annotate oldXMenu/XDelAssoc.c @ 103344:d04aeff22966

2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com> * nsterm.m (ns_use_system_highlight_color): Drop, unused. 2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com> Changes to support :script/:lang/:otf in NS font driver. * nsfont.m (nsfont_escape_name, nsfont_unescape_name) (nsfont_get_family, nsfont_char_width): Rename to ns_ prefix to indicate not part of font driver interface, and change callers. (ns_get_family): Remove pointless null check. (nsfont_spec_to_traits, nsfont_fmember_to_entity): Replace with ns_spec_to_descriptor, ns_descriptor_to_entity. (nsfont_trait_distance, nsfont_make_fontset_for_font): Remove. (ns_attribute_value, ns_attribute_fvalue, ns_has_attribute) (ns_spec_to_descriptor, ns_descriptor_to_entity) (ns_charset_covers, ns_lang_to_script, ns_otf_to_script) (ns_get_req_script, ns_accumulate_script_ranges) (ns_script_to_charset, ns_get_covering_families, ns_findfonts): New functions. (nsfont_list, nsfont_match): Use ns_findfonts. (nsfont_open): Use font descriptor instead of traits. (nsfont_draw): Handle "automatic" (lookup-table) compositions. (dump_glyphstring): Rename to ns_dump_glyphstring. * nsfns.m (Fns_popup_font_panel): Use shared font manager. * fontset.c (fontset_from_font): Remove NS-specific code. 2009-06-08 Peter Jones <pjones@pmade.com> (tiny change) * nsterm.m (ns_draw_window_cursor): Respect cursor_type for nonactive windows. 2009-06-08 Felix Mueller <felix@enqueue.eu> (tiny change) * nsterm.m (ns_init_paths): Append path separator to INFOPATH variable.
author Adrian Robert <Adrian.B.Robert@gmail.com>
date Mon, 08 Jun 2009 04:34:54 +0000
parents fec5e03aaf59
children ec58e5c426ef 5cc91198ffb2 a63dbe9548aa
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 */
Dave Love <fx@gnu.org>
parents:
diff changeset
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
Dave Love <fx@gnu.org>
parents:
diff changeset
5
Dave Love <fx@gnu.org>
parents:
diff changeset
6 #include <X11/Xlib.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
7 #include "X10.h"
Dave Love <fx@gnu.org>
parents:
diff changeset
8 void emacs_remque();
Dave Love <fx@gnu.org>
parents:
diff changeset
9 struct qelem {
Dave Love <fx@gnu.org>
parents:
diff changeset
10 struct qelem *q_forw;
Dave Love <fx@gnu.org>
parents:
diff changeset
11 struct qelem *q_back;
Dave Love <fx@gnu.org>
parents:
diff changeset
12 char q_data[1];
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 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
16 * XDeleteAssoc - Delete an association in an XAssocTable keyed on
Dave Love <fx@gnu.org>
parents:
diff changeset
17 * an XId. An association may be removed only once. Redundant
Dave Love <fx@gnu.org>
parents:
diff changeset
18 * deletes are meaningless (but cause no problems).
Dave Love <fx@gnu.org>
parents:
diff changeset
19 */
Dave Love <fx@gnu.org>
parents:
diff changeset
20 XDeleteAssoc(dpy, table, x_id)
Dave Love <fx@gnu.org>
parents:
diff changeset
21 register Display *dpy;
Dave Love <fx@gnu.org>
parents:
diff changeset
22 register XAssocTable *table;
Dave Love <fx@gnu.org>
parents:
diff changeset
23 register XID x_id;
Dave Love <fx@gnu.org>
parents:
diff changeset
24 {
Dave Love <fx@gnu.org>
parents:
diff changeset
25 int hash;
Dave Love <fx@gnu.org>
parents:
diff changeset
26 register XAssoc *bucket;
Dave Love <fx@gnu.org>
parents:
diff changeset
27 register XAssoc *Entry;
Dave Love <fx@gnu.org>
parents:
diff changeset
28
Dave Love <fx@gnu.org>
parents:
diff changeset
29 /* Hash the XId to get the bucket number. */
Dave Love <fx@gnu.org>
parents:
diff changeset
30 hash = x_id & (table->size - 1);
Dave Love <fx@gnu.org>
parents:
diff changeset
31 /* Look up the bucket to get the entries in that bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
32 bucket = &table->buckets[hash];
Dave Love <fx@gnu.org>
parents:
diff changeset
33 /* Get the first entry in the bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
34 Entry = bucket->next;
Dave Love <fx@gnu.org>
parents:
diff changeset
35
Dave Love <fx@gnu.org>
parents:
diff changeset
36 /* Scan through the entries in the bucket for the right XId. */
Dave Love <fx@gnu.org>
parents:
diff changeset
37 for (; Entry != bucket; Entry = Entry->next) {
Dave Love <fx@gnu.org>
parents:
diff changeset
38 if (Entry->x_id == x_id) {
Dave Love <fx@gnu.org>
parents:
diff changeset
39 /* We have the right XId. */
Dave Love <fx@gnu.org>
parents:
diff changeset
40 if (Entry->display == dpy) {
Dave Love <fx@gnu.org>
parents:
diff changeset
41 /* We have the right display. */
Dave Love <fx@gnu.org>
parents:
diff changeset
42 /* We have the right entry! */
Dave Love <fx@gnu.org>
parents:
diff changeset
43 /* Remove it from the queue and */
Dave Love <fx@gnu.org>
parents:
diff changeset
44 /* free the entry. */
Dave Love <fx@gnu.org>
parents:
diff changeset
45 emacs_remque((struct qelem *)Entry);
Dave Love <fx@gnu.org>
parents:
diff changeset
46 free((char *)Entry);
Dave Love <fx@gnu.org>
parents:
diff changeset
47 return;
Dave Love <fx@gnu.org>
parents:
diff changeset
48 }
Dave Love <fx@gnu.org>
parents:
diff changeset
49 /* Oops, identical XId's on different displays! */
Dave Love <fx@gnu.org>
parents:
diff changeset
50 continue;
Dave Love <fx@gnu.org>
parents:
diff changeset
51 }
Dave Love <fx@gnu.org>
parents:
diff changeset
52 if (Entry->x_id > x_id) {
Dave Love <fx@gnu.org>
parents:
diff changeset
53 /* We have gone past where it should be. */
Dave Love <fx@gnu.org>
parents:
diff changeset
54 /* It is apparently not in the table. */
Dave Love <fx@gnu.org>
parents:
diff changeset
55 return;
Dave Love <fx@gnu.org>
parents:
diff changeset
56 }
Dave Love <fx@gnu.org>
parents:
diff changeset
57 }
Dave Love <fx@gnu.org>
parents:
diff changeset
58 /* It is apparently not in the table. */
Dave Love <fx@gnu.org>
parents:
diff changeset
59 return;
Dave Love <fx@gnu.org>
parents:
diff changeset
60 }
Dave Love <fx@gnu.org>
parents:
diff changeset
61
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 25858
diff changeset
62 /* arch-tag: 90981a7e-601c-487a-b364-cdf55d6c475b
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 25858
diff changeset
63 (do not change this comment) */