Mercurial > hg > xemacs-beta
annotate src/console-gtk.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | 87ef74baf946 |
| children | 19a72041c5ed |
| rev | line source |
|---|---|
| 462 | 1 /* Console functions for X windows. |
| 2 Copyright (C) 1996 Ben Wing. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* Authorship: | |
| 24 | |
| 25 Ben Wing: January 1996, for 19.14. | |
| 26 William Perry: April 2000, for 21.1 (Gtk version) | |
| 27 */ | |
| 28 | |
| 29 #include <config.h> | |
| 30 #include "lisp.h" | |
| 31 | |
| 32 #include "process.h" /* canonicalize_host_name */ | |
| 33 #include "redisplay.h" /* for display_arg */ | |
| 34 | |
| 2828 | 35 #include "charset.h" |
| 36 #include "elhash.h" | |
| 37 | |
| 872 | 38 #include "console-gtk-impl.h" |
| 39 | |
| 462 | 40 DEFINE_CONSOLE_TYPE (gtk); |
| 41 | |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
42 Lisp_Object Vgtk_seen_characters; |
|
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
43 |
| 462 | 44 static int |
| 2286 | 45 gtk_initially_selected_for_input (struct console *UNUSED (con)) |
| 462 | 46 { |
| 47 return 1; | |
| 48 } | |
| 49 | |
| 50 /* Remember, in all of the following functions, we have to verify | |
| 51 the integrity of our input, because the generic functions don't. */ | |
| 52 | |
| 53 static Lisp_Object | |
| 2286 | 54 gtk_device_to_console_connection (Lisp_Object connection, |
| 55 Error_Behavior UNUSED (errb)) | |
| 462 | 56 { |
| 57 /* Strip the trailing .# off of the connection, if it's there. */ | |
| 58 | |
| 59 if (NILP (connection)) | |
| 60 return Qnil; | |
| 61 else | |
| 62 { | |
| 63 connection = build_string ("gtk"); | |
| 64 } | |
| 65 return connection; | |
| 66 } | |
| 67 | |
| 68 static Lisp_Object | |
| 69 gtk_semi_canonicalize_console_connection (Lisp_Object connection, | |
| 2286 | 70 Error_Behavior UNUSED (errb)) |
| 462 | 71 { |
| 72 struct gcpro gcpro1; | |
| 73 | |
| 74 GCPRO1 (connection); | |
| 75 | |
| 76 connection = build_string ("gtk"); | |
| 77 | |
| 78 RETURN_UNGCPRO (connection); | |
| 79 } | |
| 80 | |
| 81 static Lisp_Object | |
| 2286 | 82 gtk_canonicalize_console_connection (Lisp_Object connection, |
| 83 Error_Behavior UNUSED (errb)) | |
| 462 | 84 { |
| 85 Lisp_Object hostname = Qnil; | |
| 86 struct gcpro gcpro1, gcpro2; | |
| 87 | |
| 88 GCPRO2 (connection, hostname); | |
| 89 | |
| 90 connection = build_string ("gtk"); | |
| 91 | |
| 92 RETURN_UNGCPRO (connection); | |
| 93 } | |
| 94 | |
| 95 static Lisp_Object | |
| 96 gtk_semi_canonicalize_device_connection (Lisp_Object connection, | |
| 2286 | 97 Error_Behavior UNUSED (errb)) |
| 462 | 98 { |
| 99 struct gcpro gcpro1; | |
| 100 | |
| 101 GCPRO1 (connection); | |
| 102 | |
| 103 connection = build_string("gtk"); | |
| 104 | |
| 105 RETURN_UNGCPRO (connection); | |
| 106 } | |
| 107 | |
| 108 static Lisp_Object | |
| 2286 | 109 gtk_canonicalize_device_connection (Lisp_Object connection, |
| 110 Error_Behavior UNUSED (errb)) | |
| 462 | 111 { |
| 112 struct gcpro gcpro1; | |
| 113 | |
| 114 GCPRO1 (connection); | |
| 115 connection = build_string("gtk"); | |
| 116 | |
| 117 RETURN_UNGCPRO (connection); | |
| 118 } | |
| 119 | |
| 2828 | 120 extern Lisp_Object gtk_keysym_to_character(guint keysym); |
| 121 | |
| 122 static Lisp_Object | |
| 123 gtk_perhaps_init_unseen_key_defaults (struct console *UNUSED(con), | |
| 124 Lisp_Object key) | |
| 125 { | |
| 126 Lisp_Object char_to_associate = Qnil; | |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
127 extern Lisp_Object Vcurrent_global_map, Qcharacter_of_keysym; |
| 2828 | 128 |
| 129 if (SYMBOLP(key)) | |
| 130 { | |
| 131 gchar *symbol_name; | |
| 132 DECLARE_EISTRING(ei_symname); | |
| 133 | |
| 134 eicpy_rawz(ei_symname, XSTRING_DATA(symbol_name(XSYMBOL(key)))); | |
| 135 | |
| 136 /* No information on the coding system of the string key names in GDK, | |
| 137 to my knowledge. Defaulting to binary, */ | |
| 138 eito_external(ei_symname, Qbinary); | |
| 139 symbol_name = eiextdata(ei_symname); | |
| 140 | |
| 141 /* GTK 2.0 has an API we can use, and makes this available in gdkkeys.h | |
| 142 | |
| 143 This has yet to be compiled, because XEmacs' GTK support hasn't yet moved | |
| 144 to 2.0. So if you're porting XEmacs to GTK 2.0, bear that in mind. */ | |
| 145 char_to_associate | |
| 146 #ifdef __GDK_KEYS_H__ | |
| 147 = Funicode_to_char | |
| 148 (make_int(gdk_keyval_to_unicode | |
| 149 (gdk_keyval_from_name(symbol_name))), Qnil); | |
| 150 #else /* GTK 1.whatever doesn't. Use the X11 map. */ | |
| 151 = gtk_keysym_to_character(gdk_keyval_from_name(symbol_name)); | |
| 152 #endif | |
| 153 } | |
| 154 else | |
| 155 { | |
| 156 CHECK_CHAR(key); | |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
157 char_to_associate = key; |
| 2828 | 158 } |
| 159 | |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
160 if (!(HASH_TABLEP(Vgtk_seen_characters))) |
| 2828 | 161 { |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
162 Vgtk_seen_characters = make_lisp_hash_table (128, HASH_TABLE_NON_WEAK, |
| 2828 | 163 HASH_TABLE_EQUAL); |
| 164 } | |
| 165 | |
| 166 /* Might give the user an opaque error if make_lisp_hash_table fails, | |
| 167 but it shouldn't crash. */ | |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
168 CHECK_HASH_TABLE(Vgtk_seen_characters); |
| 2828 | 169 |
| 170 if (EQ(char_to_associate, Qnil) /* If there's no char to bind, */ | |
| 171 || (XCHAR(char_to_associate) < 0x80) /* or it's ASCII */ | |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
172 || !NILP(Fgethash(key, Vgtk_seen_characters, Qnil))) /* Or we've seen |
| 2828 | 173 it already, */ |
| 174 { | |
| 175 /* then don't bind the key. */ | |
| 176 return Qnil; | |
| 177 } | |
| 178 | |
| 179 if (NILP (Flookup_key (Vcurrent_global_map, key, Qnil))) | |
|
4432
87ef74baf946
Fix GTK build-breaking typo.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4380
diff
changeset
|
180 { |
|
87ef74baf946
Fix GTK build-breaking typo.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4380
diff
changeset
|
181 Fputhash(key, Qt, Vgtk_seen_characters); |
| 2828 | 182 Fdefine_key (Vcurrent_global_map, key, Qself_insert_command); |
| 183 if (SYMBOLP(key)) | |
| 184 { | |
| 185 Fput (key, Qcharacter_of_keysym, char_to_associate); | |
| 186 } | |
| 187 return Qt; | |
| 188 } | |
| 189 | |
| 190 return Qnil; | |
| 191 } | |
| 192 | |
| 462 | 193 void |
| 194 console_type_create_gtk (void) | |
| 195 { | |
| 196 INITIALIZE_CONSOLE_TYPE (gtk, "gtk", "console-gtk-p"); | |
| 197 | |
| 198 CONSOLE_HAS_METHOD (gtk, semi_canonicalize_console_connection); | |
| 199 CONSOLE_HAS_METHOD (gtk, canonicalize_console_connection); | |
| 200 CONSOLE_HAS_METHOD (gtk, semi_canonicalize_device_connection); | |
| 201 CONSOLE_HAS_METHOD (gtk, canonicalize_device_connection); | |
| 202 CONSOLE_HAS_METHOD (gtk, device_to_console_connection); | |
| 203 CONSOLE_HAS_METHOD (gtk, initially_selected_for_input); | |
| 2828 | 204 CONSOLE_HAS_METHOD (gtk, perhaps_init_unseen_key_defaults); |
| 462 | 205 /* CONSOLE_HAS_METHOD (gtk, delete_console); */ |
| 206 } | |
| 207 | |
| 208 void | |
| 209 reinit_console_type_create_gtk (void) | |
| 210 { | |
| 211 REINITIALIZE_CONSOLE_TYPE (gtk); | |
| 212 } | |
|
4380
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
213 |
|
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
214 void |
|
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
215 vars_of_console_gtk (void) |
|
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
216 { |
|
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
217 staticpro (&Vgtk_seen_characters); |
|
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
218 Vgtk_seen_characters = Qnil; |
|
461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2828
diff
changeset
|
219 } |