Mercurial > hg > xemacs-beta
annotate src/glyphs-gtk.h @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 06:42:16 -0600 |
parents | b3ce27ca7647 |
children | 308d34e9f07d |
rev | line source |
---|---|
462 | 1 /* Gtk-specific glyphs and related. |
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
4 Copyright (C) 1995, 1996 Ben Wing | |
5 Copyright (C) 1995 Sun Microsystems, Inc. | |
6 | |
7 This file is part of XEmacs. | |
8 | |
9 XEmacs is free software; you can redistribute it and/or modify it | |
10 under the terms of the GNU General Public License as published by the | |
11 Free Software Foundation; either version 2, or (at your option) any | |
12 later version. | |
13 | |
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
17 for more details. | |
18 | |
19 You should have received a copy of the GNU General Public License | |
20 along with XEmacs; see the file COPYING. If not, write to | |
21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 Boston, MA 02111-1307, USA. */ | |
23 | |
24 /* Synched up with: Not in FSF. */ | |
25 /* Gtk version by William Perry */ | |
26 | |
27 #ifndef _XEMACS_GLYPHS_GTK_H_ | |
28 #define _XEMACS_GLYPHS_GTK_H_ | |
29 | |
30 #include "glyphs.h" | |
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
3087
diff
changeset
|
31 #include "sysgtk.h" |
462 | 32 |
33 #ifdef HAVE_GTK | |
34 | |
35 /**************************************************************************** | |
36 * Image-Instance Object * | |
37 ****************************************************************************/ | |
38 | |
39 struct gtk_image_instance_data | |
40 { | |
41 GdkPixmap **pixmaps; | |
42 GdkCursor *cursor; | |
43 | |
44 /* If depth>0, then that means that other colors were allocated when | |
45 this pixmap was loaded. These are they; we need to free them when | |
46 finalizing the image instance. */ | |
47 GdkColormap *colormap; | |
48 unsigned long *pixels; | |
49 int npixels; | |
50 | |
51 /* Should we hang on to the extra info from the XpmAttributes, like | |
52 the textual color table and the comments? Is that useful? */ | |
53 }; | |
54 | |
55 struct gtk_subwindow_data | |
56 { | |
57 union | |
58 { | |
59 struct | |
60 { | |
61 GtkWidget *parent_window; | |
62 GtkWidget *clip_window; | |
63 } sub; | |
64 struct | |
65 { | |
66 GtkWidget *clip_window; | |
67 Lisp_Object widget; | |
68 guint x_offset; | |
69 guint y_offset; | |
70 gboolean added_to_fixed; | |
71 } wid; | |
72 } data; | |
73 }; | |
74 | |
75 void init_image_instance_from_gdk_pixmap (struct Lisp_Image_Instance *ii, | |
76 struct device *device, | |
77 GdkPixmap *gdk_pixmap, | |
78 int dest_mask, | |
79 Lisp_Object instantiator); | |
80 | |
81 #define GTK_IMAGE_INSTANCE_DATA(i) ((struct gtk_image_instance_data *) (i)->data) | |
82 | |
83 #define IMAGE_INSTANCE_GTK_PIXMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[0]) | |
84 #define IMAGE_INSTANCE_GTK_PIXMAP_SLICE(i,slice) \ | |
85 (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) | |
86 #define IMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ | |
87 (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps) | |
3087 | 88 #define IMAGE_INSTANCE_GTK_MASK(i) ((GdkPixmap*)(IMAGE_INSTANCE_PIXMAP_MASK (i))) |
462 | 89 #define IMAGE_INSTANCE_GTK_CURSOR(i) (GTK_IMAGE_INSTANCE_DATA (i)->cursor) |
90 #define IMAGE_INSTANCE_GTK_COLORMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->colormap) | |
91 #define IMAGE_INSTANCE_GTK_PIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixels) | |
92 #define IMAGE_INSTANCE_GTK_NPIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->npixels) | |
93 | |
94 #define XIMAGE_INSTANCE_GTK_PIXMAP(i) \ | |
95 IMAGE_INSTANCE_GTK_PIXMAP (XIMAGE_INSTANCE (i)) | |
96 #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICE(i) \ | |
97 IMAGE_INSTANCE_GTK_PIXMAP_SLICE (XIMAGE_INSTANCE (i)) | |
98 #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ | |
99 IMAGE_INSTANCE_GTK_PIXMAP_SLICES (XIMAGE_INSTANCE (i)) | |
100 #define XIMAGE_INSTANCE_GTK_MASK(i) \ | |
101 IMAGE_INSTANCE_GTK_MASK (XIMAGE_INSTANCE (i)) | |
102 #define XIMAGE_INSTANCE_GTK_CURSOR(i) \ | |
103 IMAGE_INSTANCE_GTK_CURSOR (XIMAGE_INSTANCE (i)) | |
104 #define XIMAGE_INSTANCE_GTK_PIXELS(i) \ | |
105 IMAGE_INSTANCE_GTK_PIXELS (XIMAGE_INSTANCE (i)) | |
106 #define XIMAGE_INSTANCE_GTK_NPIXELS(i) \ | |
107 IMAGE_INSTANCE_GTK_NPIXELS (XIMAGE_INSTANCE (i)) | |
108 | |
109 /* Subwindow / widget stuff */ | |
110 #define GTK_SUBWINDOW_INSTANCE_DATA(i) ((struct gtk_subwindow_data *) (i)->data) | |
111 | |
112 #define IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ | |
113 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window) | |
114 #define IMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ | |
115 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window) | |
116 #define IMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ | |
117 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset) | |
118 #define IMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ | |
119 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset) | |
120 #define IMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ | |
121 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id) | |
122 #define IMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ | |
123 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window) | |
124 #define IMAGE_INSTANCE_GTK_ALREADY_PUT(i) \ | |
125 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.added_to_fixed) | |
126 #define IMAGE_INSTANCE_GTK_SUBWINDOW_ID(i) \ | |
127 ((GdkWindow *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
128 #define IMAGE_INSTANCE_GTK_WIDGET_ID(i) \ | |
129 ((GtkWidget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
130 | |
131 #define XIMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ | |
132 IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i)) | |
133 #define XIMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY(i) \ | |
134 IMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i)) | |
135 #define XIMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ | |
136 IMAGE_INSTANCE_GTK_WIDGET_XOFFSET (XIMAGE_INSTANCE (i)) | |
137 #define XIMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ | |
138 IMAGE_INSTANCE_GTK_WIDGET_YOFFSET (XIMAGE_INSTANCE (i)) | |
139 #define XIMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ | |
140 IMAGE_INSTANCE_GTK_WIDGET_LWID (XIMAGE_INSTANCE (i)) | |
141 #define XIMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ | |
142 IMAGE_INSTANCE_GTK_CLIPWIDGET (XIMAGE_INSTANCE (i)) | |
143 #define XIMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ | |
144 IMAGE_INSTANCE_GTK_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
145 #define XIMAGE_INSTANCE_GTK_WIDGET_ID(i) \ | |
146 IMAGE_INSTANCE_GTK_WIDGET_ID (XIMAGE_INSTANCE (i)) | |
147 | |
148 #define DOMAIN_GTK_WIDGET(domain) \ | |
149 ((IMAGE_INSTANCEP (domain) && \ | |
150 GTK_SUBWINDOW_INSTANCE_DATA (XIMAGE_INSTANCE (domain))) ? \ | |
151 XIMAGE_INSTANCE_GTK_WIDGET_ID (domain) : \ | |
152 FRAME_GTK_CONTAINER_WIDGET (f) (DOMAIN_XFRAME (domain))) | |
153 | |
154 #endif /* HAVE_GTK */ | |
155 #endif /* _XEMACS_GLYPHS_GTK_H_ */ |