Mercurial > hg > xemacs-beta
annotate src/console-x.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 | 804517e16990 |
children | e22b0213b713 |
rev | line source |
---|---|
428 | 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. | |
793 | 4 Copyright (C) 1996, 2002 Ben Wing. |
428 | 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 | |
440 | 33 #ifndef INCLUDED_console_x_h_ |
34 #define INCLUDED_console_x_h_ | |
428 | 35 |
36 #ifdef HAVE_X_WINDOWS | |
37 | |
38 #include "console.h" | |
39 #include "xintrinsic.h" | |
40 | |
41 #include <X11/cursorfont.h> | |
42 #include <X11/keysym.h> | |
43 #include <X11/Xatom.h> | |
44 #include <X11/StringDefs.h> | |
45 | |
46 #ifdef HAVE_XPM | |
47 #include <X11/xpm.h> | |
48 #endif | |
49 | |
50 /* R5 defines the XPointer type, but R4 doesn't. | |
51 R4 also doesn't define a version number, but R5 does. */ | |
52 #if (XlibSpecificationRelease < 5) | |
53 # define XPointer char * | |
54 #endif | |
55 | |
56 #define Xt_SET_VALUE(widget, resource, value) do { \ | |
57 Arg al; \ | |
58 XtSetArg (al, resource, value); \ | |
59 XtSetValues (widget, &al, 1); \ | |
60 } while (0) | |
61 | |
62 #define Xt_GET_VALUE(widget, resource, location) do { \ | |
63 Arg al; \ | |
64 XtSetArg (al, resource, location); \ | |
65 XtGetValues (widget, &al, 1); \ | |
66 } while (0) | |
67 | |
68 /* Variables associated with the X display frame this emacs is using. */ | |
69 extern XtAppContext Xt_app_con; | |
70 | |
71 extern Lisp_Object Vx_gc_pointer_shape; | |
72 extern Lisp_Object Vx_scrollbar_pointer_shape; | |
73 extern Lisp_Object Qx_error; | |
74 | |
75 /* Number of pixels below each line. */ | |
76 extern int x_interline_space; /* #### implement me */ | |
77 | |
458 | 78 extern Fixnum x_selection_timeout; |
428 | 79 |
80 struct frame *x_any_window_to_frame (struct device *d, Window); | |
81 struct frame *x_any_widget_or_parent_to_frame (struct device *d, | |
82 Widget widget); | |
83 struct frame *decode_x_frame (Lisp_Object); | |
84 struct frame *x_window_to_frame (struct device *d, Window); | |
85 struct device *get_device_from_display (Display *dpy); | |
86 struct device *decode_x_device (Lisp_Object); | |
87 | |
88 void x_handle_selection_notify (XSelectionEvent *event); | |
89 void x_handle_selection_request (XSelectionRequestEvent *event); | |
90 void x_handle_selection_clear (XSelectionClearEvent *event); | |
91 void x_handle_property_notify (XPropertyEvent *event); | |
92 | |
440 | 93 void Xatoms_of_select_x (struct device *d); |
428 | 94 void Xatoms_of_objects_x (struct device *d); |
95 | |
96 void x_wm_set_shell_iconic_p (Widget shell, int iconic_p); | |
97 void x_wm_set_cell_size (Widget wmshell, int cw, int ch); | |
98 void x_wm_set_variable_size (Widget wmshell, int width, int height); | |
99 | |
442 | 100 const char *x_event_name (int event_type); |
428 | 101 int x_error_handler (Display *disp, XErrorEvent *event); |
102 void expect_x_error (Display *dpy); | |
103 int x_error_occurred_p (Display *dpy); | |
104 int signal_if_x_error (Display *dpy, int resumable_p); | |
105 int x_IO_error_handler (Display *disp); | |
106 | |
107 void x_redraw_exposed_area (struct frame *f, int x, int y, | |
108 int width, int height); | |
109 void x_output_string (struct window *w, struct display_line *dl, | |
867 | 110 Ichar_dynarr *buf, int xpos, int xoffset, |
428 | 111 int start_pixpos, int width, face_index findex, |
112 int cursor, int cursor_start, int cursor_width, | |
113 int cursor_height); | |
440 | 114 void x_output_x_pixmap (struct frame *f, Lisp_Image_Instance *p, |
428 | 115 int x, int y, int xoffset, int yoffset, |
116 int width, int height, | |
117 unsigned long fg, unsigned long bg, | |
118 GC override_gc); | |
119 void x_output_shadows (struct frame *f, int x, int y, int width, | |
120 int height, GC top_shadow_gc, | |
121 GC bottom_shadow_gc, GC background_gc, | |
122 int shadow_thickness, int edges); | |
123 void x_generate_shadow_pixels (struct frame *f, | |
124 unsigned long *top_shadow, | |
125 unsigned long *bottom_shadow, | |
126 unsigned long background, | |
127 unsigned long core_background); | |
128 | |
129 int x_initialize_frame_menubar (struct frame *f); | |
130 void x_init_modifier_mapping (struct device *d); | |
131 | |
593 | 132 int x_frame_window_state (struct frame *f); |
133 | |
134 | |
428 | 135 #define X_ERROR_OCCURRED(dpy, body) \ |
136 (expect_x_error (dpy), body, x_error_occurred_p (dpy)) | |
137 | |
138 #define HANDLING_X_ERROR(dpy, body) \ | |
139 (expect_x_error (dpy), body, signal_if_x_error (dpy, 0)) | |
140 | |
141 void Initialize_Locale (void); | |
142 | |
143 #ifdef HAVE_XIM | |
144 | |
145 /* X Input Method `methods' */ | |
146 void XIM_init_device (struct device *d); | |
147 void XIM_init_frame (struct frame *f); | |
148 void XIM_SetSpotLocation (struct frame *f, int x, int y); | |
149 void XIM_SetGeometry (struct frame *f); | |
150 void XIM_focus_event (struct frame *f, int in_p); | |
151 | |
152 #ifdef XIM_XLIB | |
153 /* XtTypeConverter */ | |
154 Boolean EmacsXtCvtStringToXIMStyles ( | |
155 Display *dpy, | |
156 XrmValuePtr args, | |
157 Cardinal *num_args, | |
158 XrmValuePtr from, | |
159 XrmValuePtr to_in_out, | |
160 XtPointer *converter_data); | |
161 | |
162 /* XtDestructor */ | |
163 void EmacsFreeXIMStyles ( | |
164 XtAppContext app, | |
165 XrmValuePtr to, | |
166 XtPointer converter_data, | |
167 XrmValuePtr args, | |
168 Cardinal *num_args); | |
169 | |
170 #ifdef DEBUG_XEMACS | |
171 void describe_Window (Window win); | |
172 void describe_XFontSet (XFontSet font_set); | |
173 void describe_XIM (XIM im); | |
174 void describe_XIMStyle (XIMStyle style); | |
175 void describe_XIMStyles (XIMStyles *styles); | |
176 void describe_XIC (XIC ic); | |
177 void describe_event_mask (unsigned long mask); | |
178 void describe_XRectangle (char *name, XRectangle *rect); | |
179 void describe_Status (Status status); | |
180 #endif /* DEBUG_XEMACS */ | |
181 #endif /* XIM_XLIB */ | |
182 #endif /* HAVE_XIM */ | |
183 | |
771 | 184 extern Lisp_Object Qxintl; |
185 | |
428 | 186 extern int in_resource_setting; |
187 extern int in_specifier_change_function; | |
188 | |
189 extern Lisp_Object Vx_initial_argv_list; /* #### ugh! */ | |
190 | |
191 #endif /* HAVE_X_WINDOWS */ | |
440 | 192 |
193 #endif /* INCLUDED_console_x_h_ */ |