Mercurial > hg > xemacs-beta
annotate src/glyphs-x.h @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -0600 |
| parents | abe6d1db359e |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* X-specific glyphs and related. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995, 1996 Ben Wing | |
| 5 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. */ | |
| 23 | |
| 24 /* Synched up with: Not in FSF. */ | |
| 25 | |
| 440 | 26 #ifndef INCLUDED_glyphs_x_h_ |
| 27 #define INCLUDED_glyphs_x_h_ | |
| 428 | 28 |
| 29 #include "glyphs.h" | |
| 30 | |
| 31 #ifdef HAVE_X_WINDOWS | |
| 32 | |
| 33 #include "xintrinsic.h" | |
| 34 #include "../lwlib/lwlib.h" | |
| 442 | 35 #include "../lwlib/lwlib-utils.h" |
| 428 | 36 |
| 37 /**************************************************************************** | |
| 38 * Image-Instance Object * | |
| 39 ****************************************************************************/ | |
| 40 | |
| 41 struct x_image_instance_data | |
| 42 { | |
| 43 Pixmap* pixmaps; | |
| 44 Cursor cursor; | |
| 45 | |
| 46 /* If depth>0, then that means that other colors were allocated when | |
| 47 this pixmap was loaded. These are they; we need to free them when | |
| 48 finalizing the image instance. */ | |
| 49 Colormap colormap; | |
| 50 unsigned long *pixels; | |
| 51 int npixels; | |
| 52 | |
| 53 /* Should we hang on to the extra info from the XpmAttributes, like | |
| 54 the textual color table and the comments? Is that useful? */ | |
| 55 }; | |
| 56 | |
| 57 #define X_IMAGE_INSTANCE_DATA(i) ((struct x_image_instance_data *) (i)->data) | |
| 58 | |
| 59 #define IMAGE_INSTANCE_X_PIXMAP(i) (X_IMAGE_INSTANCE_DATA (i)->pixmaps[0]) | |
| 60 #define IMAGE_INSTANCE_X_PIXMAP_SLICE(i,slice) \ | |
| 61 (X_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) | |
| 62 #define IMAGE_INSTANCE_X_PIXMAP_SLICES(i) \ | |
| 63 (X_IMAGE_INSTANCE_DATA (i)->pixmaps) | |
| 64 #define IMAGE_INSTANCE_X_MASK(i) \ | |
| 65 (Pixmap)(IMAGE_INSTANCE_PIXMAP_MASK (i)) | |
| 66 #define IMAGE_INSTANCE_X_CURSOR(i) (X_IMAGE_INSTANCE_DATA (i)->cursor) | |
| 67 #define IMAGE_INSTANCE_X_COLORMAP(i) (X_IMAGE_INSTANCE_DATA (i)->colormap) | |
| 68 #define IMAGE_INSTANCE_X_PIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->pixels) | |
| 69 #define IMAGE_INSTANCE_X_NPIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->npixels) | |
| 70 | |
| 71 #define XIMAGE_INSTANCE_X_PIXMAP(i) \ | |
| 72 IMAGE_INSTANCE_X_PIXMAP (XIMAGE_INSTANCE (i)) | |
| 73 #define XIMAGE_INSTANCE_X_PIXMAP_SLICES(i) \ | |
| 74 IMAGE_INSTANCE_X_PIXMAP_SLICES (XIMAGE_INSTANCE (i)) | |
| 75 #define XIMAGE_INSTANCE_X_PIXMAP_SLICE(i) \ | |
| 76 IMAGE_INSTANCE_X_PIXMAP_SLICE (XIMAGE_INSTANCE (i)) | |
| 77 #define XIMAGE_INSTANCE_X_MASK(i) \ | |
| 78 IMAGE_INSTANCE_X_MASK (XIMAGE_INSTANCE (i)) | |
| 79 #define XIMAGE_INSTANCE_X_CURSOR(i) \ | |
| 80 IMAGE_INSTANCE_X_CURSOR (XIMAGE_INSTANCE (i)) | |
| 81 #define XIMAGE_INSTANCE_X_PIXELS(i) \ | |
| 82 IMAGE_INSTANCE_X_PIXELS (XIMAGE_INSTANCE (i)) | |
| 83 #define XIMAGE_INSTANCE_X_NPIXELS(i) \ | |
| 84 IMAGE_INSTANCE_X_NPIXELS (XIMAGE_INSTANCE (i)) | |
| 85 | |
| 86 /**************************************************************************** | |
| 87 * Subwindow Object * | |
| 88 ****************************************************************************/ | |
| 89 | |
| 90 struct x_subwindow_data | |
| 91 { | |
| 92 union | |
| 93 { | |
| 94 struct | |
| 95 { | |
| 96 Display *display; | |
| 97 Window parent_window; | |
| 98 Window clip_window; | |
| 99 } sub; | |
| 442 | 100 struct |
| 428 | 101 { |
| 102 Widget clip_window; | |
| 103 Position x_offset; | |
| 104 Position y_offset; | |
| 105 LWLIB_ID id; | |
| 106 } wid; | |
| 107 } data; | |
| 108 }; | |
| 109 | |
| 110 #define X_SUBWINDOW_INSTANCE_DATA(i) ((struct x_subwindow_data *) (i)->data) | |
| 111 | |
| 112 #define IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \ | |
| 113 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.display) | |
| 114 #define IMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \ | |
| 115 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window) | |
| 116 #define IMAGE_INSTANCE_X_CLIPWINDOW(i) \ | |
| 117 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window) | |
| 118 #define IMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \ | |
| 119 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset) | |
| 120 #define IMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \ | |
| 121 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset) | |
| 122 #define IMAGE_INSTANCE_X_WIDGET_LWID(i) \ | |
| 123 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id) | |
| 124 #define IMAGE_INSTANCE_X_CLIPWIDGET(i) \ | |
| 125 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window) | |
| 442 | 126 #define IMAGE_INSTANCE_X_SUBWINDOW_ID(i) \ |
| 127 (* (Window *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
| 128 #define IMAGE_INSTANCE_X_WIDGET_ID(i) \ | |
| 129 (* (Widget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
| 130 | |
| 428 | 131 #define XIMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \ |
| 132 IMAGE_INSTANCE_X_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i)) | |
| 133 #define XIMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \ | |
| 134 IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i)) | |
| 135 #define XIMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \ | |
| 136 IMAGE_INSTANCE_X_WIDGET_XOFFSET (XIMAGE_INSTANCE (i)) | |
| 137 #define XIMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \ | |
| 138 IMAGE_INSTANCE_X_WIDGET_YOFFSET (XIMAGE_INSTANCE (i)) | |
| 139 #define XIMAGE_INSTANCE_X_WIDGET_LWID(i) \ | |
| 140 IMAGE_INSTANCE_X_WIDGET_LWID (XIMAGE_INSTANCE (i)) | |
| 141 #define XIMAGE_INSTANCE_X_CLIPWIDGET(i) \ | |
| 142 IMAGE_INSTANCE_X_CLIPWIDGET (XIMAGE_INSTANCE (i)) | |
| 143 #define XIMAGE_INSTANCE_X_CLIPWINDOW(i) \ | |
| 144 IMAGE_INSTANCE_X_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
| 442 | 145 #define XIMAGE_INSTANCE_X_WIDGET_ID(i) \ |
| 146 IMAGE_INSTANCE_X_WIDGET_ID (XIMAGE_INSTANCE (i)) | |
| 147 | |
| 148 #define DOMAIN_X_WIDGET(domain) \ | |
| 149 ((IMAGE_INSTANCEP (domain) && \ | |
| 150 X_SUBWINDOW_INSTANCE_DATA (XIMAGE_INSTANCE (domain))) ? \ | |
| 151 XIMAGE_INSTANCE_X_WIDGET_ID (domain) : \ | |
| 152 FRAME_X_CONTAINER_WIDGET (f) (DOMAIN_XFRAME (domain))) | |
| 428 | 153 |
| 154 #endif /* HAVE_X_WINDOWS */ | |
| 440 | 155 #endif /* INCLUDED_glyphs_x_h_ */ |