Mercurial > hg > xemacs-beta
annotate lisp/x-win-xfree86.el @ 5639:1d1f385c9149
Call XKeysymToString() much less, it leaks.
src/ChangeLog addition:
2012-01-08 Aidan Kehoe <kehoea@parhasard.net>
* device-x.c:
* device-x.c (syms_of_device_x):
Move #'x-keysym-on-keyboard{,-sans-modifiers}-p to Lisp, the hash
table no longer stores the X keysyms, so we need to manipulate any
strings we have been handed.
* event-Xt.c (x_has_keysym):
Don't call XKeysymToString() here, it leaks; trust
x_keysym_to_emacs_keysym() instead.
* event-Xt.c (x_keysym_to_emacs_keysym):
No longer leak when looking up the strings for keysyms of the form
UABCD.
lisp/ChangeLog addition:
2012-01-08 Aidan Kehoe <kehoea@parhasard.net>
* x-init.el:
* x-init.el (pseudo-canonicalize-keysym): New.
* x-init.el: Move #'x-keysym-on-keyboard-sans-modifiers-p,
#'x-keysym-on-keyboard-p here from device-x.c, some string
manipulation it now needs to do is far easier in Lisp.
* x-win-xfree86.el:
* x-win-xfree86.el (x-win-init-xfree86):
No longer call #'x-keysym-on-keyboard{,-sans-modifiers}-p,
implement it ourselves cheaply.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 08 Jan 2012 20:41:37 +0000 |
| parents | 8861440b1aa4 |
| children |
| 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 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
11 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
12 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
13 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
14 ;; option) any later version. |
| 428 | 15 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
16 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
17 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
18 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
19 ;; for more details. |
| 428 | 20 |
| 21 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5165
diff
changeset
|
22 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 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 something running XFree86 (Linux, | |
| 28 ;; NetBSD, FreeBSD, and perhaps other Intel Unixen). | |
| 29 | |
| 30 ;;; #### bleck!!! Use key-translation-map! | |
| 31 | |
| 32 ;;; #### Counter-bleck!! We shouldn't override a user binding for F13. | |
| 33 ;;; So we use function-key-map for now. | |
| 34 ;;; When we've implemented a fallback-style equivalent of | |
| 35 ;;; keyboard-translate-table, we'll use that instead. (martin) | |
| 36 | |
| 37 ;; For no obvious reason, shift-F1 is called F13, although Meta-F1 and | |
| 38 ;; Control-F1 have normal names. | |
| 39 | |
| 502 | 40 ;;; Code: |
| 41 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
42 (defun x-win-init-xfree86 (device) |
| 3171 | 43 |
| 44 ;; We know this keyboard is an XFree86 keyboard. As such, we can predict | |
| 45 ;; what key scan codes will correspond to the keys on US keyboard layout, | |
| 46 ;; and we can use that information to fall back to the US layout when | |
| 47 ;; looking up commands that would otherwise fail. (Cf. the hard-coding of | |
| 48 ;; this information in /usr/X11R6/lib/X11/xkb/keycodes/xfree86 ) | |
| 49 ;; | |
| 50 ;; These settings for x-us-keymap-first-keycode and | |
| 51 ;; x-us-keymap-description were determined with | |
| 52 ;; | |
| 53 ;; setxkbmap us | |
| 54 ;; xmodmap -pke > keyboard-description.txt | |
| 55 ;; | |
| 56 ;; "8" is the key code of the first line, x-us-keymap-description is | |
| 57 ;; taken from the column describing the bindings. | |
| 58 | |
| 59 (setq x-us-keymap-first-keycode 8 | |
| 60 x-us-keymap-description | |
| 61 [nil nil [?1 ?!] [?2 ?@] [?3 ?\#] [?4 ?$] [?5 ?%] [?6 ?^] [?7 ?&] | |
| 62 [?8 ?*] [?9 ?\(] [?0 ?\)] [?- ?_] [?= ?+] nil ?\t [?q ?Q] | |
| 63 [?w ?W] [?e ?E] [?r ?R] [?t ?T] [?y ?Y] [?u ?U] [?i ?I] [?o ?O] | |
| 64 [?p ?P] [?\[ ?{] [?\] ?}] nil nil [?a ?A] [?s ?S] [?d ?D] | |
| 65 [?f ?F] [?g ?G] [?h ?H] [?j ?J] [?k ?K] [?l ?L] [?\; ?:] | |
| 66 [?\' ?\"] [?\` ?~] nil [?\\ ?|] [?z ?Z] [?x ?X] [?c ?C] | |
| 67 [?v ?V] [?b ?B] [?n ?N] [?m ?M] [?\, ?<] [?\. ?>] [?/ ?\?] | |
| 68 nil ?* nil ?\ nil nil nil nil nil nil nil nil nil nil nil | |
| 69 nil nil ?7 ?8 ?9 ?- ?4 ?5 ?6 ?+ ?1 ?2 ?3 ?0 ?\. nil nil | |
| 70 [?< ?>] nil nil nil nil nil nil nil nil nil nil nil nil | |
| 71 nil nil nil nil nil ?/ nil nil nil nil nil nil nil nil | |
| 72 nil nil nil nil nil ?=]) | |
| 73 | |
| 428 | 74 (loop for (key sane-key) in |
| 75 '((f13 f1) | |
| 76 (f14 f2) | |
| 77 (f15 f3) | |
| 78 (f16 f4) | |
| 79 (f17 f5) | |
| 80 (f18 f6) | |
| 81 (f19 f7) | |
| 82 (f20 f8) | |
| 83 (f21 f9) | |
| 84 (f22 f10) | |
| 85 (f23 f11) | |
| 86 (f24 f12)) | |
|
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
87 ;; Get the correct value for function-key-map |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
88 with function-key-map = (symbol-value-in-console 'function-key-map |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
89 (device-console device) |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
90 function-key-map) |
|
5639
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
91 with x-keysym-hash-table = (x-keysym-hash-table device) |
|
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
92 |
|
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
93 initially |
|
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
94 (when (gethash 'iso-left-tab x-keysym-hash-table) |
|
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
95 (define-key function-key-map 'iso-left-tab [(shift tab)])) |
|
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
96 |
| 428 | 97 do |
|
5639
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
98 (when (not (memq (gethash key x-keysym-hash-table) '(nil sans-modifiers))) |
| 428 | 99 ;; define also the control, meta, and meta-control versions. |
| 100 (loop for mods in '(() (control) (meta) (meta control)) do | |
|
5639
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
101 (define-key function-key-map `[(,@mods ,key)] |
|
1d1f385c9149
Call XKeysymToString() much less, it leaks.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5490
diff
changeset
|
102 `[(shift ,@mods ,sane-key)]))))) |
| 428 | 103 |
| 104 ;;; x-win-xfree86.el ends here |