comparison src/device-gtk.c @ 872:79c6ff3eef26

[xemacs-hg @ 2002-06-20 21:18:01 by ben] font changes etc.; some 21.4 changes mule/mule-msw-init-late.el: Specify charset->windows-registry conversion. mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c. cl-macs.el: Document better. font-lock.el: Move Lisp function regexp to lisp-mode.el. lisp-mode.el: Various indentation fixes: Handle flet functions better. Handle argument lists in defuns and flets. Handle quoted lists, e.g. property lists -- don't indent like function calls. Distinguish between lambdas and other lists. lisp-mode.el: Handle this form. faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code: -- Fix lots of bogus code in msw-faces.el, msw-font-menu.el, font-menu.el that was "truenaming" font specs -- i.e. in the process of frobbing a particular field in a general user-specified font spec with wildcarded fields, sticking in particular values for all the remaining wildcarded fields. This bug was rampant everywhere except in x-faces.el (the oldest and only correctly written code). This also means that we need to work with font names at all times and not font instances, because a font instance is essentially a truenamed font. -- Total rewrite of extremely junky code in msw-faces.el. Work with names as well as font instances, and return names; stop truenaming when canonicalizing and frobbing; fix handling of the combined style field, i.e. weight/slant (also fixed in font.el). -- Totally rewrite the frobbing functions in faces.el. This time, we frob all the instantiators rather than just computing a single instance value and working backwards. That way, e.g., `bold' will work for all charsets that have bold available, rather than only for whatever charset was part of the computed font instance (another example of the truename virus). Also fix up code to look at the fallbacks (all of them) when no global value present, so we don't need to put something in the global value. Intelligently handle a request to frob a buffer locale, rather than signalling an error. When frobbing instantiators, try hard to figure out what device type is associated with them, and frob each according to its own proper device type. Correctly handle inheritance vectors given as instantiators. Preserve existing tags when putting back frobbed instantiators. Extract out general specifier-frobbing code into specifier.el. Document everything cleanly. Do lots of other things better, etc. -- Don't duplicatively set a global specification for the default font -- it's already in the fallback and we no longer need a default global specification present. Delete various code in x-faces.el and msw-faces.el that duplicated the lists of fonts in faces.c. -- init-global-faces was not being called at all under MS Windows! Major bogosity. That caused device-specific values to get stuck into all the fonts, making it very hard to change them -- setting global specs caused nothing to happen. -- Correct weight names in font.el. -- Lots more font fixups in objects*.c. Printer.el: Warning fix. specifier.el: Add more args to map-specifier. Add various "heuristic" specifier functions to aid in creation of specifier-munging code such as in faces.el. subr.el: New functions. lwlib.c: Fix warning. config.inc.samp: Clean up, add args to control fastcall (not yet supported! the changes needed are in another ws of mine), profile support, vc6 support, union-type. xemacs.dsp, xemacs.mak: Semi-major overhaul. Fix bug where dump-id was always getting recomputed, forcing a redump even when nothing changed. Add support for fastcall. Support edit-and-continue (on by default) with vc6. Use incremental linking when doing a debug compilation. Add support for profiling. Consolidate the various debug flags. Partial support for "batch-compiling" -- compiling many files on a single invocation of the compiler. Doesn't seem to help that much for me, so it's not finished or enabled by default. Remove HAVE_MSW_C_DIRED, we always do. Correct some sloppy use of directories. s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine HAVE_MMAP). s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32 variants (Cygwin, native, MinGW). Both of these are properly used in another ws. alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made: (1) Separation of various header files into an external and an internal version, similar to the existing separation of process.h and procimpl.h. Eventually this should be done for all Lisp objects. The external version has the same name as currently; the internal adds -impl. The external file has XFOO() macros for objects, but the structure is opaque and defined only in the internal file. It's now reasonable to move all prototypes in lisp.h into the appropriate external file, and this should be done. Currently, separation has been done on extents.h, objects*.h, console.h, device.h, frame.h, and window.h. For c/d/f/w, the most basic properties are available in the external header file, with the macros resolving to functions. In the internal header file, the macros are redefined to directly access the structure. Also, the global MARK_FOO_CHANGED macros have been made into functions so that they can be accessed without needing to include lots of -impl headers -- they are used in almost exclusively in non-time-critical functions, and take up enough time that the function overhead will be negligible. Similarly, the function overhead from making the basic properties mentioned above into functions is negligible, and code that does heavy accessing of c/d/f/w structures inevitably ends up needing the internal header files, anyway. (2) More face changes. -- Major rewrite of objects-msw.c. Now handles wildcard specs properly, rather than "truenaming" (or even worse, signalling an error, which previously happened with some of the fallbacks if you tried to use them in make-font-instance!). -- Split charset matching of fonts into two stages -- one to find a font specifically designed for a particular charset (by examining its registry), the second to find a Unicode font that can support the charset. This needs to proceed as two complete, separate instantiations in order to work properly (otherwise many of the fonts in the HELLO page look wrong). This should also make it easy to support iso10646 (Unicode) fonts under X. -- All default values for fonts are now completely specified in the fallbacks. Stuff from mule-x-init.el has all been moved here, merged with the existing specs, and totally rethought so you get sensible results. (HELLO now looks much better!). -- Generalize the "default X/GTK device" stuff into a per-device-type "default device". -- Add mswindows-{set-}charset-registry. In time, charset<->code-page conversion functions will be removed. -- Wrap protective code around calls to compute device specifier tags, and do this computation before calling the face initialization code because the latter may need these tags to be correctly updated. (3) Other changes. EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes. config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of #ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside! eval.c: Let detailed backtraces be detailed. specifier.c: Don't override user's print-string-length/print-length settings. glyphs.c: New function image-instance-instantiator. config.h.in, sysdep.c: Changes for fastcall. sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP NEEDS TO GO IN, TOO. search.c: Fix *evil* crash due to incorrect synching of syntax-cache code with 21.1. THIS SHOULD GO INTO 21.4.
author ben
date Thu, 20 Jun 2002 21:19:10 +0000
parents 42375619fa45
children e22b0213b713
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
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) 2002 Ben Wing.
4 5
5 This file is part of XEmacs. 6 This file is part of XEmacs.
6 7
7 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
8 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
26 /* Gtk flavor written by William Perry */ 27 /* Gtk flavor written by William Perry */
27 28
28 #include <config.h> 29 #include <config.h>
29 #include "lisp.h" 30 #include "lisp.h"
30 31
31 #include "console-gtk.h" 32 #include "buffer.h"
33 #include "device-impl.h"
34 #include "elhash.h"
35 #include "events.h"
36 #include "faces.h"
37 #include "frame-impl.h"
38 #include "redisplay.h"
39 #include "sysdep.h"
40 #include "window.h"
41
42 #include "console-gtk-impl.h"
32 #include "gccache-gtk.h" 43 #include "gccache-gtk.h"
33 #include "glyphs-gtk.h" 44 #include "glyphs-gtk.h"
34 #include "objects-gtk.h" 45 #include "objects-gtk.h"
35 #include "gtk-xemacs.h" 46 #include "gtk-xemacs.h"
36 47
37 #include "buffer.h"
38 #include "events.h"
39 #include "faces.h"
40 #include "frame.h"
41 #include "device.h"
42 #include "redisplay.h"
43 #include "sysdep.h"
44 #include "window.h"
45 #include "elhash.h"
46
47 #include "sysfile.h" 48 #include "sysfile.h"
48 #include "systime.h" 49 #include "systime.h"
49 50
50 #ifdef HAVE_GNOME 51 #ifdef HAVE_GNOME
51 #include <libgnomeui/libgnomeui.h> 52 #include <libgnomeui/libgnomeui.h>
52 #endif 53 #endif
53 54
54 #ifdef HAVE_BONOBO 55 #ifdef HAVE_BONOBO
55 #include <bonobo.h> 56 #include <bonobo.h>
56 #endif 57 #endif
57
58 Lisp_Object Vdefault_gtk_device;
59 58
60 /* Qdisplay in general.c */ 59 /* Qdisplay in general.c */
61 Lisp_Object Qinit_pre_gtk_win, Qinit_post_gtk_win; 60 Lisp_Object Qinit_pre_gtk_win, Qinit_post_gtk_win;
62 61
63 /* The application class of Emacs. */ 62 /* The application class of Emacs. */
369 if (checking_free) 368 if (checking_free)
370 enable_strict_free_check (); 369 enable_strict_free_check ();
371 #endif 370 #endif
372 } 371 }
373 372
374 if (EQ (device, Vdefault_gtk_device))
375 {
376 Lisp_Object devcons, concons;
377 /* #### handle deleting last X device */
378 Vdefault_gtk_device = Qnil;
379 DEVICE_LOOP_NO_BREAK (devcons, concons)
380 {
381 if (DEVICE_GTK_P (XDEVICE (XCAR (devcons))) &&
382 !EQ (device, XCAR (devcons)))
383 {
384 Vdefault_gtk_device = XCAR (devcons);
385 goto double_break;
386 }
387 }
388 }
389 double_break:
390 free_gtk_device_struct (d); 373 free_gtk_device_struct (d);
391 } 374 }
392 375
393 376
394 /************************************************************************/ 377 /************************************************************************/
410 393
411 394
412 /************************************************************************/ 395 /************************************************************************/
413 /* display information functions */ 396 /* display information functions */
414 /************************************************************************/ 397 /************************************************************************/
415
416 DEFUN ("default-gtk-device", Fdefault_gtk_device, 0, 0, 0, /*
417 Return the default GTK device for resourcing.
418 This is the first-created GTK device that still exists.
419 */
420 ())
421 {
422 return Vdefault_gtk_device;
423 }
424 398
425 DEFUN ("gtk-display-visual-class", Fgtk_display_visual_class, 0, 1, 0, /* 399 DEFUN ("gtk-display-visual-class", Fgtk_display_visual_class, 0, 1, 0, /*
426 Return the visual class of the GTK display DEVICE is using. 400 Return the visual class of the GTK display DEVICE is using.
427 The returned value will be one of the symbols `static-gray', `gray-scale', 401 The returned value will be one of the symbols `static-gray', `gray-scale',
428 `static-color', `pseudo-color', `true-color', or `direct-color'. 402 `static-color', `pseudo-color', `true-color', or `direct-color'.
696 /************************************************************************/ 670 /************************************************************************/
697 671
698 void 672 void
699 syms_of_device_gtk (void) 673 syms_of_device_gtk (void)
700 { 674 {
701 DEFSUBR (Fdefault_gtk_device);
702 DEFSUBR (Fgtk_keysym_on_keyboard_p); 675 DEFSUBR (Fgtk_keysym_on_keyboard_p);
703 DEFSUBR (Fgtk_display_visual_class); 676 DEFSUBR (Fgtk_display_visual_class);
704 DEFSUBR (Fgtk_display_visual_depth); 677 DEFSUBR (Fgtk_display_visual_depth);
705 DEFSUBR (Fgtk_style_info); 678 DEFSUBR (Fgtk_style_info);
706 DEFSUBR (Fgtk_grab_pointer); 679 DEFSUBR (Fgtk_grab_pointer);
730 void 703 void
731 vars_of_device_gtk (void) 704 vars_of_device_gtk (void)
732 { 705 {
733 Fprovide (Qgtk); 706 Fprovide (Qgtk);
734 707
735 staticpro (&Vdefault_gtk_device);
736
737 DEFVAR_LISP ("gtk-initial-argv-list", &Vgtk_initial_argv_list /* 708 DEFVAR_LISP ("gtk-initial-argv-list", &Vgtk_initial_argv_list /*
738 You don't want to know. 709 You don't want to know.
739 This is used during startup to communicate the remaining arguments in 710 This is used during startup to communicate the remaining arguments in
740 `command-line-args-left' to the C code, which passes the args to 711 `command-line-args-left' to the C code, which passes the args to
741 the GTK initialization code, which removes some args, and then the 712 the GTK initialization code, which removes some args, and then the
747 DEFVAR_LISP ("gtk-initial-geometry", &Vgtk_initial_geometry /* 718 DEFVAR_LISP ("gtk-initial-geometry", &Vgtk_initial_geometry /*
748 You don't want to know. 719 You don't want to know.
749 This is used during startup to communicate the default geometry to GTK. 720 This is used during startup to communicate the default geometry to GTK.
750 */ ); 721 */ );
751 722
752 Vdefault_gtk_device = Qnil;
753 Vgtk_initial_geometry = Qnil; 723 Vgtk_initial_geometry = Qnil;
754 Vgtk_initial_argv_list = Qnil; 724 Vgtk_initial_argv_list = Qnil;
755 } 725 }
756 726
757 #include <gdk/gdkx.h> 727 #include <gdk/gdkx.h>