Mercurial > hg > xemacs-beta
annotate lwlib/xlwgcs.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 | 5460287a3327 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 398 | 1 /* Tabs Widget for XEmacs. |
| 2 Copyright (C) 1999 Edward A. Falk | |
| 442 | 3 |
| 398 | 4 This file is part of XEmacs. |
| 442 | 5 |
| 398 | 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. | |
| 442 | 10 |
| 398 | 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. | |
| 442 | 15 |
| 398 | 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. */ | |
| 442 | 20 |
| 398 | 21 /* Synched up with: Gcs 1.7 */ |
| 442 | 22 |
| 398 | 23 |
| 24 #ifndef GCS_H | |
| 25 #define GCS_H | |
| 26 | |
| 27 /* Overview of functions provided here: | |
| 28 * | |
| 29 * AllocFgGC() | |
| 30 * Given a foreground pixel & a font, return an appropriate GC | |
| 31 * | |
| 32 * AllocBackgroundGC() | |
| 33 * Given a widget, return a GC for painting the background color | |
| 34 * | |
| 35 * AllocShadeGC() | |
| 36 * Given foreground, background, a contrast value & be_nice_to_colormap | |
| 37 * flag, return a GC suitable for rendering in an intermediate color, | |
| 442 | 38 * as determined by contrast. May return a dither pattern or a |
| 398 | 39 * solid color, as appropriate. |
| 40 * | |
| 41 * Contrast 0 = background color, 100 = foreground color. It is legal | |
| 42 * for contrast to be more than 100 or less than 0. | |
| 43 * | |
| 44 * AllocGreyGC() | |
| 45 * Given widget, foreground, font, contrast & be_nice_to_colormap, | |
| 46 * return a shade GC (see above) based on foreground and widget | |
| 47 * background. | |
| 48 * | |
| 49 * AllocTopShadowGC() | |
| 50 * Given widget, contrast & be_nice_to_colormap, return a GC suitable | |
| 51 * for rendering the top shadow. | |
| 52 * | |
| 53 * Contrast 0 = use background pixel. Contrast > 0 = use brighter | |
| 54 * colors. | |
| 55 * | |
| 56 * AllocBotShadowGC() | |
| 57 * Given widget, contrast & be_nice_to_colormap, return a GC suitable | |
| 58 * for rendering the bottom shadow. | |
| 59 * | |
| 60 * Contrast 0 = use background pixel. Contrast > 0 = use darker | |
| 61 * colors. | |
| 62 * | |
| 63 * AllocArmShadowGC() | |
| 64 * Given widget, contrast & be_nice_to_colormap, return a GC suitable | |
| 65 * for rendering the "armed" shadow. | |
| 66 * | |
| 67 * Contrast 0 = use background pixel. Contrast > 0 = use darker | |
| 68 * colors. | |
| 69 * | |
| 70 * AllocShadowPixel() | |
| 71 * Given a widget & scale factor, allocate & return a color darker | |
| 72 * or lighter than the background pixel, as determined by scale. | |
| 73 * | |
| 74 * Scale 100 = use background pixel. Scale > 100 = brighter color, | |
| 75 * Scale < 100 = darker color. | |
| 76 * | |
| 77 * AllocGreyPixel() | |
| 78 * Given two pixel values and scale factor, allocate & return a | |
| 79 * pixel value between them, according to scale. | |
| 80 * | |
| 81 * Scale == 0: background color | |
| 82 * Scale == 100: foreground color | |
| 83 * 0<Scale<100: intermediate color | |
| 84 * Scale > 100: more foreground | |
| 85 * Scale < 0: more background | |
| 86 * | |
| 87 * | |
| 88 * AllocGreyPixelC() | |
| 89 * Given two color values and scale factor, allocate & return a | |
| 90 * pixel value between them, according to scale. | |
| 91 * | |
| 92 * Scale == 0: background color | |
| 93 * Scale == 100: foreground color | |
| 94 * 0<Scale<100: intermediate color | |
| 95 * Scale > 100: more foreground | |
| 96 * Scale < 0: more background | |
| 97 * | |
| 98 * Draw3dBox() | |
| 99 * Given box dimensions, shadow width, top shadow GC & bottom shadow GC, | |
| 100 * draw a 3-d box. | |
| 101 */ | |
| 102 | |
| 103 #if NeedFunctionPrototypes | |
| 104 | |
| 105 extern GC AllocFgGC( Widget w, Pixel fg, Font font) ; | |
| 106 extern GC AllocBackgroundGC( Widget w, Font font) ; | |
| 107 extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font, | |
| 108 int contrast, Bool ) ; | |
| 109 extern GC AllocGreyGC( Widget w, Pixel fg, Font, int, Bool ) ; | |
| 110 extern GC AllocTopShadowGC( Widget w, int contrast, int ) ; | |
| 111 extern GC AllocBotShadowGC( Widget w, int contrast, int ) ; | |
| 112 extern GC AllocArmGC( Widget w, int contrast, int) ; | |
| 113 extern Pixel AllocShadowPixel(Widget, int scale) ; | |
| 114 extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; | |
| 115 extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; | |
| 116 extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, | |
| 117 GC topgc, GC botgc) ; | |
| 118 | |
| 119 #else | |
| 120 | |
| 121 extern GC AllocFgGC() ; | |
| 122 extern GC AllocBackgroundGC() ; | |
| 123 extern GC AllocShadeGC() ; | |
| 124 extern GC AllocGreyGC() ; | |
| 125 extern GC AllocTopShadowGC() ; | |
| 126 extern GC AllocBotShadowGC() ; | |
| 127 extern GC AllocArmGC() ; | |
| 128 extern Pixel AllocShadowPixel() ; | |
| 129 extern Pixel AllocGreyPixel() ; | |
| 130 extern Pixel AllocGreyPixelC() ; | |
| 131 extern void Draw3dBox() ; | |
| 132 | |
| 133 #endif | |
| 134 | |
| 135 #endif /* GCS_H */ |