Mercurial > hg > xemacs-beta
annotate lisp/x-init.el @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -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 |