comparison src/objects-x.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 804517e16990
children e22b0213b713
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
29 /* This file Mule-ized by Ben Wing, 7-10-00. */ 29 /* This file Mule-ized by Ben Wing, 7-10-00. */
30 30
31 #include <config.h> 31 #include <config.h>
32 #include "lisp.h" 32 #include "lisp.h"
33 33
34 #include "console-x.h"
35 #include "objects-x.h"
36
37 #include "charset.h" 34 #include "charset.h"
38 #include "device.h" 35 #include "device-impl.h"
39 #include "insdel.h" 36 #include "insdel.h"
37
38 #include "console-x-impl.h"
39 #include "objects-x-impl.h"
40 40
41 int x_handle_non_fully_specified_fonts; 41 int x_handle_non_fully_specified_fonts;
42 42
43 43
44 /************************************************************************/ 44 /************************************************************************/
388 } 388 }
389 389
390 /* Don't allocate the data until we're sure that we will succeed, 390 /* Don't allocate the data until we're sure that we will succeed,
391 or the finalize method may get fucked. */ 391 or the finalize method may get fucked. */
392 f->data = xnew (struct x_font_instance_data); 392 f->data = xnew (struct x_font_instance_data);
393 FONT_INSTANCE_X_TRUENAME (f) = Qnil;
394 FONT_INSTANCE_X_FONT (f) = xf; 393 FONT_INSTANCE_X_FONT (f) = xf;
395 f->ascent = xf->ascent; 394 f->ascent = xf->ascent;
396 f->descent = xf->descent; 395 f->descent = xf->descent;
397 f->height = xf->ascent + xf->descent; 396 f->height = xf->ascent + xf->descent;
398 { 397 {
453 452
454 return 1; 453 return 1;
455 } 454 }
456 455
457 static void 456 static void
458 x_mark_font_instance (Lisp_Font_Instance *f)
459 {
460 mark_object (FONT_INSTANCE_X_TRUENAME (f));
461 }
462
463 static void
464 x_print_font_instance (Lisp_Font_Instance *f, 457 x_print_font_instance (Lisp_Font_Instance *f,
465 Lisp_Object printcharfun, 458 Lisp_Object printcharfun,
466 int escapeflag) 459 int escapeflag)
467 { 460 {
468 write_fmt_string (printcharfun, " 0x%lx", 461 write_fmt_string (printcharfun, " 0x%lx",
773 static Lisp_Object 766 static Lisp_Object
774 x_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb) 767 x_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb)
775 { 768 {
776 struct device *d = XDEVICE (f->device); 769 struct device *d = XDEVICE (f->device);
777 770
778 if (NILP (FONT_INSTANCE_X_TRUENAME (f))) 771 if (NILP (FONT_INSTANCE_TRUENAME (f)))
779 { 772 {
780 Display *dpy = DEVICE_X_DISPLAY (d); 773 Display *dpy = DEVICE_X_DISPLAY (d);
781 { 774 {
782 Extbyte *nameext; 775 Extbyte *nameext;
783 776
784 LISP_STRING_TO_EXTERNAL (f->name, nameext, Qx_font_name_encoding); 777 LISP_STRING_TO_EXTERNAL (f->name, nameext, Qx_font_name_encoding);
785 FONT_INSTANCE_X_TRUENAME (f) = 778 FONT_INSTANCE_TRUENAME (f) =
786 x_font_truename (dpy, nameext, FONT_INSTANCE_X_FONT (f)); 779 x_font_truename (dpy, nameext, FONT_INSTANCE_X_FONT (f));
787 } 780 }
788 if (NILP (FONT_INSTANCE_X_TRUENAME (f))) 781 if (NILP (FONT_INSTANCE_TRUENAME (f)))
789 { 782 {
790 Lisp_Object font_instance = wrap_font_instance (f); 783 Lisp_Object font_instance = wrap_font_instance (f);
791 784
792 785
793 maybe_signal_error (Qgui_error, "Couldn't determine font truename", 786 maybe_signal_error (Qgui_error, "Couldn't determine font truename",
795 /* Ok, just this once, return the font name as the truename. 788 /* Ok, just this once, return the font name as the truename.
796 (This is only used by Fequal() right now.) */ 789 (This is only used by Fequal() right now.) */
797 return f->name; 790 return f->name;
798 } 791 }
799 } 792 }
800 return FONT_INSTANCE_X_TRUENAME (f); 793 return FONT_INSTANCE_TRUENAME (f);
801 } 794 }
802 795
803 static Lisp_Object 796 static Lisp_Object
804 x_font_instance_properties (Lisp_Font_Instance *f) 797 x_font_instance_properties (Lisp_Font_Instance *f)
805 { 798 {
882 #ifdef MULE 875 #ifdef MULE
883 876
884 static int 877 static int
885 x_font_spec_matches_charset (struct device *d, Lisp_Object charset, 878 x_font_spec_matches_charset (struct device *d, Lisp_Object charset,
886 const Ibyte *nonreloc, Lisp_Object reloc, 879 const Ibyte *nonreloc, Lisp_Object reloc,
887 Bytecount offset, Bytecount length) 880 Bytecount offset, Bytecount length,
888 { 881 int stage)
882 {
883 if (stage)
884 return 0;
885
889 if (UNBOUNDP (charset)) 886 if (UNBOUNDP (charset))
890 return 1; 887 return 1;
891 /* Hack! Short font names don't have the registry in them, 888 /* Hack! Short font names don't have the registry in them,
892 so we just assume the user knows what they're doing in the 889 so we just assume the user knows what they're doing in the
893 case of ASCII. For other charsets, you gotta give the 890 case of ASCII. For other charsets, you gotta give the
931 } 928 }
932 929
933 /* find a font spec that matches font spec FONT and also matches 930 /* find a font spec that matches font spec FONT and also matches
934 (the registry of) CHARSET. */ 931 (the registry of) CHARSET. */
935 static Lisp_Object 932 static Lisp_Object
936 x_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset) 933 x_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset,
934 int stage)
937 { 935 {
938 Extbyte **names; 936 Extbyte **names;
939 int count = 0; 937 int count = 0;
940 Lisp_Object result = Qnil; 938 Lisp_Object result = Qnil;
941 const Extbyte *patternext; 939 const Extbyte *patternext;
942 int i; 940 int i;
943 941
942 if (stage)
943 return Qnil;
944
944 LISP_STRING_TO_EXTERNAL (font, patternext, Qx_font_name_encoding); 945 LISP_STRING_TO_EXTERNAL (font, patternext, Qx_font_name_encoding);
945 946
946 names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)), 947 names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
947 patternext, MAX_FONT_COUNT, &count); 948 patternext, MAX_FONT_COUNT, &count);
948 /* #### This code seems awfully bogus -- mrb */ 949 /* #### This code seems awfully bogus -- mrb */
953 954
954 TO_INTERNAL_FORMAT (C_STRING, names[i], 955 TO_INTERNAL_FORMAT (C_STRING, names[i],
955 ALLOCA, (intname, intlen), 956 ALLOCA, (intname, intlen),
956 Qx_font_name_encoding); 957 Qx_font_name_encoding);
957 if (x_font_spec_matches_charset (XDEVICE (device), charset, 958 if (x_font_spec_matches_charset (XDEVICE (device), charset,
958 intname, Qnil, 0, -1)) 959 intname, Qnil, 0, -1, 0))
959 { 960 {
960 result = make_string (intname, intlen); 961 result = make_string (intname, intlen);
961 break; 962 break;
962 } 963 }
963 } 964 }
966 XFreeFontNames (names); 967 XFreeFontNames (names);
967 968
968 /* Check for a short font name. */ 969 /* Check for a short font name. */
969 if (NILP (result) 970 if (NILP (result)
970 && x_font_spec_matches_charset (XDEVICE (device), charset, 0, 971 && x_font_spec_matches_charset (XDEVICE (device), charset, 0,
971 font, 0, -1)) 972 font, 0, -1, 0))
972 return font; 973 return font;
973 974
974 return result; 975 return result;
975 } 976 }
976 977
998 CONSOLE_HAS_METHOD (x, color_instance_hash); 999 CONSOLE_HAS_METHOD (x, color_instance_hash);
999 CONSOLE_HAS_METHOD (x, color_instance_rgb_components); 1000 CONSOLE_HAS_METHOD (x, color_instance_rgb_components);
1000 CONSOLE_HAS_METHOD (x, valid_color_name_p); 1001 CONSOLE_HAS_METHOD (x, valid_color_name_p);
1001 1002
1002 CONSOLE_HAS_METHOD (x, initialize_font_instance); 1003 CONSOLE_HAS_METHOD (x, initialize_font_instance);
1003 CONSOLE_HAS_METHOD (x, mark_font_instance);
1004 CONSOLE_HAS_METHOD (x, print_font_instance); 1004 CONSOLE_HAS_METHOD (x, print_font_instance);
1005 CONSOLE_HAS_METHOD (x, finalize_font_instance); 1005 CONSOLE_HAS_METHOD (x, finalize_font_instance);
1006 CONSOLE_HAS_METHOD (x, font_instance_truename); 1006 CONSOLE_HAS_METHOD (x, font_instance_truename);
1007 CONSOLE_HAS_METHOD (x, font_instance_properties); 1007 CONSOLE_HAS_METHOD (x, font_instance_properties);
1008 CONSOLE_HAS_METHOD (x, list_fonts); 1008 CONSOLE_HAS_METHOD (x, list_fonts);