Mercurial > hg > xemacs-beta
comparison src/console-gtk-impl.h @ 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 | |
children | e22b0213b713 |
comparison
equal
deleted
inserted
replaced
871:732270854293 | 872:79c6ff3eef26 |
---|---|
1 /* Define X specific console, device, and frame object for XEmacs. | |
2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. | |
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
4 Copyright (C) 2002 Ben Wing. | |
5 | |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
25 | |
26 /* Authorship: | |
27 | |
28 Ultimately based on FSF, then later on JWZ work for Lemacs. | |
29 Rewritten over time by Ben Wing and Chuck Thompson (original | |
30 multi-device work by Chuck Thompson). | |
31 */ | |
32 | |
33 #ifndef INCLUDED_console_gtk_impl_h_ | |
34 #define INCLUDED_console_gtk_impl_h_ | |
35 | |
36 #ifdef HAVE_GTK | |
37 | |
38 #include "console-impl.h" | |
39 #include "console-gtk.h" | |
40 | |
41 #define GDK_DRAWABLE(x) (GdkDrawable *) (x) | |
42 #define GET_GTK_WIDGET_WINDOW(x) (GTK_WIDGET (x)->window) | |
43 #define GET_GTK_WIDGET_PARENT(x) (GTK_WIDGET (x)->parent) | |
44 | |
45 DECLARE_CONSOLE_TYPE (gtk); | |
46 | |
47 struct gtk_device | |
48 { | |
49 /* Gtk application info. */ | |
50 GtkWidget *gtk_app_shell; | |
51 | |
52 /* Cache of GC's for frame's on this device. */ | |
53 struct gc_cache *gc_cache; | |
54 | |
55 /* Selected visual, depth and colormap for this device */ | |
56 GdkVisual *visual; | |
57 int depth; | |
58 GdkColormap *device_cmap; | |
59 | |
60 /* Used by x_bevel_modeline in redisplay-x.c */ | |
61 GdkBitmap *gray_pixmap; | |
62 | |
63 /* frame that holds the WM_COMMAND property; there should be exactly | |
64 one of these per device. */ | |
65 Lisp_Object WM_COMMAND_frame; | |
66 | |
67 /* The following items are all used exclusively in event-gtk.c. */ | |
68 int MetaMask, HyperMask, SuperMask, AltMask, ModeMask; | |
69 guint lock_interpretation; | |
70 | |
71 void *x_modifier_keymap; /* Really an (XModifierKeymap *)*/ | |
72 | |
73 guint *x_keysym_map; | |
74 int x_keysym_map_min_code; | |
75 int x_keysym_map_max_code; | |
76 int x_keysym_map_keysyms_per_code; | |
77 Lisp_Object x_keysym_map_hashtable; | |
78 | |
79 /* #### It's not clear that there is much distinction anymore | |
80 between mouse_timestamp and global_mouse_timestamp, now that | |
81 Emacs doesn't see most (all?) events not destined for it. */ | |
82 | |
83 /* The timestamp of the last button or key event used by emacs itself. | |
84 This is used for asserting selections and input focus. */ | |
85 guint32 mouse_timestamp; | |
86 | |
87 /* This is the timestamp the last button or key event whether it was | |
88 dispatched to emacs or widgets. */ | |
89 guint32 global_mouse_timestamp; | |
90 | |
91 /* This is the last known timestamp received from the server. It is | |
92 maintained by x_event_to_emacs_event and used to patch bogus | |
93 WM_TAKE_FOCUS messages sent by Mwm. */ | |
94 guint32 last_server_timestamp; | |
95 | |
96 GdkAtom atom_WM_PROTOCOLS; | |
97 GdkAtom atom_WM_TAKE_FOCUS; | |
98 GdkAtom atom_WM_STATE; | |
99 | |
100 #if 0 | |
101 /* #### BILL!!! */ | |
102 /* stuff for sticky modifiers: */ | |
103 unsigned int need_to_add_mask, down_mask; | |
104 KeyCode last_downkey; | |
105 guint32 release_time; | |
106 #endif | |
107 }; | |
108 | |
109 #define DEVICE_GTK_DATA(d) DEVICE_TYPE_DATA (d, gtk) | |
110 | |
111 #define DEVICE_GTK_VISUAL(d) (DEVICE_GTK_DATA (d)->visual) | |
112 #define DEVICE_GTK_DEPTH(d) (DEVICE_GTK_DATA (d)->depth) | |
113 #define DEVICE_GTK_COLORMAP(d) (DEVICE_GTK_DATA (d)->device_cmap) | |
114 #define DEVICE_GTK_APP_SHELL(d) (DEVICE_GTK_DATA (d)->gtk_app_shell) | |
115 #define DEVICE_GTK_GC_CACHE(d) (DEVICE_GTK_DATA (d)->gc_cache) | |
116 #define DEVICE_GTK_GRAY_PIXMAP(d) (DEVICE_GTK_DATA (d)->gray_pixmap) | |
117 #define DEVICE_GTK_WM_COMMAND_FRAME(d) (DEVICE_GTK_DATA (d)->WM_COMMAND_frame) | |
118 #define DEVICE_GTK_MOUSE_TIMESTAMP(d) (DEVICE_GTK_DATA (d)->mouse_timestamp) | |
119 #define DEVICE_GTK_GLOBAL_MOUSE_TIMESTAMP(d) (DEVICE_GTK_DATA (d)->global_mouse_timestamp) | |
120 #define DEVICE_GTK_LAST_SERVER_TIMESTAMP(d) (DEVICE_GTK_DATA (d)->last_server_timestamp) | |
121 | |
122 /* The maximum number of widgets that can be displayed above the text | |
123 area at one time. Currently no more than 3 will ever actually be | |
124 displayed (menubar, psheet, debugger panel). */ | |
125 #define MAX_CONCURRENT_TOP_WIDGETS 8 | |
126 | |
127 struct gtk_frame | |
128 { | |
129 /* The widget of this frame. */ | |
130 GtkWidget *widget; /* This is really a GtkWindow */ | |
131 | |
132 /* The layout manager */ | |
133 GtkWidget *container; /* actually a GtkVBox. */ | |
134 | |
135 /* The widget of the menubar */ | |
136 GtkWidget *menubar_widget; | |
137 | |
138 /* The widget of the edit portion of this frame; this is a GtkDrawingArea, | |
139 and the window of this widget is what the redisplay code draws on. */ | |
140 GtkWidget *edit_widget; | |
141 | |
142 /* Lists the widgets above the text area, in the proper order. */ | |
143 GtkWidget *top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; | |
144 int num_top_widgets; | |
145 | |
146 /* Our container widget as a Lisp_Object */ | |
147 Lisp_Object lisp_visible_widgets[10]; | |
148 | |
149 /*************************** Miscellaneous **************************/ | |
150 | |
151 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */ | |
152 Lisp_Object icon_pixmap; | |
153 Lisp_Object icon_pixmap_mask; | |
154 | |
155 /* geometry string that ought to be freed. */ | |
156 char *geom_free_me_please; | |
157 | |
158 /* 1 if the frame is completely visible on the display, 0 otherwise. | |
159 if 0 the frame may have been iconified or may be totally | |
160 or partially hidden by another X window */ | |
161 unsigned int totally_visible_p :1; | |
162 | |
163 /* Is it visible at all? */ | |
164 unsigned int visible_p :1; | |
165 | |
166 /* Are we a top-level frame? This means that our shell is a | |
167 TopLevelShell, and we should do certain things to interact with | |
168 the window manager. */ | |
169 unsigned int top_level_frame_p :1; | |
170 | |
171 /* Are we iconfied right now? */ | |
172 unsigned int iconified_p :1; | |
173 | |
174 }; | |
175 | |
176 #define FRAME_GTK_DATA(f) FRAME_TYPE_DATA (f, gtk) | |
177 | |
178 #define FRAME_GTK_SHELL_WIDGET(f) (FRAME_GTK_DATA (f)->widget) | |
179 #define FRAME_GTK_CONTAINER_WIDGET(f) (FRAME_GTK_DATA (f)->container) | |
180 #define FRAME_GTK_MENUBAR_WIDGET(f) (FRAME_GTK_DATA (f)->menubar_widget) | |
181 #define FRAME_GTK_TEXT_WIDGET(f) (FRAME_GTK_DATA (f)->edit_widget) | |
182 #define FRAME_GTK_TOP_WIDGETS(f) (FRAME_GTK_DATA (f)->top_widgets) | |
183 #define FRAME_GTK_NUM_TOP_WIDGETS(f) (FRAME_GTK_DATA (f)->num_top_widgets) | |
184 #define FRAME_GTK_ICONIFIED_P(f) (FRAME_GTK_DATA (f)->iconfigied_p) | |
185 | |
186 #define FRAME_GTK_LISP_WIDGETS(f) (FRAME_GTK_DATA (f)->lisp_visible_widgets) | |
187 #define FRAME_GTK_ICON_PIXMAP(f) (FRAME_GTK_DATA (f)->icon_pixmap) | |
188 #define FRAME_GTK_ICON_PIXMAP_MASK(f) (FRAME_GTK_DATA (f)->icon_pixmap_mask) | |
189 | |
190 #define FRAME_GTK_GEOM_FREE_ME_PLEASE(f) (FRAME_GTK_DATA (f)->geom_free_me_please) | |
191 | |
192 #define FRAME_GTK_TOTALLY_VISIBLE_P(f) (FRAME_GTK_DATA (f)->totally_visible_p) | |
193 #define FRAME_GTK_VISIBLE_P(f) (FRAME_GTK_DATA (f)->visible_p) | |
194 #define FRAME_GTK_TOP_LEVEL_FRAME_P(f) (FRAME_GTK_DATA (f)->top_level_frame_p) | |
195 | |
196 extern struct console_type *gtk_console_type; | |
197 | |
198 #endif /* HAVE_GTK */ | |
199 #endif /* INCLUDED_console_gtk_impl_h_ */ |