Mercurial > hg > xemacs-beta
annotate src/libinterface.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 | 1cecc3e9f0a0 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 870 | 1 /* Define prototypes for graphics library interface functions. |
| 2 Copyright (C) 2002 Ben Wing. | |
| 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: Not in FSF. */ | |
| 22 | |
| 23 #ifndef INCLUDED_libinterface_h_ | |
| 24 #define INCLUDED_libinterface_h_ | |
| 25 | |
| 26 #ifdef HAVE_GIF | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
1743
diff
changeset
|
27 #include <gif_lib.h> |
| 870 | 28 #endif /* HAVE_GIF */ |
| 29 | |
| 30 #ifdef HAVE_PNG | |
| 1743 | 31 BEGIN_C_DECLS |
| 870 | 32 #define message message_ /* Yuck */ |
| 33 /* See comment in libinterface.c for the following */ | |
| 34 #define PNG_EXPORT(type, symbol) type XCDECL symbol | |
| 35 #define ZEXPORT XCDECL | |
| 36 #define ZEXPORTVA XCDECL | |
| 37 #include <png.h> | |
| 38 #undef message | |
| 1743 | 39 END_C_DECLS |
| 870 | 40 #endif /* HAVE_PNG */ |
| 41 | |
| 42 /* #### WARNING: Utterly random magic here to prevent namespace conflicts | |
| 43 when no one bothers to be the least bit namespace-clean. Potential | |
| 44 problems: INT32, FAR. DONT_NEED_JPEG avoids the problem with FAR in | |
| 45 glyphs-msw.c. For some reason, putting the XPM code after this fixes | |
| 46 other problems; don't move it before. --ben */ | |
| 47 #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) | |
| 1743 | 48 BEGIN_C_DECLS |
| 870 | 49 #ifdef _MSC_VER |
| 50 # ifndef XMD_H | |
| 51 /* Yuck! This tricks jpeglib.h into not defining INT32, which is defined | |
| 52 in VC98/INCLUDE/basetsd.h */ | |
| 53 # define UNDEF_XMD_H_ME_HARDER | |
| 54 # define XMD_H | |
| 55 # endif | |
| 56 #endif /* _MSC_VER */ | |
| 57 #include <jpeglib.h> | |
| 58 #ifdef UNDEF_XMD_H_ME_HARDER | |
| 59 # undef XMD_H | |
| 60 #endif | |
| 61 #include <jerror.h> | |
| 1743 | 62 END_C_DECLS |
| 870 | 63 |
| 64 boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo); | |
| 65 boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo); | |
| 66 JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, | |
| 67 JSAMPARRAY scanlines, | |
| 68 JDIMENSION max_lines); | |
| 69 int XCDECL qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image); | |
| 70 #define qxe_jpeg_create_decompress(cinfo) \ | |
| 71 qxe_jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \ | |
| 72 (size_t) sizeof(struct jpeg_decompress_struct)) | |
| 73 void XCDECL qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, | |
| 74 size_t structsize); | |
| 75 struct jpeg_error_mgr * XCDECL qxe_jpeg_std_error (struct jpeg_error_mgr *err); | |
| 76 void XCDECL qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo); | |
| 77 boolean XCDECL qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired); | |
| 78 | |
| 79 #endif /* defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) */ | |
| 80 | |
| 81 #ifdef HAVE_XPM | |
| 82 | |
| 83 #ifndef HAVE_GTK /* #### ????????????????????? No comprendo ni un poco. | |
| 84 This was here before, in a different file. --ben */ | |
| 85 #include <X11/xpm.h> | |
| 86 #endif | |
| 87 | |
| 88 void XCDECL qxe_XpmFreeXpmImage (XpmImage *image); | |
| 89 void XCDECL qxe_XpmFreeXpmInfo (XpmInfo *info); | |
| 90 int XCDECL qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, | |
| 91 XpmInfo *info); | |
| 92 void XCDECL qxe_XpmFree (void *ptr); | |
| 93 int XCDECL qxe_XpmReadFileToData (char *filename, char ***data_return); | |
| 94 | |
| 95 #endif /* HAVE_XPM */ | |
| 96 | |
| 97 #ifdef HAVE_TIFF | |
| 98 #include "tiffio.h" | |
| 99 | |
| 100 tdata_t XCDECL qxe_TIFFmalloc (tsize_t x1); | |
| 101 void XCDECL qxe_TIFFfree (tdata_t x1); | |
| 102 void XCDECL qxe_TIFFClose (TIFF *x1); | |
| 103 int XCDECL qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3); | |
| 104 TIFF * XCDECL qxe_TIFFClientOpen (const char *x1, const char *x2, | |
| 105 thandle_t x3, TIFFReadWriteProc x4, | |
| 106 TIFFReadWriteProc x5, TIFFSeekProc x6, | |
| 107 TIFFCloseProc x7, TIFFSizeProc x8, | |
| 108 TIFFMapFileProc x9, TIFFUnmapFileProc x10); | |
| 109 TIFFErrorHandler XCDECL qxe_TIFFSetErrorHandler (TIFFErrorHandler x1); | |
| 110 TIFFErrorHandler XCDECL qxe_TIFFSetWarningHandler (TIFFErrorHandler x1); | |
| 111 int XCDECL qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, | |
| 112 int x5); | |
| 113 | |
| 114 #endif /* HAVE_TIFF */ | |
| 115 | |
| 116 #endif /* INCLUDED_libinterface_h_ */ |