Mercurial > hg > xemacs-beta
view lisp/x-win-xfree86.el @ 5619:75ad4969a16d
Replace the 'flush face property with the opposite 'shrink one.
lisp/ChangeLog addition:
2011-12-26 Didier Verna <didier@xemacs.org>
* cl-macs.el (face-flush-p): Removed.
* cl-macs.el (face-shrink-p): New.
* faces.el (face-flush-p): Removed.
* faces.el (face-shrink-p): New.
* faces.el (set-face-flush-p): Removed.
* faces.el (set-face-shrink-p): New.
* cus-face.el (custom-face-attributes):
* faces.el (set-face-property):
* faces.el (face-equal):
* x-faces.el (x-init-face-from-resources):
* x-faces.el (make-face-x-resource-internal): Replace the 'flush
property with the opposite 'shrink one.
src/ChangeLog addition:
2011-12-26 Didier Verna <didier@xemacs.org>
* lisp.h:
* faces.c (mark_face):
* faces.c (face_equal):
* faces.c (face_getprop):
* faces.c (face_putprop):
* faces.c (face_remprop):
* faces.c (face_plist):
* faces.c (reset_face):
* faces.c (update_face_inheritance_mapper):
* faces.c (Fmake_face):
* faces.c (update_face_cachel_data):
* faces.c (merge_face_cachel_data):
* faces.c (Fcopy_face):
* faces.c (syms_of_faces):
* faces.c (vars_of_faces):
* faces.c (complex_vars_of_faces):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* faces.h (WINDOW_FACE_CACHEL_SHRINK_P):
* faces.h (FACE_SHRINK_P):
* fontcolor.c (face_boolean_validate): Replace the 'flush property
with the opposite 'shrink one.
* redisplay.c (create_text_block):
* redisplay.c (create_string_text_block): Ditto. Invert the logic
for storing a new clear_findex in the display lines.
author | Didier Verna <didier@xemacs.org> |
---|---|
date | Mon, 26 Dec 2011 15:04:25 +0100 |
parents | 8861440b1aa4 |
children | 1d1f385c9149 |
line wrap: on
line source
;;; x-win-xfree86.el --- runtime initialization for XFree86 servers ;; Copyright (C) 1995 Sun Microsystems, Inc. ;; Copyright (C) 1995 Ben Wing. ;; Author: Ben Wing ;; Author: Martin Buchholz (rewritten to use function-key-map) ;; Keywords: terminals ;; 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; This file is loaded by x-win.el at run-time when we are sure that XEmacs ;; is running on the display of something running XFree86 (Linux, ;; NetBSD, FreeBSD, and perhaps other Intel Unixen). ;;; #### bleck!!! Use key-translation-map! ;;; #### Counter-bleck!! We shouldn't override a user binding for F13. ;;; So we use function-key-map for now. ;;; When we've implemented a fallback-style equivalent of ;;; keyboard-translate-table, we'll use that instead. (martin) ;; For no obvious reason, shift-F1 is called F13, although Meta-F1 and ;; Control-F1 have normal names. ;;; Code: (globally-declare-fboundp '(x-keysym-on-keyboard-p x-keysym-on-keyboard-sans-modifiers-p)) (defun x-win-init-xfree86 (device) ;; We know this keyboard is an XFree86 keyboard. As such, we can predict ;; what key scan codes will correspond to the keys on US keyboard layout, ;; and we can use that information to fall back to the US layout when ;; looking up commands that would otherwise fail. (Cf. the hard-coding of ;; this information in /usr/X11R6/lib/X11/xkb/keycodes/xfree86 ) ;; ;; These settings for x-us-keymap-first-keycode and ;; x-us-keymap-description were determined with ;; ;; setxkbmap us ;; xmodmap -pke > keyboard-description.txt ;; ;; "8" is the key code of the first line, x-us-keymap-description is ;; taken from the column describing the bindings. (setq x-us-keymap-first-keycode 8 x-us-keymap-description [nil nil [?1 ?!] [?2 ?@] [?3 ?\#] [?4 ?$] [?5 ?%] [?6 ?^] [?7 ?&] [?8 ?*] [?9 ?\(] [?0 ?\)] [?- ?_] [?= ?+] nil ?\t [?q ?Q] [?w ?W] [?e ?E] [?r ?R] [?t ?T] [?y ?Y] [?u ?U] [?i ?I] [?o ?O] [?p ?P] [?\[ ?{] [?\] ?}] nil nil [?a ?A] [?s ?S] [?d ?D] [?f ?F] [?g ?G] [?h ?H] [?j ?J] [?k ?K] [?l ?L] [?\; ?:] [?\' ?\"] [?\` ?~] nil [?\\ ?|] [?z ?Z] [?x ?X] [?c ?C] [?v ?V] [?b ?B] [?n ?N] [?m ?M] [?\, ?<] [?\. ?>] [?/ ?\?] nil ?* nil ?\ nil nil nil nil nil nil nil nil nil nil nil nil nil ?7 ?8 ?9 ?- ?4 ?5 ?6 ?+ ?1 ?2 ?3 ?0 ?\. nil nil [?< ?>] nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil ?/ nil nil nil nil nil nil nil nil nil nil nil nil nil ?=]) (when (x-keysym-on-keyboard-p 'iso-left-tab device) (define-key function-key-map 'iso-left-tab [(shift tab)])) (loop for (key sane-key) in '((f13 f1) (f14 f2) (f15 f3) (f16 f4) (f17 f5) (f18 f6) (f19 f7) (f20 f8) (f21 f9) (f22 f10) (f23 f11) (f24 f12)) ;; Get the correct value for function-key-map with function-key-map = (symbol-value-in-console 'function-key-map (device-console device) function-key-map) do (when (and (x-keysym-on-keyboard-p key device) (not (x-keysym-on-keyboard-sans-modifiers-p key device))) ;; define also the control, meta, and meta-control versions. (loop for mods in '(() (control) (meta) (meta control)) do (define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)]) )))) ;;; x-win-xfree86.el ends here