Mercurial > hg > xemacs-beta
annotate lisp/x-win-sun.el @ 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 | 7039e6323819 |
children | 4cad7ff4a200 |
rev | line source |
---|---|
428 | 1 ;;; x-win-sun.el --- runtime initialization for Sun X servers and keyboards |
2 ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
3 | |
4 ;; Authors: jwz, ben, martin | |
5 ;; Keywords: terminals | |
6 | |
7 ;; This file is part of XEmacs. | |
8 | |
9 ;; XEmacs is free software; you can redistribute it and/or modify it | |
10 ;; under the terms of the GNU General Public License as published by | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
12 ;; any later version. | |
13 | |
14 ;; XEmacs is distributed in the hope that it will be useful, but | |
15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 ;; General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
20 ;; along with XEmacs; see the file COPYING. If not, write to the | |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
23 | |
24 ;;; Commentary: | |
25 | |
26 ;; This file is loaded by x-win.el at run-time when we are sure that XEmacs | |
27 ;; is running on the display of a Sun. | |
28 | |
29 ;; The Sun X server (both the MIT and OpenWindows varieties) have extremely | |
30 ;; stupid names for their keypad and function keys. For example, the key | |
31 ;; labeled 3 / PgDn, with R15 written on the front, is actually called F35. | |
32 | |
33 ;; There are 3 methods of dealing with the Sun key brokenness: | |
34 ;; | |
35 ;; - Use xmodmap to give all keys more sensible names for all apps: | |
36 ;; I use this shell script: | |
37 ;; | |
38 ;; for i in 0 1 2 3 4 5 6 7 8 9 Add Subtract Multiply Divide Decimal ; do | |
39 ;; echo "keysym KP-$i = KP-$i" | |
40 ;; done | xmodmap | |
41 ;; | |
42 ;; Clearly, as a good X11 citizen, we can't do this. | |
43 ;; | |
44 ;; - Use keyboard-translate-table to remap the keybindings at a low level. | |
45 ;; This approach is taken in the function `sun-x11-keyboard-translate'. | |
46 ;; This is like running xmodmap within XEmacs only. | |
47 ;; This is not the default, however, so that legacy keybindings in users' | |
48 ;; .emacs files like (global-set-key [(f35)] 'foo) continue to work | |
49 ;; | |
50 ;; - Use keyboard macros to provide indirection for keybindings. | |
51 ;; If we do (global-set-key [(f35)] [(kp-3)]), then the user's keybindings | |
52 ;; work whether he uses `f35' or `kp-3'. | |
53 ;; This is also compatible with FSF Emacs and other X11 apps. | |
54 ;; Although this has the disadvantage that these remappings | |
55 ;; only work with the global key map, we use this as the default. | |
56 ;; | |
57 ;; - The Right Way to do this remains to be written... | |
58 | |
59 ;; OK, here's another try at doing things the right way. | |
60 | |
61 ;; We use function-key-map, which honors explicit key-bindings for the | |
62 ;; stupid Sun names, but also allows indirection if no explicit | |
63 ;; key-binding exists. | |
64 | |
65 ;;; Code: | |
66 | |
502 | 67 (globally-declare-fboundp |
68 '(x-keysym-on-keyboard-sans-modifiers-p)) | |
69 | |
428 | 70 ;;;###autoload |
71 (defun x-win-init-sun () | |
72 | |
73 ;; help is ok | |
74 ;; num_lock is ok | |
75 ;; up is ok | |
76 ;; left is ok | |
77 ;; right is ok | |
78 ;; kp-add is ok | |
79 ;; down is ok | |
80 ;; insert is ok | |
81 ;; delete is ok | |
82 ;; kp-enter is ok | |
83 ;; Sun Function keys | |
84 (loop for (from-key to-key) in | |
85 `((f21 pause) | |
86 (f22 print) | |
87 (f23 scroll_lock) | |
88 | |
89 ;; X11 R6 mappings | |
90 (SunProps props) | |
91 (SunFront front) | |
92 (SunOpen open) | |
93 (SunFind find) | |
94 (cancel stop) | |
95 (Undo undo) | |
96 (SunCopy copy) | |
97 (SunPaste paste) | |
98 (SunCut cut) | |
99 | |
100 (f13 props) | |
101 (f14 undo) | |
102 (f15 front) | |
103 (f16 copy) | |
104 (f17 open) | |
105 (f18 paste) | |
106 (f19 find) | |
107 (f20 cut) | |
108 | |
109 (f25 kp-divide) | |
110 (f26 kp-multiply) | |
111 (f31 kp-5) | |
112 | |
113 ;; Map f33 and r13 to end or kp-end | |
114 ,@(cond | |
115 ((not (x-keysym-on-keyboard-sans-modifiers-p 'end)) | |
116 '((f33 end) | |
117 (r13 end))) | |
118 ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-end)) | |
119 '((f33 kp-end) | |
120 (r13 kp-end)))) | |
121 | |
122 ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f36) | |
123 '((f36 stop) | |
124 (f37 again))) | |
125 | |
126 ;; Type 4 keyboards have a real kp-subtract and a f24 labelled `=' | |
127 ;; Type 5 keyboards have no key labelled `=' and a f24 labelled `-' | |
128 ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f24) | |
129 `((f24 ,(if (x-keysym-on-keyboard-sans-modifiers-p 'kp-subtract) | |
130 'kp-equal | |
131 'kp-subtract)))) | |
132 | |
133 ;; Map f27 to home or kp-home, as appropriate | |
134 ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'home)) | |
135 '((f27 home))) | |
136 ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-home)) | |
137 '((f27 kp-home)))) | |
138 | |
139 ;; Map f29 to prior or kp-prior, as appropriate | |
140 ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'prior)) | |
141 '((f29 prior))) | |
142 ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-prior)) | |
143 '((f29 kp-prior)))) | |
144 | |
145 ;; Map f35 to next or kp-next, as appropriate | |
146 ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'next)) | |
147 '((f35 next))) | |
148 ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-next)) | |
149 '((f35 kp-next)))) | |
150 | |
151 ,@(cond ((x-keysym-on-keyboard-sans-modifiers-p 'apRead) ; SunOS 4.1.1 | |
152 '((apRead f11) (apEdit f12))) | |
153 ((x-keysym-on-keyboard-sans-modifiers-p 'SunF36) ; SunOS 5 | |
154 '((SunF36 f11) | |
155 (SunF37 f12) | |
156 (f11 stop) | |
157 (f12 again)))) | |
158 ) | |
159 do (when (x-keysym-on-keyboard-sans-modifiers-p from-key) | |
160 (dolist (prefix '(() (shift) (control) (meta) (alt) | |
161 (shift control) (shift alt) (shift meta) | |
162 (control alt) (control meta) (alt meta) | |
163 (shift control alt) (shift control meta) | |
164 (shift alt meta) (control alt meta) | |
165 (shift control alt meta))) | |
166 (define-key function-key-map | |
167 (append prefix (list from-key)) | |
168 (vector (append prefix (list to-key))))))) | |
169 | |
170 ;; for each element in the left column of the above table, alias it | |
171 ;; to the thing in the right column. Then do the same for many, but | |
172 ;; not all, modifier combinations. | |
173 ;; | |
174 ;; (Well, we omit hyper and super. #### Handle this some other way!) | |
175 ;; (while mapping | |
176 ;; (let ((mods '(() (shift) (control) (meta) (alt)))) | |
177 ;; (while mods | |
178 ;; (let ((k1 (vector (append (car mods) (list (car (car mapping)))))) | |
179 ;; (k2 (vector (append (car mods) (list (cdr (car mapping))))))) | |
180 ;; (define-key global-map k1 k2)) | |
181 ;; (setq mods (cdr mods)))) | |
182 ;; (setq mapping (cdr mapping)))) | |
183 | |
184 ;;; I've extended keyboard-translate-table to work over keysyms. | |
185 ;;; [FSF Emacs has something called `system-key-alist' that is | |
186 ;;; supposed to accomplish approximately the same thing. Unfortunately, | |
187 ;;; it's brain-dead in the typically FSF way, and associates *numbers* | |
188 ;;; (who knows where the hell they come from?) with symbols.] --ben | |
189 | |
190 ;;; And I've made it into a function which is NOT called by default --martin | |
191 | |
192 (defun sun-x11-keyboard-translate () | |
193 "Remap Sun's X11 keyboard. | |
194 Keys with names like `f35' are remapped, at a low level, | |
195 to more mnemonic ones,like `kp-3'." | |
196 (interactive) | |
197 | |
198 (keyboard-translate | |
199 'f11 'stop ; the type4 keyboard Sun/MIT name | |
200 'f36 'stop ; the type5 keyboard Sun name | |
201 'cancel 'stop ; R6 binding | |
202 'f12 'again ; the type4 keyboard Sun/MIT name | |
203 'f37 'again ; the type5 keyboard Sun name | |
204 'f13 'props ; | |
205 'SunProps 'props ; R6 binding | |
206 'f14 'undo ; | |
207 'f15 'front ; | |
208 'SunFront 'front ; R6 binding | |
209 'f16 'copy ; | |
210 'SunCopy 'copy ; R6 binding | |
211 'f17 'open ; | |
212 'SunOpen 'open ; R6 binding | |
213 'f18 'paste ; | |
214 'SunPaste 'paste ; R6 binding | |
215 'f19 'find ; | |
216 'f20 'cut ; | |
217 'SunCut 'cut ; R6 binding | |
218 ;; help is ok | |
219 'f21 'pause | |
220 'f22 'prsc | |
221 'f23 'scroll | |
222 ;; num_lock is ok | |
223 ;;'f24 'kp-equal) ; type4 only! | |
224 'f25 'kp-divide ; | |
225 'f26 'kp-multiply ; | |
226 'f24 'kp-subtract ; type5 only! | |
227 'f27 'kp-7 ; | |
228 ;; up is ok | |
229 'f29 'kp-9 | |
230 ;; left is ok | |
231 'f31 'kp-5 | |
232 ;; right is ok | |
233 ;; kp-add is ok | |
234 'f33 'kp-1 ; the Sun name | |
235 'r13 'end ; the MIT name | |
236 ;; down is ok | |
237 'f35 'kp-3 | |
238 ;; insert is ok | |
239 ;; delete is ok | |
240 ;; kp-enter is ok | |
241 'SunF36 'f11 ; Type 5 keyboards | |
242 'SunF37 'f12 ; Used to be Stop & Again | |
243 )) | |
244 | |
245 | |
246 ;;; OpenWindows-like "find" processing. | |
247 ;;; As far as I know, the `find' key is a Sunism, so we do that binding | |
248 ;;; here. This is the only Sun-specific keybinding. (The functions | |
249 ;;; themselves are in x-win.el in case someone wants to use them when | |
250 ;;; not running on a Sun display.) | |
251 | |
252 (or (lookup-key global-map 'find) | |
253 (define-key global-map 'find 'ow-find)) | |
254 (or (lookup-key global-map '(shift find)) | |
255 (define-key global-map '(shift find) 'ow-find-backward)) | |
256 | |
257 ) | |
258 | |
259 ;;; x-win-sun.el ends here |