Mercurial > hg > xemacs-beta
annotate src/console-gtk.c @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 (2008-12-27) |
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 } |