Mercurial > emacs
view oldXMenu/XMakeAssoc.c @ 110559:9c63d46e000c
Fix int/EMACS_INT use in keyboard.c.
keyboard.c <last_point_position, last_non_minibuf_size>: Declare EMACS_INT.
(echo_truncate, adjust_point_for_property, read_char)
(gen_help_event, make_lispy_event, modify_event_symbol)
(Fexecute_extended_command, stuff_buffered_input): Use EMACS_INT
for buffer positions and string length.
keyboard.h (gen_help_event): Adjust prototype.
termhooks.h <struct input_event>: Make `code' member EMACS_INT.
commands.h <last_point_position>: Declare EMACS_INT.
xdisp.c <help_echo_pos>: Define as EMACS_INT.
(truncate_echo_area): Accept EMACS_INT argument.
dispextern.h <help_echo_pos>: Declare EMACS_INT.
lisp.h (truncate_echo_area): Adjust prototype.
composite.c (composition_adjust_point): Return EMACS_INT.
composite.h (composition_adjust_point): Adjust prototype.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 25 Sep 2010 05:36:36 -0400 |
parents | 5cc91198ffb2 |
children | 132f2dfd549f |
line wrap: on
line source
/* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" #include <config.h> #include <X11/Xlib.h> #include <X11/Xresource.h> #include "X10.h" #include <errno.h> #ifndef NULL #define NULL 0 #endif struct qelem { struct qelem *q_forw; struct qelem *q_back; char q_data[1]; }; void emacs_insque (struct qelem *elem, struct qelem *prev); /* * XMakeAssoc - Insert data into an XAssocTable keyed on an XId. * Data is inserted into the table only once. Redundant inserts are * meaningless (but cause no problems). The queue in each association * bucket is sorted (lowest XId to highest XId). */ XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data) { int hash; register XAssoc *bucket; register XAssoc *Entry; register XAssoc *new_entry; /* Hash the XId to get the bucket number. */ hash = x_id & (table->size - 1); /* Look up the bucket to get the entries in that bucket. */ bucket = &table->buckets[hash]; /* Get the first entry in the bucket. */ Entry = bucket->next; /* If (Entry != bucket), the bucket is empty so make */ /* the new entry the first entry in the bucket. */ /* if (Entry == bucket), the we have to search the */ /* bucket. */ if (Entry != bucket) { /* The bucket isn't empty, begin searching. */ /* If we leave the for loop then we have either passed */ /* where the entry should be or hit the end of the bucket. */ /* In either case we should then insert the new entry */ /* before the current value of "Entry". */ for (; Entry != bucket; Entry = Entry->next) { if (Entry->x_id == x_id) { /* Entry has the same XId... */ if (Entry->display == dpy) { /* Entry has the same Display... */ /* Therefore there is already an */ /* entry with this XId and Display, */ /* reset its data value and return. */ Entry->data = data; return; } /* We found an association with the right */ /* id but the wrong display! */ continue; } /* If the current entry's XId is greater than the */ /* XId of the entry to be inserted then we have */ /* passed the location where the new XId should */ /* be inserted. */ if (Entry->x_id > x_id) break; } } /* If we are here then the new entry should be inserted just */ /* before the current value of "Entry". */ /* Create a new XAssoc and load it with new provided data. */ new_entry = (XAssoc *) malloc(sizeof(XAssoc)); new_entry->display = dpy; new_entry->x_id = x_id; new_entry->data = data; /* Insert the new entry. */ emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev); } /* arch-tag: d7e3fb8a-f3b3-4c5d-a307-75ca67ec1b49 (do not change this comment) */