Mercurial > hg > xemacs-beta
view src/EmacsFrame.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 | 8de8e3f6228a |
children | 308d34e9f07d |
line wrap: on
line source
/* Public header for the Emacs frame widget. Copyright (C) 1993-1995 Sun Microsystems, Inc. Copyright (C) 1995 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_EmacsFrame_h_ #define INCLUDED_EmacsFrame_h_ #ifndef XtNminibuffer #define XtNminibuffer "minibuffer" #endif #ifndef XtCMinibuffer #define XtCMinibuffer "Minibuffer" #endif #ifndef XtNunsplittable #define XtNunsplittable "unsplittable" #endif #ifndef XtCUnsplittable #define XtCUnsplittable "Unsplittable" #endif #ifndef XtNinternalBorderWidth #define XtNinternalBorderWidth "internalBorderWidth" #endif #ifndef XtCInternalBorderWidth #define XtCInternalBorderWidth "InternalBorderWidth" #endif #ifndef XtNscrollBarWidth #define XtNscrollBarWidth "scrollBarWidth" #endif #ifndef XtCScrollBarWidth #define XtCScrollBarWidth "ScrollBarWidth" #endif #ifndef XtNscrollBarHeight #define XtNscrollBarHeight "scrollBarHeight" #endif #ifndef XtCScrollBarHeight #define XtCScrollBarHeight "ScrollBarHeight" #endif #ifndef XtNtopToolBarHeight #define XtNtopToolBarHeight "topToolBarHeight" #endif #ifndef XtCTopToolBarHeight #define XtCTopToolBarHeight "TopToolBarHeight" #endif #ifndef XtNbottomToolBarHeight #define XtNbottomToolBarHeight "bottomToolBarHeight" #endif #ifndef XtCBottomToolBarHeight #define XtCBottomToolBarHeight "BottomToolBarHeight" #endif #ifndef XtNleftToolBarWidth #define XtNleftToolBarWidth "leftToolBarWidth" #endif #ifndef XtCLeftToolBarWidth #define XtCLeftToolBarWidth "LeftToolBarWidth" #endif #ifndef XtNrightToolBarWidth #define XtNrightToolBarWidth "rightToolBarWidth" #endif #ifndef XtCRightToolBarWidth #define XtCRightToolBarWidth "RightToolBarWidth" #endif #ifndef XtNtopToolBarBorderWidth #define XtNtopToolBarBorderWidth "topToolBarBorderWidth" #endif #ifndef XtCTopToolBarBorderWidth #define XtCTopToolBarBorderWidth "TopToolBarBorderWidth" #endif #ifndef XtNbottomToolBarBorderWidth #define XtNbottomToolBarBorderWidth "bottomToolBarBorderWidth" #endif #ifndef XtCBottomToolBarBorderWidth #define XtCBottomToolBarBorderWidth "BottomToolBarBorderWidth" #endif #ifndef XtNleftToolBarBorderWidth #define XtNleftToolBarBorderWidth "leftToolBarBorderWidth" #endif #ifndef XtCLeftToolBarBorderWidth #define XtCLeftToolBarBorderWidth "LeftToolBarBorderWidth" #endif #ifndef XtNrightToolBarBorderWidth #define XtNrightToolBarBorderWidth "rightToolBarBorderWidth" #endif #ifndef XtCRightToolBarBorderWidth #define XtCRightToolBarBorderWidth "RightToolBarBorderWidth" #endif #ifndef XtNtopToolBarShadowColor #define XtNtopToolBarShadowColor "topToolBarShadowColor" #endif #ifndef XtCTopToolBarShadowColor #define XtCTopToolBarShadowColor "TopToolBarShadowColor" #endif #ifndef XtNbottomToolBarShadowColor #define XtNbottomToolBarShadowColor "bottomToolBarShadowColor" #endif #ifndef XtCBottomToolBarShadowColor #define XtCBottomToolBarShadowColor "BottomToolBarShadowColor" #endif #ifndef XtNbackgroundToolBarColor #define XtNbackgroundToolBarColor "backgroundToolBarColor" #endif #ifndef XtCBackgroundToolBarColor #define XtCBackgroundToolBarColor "BackgroundToolBarColor" #endif #ifndef XtNforegroundToolBarColor #define XtNforegroundToolBarColor "foregroundToolBarColor" #endif #ifndef XtCForegroundToolBarColor #define XtCForegroundToolBarColor "ForegroundToolBarColor" #endif #ifndef XtNtopToolBarShadowPixmap #define XtNtopToolBarShadowPixmap "topToolBarShadowPixmap" #endif #ifndef XtCTopToolBarShadowPixmap #define XtCTopToolBarShadowPixmap "TopToolBarShadowPixmap" #endif #ifndef XtNbottomToolBarShadowPixmap #define XtNbottomToolBarShadowPixmap "bottomToolBarShadowPixmap" #endif #ifndef XtCBottomToolBarShadowPixmap #define XtCBottomToolBarShadowPixmap "BottomToolBarShadowPixmap" #endif #ifndef XtNtoolBarShadowThickness #define XtNtoolBarShadowThickness "toolBarShadowThickness" #endif #ifndef XtCToolBarShadowThickness #define XtCToolBarShadowThickness "ToolBarShadowThickness" #endif #ifndef XtNscrollBarPlacement #define XtNscrollBarPlacement "scrollBarPlacement" #endif #ifndef XtCScrollBarPlacement #define XtCScrollBarPlacement "ScrollBarPlacement" #endif #ifndef XtRScrollBarPlacement #define XtRScrollBarPlacement "ScrollBarPlacement" #endif #ifndef XtNinterline #define XtNinterline "interline" #endif #ifndef XtCInterline #define XtCInterline "Interline" #endif #ifndef XtNfont #define XtNfont "font" #endif #ifndef XtCFont #define XtCFont "Font" #endif #ifndef XtNforeground #define XtNforeground "foreground" #endif #ifndef XtCForeground #define XtCForeground "Foreground" #endif #ifndef XtNbackground #define XtNbackground "background" #endif #ifndef XtCBackground #define XtCBackground "Background" #endif #ifndef XtNiconic #define XtNiconic "iconic" #endif #ifndef XtCIconic #define XtCIconic "Iconic" #endif #ifndef XtNcursorColor #define XtNcursorColor "cursorColor" #endif #ifndef XtCCursorColor #define XtCCursorColor "CursorColor" #endif #ifndef XtNbarCursor #define XtNbarCursor "barCursor" #endif #ifndef XtCBarCursor #define XtCBarCursor "BarCursor" #endif #ifndef XtNvisualBell #define XtNvisualBell "visualBell" #endif #ifndef XtCVisualBell #define XtCVisualBell "VisualBell" #endif #ifndef XtNbellVolume #define XtNbellVolume "bellVolume" #endif #ifndef XtCBellVolume #define XtCBellVolume "BellVolume" #endif #ifndef XtNpointerBackground #define XtNpointerBackground "pointerBackground" #endif #ifndef XtNpointerColor #define XtNpointerColor "pointerColor" #endif #ifndef XtNtextPointer #define XtNtextPointer "textPointer" #endif #ifndef XtNspacePointer #define XtNspacePointer "spacePointer" #endif #ifndef XtNmodeLinePointer #define XtNmodeLinePointer "modePointer" #endif #ifndef XtNgcPointer #define XtNgcPointer "gcPointer" #endif #ifndef XtNemacsFrame #define XtNemacsFrame "emacsFrame" #endif #ifndef XtCEmacsFrame #define XtCEmacsFrame "EmacsFrame" #endif #ifndef XtNgeometry #define XtNgeometry "geometry" #endif #ifndef XtCGeometry #define XtCGeometry "Geometry" #endif #ifndef XtNinitialGeometry #define XtNinitialGeometry "initialGeometry" #endif #ifndef XtCInitialGeometry #define XtCInitialGeometry "InitialGeometry" #endif #ifndef XtNmenubar #define XtNmenubar "menubar" #endif #ifndef XtCMenubar #define XtCMenubar "Menubar" #endif #ifndef XtNinitiallyUnmapped #define XtNinitiallyUnmapped "initiallyUnmapped" #endif #ifndef XtCInitiallyUnmapped #define XtCInitiallyUnmapped "InitiallyUnmapped" #endif #ifndef XtNpreferredWidth #define XtNpreferredWidth "preferredWidth" #endif #ifndef XtCPreferredWidth #define XtCPreferredWidth "PreferredWidth" #endif #ifndef XtNpreferredHeight #define XtNpreferredHeight "preferredHeight" #endif #ifndef XtCPreferredHeight #define XtCPreferredHeight "PreferredHeight" #endif #ifndef XtNuseBackingStore #define XtNuseBackingStore "useBackingStore" #endif #ifndef XtCUseBackingStore #define XtCUseBackingStore "UseBackingStore" #endif #define XtNximStyles "ximStyles" #define XtCXimStyles "XimStyles" #define XtRXimStyles "XimStyles" #define XtNximForeground "ximForeground" #define XtNximBackground "ximBackground" /* scrollbar placement types; like in ScrolledW.h */ #define EM_TOP 1 #define EM_BOTTOM 0 #define EM_LEFT 2 #define EM_RIGHT 0 #define XtTOP_LEFT (EM_TOP | EM_LEFT) #define XtBOTTOM_LEFT (EM_BOTTOM | EM_LEFT) #define XtTOP_RIGHT (EM_TOP | EM_RIGHT) #define XtBOTTOM_RIGHT (EM_BOTTOM | EM_RIGHT) /* structures */ typedef struct _EmacsFrameRec *EmacsFrame; typedef struct _EmacsFrameClassRec *EmacsFrameClass; extern WidgetClass emacsFrameClass; extern struct _DisplayContext* display_context; /* Special entrypoints */ void EmacsFrameRecomputeCellSize (Widget widget); void EmacsFrameSetCharSize (Widget widget, int rows, int cols); #endif /* INCLUDED_EmacsFrame_h_ */