annotate oldXMenu/XCrAssoc.c @ 110592:c06958da83b5

Add fd handling with callbacks to select, dbus needs it for async operation. * src/dbusbind.c: Include process.h. (dbus_fd_cb, xd_find_watch_fd, xd_toggle_watch) (xd_read_message_1): New functions. (xd_add_watch, xd_remove_watch): Call xd_find_watch_fd. Handle watch for both read and write. (Fdbus_init_bus): Also register xd_toggle_watch. (Fdbus_call_method_asynchronously, Fdbus_method_return_internal) (Fdbus_method_error_internal, Fdbus_send_signal): Remove call to dbus_connection_flush. (xd_read_message): Move most of the code to xd_read_message_1. Call xd_read_message_1 until status is COMPLETE. * src/keyboard.c (readable_events, gobble_input): Remove DBUS code. * src/process.c (gpm_wait_mask, max_gpm_desc): Remove. (write_mask): New variable. (max_input_desc): Renamed from max_keyboard_desc. (fd_callback_info): New variable. (add_read_fd, delete_read_fd, add_write_fd, delete_write_fd): New functions. (Fmake_network_process): FD_SET write_mask. (deactivate_process): FD_CLR write_mask. (wait_reading_process_output): Connecting renamed to Writeok. check_connect removed. check_write is new. Remove references to gpm. Use Writeok/check_write unconditionally (i.e. no #ifdef NON_BLOCKING_CONNECT) instead of Connecting. Loop over file descriptors and call callbacks in fd_callback_info if file descriptor is ready for I/O. (add_gpm_wait_descriptor): Just call add_keyboard_wait_descriptor. (delete_gpm_wait_descriptor): Just call delete_keyboard_wait_descriptor. (keyboard_bit_set): Use max_input_desc. (add_keyboard_wait_descriptor, delete_keyboard_wait_descriptor): Remove #ifdef subprocesses. Use max_input_desc. (init_process): Initialize write_mask and fd_callback_info. * src/process.h (add_read_fd, delete_read_fd, add_write_fd) (delete_write_fd): Declare.
author Jan D <jan.h.d@swipnet.se>
date Sun, 26 Sep 2010 18:20:01 +0200
parents 5cc91198ffb2
children ef719132ddfa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
1 /* Copyright Massachusetts Institute of Technology 1985 */
76133
995b45abe69d Remove license text in favour of including copyright.h, as was done in
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
2 #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
3
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
4
Dave Love <fx@gnu.org>
parents:
diff changeset
5 #include <config.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
6 #include <X11/Xlib.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
7 #include <errno.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
8 #include "X10.h"
Dave Love <fx@gnu.org>
parents:
diff changeset
9
Dave Love <fx@gnu.org>
parents:
diff changeset
10 #ifndef NULL
Dave Love <fx@gnu.org>
parents:
diff changeset
11 #define NULL 0
Dave Love <fx@gnu.org>
parents:
diff changeset
12 #endif
Dave Love <fx@gnu.org>
parents:
diff changeset
13
Dave Love <fx@gnu.org>
parents:
diff changeset
14 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
15 * XCreateAssocTable - Create an XAssocTable. The size argument should be
Dave Love <fx@gnu.org>
parents:
diff changeset
16 * a power of two for efficiency reasons. Some size suggestions: use 32
Dave Love <fx@gnu.org>
parents:
diff changeset
17 * buckets per 100 objects; a reasonable maximum number of object per
Dave Love <fx@gnu.org>
parents:
diff changeset
18 * buckets is 8. If there is an error creating the XAssocTable, a NULL
Dave Love <fx@gnu.org>
parents:
diff changeset
19 * pointer is returned.
Dave Love <fx@gnu.org>
parents:
diff changeset
20 */
109124
5cc91198ffb2 Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 76174
diff changeset
21 XAssocTable *XCreateAssocTable(register int size)
5cc91198ffb2 Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 76174
diff changeset
22 /* Desired size of the table. */
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
23 {
Dave Love <fx@gnu.org>
parents:
diff changeset
24 register XAssocTable *table; /* XAssocTable to be initialized. */
Dave Love <fx@gnu.org>
parents:
diff changeset
25 register XAssoc *buckets; /* Pointer to the first bucket in */
Dave Love <fx@gnu.org>
parents:
diff changeset
26 /* the bucket array. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
27
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
28 /* Malloc the XAssocTable. */
Dave Love <fx@gnu.org>
parents:
diff changeset
29 if ((table = (XAssocTable *)malloc(sizeof(XAssocTable))) == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
30 /* malloc call failed! */
Dave Love <fx@gnu.org>
parents:
diff changeset
31 errno = ENOMEM;
Dave Love <fx@gnu.org>
parents:
diff changeset
32 return(NULL);
Dave Love <fx@gnu.org>
parents:
diff changeset
33 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
34
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
35 /* calloc the buckets (actually just their headers). */
Dave Love <fx@gnu.org>
parents:
diff changeset
36 buckets = (XAssoc *)calloc((unsigned)size, (unsigned)sizeof(XAssoc));
Dave Love <fx@gnu.org>
parents:
diff changeset
37 if (buckets == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
38 /* calloc call failed! */
Dave Love <fx@gnu.org>
parents:
diff changeset
39 errno = ENOMEM;
Dave Love <fx@gnu.org>
parents:
diff changeset
40 return(NULL);
Dave Love <fx@gnu.org>
parents:
diff changeset
41 }
Dave Love <fx@gnu.org>
parents:
diff changeset
42
Dave Love <fx@gnu.org>
parents:
diff changeset
43 /* Insert table data into the XAssocTable structure. */
Dave Love <fx@gnu.org>
parents:
diff changeset
44 table->buckets = buckets;
Dave Love <fx@gnu.org>
parents:
diff changeset
45 table->size = size;
Dave Love <fx@gnu.org>
parents:
diff changeset
46
Dave Love <fx@gnu.org>
parents:
diff changeset
47 while (--size >= 0) {
Dave Love <fx@gnu.org>
parents:
diff changeset
48 /* Initialize each bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
49 buckets->prev = buckets;
Dave Love <fx@gnu.org>
parents:
diff changeset
50 buckets->next = buckets;
Dave Love <fx@gnu.org>
parents:
diff changeset
51 buckets++;
Dave Love <fx@gnu.org>
parents:
diff changeset
52 }
Dave Love <fx@gnu.org>
parents:
diff changeset
53
Dave Love <fx@gnu.org>
parents:
diff changeset
54 return(table);
Dave Love <fx@gnu.org>
parents:
diff changeset
55 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
56
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
57 /* arch-tag: 5df3237d-ada0-4345-a3ab-282cafb397aa
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
58 (do not change this comment) */