Mercurial > emacs
annotate oldXMenu/XDelAssoc.c @ 106186:9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
timeouts and event sources. This simplifies Gtk+-code a lot, and is needed
for handling GConf death/restart.
* xterm.c: #include xgselect.h.
(x_initialize): Call xgselect_initialize.
* xsettings.c (something_changedCB): C++ comments => C comments.
(init_gconf): Do not deal with any GLib file descriptors, xg_select
does that now.
* gtkutil.c (xg_timer, xg_process_timeouts, xg_start_timer)
(xg_stop_timer, menu_grab_callback_cnt, menu_grab_callback)
(scroll_bar_button_cb): Remove.
(create_menus): C++ comments => C comments. Don't bind grab-notify
event.
(xg_create_scroll_bar): Don't bind button-press-event and
button-release-event.
* process.c: Include xgselect.h if defined (USE_GTK) ||
defined (HAVE_GCONF).
(wait_reading_process_output): Call xg_select for the same condition.
* xgselect.c (xg_select): New function to better integrate with
GLib/Gtk event handling. Needed if GConf daemon dies/restarts.
* xgselect.h: New file, declare xg_select, xgselect_initialize.
* Makefile.in (XOBJ): Add xgselect.o.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Sat, 21 Nov 2009 15:28:59 +0000 |
parents | fec5e03aaf59 |
children | ec58e5c426ef 5cc91198ffb2 a63dbe9548aa |
rev | line source |
---|---|
25858 | 1 /* Copyright Massachusetts Institute of Technology 1985 */ |
2 | |
76133
995b45abe69d
Remove license text in favour of including copyright.h, as was done in
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
3 #include "copyright.h" |
995b45abe69d
Remove license text in favour of including copyright.h, as was done in
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
4 |
25858 | 5 |
6 #include <X11/Xlib.h> | |
7 #include "X10.h" | |
8 void emacs_remque(); | |
9 struct qelem { | |
10 struct qelem *q_forw; | |
11 struct qelem *q_back; | |
12 char q_data[1]; | |
13 }; | |
14 | |
15 /* | |
16 * XDeleteAssoc - Delete an association in an XAssocTable keyed on | |
17 * an XId. An association may be removed only once. Redundant | |
18 * deletes are meaningless (but cause no problems). | |
19 */ | |
20 XDeleteAssoc(dpy, table, x_id) | |
21 register Display *dpy; | |
22 register XAssocTable *table; | |
23 register XID x_id; | |
24 { | |
25 int hash; | |
26 register XAssoc *bucket; | |
27 register XAssoc *Entry; | |
28 | |
29 /* Hash the XId to get the bucket number. */ | |
30 hash = x_id & (table->size - 1); | |
31 /* Look up the bucket to get the entries in that bucket. */ | |
32 bucket = &table->buckets[hash]; | |
33 /* Get the first entry in the bucket. */ | |
34 Entry = bucket->next; | |
35 | |
36 /* Scan through the entries in the bucket for the right XId. */ | |
37 for (; Entry != bucket; Entry = Entry->next) { | |
38 if (Entry->x_id == x_id) { | |
39 /* We have the right XId. */ | |
40 if (Entry->display == dpy) { | |
41 /* We have the right display. */ | |
42 /* We have the right entry! */ | |
43 /* Remove it from the queue and */ | |
44 /* free the entry. */ | |
45 emacs_remque((struct qelem *)Entry); | |
46 free((char *)Entry); | |
47 return; | |
48 } | |
49 /* Oops, identical XId's on different displays! */ | |
50 continue; | |
51 } | |
52 if (Entry->x_id > x_id) { | |
53 /* We have gone past where it should be. */ | |
54 /* It is apparently not in the table. */ | |
55 return; | |
56 } | |
57 } | |
58 /* It is apparently not in the table. */ | |
59 return; | |
60 } | |
61 | |
52401 | 62 /* arch-tag: 90981a7e-601c-487a-b364-cdf55d6c475b |
63 (do not change this comment) */ |