comparison src/objects.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 d4ba25667ff4
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
24 24
25 #include <config.h> 25 #include <config.h>
26 #include "lisp.h" 26 #include "lisp.h"
27 27
28 #include "buffer.h" 28 #include "buffer.h"
29 #include "device.h" 29 #include "device-impl.h"
30 #include "elhash.h" 30 #include "elhash.h"
31 #include "faces.h" 31 #include "faces.h"
32 #include "frame.h" 32 #include "frame.h"
33 #include "glyphs.h" 33 #include "glyphs.h"
34 #include "objects.h" 34 #include "objects-impl.h"
35 #include "specifier.h" 35 #include "specifier.h"
36 #include "window.h" 36 #include "window.h"
37 37
38 /* Objects that are substituted when an instantiation fails. 38 /* Objects that are substituted when an instantiation fails.
39 If we leave in the Qunbound value, we will probably get crashes. */ 39 If we leave in the Qunbound value, we will probably get crashes. */
236 mark_font_instance (Lisp_Object obj) 236 mark_font_instance (Lisp_Object obj)
237 { 237 {
238 Lisp_Font_Instance *f = XFONT_INSTANCE (obj); 238 Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
239 239
240 mark_object (f->name); 240 mark_object (f->name);
241 mark_object (f->truename);
241 if (!NILP (f->device)) /* Vthe_null_font_instance */ 242 if (!NILP (f->device)) /* Vthe_null_font_instance */
242 MAYBE_DEVMETH (XDEVICE (f->device), mark_font_instance, (f)); 243 MAYBE_DEVMETH (XDEVICE (f->device), mark_font_instance, (f));
243 244
244 return f->device; 245 return f->device;
245 } 246 }
323 324
324 device = wrap_device (decode_device (device)); 325 device = wrap_device (decode_device (device));
325 326
326 f = alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance); 327 f = alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
327 f->name = name; 328 f->name = name;
329 f->truename = Qnil;
328 f->device = device; 330 f->device = device;
329 331
330 f->data = 0; 332 f->data = 0;
331 333
332 /* Stick some default values here ... */ 334 /* Stick some default values here ... */
663 /* No equal or hash methods; ignore the face the font is based off 665 /* No equal or hash methods; ignore the face the font is based off
664 of for `equal' */ 666 of for `equal' */
665 667
666 #ifdef MULE 668 #ifdef MULE
667 669
668 int 670 /* Given a truename font spec (i.e. the font spec should have its registry
671 field filled in), does it support displaying characters from CHARSET? */
672
673 static int
669 font_spec_matches_charset (struct device *d, Lisp_Object charset, 674 font_spec_matches_charset (struct device *d, Lisp_Object charset,
670 const Ibyte *nonreloc, Lisp_Object reloc, 675 const Ibyte *nonreloc, Lisp_Object reloc,
671 Bytecount offset, Bytecount length) 676 Bytecount offset, Bytecount length,
677 int stage)
672 { 678 {
673 return DEVMETH_OR_GIVEN (d, font_spec_matches_charset, 679 return DEVMETH_OR_GIVEN (d, font_spec_matches_charset,
674 (d, charset, nonreloc, reloc, offset, length), 680 (d, charset, nonreloc, reloc, offset, length,
681 stage),
675 1); 682 1);
676 } 683 }
677 684
678 static void 685 static void
679 font_validate_matchspec (Lisp_Object matchspec) 686 font_validate_matchspec (Lisp_Object matchspec)
680 { 687 {
681 Fget_charset (matchspec); 688 CHECK_CONS (matchspec);
689 Fget_charset (XCAR (matchspec));
682 } 690 }
683 691
684 #endif /* MULE */ 692 #endif /* MULE */
685 693
694 void
695 initialize_charset_font_caches (struct device *d)
696 {
697 /* Note that the following tables are bi-level. */
698 d->charset_font_cache_stage_1 =
699 make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
700 d->charset_font_cache_stage_2 =
701 make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
702 }
703
704 void
705 invalidate_charset_font_caches (Lisp_Object charset)
706 {
707 /* Invalidate font cache entries for charset on all devices. */
708 Lisp_Object devcons, concons, hash_table;
709 DEVICE_LOOP_NO_BREAK (devcons, concons)
710 {
711 struct device *d = XDEVICE (XCAR (devcons));
712 hash_table = Fgethash (charset, d->charset_font_cache_stage_1,
713 Qunbound);
714 if (!UNBOUNDP (hash_table))
715 Fclrhash (hash_table);
716 hash_table = Fgethash (charset, d->charset_font_cache_stage_2,
717 Qunbound);
718 if (!UNBOUNDP (hash_table))
719 Fclrhash (hash_table);
720 }
721 }
686 722
687 static Lisp_Object 723 static Lisp_Object
688 font_instantiate (Lisp_Object specifier, Lisp_Object matchspec, 724 font_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
689 Lisp_Object domain, Lisp_Object instantiator, 725 Lisp_Object domain, Lisp_Object instantiator,
690 Lisp_Object depth) 726 Lisp_Object depth)
692 /* When called, we're inside of call_with_suspended_errors(), 728 /* When called, we're inside of call_with_suspended_errors(),
693 so we can freely error. */ 729 so we can freely error. */
694 Lisp_Object device = DOMAIN_DEVICE (domain); 730 Lisp_Object device = DOMAIN_DEVICE (domain);
695 struct device *d = XDEVICE (device); 731 struct device *d = XDEVICE (device);
696 Lisp_Object instance; 732 Lisp_Object instance;
733 Lisp_Object charset = Qnil;
734 int stage = 0;
697 735
698 #ifdef MULE 736 #ifdef MULE
699 if (!UNBOUNDP (matchspec)) 737 if (!UNBOUNDP (matchspec))
700 matchspec = Fget_charset (matchspec); 738 {
739 charset = Fget_charset (XCAR (matchspec));
740 stage = NILP (XCDR (matchspec)) ? 0 : 1;
741 }
701 #endif 742 #endif
702 743
703 if (FONT_INSTANCEP (instantiator)) 744 if (FONT_INSTANCEP (instantiator))
704 { 745 {
705 if (NILP (device) 746 if (NILP (device)
706 || EQ (device, XFONT_INSTANCE (instantiator)->device)) 747 || EQ (device, XFONT_INSTANCE (instantiator)->device))
707 { 748 {
708 #ifdef MULE 749 #ifdef MULE
709 if (font_spec_matches_charset (d, matchspec, 0, 750 if (font_spec_matches_charset (d, charset, 0,
710 Ffont_instance_truename 751 Ffont_instance_truename
711 (instantiator), 752 (instantiator),
712 0, -1)) 753 0, -1, stage))
713 return instantiator; 754 return instantiator;
714 #else 755 #else
715 return instantiator; 756 return instantiator;
716 #endif 757 #endif
717 } 758 }
718 instantiator = Ffont_instance_name (instantiator); 759 instantiator = Ffont_instance_name (instantiator);
719 } 760 }
720 761
721 if (STRINGP (instantiator)) 762 if (STRINGP (instantiator))
722 { 763 {
764 Lisp_Object cache = stage ? d->charset_font_cache_stage_2 :
765 d->charset_font_cache_stage_1;
766
723 #ifdef MULE 767 #ifdef MULE
724 if (!UNBOUNDP (matchspec)) 768 if (!NILP (charset))
725 { 769 {
726 /* The instantiator is a font spec that could match many 770 /* The instantiator is a font spec that could match many
727 different fonts. We need to find one of those fonts 771 different fonts. We need to find one of those fonts
728 whose registry matches the registry of the charset in 772 whose registry matches the registry of the charset in
729 MATCHSPEC. This is potentially a very slow operation, 773 MATCHSPEC. This is potentially a very slow operation,
730 as it involves doing an XListFonts() or equivalent to 774 as it involves doing an XListFonts() or equivalent to
731 iterate over all possible fonts, and a regexp match 775 iterate over all possible fonts, and a regexp match
732 on each one. So we cache the results. */ 776 on each one. So we cache the results. */
733 Lisp_Object matching_font = Qunbound; 777 Lisp_Object matching_font = Qunbound;
734 Lisp_Object hash_table = Fgethash (matchspec, d->charset_font_cache, 778 Lisp_Object hash_table = Fgethash (charset, cache, Qunbound);
735 Qunbound);
736 if (UNBOUNDP (hash_table)) 779 if (UNBOUNDP (hash_table))
737 { 780 {
738 /* need to make a sub hash table. */ 781 /* need to make a sub hash table. */
739 hash_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, 782 hash_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK,
740 HASH_TABLE_EQUAL); 783 HASH_TABLE_EQUAL);
741 Fputhash (matchspec, hash_table, d->charset_font_cache); 784 Fputhash (charset, hash_table, cache);
742 } 785 }
743 else 786 else
744 matching_font = Fgethash (instantiator, hash_table, Qunbound); 787 matching_font = Fgethash (instantiator, hash_table, Qunbound);
745 788
746 if (UNBOUNDP (matching_font)) 789 if (UNBOUNDP (matching_font))
747 { 790 {
748 /* make sure we cache the failures, too. */ 791 /* make sure we cache the failures, too. */
749 matching_font = 792 matching_font =
750 DEVMETH_OR_GIVEN (d, find_charset_font, 793 DEVMETH_OR_GIVEN (d, find_charset_font,
751 (device, instantiator, matchspec), 794 (device, instantiator, charset, stage),
752 instantiator); 795 instantiator);
753 Fputhash (instantiator, matching_font, hash_table); 796 Fputhash (instantiator, matching_font, hash_table);
754 } 797 }
755 if (NILP (matching_font)) 798 if (NILP (matching_font))
756 return Qunbound; 799 return Qunbound;
757 instantiator = matching_font; 800 instantiator = matching_font;
758 } 801 }
759 #endif /* MULE */ 802 #endif /* MULE */
760 803
761 /* First, look to see if we can retrieve a cached value. */ 804 /* First, look to see if we can retrieve a cached value. */
762 instance = Fgethash (instantiator, d->font_instance_cache, Qunbound); 805 instance = Fgethash (instantiator, cache, Qunbound);
763 /* Otherwise, make a new one. */ 806 /* Otherwise, make a new one. */
764 if (UNBOUNDP (instance)) 807 if (UNBOUNDP (instance))
765 { 808 {
766 /* make sure we cache the failures, too. */ 809 /* make sure we cache the failures, too. */
767 instance = Fmake_font_instance (instantiator, device, Qt); 810 instance = Fmake_font_instance (instantiator, device, Qt);
768 Fputhash (instantiator, instance, d->font_instance_cache); 811 Fputhash (instantiator, instance, cache);
769 } 812 }
770 813
771 return NILP (instance) ? Qunbound : instance; 814 return NILP (instance) ? Qunbound : instance;
772 } 815 }
773 else if (VECTORP (instantiator)) 816 else if (VECTORP (instantiator))
774 { 817 {
775 assert (XVECTOR_LENGTH (instantiator) == 1); 818 assert (XVECTOR_LENGTH (instantiator) == 1);
776 return (face_property_matching_instance 819 return (face_property_matching_instance
777 (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont, 820 (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont,
778 matchspec, domain, ERROR_ME, 0, depth)); 821 charset, domain, ERROR_ME, 0, depth));
779 } 822 }
780 else if (NILP (instantiator)) 823 else if (NILP (instantiator))
781 return Qunbound; 824 return Qunbound;
782 else 825 else
783 abort (); /* Eh? */ 826 abort (); /* Eh? */
1092 staticpro_nodump (&Vthe_null_font_instance); 1135 staticpro_nodump (&Vthe_null_font_instance);
1093 { 1136 {
1094 Lisp_Font_Instance *f = 1137 Lisp_Font_Instance *f =
1095 alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance); 1138 alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
1096 f->name = Qnil; 1139 f->name = Qnil;
1140 f->truename = Qnil;
1097 f->device = Qnil; 1141 f->device = Qnil;
1098 f->data = 0; 1142 f->data = 0;
1099 1143
1100 f->ascent = f->height = 0; 1144 f->ascent = f->height = 0;
1101 f->descent = 0; 1145 f->descent = 0;