Mercurial > hg > xemacs-beta
annotate src/cm.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 /* Cursor motion calculation definitions for XEmacs |
| 2 Copyright (C) 1985, 1989, 1992, 1993 Free Software Foundation, Inc. | |
| 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: FSF 19.30. */ | |
| 22 | |
| 23 /* #### Chuck -- This file should be deleted. I'm not deleting it yet | |
| 24 because there might be something you want out of it. */ | |
| 25 | |
| 440 | 26 #ifndef INCLUDED_cm_h_ |
| 27 #define INCLUDED_cm_h_ | |
| 428 | 28 |
| 29 /* Holds the minimum and maximum costs for the parametrized capabilities. */ | |
| 30 struct parmcap | |
| 31 { | |
| 32 int mincost, maxcost; | |
| 33 }; | |
| 34 | |
| 35 /* This structure holds everything needed to do cursor motion except the pad | |
| 36 character (PC) and the output speed of the terminal (ospeed), which | |
| 37 termcap wants in global variables. */ | |
| 38 | |
| 39 struct cm | |
| 40 { | |
| 41 #if 0 | |
| 42 /* Cursor position. -1 in *both* variables means the cursor | |
| 43 position is unknown, in order to force absolute cursor motion. */ | |
| 44 | |
| 45 int cm_curY; /* Current row */ | |
| 46 int cm_curX; /* Current column */ | |
| 47 | |
| 48 /* Capabilities from termcap */ | |
| 442 | 49 const char *cm_up; /* up (up) */ |
| 50 const char *cm_down; /* down (do) */ | |
| 51 const char *cm_left; /* left (le) */ | |
| 52 const char *cm_right; /* right (nd) */ | |
| 53 const char *cm_home; /* home (ho) */ | |
| 54 const char *cm_cr; /* carriage return (cr) */ | |
| 55 const char *cm_ll; /* last line (ll) */ | |
| 428 | 56 #endif /* 0 */ |
| 442 | 57 const char *cm_tab; /* tab (ta) */ |
| 58 const char *cm_backtab; /* backtab (bt) */ | |
| 428 | 59 #if 0 |
| 442 | 60 const char *cm_abs; /* absolute (cm) */ |
| 61 const char *cm_habs; /* horizontal absolute (ch) */ | |
| 62 const char *cm_vabs; /* vertical absolute (cv) */ | |
| 63 const char *cm_ds; /* "don't send" string (ds) */ | |
| 64 const char *cm_multiup; /* multiple up (UP) */ | |
| 65 const char *cm_multidown; /* multiple down (DO) */ | |
| 66 const char *cm_multileft; /* multiple left (LE) */ | |
| 67 const char *cm_multiright; /* multiple right (RI) */ | |
| 428 | 68 int cm_cols; /* number of cols on frame (co) */ |
| 69 int cm_rows; /* number of rows on frame (li) */ | |
| 70 int cm_tabwidth; /* tab width (it) */ | |
| 71 unsigned int cm_autowrap:1; /* autowrap flag (am) */ | |
| 72 unsigned int cm_magicwrap:1; /* VT-100: cursor stays in last col but | |
| 73 will cm_wrap if next char is | |
| 74 printing (xn) */ | |
| 75 unsigned int cm_usetabs:1; /* if set, use tabs */ | |
| 76 unsigned int cm_losewrap:1; /* if reach right margin, forget cursor | |
| 77 location */ | |
| 78 unsigned int cm_autolf:1; /* \r performs a \r\n (rn) */ | |
| 79 #endif | |
| 80 | |
| 81 /* Parametrized capabilities. This needs to be a struct since | |
| 82 the costs are accessed through pointers. */ | |
| 83 | |
| 84 #if 0 | |
| 85 struct parmcap cc_abs; /* absolute (cm) */ | |
| 86 struct parmcap cc_habs; /* horizontal absolute (ch) */ | |
| 87 struct parmcap cc_vabs; /* vertical absolute (cv) */ | |
| 88 struct parmcap cc_multiup; /* multiple up (UP) */ | |
| 89 struct parmcap cc_multidown; /* multiple down (DO) */ | |
| 90 struct parmcap cc_multileft; /* multiple left (LE) */ | |
| 91 struct parmcap cc_multiright; /* multiple right (RI) */ | |
| 92 #endif | |
| 93 | |
| 94 #if 0 | |
| 95 /* Costs for the non-parametrized capabilities */ | |
| 96 int cc_up; /* cost for up */ | |
| 97 int cc_down; /* etc. */ | |
| 98 int cc_left; | |
| 99 int cc_right; | |
| 100 int cc_home; | |
| 101 int cc_cr; | |
| 102 int cc_ll; | |
| 103 int cc_tab; | |
| 104 int cc_backtab; | |
| 105 /* These are temporary, until the code is installed to use the | |
| 106 struct parmcap fields above. */ | |
| 107 int cc_abs; | |
| 108 int cc_habs; | |
| 109 int cc_vabs; | |
| 110 #endif | |
| 111 }; | |
| 112 | |
| 113 #if 0 | |
| 114 extern struct cm Wcm; /* Terminal capabilities */ | |
| 115 extern char PC; /* Pad character */ | |
| 116 | |
| 117 /* Shorthand */ | |
| 118 #ifndef NoCMShortHand | |
| 119 #define curY Wcm.cm_curY | |
| 120 #define curX Wcm.cm_curX | |
| 121 #define Up Wcm.cm_up | |
| 122 #define Down Wcm.cm_down | |
| 123 #define Left Wcm.cm_left | |
| 124 #define Right Wcm.cm_right | |
| 125 #define Tab Wcm.cm_tab | |
| 126 #define BackTab Wcm.cm_backtab | |
| 127 #define TabWidth Wcm.cm_tabwidth | |
| 128 #define CR Wcm.cm_cr | |
| 129 #define Home Wcm.cm_home | |
| 130 #define LastLine Wcm.cm_ll | |
| 131 #define AbsPosition Wcm.cm_abs | |
| 132 #define ColPosition Wcm.cm_habs | |
| 133 #define RowPosition Wcm.cm_vabs | |
| 134 #define MultiUp Wcm.cm_multiup | |
| 135 #define MultiDown Wcm.cm_multidown | |
| 136 #define MultiLeft Wcm.cm_multileft | |
| 137 #define MultiRight Wcm.cm_multiright | |
| 138 #define AutoWrap Wcm.cm_autowrap | |
| 139 #define MagicWrap Wcm.cm_magicwrap | |
| 140 #define UseTabs Wcm.cm_usetabs | |
| 141 #define FrameRows Wcm.cm_rows | |
| 142 #define FrameCols Wcm.cm_cols | |
| 143 | |
| 144 #define UpCost Wcm.cc_up | |
| 145 #define DownCost Wcm.cc_down | |
| 146 #define LeftCost Wcm.cc_left | |
| 147 #define RightCost Wcm.cc_right | |
| 148 #define HomeCost Wcm.cc_home | |
| 149 #define CRCost Wcm.cc_cr | |
| 150 #define LastLineCost Wcm.cc_ll | |
| 151 #define TabCost Wcm.cc_tab | |
| 152 #define BackTabCost Wcm.cc_backtab | |
| 153 #define AbsPositionCost Wcm.cc_abs | |
| 154 #define ColPositionCost Wcm.cc_habs | |
| 155 #define RowPositionCost Wcm.cc_vabs | |
| 156 #define MultiUpCost Wcm.cc_multiup | |
| 157 #define MultiDownCost Wcm.cc_multidown | |
| 158 #define MultiLeftCost Wcm.cc_multileft | |
| 159 #define MultiRightCost Wcm.cc_multiright | |
| 160 #endif | |
| 161 #endif /* 0 */ | |
| 162 | |
| 163 #define cmat(row,col) (curY = (row), curX = (col)) | |
| 164 #define cmplus(n) \ | |
| 165 { \ | |
| 166 if ((curX += (n)) >= FrameCols && !MagicWrap) \ | |
| 167 { \ | |
| 168 if (Wcm.cm_losewrap) losecursor (); \ | |
| 169 else if (AutoWrap) curX = 0, curY++; \ | |
| 170 else curX--; \ | |
| 171 } \ | |
| 172 } | |
| 173 | |
| 174 #define losecursor() (curX = -1, curY = -1) | |
| 175 | |
| 176 extern int cost; | |
| 177 void cmputc (int c); | |
| 178 void cmcheckmagic (void); | |
| 179 void cm_cost_init (struct console *c); | |
| 180 void cmgoto (int, int); | |
| 181 void Wcm_clear (void); | |
| 182 int Wcm_init (void); | |
| 183 | |
| 440 | 184 #endif /* INCLUDED_cm_h_ */ |