Mercurial > hg > xemacs-beta
view lisp/x-init.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 | e214ff9f9507 |
children | e3ef34f57070 |
line wrap: on
line source
;;; x-init.el --- initialization code for X windows ;; Copyright (C) 1990, 1993, 1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Board of Trustees, University of Illinois. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: terminals, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not synched. ;;; Commentary: ;; This file is dumped with XEmacs (when X support is compiled in). ;;; Code: (globally-declare-fboundp '(x-keysym-on-keyboard-p x-server-vendor x-init-specifier-from-resources init-mule-x-win)) (globally-declare-boundp '(x-initial-argv-list x-app-defaults-directory)) ;; If you want to change this variable, this is the place you must do it. ;; Do not set it to a string containing periods. X doesn't like that. ;(setq x-emacs-application-class "Emacs") (defgroup x nil "The X Window system." :group 'environment) ;; OpenWindows-like "find" processing. These functions are really Sunisms, ;; but we put them here instead of in x-win-sun.el in case someone wants ;; to use them when not running on a Sun console (presumably after binding ;; them to different keys, or putting them on menus.) (defvar ow-find-last-string nil) (defvar ow-find-last-clipboard nil) (defun ow-find (&optional backward-p) "Search forward the next occurrence of the text of the selection." (interactive) (let ((sel (ignore-errors (get-selection))) (clip (ignore-errors (get-clipboard))) text) (setq text (cond (sel) ((not (equal clip ow-find-last-clipboard)) (setq ow-find-last-clipboard clip)) (ow-find-last-string) (t (error "No selection available")))) (setq ow-find-last-string text) (cond (backward-p (search-backward text) (set-mark (+ (point) (length text)))) (t (search-forward text) (set-mark (- (point) (length text))))) (zmacs-activate-region))) (defun ow-find-backward () "Search backward for the previous occurrence of the text of the selection." (interactive) (ow-find t)) ;; Load X-server specific code. ;; Specifically, load some code to repair the grievous damage that MIT and ;; Sun have done to the default keymap for the Sun keyboards. (eval-when-compile (defmacro x-define-dead-key (key map device) `(when (x-keysym-on-keyboard-p ',key device) (define-key function-key-map [,key] ',map)))) (defun x-initialize-compose (device) "Enable compose key and dead key processing on DEVICE." (autoload 'compose-map "x-compose" nil t 'keymap) (autoload 'compose-acute-map "x-compose" nil t 'keymap) (autoload 'compose-grave-map "x-compose" nil t 'keymap) (autoload 'compose-cedilla-map "x-compose" nil t 'keymap) (autoload 'compose-diaeresis-map "x-compose" nil t 'keymap) (autoload 'compose-circumflex-map "x-compose" nil t 'keymap) (autoload 'compose-tilde-map "x-compose" nil t 'keymap) (when (x-keysym-on-keyboard-p 'multi-key device) (define-key function-key-map [multi-key] 'compose-map)) ;; The dead keys might really be called just about anything, depending ;; on the vendor. MIT thinks that the prefixes are "SunFA_", "D", and ;; "hpmute_" for Sun, DEC, and HP respectively. However, OpenWindows 3 ;; thinks that the prefixes are "SunXK_FA_", "DXK_", and "hpXK_mute_". ;; And HP (who don't mention Sun and DEC at all) use "XK_mute_". ;; Go figure. ;; Presumably if someone is running OpenWindows, they won't be using ;; the DEC or HP keysyms, but if they are defined then that is possible, ;; so in that case we accept them all. ;; If things seem not to be working, you might want to check your ;; /usr/lib/X11/XKeysymDB file to see if your vendor has an equally ;; mixed up view of what these keys should be called. ;; Canonical names: (x-define-dead-key acute compose-acute-map device) (x-define-dead-key grave compose-grave-map device) (x-define-dead-key cedilla compose-cedilla-map device) (x-define-dead-key diaeresis compose-diaeresis-map device) (x-define-dead-key circumflex compose-circumflex-map device) (x-define-dead-key tilde compose-tilde-map device) (x-define-dead-key degree compose-ring-map device) ;; Sun according to MIT: (x-define-dead-key SunFA_Acute compose-acute-map device) (x-define-dead-key SunFA_Grave compose-grave-map device) (x-define-dead-key SunFA_Cedilla compose-cedilla-map device) (x-define-dead-key SunFA_Diaeresis compose-diaeresis-map device) (x-define-dead-key SunFA_Circum compose-circumflex-map device) (x-define-dead-key SunFA_Tilde compose-tilde-map device) ;; Sun according to OpenWindows 2: (x-define-dead-key Dead_Grave compose-grave-map device) (x-define-dead-key Dead_Circum compose-circumflex-map device) (x-define-dead-key Dead_Tilde compose-tilde-map device) ;; Sun according to OpenWindows 3: (x-define-dead-key SunXK_FA_Acute compose-acute-map device) (x-define-dead-key SunXK_FA_Grave compose-grave-map device) (x-define-dead-key SunXK_FA_Cedilla compose-cedilla-map device) (x-define-dead-key SunXK_FA_Diaeresis compose-diaeresis-map device) (x-define-dead-key SunXK_FA_Circum compose-circumflex-map device) (x-define-dead-key SunXK_FA_Tilde compose-tilde-map device) ;; DEC according to MIT: (x-define-dead-key Dacute_accent compose-acute-map device) (x-define-dead-key Dgrave_accent compose-grave-map device) (x-define-dead-key Dcedilla_accent compose-cedilla-map device) (x-define-dead-key Dcircumflex_accent compose-circumflex-map device) (x-define-dead-key Dtilde compose-tilde-map device) (x-define-dead-key Dring_accent compose-ring-map device) ;; DEC according to OpenWindows 3: (x-define-dead-key DXK_acute_accent compose-acute-map device) (x-define-dead-key DXK_grave_accent compose-grave-map device) (x-define-dead-key DXK_cedilla_accent compose-cedilla-map device) (x-define-dead-key DXK_circumflex_accent compose-circumflex-map device) (x-define-dead-key DXK_tilde compose-tilde-map device) (x-define-dead-key DXK_ring_accent compose-ring-map device) ;; HP according to MIT: (x-define-dead-key hpmute_acute compose-acute-map device) (x-define-dead-key hpmute_grave compose-grave-map device) (x-define-dead-key hpmute_diaeresis compose-diaeresis-map device) (x-define-dead-key hpmute_asciicircum compose-circumflex-map device) (x-define-dead-key hpmute_asciitilde compose-tilde-map device) ;; Empirically discovered on Linux XFree86 MetroX: (x-define-dead-key usldead_acute compose-acute-map device) (x-define-dead-key usldead_grave compose-grave-map device) (x-define-dead-key usldead_diaeresis compose-diaeresis-map device) (x-define-dead-key usldead_asciicircum compose-circumflex-map device) (x-define-dead-key usldead_asciitilde compose-tilde-map device) ;; HP according to OpenWindows 3: (x-define-dead-key hpXK_mute_acute compose-acute-map device) (x-define-dead-key hpXK_mute_grave compose-grave-map device) (x-define-dead-key hpXK_mute_diaeresis compose-diaeresis-map device) (x-define-dead-key hpXK_mute_asciicircum compose-circumflex-map device) (x-define-dead-key hpXK_mute_asciitilde compose-tilde-map device) ;; HP according to HP-UX 8.0: (x-define-dead-key XK_mute_acute compose-acute-map device) (x-define-dead-key XK_mute_grave compose-grave-map device) (x-define-dead-key XK_mute_diaeresis compose-diaeresis-map device) (x-define-dead-key XK_mute_asciicircum compose-circumflex-map device) (x-define-dead-key XK_mute_asciitilde compose-tilde-map device) ;; [[ XFree86 seems to use lower case and a hyphen ]] Not true; they use ;; lower case and an underscore. XEmacs converts the underscore to a ;; hyphen in x_keysym_to_emacs_keysym because the keysym is in the ;; "Keyboard" character set, which is just totally fucking random, ;; considering it doesn't happen for any other character sets. (x-define-dead-key dead-acute compose-acute-map device) (x-define-dead-key dead-grave compose-grave-map device) (x-define-dead-key dead-cedilla compose-cedilla-map device) (x-define-dead-key dead-diaeresis compose-diaeresis-map device) (x-define-dead-key dead-circum compose-circumflex-map device) (x-define-dead-key dead-circumflex compose-circumflex-map device) (x-define-dead-key dead-tilde compose-tilde-map device) ) (eval-when-compile (load "x-win-sun" nil t) (load "x-win-xfree86" nil t)) (defun x-initialize-keyboard (device) "Perform X-Server-specific initializations. Don't call this." ;; This is some heuristic junk that tries to guess whether this is ;; a Sun keyboard. ;; ;; One way of implementing this (which would require C support) would ;; be to examine the X keymap itself and see if the layout looks even ;; remotely like a Sun - check for the Find key on a particular ;; keycode, for example. It'd be nice to have a table of this to ;; recognize various keyboards; see also xkeycaps. ;; ;; Note that we cannot use most vendor-provided proprietary keyboard ;; APIs to identify the keyboard - those only work on the console. ;; xkeycaps has the same problem when running `remotely'. (let ((vendor (x-server-vendor device))) (cond ((or (string-match "Sun Microsystems" vendor) ;; MIT losingly fails to tell us what hardware the X server ;; is managing, so assume all MIT displays are Suns... HA HA! (string-equal "MIT X Consortium" vendor) (string-equal "X Consortium" vendor)) ;; Ok, we think this could be a Sun keyboard. Run the Sun code. (x-win-init-sun device)) ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) ;; Those XFree86 people do some weird keysym stuff, too. (x-win-init-xfree86 device))))) ;; Moved from x-toolbar.el, since InfoDock doesn't dump x-toolbar.el. (defun x-init-toolbar-from-resources (locale) (loop for (specifier . resname) in `(( ,top-toolbar-height . "topToolBarHeight") (,bottom-toolbar-height . "bottomToolBarHeight") ( ,left-toolbar-width . "leftToolBarWidth") ( ,right-toolbar-width . "rightToolBarWidth") ( ,top-toolbar-border-width . "topToolBarBorderWidth") (,bottom-toolbar-border-width . "bottomToolBarBorderWidth") ( ,left-toolbar-border-width . "leftToolBarBorderWidth") ( ,right-toolbar-border-width . "rightToolBarBorderWidth")) do (x-init-specifier-from-resources specifier 'natnum locale (cons resname (upcase-initials resname))))) (defvar make-device-early-x-entry-point-called-p nil "Whether `make-device-early-x-entry-point' has been called, at least once. Much of the X11-specific Lisp init code should only be called the first time an X11 device is created; this variable allows for that.") (defvar make-device-late-x-entry-point-called-p nil "Whether `make-device-late-x-entry-point' has been called, at least once. Much of the X11-specific Lisp init code should only be called the first time an X11 device is created; this variable allows for that.") (defun make-device-early-x-entry-point () "Entry point to set up the Lisp environment for X device creation." (unless make-device-early-x-entry-point-called-p (setq initial-frame-plist (and initial-frame-unmapped-p '(initially-unmapped t)) ;; Save the argv value. x-initial-argv-list (cons (car command-line-args) command-line-args-left) ;; Locate the app-defaults directory x-app-defaults-directory (or x-app-defaults-directory (locate-data-directory "app-defaults")) make-device-early-x-entry-point-called-p t))) (defun make-device-late-x-entry-point (device) "Entry point to do any Lisp-level X device-specific initialization." ;; General code, called on every X device created: (x-initialize-keyboard device) (x-initialize-compose device) ;; And the following code is to be called once, the first time an X11 ;; device is created: (unless make-device-late-x-entry-point-called-p (setq command-line-args-left (cdr x-initial-argv-list)) ;; Motif-ish bindings (define-key global-map '(shift insert) 'yank-clipboard-selection) (define-key global-map '(control insert) 'copy-primary-selection) ;; These are Sun-isms. (define-key global-map 'copy 'copy-primary-selection) (define-key global-map 'paste 'yank-clipboard-selection) (define-key global-map 'cut 'kill-primary-selection) (setq make-device-late-x-entry-point-called-p t))) (defun make-frame-on-display (display &optional props) "Create a frame on the X display named DISPLAY. DISPLAY should be a standard display string such as \"unix:0\", or nil for the display specified on the command line or in the DISPLAY environment variable. PROPS should be a plist of properties, as in the call to `make-frame'. This function opens a connection to the display or reuses an existing connection. This function is a trivial wrapper around `make-frame-on-device'." (interactive "sMake frame on display: ") (if (equal display "") (setq display nil)) (make-frame-on-device 'x display props)) ;; Character 160 (octal 0240) displays incorrectly under X apparently ;; due to a universally crocked font width specification. Display it ;; as a space since that's what seems to be expected. ;; ;; (make-char-table 'generic) instead of (make-display-table) because ;; make-display-table isn't dumped, and this file is. (let ((tab (make-char-table 'generic))) (put-char-table 160 " " tab) (set-specifier current-display-table tab 'global 'x)) ;;; x-init.el ends here