Mercurial > hg > xemacs-beta
annotate lwlib/xlwgauge.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 | 16b17fd1dc93 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 424 | 1 /* Gauge Widget for XEmacs. |
| 2 Copyright (C) 1999 Edward A. Falk | |
| 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: Gauge.h 1.1 */ | |
| 22 | |
| 23 /* | |
| 24 * Gauge.h - Gauge widget | |
| 25 * | |
| 26 * Author: Edward A. Falk | |
| 27 * falk@falconer.vip.best.com | |
| 442 | 28 * |
| 424 | 29 * Date: July 8, 1997 |
| 30 */ | |
| 31 | |
| 32 #ifndef _XawGauge_h | |
| 33 #define _XawGauge_h | |
| 34 | |
| 35 /*********************************************************************** | |
| 36 * | |
| 37 * Gauge Widget | |
| 38 * | |
| 39 * The Gauge widget looks something like a thermometer. Application | |
| 40 * defines the values at the ends of the range and the current value | |
| 41 * and Gauge draws accordingly. Gauge does not accept input. | |
| 42 * | |
| 43 ***********************************************************************/ | |
| 44 | |
| 442 | 45 #include ATHENA_Label_h_ |
| 424 | 46 |
| 47 /* Resources: | |
| 48 | |
| 49 Name Class RepType Default Value | |
| 50 ---- ----- ------- ------------- | |
| 3968 | 51 value Value Int 0 |
| 52 minValue Int Cardinal 0 | |
| 53 maxValue Int Cardinal 100 | |
| 424 | 54 ntics NTics Cardinal 0 + |
| 55 nlabels NLabels Cardinal 0 ++ | |
| 56 labels Labels String * NULL +++ | |
| 57 orientation Orientation XtOrientation horizontal | |
| 58 autoScaleUp AutoScaleUp Boolean FALSE ++++ | |
| 59 autoScaleDown AutoScaleDown Boolean FALSE ++++ | |
| 60 getValue Callback XtCallbackList NULL +++++ | |
| 61 update Interval int 0 (seconds) = disabled | |
| 62 | |
| 63 encoding Encoding unsigned char XawTextEncoding8bit | |
| 64 font Font XFontStruct* XtDefaultFont | |
| 65 foreground Foreground Pixel XtDefaultForeground | |
| 66 internalHeight Height Dimension 2 | |
| 67 internalWidth Width Dimension 4 | |
| 68 resize Resize Boolean True | |
| 69 background Background Pixel XtDefaultBackground | |
| 70 bitmap Pixmap Pixmap None | |
| 71 border BorderColor Pixel XtDefaultForeground | |
| 72 borderWidth BorderWidth Dimension 1 | |
| 73 cursor Cursor Cursor None | |
| 74 cursorName Cursor String NULL | |
| 75 destroyCallback Callback XtCallbackList NULL | |
| 76 height Height Dimension varies | |
| 77 insensitiveBorder Insensitive Pixmap Gray | |
| 78 mappedWhenManaged MappedWhenManaged Boolean True | |
| 79 pointerColor Foreground Pixel XtDefaultForeground | |
| 80 pointerColorBackground Background Pixel XtDefaultBackground | |
| 81 sensitive Sensitive Boolean True | |
| 82 width Width Dimension text width | |
| 83 x Position Position 0 | |
| 84 y Position Position 0 | |
| 85 | |
| 86 + Ntics sets the number of tic marks next to the gauge. If 0, no | |
| 87 tic marks will be drawn. | |
| 88 ++ Nlabels sets the number of labels next to the gauge. | |
| 89 +++ Labels is an array of nul-terminated strings to be used as labels. | |
| 90 If this field is NULL but nlabels is > 0, then numeric labels will be | |
| 91 provided. NOTE: the labels are not copied to any internal memory; they | |
| 442 | 92 must be stored in static memory provided by the application. |
| 424 | 93 ++++ AutoScale allows the gauge to set its own value limits. Default is |
| 94 False unless upper & lower limits are both 0. | |
| 95 | |
| 96 +++++ The GetValue() callback proc is called with these arguments: | |
| 97 static void | |
| 98 myGetValue(gauge, client, rval) | |
| 99 Widget gauge ; | |
| 100 XtPointer client ; | |
| 101 XtPointer rval ; | |
| 102 { | |
| 3968 | 103 *(int *)rval = value ; |
| 424 | 104 } |
| 442 | 105 |
| 424 | 106 */ |
| 107 | |
| 108 /* | |
| 109 * Resource names not provided in StringDefs.h | |
| 110 */ | |
| 111 | |
| 112 #ifndef XtNvalue | |
| 113 #define XtNvalue "value" | |
| 114 #define XtCValue "Value" | |
| 115 #endif | |
| 116 | |
| 117 #ifndef XtNorientation | |
| 118 #define XtNorientation "orientation" | |
| 119 #define XtCOrientation "Orientation" | |
| 120 #endif | |
| 121 | |
| 122 #define XtNntics "ntics" | |
| 123 #define XtCNTics "NTics" | |
| 124 | |
| 125 #ifndef XtNnlabels | |
| 126 #define XtNnlabels "nlabels" | |
| 127 #define XtCNLabels "NLabels" | |
| 128 #endif | |
| 129 #ifndef XtNlabels | |
| 130 #define XtNlabels "labels" | |
| 131 #define XtCLabels "Labels" | |
| 132 #endif | |
| 133 | |
| 134 #ifndef XtNminValue | |
| 135 #define XtNminValue "minValue" | |
| 136 #define XtCMinValue "MinValue" | |
| 137 #endif | |
| 138 #ifndef XtNmaxValue | |
| 139 #define XtNmaxValue "maxValue" | |
| 140 #define XtCMaxValue "MaxValue" | |
| 141 #endif | |
| 142 | |
| 143 #ifndef XtNautoScaleUp | |
| 144 #define XtNautoScaleUp "autoScaleUp" | |
| 145 #define XtCAutoScaleUp "AutoScaleUp" | |
| 146 #define XtNautoScaleDown "autoScaleDown" | |
| 147 #define XtCAutoScaleDown "AutoScaleDown" | |
| 148 #endif | |
| 149 | |
| 150 #ifndef XtNupdate | |
| 151 #define XtNupdate "update" | |
| 152 #endif | |
| 153 | |
| 154 #ifndef XtNgetValue | |
| 155 #define XtNgetValue "getValue" | |
| 156 #endif | |
| 157 | |
| 158 | |
| 159 /* Class record constants */ | |
| 160 | |
| 161 extern WidgetClass gaugeWidgetClass; | |
| 162 | |
| 163 typedef struct _GaugeClassRec *GaugeWidgetClass; | |
| 164 typedef struct _GaugeRec *GaugeWidget; | |
| 165 | |
| 166 | |
| 167 _XFUNCPROTOBEGIN | |
| 168 | |
| 169 extern void XawGaugeSetValue( | |
| 170 #if NeedFunctionPrototypes | |
| 171 Widget gauge, | |
| 3968 | 172 int value |
| 424 | 173 #endif |
| 174 ); | |
| 175 | |
| 3968 | 176 extern int XawGaugeGetValue( |
| 424 | 177 #if NeedFunctionPrototypes |
| 178 Widget gauge | |
| 179 #endif | |
| 180 ); | |
| 181 | |
| 182 _XFUNCPROTOEND | |
| 183 | |
| 184 #endif /* _XawGauge_h */ |