comparison src/objects-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 804517e16990
children c1a972caf831
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
1 /* X-specific Lisp objects. 1 /* X-specific Lisp objects.
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995 Tinker Systems. 4 Copyright (C) 1995 Tinker Systems.
5 Copyright (C) 1995, 1996 Ben Wing. 5 Copyright (C) 1995, 1996, 2002 Ben Wing.
6 Copyright (C) 1995 Sun Microsystems, Inc. 6 Copyright (C) 1995 Sun Microsystems, Inc.
7 7
8 This file is part of XEmacs. 8 This file is part of XEmacs.
9 9
10 XEmacs is free software; you can redistribute it and/or modify it 10 XEmacs is free software; you can redistribute it and/or modify it
28 /* Gtk version by William Perry */ 28 /* Gtk version by William Perry */
29 29
30 #include <config.h> 30 #include <config.h>
31 #include "lisp.h" 31 #include "lisp.h"
32 32
33 #include "console-gtk.h"
34 #include "objects-gtk.h"
35
36 #include "buffer.h" 33 #include "buffer.h"
37 #include "device.h" 34 #include "device-impl.h"
38 #include "insdel.h" 35 #include "insdel.h"
36
37 #include "console-gtk-impl.h"
38 #include "objects-gtk-impl.h"
39 39
40 /* sigh */ 40 /* sigh */
41 #include <gdk/gdkx.h> 41 #include <gdk/gdkx.h>
42 42
43 43
233 xf = GDK_FONT_XFONT (gf); 233 xf = GDK_FONT_XFONT (gf);
234 234
235 /* Don't allocate the data until we're sure that we will succeed, 235 /* Don't allocate the data until we're sure that we will succeed,
236 or the finalize method may get fucked. */ 236 or the finalize method may get fucked. */
237 f->data = xnew (struct gtk_font_instance_data); 237 f->data = xnew (struct gtk_font_instance_data);
238 FONT_INSTANCE_GTK_TRUENAME (f) = Qnil;
239 FONT_INSTANCE_GTK_FONT (f) = gf; 238 FONT_INSTANCE_GTK_FONT (f) = gf;
240 f->ascent = gf->ascent; 239 f->ascent = gf->ascent;
241 f->descent = gf->descent; 240 f->descent = gf->descent;
242 f->height = gf->ascent + gf->descent; 241 f->height = gf->ascent + gf->descent;
243 242
304 #endif 303 #endif
305 return 1; 304 return 1;
306 } 305 }
307 306
308 static void 307 static void
309 gtk_mark_font_instance (struct Lisp_Font_Instance *f)
310 {
311 mark_object (FONT_INSTANCE_GTK_TRUENAME (f));
312 }
313
314 static void
315 gtk_print_font_instance (struct Lisp_Font_Instance *f, 308 gtk_print_font_instance (struct Lisp_Font_Instance *f,
316 Lisp_Object printcharfun, 309 Lisp_Object printcharfun,
317 int escapeflag) 310 int escapeflag)
318 { 311 {
319 write_fmt_string (printcharfun, " 0x%lx", 312 write_fmt_string (printcharfun, " 0x%lx",
339 static Lisp_Object __gtk_list_fonts_internal (const char *pattern); 332 static Lisp_Object __gtk_list_fonts_internal (const char *pattern);
340 333
341 static Lisp_Object 334 static Lisp_Object
342 gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_Behavior errb) 335 gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_Behavior errb)
343 { 336 {
344 if (NILP (FONT_INSTANCE_GTK_TRUENAME (f))) 337 if (NILP (FONT_INSTANCE_TRUENAME (f)))
345 { 338 {
346 FONT_INSTANCE_GTK_TRUENAME (f) = __get_gtk_font_truename (FONT_INSTANCE_GTK_FONT (f), 1); 339 FONT_INSTANCE_TRUENAME (f) = __get_gtk_font_truename (FONT_INSTANCE_GTK_FONT (f), 1);
347 340
348 if (NILP (FONT_INSTANCE_GTK_TRUENAME (f))) 341 if (NILP (FONT_INSTANCE_TRUENAME (f)))
349 { 342 {
350 /* Ok, just this once, return the font name as the truename. 343 /* Ok, just this once, return the font name as the truename.
351 (This is only used by Fequal() right now.) */ 344 (This is only used by Fequal() right now.) */
352 return f->name; 345 return f->name;
353 } 346 }
354 } 347 }
355 return (FONT_INSTANCE_GTK_TRUENAME (f)); 348 return (FONT_INSTANCE_TRUENAME (f));
356 } 349 }
357 350
358 static Lisp_Object 351 static Lisp_Object
359 gtk_font_instance_properties (struct Lisp_Font_Instance *f) 352 gtk_font_instance_properties (struct Lisp_Font_Instance *f)
360 { 353 {
378 #ifdef MULE 371 #ifdef MULE
379 372
380 static int 373 static int
381 gtk_font_spec_matches_charset (struct device *d, Lisp_Object charset, 374 gtk_font_spec_matches_charset (struct device *d, Lisp_Object charset,
382 const Ibyte *nonreloc, Lisp_Object reloc, 375 const Ibyte *nonreloc, Lisp_Object reloc,
383 Bytecount offset, Bytecount length) 376 Bytecount offset, Bytecount length,
384 { 377 int stage)
378 {
379 if (stage)
380 return 0;
381
385 if (UNBOUNDP (charset)) 382 if (UNBOUNDP (charset))
386 return 1; 383 return 1;
387 /* Hack! Short font names don't have the registry in them, 384 /* Hack! Short font names don't have the registry in them,
388 so we just assume the user knows what they're doing in the 385 so we just assume the user knows what they're doing in the
389 case of ASCII. For other charsets, you gotta give the 386 case of ASCII. For other charsets, you gotta give the
454 CONSOLE_HAS_METHOD (gtk, color_instance_hash); 451 CONSOLE_HAS_METHOD (gtk, color_instance_hash);
455 CONSOLE_HAS_METHOD (gtk, color_instance_rgb_components); 452 CONSOLE_HAS_METHOD (gtk, color_instance_rgb_components);
456 CONSOLE_HAS_METHOD (gtk, valid_color_name_p); 453 CONSOLE_HAS_METHOD (gtk, valid_color_name_p);
457 454
458 CONSOLE_HAS_METHOD (gtk, initialize_font_instance); 455 CONSOLE_HAS_METHOD (gtk, initialize_font_instance);
459 CONSOLE_HAS_METHOD (gtk, mark_font_instance);
460 CONSOLE_HAS_METHOD (gtk, print_font_instance); 456 CONSOLE_HAS_METHOD (gtk, print_font_instance);
461 CONSOLE_HAS_METHOD (gtk, finalize_font_instance); 457 CONSOLE_HAS_METHOD (gtk, finalize_font_instance);
462 CONSOLE_HAS_METHOD (gtk, font_instance_truename); 458 CONSOLE_HAS_METHOD (gtk, font_instance_truename);
463 CONSOLE_HAS_METHOD (gtk, font_instance_properties); 459 CONSOLE_HAS_METHOD (gtk, font_instance_properties);
464 CONSOLE_HAS_METHOD (gtk, list_fonts); 460 CONSOLE_HAS_METHOD (gtk, list_fonts);
482 478
483 #ifdef MULE 479 #ifdef MULE
484 /* find a font spec that matches font spec FONT and also matches 480 /* find a font spec that matches font spec FONT and also matches
485 (the registry of) CHARSET. */ 481 (the registry of) CHARSET. */
486 static Lisp_Object 482 static Lisp_Object
487 gtk_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset) 483 gtk_find_charset_font (Lisp_Object device, Lisp_Object font,
484 Lisp_Object charset, int stage)
488 { 485 {
489 char **names; 486 char **names;
490 int count = 0; 487 int count = 0;
491 Lisp_Object result = Qnil; 488 Lisp_Object result = Qnil;
492 const char *patternext; 489 const char *patternext;
493 int i; 490 int i;
494 491
492 if (stage)
493 return Qnil;
494
495 TO_EXTERNAL_FORMAT (LISP_STRING, font, C_STRING_ALLOCA, patternext, Qbinary); 495 TO_EXTERNAL_FORMAT (LISP_STRING, font, C_STRING_ALLOCA, patternext, Qbinary);
496 496
497 names = XListFonts (GDK_DISPLAY (), 497 names = XListFonts (GDK_DISPLAY (),
498 patternext, MAX_FONT_COUNT, &count); 498 patternext, MAX_FONT_COUNT, &count);
499 /* #### This code seems awfully bogus -- mrb */ 499 /* #### This code seems awfully bogus -- mrb */
503 Bytecount intlen; 503 Bytecount intlen;
504 504
505 TO_INTERNAL_FORMAT (C_STRING, names[i], ALLOCA, (intname, intlen), 505 TO_INTERNAL_FORMAT (C_STRING, names[i], ALLOCA, (intname, intlen),
506 Qctext); 506 Qctext);
507 if (gtk_font_spec_matches_charset (XDEVICE (device), charset, 507 if (gtk_font_spec_matches_charset (XDEVICE (device), charset,
508 intname, Qnil, 0, -1)) 508 intname, Qnil, 0, -1, 0))
509 { 509 {
510 result = make_string ((char *) intname, intlen); 510 result = make_string ((char *) intname, intlen);
511 break; 511 break;
512 } 512 }
513 } 513 }
516 XFreeFontNames (names); 516 XFreeFontNames (names);
517 517
518 /* Check for a short font name. */ 518 /* Check for a short font name. */
519 if (NILP (result) 519 if (NILP (result)
520 && gtk_font_spec_matches_charset (XDEVICE (device), charset, 0, 520 && gtk_font_spec_matches_charset (XDEVICE (device), charset, 0,
521 font, 0, -1)) 521 font, 0, -1, 0))
522 return font; 522 return font;
523 523
524 return result; 524 return result;
525 } 525 }
526 #endif /* MULE */ 526 #endif /* MULE */