Mercurial > hg > xemacs-beta
annotate lisp/x-init.el @ 4451:e214ff9f9507
Use char-tables, not vectors, to instantiate the display table specifiers.
2007-07-21 Aidan Kehoe <kehoea@parhasard.net>
* mule/cyril-util.el:
* mule/cyril-util.el (cyrillic-encode-koi8-r-char): Removed.
* mule/cyril-util.el (cyrillic-encode-alternativnyj-char):
Removed. No-one uses these functions in google.com/codesearch,
GNU have a comment doubting their utility, and their
implementation is trivial.
* mule/cyril-util.el (cyrillic-language-alist):
Reformatted.
* mule/cyril-util.el (standard-display-table)): Removed. It wasn't
used anyway.
* mule/cyril-util.el (standard-display-cyrillic-translit):
Rewrite it to work with character tables as display tables, and
not to abort with an error.
2007-07-21 Aidan Kehoe <kehoea@parhasard.net>
* disp-table.el:
* disp-table.el (make-display-table): Moved earlier in the file in
a weak attempt at making syncing with GNU easier.
* disp-table.el (frob-display-table):
Autoload it, accept TAG-SET, for editing specifiers.
* disp-table.el (describe-display-table):
Have it handle character sets.
* disp-table.el (standard-display-8bit-1):
* disp-table.el (standard-display-8bit):
* disp-table.el (standard-display-default-1):
* disp-table.el (standard-display-ascii):
* disp-table.el (standard-display-g1):
* disp-table.el (standard-display-graphic):
* disp-table.el (standard-display-underline):
* disp-table.el (standard-display-european):
Rework them all to use put-char-table, remove-char-table instead
of aset. Limit standard-display-g1, standard-display-graphic to
TTYs; have standard-display-underline work on X11 too.
* font.el (font-caps-display-table):
Use put-char-table instead of aset when editing a display table.
* x-init.el:
* x-init.el (tab):
Create the initial display table as a char-table, not a vector.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 24 Dec 2007 20:22:08 +0100 |
| parents | aa22980554d9 |
| children | e34711681f30 |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-init.el --- initialization code for X windows |
| 2 | |
| 3 ;; Copyright (C) 1990, 1993, 1994, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 5 ;; Copyright (C) 1995, 1996 Ben Wing. | |
| 6 | |
| 7 ;; Maintainer: XEmacs Development Team | |
| 8 ;; Keywords: terminals, dumped | |
| 9 | |
| 10 ;; This file is part of XEmacs. | |
| 11 | |
| 12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 13 ;; under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 ;; General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 23 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 24 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 25 ;; Boston, MA 02111-1307, USA. | |
| 26 | |
| 27 ;;; Synched up with: Not synched. | |
| 28 | |
| 29 ;;; Commentary: | |
| 30 | |
| 31 ;; This file is dumped with XEmacs (when X support is compiled in). | |
| 32 | |
| 33 ;;; Code: | |
| 34 | |
| 502 | 35 (globally-declare-fboundp |
| 36 '(x-keysym-on-keyboard-p | |
| 37 x-server-vendor x-init-specifier-from-resources init-mule-x-win)) | |
| 38 | |
| 39 (globally-declare-boundp | |
| 40 '(x-initial-argv-list)) | |
| 41 | |
| 428 | 42 ;; If you want to change this variable, this is the place you must do it. |
| 43 ;; Do not set it to a string containing periods. X doesn't like that. | |
| 44 ;(setq x-emacs-application-class "Emacs") | |
| 45 | |
| 46 (defgroup x nil | |
| 47 "The X Window system." | |
| 48 :group 'environment) | |
| 49 | |
| 50 ;; OpenWindows-like "find" processing. These functions are really Sunisms, | |
| 51 ;; but we put them here instead of in x-win-sun.el in case someone wants | |
| 52 ;; to use them when not running on a Sun console (presumably after binding | |
| 53 ;; them to different keys, or putting them on menus.) | |
| 54 | |
| 55 (defvar ow-find-last-string nil) | |
| 56 (defvar ow-find-last-clipboard nil) | |
| 57 | |
| 58 (defun ow-find (&optional backward-p) | |
| 59 "Search forward the next occurrence of the text of the selection." | |
| 60 (interactive) | |
| 442 | 61 (let ((sel (ignore-errors (get-selection))) |
| 62 (clip (ignore-errors (get-clipboard))) | |
| 428 | 63 text) |
| 64 (setq text (cond | |
| 65 (sel) | |
| 66 ((not (equal clip ow-find-last-clipboard)) | |
| 67 (setq ow-find-last-clipboard clip)) | |
| 68 (ow-find-last-string) | |
| 69 (t (error "No selection available")))) | |
| 70 (setq ow-find-last-string text) | |
| 71 (cond (backward-p | |
| 72 (search-backward text) | |
| 73 (set-mark (+ (point) (length text)))) | |
| 74 (t | |
| 75 (search-forward text) | |
| 76 (set-mark (- (point) (length text))))) | |
| 77 (zmacs-activate-region))) | |
| 78 | |
| 79 (defun ow-find-backward () | |
| 80 "Search backward for the previous occurrence of the text of the selection." | |
| 81 (interactive) | |
| 82 (ow-find t)) | |
| 83 | |
| 84 ;; Load X-server specific code. | |
| 85 ;; Specifically, load some code to repair the grievous damage that MIT and | |
| 86 ;; Sun have done to the default keymap for the Sun keyboards. | |
| 87 | |
| 88 (eval-when-compile | |
| 89 (defmacro x-define-dead-key (key map) | |
| 90 `(when (x-keysym-on-keyboard-p ',key) | |
| 91 (define-key function-key-map [,key] ',map)))) | |
| 92 | |
| 93 (defun x-initialize-compose () | |
| 94 "Enable compose key and dead key processing." | |
| 95 (autoload 'compose-map "x-compose" nil t 'keymap) | |
| 96 (autoload 'compose-acute-map "x-compose" nil t 'keymap) | |
| 97 (autoload 'compose-grave-map "x-compose" nil t 'keymap) | |
| 98 (autoload 'compose-cedilla-map "x-compose" nil t 'keymap) | |
| 99 (autoload 'compose-diaeresis-map "x-compose" nil t 'keymap) | |
| 100 (autoload 'compose-circumflex-map "x-compose" nil t 'keymap) | |
| 101 (autoload 'compose-tilde-map "x-compose" nil t 'keymap) | |
| 102 | |
| 103 (when (x-keysym-on-keyboard-p 'multi-key) | |
| 104 (define-key function-key-map [multi-key] 'compose-map)) | |
| 105 | |
| 106 ;; The dead keys might really be called just about anything, depending | |
| 107 ;; on the vendor. MIT thinks that the prefixes are "SunFA_", "D", and | |
| 108 ;; "hpmute_" for Sun, DEC, and HP respectively. However, OpenWindows 3 | |
| 109 ;; thinks that the prefixes are "SunXK_FA_", "DXK_", and "hpXK_mute_". | |
| 110 ;; And HP (who don't mention Sun and DEC at all) use "XK_mute_". | |
| 111 ;; Go figure. | |
| 112 | |
| 113 ;; Presumably if someone is running OpenWindows, they won't be using | |
| 114 ;; the DEC or HP keysyms, but if they are defined then that is possible, | |
| 115 ;; so in that case we accept them all. | |
| 116 | |
| 117 ;; If things seem not to be working, you might want to check your | |
| 118 ;; /usr/lib/X11/XKeysymDB file to see if your vendor has an equally | |
| 119 ;; mixed up view of what these keys should be called. | |
| 120 | |
| 121 ;; Canonical names: | |
| 122 (x-define-dead-key acute compose-acute-map) | |
| 123 (x-define-dead-key grave compose-grave-map) | |
| 124 (x-define-dead-key cedilla compose-cedilla-map) | |
| 125 (x-define-dead-key diaeresis compose-diaeresis-map) | |
| 126 (x-define-dead-key circumflex compose-circumflex-map) | |
| 127 (x-define-dead-key tilde compose-tilde-map) | |
| 128 (x-define-dead-key degree compose-ring-map) | |
| 129 | |
| 130 ;; Sun according to MIT: | |
| 131 (x-define-dead-key SunFA_Acute compose-acute-map) | |
| 132 (x-define-dead-key SunFA_Grave compose-grave-map) | |
| 133 (x-define-dead-key SunFA_Cedilla compose-cedilla-map) | |
| 134 (x-define-dead-key SunFA_Diaeresis compose-diaeresis-map) | |
| 135 (x-define-dead-key SunFA_Circum compose-circumflex-map) | |
| 136 (x-define-dead-key SunFA_Tilde compose-tilde-map) | |
| 137 | |
| 138 ;; Sun according to OpenWindows 2: | |
| 139 (x-define-dead-key Dead_Grave compose-grave-map) | |
| 140 (x-define-dead-key Dead_Circum compose-circumflex-map) | |
| 141 (x-define-dead-key Dead_Tilde compose-tilde-map) | |
| 142 | |
| 143 ;; Sun according to OpenWindows 3: | |
| 144 (x-define-dead-key SunXK_FA_Acute compose-acute-map) | |
| 145 (x-define-dead-key SunXK_FA_Grave compose-grave-map) | |
| 146 (x-define-dead-key SunXK_FA_Cedilla compose-cedilla-map) | |
| 147 (x-define-dead-key SunXK_FA_Diaeresis compose-diaeresis-map) | |
| 148 (x-define-dead-key SunXK_FA_Circum compose-circumflex-map) | |
| 149 (x-define-dead-key SunXK_FA_Tilde compose-tilde-map) | |
| 150 | |
| 151 ;; DEC according to MIT: | |
| 152 (x-define-dead-key Dacute_accent compose-acute-map) | |
| 153 (x-define-dead-key Dgrave_accent compose-grave-map) | |
| 154 (x-define-dead-key Dcedilla_accent compose-cedilla-map) | |
| 155 (x-define-dead-key Dcircumflex_accent compose-circumflex-map) | |
| 156 (x-define-dead-key Dtilde compose-tilde-map) | |
| 157 (x-define-dead-key Dring_accent compose-ring-map) | |
| 158 | |
| 159 ;; DEC according to OpenWindows 3: | |
| 160 (x-define-dead-key DXK_acute_accent compose-acute-map) | |
| 161 (x-define-dead-key DXK_grave_accent compose-grave-map) | |
| 162 (x-define-dead-key DXK_cedilla_accent compose-cedilla-map) | |
| 163 (x-define-dead-key DXK_circumflex_accent compose-circumflex-map) | |
| 164 (x-define-dead-key DXK_tilde compose-tilde-map) | |
| 165 (x-define-dead-key DXK_ring_accent compose-ring-map) | |
| 166 | |
| 167 ;; HP according to MIT: | |
| 168 (x-define-dead-key hpmute_acute compose-acute-map) | |
| 169 (x-define-dead-key hpmute_grave compose-grave-map) | |
| 170 (x-define-dead-key hpmute_diaeresis compose-diaeresis-map) | |
| 171 (x-define-dead-key hpmute_asciicircum compose-circumflex-map) | |
| 172 (x-define-dead-key hpmute_asciitilde compose-tilde-map) | |
| 173 | |
| 174 ;; Empirically discovered on Linux XFree86 MetroX: | |
| 175 (x-define-dead-key usldead_acute compose-acute-map) | |
| 176 (x-define-dead-key usldead_grave compose-grave-map) | |
| 177 (x-define-dead-key usldead_diaeresis compose-diaeresis-map) | |
| 178 (x-define-dead-key usldead_asciicircum compose-circumflex-map) | |
| 179 (x-define-dead-key usldead_asciitilde compose-tilde-map) | |
| 180 | |
| 181 ;; HP according to OpenWindows 3: | |
| 182 (x-define-dead-key hpXK_mute_acute compose-acute-map) | |
| 183 (x-define-dead-key hpXK_mute_grave compose-grave-map) | |
| 184 (x-define-dead-key hpXK_mute_diaeresis compose-diaeresis-map) | |
| 185 (x-define-dead-key hpXK_mute_asciicircum compose-circumflex-map) | |
| 186 (x-define-dead-key hpXK_mute_asciitilde compose-tilde-map) | |
| 187 | |
| 188 ;; HP according to HP-UX 8.0: | |
| 189 (x-define-dead-key XK_mute_acute compose-acute-map) | |
| 190 (x-define-dead-key XK_mute_grave compose-grave-map) | |
| 191 (x-define-dead-key XK_mute_diaeresis compose-diaeresis-map) | |
| 192 (x-define-dead-key XK_mute_asciicircum compose-circumflex-map) | |
| 193 (x-define-dead-key XK_mute_asciitilde compose-tilde-map) | |
| 194 | |
| 2828 | 195 ;; [[ XFree86 seems to use lower case and a hyphen ]] Not true; they use |
| 196 ;; lower case and an underscore. XEmacs converts the underscore to a | |
| 197 ;; hyphen in x_keysym_to_emacs_keysym because the keysym is in the | |
| 198 ;; "Keyboard" character set, which is just totally fucking random, | |
| 199 ;; considering it doesn't happen for any other character sets. | |
| 428 | 200 (x-define-dead-key dead-acute compose-acute-map) |
| 201 (x-define-dead-key dead-grave compose-grave-map) | |
| 202 (x-define-dead-key dead-cedilla compose-cedilla-map) | |
| 203 (x-define-dead-key dead-diaeresis compose-diaeresis-map) | |
| 204 (x-define-dead-key dead-circum compose-circumflex-map) | |
| 205 (x-define-dead-key dead-circumflex compose-circumflex-map) | |
| 206 (x-define-dead-key dead-tilde compose-tilde-map) | |
| 207 ) | |
| 208 | |
| 209 (eval-when-compile | |
| 210 (load "x-win-sun" nil t) | |
| 211 (load "x-win-xfree86" nil t)) | |
| 212 | |
| 213 (defun x-initialize-keyboard () | |
| 214 "Perform X-Server-specific initializations. Don't call this." | |
| 215 ;; This is some heuristic junk that tries to guess whether this is | |
| 216 ;; a Sun keyboard. | |
| 217 ;; | |
| 218 ;; One way of implementing this (which would require C support) would | |
| 219 ;; be to examine the X keymap itself and see if the layout looks even | |
| 220 ;; remotely like a Sun - check for the Find key on a particular | |
| 221 ;; keycode, for example. It'd be nice to have a table of this to | |
| 222 ;; recognize various keyboards; see also xkeycaps. | |
| 223 ;; | |
| 224 ;; Note that we cannot use most vendor-provided proprietary keyboard | |
| 225 ;; APIs to identify the keyboard - those only work on the console. | |
| 226 ;; xkeycaps has the same problem when running `remotely'. | |
| 227 (let ((vendor (x-server-vendor))) | |
| 228 (cond ((or (string-match "Sun Microsystems" vendor) | |
| 229 ;; MIT losingly fails to tell us what hardware the X server | |
| 230 ;; is managing, so assume all MIT displays are Suns... HA HA! | |
| 231 (string-equal "MIT X Consortium" vendor) | |
| 232 (string-equal "X Consortium" vendor)) | |
| 233 ;; Ok, we think this could be a Sun keyboard. Run the Sun code. | |
| 234 (x-win-init-sun)) | |
| 4062 | 235 ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) |
| 428 | 236 ;; Those XFree86 people do some weird keysym stuff, too. |
| 3475 | 237 (x-win-init-xfree86))))) |
| 428 | 238 |
| 3360 | 239 ;; Moved from x-toolbar.el, since InfoDock doesn't dump x-toolbar.el. |
| 428 | 240 (defun x-init-toolbar-from-resources (locale) |
| 241 (loop for (specifier . resname) in | |
| 242 `(( ,top-toolbar-height . "topToolBarHeight") | |
| 243 (,bottom-toolbar-height . "bottomToolBarHeight") | |
| 244 ( ,left-toolbar-width . "leftToolBarWidth") | |
| 245 ( ,right-toolbar-width . "rightToolBarWidth") | |
| 246 | |
| 247 ( ,top-toolbar-border-width . "topToolBarBorderWidth") | |
| 248 (,bottom-toolbar-border-width . "bottomToolBarBorderWidth") | |
| 249 ( ,left-toolbar-border-width . "leftToolBarBorderWidth") | |
| 250 ( ,right-toolbar-border-width . "rightToolBarBorderWidth")) | |
| 251 do | |
| 252 (x-init-specifier-from-resources | |
| 253 specifier 'natnum locale (cons resname (upcase-initials resname))))) | |
| 254 | |
| 255 (defvar pre-x-win-initted nil) | |
| 256 | |
| 257 (defun init-pre-x-win () | |
| 258 "Initialize X Windows at startup (pre). Don't call this." | |
| 259 (when (not pre-x-win-initted) | |
| 260 (setq initial-frame-plist (if initial-frame-unmapped-p | |
| 261 '(initially-unmapped t) | |
| 262 nil)) | |
| 263 (setq pre-x-win-initted t))) | |
| 264 | |
| 265 (defvar x-win-initted nil) | |
| 266 | |
| 267 (defun init-x-win () | |
| 268 "Initialize X Windows at startup. Don't call this." | |
| 269 (when (not x-win-initted) | |
| 270 (defvar x-app-defaults-directory) | |
| 271 (init-pre-x-win) | |
| 872 | 272 (if (featurep 'mule) (init-mule-x-win)) |
| 428 | 273 |
| 274 ;; Open the X display when this file is loaded | |
| 275 ;; (Note that the first frame is created later.) | |
| 276 (setq x-initial-argv-list (cons (car command-line-args) | |
| 277 command-line-args-left)) | |
| 278 ;; Locate the app-defaults directory | |
| 279 (when (and (boundp 'x-app-defaults-directory) | |
| 280 (null x-app-defaults-directory)) | |
| 281 (setq x-app-defaults-directory | |
| 282 (locate-data-directory "app-defaults"))) | |
| 283 (make-x-device nil) | |
| 284 (setq command-line-args-left (cdr x-initial-argv-list)) | |
| 285 (setq x-win-initted t))) | |
| 286 | |
| 287 (defvar post-x-win-initted nil) | |
| 288 | |
| 289 (defun init-post-x-win () | |
| 290 "Initialize X Windows at startup (post). Don't call this." | |
| 291 (when (not post-x-win-initted) | |
| 872 | 292 ;(if (featurep 'mule) (init-mule-x-win)) |
| 428 | 293 ;; Motif-ish bindings |
| 294 ;; The following two were generally unliked. | |
| 295 ;;(define-key global-map '(shift delete) 'kill-primary-selection) | |
| 296 ;;(define-key global-map '(control delete) 'delete-primary-selection) | |
| 297 (define-key global-map '(shift insert) 'yank-clipboard-selection) | |
| 298 (define-key global-map '(control insert) 'copy-primary-selection) | |
| 299 ;; These are Sun-isms. | |
| 300 (define-key global-map 'copy 'copy-primary-selection) | |
| 301 (define-key global-map 'paste 'yank-clipboard-selection) | |
| 302 (define-key global-map 'cut 'kill-primary-selection) | |
| 303 | |
| 304 ;;(define-key global-map '(shift menu) 'x-goto-menubar) ;NYI | |
| 305 | |
| 306 (setq post-x-win-initted t))) | |
| 307 | |
| 308 ;;; Keyboard initialization needs to be done differently for each X | |
| 309 ;;; console, so use create-console-hook. | |
| 310 (when (featurep 'x) | |
| 311 (add-hook | |
| 312 'create-console-hook | |
| 313 (lambda (console) | |
| 314 (letf (((selected-console) console)) | |
| 315 (when (eq 'x (console-type console)) | |
| 316 (x-initialize-keyboard) | |
| 317 (x-initialize-compose)))))) | |
| 318 | |
| 319 (defun make-frame-on-display (display &optional props) | |
| 320 "Create a frame on the X display named DISPLAY. | |
| 321 DISPLAY should be a standard display string such as \"unix:0\", | |
| 322 or nil for the display specified on the command line or in the | |
| 323 DISPLAY environment variable. | |
| 324 | |
| 325 PROPS should be a plist of properties, as in the call to `make-frame'. | |
| 326 | |
| 327 This function opens a connection to the display or reuses an existing | |
| 328 connection. | |
| 329 | |
| 330 This function is a trivial wrapper around `make-frame-on-device'." | |
| 331 (interactive "sMake frame on display: ") | |
| 332 (if (equal display "") (setq display nil)) | |
| 333 (make-frame-on-device 'x display props)) | |
| 334 | |
| 335 ;; Character 160 (octal 0240) displays incorrectly under X apparently | |
| 336 ;; due to a universally crocked font width specification. Display it | |
| 337 ;; as a space since that's what seems to be expected. | |
| 338 ;; | |
|
4451
e214ff9f9507
Use char-tables, not vectors, to instantiate the display table specifiers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4062
diff
changeset
|
339 ;; (make-char-table 'generic) instead of (make-display-table) because |
|
e214ff9f9507
Use char-tables, not vectors, to instantiate the display table specifiers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4062
diff
changeset
|
340 ;; make-display-table isn't dumped, and this file is. |
| 428 | 341 |
|
4451
e214ff9f9507
Use char-tables, not vectors, to instantiate the display table specifiers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4062
diff
changeset
|
342 (let ((tab (make-char-table 'generic))) |
|
e214ff9f9507
Use char-tables, not vectors, to instantiate the display table specifiers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4062
diff
changeset
|
343 (put-char-table 160 " " tab) |
| 428 | 344 (set-specifier current-display-table tab 'global 'x)) |
| 345 | |
| 346 ;;; x-init.el ends here |