comparison src/device-x.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents ba4677f54a05
children 3d8143fc88e1
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
1 /* Device functions for X windows. 1 /* Device functions for X windows.
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1994, 1995 Free Software Foundation, Inc. 3 Copyright (C) 1994, 1995 Free Software Foundation, Inc.
4 Copyright (C) 2001, 2002 Ben Wing. 4 Copyright (C) 2001, 2002, 2004 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
492 492
493 493
494 static void 494 static void
495 x_init_device (struct device *d, Lisp_Object UNUSED (props)) 495 x_init_device (struct device *d, Lisp_Object UNUSED (props))
496 { 496 {
497 /* !!#### */
497 Lisp_Object display; 498 Lisp_Object display;
498 Display *dpy; 499 Display *dpy;
499 Widget app_shell; 500 Widget app_shell;
500 int argc; 501 int argc;
501 Extbyte **argv; 502 Extbyte **argv;
649 if (STRINGP (Vx_app_defaults_directory) && 650 if (STRINGP (Vx_app_defaults_directory) &&
650 XSTRING_LENGTH (Vx_app_defaults_directory) > 0) 651 XSTRING_LENGTH (Vx_app_defaults_directory) > 0)
651 { 652 {
652 LISP_STRING_TO_EXTERNAL (Vx_app_defaults_directory, data_dir, 653 LISP_STRING_TO_EXTERNAL (Vx_app_defaults_directory, data_dir,
653 Qfile_name); 654 Qfile_name);
654 path = (Extbyte *) ALLOCA (strlen (data_dir) + strlen (locale) + 655 path = alloca_extbytes (strlen (data_dir) + strlen (locale) + 7);
655 7);
656 sprintf (path, "%s%s/Emacs", data_dir, locale); 656 sprintf (path, "%s%s/Emacs", data_dir, locale);
657 if (!access (path, R_OK)) 657 if (!access (path, R_OK))
658 XrmCombineFileDatabase (path, &db, False); 658 XrmCombineFileDatabase (path, &db, False);
659 } 659 }
660 else if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0) 660 else if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0)
661 { 661 {
662 LISP_STRING_TO_EXTERNAL (Vdata_directory, data_dir, Qfile_name); 662 LISP_STRING_TO_EXTERNAL (Vdata_directory, data_dir, Qfile_name);
663 path = (Extbyte *) ALLOCA (strlen (data_dir) + 13 + strlen (locale) + 663 path = alloca_extbytes (strlen (data_dir) + 13 + strlen (locale) + 7);
664 7);
665 sprintf (path, "%sapp-defaults/%s/Emacs", data_dir, locale); 664 sprintf (path, "%sapp-defaults/%s/Emacs", data_dir, locale);
666 if (!access (path, R_OK)) 665 if (!access (path, R_OK))
667 XrmCombineFileDatabase (path, &db, False); 666 XrmCombineFileDatabase (path, &db, False);
668 } 667 }
669 } 668 }
1719 Return the empty string if the vendor ID string cannot be determined. 1718 Return the empty string if the vendor ID string cannot be determined.
1720 */ 1719 */
1721 (device)) 1720 (device))
1722 { 1721 {
1723 Display *dpy = get_x_display (device); 1722 Display *dpy = get_x_display (device);
1724 char *vendor = ServerVendor (dpy); 1723 Extbyte *vendor = ServerVendor (dpy);
1725 1724
1726 return build_string (vendor ? vendor : ""); 1725 return build_ext_string (vendor ? vendor : "", Qx_hpc_encoding);
1727 } 1726 }
1728 1727
1729 DEFUN ("x-server-version", Fx_server_version, 0, 1, 0, /* 1728 DEFUN ("x-server-version", Fx_server_version, 0, 1, 0, /*
1730 Return the version numbers of the X server DEVICE is on. 1729 Return the version numbers of the X server DEVICE is on.
1731 The returned value is a list of three integers: the major and minor 1730 The returned value is a list of three integers: the major and minor
1746 Valid keysyms are listed in the files /usr/include/X11/keysymdef.h and in 1745 Valid keysyms are listed in the files /usr/include/X11/keysymdef.h and in
1747 /usr/lib/X11/XKeysymDB, or whatever the equivalents are on your system. 1746 /usr/lib/X11/XKeysymDB, or whatever the equivalents are on your system.
1748 */ 1747 */
1749 (keysym)) 1748 (keysym))
1750 { 1749 {
1751 const char *keysym_ext; 1750 const Extbyte *keysym_ext;
1752 1751
1753 CHECK_STRING (keysym); 1752 CHECK_STRING (keysym);
1754 LISP_STRING_TO_EXTERNAL (keysym, keysym_ext, Qctext); 1753 LISP_STRING_TO_EXTERNAL (keysym, keysym_ext, Qctext);
1755 1754
1756 return XStringToKeysym (keysym_ext) ? Qt : Qnil; 1755 return XStringToKeysym (keysym_ext) ? Qt : Qnil;
1950 */ 1949 */
1951 (device)) 1950 (device))
1952 { 1951 {
1953 Display *dpy = get_x_display (device); 1952 Display *dpy = get_x_display (device);
1954 int ndirs_return; 1953 int ndirs_return;
1955 const char **directories = (const char **) XGetFontPath (dpy, &ndirs_return); 1954 const Extbyte **directories =
1955 (const Extbyte **) XGetFontPath (dpy, &ndirs_return);
1956 Lisp_Object font_path = Qnil; 1956 Lisp_Object font_path = Qnil;
1957 1957
1958 if (!directories) 1958 if (!directories)
1959 gui_error ("Can't get X font path", device); 1959 gui_error ("Can't get X font path", device);
1960 1960
1981 See also `x-get-font-path'. 1981 See also `x-get-font-path'.
1982 */ 1982 */
1983 (font_path, device)) 1983 (font_path, device))
1984 { 1984 {
1985 Display *dpy = get_x_display (device); 1985 Display *dpy = get_x_display (device);
1986 Lisp_Object path_entry; 1986 Extbyte **directories;
1987 const char **directories;
1988 int i=0,ndirs=0; 1987 int i=0,ndirs=0;
1989 1988
1990 EXTERNAL_LIST_LOOP (path_entry, font_path) 1989 {
1991 { 1990 EXTERNAL_LIST_LOOP_2 (path_entry, font_path)
1992 CHECK_STRING (XCAR (path_entry)); 1991 {
1993 ndirs++; 1992 CHECK_STRING (path_entry);
1994 } 1993 ndirs++;
1995 1994 }
1996 directories = alloca_array (const char *, ndirs); 1995 }
1997 1996
1998 EXTERNAL_LIST_LOOP (path_entry, font_path) 1997 directories = alloca_array (Extbyte *, ndirs);
1999 { 1998
2000 LISP_STRING_TO_EXTERNAL (XCAR (path_entry), directories[i++], Qfile_name); 1999 {
2001 } 2000 EXTERNAL_LIST_LOOP_2 (path_entry, font_path)
2001 {
2002 LISP_STRING_TO_EXTERNAL (path_entry, directories[i++],
2003 Qfile_name);
2004 }
2005 }
2002 2006
2003 expect_x_error (dpy); 2007 expect_x_error (dpy);
2004 XSetFontPath (dpy, (char **) directories, ndirs); 2008 XSetFontPath (dpy, directories, ndirs);
2005 signal_if_x_error (dpy, 1/*resumable_p*/); 2009 signal_if_x_error (dpy, 1/*resumable_p*/);
2006 2010
2007 return Qnil; 2011 return Qnil;
2008 } 2012 }
2009 2013
2049 2053
2050 void 2054 void
2051 reinit_console_type_create_device_x (void) 2055 reinit_console_type_create_device_x (void)
2052 { 2056 {
2053 /* Initialize variables to speed up X resource interactions */ 2057 /* Initialize variables to speed up X resource interactions */
2054 const Char_ASCII *valid_resource_chars = 2058 const Ascbyte *valid_resource_chars =
2055 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; 2059 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
2056 while (*valid_resource_chars) 2060 while (*valid_resource_chars)
2057 valid_resource_char_p[(unsigned int) (*valid_resource_chars++)] = 1; 2061 valid_resource_char_p[(unsigned int) (*valid_resource_chars++)] = 1;
2058 2062
2059 name_Extbyte_dynarr = Dynarr_new (Extbyte); 2063 name_Extbyte_dynarr = Dynarr_new (Extbyte);
2081 } 2085 }
2082 2086
2083 void 2087 void
2084 vars_of_device_x (void) 2088 vars_of_device_x (void)
2085 { 2089 {
2086 reinit_vars_of_device_x ();
2087
2088 DEFVAR_LISP ("x-emacs-application-class", &Vx_emacs_application_class /* 2090 DEFVAR_LISP ("x-emacs-application-class", &Vx_emacs_application_class /*
2089 The X application class of the XEmacs process. 2091 The X application class of the XEmacs process.
2090 This controls, among other things, the name of the `app-defaults' file 2092 This controls, among other things, the name of the `app-defaults' file
2091 that XEmacs will use. For changes to this variable to take effect, they 2093 that XEmacs will use. For changes to this variable to take effect, they
2092 must be made before the connection to the X server is initialized, that is, 2094 must be made before the connection to the X server is initialized, that is,