/* Deal with the X Resource Manager.
Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Author: Joseph Arceneaux
+Created: 4/90
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
-
-/* Written by jla, 4/90 */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef emacs
#include <config.h>
-#endif
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
-
+#include <errno.h>
#include <epaths.h>
#include <stdio.h>
-
-#if 1 /* I'd really appreciate it if this code could go away... -JimB */
-/* This avoids lossage in the `dual-universe' headers on AT&T SysV
- X11. Don't do it on Solaris, because it breaks compilation with
- XFree86 4.0.3 (and probably many other X11R6 releases) on Solaris
- 2 */
-#if defined(USG5) && !defined(SOLARIS2)
-#ifndef SYSV
-#define SYSV
-#endif
-#endif /* USG5 && !SOLARIS2 */
-
-#endif /* 1 */
+#include <setjmp.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#if 0
-#include <X11/Xos.h>
-#endif
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
#include "lisp.h"
-extern char *getenv ();
-
-/* This does cause trouble on AIX. I'm going to take the comment at
- face value. */
-#if 0
-extern short getuid (); /* If this causes portability problems,
- I think we should just delete it; it'll
- default to `int' anyway. */
+#ifdef USE_MOTIF
+/* For Vdouble_click_time. */
+#include "keyboard.h"
#endif
-#ifdef DECLARE_GETPWUID_WITH_UID_T
+extern char *getenv (const char *);
+
extern struct passwd *getpwuid (uid_t);
extern struct passwd *getpwnam (const char *);
-#else
-extern struct passwd *getpwuid ();
-extern struct passwd *getpwnam ();
-#endif
-extern char *get_system_name ();
-
-/* Make sure not to #include anything after these definitions. Let's
- not step on anyone's prototypes. */
-#ifdef emacs
-/* darwin.h may have already defined these. */
-#undef malloc
-#undef realloc
-#undef free
-#define malloc xmalloc
-#define realloc xrealloc
-#define free xfree
-#endif
+extern const char *get_system_name (void);
-char *x_get_string_resource ();
-static int file_p ();
+char *x_get_string_resource (XrmDatabase rdb, const char *name,
+ const char *class);
+static int file_p (const char *filename);
\f
/* X file search path processing. */
/* Return the value of the emacs.customization (Emacs.Customization)
resource, for later use in search path decoding. If we find no
such resource, return zero. */
-char *
-x_get_customization_string (db, name, class)
- XrmDatabase db;
- char *name, *class;
+static char *
+x_get_customization_string (XrmDatabase db, const char *name,
+ const char *class)
{
char *full_name
= (char *) alloca (strlen (name) + sizeof ("customization") + 3);
if (result)
{
- char *copy = (char *) malloc (strlen (result) + 1);
+ char *copy = (char *) xmalloc (strlen (result) + 1);
strcpy (copy, result);
return copy;
}
Return NULL otherwise. */
static char *
-magic_file_p (string, string_len, class, escaped_suffix, suffix)
- char *string;
- int string_len;
- char *class, *escaped_suffix, *suffix;
+magic_file_p (const char *string, EMACS_INT string_len, const char *class, const char *escaped_suffix, const char *suffix)
{
char *lang = getenv ("LANG");
int path_size = 100;
- char *path = (char *) malloc (path_size);
+ char *path = (char *) xmalloc (path_size);
int path_len = 0;
- char *p = string;
+ const char *p = string;
while (p < string + string_len)
{
/* The chunk we're about to stick on the end of result. */
- char *next = NULL;
+ const char *next = NULL;
int next_len;
if (*p == '%')
case 'l':
if (! lang)
{
- free (path);
+ xfree (path);
return NULL;
}
case 't':
case 'c':
- free (path);
+ xfree (path);
return NULL;
}
}
if (path_len + next_len + 1 > path_size)
{
path_size = (path_len + next_len + 1) * 2;
- path = (char *) realloc (path, path_size);
+ path = (char *) xrealloc (path, path_size);
}
- bcopy (next, path + path_len, next_len);
+ memcpy (path + path_len, next, next_len);
path_len += next_len;
p++;
if (path_len + suffix_len + 1 > path_size)
{
path_size = (path_len + suffix_len + 1);
- path = (char *) realloc (path, path_size);
+ path = (char *) xrealloc (path, path_size);
}
- bcopy (suffix, path + path_len, suffix_len);
+ memcpy (path + path_len, suffix, suffix_len);
path_len += suffix_len;
}
if (! file_p (path))
{
- free (path);
+ xfree (path);
return NULL;
}
static char *
-gethomedir ()
+gethomedir (void)
{
struct passwd *pw;
char *ptr;
if (ptr == NULL)
return xstrdup ("/");
- copy = (char *) malloc (strlen (ptr) + 2);
+ copy = (char *) xmalloc (strlen (ptr) + 2);
strcpy (copy, ptr);
strcat (copy, "/");
static int
-file_p (filename)
- char *filename;
+file_p (const char *filename)
{
struct stat status;
the path name of the one we found otherwise. */
static char *
-search_magic_path (search_path, class, escaped_suffix, suffix)
- char *search_path, *class, *escaped_suffix, *suffix;
+search_magic_path (const char *search_path, const char *class, const char *escaped_suffix, const char *suffix)
{
- register char *s, *p;
+ const char *s, *p;
for (s = search_path; *s; s = p)
{
if (p > s)
{
- char *path = magic_file_p (s, p - s, class, escaped_suffix, suffix);
+ char *path = magic_file_p (s, p - s, class, escaped_suffix,
+ suffix);
if (path)
return path;
}
/* Producing databases for individual sources. */
static XrmDatabase
-get_system_app (class)
- char *class;
+get_system_app (const char *class)
{
XrmDatabase db = NULL;
- char *path;
+ const char *path;
+ char *p;
path = getenv ("XFILESEARCHPATH");
if (! path) path = PATH_X_DEFAULTS;
- path = search_magic_path (path, class, 0, 0);
- if (path)
+ p = search_magic_path (path, class, 0, 0);
+ if (p)
{
- db = XrmGetFileDatabase (path);
- free (path);
+ db = XrmGetFileDatabase (p);
+ xfree (p);
}
return db;
static XrmDatabase
-get_fallback (display)
- Display *display;
+get_fallback (Display *display)
{
return NULL;
}
static XrmDatabase
-get_user_app (class)
- char *class;
+get_user_app (const char *class)
{
- char *path;
+ const char *path;
char *file = 0;
char *free_it = 0;
|| (file = search_magic_path (free_it, class, "%N", 0)))))
{
XrmDatabase db = XrmGetFileDatabase (file);
- free (file);
- if (free_it)
- free (free_it);
+ xfree (file);
+ xfree (free_it);
return db;
}
- if (free_it)
- free (free_it);
+ xfree (free_it);
return NULL;
}
static XrmDatabase
-get_user_db (display)
- Display *display;
+get_user_db (Display *display)
{
XrmDatabase db;
char *xdefs;
char *xdefault;
home = gethomedir ();
- xdefault = (char *) malloc (strlen (home) + sizeof (".Xdefaults"));
+ xdefault = (char *) xmalloc (strlen (home) + sizeof (".Xdefaults"));
strcpy (xdefault, home);
strcat (xdefault, ".Xdefaults");
db = XrmGetFileDatabase (xdefault);
- free (home);
- free (xdefault);
+ xfree (home);
+ xfree (xdefault);
}
#ifdef HAVE_XSCREENRESOURCESTRING
}
static XrmDatabase
-get_environ_db ()
+get_environ_db (void)
{
XrmDatabase db;
char *p;
- char *path = 0, *home = 0, *host;
+ char *path = 0, *home = 0;
+ const char *host;
if ((p = getenv ("XENVIRONMENT")) == NULL)
{
home = gethomedir ();
host = get_system_name ();
- path = (char *) malloc (strlen (home)
+ path = (char *) xmalloc (strlen (home)
+ sizeof (".Xdefaults-")
+ strlen (host));
sprintf (path, "%s%s%s", home, ".Xdefaults-", host);
db = XrmGetFileDatabase (p);
- if (path) free (path);
- if (home) free (home);
+ xfree (path);
+ xfree (home);
return db;
}
/* Load X resources based on the display and a possible -xrm option. */
XrmDatabase
-x_load_resources (display, xrm_string, myname, myclass)
- Display *display;
- char *xrm_string, *myname, *myclass;
+x_load_resources (Display *display, const char *xrm_string,
+ const char *myname, const char *myclass)
{
XrmDatabase user_database;
XrmDatabase rdb;
XrmDatabase db;
char line[256];
- char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
+ const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
#ifdef USE_MOTIF
- char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
- extern Lisp_Object Vdouble_click_time;
+ const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
#endif
x_rm_string = XrmStringToQuark (XrmStringType);
#endif /* not USE_MOTIF */
-#ifdef HAVE_X_I18N
- {
-#ifdef USE_MOTIF
- Bool motif = True;
-#else /* not USE_MOTIF */
- Bool motif = False;
-#endif /* not USE_MOTIF */
- /* Setup the default fontSet resource. */
- extern char *xic_create_fontsetname P_ ((char *base_fontname, Bool motif));
- char *fontsetname = xic_create_fontsetname (helv, motif);
- int len = strlen (fontsetname);
- char *buf = line;
-
- /* fontsetname may be very long. */
- if (len + 16 > 256)
- buf = alloca (len + 16);
- sprintf (buf, "Emacs*fontSet: %s", fontsetname);
- XrmPutLineResource (&rdb, buf);
- if (fontsetname != helv)
- xfree (fontsetname);
- }
-#endif /* HAVE_X_I18N */
-
user_database = get_user_db (display);
/* Figure out what the "customization string" is, so we can use it
to decode paths. */
- if (x_customization_string)
- free (x_customization_string);
+ xfree (x_customization_string);
x_customization_string
= x_get_customization_string (user_database, myname, myclass);
/* Retrieve the value of the resource specified by NAME with class CLASS
and of type TYPE from database RDB. The value is returned in RET_VALUE. */
-int
-x_get_resource (rdb, name, class, expected_type, ret_value)
- XrmDatabase rdb;
- char *name, *class;
- XrmRepresentation expected_type;
- XrmValue *ret_value;
+static int
+x_get_resource (XrmDatabase rdb, const char *name, const char *class,
+ XrmRepresentation expected_type, XrmValue *ret_value)
{
XrmValue value;
XrmName namelist[100];
if (type == x_rm_string)
ret_value->addr = (char *) value.addr;
else
- bcopy (value.addr, ret_value->addr, ret_value->size);
+ memcpy (ret_value->addr, value.addr, ret_value->size);
return value.size;
}
database RDB. */
char *
-x_get_string_resource (rdb, name, class)
- XrmDatabase rdb;
- char *name, *class;
+x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
{
XrmValue value;
+ if (inhibit_x_resources)
+ /* --quick was passed, so this is a no-op. */
+ return NULL;
+
if (x_get_resource (rdb, name, class, x_rm_string, &value))
return (char *) value.addr;
char *msg, *prog;
int x1, x2, x3, x4, x5;
{
- extern int errno;
-
if (errno)
perror (prog);
HCoop / bpt / emacs.git / blobdiff