Mercurial > hg > xemacs-beta
annotate lisp/x-win-xfree86.el @ 5047:07dcc7000bbf
put width before height consistently, fix a real bug found in the process
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* EmacsFrame.c (EmacsFrameRecomputeCellSize):
* faces.c (default_face_font_info):
* faces.c (default_face_width_and_height):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-gtk.c (gtk_recompute_cell_sizes):
* frame.c:
* frame.c (frame_conversion_internal_1):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-widget.c (widget_instantiate):
* glyphs-widget.c (tree_view_query_geometry):
* glyphs-widget.c (Fwidget_logical_to_character_width):
* glyphs-widget.c (Fwidget_logical_to_character_height):
* indent.c (vmotion_pixels):
* redisplay-output.c (get_cursor_size_and_location):
* redisplay-xlike-inc.c (XLIKE_output_eol_cursor):
* redisplay-xlike-inc.c (XLIKE_flash):
* redisplay.c (calculate_baseline):
* redisplay.c (start_with_point_on_display_line):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* window.c (margin_width_internal):
* window.c (frame_size_valid_p):
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
* window.c (set_window_pixsize):
* window.c (window_pixel_height_to_char_height):
* window.c (window_char_height_to_pixel_height):
* window.c (window_displayed_height):
* window.c (window_pixel_width_to_char_width):
* window.c (window_char_width_to_pixel_width):
* window.c (change_window_height):
* window.c (window_scroll):
* window.h:
IMPORTANT: Aidan and Carbon Repo, please pay attention and fix
appropriately!
Rename: default_face_height_and_width -> default_face_width_and_height
and reverse width/height arguments.
Reverse width/height arguments to the following functions:
-- default_face_font_info
-- default_face_height_and_width (see above)
-- check_frame_size
-- frame_size_valid_p (made into a static function)
Fix a redisplay bug where args to default_face_height_and_width
were in the wrong order.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 20 Feb 2010 18:56:01 -0600 |
| parents | e3ef34f57070 |
| children | 17fe69fff7fa |
| 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)) | |
|
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
93 ;; 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
|
94 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
|
95 (device-console device) |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
96 function-key-map) |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
97 |
| 428 | 98 do |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
99 (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
|
100 (not (x-keysym-on-keyboard-sans-modifiers-p key device))) |
| 428 | 101 ;; define also the control, meta, and meta-control versions. |
| 102 (loop for mods in '(() (control) (meta) (meta control)) do | |
| 103 (define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)]) | |
| 104 )))) | |
| 105 | |
| 106 ;;; x-win-xfree86.el ends here |