Mercurial > hg > xemacs-beta
annotate src/tparam.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 | facf3239ba30 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 0 | 1 /* Merge parameters into a termcap entry string. |
| 2 Copyright (C) 1985, 1987, 1992, 1993, 1994 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: Not synched with FSF. */ | |
| 22 | |
| 23 /* config.h may rename various library functions such as malloc. */ | |
| 24 #include <config.h> | |
| 647 | 25 #include "lisp.h" |
| 0 | 26 |
| 551 | 27 #undef realloc |
| 28 #undef malloc | |
| 0 | 29 #define realloc xrealloc |
| 30 #define malloc xmalloc | |
| 31 | |
| 32 /* Assuming STRING is the value of a termcap string entry | |
| 33 containing `%' constructs to expand parameters, | |
| 34 merge in parameter values and store result in block OUTSTRING points to. | |
| 35 LEN is the length of OUTSTRING. If more space is needed, | |
| 36 a block is allocated with `malloc'. | |
| 37 | |
| 38 The value returned is the address of the resulting string. | |
| 39 This may be OUTSTRING or may be the address of a block got with `malloc'. | |
| 40 In the latter case, the caller must free the block. | |
| 41 | |
| 42 The fourth and following args to tparam serve as the parameter values. */ | |
| 43 | |
| 398 | 44 static char *tparam1 (const char *string, char *outstring, int len, |
| 45 const char *up, const char *left, | |
| 0 | 46 int *argp); |
| 47 | |
| 48 /* XEmacs: renamed this function because just tparam() conflicts with | |
| 49 ncurses */ | |
| 398 | 50 char *emacs_tparam (const char *string, char *outstring, int len, int arg0, |
| 0 | 51 int arg1, int arg2, int arg3); |
| 52 char * | |
| 398 | 53 emacs_tparam (const char *string, char *outstring, int len, int arg0, |
| 0 | 54 int arg1, int arg2, int arg3) |
| 55 { | |
| 56 int arg[4]; | |
| 57 arg[0] = arg0; | |
| 58 arg[1] = arg1; | |
| 59 arg[2] = arg2; | |
| 60 arg[3] = arg3; | |
| 61 return tparam1 (string, outstring, len, 0, 0, arg); | |
| 62 } | |
| 63 | |
| 398 | 64 const char *BC; |
| 65 const char *UP; | |
| 0 | 66 |
| 67 static char tgoto_buf[50]; | |
| 68 | |
| 398 | 69 char *tgoto (const char *cm, int hpos, int vpos); |
| 0 | 70 char * |
| 398 | 71 tgoto (const char *cm, int hpos, int vpos) |
| 0 | 72 { |
| 73 int args[2]; | |
| 74 if (!cm) | |
| 75 return 0; | |
| 76 args[0] = vpos; | |
| 77 args[1] = hpos; | |
| 78 return tparam1 (cm, tgoto_buf, 50, UP, BC, args); | |
| 79 } | |
| 80 | |
| 81 static char * | |
| 398 | 82 tparam1 (const char *string, char *outstring, int len, const char *up, |
| 83 const char *left, int *argp) | |
| 0 | 84 { |
| 85 int c; | |
| 398 | 86 const char *p = string; |
| 0 | 87 char *op = outstring; |
| 88 char *outend; | |
| 89 int outlen = 0; | |
| 90 | |
| 91 int tem; | |
| 92 int *old_argp = argp; | |
| 93 int doleft = 0; | |
| 94 int doup = 0; | |
| 95 | |
| 96 outend = outstring + len; | |
| 97 | |
| 98 while (1) | |
| 99 { | |
| 100 /* If the buffer might be too short, make it bigger. */ | |
| 101 if (op + 5 >= outend) | |
| 102 { | |
| 3025 | 103 char *new_; |
| 0 | 104 if (outlen == 0) |
| 105 { | |
| 106 outlen = len + 40; | |
| 3025 | 107 new_ = (char *) malloc (outlen); |
| 0 | 108 outend += 40; |
| 3025 | 109 memcpy (new_, outstring, op - outstring); |
| 0 | 110 } |
| 111 else | |
| 112 { | |
| 113 outend += outlen; | |
| 114 outlen *= 2; | |
| 3025 | 115 new_ = (char *) realloc (outstring, outlen); |
| 0 | 116 } |
| 3025 | 117 op += new_ - outstring; |
| 118 outend += new_ - outstring; | |
| 119 outstring = new_; | |
| 0 | 120 } |
| 121 c = *p++; | |
| 122 if (!c) | |
| 123 break; | |
| 124 if (c == '%') | |
| 125 { | |
| 126 c = *p++; | |
| 127 tem = *argp; | |
| 128 switch (c) | |
| 129 { | |
| 130 case 'd': /* %d means output in decimal. */ | |
| 131 if (tem < 10) | |
| 132 goto onedigit; | |
| 133 if (tem < 100) | |
| 134 goto twodigit; | |
| 135 case '3': /* %3 means output in decimal, 3 digits. */ | |
| 136 if (tem > 999) | |
| 137 { | |
| 138 *op++ = tem / 1000 + '0'; | |
| 139 tem %= 1000; | |
| 140 } | |
| 141 *op++ = tem / 100 + '0'; | |
| 142 case '2': /* %2 means output in decimal, 2 digits. */ | |
| 143 twodigit: | |
| 144 tem %= 100; | |
| 145 *op++ = tem / 10 + '0'; | |
| 146 onedigit: | |
| 147 *op++ = tem % 10 + '0'; | |
| 148 argp++; | |
| 149 break; | |
| 150 | |
| 151 case 'C': | |
| 152 /* For c-100: print quotient of value by 96, if nonzero, | |
| 153 then do like %+. */ | |
| 154 if (tem >= 96) | |
| 155 { | |
| 156 *op++ = tem / 96; | |
| 157 tem %= 96; | |
| 158 } | |
| 159 case '+': /* %+x means add character code of char x. */ | |
| 160 tem += *p++; | |
| 161 case '.': /* %. means output as character. */ | |
| 162 if (left) | |
| 163 { | |
| 164 /* If want to forbid output of 0 and \n and \t, | |
| 165 and this is one of them, increment it. */ | |
| 166 while (tem == 0 || tem == '\n' || tem == '\t') | |
| 167 { | |
| 168 tem++; | |
| 169 if (argp == old_argp) | |
| 170 doup++, outend -= strlen (up); | |
| 171 else | |
| 172 doleft++, outend -= strlen (left); | |
| 173 } | |
| 174 } | |
| 175 *op++ = tem | 0200; | |
| 176 case 'f': /* %f means discard next arg. */ | |
| 177 argp++; | |
| 178 break; | |
| 179 | |
| 180 case 'b': /* %b means back up one arg (and re-use it). */ | |
| 181 argp--; | |
| 182 break; | |
| 183 | |
| 184 case 'r': /* %r means interchange following two args. */ | |
| 185 argp[0] = argp[1]; | |
| 186 argp[1] = tem; | |
| 187 old_argp++; | |
| 188 break; | |
| 189 | |
| 190 case '>': /* %>xy means if arg is > char code of x, */ | |
| 191 if (argp[0] > *p++) /* then add char code of y to the arg, */ | |
| 192 argp[0] += *p; /* and in any case don't output. */ | |
| 193 p++; /* Leave the arg to be output later. */ | |
| 194 break; | |
| 195 | |
| 196 case 'a': /* %a means arithmetic. */ | |
| 197 /* Next character says what operation. | |
| 198 Add or subtract either a constant or some other arg. */ | |
| 199 /* First following character is + to add or - to subtract | |
| 200 or = to assign. */ | |
| 201 /* Next following char is 'p' and an arg spec | |
| 202 (0100 plus position of that arg relative to this one) | |
| 203 or 'c' and a constant stored in a character. */ | |
| 204 tem = p[2] & 0177; | |
| 205 if (p[1] == 'p') | |
| 206 tem = argp[tem - 0100]; | |
| 207 if (p[0] == '-') | |
| 208 argp[0] -= tem; | |
| 209 else if (p[0] == '+') | |
| 210 argp[0] += tem; | |
| 211 else if (p[0] == '*') | |
| 212 argp[0] *= tem; | |
| 213 else if (p[0] == '/') | |
| 214 argp[0] /= tem; | |
| 215 else | |
| 216 argp[0] = tem; | |
| 217 | |
| 218 p += 3; | |
| 219 break; | |
| 220 | |
| 221 case 'i': /* %i means add one to arg, */ | |
| 222 argp[0] ++; /* and leave it to be output later. */ | |
| 223 argp[1] ++; /* Increment the following arg, too! */ | |
| 224 break; | |
| 225 | |
| 226 case '%': /* %% means output %; no arg. */ | |
| 227 goto ordinary; | |
| 228 | |
| 229 case 'n': /* %n means xor each of next two args with 140. */ | |
| 230 argp[0] ^= 0140; | |
| 231 argp[1] ^= 0140; | |
| 232 break; | |
| 233 | |
| 234 case 'm': /* %m means xor each of next two args with 177. */ | |
| 235 argp[0] ^= 0177; | |
| 236 argp[1] ^= 0177; | |
| 237 break; | |
| 238 | |
| 239 case 'B': /* %B means express arg as BCD char code. */ | |
| 240 argp[0] += 6 * (tem / 10); | |
| 241 break; | |
| 242 | |
| 243 case 'D': /* %D means weird Delta Data transformation. */ | |
| 244 argp[0] -= 2 * (tem % 16); | |
| 245 break; | |
| 246 } | |
| 247 } | |
| 248 else | |
| 249 /* Ordinary character in the argument string. */ | |
| 250 ordinary: | |
| 251 *op++ = c; | |
| 252 } | |
| 253 *op = 0; | |
| 254 while (doup-- > 0) | |
| 255 strcat (op, up); | |
| 256 while (doleft-- > 0) | |
| 257 strcat (op, left); | |
| 258 return outstring; | |
| 259 } |