Mercurial > hg > xemacs-beta
annotate src/elhash.h @ 4908:b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* compiler.h:
Create a USED() macro to force unused-var warnings to go away,
in certain cases where it's inconvenient to do otherwise (e.g.
when THIS_IS_GTK in redisplay-xlike-inc.c).
* console-x.h:
Remove unneeded decls, make some static.
* redisplay-xlike-inc.c:
* console-xlike-inc.h: New file. Include defns from
redisplay-xlike-inc.c that may be useful in other XLIKE files.
Correct the handling of colors and font-style setting functions
in the xlike defns. Lots of fixes in the GTK-specific defns.
* depend: Regenerate.
* event-xlike-inc.c:
* event-xlike-inc.c (USE_UNICODE_MAP):
* event-xlike-inc.c (endif):
* gccache-gtk.c:
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (FROB):
* gtk-glue.c (face_to_gc):
* gtk-glue.c (face_to_style):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.h (struct _GtkXEmacs):
* gtk-xemacs.h (struct _GtkXEmacsClass):
* objects-xlike-inc.c:
Cosmetic, comment fixes.
* glyphs.c (pixmap_to_lisp_data):
Unused var fixes.
* gtk-glue.c:
* gccache-gtk.c:
* gtk-xemacs.c:
* gtk-xemacs.h:
* objects-xlike-inc.c:
* ui-gtk.c:
* ui-gtk.h:
* xgccache.c:
* xgccache.c (GC_CACHE_SIZE):
* xgccache.h:
Misc include-file fixes.
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xlistfonts_checking_charset):
Combine some ifdeffed stuff using defs in console-xlike-inc.h.
* redisplay-gtk.c:
* redisplay-gtk.c (THIS_IS_GTK):
* redisplay-gtk.c (XLIKE_bevel_area):
* redisplay-gtk.c (XLIKE_ring_bell):
* redisplay-gtk.c (gdk_draw_text_image):
Fix numerous compile problems. Delete gtk_output_shadows(),
which mostly duplicates generic bevel_modeline(). Fix up
gtk_bevel_modeline() into XLIKE_bevel_area() and make use of
the style var properly to set the appropriate GTK constant.
* redisplay-x.c:
* redisplay-x.c (XLIKE_window_output_begin):
* redisplay-x.c (XLIKE_window_output_end):
* redisplay-x.c (XLIKE_bevel_area):
* redisplay-x.c (x_output_shadows):
* redisplay-x.c (XLIKE_ring_bell):
Make x_output_shadows be static. Change the defn of various
functions to look like XLIKE_foo() so it matches the calling
convention elsewhere.
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (NEED_GCCACHE_H):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR):
* redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_flash):
Lots of header fixes. Lots of stuff moved to console-xlike-inc.h.
Use XFUN() to generate function names instead of directly
calling XLIKE_PASTE(). Remove unnecessary prototypes.
Unify calls to text_width funs. Make XLIKE_get_gc non-static
since it's called from gtk. Change the color-function calls
and fill-style-setting calls to match the changes in
console-xlike-inc.h. Use USED() to avoid some warnings.
* symsinit.h:
Sort the prototypes, and add a fun `sort-symsinit' in a comment
that does the sorting (using sort-regexp-fields).
* symsinit.h (init_number):
* sysgtk.h: New file, wraps the various GTK headers.
* sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to
* event-gtk.h: Delete. Combine stuff into console-gtk.h.
help isolate X-specific code from GTK.
* device-gtk.c:
* event-gtk.c:
* console-gtk.h:
* frame-gtk.c:
* gccache-gtk.c:
* gccache-gtk.h:
* glyphs-gtk.c (gtk_colorize_image_instance):
* glyphs-gtk.h:
* gtk-xemacs.h:
* objects-gtk.c:
* objects-gtk.c (MAX_FONT_COUNT):
* ui-gtk.h:
Use sysgtk.h or sysgdkx.h instead of directly including GTK
headers. Don't include event-gtk.h.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 02:15:28 -0600 |
parents | aa28d959af41 |
children | e0db3c197671 |
rev | line source |
---|---|
428 | 1 /* Lisp interface to hash tables -- include file. |
2 Copyright (C) 1995, 1996 Ben Wing. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: Not in FSF. */ | |
22 | |
440 | 23 #ifndef INCLUDED_elhash_h_ |
24 #define INCLUDED_elhash_h_ | |
428 | 25 |
440 | 26 typedef struct Lisp_Hash_Table Lisp_Hash_Table; |
428 | 27 |
440 | 28 DECLARE_LRECORD (hash_table, Lisp_Hash_Table); |
29 | |
30 #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table) | |
617 | 31 #define wrap_hash_table(p) wrap_record (p, hash_table) |
428 | 32 #define HASH_TABLEP(x) RECORDP (x, hash_table) |
33 #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table) | |
34 #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table) | |
35 | |
4072 | 36 typedef struct htentry |
37 { | |
3092 | 38 #ifdef NEW_GC |
4072 | 39 struct lrecord_header lheader; |
40 #endif /* NEW_GC */ | |
41 Lisp_Object key; | |
42 Lisp_Object value; | |
43 } htentry; | |
44 | |
45 #define HTENTRY_CLEAR_P(htentry) ((*(EMACS_UINT*)(&((htentry)->key))) == 0) | |
46 | |
47 #ifdef NEW_GC | |
48 | |
3092 | 49 typedef struct htentry Lisp_Hash_Table_Entry; |
50 | |
51 DECLARE_LRECORD (hash_table_entry, Lisp_Hash_Table_Entry); | |
52 | |
53 #define XHASH_TABLE_ENTRY(x) \ | |
54 XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry) | |
55 #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry) | |
56 #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry) | |
57 #define CHECK_HASH_TABLE_ENTRY(x) CHECK_RECORD (x, hash_table_entry) | |
58 #define CONCHECK_HASH_TABLE_ENTRY(x) CONCHECK_RECORD (x, hash_table_entry) | |
59 #endif /* NEW_GC */ | |
60 | |
428 | 61 enum hash_table_weakness |
62 { | |
63 HASH_TABLE_NON_WEAK, | |
64 HASH_TABLE_KEY_WEAK, | |
65 HASH_TABLE_VALUE_WEAK, | |
442 | 66 HASH_TABLE_KEY_VALUE_WEAK, |
428 | 67 HASH_TABLE_KEY_CAR_WEAK, |
68 HASH_TABLE_VALUE_CAR_WEAK, | |
450 | 69 HASH_TABLE_KEY_CAR_VALUE_WEAK, |
428 | 70 HASH_TABLE_WEAK |
71 }; | |
72 | |
73 enum hash_table_test | |
74 { | |
75 HASH_TABLE_EQ, | |
76 HASH_TABLE_EQL, | |
77 HASH_TABLE_EQUAL | |
78 }; | |
79 | |
1204 | 80 extern const struct memory_description hash_table_description[]; |
428 | 81 |
82 EXFUN (Fcopy_hash_table, 1); | |
83 EXFUN (Fhash_table_count, 1); | |
84 EXFUN (Fgethash, 3); | |
85 EXFUN (Fputhash, 3); | |
86 EXFUN (Fremhash, 2); | |
87 EXFUN (Fclrhash, 1); | |
88 | |
89 typedef int (*hash_table_test_function_t) (Lisp_Object obj1, Lisp_Object obj2); | |
2515 | 90 typedef Hashcode (*hash_table_hash_function_t) (Lisp_Object obj); |
428 | 91 typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value, |
92 void* extra_arg); | |
93 | |
450 | 94 Lisp_Object make_standard_lisp_hash_table (enum hash_table_test test, |
665 | 95 Elemcount size, |
450 | 96 double rehash_size, |
97 double rehash_threshold, | |
98 enum hash_table_weakness weakness); | |
99 | |
100 Lisp_Object make_general_lisp_hash_table (hash_table_hash_function_t hash_function, | |
101 hash_table_test_function_t test_function, | |
665 | 102 Elemcount size, |
428 | 103 double rehash_size, |
104 double rehash_threshold, | |
105 enum hash_table_weakness weakness); | |
106 | |
665 | 107 Lisp_Object make_lisp_hash_table (Elemcount size, |
428 | 108 enum hash_table_weakness weakness, |
109 enum hash_table_test test); | |
110 | |
111 void elisp_maphash (maphash_function_t function, | |
112 Lisp_Object hash_table, void *extra_arg); | |
113 | |
489 | 114 void elisp_maphash_unsafe (maphash_function_t function, |
115 Lisp_Object hash_table, void *extra_arg); | |
116 | |
428 | 117 void elisp_map_remhash (maphash_function_t predicate, |
118 Lisp_Object hash_table, void *extra_arg); | |
119 | |
120 int finish_marking_weak_hash_tables (void); | |
121 void prune_weak_hash_tables (void); | |
122 | |
440 | 123 void pdump_reorganize_hash_table (Lisp_Object); |
428 | 124 |
2421 | 125 void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset); |
126 | |
4072 | 127 htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht); |
128 | |
440 | 129 #endif /* INCLUDED_elhash_h_ */ |