Mercurial > hg > xemacs-beta
view src/EmacsShell-sub.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 | 8de8e3f6228a |
children | 8c5cf108f035 |
line wrap: on
line source
/* Emacs shell widget -- define the two widgets. Copyright (C) 1994, 1995 Sun Microsystems, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, May, 1994. */ /* It is rather unfortunate that we have to do this. Blame those short-sighted people who designed the monstrosities known as Xt and ICCCM. */ /* This widget is not actually Emacs-specific; perhaps there could be a better name than "EmacsShell". What it does is work around a limitation in Xt in correctly dealing with the window-manager size hints with applications that (a) dynamically change their window size (b) have a cell size (width-inc and height-inc) other than 1 and (c) cannot predict in advance exactly what size their shell will be (This is the more common situation, when you have a number of widgets, each with their own size ideas) This widget assumes that your program contains a fixed "base size" plus some number of cells (e.g. character cells). The WMShell resources "widthInc" and "heightInc" specify the size of a character cell, and the window manager will report the app's size in cells rather than in pixels. If you use this widget, do not use the WMShell resources "baseWidth", "baseHeight", "minWidth", or "minHeight". Instead, use "widthCells" and "heightCells" to specify the current size in cells (you must keep this up-to-date), and "minWidthCells" and "minHeightCells" to specify the minimum size in cells. Every time that the program issues a size command, the "baseWidth", "baseHeight", "minWidth", and "minHeight" fields of the WM_NORMAL_HINTS property will be updated to stay in line with the resource values specified above. The calculations are done once the desired shell size is known but before the window-manager size-change request is issued. (We must do it at this time because before then we don't know what size we will request, and after the request the deed has already been done.) After you change the "baseWidth", "baseHeight", "minWidth", or "minHeight" resources, you need to call EmacsShellUpdateSizeHints() to manually update the size hints, except in the following two circumstances: (a) you are about to make a geometry request. (b) you are changing only "baseWidth" and "baseHeight" from within a resize procedure. (In this case, the size hints are already correct.) */ #include <config.h> #include <stdio.h> #include <stdlib.h> #include <X11/StringDefs.h> #include "xintrinsicp.h" #include <X11/Shell.h> #include <X11/ShellP.h> #include <X11/Vendor.h> #include <X11/VendorP.h> #include "EmacsShellP.h" #if defined (DEFINE_TOP_LEVEL_EMACS_SHELL) #define EMACS_SHELL_WIDGET TopLevelEmacsShellWidget #define SUPERCLASS_WIDGET_CLASS topLevelShellWidgetClass #define SUPERCLASS_CLASS_REC topLevelShellClassRec #define EMACS_SHELL_REC TopLevelEmacsShellRec #define EMACS_SHELL_CLASS_REC topLevelEmacsShellClassRec #define EMACS_SHELL_CLASS_REC_TYPE TopLevelEmacsShellClassRec #define EMACS_SHELL_CLASS_NAME "TopLevelEmacsShell" #define EMACS_SHELL_WIDGET_CLASS topLevelEmacsShellWidgetClass #define EMACS_SHELL_UPDATE_SIZE_HINTS TopLevelEmacsShellUpdateSizeHints #elif defined (DEFINE_TRANSIENT_EMACS_SHELL) #define EMACS_SHELL_WIDGET TransientEmacsShellWidget #define SUPERCLASS_WIDGET_CLASS transientShellWidgetClass #define SUPERCLASS_CLASS_REC transientShellClassRec #define EMACS_SHELL_REC TransientEmacsShellRec #define EMACS_SHELL_CLASS_REC transientEmacsShellClassRec #define EMACS_SHELL_CLASS_REC_TYPE TransientEmacsShellClassRec #define EMACS_SHELL_CLASS_NAME "TransientEmacsShell" #define EMACS_SHELL_WIDGET_CLASS transientEmacsShellWidgetClass #define EMACS_SHELL_UPDATE_SIZE_HINTS TransientEmacsShellUpdateSizeHints #else Error. Must define either DEFINE_TOP_LEVEL_EMACS_SHELL or DEFINE_TRANSIENT_EMACS_SHELL. #endif typedef struct { XtPointer next_extension; XrmQuark record_type; long version; Cardinal record_size; } GenericClassExtRec; static XtGeometryResult RootGeometryManager (Widget gw, XtWidgetGeometry *request, XtWidgetGeometry *reply); static void ChangeManaged (Widget w); /* snarfed from Shell.c */ #define BIGSIZE ((Dimension)32767) static XtResource resources[] = { #define offset(field) XtOffset(EMACS_SHELL_WIDGET, emacs_shell.field) #define coreoffset(field) XtOffset(EMACS_SHELL_WIDGET, core.field) #ifdef LWLIB_USES_MOTIF /* *** BOGOSITY^10! *** The Motif VendorShell fucks around with the default values for X and Y, for no obvious reason. This causes Shell to indicate that the defaults of (0,0) were program-specified, instead of letting the WM do what it wants. */ { XtNx, XtCPosition, XtRPosition, sizeof (Position), coreoffset (x), XtRImmediate, (XtPointer)BIGSIZE }, { XtNy, XtCPosition, XtRPosition, sizeof (Position), coreoffset (y), XtRImmediate, (XtPointer)BIGSIZE }, #endif { XtNwidthCells, XtCWidthCells, XtRInt, sizeof (int), offset (width_cells), XtRImmediate, (XtPointer)0 }, { XtNheightCells, XtCHeightCells, XtRInt, sizeof (int), offset (height_cells), XtRImmediate, (XtPointer)0 }, { XtNminWidthCells, XtCMinWidthCells, XtRInt, sizeof (int), offset (min_width_cells), XtRImmediate, (XtPointer)0 }, { XtNminHeightCells, XtCMinHeightCells, XtRInt, sizeof (int), offset (min_height_cells), XtRImmediate, (XtPointer)0 }, }; static CompositeClassExtensionRec compositeClassExtRec = { NULL, NULLQUARK, XtCompositeExtensionVersion, sizeof (CompositeClassExtensionRec), TRUE, }; static ShellClassExtensionRec shellClassExtRec = { NULL, NULLQUARK, XtShellExtensionVersion, sizeof (ShellClassExtensionRec), RootGeometryManager }; EMACS_SHELL_CLASS_REC_TYPE EMACS_SHELL_CLASS_REC = { { /* * core_class fields */ /* superclass */ (WidgetClass) &SUPERCLASS_CLASS_REC, /* class_name */ (String) EMACS_SHELL_CLASS_NAME, /* size */ sizeof (EMACS_SHELL_REC), /* Class Initializer */ NULL, /* class_part_initialize*/ NULL, /* XtInheritClassPartInitialize, */ /* Class init'ed ? */ FALSE, /* initialize */ NULL, /* initialize_notify */ NULL, /* realize */ XtInheritRealize, /* actions */ NULL, /* num_actions */ 0, /* resources */ resources, /* resource_count */ XtNumber (resources), /* xrm_class */ NULLQUARK, /* compress_motion */ FALSE, /* compress_exposure */ TRUE, /* compress_enterleave*/ FALSE, /* visible_interest */ TRUE, /* destroy */ NULL, /* resize */ XtInheritResize, /* expose */ NULL, /* set_values */ NULL, /* XtInheritSetValues, */ /* set_values_hook */ NULL, /* set_values_almost */ XtInheritSetValuesAlmost, /* get_values_hook */ NULL, /* accept_focus */ NULL, /* intrinsics version */ XtVersion, /* callback offsets */ NULL, /* tm_table */ NULL, /* query_geometry */ NULL, /* display_accelerator*/ NULL, /* extension */ NULL },{ /* Composite */ /* geometry_manager */ XtInheritGeometryManager, /* change_managed */ ChangeManaged, /* insert_child */ XtInheritInsertChild, /* delete_child */ XtInheritDeleteChild, /* extension */ (XtPointer)&compositeClassExtRec },{ /* Shell */ /* extension */ (XtPointer)&shellClassExtRec },{ /* WMShell */ /* extension */ NULL },{ /* VendorShell */ /* extension */ NULL },{ /* TopLevelShell or TransientShell */ /* both have exactly one XtPointer here. */ /* extension */ NULL },{ /* EmacsShell */ 0 } }; WidgetClass EMACS_SHELL_WIDGET_CLASS = (WidgetClass) &EMACS_SHELL_CLASS_REC; static void update_size_hints_internal (EMACS_SHELL_WIDGET w, int width, int height) { int base_width, base_height; int cell_width, cell_height; Arg al [10]; /* time to update them thar size hints */ cell_width = w->wm.size_hints.width_inc; cell_height = w->wm.size_hints.height_inc; base_width = width - cell_width * w->emacs_shell.width_cells; base_height = height - cell_height * w->emacs_shell.height_cells; #ifdef DEBUG_GEOMETRY_MANAGEMENT /* Very useful info when debugging geometry management problems. When it's guaranteed that no more such problems exist, take this stuff out. */ printf ("update_size_hints_internal:\n"); printf (" actual pixel size: %d %d\n", width, height); printf (" cell size in pixels: %d %d\n", cell_width, cell_height); printf (" text area size in cells: %d %d\n", w->emacs_shell.width_cells, w->emacs_shell.height_cells); printf (" base size set to: %d %d\n", base_width, base_height); fflush (stdout); #endif XtSetArg(al [0], XtNbaseWidth, base_width); XtSetArg(al [1], XtNbaseHeight, base_height); XtSetArg(al [2], XtNminWidth, base_width + cell_width * w->emacs_shell.min_width_cells); XtSetArg(al [3], XtNminHeight, base_height + cell_height * w->emacs_shell.min_height_cells); XtSetValues ((Widget) w, al, 4); } static XtGeometryResult SuperClassRootGeometryManager (Widget gw, XtWidgetGeometry *request, XtWidgetGeometry *reply) { ShellWidgetClass swc = (ShellWidgetClass) SUPERCLASS_WIDGET_CLASS; ShellClassExtensionRec *scer; GenericClassExtRec *gcer; /* find the shell extension record that specifies the root geometry manager method */ for (gcer = (GenericClassExtRec *) swc->shell_class.extension; gcer; gcer = (GenericClassExtRec *) gcer->next_extension) { if (gcer->record_type == NULLQUARK) break; } if (!gcer) abort (); /* call it to actually make the geometry request */ scer = (ShellClassExtensionRec *) gcer; return (scer->root_geometry_manager)(gw, request, reply); } static XtGeometryResult RootGeometryManager (Widget gw, XtWidgetGeometry *request, XtWidgetGeometry *reply) { EMACS_SHELL_WIDGET w = (EMACS_SHELL_WIDGET) gw; /* OK since this file is not dumped */ static int reentrant = 0; XtGeometryResult result; if (reentrant) abort (); reentrant++; #ifdef DEBUG_GEOMETRY_MANAGEMENT printf ("root_geometry_manager:\n"); printf (" current shell size: %d %d\n", w->core.width, w->core.height); if (request->request_mode & CWWidth) printf ("width requested;"); if (request->request_mode & CWHeight) printf ("height requested;"); printf ("\n"); printf (" requested shell size: %d %d\n", request->width, request->height); #endif /* update the size hints */ update_size_hints_internal (w, request->request_mode & CWWidth ? request->width : w->core.width, request->request_mode & CWHeight ? request->height : w->core.height); result = SuperClassRootGeometryManager (gw, request, reply); #ifdef DEBUG_GEOMETRY_MANAGEMENT printf (" result: %s\n", result == XtGeometryYes ? "XtGeometryYes" : result == XtGeometryNo ? "XtGeometryNo" : result == XtGeometryAlmost ? "XtGeometryAlmost" : "XtGeometryDone"); if (reply->request_mode & CWWidth) printf ("width returned;"); if (reply->request_mode & CWHeight) printf ("height returned;"); printf ("\n"); printf (" resulting shell size: %d %d\n", reply->width, reply->height); printf ("----------\n"); fflush (stdout); #endif reentrant--; return result; } static void ChangeManaged (Widget wid) { EMACS_SHELL_WIDGET w = (EMACS_SHELL_WIDGET) wid; /* If not realized, then we're being called from XtRealizeWidget(). RootGeometryManager() has not yet been called, and thus our base size is incorrect. We need to set it now or the Shell will mess up geometry specifications with negative positional offsets. */ if (!XtIsRealized (wid)) { Widget child = NULL; Cardinal i; /* the managed child indicates what our size is */ for (i = 0; i < w->composite.num_children; i++) { if (XtIsManaged(w->composite.children[i])) { child = w->composite.children[i]; break; } } update_size_hints_internal (w, child->core.width, child->core.height); } /* call the real ChangeManaged */ (((ShellWidgetClass) SUPERCLASS_WIDGET_CLASS)-> composite_class.change_managed)(wid); } /******************* external entry points *********************/ void EMACS_SHELL_UPDATE_SIZE_HINTS (Widget gw) { EMACS_SHELL_WIDGET w = (EMACS_SHELL_WIDGET) gw; update_size_hints_internal (w, w->core.width, w->core.height); }