Mercurial > hg > xemacs-beta
annotate src/input-method-motif.c @ 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 | 04bc9d2f42c7 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Various functions for X11R5+ input methods, using the Motif XmIm* functions. |
| 2 input-method-xlib.c provides a lower-level implementation. | |
| 3 Copyright (C) 1996 Sun Microsystems. | |
| 4 | |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Written by Martin Buchholz. */ | |
| 25 | |
| 26 #include <config.h> | |
| 27 #include <X11/Xlocale.h> /* More portable than <locale.h> ? */ | |
| 28 #include "lisp.h" | |
| 897 | 29 #include "frame-impl.h" |
| 30 #include "console-x-impl.h" | |
| 428 | 31 #include "device.h" |
| 32 #include "frame.h" | |
| 33 #include "EmacsFrame.h" | |
| 1315 | 34 #include "xmotif.h" |
| 428 | 35 |
| 36 #ifndef XIM_MOTIF | |
| 37 #error XIM_MOTIF is not defined?? | |
| 38 #endif | |
| 39 | |
| 40 | |
| 41 /* Create X input method for device */ | |
| 42 void | |
| 2286 | 43 XIM_init_device (struct device *UNUSED (d)) |
| 428 | 44 { |
| 45 /* Nothing to do */ | |
| 46 } | |
| 47 | |
| 651 | 48 /* Callback for the deleting frame. */ |
| 49 static void | |
| 2286 | 50 XIM_delete_frame (Widget UNUSED (w), XtPointer client_data, |
| 51 XtPointer UNUSED (call_data)) | |
| 651 | 52 { |
| 53 XmImUnregister ((Widget) client_data); | |
| 54 } | |
| 55 | |
| 428 | 56 void |
| 57 XIM_init_frame (struct frame *f) | |
| 58 { | |
| 59 Widget w = FRAME_X_TEXT_WIDGET (f); | |
| 60 XPoint spot = {0,0}; | |
| 61 XmFontList fontlist; | |
| 62 XmFontListEntry fontlistEntry; | |
| 63 | |
| 64 typedef struct | |
| 65 { | |
| 66 XFontSet fontset; | |
| 67 Pixel fg; | |
| 68 Pixel bg; | |
| 69 } xim_resources_t; | |
| 70 | |
| 71 xim_resources_t xim_resources; | |
| 72 | |
| 73 /* mrb: #### Fix so that background and foreground is set from | |
| 74 default face, rather than foreground and background resources, or | |
| 75 that the user can use set-frame-parameters to set xic attributes */ | |
| 76 | |
| 1204 | 77 #define res(name, class_, representation, field, default_value) \ |
| 78 { name, class_, representation, sizeof(xim_resources.field), \ | |
| 438 | 79 XtOffsetOf(xim_resources_t, field), \ |
| 80 XtRString, (XtPointer) (default_value) } | |
| 428 | 81 |
| 82 static XtResource resources[] = | |
| 83 { | |
| 84 /* name class represent'n field default value */ | |
| 85 res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, XtDefaultFontSet), | |
| 86 res(XtNximForeground, XtCForeground, XtRPixel, fg, XtDefaultForeground), | |
| 87 res(XtNximBackground, XtCBackground, XtRPixel, bg, XtDefaultBackground) | |
| 88 }; | |
| 89 | |
| 90 XtGetApplicationResources (w, &xim_resources, | |
| 91 resources, XtNumber (resources), | |
| 92 NULL, 0); | |
| 93 | |
| 94 if (! xim_resources.fontset) | |
| 95 { | |
| 96 stderr_out ("Can't get fontset resource for Input Method\n"); | |
| 97 return; | |
| 98 } | |
| 99 | |
| 100 fontlistEntry = XmFontListEntryCreate(XmFONTLIST_DEFAULT_TAG, | |
| 101 XmFONT_IS_FONTSET, | |
| 102 (XtPointer) xim_resources.fontset); | |
| 103 fontlist = XmFontListAppendEntry (NULL, fontlistEntry); | |
| 104 XmImRegister (w, 0); | |
| 105 XmImVaSetValues (w, | |
| 106 XmNfontList, fontlist, | |
| 107 XmNforeground, xim_resources.fg, | |
| 108 XmNbackground, xim_resources.bg, | |
| 109 XmNspotLocation, &spot, | |
| 110 /* XmNlineSpace, 0, */ | |
| 111 NULL); | |
| 112 | |
| 113 XmFontListEntryFree (&fontlistEntry); | |
| 651 | 114 |
| 115 XtAddCallback (w, XmNdestroyCallback, XIM_delete_frame, (XtPointer) w); | |
| 428 | 116 } |
| 117 | |
| 118 void | |
| 2286 | 119 XIM_SetGeometry (struct frame *UNUSED (f)) |
| 428 | 120 { |
| 121 } | |
| 122 | |
| 123 void | |
| 124 XIM_SetSpotLocation (struct frame *f, int x, int y) | |
| 125 { | |
| 440 | 126 /* #### FIX: Must make sure spot fits within Preedit Area */ |
| 428 | 127 XPoint *spot = &(FRAME_X_XIC_SPOT (f)); |
| 128 if (spot->x == (short) x && | |
| 129 spot->y == (short) y) | |
| 130 return; | |
| 131 | |
| 132 spot->x = (short) x; | |
| 133 spot->y = (short) y; | |
| 134 | |
| 135 XmImVaSetValues (FRAME_X_TEXT_WIDGET (f), XmNspotLocation, spot, NULL); | |
| 136 } | |
| 137 | |
| 138 void | |
| 139 XIM_focus_event (struct frame *f, int in_p) | |
| 140 { | |
| 141 if (in_p) | |
| 142 XmImVaSetFocusValues (FRAME_X_TEXT_WIDGET (f), NULL); | |
| 143 else | |
| 144 XmImUnsetFocus (FRAME_X_TEXT_WIDGET (f)); | |
| 145 } | |
| 146 | |
| 147 void | |
| 148 vars_of_input_method_motif (void) | |
| 149 { | |
| 150 Fprovide (intern ("xim")); | |
| 151 } |