comparison src/EmacsFrame.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 a07667553efc
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
27 you may think. */ 27 you may think. */
28 28
29 #include <config.h> 29 #include <config.h>
30 #include "lisp.h" 30 #include "lisp.h"
31 31
32 #include "device.h" 32 #include "device-impl.h"
33 #include "faces.h" 33 #include "faces.h"
34 #include "frame.h" 34 #include "frame-impl.h"
35 #include "toolbar.h" 35 #include "toolbar.h"
36 #include "window.h" 36 #include "window.h"
37 37
38 #include "console-x.h" 38 #include "console-x-impl.h"
39 #include "glyphs-x.h" 39 #include "glyphs-x.h"
40 #include "objects-x.h" 40 #include "objects-x.h"
41 41
42 #include <X11/Shell.h> 42 #include <X11/Shell.h>
43 #include "EmacsFrameP.h" 43 #include "EmacsFrameP.h"
380 ArgList argv, Cardinal *argc) 380 ArgList argv, Cardinal *argc)
381 { 381 {
382 EmacsFrame cur = (EmacsFrame) cur_widget; 382 EmacsFrame cur = (EmacsFrame) cur_widget;
383 EmacsFrame new = (EmacsFrame) new_widget; 383 EmacsFrame new = (EmacsFrame) new_widget;
384 struct frame *f = new->emacs_frame.frame; 384 struct frame *f = new->emacs_frame.frame;
385 Lisp_Object frame = wrap_frame (f);
386 in_resource_setting++; 385 in_resource_setting++;
387 /* This function does not need to do much. Pretty much everything 386 /* This function does not need to do much. Pretty much everything
388 interesting will get done in the resize method, which will 387 interesting will get done in the resize method, which will
389 (if necessary) get called by Xt when this function returns 388 (if necessary) get called by Xt when this function returns
390 (see below). 389 (see below).
418 if (cur->emacs_frame.scrollbar_width != 417 if (cur->emacs_frame.scrollbar_width !=
419 new->emacs_frame.scrollbar_width) 418 new->emacs_frame.scrollbar_width)
420 Fadd_spec_to_specifier 419 Fadd_spec_to_specifier
421 (Vscrollbar_width, 420 (Vscrollbar_width,
422 make_int (new->emacs_frame.scrollbar_width), 421 make_int (new->emacs_frame.scrollbar_width),
423 frame, Qnil, Qnil); 422 wrap_frame (f), Qnil, Qnil);
424 if (cur->emacs_frame.scrollbar_height != 423 if (cur->emacs_frame.scrollbar_height !=
425 new->emacs_frame.scrollbar_height) 424 new->emacs_frame.scrollbar_height)
426 Fadd_spec_to_specifier 425 Fadd_spec_to_specifier
427 (Vscrollbar_height, 426 (Vscrollbar_height,
428 make_int (new->emacs_frame.scrollbar_height), 427 make_int (new->emacs_frame.scrollbar_height),
429 frame, Qnil, Qnil); 428 wrap_frame (f), Qnil, Qnil);
430 #endif /* HAVE_SCROLLBARS */ 429 #endif /* HAVE_SCROLLBARS */
431 #ifdef HAVE_TOOLBARS 430 #ifdef HAVE_TOOLBARS
432 if (cur->emacs_frame.top_toolbar_height != 431 if (cur->emacs_frame.top_toolbar_height !=
433 new->emacs_frame.top_toolbar_height) 432 new->emacs_frame.top_toolbar_height)
434 Fadd_spec_to_specifier 433 Fadd_spec_to_specifier
435 (Vtoolbar_size[TOP_TOOLBAR], 434 (Vtoolbar_size[TOP_TOOLBAR],
436 make_int (new->emacs_frame.top_toolbar_height), 435 make_int (new->emacs_frame.top_toolbar_height),
437 frame, Qnil, Qnil); 436 wrap_frame (f), Qnil, Qnil);
438 if (cur->emacs_frame.bottom_toolbar_height != 437 if (cur->emacs_frame.bottom_toolbar_height !=
439 new->emacs_frame.bottom_toolbar_height) 438 new->emacs_frame.bottom_toolbar_height)
440 Fadd_spec_to_specifier 439 Fadd_spec_to_specifier
441 (Vtoolbar_size[BOTTOM_TOOLBAR], 440 (Vtoolbar_size[BOTTOM_TOOLBAR],
442 make_int (new->emacs_frame.bottom_toolbar_height), 441 make_int (new->emacs_frame.bottom_toolbar_height),
443 frame, Qnil, Qnil); 442 wrap_frame (f), Qnil, Qnil);
444 if (cur->emacs_frame.left_toolbar_width != 443 if (cur->emacs_frame.left_toolbar_width !=
445 new->emacs_frame.left_toolbar_width) 444 new->emacs_frame.left_toolbar_width)
446 Fadd_spec_to_specifier 445 Fadd_spec_to_specifier
447 (Vtoolbar_size[LEFT_TOOLBAR], 446 (Vtoolbar_size[LEFT_TOOLBAR],
448 make_int (new->emacs_frame.left_toolbar_width), 447 make_int (new->emacs_frame.left_toolbar_width),
449 frame, Qnil, Qnil); 448 wrap_frame (f), Qnil, Qnil);
450 if (cur->emacs_frame.right_toolbar_width != 449 if (cur->emacs_frame.right_toolbar_width !=
451 new->emacs_frame.right_toolbar_width) 450 new->emacs_frame.right_toolbar_width)
452 Fadd_spec_to_specifier 451 Fadd_spec_to_specifier
453 (Vtoolbar_size[RIGHT_TOOLBAR], 452 (Vtoolbar_size[RIGHT_TOOLBAR],
454 make_int (new->emacs_frame.right_toolbar_width), 453 make_int (new->emacs_frame.right_toolbar_width),
455 frame, Qnil, Qnil); 454 wrap_frame (f), Qnil, Qnil);
456 if (cur->emacs_frame.top_toolbar_border_width != 455 if (cur->emacs_frame.top_toolbar_border_width !=
457 new->emacs_frame.top_toolbar_border_width) 456 new->emacs_frame.top_toolbar_border_width)
458 Fadd_spec_to_specifier 457 Fadd_spec_to_specifier
459 (Vtoolbar_border_width[TOP_TOOLBAR], 458 (Vtoolbar_border_width[TOP_TOOLBAR],
460 make_int (new->emacs_frame.top_toolbar_border_width), 459 make_int (new->emacs_frame.top_toolbar_border_width),
461 frame, Qnil, Qnil); 460 wrap_frame (f), Qnil, Qnil);
462 if (cur->emacs_frame.bottom_toolbar_border_width != 461 if (cur->emacs_frame.bottom_toolbar_border_width !=
463 new->emacs_frame.bottom_toolbar_border_width) 462 new->emacs_frame.bottom_toolbar_border_width)
464 Fadd_spec_to_specifier 463 Fadd_spec_to_specifier
465 (Vtoolbar_border_width[BOTTOM_TOOLBAR], 464 (Vtoolbar_border_width[BOTTOM_TOOLBAR],
466 make_int (new->emacs_frame.bottom_toolbar_border_width), 465 make_int (new->emacs_frame.bottom_toolbar_border_width),
467 frame, Qnil, Qnil); 466 wrap_frame (f), Qnil, Qnil);
468 if (cur->emacs_frame.left_toolbar_border_width != 467 if (cur->emacs_frame.left_toolbar_border_width !=
469 new->emacs_frame.left_toolbar_border_width) 468 new->emacs_frame.left_toolbar_border_width)
470 Fadd_spec_to_specifier 469 Fadd_spec_to_specifier
471 (Vtoolbar_border_width[LEFT_TOOLBAR], 470 (Vtoolbar_border_width[LEFT_TOOLBAR],
472 make_int (new->emacs_frame.left_toolbar_border_width), 471 make_int (new->emacs_frame.left_toolbar_border_width),
473 frame, Qnil, Qnil); 472 wrap_frame (f), Qnil, Qnil);
474 if (cur->emacs_frame.right_toolbar_border_width != 473 if (cur->emacs_frame.right_toolbar_border_width !=
475 new->emacs_frame.right_toolbar_border_width) 474 new->emacs_frame.right_toolbar_border_width)
476 Fadd_spec_to_specifier 475 Fadd_spec_to_specifier
477 (Vtoolbar_border_width[RIGHT_TOOLBAR], 476 (Vtoolbar_border_width[RIGHT_TOOLBAR],
478 make_int (new->emacs_frame.right_toolbar_border_width), 477 make_int (new->emacs_frame.right_toolbar_border_width),
479 frame, Qnil, Qnil); 478 wrap_frame (f), Qnil, Qnil);
480 #endif /* HAVE_TOOLBARS */ 479 #endif /* HAVE_TOOLBARS */
481 480
482 in_resource_setting--; 481 in_resource_setting--;
483 482
484 /* If the request was to resize us, but the size has not changed, Xt 483 /* If the request was to resize us, but the size has not changed, Xt