Mercurial > hg > xemacs-beta
annotate src/glyphs-msw.h @ 4976:16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-04 Ben Wing <ben@xemacs.org>
* alloc.c (release_breathing_space):
* alloc.c (resize_string):
* alloc.c (sweep_lcrecords_1):
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1):
* alloc.c (ADDITIONAL_FREE_compiled_function):
* alloc.c (compact_string_chars):
* alloc.c (ADDITIONAL_FREE_string):
* alloc.c (sweep_strings):
* alloca.c (xemacs_c_alloca):
* alsaplay.c (alsa_play_sound_file):
* buffer.c (init_initial_directory):
* buffer.h:
* buffer.h (BUFFER_FREE):
* console-stream.c (stream_delete_console):
* console-tty.c (free_tty_console_struct):
* data.c (Fnumber_to_string):
* device-gtk.c (gtk_init_device):
* device-gtk.c (free_gtk_device_struct):
* device-gtk.c (gtk_delete_device):
* device-msw.c (mswindows_delete_device):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* device-x.c (x_init_device):
* device-x.c (free_x_device_struct):
* device-x.c (x_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* dired-msw.c (Fmswindows_insert_directory):
* dired.c (free_user_cache):
* dired.c (user_name_completion_unwind):
* doc.c (unparesseuxify_doc_string):
* doc.c (Fsubstitute_command_keys):
* doprnt.c (emacs_doprnt_1):
* dumper.c (pdump_load_finish):
* dumper.c (pdump_file_free):
* dumper.c (pdump_file_unmap):
* dynarr.c:
* dynarr.c (Dynarr_free):
* editfns.c (uncache_home_directory):
* editfns.c (Fset_time_zone_rule):
* elhash.c:
* elhash.c (pdump_reorganize_hash_table):
* elhash.c (maphash_unwind):
* emacs.c (make_arg_list_1):
* emacs.c (free_argc_argv):
* emacs.c (sort_args):
* emacs.c (Frunning_temacs_p):
* emodules.c (attempt_module_delete):
* eval.c (free_pointer):
* event-Xt.c (unselect_filedesc):
* event-Xt.c (emacs_Xt_select_process):
* event-gtk.c (unselect_filedesc):
* event-gtk.c (dragndrop_data_received):
* event-msw.c (winsock_closer):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* event-stream.c (finalize_command_builder):
* event-stream.c (free_command_builder):
* extents.c (free_gap_array):
* extents.c (free_extent_list):
* extents.c (free_soe):
* extents.c (extent_fragment_delete):
* extents.c (extent_priority_sort_function):
* file-coding.c (make_coding_system_1):
* file-coding.c (coding_finalizer):
* file-coding.c (set_coding_stream_coding_system):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize):
* file-coding.c (free_detection_state):
* file-coding.c (coding_category_symbol_to_id):
* fileio.c:
* fileio.c (Ffile_name_directory):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* filelock.c (FREE_LOCK_INFO):
* filelock.c (current_lock_owner):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* frame-gtk.c (gtk_delete_frame):
* frame-msw.c (mswindows_delete_frame):
* frame-msw.c (msprinter_delete_frame):
* frame-x.c (x_cde_destroy_callback):
* frame-x.c (Fcde_start_drag_internal):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_delete_frame):
* frame.c (update_frame_title):
* frame.c (Fset_frame_pointer):
* gc.c (register_for_finalization):
* gccache-gtk.c (free_gc_cache):
* gccache-gtk.c (gc_cache_lookup):
* gccache-x.c (free_gc_cache):
* gccache-x.c (gc_cache_lookup):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate_unwind):
* glyphs-gtk.c (convert_EImage_to_GDKImage):
* glyphs-gtk.c (gtk_finalize_image_instance):
* glyphs-gtk.c (gtk_init_image_instance_from_eimage):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-msw.c (convert_EImage_to_DIBitmap):
* glyphs-msw.c (mswindows_init_image_instance_from_eimage):
* glyphs-msw.c (mswindows_initialize_image_instance_mask):
* glyphs-msw.c (xpm_to_eimage):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (xbm_create_bitmap_from_data):
* glyphs-msw.c (mswindows_finalize_image_instance):
* glyphs-x.c (convert_EImage_to_XImage):
* glyphs-x.c (x_finalize_image_instance):
* glyphs-x.c (x_init_image_instance_from_eimage):
* glyphs-x.c (x_xpm_instantiate):
* gui-x.c (free_popup_widget_value_tree):
* hash.c (free_hash_table):
* hash.c (grow_hash_table):
* hash.c (pregrow_hash_table_if_necessary):
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* intl-win32.c (convert_multibyte_to_internal_malloc):
* intl.c:
* intl.c (Fset_current_locale):
* keymap.c:
* keymap.c (where_is_recursive_mapper):
* keymap.c (where_is_internal):
* lisp.h:
* lisp.h (xfree):
* lstream.c (Lstream_close):
* lstream.c (resizing_buffer_closer):
* mule-coding.c:
* mule-coding.c (iso2022_finalize_detection_state):
* nt.c:
* nt.c (mswindows_get_long_filename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_opendir):
* nt.c (mswindows_closedir):
* nt.c (mswindows_readdir):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (Fmswindows_long_file_name):
* ntplay.c (nt_play_sound_file):
* ntplay.c (play_sound_data_1):
* number-gmp.c (gmp_free):
* number-gmp.c (init_number_gmp):
* number-mp.c (bignum_to_string):
* number-mp.c (BIGNUM_TO_TYPE):
* number.c (bignum_print):
* number.c (bignum_convfree):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-gtk.c (gtk_finalize_color_instance):
* objects-gtk.c (gtk_finalize_font_instance):
* objects-msw.c (mswindows_finalize_color_instance):
* objects-msw.c (mswindows_finalize_font_instance):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* objects-x.c (x_finalize_color_instance):
* objects-x.c (x_finalize_font_instance):
* process.c:
* process.c (finalize_process):
* realpath.c:
* redisplay.c (add_propagation_runes):
* regex.c:
* regex.c (xfree):
* regex.c (REGEX_FREE_STACK):
* regex.c (FREE_STACK_RETURN):
* regex.c (regex_compile):
* regex.c (regexec):
* regex.c (regfree):
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-gtk.c (emacs_gtk_selection_handle):
* select-msw.c (mswindows_own_selection):
* select-x.c:
* select-x.c (x_handle_selection_request):
* select-x.c (unexpect_property_change):
* select-x.c (x_handle_property_notify):
* select-x.c (receive_incremental_selection):
* select-x.c (x_get_window_property_as_lisp_data):
* select-x.c (Fx_get_cutbuffer_internal):
* specifier.c (finalize_specifier):
* syntax.c (uninit_buffer_syntax_cache):
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_lstat):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_ctime):
* sysdep.c (closedir):
* sysdep.c (DIRSIZ):
* termcap.c (tgetent):
* termcap.c (tprint):
* tests.c (Ftest_data_format_conversion):
* text.c (new_dfc_convert_copy_data):
* text.h (eifree):
* text.h (eito_alloca):
* text.h (eito_external):
* toolbar-msw.c (mswindows_output_toolbar):
* ui-gtk.c (CONVERT_RETVAL):
* ui-gtk.c (__allocate_object_storage):
* unicode.c (free_from_unicode_table):
* unicode.c (free_to_unicode_table):
* unicode.c (free_charset_unicode_tables):
* win32.c (mswindows_read_link_1):
Rename: xfree(VAL, TYPE)->xfree(VAL)
Command used:
gr 'xfree *\((.*),.*\);' 'xfree (\1);' *.[ch]
Followed by grepping for 'xfree.*,' and fixing anything left.
Rationale: Having to specify the TYPE argument is annoying and
error-prone. It was originally put in to work around warnings
due to strict aliasing but years and years ago I rewrote it
in a way that doesn't use the TYPE argument at all and no one
has complained since then. (And anyway, XEmacs is far from
ever being in compliance with strict aliasing and would require
far-reaching changes to get that way.)
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Thu, 04 Feb 2010 07:28:14 -0600 |
parents | 6728e641994e |
children | 308d34e9f07d |
rev | line source |
---|---|
428 | 1 /* mswindows-specific glyphs and related. |
2 Copyright (C) 1998 Andy Piper | |
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 | |
440 | 23 #ifndef INCLUDED_glyphs_msw_h_ |
24 #define INCLUDED_glyphs_msw_h_ | |
428 | 25 |
26 #ifdef HAVE_MS_WINDOWS | |
27 | |
771 | 28 #include "syswindows.h" |
428 | 29 #include "glyphs.h" |
30 | |
31 /**************************************************************************** | |
32 * Image-Instance Object * | |
33 ****************************************************************************/ | |
34 | |
35 struct mswindows_image_instance_data | |
36 { | |
771 | 37 HBITMAP *bitmaps; |
428 | 38 HICON icon; |
442 | 39 int real_width, real_height; |
428 | 40 }; |
41 | |
42 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \ | |
43 ((struct mswindows_image_instance_data *) (i)->data) | |
44 | |
45 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ | |
46 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[0]) | |
47 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \ | |
48 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice]) | |
49 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ | |
50 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps) | |
51 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \ | |
771 | 52 (* (HBITMAP *) &(IMAGE_INSTANCE_PIXMAP_MASK (i))) /* Make it lvalue */ |
428 | 53 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \ |
54 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon) | |
442 | 55 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \ |
56 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width) | |
57 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \ | |
58 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height) | |
428 | 59 |
60 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ | |
61 IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i)) | |
771 | 62 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i, slice) \ |
63 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i, slice)) | |
428 | 64 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ |
65 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i)) | |
66 #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \ | |
67 IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i)) | |
68 #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \ | |
69 IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i)) | |
70 | |
826 | 71 int mswindows_resize_dibitmap_instance (Lisp_Image_Instance *ii, |
72 struct frame *f, | |
73 int newx, int newy); | |
74 HBITMAP mswindows_create_resized_bitmap (Lisp_Image_Instance *ii, | |
75 struct frame *f, | |
76 int newx, int newy); | |
77 HBITMAP mswindows_create_resized_mask (Lisp_Image_Instance *ii, | |
78 struct frame *f, | |
79 int newx, int newy); | |
80 void mswindows_initialize_image_instance_icon (Lisp_Image_Instance *image, | |
81 int cursor); | |
428 | 82 |
83 #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ | |
84 (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
85 | |
86 #define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ | |
87 WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i)) | |
88 | |
89 struct mswindows_subwindow_data | |
90 { | |
91 HWND clip_window; | |
92 }; | |
93 | |
94 #define MSWINDOWS_SUBWINDOW_DATA(i) \ | |
442 | 95 ((struct mswindows_subwindow_data *) (i)->data) |
428 | 96 #define IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ |
97 (MSWINDOWS_SUBWINDOW_DATA (i)->clip_window) | |
98 | |
442 | 99 #define XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA(i) \ |
100 MSWINDOWS_SUBWINDOW_DATA (XIMAGE_INSTANCE (i)) | |
428 | 101 #define XIMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ |
102 IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
103 | |
442 | 104 #define DOMAIN_MSWINDOWS_HANDLE(domain) \ |
105 ((IMAGE_INSTANCEP (domain) && \ | |
106 XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA (domain)) ? \ | |
107 XWIDGET_INSTANCE_MSWINDOWS_HANDLE (domain) : \ | |
108 FRAME_MSWINDOWS_HANDLE (DOMAIN_XFRAME (domain))) | |
109 | |
428 | 110 #endif /* HAVE_MS_WINDOWS */ |
440 | 111 |
112 #endif /* INCLUDED_glyphs_msw_h_ */ |