Mercurial > hg > xemacs-beta
annotate src/extw-Xt.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 | 4fbcce3f6097 |
children | 2aa9cd456ae7 |
rev | line source |
---|---|
0 | 1 /* Common code between client and shell widgets -- Xt only. |
2 Copyright (C) 1993, 1994 Sun Microsystems, Inc. | |
3 | |
4 This library is free software; you can redistribute it and/or | |
5 modify it under the terms of the GNU Library General Public | |
6 License as published by the Free Software Foundation; either | |
7 version 2 of the License, or (at your option) any later version. | |
8 | |
9 This library is distributed in the hope that it will be useful, | |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
12 Library General Public License for more details. | |
13 | |
14 You should have received a copy of the GNU Library General Public | |
15 License along with this library; if not, write to | |
16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
17 Boston, MA 02111-1307, USA. */ | |
18 | |
19 /* Synched up with: Not in FSF. */ | |
20 | |
21 /* Written by Ben Wing, September 1993. */ | |
22 | |
23 #ifdef emacs | |
24 | |
25 #include <config.h> | |
26 | |
27 #ifndef EXTERNAL_WIDGET | |
28 ERROR! This ought not be getting compiled if EXTERNAL_WIDGET is undefined | |
29 #endif | |
30 | |
2110 | 31 EXTERN_C void fatal (const char *fmt, ...); |
0 | 32 #else /* not emacs */ |
33 static void fatal (char *msg); | |
34 #endif | |
35 | |
36 #include <X11/Intrinsic.h> | |
37 #include <X11/IntrinsicP.h> | |
38 #include <stdlib.h> | |
39 #include <stdio.h> | |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
40 #include "compiler.h" |
0 | 41 #include "extw-Xt.h" |
42 | |
43 #ifdef DEBUG_WIDGET | |
44 | |
45 static int geom_masks[] = { | |
46 CWX, CWY, CWWidth, CWHeight, CWBorderWidth, CWSibling, CWStackMode, | |
47 XtCWQueryOnly }; | |
48 static char *geom_mask_strings[] = { | |
49 "CWX", "CWY", "CWWidth", "CWHeight", "CWBorderWidth", | |
50 "CWSibling", "CWStackMode", "XtCWQueryOnly" }; | |
51 static int stack_modes[] = { | |
52 Below, TopIf, BottomIf, Opposite, XtSMDontChange }; | |
53 static char *stack_mode_strings[] = { | |
54 "Below", "TopIf", "BottomIf", "Opposite", "XtSMDontChange" }; | |
55 | |
56 static void | |
57 print_geometry_structure(XtWidgetGeometry *xwg) | |
58 { | |
59 int num = sizeof(geom_masks)/sizeof(int); | |
60 int i; | |
2108 | 61 |
0 | 62 printf (" masks:"); |
63 for (i=0; i<num; i++) | |
64 if (xwg->request_mode & geom_masks[i]) | |
65 printf (" %s", geom_mask_strings[i]); | |
66 printf ("\n"); | |
67 printf (" x:%d y:%d\n", xwg->x, xwg->y); | |
68 printf (" width:%d height:%d border_width:%d\n", xwg->width, | |
69 xwg->height, xwg->border_width); | |
70 printf (" sibling: %x\n", xwg->sibling); | |
71 printf (" stack_mode: "); | |
72 for (i=0, num=sizeof(stack_modes)/sizeof(int); i<num; i++) | |
73 if (xwg->stack_mode == stack_modes[i]) { | |
74 printf ("%s", stack_mode_strings[i]); | |
75 break; | |
76 } | |
77 printf ("\n"); | |
78 } | |
79 | |
80 static void | |
81 print_geometry_result (XtGeometryResult res) | |
82 { | |
83 printf ("result: %s\n", | |
84 res == XtGeometryYes ? "XtGeometryYes" : | |
85 res == XtGeometryNo ? "XtGeometryNo" : | |
86 res == XtGeometryAlmost ? "XtGeometryAlmost" : | |
87 res == XtGeometryDone ? "XtGeometryDone" : | |
88 "unknown"); | |
89 } | |
90 | |
91 #endif | |
92 | |
93 #ifndef emacs | |
94 | |
95 static void | |
96 fatal (char *msg) | |
97 { | |
98 fprintf (stderr, "%s", msg); | |
99 exit (1); | |
100 } | |
101 | |
102 #endif | |
103 | |
104 /* put a geometry specification in the specified property on the window | |
105 of the specified widget, and send a notification message to tell the | |
106 client-side widget about this. */ | |
107 | |
108 void | |
109 extw_send_geometry_value(Display *display, Window win, Atom property, | |
110 en_extw_notify type, XtWidgetGeometry *xwg, | |
111 long data0) | |
112 { | |
113 if (xwg != NULL) | |
114 XChangeProperty(display, win, property, | |
115 a_EXTW_WIDGET_GEOMETRY, 32, PropModeReplace, | |
116 (unsigned char *) xwg, sizeof(*xwg)/sizeof(int)); | |
117 extw_send_notify_3(display, win, type, data0, 0, 0); | |
118 } | |
119 | |
120 /* get the geometry specification stored in the specified property of the | |
121 specified widget's window. */ | |
122 | |
123 void | |
124 extw_get_geometry_value(Display *display, Window win, Atom property, | |
125 XtWidgetGeometry *xwg) | |
126 { | |
127 Atom dummy; | |
128 int format; | |
129 unsigned long nitems, bytes_after; | |
130 unsigned char *prop; | |
2108 | 131 |
0 | 132 if (XGetWindowProperty(display, win, property, 0, |
133 sizeof(*xwg)/4, False, a_EXTW_WIDGET_GEOMETRY, | |
134 &dummy, &format, &nitems, &bytes_after, | |
135 &prop) != Success) | |
136 goto error; | |
137 if (format != 8*sizeof(int) || bytes_after) { | |
138 XFree((char *) prop); | |
139 goto error; | |
140 } | |
141 *xwg = * (XtWidgetGeometry *) prop; | |
142 return; | |
143 | |
144 error: | |
145 fatal("Unable to retrieve property for widget-geometry"); | |
146 #if 0 | |
147 XtAppErrorMsg(XtWidgetToApplicationContext((Widget)w), | |
148 "invalidProperty","get_geometry_value",XtCXtToolkitError, | |
149 "Unable to retrieve property for widget-geometry", | |
150 (String *)NULL, (Cardinal *)NULL); | |
151 #endif | |
152 } | |
153 | |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
154 typedef struct |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
155 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
156 Widget w; |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
157 unsigned long request_num; |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
158 en_extw_notify type; |
0 | 159 } QueryStruct; |
160 | |
161 /* check if an event is of the sort we're looking for */ | |
162 | |
163 static Bool | |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
164 isMine(XEvent *event, QueryStruct *q) |
0 | 165 { |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
166 Widget w = q->w; |
2108 | 167 |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
168 if ( (event->xany.display != XtDisplay(w)) || (event->xany.window != XtWindow(w)) ) |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
169 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
170 return FALSE; |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
171 } |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
172 if (event->xany.serial >= q->request_num) |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
173 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
174 if (event->type == ClientMessage && |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
175 event->xclient.message_type == a_EXTW_NOTIFY && |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
176 event->xclient.data.l[0] == 1 - extw_which_side && |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
177 event->xclient.data.l[1] == (int) q->type) |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
178 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
179 return TRUE; |
0 | 180 } |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
181 } |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
182 return FALSE; |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
183 } |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
184 |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
185 void responseTimeOut(XtPointer clientData, XtIntervalId * UNUSED (id)) |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
186 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
187 Bool *expired=(Bool *)clientData; |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
188 *expired=TRUE; |
0 | 189 } |
190 | |
191 /* wait for a ClientMessage of the specified type from the other widget, or | |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
192 time-out. isMine() determines whether an event matches. |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
193 Took out the call to _XtWaitForSomething and replaced it with public |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
194 Xt api's. |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
195 */ |
0 | 196 |
197 Bool | |
2108 | 198 extw_wait_for_response (Widget w, XEvent *event, unsigned long request_num, |
199 en_extw_notify type, unsigned long timeout) | |
0 | 200 { |
2108 | 201 XtAppContext app = XtWidgetToApplicationContext(w); |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
202 XtInputMask inputMask; |
2108 | 203 QueryStruct q; |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
204 Bool expired; |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
205 XtIntervalId id; |
2108 | 206 |
207 q.w = w; | |
208 q.request_num = request_num; | |
209 q.type = type; | |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
210 expired=FALSE; |
0 | 211 |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
212 id=XtAppAddTimeOut(app, timeout, responseTimeOut,&expired); |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
213 while (!expired) |
2108 | 214 { |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
215 inputMask=XtAppPending(app); |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
216 if (inputMask & XtIMXEvent) |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
217 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
218 XtAppNextEvent(app, event); |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
219 if (isMine(event,&q)) |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
220 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
221 if (!expired) XtRemoveTimeOut(id); |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
222 return True; |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
223 } |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
224 else |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
225 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
226 /* Do Nothing and go back to waiting */ |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
227 } |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
228 } |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
229 if (inputMask & XtIMTimer) |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
230 { |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
231 /* Process the expired timer */ |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
232 XtAppProcessEvent(app,XtIMTimer); |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
233 } |
2108 | 234 } |
4331
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
235 /* Must have expired */ |
4fbcce3f6097
Don't use undocumented Xt functions in external widget.
Mike Sperber <sperber@deinprogramm.de>
parents:
2114
diff
changeset
|
236 return False; |
0 | 237 } |