Mercurial > hg > xemacs-beta
annotate src/gtk-glue.c @ 502:7039e6323819
[xemacs-hg @ 2001-05-04 22:41:46 by ben]
----------------------- byte-comp warning fixes -----------------
New functions for cleanly eliminating byte-compiler warnings.
Their definitions require no changes at all in bytecomp.el,
meaning that any package that wants to use them and be compatible
with older versions of XEmacs need only copy the code and rename
the functions (i.e. prefix them with the package name).
Eliminate byte-compiler warnings using the new functions in
bytecomp-runtime.el.
Move coding-system-put,get,category, since they're not
Mule-specific and are used in prefer-coding-system.
font.el was incredibly ugly. Clean it up. Avoid using defsubst
for any exported functions, to avoid possible compatibility
problems if we later change the internal interface. (It happened
before, with face accessors, between 19.8 and 19.9). Fix tons
of warnings.
Clean up (new function gpm-is-supported-p eliminates duplicate
code in gpm-create/delete-device-hook) and eliminate warnings.
---------- make byte-recompile-directory work in the ---------
core `lisp' dir, even in the absence of
a Mule XEmacs (i.e. make it skip the Mule
files rather than trying to compile them).
now you should be able to do `touch *.el'
in the `lisp' dir, then
M-x byte-recompile-directory, and get no
warnings.
Avoid trying to compile Mule files in byte-recompile-directory
when we're not in a Mule XEmacs, since we're highly likely to get
syntax errors.
Add a coding-system cookie to all Mule files so that
byte-recompile-directory ignores them.
Magic cookie function moved to files.el from code-files.el (for
use by bytecomp even in a non-coding-system XEmacs), and changed
names and semantics for use by bytecomp. NOTE: IMO this is an
internal function that we can change as we like (and there is
absolutely no code anywhere else using the function).
---------------- GUI improvements: menus, help -------------------
Rearrange order of keymap declarations to be alphabetical.
Improve help on help to include all bindings, and group by
category. Add bindings for new Info commands. Remove
warnings. Use command-hyper-apropos in place of command-apropos.
Add a function to do the equivalent of command-apropos.
Evals its help-text argument so you can put expressions there.
Used now by help-for-help.
Add binding to continue text searches. Expand index searches to
work over multiple info documents. Add commands to search
text/index in User and Lispref.
Add new entry, "Uncomment Region" (parallels "Comment Out Region").
Redo Help menu; add bindings for new Info commands to search the
index or text of the User and Lispref manuals. Add command for
mark-paragraph, activate-region. Make Edit->R accelerator be
rectangle, not register (more commonly used), and put rectangle
first. Fix the Edit Init File entry to never load the .elc file.
Simplify the default-popup-menu. Add Cmds->Tabs menu.
Use kp-left not kp_left, etc.
---------------- Miscellaneous bug fixes/cleanup -------------------
byte-compiler-options: Correct doc string.
easy-menu-do-define: fix extra quote.
fill-paragraph-or-region:Rewrite to be more correct -- use
call-interactively so that we always get exactly the same
behavior as if the functions were called directly.
No need to fiddle with zmacs-region-stays, now that bogus
clearing of it (2001-04-28 src/ChangeLog) is removed.
Put dialog titles back in -- this time correctly. Fix various
other problems with leaks and such.
key-sequence-list-description:
Clean up fun to always correctly canonicalize.
Clean up Kinsoku comments, synch comment-region with FSF 20.7.
* simple.el (region-exists-p):
* simple.el (region-active-p):
Add comment about which one is correct to use in menu specs.
* sound.el (load-sound-file):
Minor code clean up.
* startup.el:
* startup.el (command-line-early):
* startup.el (initial-scratch-message):
Comment changes. Add info about sample.init.el to splash screen.
Improve initial-scratch-message and clarify purpose of Scratch
buffer. Fix byte-compile warning.
------------------------ Added features -------------------------
Add new variable to control whether etags checks all parent
directories for tag files. (On by default.)
* hash-table.el: New file, useful utility functions.
* dumped-lisp.el (preloaded-file-list): Dump hash-table.el.
------------ notable bug fix: Windows event code --------------
Get critical quit working.
------------ notable bug fix and new feature: regex code --------------
Shy groups were implemented in a horrible, half-assed way that
would cause them to screw up regex searching in most cases.
Fixed to work correctly.
Also extended back-reference syntax past 9. Only is recognized
as such if there are at least that many non-shy groups; and
optionally will warn about such uses, to catch old code that
might be using them differently. (Added variable to control
this in search.c -- `warn-about-possibly-incompatible-back-
references', on by default for the moment. Declared in lisp.h.
---------------- process/SIGIO improvements -------------------
define USE_GETADDRINFO to replace more complex conditional,
and use it. the code conditionalized on this in
unix_open_network_stream had *serious* problems handling errors.
it's now fixed, and major amounts of duplicate code between
the two versions were combined.
don't disable SIGIO and other interrupts unless
CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's
without bugs. similarly for a freebsd bug that was affecting all
OS's.
* s\ultrix.h:
define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS
mentioned as having a kernel bug.
* sysdep.c (request_sigio_on_device):
* sysdep.c (unrequest_sigio_on_device):
fix SIGIO problems on Linux. add check for O_ASYNC in case it's
defined and FASYNC isn't. add comment about other ways to do
SIGIO on Linux.
* callproc.c (Fold_call_process_internal):
* process.c (Fstart_process_internal):
Deal with the possibility that `default-directory' doesn't
have terminating slash. Correct comments about vfork.
---------------- Miscellaneous bug fixes/cleanup -------------------
* callint.c (Finteractive):
Add lots of documentation -- exactly what the Lisp equivalents of
all the interactive specs are.
* console.h (struct console): change type of quit_char to Emchar.
* event-msw.c (lstream_type_create_mswindows_selectable): spacing
change.
Eliminate events-mod.h and combine into events.h.
* emacs.c:
* emacs.c (make_arg_list_1):
* emacs.c (main_1):
A couple of char->Extbyte changes, add a comment.
* glyphs-msw.c:
Correct indentation of function defns to not exceed 80 cols.
Try (sort of) to fix some code that sets the colors of the
progress gauge. (Commented out)
* keymap.c (syms_of_keymap):
use DEFSYMBOL.
* process.c (read_process_output):
No need to fiddle with zmacs_region_stays, now that bogus
clearing of it (see below) is removed.
* search.c (Freplace_match): warning fix.
author | ben |
---|---|
date | Fri, 04 May 2001 22:42:35 +0000 |
parents | 0784d089fdc9 |
children | 2923009caf47 |
rev | line source |
---|---|
462 | 1 GtkType GTK_TYPE_ARRAY = 0; |
2 GtkType GTK_TYPE_STRING_ARRAY = 0; | |
3 GtkType GTK_TYPE_FLOAT_ARRAY = 0; | |
4 GtkType GTK_TYPE_INT_ARRAY = 0; | |
5 GtkType GTK_TYPE_LISTOF = 0; | |
6 GtkType GTK_TYPE_STRING_LIST = 0; | |
7 GtkType GTK_TYPE_OBJECT_LIST = 0; | |
8 GtkType GTK_TYPE_GDK_GC = 0; | |
9 | |
10 static GtkType | |
11 xemacs_type_register (gchar *name, GtkType parent) | |
12 { | |
13 GtkType type_id; | |
14 GtkTypeInfo info; | |
15 | |
16 info.type_name = name; | |
17 info.object_size = 0; | |
18 info.class_size = 0; | |
19 info.class_init_func = NULL; | |
20 info.object_init_func = NULL; | |
21 info.reserved_1 = NULL; | |
22 info.reserved_2 = NULL; | |
23 | |
24 type_id = gtk_type_unique (parent, &info); | |
25 | |
26 return (type_id); | |
27 } | |
28 | |
29 static void | |
30 xemacs_init_gtk_classes (void) | |
31 { | |
32 if (!GTK_TYPE_ARRAY) | |
33 { | |
34 GTK_TYPE_ARRAY = xemacs_type_register ("GtkArrayOf", 0); | |
35 GTK_TYPE_STRING_ARRAY = xemacs_type_register ("GtkArrayOfString", GTK_TYPE_ARRAY); | |
36 GTK_TYPE_FLOAT_ARRAY = xemacs_type_register ("GtkArrayOfFloat", GTK_TYPE_ARRAY); | |
37 GTK_TYPE_INT_ARRAY = xemacs_type_register ("GtkArrayOfInteger", GTK_TYPE_ARRAY); | |
38 GTK_TYPE_LISTOF = xemacs_type_register ("GtkListOf", 0); | |
39 GTK_TYPE_STRING_LIST = xemacs_type_register ("GtkListOfString", GTK_TYPE_LISTOF); | |
40 GTK_TYPE_OBJECT_LIST = xemacs_type_register ("GtkListOfObject", GTK_TYPE_LISTOF); | |
41 GTK_TYPE_GDK_GC = xemacs_type_register ("GdkGC", GTK_TYPE_BOXED); | |
42 } | |
43 } | |
44 | |
45 static void | |
46 xemacs_list_to_gtklist (Lisp_Object obj, GtkArg *arg) | |
47 { | |
48 CHECK_LIST (obj); | |
49 | |
50 if (arg->type == GTK_TYPE_STRING_LIST) | |
51 { | |
52 Lisp_Object temp = obj; | |
53 GList *strings = NULL; | |
54 | |
55 while (!NILP (temp)) | |
56 { | |
57 CHECK_STRING (XCAR (temp)); | |
58 temp = XCDR (temp); | |
59 } | |
60 | |
61 temp = obj; | |
62 | |
63 while (!NILP (temp)) | |
64 { | |
65 strings = g_list_append (strings, XSTRING_DATA (XCAR (temp))); | |
66 temp = XCDR (temp); | |
67 } | |
68 | |
69 GTK_VALUE_POINTER(*arg) = strings; | |
70 } | |
71 else if (arg->type == GTK_TYPE_OBJECT_LIST) | |
72 { | |
73 Lisp_Object temp = obj; | |
74 GList *objects = NULL; | |
75 | |
76 while (!NILP (temp)) | |
77 { | |
78 CHECK_GTK_OBJECT (XCAR (temp)); | |
79 temp = XCDR (temp); | |
80 } | |
81 | |
82 temp = obj; | |
83 | |
84 while (!NILP (temp)) | |
85 { | |
86 objects = g_list_append (objects, XGTK_OBJECT (XCAR (temp))->object); | |
87 temp = XCDR (temp); | |
88 } | |
89 | |
90 GTK_VALUE_POINTER(*arg) = objects; | |
91 } | |
92 else | |
93 { | |
94 abort(); | |
95 } | |
96 } | |
97 | |
98 static void | |
99 __make_gtk_object_mapper (gpointer data, gpointer user_data) | |
100 { | |
101 Lisp_Object *rv = (Lisp_Object *) user_data; | |
102 | |
103 *rv = Fcons (build_gtk_object (GTK_OBJECT (data)), *rv); | |
104 } | |
105 | |
106 static void | |
107 __make_string_mapper (gpointer data, gpointer user_data) | |
108 { | |
109 Lisp_Object *rv = (Lisp_Object *) user_data; | |
110 | |
111 *rv = Fcons (build_string ((char *)data), *rv); | |
112 } | |
113 | |
114 static Lisp_Object | |
115 xemacs_gtklist_to_list (GtkArg *arg) | |
116 { | |
117 Lisp_Object rval = Qnil; | |
118 | |
119 if (GTK_VALUE_POINTER (*arg)) | |
120 { | |
121 if (arg->type == GTK_TYPE_STRING_LIST) | |
122 { | |
123 g_list_foreach (GTK_VALUE_POINTER (*arg), __make_string_mapper, &rval); | |
124 } | |
125 else if (arg->type == GTK_TYPE_OBJECT_LIST) | |
126 { | |
127 g_list_foreach (GTK_VALUE_POINTER (*arg), __make_gtk_object_mapper, &rval); | |
128 } | |
129 else | |
130 { | |
131 abort(); | |
132 } | |
133 } | |
134 return (rval); | |
135 } | |
136 | |
137 static void | |
138 xemacs_list_to_array (Lisp_Object obj, GtkArg *arg) | |
139 { | |
140 CHECK_LIST (obj); | |
141 | |
142 #define FROB(ret_type,check_fn,extract_fn) \ | |
143 do { \ | |
144 Lisp_Object temp = obj; \ | |
145 int length = 0; \ | |
146 ret_type *array = NULL; \ | |
147 \ | |
148 while (!NILP (temp)) \ | |
149 { \ | |
150 check_fn (XCAR (temp)); \ | |
151 length++; \ | |
152 temp = XCDR (temp); \ | |
153 } \ | |
154 \ | |
155 array = xnew_array_and_zero (ret_type, length + 2); \ | |
156 temp = obj; \ | |
157 length = 0; \ | |
158 \ | |
159 while (!NILP (temp)) \ | |
160 { \ | |
161 array[length++] = extract_fn (XCAR (temp)); \ | |
162 temp = XCDR (temp); \ | |
163 } \ | |
164 \ | |
165 GTK_VALUE_POINTER(*arg) = array; \ | |
166 } while (0); | |
167 | |
168 if (arg->type == GTK_TYPE_STRING_ARRAY) | |
169 { | |
170 FROB(gchar *, CHECK_STRING, XSTRING_DATA); | |
171 } | |
172 else if (arg->type == GTK_TYPE_FLOAT_ARRAY) | |
173 { | |
174 FROB(gfloat, CHECK_FLOAT, extract_float); | |
175 } | |
176 else if (arg->type == GTK_TYPE_INT_ARRAY) | |
177 { | |
178 FROB(gint, CHECK_INT, XINT); | |
179 } | |
180 else | |
181 { | |
182 abort(); | |
183 } | |
184 #undef FROB | |
185 } | |
186 | |
187 extern GdkGC *gtk_get_gc (struct device *d, Lisp_Object font, Lisp_Object fg, Lisp_Object bg, | |
188 Lisp_Object bg_pmap, Lisp_Object lwidth); | |
189 | |
190 static GdkGC * | |
191 face_to_gc (Lisp_Object face) | |
192 { | |
193 Lisp_Object device = Fselected_device (Qnil); | |
194 | |
195 return (gtk_get_gc (XDEVICE (device), | |
196 Fspecifier_instance (Fget (face, Qfont, Qnil), device, Qnil, Qnil), | |
197 Fspecifier_instance (Fget (face, Qforeground, Qnil), device, Qnil, Qnil), | |
198 Fspecifier_instance (Fget (face, Qbackground, Qnil), device, Qnil, Qnil), | |
199 Fspecifier_instance (Fget (face, Qbackground_pixmap, Qnil), device, Qnil, Qnil), | |
200 Qnil)); | |
201 } | |
202 | |
203 static GtkStyle * | |
204 face_to_style (Lisp_Object face) | |
205 { | |
206 Lisp_Object device = Fselected_device (Qnil); | |
207 GtkStyle *style = gtk_style_new (); | |
208 int i; | |
209 | |
210 Lisp_Object font = Fspecifier_instance (Fget (face, Qfont, Qnil), device, Qnil, Qnil); | |
211 Lisp_Object fg = Fspecifier_instance (Fget (face, Qforeground, Qnil), device, Qnil, Qnil); | |
212 Lisp_Object bg = Fspecifier_instance (Fget (face, Qbackground, Qnil), device, Qnil, Qnil); | |
213 Lisp_Object pm = Fspecifier_instance (Fget (face, Qbackground_pixmap, Qnil), device, Qnil, Qnil); | |
214 | |
215 for (i = 0; i < 5; i++) style->fg[i] = * COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (fg)); | |
216 for (i = 0; i < 5; i++) style->bg[i] = * COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (bg)); | |
217 | |
218 if (IMAGE_INSTANCEP (pm)) | |
219 { | |
220 for (i = 0; i < 5; i++) style->bg_pixmap[i] = XIMAGE_INSTANCE_GTK_PIXMAP (pm); | |
221 } | |
222 | |
223 style->font = FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (font)); | |
224 | |
225 return (style); | |
226 } | |
227 | |
228 extern int gtk_event_to_emacs_event (struct frame *, GdkEvent *, struct Lisp_Event *); | |
229 | |
230 static Lisp_Object | |
231 gdk_event_to_emacs_event(GdkEvent *ev) | |
232 { | |
233 Lisp_Object emacs_event = Qnil; | |
234 | |
235 if (ev) | |
236 { | |
237 emacs_event = Fmake_event (Qnil, Qnil); | |
238 if (!gtk_event_to_emacs_event (NULL, ev, XEVENT (emacs_event))) | |
239 { | |
240 /* We need to handle a few more cases than the normal event | |
241 ** loop does. Mainly the double/triple click events. | |
242 */ | |
243 if ((ev->type == GDK_2BUTTON_PRESS) || (ev->type == GDK_3BUTTON_PRESS)) | |
244 { | |
245 struct Lisp_Event *le = XEVENT (emacs_event); | |
246 | |
247 le->event_type = misc_user_event; | |
248 le->event.misc.button = ev->button.button; | |
249 le->event.misc.modifiers = 0; | |
250 le->event.misc.x = ev->button.x; | |
251 le->event.misc.y = ev->button.y; | |
252 if (ev->type == GDK_2BUTTON_PRESS) | |
253 le->event.misc.function = intern ("double-click"); | |
254 else | |
255 le->event.misc.function = intern ("triple-click"); | |
256 } | |
257 else | |
258 { | |
259 Fdeallocate_event (emacs_event); | |
260 emacs_event = Qnil; | |
261 } | |
262 } | |
263 } | |
264 return (emacs_event); | |
265 } |