xemacs-beta: src/device-x.c comparison

comparison src/device-x.c @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36

author	cvs
date	Mon, 13 Aug 2007 11:35:02 +0200
parents	8de8e3f6228a
children	576fb035e263

comparison

equal deleted inserted replaced

-:72a7cfa4a488
+:abe6d1db359e
 along with XEmacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 /* Synched up with: Not in FSF. */
+/* 7-8-00 !!#### This file needs definite Mule review. */
 /* Original authors: Jamie Zawinski and the FSF */
 /* Rewritten by Ben Wing and Chuck Thompson. */
 #include <config.h>
 #include "window.h"
 #include "sysfile.h"
 #include "systime.h"
-#if defined(HAVE_DLOPEN) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
+#if defined(HAVE_SHLIB) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
 #include "sysdll.h"
-#endif /* HAVE_DLOPEN and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
+#endif /* HAVE_SHLIB and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
 #ifdef HAVE_OFFIX_DND
 #include "offix.h"
 #endif
 * I have removed the gratuitous use of getenv("RESOURCE_NAME")
 * which was in X11R5, but left the matching of any prefix of `-name'.
 * Finally, if all else fails, return `xemacs', as it is more
 * appropriate (X11R5 returns `main').
 */
-static char *
+static Extbyte *
-compute_x_app_name (int argc, char **argv)
+compute_x_app_name (int argc, Extbyte **argv)
 {
 int i;
-char *ptr;
+Extbyte *ptr;
 for (i = 1; i < argc - 1; i++)
 if (!strncmp(argv[i], "-name", max (2, strlen (argv[1]))))
 return argv[i+1];
 Lisp_Object display;
 Lisp_Object device;
 Display *dpy;
 Widget app_shell;
 int argc;
-char **argv;
+Extbyte **argv;
-CONST char *app_class;
+const char *app_class;
-CONST char *app_name;
+const char *app_name;
-CONST char *disp_name;
+const char *disp_name;
 Visual *visual = NULL;
 int depth = 8;		/* shut up the compiler */
 Colormap cmap;
 int screen;
 /* */
 int best_visual_found = 0;
-#if defined(HAVE_DLOPEN) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
+#if defined(HAVE_SHLIB) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
 /*
 * In order to avoid the lossage with flat Athena widgets dynamically
 * linking to one of the ThreeD variants, using the dynamic symbol helpers
 * to look for symbols that shouldn't be there and refusing to run if they
 * are seems a less toxic idea than having XEmacs crash when we try and
 	 * No error catch here; I can't think of a way to recover anyhow.
 	 */
 	dll_close (xaw_dll_handle);
 }
 }
-#endif /* HAVE_DLOPEN and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
+#endif /* HAVE_SHLIB and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
 XSETDEVICE (device, d);
 display = DEVICE_CONNECTION (d);
 allocate_x_device_struct (d);
 make_argc_argv (Vx_initial_argv_list, &argc, &argv);
-TO_EXTERNAL_FORMAT (LISP_STRING, display,
+LISP_STRING_TO_EXTERNAL (display, disp_name, Qctext);
-		      C_STRING_ALLOCA, disp_name,
-		      Qctext);
 /*
 * Break apart the old XtOpenDisplay call into XOpenDisplay and
 * XtDisplayInitialize so we can figure out whether there
 * are any XEmacs resources in the resource database before
 signal_simple_error ("X server not responding\n", display);
 }
 if (STRINGP (Vx_emacs_application_class) &&
 XSTRING_LENGTH (Vx_emacs_application_class) > 0)
-TO_EXTERNAL_FORMAT (LISP_STRING, Vx_emacs_application_class,
+LISP_STRING_TO_EXTERNAL (Vx_emacs_application_class, app_class, Qctext);
-			C_STRING_ALLOCA, app_class,
-			Qctext);
 else
 {
 app_class = (NILP (Vx_emacs_application_class)  &&
 have_xemacs_resources_in_xrdb (dpy))
 #ifdef INFODOCK
 slow_down_interrupts ();
 /* May not be needed but XtOpenDisplay could not deal with signals here.
 Yuck. */
 XtDisplayInitialize (Xt_app_con, dpy, compute_x_app_name (argc, argv),
 app_class, emacs_options,
-XtNumber (emacs_options), &argc, argv);
+XtNumber (emacs_options), &argc, (char **) argv);
 speed_up_interrupts ();
 screen = DefaultScreen (dpy);
 if (NILP (Vdefault_x_device))
 Vdefault_x_device = device;
 {
 /* Read in locale-specific resources from
 data-directory/app-defaults/$LANG/Emacs.
 This is in addition to the standard app-defaults files, and
 does not override resources defined elsewhere */
-CONST char *data_dir;
+const char *data_dir;
 char *path;
 XrmDatabase db = XtDatabase (dpy); /* #### XtScreenDatabase(dpy) ? */
-CONST char *locale = XrmLocaleOfDatabase (db);
+const char *locale = XrmLocaleOfDatabase (db);
 if (STRINGP (Vx_app_defaults_directory) &&
 	XSTRING_LENGTH (Vx_app_defaults_directory) > 0)
 {
-	TO_EXTERNAL_FORMAT (LISP_STRING, Vx_app_defaults_directory,
+	LISP_STRING_TO_EXTERNAL (Vx_app_defaults_directory, data_dir, Qfile_name);
-			    C_STRING_ALLOCA, data_dir,
-			    Qfile_name);
 	path = (char *)alloca (strlen (data_dir) + strlen (locale) + 7);
 	sprintf (path, "%s%s/Emacs", data_dir, locale);
 	if (!access (path, R_OK))
 	  XrmCombineFileDatabase (path, &db, False);
 }
 else if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0)
 {
-	TO_EXTERNAL_FORMAT (LISP_STRING, Vdata_directory,
+	LISP_STRING_TO_EXTERNAL (Vdata_directory, data_dir, Qfile_name);
-			    C_STRING_ALLOCA, data_dir,
-			    Qfile_name);
 	path = (char *)alloca (strlen (data_dir) + 13 + strlen (locale) + 7);
 	sprintf (path, "%sapp-defaults/%s/Emacs", data_dir, locale);
 	if (!access (path, R_OK))
 	  XrmCombineFileDatabase (path, &db, False);
 }
 }
 #ifdef HAVE_WMCOMMAND
 {
 int new_argc;
-char **new_argv;
+Extbyte **new_argv;
 make_argc_argv (Vcommand_line_args, &new_argc, &new_argv);
-XSetCommand (XtDisplay (app_shell), XtWindow (app_shell), new_argv, new_argc);
+XSetCommand (XtDisplay (app_shell), XtWindow (app_shell),
+		 (char **) new_argv, new_argc);
 free_argc_argv (new_argv);
 }
 #endif /* HAVE_WMCOMMAND */
 /************************************************************************/
 /*				handle X errors				*/
 /************************************************************************/
-CONST char *
+const char *
 x_event_name (int event_type)
 {
-static CONST char *events[] =
+static const char *events[] =
 {
 "0: ERROR!",
 "1: REPLY",
 "KeyPress",
 "KeyRelease",
 }
 }
 #endif /* 0 */
+/* strcasecmp() is not sufficiently portable or standard,
+and it's easier just to write our own. */
+static int
+ascii_strcasecmp (const char *s1, const char *s2)
+{
+while (1)
+{
+char c1 = *s1++;
+char c2 = *s2++;
+if (c1 >= 'A' && c1 <= 'Z') c1 += 'a' - 'A';
+if (c2 >= 'A' && c2 <= 'Z') c2 += 'a' - 'A';
+if (c1 != c2) return c1 - c2;
+if (c1 == '\0') return 0;
+}
+}
 static char_dynarr *name_char_dynarr;
 static char_dynarr *class_char_dynarr;
 /* Given a locale and device specification from x-get-resource or
 x-get-resource-prefix, return the resource prefix and display to
 LOCALE, if a device can be derived (i.e. if LOCALE is a frame or device),
 and otherwise defaults to the value of `default-x-device'.
 The sixth arg NOERROR, if non-nil, means do not signal an error if a
 bogus resource specification was retrieved (e.g. if a non-integer was
 given when an integer was requested).  In this case, a warning is issued
-instead.
+instead, unless NOERROR is t, in which case no warning is issued.
 The resource names passed to this function are looked up relative to the
 locale.
 If you want to search for a subresource, you just need to specify the
 if (EQ (type, Qstring))
 return build_string (raw_result);
 else if (EQ (type, Qboolean))
 {
-if (!strcasecmp (raw_result, "off")   ||
+if (!ascii_strcasecmp (raw_result, "off")   ||
-	  !strcasecmp (raw_result, "false") ||
+	  !ascii_strcasecmp (raw_result, "false") ||
-	  !strcasecmp (raw_result, "no"))
+	  !ascii_strcasecmp (raw_result, "no"))
 	return Fcons (Qnil, Qnil);
-if (!strcasecmp (raw_result, "on")   ||
+if (!ascii_strcasecmp (raw_result, "on")   ||
-	  !strcasecmp (raw_result, "true") ||
+	  !ascii_strcasecmp (raw_result, "true") ||
-	  !strcasecmp (raw_result, "yes"))
+	  !ascii_strcasecmp (raw_result, "yes"))
 	return Fcons (Qt, Qnil);
 return maybe_continuable_error
 	(Qresource, errb,
 	 "can't convert %s: %s to a Boolean", name_string, raw_result);
 }
 Valid keysyms are listed in the files /usr/include/X11/keysymdef.h and in
 /usr/lib/X11/XKeysymDB, or whatever the equivalents are on your system.
 */
 (keysym))
 {
-CONST char *keysym_ext;
+const char *keysym_ext;
 CHECK_STRING (keysym);
-TO_EXTERNAL_FORMAT (LISP_STRING, keysym,
+LISP_STRING_TO_EXTERNAL (keysym, keysym_ext, Qctext);
-		      C_STRING_ALLOCA, keysym_ext,
-		      Qctext);
 return XStringToKeysym (keysym_ext) ? Qt : Qnil;
 }
 DEFUN ("x-keysym-hash-table", Fx_keysym_hash_table, 0, 1, 0, /*
 */
 (device))
 {
 Display *dpy = get_x_display (device);
 int ndirs_return;
-CONST char **directories = (CONST char **) XGetFontPath (dpy, &ndirs_return);
+const char **directories = (const char **) XGetFontPath (dpy, &ndirs_return);
 Lisp_Object font_path = Qnil;
 if (!directories)
 signal_simple_error ("Can't get X font path", device);
 */
 (font_path, device))
 {
 Display *dpy = get_x_display (device);
 Lisp_Object path_entry;
-CONST char **directories;
+const char **directories;
 int i=0,ndirs=0;
 EXTERNAL_LIST_LOOP (path_entry, font_path)
 {
 CHECK_STRING (XCAR (path_entry));
 ndirs++;
 }
-directories = alloca_array (CONST char *, ndirs);
+directories = alloca_array (const char *, ndirs);
 EXTERNAL_LIST_LOOP (path_entry, font_path)
 {
-TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (path_entry),
+LISP_STRING_TO_EXTERNAL (XCAR (path_entry), directories[i++], Qfile_name);
-			  C_STRING_ALLOCA, directories[i++],
-			  Qfile_name);
 }
 expect_x_error (dpy);
 XSetFontPath (dpy, (char **) directories, ndirs);
 signal_if_x_error (dpy, 1/*resumable_p*/);
 void
 reinit_console_type_create_device_x (void)
 {
 /* Initialize variables to speed up X resource interactions */
-CONST char *valid_resource_chars =
+const char *valid_resource_chars =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 while (*valid_resource_chars)
 valid_resource_char_p[(unsigned int) (*valid_resource_chars++)] = 1;
 name_char_dynarr  = Dynarr_new (char);

Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 442:abe6d1db359e r21-2-36