Mercurial > hg > xemacs-beta
annotate src/console-x.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 | 04bc9d2f42c7 |
rev | line source |
---|---|
428 | 1 /* Console functions for X windows. |
793 | 2 Copyright (C) 1996, 2002 Ben Wing. |
428 | 3 |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: Not in FSF. */ | |
22 | |
442 | 23 /* This file Mule-ized by Ben Wing, 7-10-00. */ |
24 | |
428 | 25 /* Authorship: |
26 | |
27 Ben Wing: January 1996, for 19.14. | |
28 */ | |
29 | |
30 #include <config.h> | |
31 #include "lisp.h" | |
32 | |
442 | 33 #include "buffer.h" |
428 | 34 #include "process.h" /* canonicalize_host_name */ |
35 #include "redisplay.h" /* for display_arg */ | |
36 | |
872 | 37 #include "console-x-impl.h" |
38 | |
428 | 39 DEFINE_CONSOLE_TYPE (x); |
40 | |
41 static int | |
42 x_initially_selected_for_input (struct console *con) | |
43 { | |
44 return 1; | |
45 } | |
46 | |
444 | 47 /* Parse a DISPLAY specification like "host:10.0" or ":0" */ |
428 | 48 static void |
49 split_up_display_spec (Lisp_Object display, int *hostname_length, | |
50 int *display_length, int *screen_length) | |
51 { | |
867 | 52 Ibyte *beg = XSTRING_DATA (display); |
53 Ibyte *end = beg + XSTRING_LENGTH (display); | |
54 Ibyte *p = end; | |
428 | 55 |
444 | 56 while (p > beg) |
428 | 57 { |
867 | 58 DEC_IBYTEPTR (p); |
59 if (itext_ichar (p) == ':') | |
444 | 60 { |
61 *hostname_length = p - beg; | |
428 | 62 |
444 | 63 while (p < end - 1) |
64 { | |
867 | 65 INC_IBYTEPTR (p); |
66 if (itext_ichar (p) == '.') | |
444 | 67 { |
68 *display_length = p - beg - *hostname_length; | |
69 *screen_length = end - p; | |
70 return; | |
71 } | |
72 } | |
73 /* No '.' found. */ | |
74 *display_length = XSTRING_LENGTH (display) - *hostname_length; | |
75 *screen_length = 0; | |
76 return; | |
77 } | |
428 | 78 } |
79 | |
444 | 80 /* No ':' found. */ |
81 *hostname_length = XSTRING_LENGTH (display); | |
82 *display_length = 0; | |
83 *screen_length = 0; | |
428 | 84 } |
85 | |
86 /* Remember, in all of the following functions, we have to verify | |
87 the integrity of our input, because the generic functions don't. */ | |
88 | |
89 static Lisp_Object | |
578 | 90 x_device_to_console_connection (Lisp_Object connection, Error_Behavior errb) |
428 | 91 { |
92 /* Strip the trailing .# off of the connection, if it's there. */ | |
93 | |
94 if (NILP (connection)) | |
95 return Qnil; | |
96 else | |
97 { | |
98 int hostname_length, display_length, screen_length; | |
99 | |
100 if (!ERRB_EQ (errb, ERROR_ME)) | |
101 { | |
102 if (!STRINGP (connection)) | |
103 return Qunbound; | |
104 } | |
105 else | |
106 CHECK_STRING (connection); | |
107 | |
108 split_up_display_spec (connection, &hostname_length, &display_length, | |
109 &screen_length); | |
110 connection = make_string (XSTRING_DATA (connection), | |
111 hostname_length + display_length); | |
112 } | |
113 | |
114 return connection; | |
115 } | |
116 | |
117 static Lisp_Object | |
118 get_display_arg_connection (void) | |
119 { | |
442 | 120 const Extbyte *disp_name; |
428 | 121 |
122 /* If the user didn't explicitly specify a display to use when | |
123 they called make-x-device, then we first check to see if a | |
124 display was specified on the command line with -display. If | |
125 so, we set disp_name to it. Otherwise we use XDisplayName to | |
126 see what DISPLAY is set to. XtOpenDisplay knows how to do | |
127 both of these things, but we need to know the name to use. */ | |
128 if (display_arg) | |
129 { | |
130 int elt; | |
131 int argc; | |
442 | 132 Extbyte **argv; |
428 | 133 Lisp_Object conn; |
134 | |
135 make_argc_argv (Vx_initial_argv_list, &argc, &argv); | |
136 | |
137 disp_name = NULL; | |
138 for (elt = 0; elt < argc; elt++) | |
139 { | |
140 if (!strcmp (argv[elt], "-d") || !strcmp (argv[elt], "-display")) | |
141 { | |
142 if (elt + 1 == argc) | |
143 { | |
144 suppress_early_error_handler_backtrace = 1; | |
563 | 145 invalid_argument ("-display specified with no arg", Qunbound); |
428 | 146 } |
147 else | |
148 { | |
149 disp_name = argv[elt + 1]; | |
150 break; | |
151 } | |
152 } | |
153 } | |
154 | |
155 /* assert: display_arg is only set if we found the display | |
156 arg earlier so we can't fail to find it now. */ | |
157 assert (disp_name != NULL); | |
442 | 158 conn = build_ext_string (disp_name, Qcommand_argument_encoding); |
428 | 159 free_argc_argv (argv); |
160 return conn; | |
161 } | |
162 else | |
442 | 163 return build_ext_string (XDisplayName (0), Qx_display_name_encoding); |
428 | 164 } |
165 | |
166 /* "semi-canonicalize" means convert to a nicer form for printing, but | |
167 don't completely canonicalize (into some likely ugly form) */ | |
168 | |
169 static Lisp_Object | |
170 x_semi_canonicalize_console_connection (Lisp_Object connection, | |
578 | 171 Error_Behavior errb) |
428 | 172 { |
173 struct gcpro gcpro1; | |
174 | |
175 GCPRO1 (connection); | |
176 | |
177 if (NILP (connection)) | |
178 connection = get_display_arg_connection (); | |
179 else | |
180 { | |
181 if (!ERRB_EQ (errb, ERROR_ME)) | |
182 { | |
183 if (!STRINGP (connection)) | |
184 RETURN_UNGCPRO (Qunbound); | |
185 } | |
186 else | |
187 CHECK_STRING (connection); | |
188 } | |
189 | |
190 | |
191 /* Be lenient, allow people to specify a device connection instead of | |
192 a console connection -- e.g. "foo:0.0" instead of "foo:0". This | |
193 only happens in `find-console' and `get-console'. */ | |
194 connection = x_device_to_console_connection (connection, errb); | |
195 | |
196 /* Check for a couple of standard special cases */ | |
867 | 197 if (string_ichar (connection, 0) == ':') |
428 | 198 connection = concat2 (build_string ("localhost"), connection); |
444 | 199 else |
200 { | |
201 /* connection =~ s/^unix:/localhost:/; */ | |
867 | 202 const Ibyte *p = XSTRING_DATA (connection); |
203 const Ibyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection); | |
647 | 204 int i; |
444 | 205 |
647 | 206 for (i = 0; i < (int) sizeof ("unix:") - 1; i++) |
444 | 207 { |
867 | 208 if (p == end || itext_ichar (p) != "unix:"[i]) |
444 | 209 goto ok; |
867 | 210 INC_IBYTEPTR (p); |
444 | 211 } |
212 | |
213 connection = concat2 (build_string ("localhost:"), | |
214 make_string (p, end - p)); | |
215 } | |
216 ok: | |
428 | 217 |
218 RETURN_UNGCPRO (connection); | |
219 } | |
220 | |
221 static Lisp_Object | |
578 | 222 x_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) |
428 | 223 { |
224 Lisp_Object hostname = Qnil; | |
225 struct gcpro gcpro1, gcpro2; | |
226 | |
227 GCPRO2 (connection, hostname); | |
228 | |
229 connection = x_semi_canonicalize_console_connection (connection, errb); | |
230 if (UNBOUNDP (connection)) | |
231 RETURN_UNGCPRO (Qunbound); | |
232 | |
233 { | |
234 int hostname_length, display_length, screen_length; | |
235 | |
236 split_up_display_spec (connection, &hostname_length, &display_length, | |
237 &screen_length); | |
238 hostname = Fsubstring (connection, Qzero, make_int (hostname_length)); | |
239 hostname = canonicalize_host_name (hostname); | |
240 connection = concat2 (hostname, | |
241 make_string (XSTRING_DATA (connection) | |
242 + hostname_length, display_length)); | |
243 } | |
244 | |
245 RETURN_UNGCPRO (connection); | |
246 } | |
247 | |
248 static Lisp_Object | |
249 x_semi_canonicalize_device_connection (Lisp_Object connection, | |
578 | 250 Error_Behavior errb) |
428 | 251 { |
252 int hostname_length, display_length, screen_length; | |
253 struct gcpro gcpro1; | |
254 | |
255 GCPRO1 (connection); | |
256 if (NILP (connection)) | |
257 connection = get_display_arg_connection (); | |
258 else | |
259 { | |
260 if (!ERRB_EQ (errb, ERROR_ME)) | |
261 { | |
262 if (!STRINGP (connection)) | |
263 RETURN_UNGCPRO (Qunbound); | |
264 } | |
265 else | |
266 CHECK_STRING (connection); | |
267 } | |
268 | |
269 split_up_display_spec (connection, &hostname_length, &display_length, | |
270 &screen_length); | |
271 | |
272 if (!screen_length) | |
273 connection = concat2 (connection, build_string (".0")); | |
274 RETURN_UNGCPRO (connection); | |
275 } | |
276 | |
277 static Lisp_Object | |
578 | 278 x_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) |
428 | 279 { |
280 int hostname_length, display_length, screen_length; | |
281 Lisp_Object screen_str = Qnil; | |
282 struct gcpro gcpro1, gcpro2; | |
283 | |
284 GCPRO2 (screen_str, connection); | |
285 connection = x_semi_canonicalize_device_connection (connection, errb); | |
286 if (UNBOUNDP (connection)) | |
287 RETURN_UNGCPRO (Qunbound); | |
288 | |
289 split_up_display_spec (connection, &hostname_length, &display_length, | |
290 &screen_length); | |
291 | |
444 | 292 screen_str = make_string (XSTRING_DATA (connection) |
293 + hostname_length + display_length, screen_length); | |
428 | 294 connection = x_canonicalize_console_connection (connection, errb); |
295 | |
296 RETURN_UNGCPRO (concat2 (connection, screen_str)); | |
297 } | |
298 | |
299 void | |
300 console_type_create_x (void) | |
301 { | |
302 INITIALIZE_CONSOLE_TYPE (x, "x", "console-x-p"); | |
303 | |
304 CONSOLE_HAS_METHOD (x, semi_canonicalize_console_connection); | |
305 CONSOLE_HAS_METHOD (x, canonicalize_console_connection); | |
306 CONSOLE_HAS_METHOD (x, semi_canonicalize_device_connection); | |
307 CONSOLE_HAS_METHOD (x, canonicalize_device_connection); | |
308 CONSOLE_HAS_METHOD (x, device_to_console_connection); | |
309 CONSOLE_HAS_METHOD (x, initially_selected_for_input); | |
310 } | |
311 | |
312 | |
313 void | |
314 reinit_console_type_create_x (void) | |
315 { | |
316 REINITIALIZE_CONSOLE_TYPE (x); | |
317 } |