Mercurial > hg > xemacs-beta
annotate lisp/x-win-xfree86.el @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | 4cad7ff4a200 |
| children | e3ef34f57070 |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-win-xfree86.el --- runtime initialization for XFree86 servers |
| 2 ;; Copyright (C) 1995 Sun Microsystems, Inc. | |
| 3 ;; Copyright (C) 1995 Ben Wing. | |
| 4 | |
| 5 ;; Author: Ben Wing | |
| 6 ;; Author: Martin Buchholz (rewritten to use function-key-map) | |
| 7 ;; Keywords: terminals | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;; This file is loaded by x-win.el at run-time when we are sure that XEmacs | |
| 29 ;; is running on the display of something running XFree86 (Linux, | |
| 30 ;; NetBSD, FreeBSD, and perhaps other Intel Unixen). | |
| 31 | |
| 32 ;;; #### bleck!!! Use key-translation-map! | |
| 33 | |
| 34 ;;; #### Counter-bleck!! We shouldn't override a user binding for F13. | |
| 35 ;;; So we use function-key-map for now. | |
| 36 ;;; When we've implemented a fallback-style equivalent of | |
| 37 ;;; keyboard-translate-table, we'll use that instead. (martin) | |
| 38 | |
| 39 ;; For no obvious reason, shift-F1 is called F13, although Meta-F1 and | |
| 40 ;; Control-F1 have normal names. | |
| 41 | |
| 502 | 42 ;;; Code: |
| 43 | |
| 44 (globally-declare-fboundp | |
| 45 '(x-keysym-on-keyboard-p x-keysym-on-keyboard-sans-modifiers-p)) | |
| 46 | |
| 428 | 47 ;;;###autoload |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
48 (defun x-win-init-xfree86 (device) |
| 3171 | 49 |
| 50 ;; We know this keyboard is an XFree86 keyboard. As such, we can predict | |
| 51 ;; what key scan codes will correspond to the keys on US keyboard layout, | |
| 52 ;; and we can use that information to fall back to the US layout when | |
| 53 ;; looking up commands that would otherwise fail. (Cf. the hard-coding of | |
| 54 ;; this information in /usr/X11R6/lib/X11/xkb/keycodes/xfree86 ) | |
| 55 ;; | |
| 56 ;; These settings for x-us-keymap-first-keycode and | |
| 57 ;; x-us-keymap-description were determined with | |
| 58 ;; | |
| 59 ;; setxkbmap us | |
| 60 ;; xmodmap -pke > keyboard-description.txt | |
| 61 ;; | |
| 62 ;; "8" is the key code of the first line, x-us-keymap-description is | |
| 63 ;; taken from the column describing the bindings. | |
| 64 | |
| 65 (setq x-us-keymap-first-keycode 8 | |
| 66 x-us-keymap-description | |
| 67 [nil nil [?1 ?!] [?2 ?@] [?3 ?\#] [?4 ?$] [?5 ?%] [?6 ?^] [?7 ?&] | |
| 68 [?8 ?*] [?9 ?\(] [?0 ?\)] [?- ?_] [?= ?+] nil ?\t [?q ?Q] | |
| 69 [?w ?W] [?e ?E] [?r ?R] [?t ?T] [?y ?Y] [?u ?U] [?i ?I] [?o ?O] | |
| 70 [?p ?P] [?\[ ?{] [?\] ?}] nil nil [?a ?A] [?s ?S] [?d ?D] | |
| 71 [?f ?F] [?g ?G] [?h ?H] [?j ?J] [?k ?K] [?l ?L] [?\; ?:] | |
| 72 [?\' ?\"] [?\` ?~] nil [?\\ ?|] [?z ?Z] [?x ?X] [?c ?C] | |
| 73 [?v ?V] [?b ?B] [?n ?N] [?m ?M] [?\, ?<] [?\. ?>] [?/ ?\?] | |
| 74 nil ?* nil ?\ nil nil nil nil nil nil nil nil nil nil nil | |
| 75 nil nil ?7 ?8 ?9 ?- ?4 ?5 ?6 ?+ ?1 ?2 ?3 ?0 ?\. nil nil | |
| 76 [?< ?>] nil nil nil nil nil nil nil nil nil nil nil nil | |
| 77 nil nil nil nil nil ?/ nil nil nil nil nil nil nil nil | |
| 78 nil nil nil nil nil ?=]) | |
| 79 | |
| 428 | 80 (loop for (key sane-key) in |
| 81 '((f13 f1) | |
| 82 (f14 f2) | |
| 83 (f15 f3) | |
| 84 (f16 f4) | |
| 85 (f17 f5) | |
| 86 (f18 f6) | |
| 87 (f19 f7) | |
| 88 (f20 f8) | |
| 89 (f21 f9) | |
| 90 (f22 f10) | |
| 91 (f23 f11) | |
| 92 (f24 f12)) | |
| 93 do | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
94 (when (and (x-keysym-on-keyboard-p key device) |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
95 (not (x-keysym-on-keyboard-sans-modifiers-p key device))) |
| 428 | 96 ;; define also the control, meta, and meta-control versions. |
| 97 (loop for mods in '(() (control) (meta) (meta control)) do | |
| 98 (define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)]) | |
| 99 )))) | |
| 100 | |
| 101 ;;; x-win-xfree86.el ends here |