Mercurial > hg > xemacs-beta
annotate src/console-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 | 8af6a32b170d |
rev | line source |
---|---|
462 | 1 /* Define X specific console, device, and frame object for XEmacs. |
2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. | |
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
1318 | 4 Copyright (C) 2002, 2003 Ben Wing. |
462 | 5 |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
25 | |
26 /* Authorship: | |
27 | |
28 Ultimately based on FSF, then later on JWZ work for Lemacs. | |
29 Rewritten over time by Ben Wing and Chuck Thompson (original | |
30 multi-device work by Chuck Thompson). | |
31 */ | |
32 | |
33 #ifndef _XEMACS_CONSOLE_GTK_H_ | |
34 #define _XEMACS_CONSOLE_GTK_H_ | |
35 | |
36 #ifdef HAVE_GTK | |
37 | |
38 #include "console.h" | |
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
39 #include "sysgtk.h" |
462 | 40 |
41 /* Variables associated with the X display frame this emacs is using. */ | |
42 | |
43 extern Lisp_Object Vx_gc_pointer_shape; | |
44 extern Lisp_Object Vx_scrollbar_pointer_shape; | |
45 | |
46 /* Number of pixels below each line. */ | |
47 extern int gtk_interline_space; | |
48 | |
49 extern int gtk_selection_timeout; | |
50 | |
2168 | 51 struct frame *gtk_widget_to_frame (GtkWidget *); |
462 | 52 struct frame *gtk_any_window_to_frame (struct device *d, GdkWindow *); |
53 struct frame *gtk_window_to_frame (struct device *d, GdkWindow *); | |
54 struct frame *gtk_any_widget_or_parent_to_frame (struct device *d, GtkWidget *widget); | |
55 struct frame *decode_gtk_frame (Lisp_Object); | |
56 struct device *gtk_any_window_to_device (GdkWindow *); | |
57 struct device *decode_gtk_device (Lisp_Object); | |
58 void gtk_handle_property_notify (GdkEventProperty *event); | |
59 | |
60 void signal_special_gtk_user_event (Lisp_Object channel, Lisp_Object function, | |
61 Lisp_Object object); | |
62 void gtk_output_string (struct window *w, struct display_line *dl, | |
867 | 63 Ichar_dynarr *buf, int xpos, int xoffset, |
462 | 64 int start_pixpos, int width, face_index findex, |
65 int cursor, int cursor_start, int cursor_width, | |
66 int cursor_height); | |
714 | 67 GdkGC *gtk_get_gc (struct device *d, Lisp_Object font, Lisp_Object fg, Lisp_Object bg, |
68 Lisp_Object bg_pmap, Lisp_Object lwidth); | |
462 | 69 |
70 int gtk_initialize_frame_menubar (struct frame *f); | |
71 void gtk_init_modifier_mapping (struct device *d); | |
72 | |
73 void Initialize_Locale (void); | |
74 | |
75 extern Lisp_Object Vgtk_initial_argv_list; /* #### ugh! */ | |
76 | |
77 const char *gtk_event_name (GdkEventType event_type); | |
778 | 78 |
79 void reinit_console_type_create_gtk (void); | |
80 | |
81 void emacs_gtk_selection_handle (GtkWidget *, | |
82 GtkSelectionData *selection_data, | |
83 guint info, | |
84 guint time_stamp, | |
85 gpointer data); | |
86 void emacs_gtk_selection_clear_event_handle (GtkWidget *widget, | |
87 GdkEventSelection *event, | |
88 gpointer data); | |
89 void emacs_gtk_selection_received (GtkWidget *widget, | |
90 GtkSelectionData *selection_data, | |
91 gpointer user_data); | |
92 | |
1346 | 93 typedef unsigned int GUI_ID; |
94 extern GUI_ID new_gui_id (void); | |
95 | |
96 extern void gcpro_popup_callbacks (GUI_ID id, Lisp_Object data); | |
97 extern void ungcpro_popup_callbacks (GUI_ID id); | |
98 extern Lisp_Object get_gcpro_popup_callbacks (GUI_ID id); | |
99 | |
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
100 int gtk_event_to_emacs_event (struct frame *frame, |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
101 GdkEvent *gdk_event, |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
102 struct Lisp_Event *emacs_event); |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
103 |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
104 gint emacs_gtk_key_event_handler(GtkWidget *widget, GdkEventKey *event); |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
105 gint emacs_gtk_button_event_handler(GtkWidget *widget, GdkEventButton *event); |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
106 gint emacs_gtk_motion_event_handler (GtkWidget *widget, GdkEventMotion *event); |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
107 |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
108 gboolean emacs_shell_event_handler (GtkWidget *wid /* unused */, |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
109 GdkEvent *event, |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
110 gpointer closure); |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
2168
diff
changeset
|
111 |
462 | 112 #endif /* HAVE_GTK */ |
113 #endif /* _XEMACS_DEVICE_X_H_ */ |