Mercurial > hg > xemacs-beta
annotate lisp/x-init.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 20:51:18 -0600 |
parents | fdc76fec36d3 |
children | dceee3855f15 |
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 | |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
40 '(x-initial-argv-list x-app-defaults-directory)) |
502 | 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. | |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
87 (defun x-initialize-compose (device) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
88 "Enable compose key and dead key processing on DEVICE." |
4627
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
89 (loop for map in '(compose-map compose-acute-map compose-grave-map |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
90 compose-cedilla-map compose-diaeresis-map |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
91 compose-circumflex-map compose-tilde-map |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
92 compose-ring-map compose-caron-map compose-macron-map |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
93 compose-breve-map compose-dot-map |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
94 compose-doubleacute-map compose-ogonek-map |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
95 compose-hook-map compose-horn-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
96 do (autoload map "x-compose" nil t 'keymap)) |
428 | 97 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
98 (loop |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
99 for (key map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
100 ;; The dead keys might really be called just about anything, depending |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
101 ;; on the vendor. MIT thinks that the prefixes are "SunFA_", "D", and |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
102 ;; "hpmute_" for Sun, DEC, and HP respectively. However, OpenWindows 3 |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
103 ;; thinks that the prefixes are "SunXK_FA_", "DXK_", and "hpXK_mute_". |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
104 ;; And HP (who don't mention Sun and DEC at all) use "XK_mute_". Go |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
105 ;; figure. |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
106 |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
107 ;; Presumably if someone is running OpenWindows, they won't be using the |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
108 ;; DEC or HP keysyms, but if they are defined then that is possible, so |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
109 ;; in that case we accept them all. |
428 | 110 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
111 ;; If things seem not to be working, you might want to check your |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
112 ;; /usr/lib/X11/XKeysymDB file to see if your vendor has an equally |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
113 ;; mixed up view of what these keys should be called. |
428 | 114 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
115 ;; Canonical names: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
116 in '((acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
117 (grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
118 (cedilla compose-cedilla-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
119 (diaeresis compose-diaeresis-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
120 (circumflex compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
121 (tilde compose-tilde-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
122 (degree compose-ring-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
123 (multi-key compose-map) |
428 | 124 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
125 ;; Sun according to MIT: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
126 (SunFA_Acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
127 (SunFA_Grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
128 (SunFA_Cedilla compose-cedilla-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
129 (SunFA_Diaeresis compose-diaeresis-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
130 (SunFA_Circum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
131 (SunFA_Tilde compose-tilde-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
132 |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
133 ;; Sun according to OpenWindows 2: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
134 (Dead_Grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
135 (Dead_Circum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
136 (Dead_Tilde compose-tilde-map) |
428 | 137 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
138 ;; Sun according to OpenWindows 3: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
139 (SunXK_FA_Acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
140 (SunXK_FA_Grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
141 (SunXK_FA_Cedilla compose-cedilla-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
142 (SunXK_FA_Diaeresis compose-diaeresis-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
143 (SunXK_FA_Circum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
144 (SunXK_FA_Tilde compose-tilde-map) |
428 | 145 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
146 ;; DEC according to MIT: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
147 (Dacute_accent compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
148 (Dgrave_accent compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
149 (Dcedilla_accent compose-cedilla-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
150 (Dcircumflex_accent compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
151 (Dtilde compose-tilde-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
152 (Dring_accent compose-ring-map) |
428 | 153 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
154 ;; DEC according to OpenWindows 3: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
155 (DXK_acute_accent compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
156 (DXK_grave_accent compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
157 (DXK_cedilla_accent compose-cedilla-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
158 (DXK_circumflex_accent compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
159 (DXK_tilde compose-tilde-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
160 (DXK_ring_accent compose-ring-map) |
428 | 161 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
162 ;; HP according to MIT: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
163 (hpmute_acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
164 (hpmute_grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
165 (hpmute_diaeresis compose-diaeresis-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
166 (hpmute_asciicircum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
167 (hpmute_asciitilde compose-tilde-map) |
428 | 168 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
169 ;; Empirically discovered on Linux XFree86 MetroX: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
170 (usldead_acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
171 (usldead_grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
172 (usldead_diaeresis compose-diaeresis-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
173 (usldead_asciicircum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
174 (usldead_asciitilde compose-tilde-map) |
428 | 175 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
176 ;; HP according to OpenWindows 3: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
177 (hpXK_mute_acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
178 (hpXK_mute_grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
179 (hpXK_mute_diaeresis compose-diaeresis-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
180 (hpXK_mute_asciicircum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
181 (hpXK_mute_asciitilde compose-tilde-map) |
428 | 182 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
183 ;; HP according to HP-UX 8.0: |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
184 (XK_mute_acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
185 (XK_mute_grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
186 (XK_mute_diaeresis compose-diaeresis-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
187 (XK_mute_asciicircum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
188 (XK_mute_asciitilde compose-tilde-map) |
428 | 189 |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
190 ;; [[ XFree86 seems to use lower case and a hyphen ]] Not true; |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
191 ;; they use lower case and an underscore. XEmacs converts the |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
192 ;; underscore to a hyphen in x_keysym_to_emacs_keysym because the |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
193 ;; keysym is in the "Keyboard" character set, which is just totally |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
194 ;; fucking random, considering it doesn't happen for any other |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
195 ;; character sets. |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
196 (dead-acute compose-acute-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
197 (dead-grave compose-grave-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
198 (dead-cedilla compose-cedilla-map) |
4627
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
199 (dead-diaeresis compose-diaeresis-map) |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
200 (dead-circum compose-circumflex-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
201 (dead-circumflex compose-circumflex-map) |
4627
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
202 (dead-tilde compose-tilde-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
203 (dead-abovering compose-ring-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
204 (dead-caron compose-caron-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
205 (dead-macron compose-macron-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
206 (dead-breve compose-breve-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
207 (dead-abovedot compose-dot-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
208 (dead-doubleacute compose-doubleacute-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
209 (dead-ogonek compose-ogonek-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
210 (dead-hook compose-hook-map) |
fdc76fec36d3
Vastly expand the characters x-compose.el supports.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4489
diff
changeset
|
211 (dead-horn compose-horn-map)) |
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
212 |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
213 ;; 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
|
214 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
|
215 (device-console device) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
216 function-key-map) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
217 do (when (x-keysym-on-keyboard-p key device) |
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
218 (define-key function-key-map (vector key) map)))) |
428 | 219 |
220 (eval-when-compile | |
221 (load "x-win-sun" nil t) | |
222 (load "x-win-xfree86" nil t)) | |
223 | |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
224 (defun x-initialize-keyboard (device) |
428 | 225 "Perform X-Server-specific initializations. Don't call this." |
226 ;; This is some heuristic junk that tries to guess whether this is | |
227 ;; a Sun keyboard. | |
228 ;; | |
229 ;; One way of implementing this (which would require C support) would | |
230 ;; be to examine the X keymap itself and see if the layout looks even | |
231 ;; remotely like a Sun - check for the Find key on a particular | |
232 ;; keycode, for example. It'd be nice to have a table of this to | |
233 ;; recognize various keyboards; see also xkeycaps. | |
234 ;; | |
235 ;; Note that we cannot use most vendor-provided proprietary keyboard | |
236 ;; APIs to identify the keyboard - those only work on the console. | |
237 ;; xkeycaps has the same problem when running `remotely'. | |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
238 (let ((vendor (x-server-vendor device))) |
428 | 239 (cond ((or (string-match "Sun Microsystems" vendor) |
240 ;; MIT losingly fails to tell us what hardware the X server | |
241 ;; is managing, so assume all MIT displays are Suns... HA HA! | |
242 (string-equal "MIT X Consortium" vendor) | |
243 (string-equal "X Consortium" vendor)) | |
244 ;; Ok, we think this could be a Sun keyboard. Run the Sun code. | |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
245 (x-win-init-sun device)) |
4062 | 246 ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) |
428 | 247 ;; Those XFree86 people do some weird keysym stuff, too. |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
248 (x-win-init-xfree86 device))))) |
428 | 249 |
3360 | 250 ;; Moved from x-toolbar.el, since InfoDock doesn't dump x-toolbar.el. |
428 | 251 (defun x-init-toolbar-from-resources (locale) |
252 (loop for (specifier . resname) in | |
253 `(( ,top-toolbar-height . "topToolBarHeight") | |
254 (,bottom-toolbar-height . "bottomToolBarHeight") | |
255 ( ,left-toolbar-width . "leftToolBarWidth") | |
256 ( ,right-toolbar-width . "rightToolBarWidth") | |
257 | |
258 ( ,top-toolbar-border-width . "topToolBarBorderWidth") | |
259 (,bottom-toolbar-border-width . "bottomToolBarBorderWidth") | |
260 ( ,left-toolbar-border-width . "leftToolBarBorderWidth") | |
261 ( ,right-toolbar-border-width . "rightToolBarBorderWidth")) | |
262 do | |
263 (x-init-specifier-from-resources | |
264 specifier 'natnum locale (cons resname (upcase-initials resname))))) | |
265 | |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
266 (defvar make-device-early-x-entry-point-called-p nil |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
267 "Whether `make-device-early-x-entry-point' has been called, at least once. |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
268 |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
269 Much of the X11-specific Lisp init code should only be called the first time |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
270 an X11 device is created; this variable allows for that.") |
428 | 271 |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
272 (defvar make-device-late-x-entry-point-called-p nil |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
273 "Whether `make-device-late-x-entry-point' has been called, at least once. |
428 | 274 |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
275 Much of the X11-specific Lisp init code should only be called the first time |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
276 an X11 device is created; this variable allows for that.") |
428 | 277 |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
278 (defun make-device-early-x-entry-point () |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
279 "Entry point to set up the Lisp environment for X device creation." |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
280 (unless make-device-early-x-entry-point-called-p |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
281 (setq initial-frame-plist |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
282 (and initial-frame-unmapped-p '(initially-unmapped t)) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
283 ;; Save the argv value. |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
284 x-initial-argv-list |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
285 (cons (car command-line-args) command-line-args-left) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
286 ;; Locate the app-defaults directory |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
287 x-app-defaults-directory |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
288 (or x-app-defaults-directory (locate-data-directory "app-defaults")) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
289 make-device-early-x-entry-point-called-p t))) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
290 |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
291 (defun make-device-late-x-entry-point (device) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
292 "Entry point to do any Lisp-level X device-specific initialization." |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
293 ;; General code, called on every X device created: |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
294 (x-initialize-keyboard device) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
295 (x-initialize-compose device) |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
296 ;; And the following code is to be called once, the first time an X11 |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
297 ;; device is created: |
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
298 (unless make-device-late-x-entry-point-called-p |
428 | 299 (setq command-line-args-left (cdr x-initial-argv-list)) |
300 ;; Motif-ish bindings | |
301 (define-key global-map '(shift insert) 'yank-clipboard-selection) | |
302 (define-key global-map '(control insert) 'copy-primary-selection) | |
303 ;; These are Sun-isms. | |
304 (define-key global-map 'copy 'copy-primary-selection) | |
305 (define-key global-map 'paste 'yank-clipboard-selection) | |
306 (define-key global-map 'cut 'kill-primary-selection) | |
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4451
diff
changeset
|
307 (setq make-device-late-x-entry-point-called-p t))) |
428 | 308 |
309 (defun make-frame-on-display (display &optional props) | |
310 "Create a frame on the X display named DISPLAY. | |
311 DISPLAY should be a standard display string such as \"unix:0\", | |
312 or nil for the display specified on the command line or in the | |
313 DISPLAY environment variable. | |
314 | |
315 PROPS should be a plist of properties, as in the call to `make-frame'. | |
316 | |
317 This function opens a connection to the display or reuses an existing | |
318 connection. | |
319 | |
320 This function is a trivial wrapper around `make-frame-on-device'." | |
321 (interactive "sMake frame on display: ") | |
322 (if (equal display "") (setq display nil)) | |
323 (make-frame-on-device 'x display props)) | |
324 | |
325 ;;; x-init.el ends here |