Mercurial > hg > xemacs-beta

comparison src/keymap.c @ 4953:304aebb79cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 19a72041c5ed
children e813cf16c015
comparison
equal deleted inserted replaced
4952:19a72041c5ed 4953:304aebb79cd3
472 */ 472 */
473 /* !!#### I'm not sure how correct this is. */ 473 /* !!#### I'm not sure how correct this is. */
474 Ibyte str [1 + MAX_ICHAR_LEN]; 474 Ibyte str [1 + MAX_ICHAR_LEN];
475 Bytecount count = set_itext_ichar (str, XCHAR (keysym)); 475 Bytecount count = set_itext_ichar (str, XCHAR (keysym));
476 str[count] = 0; 476 str[count] = 0;
477 keysym = intern_int (str); 477 keysym = intern_istring (str);
478 } 478 }
479 return control_meta_superify (keysym, modifiers); 479 return control_meta_superify (keysym, modifiers);
480 } 480 }
481 481
482 482
3653 { 3653 {
3654 p += set_itext_ichar (p, c); 3654 p += set_itext_ichar (p, c);
3655 } 3655 }
3656 3656
3657 *p = 0; 3657 *p = 0;
3658 return build_intstring (buf); 3658 return build_istring (buf);
3659 } 3659 }
3660 3660
3661 3661
3662 /************************************************************************/ 3662 /************************************************************************/
3663 /* where-is (mapping bindings to keys) */ 3663 /* where-is (mapping bindings to keys) */
4148 struct gcpro gcpro1; 4148 struct gcpro gcpro1;
4149 GCPRO1 (definition); 4149 GCPRO1 (definition);
4150 4150
4151 Findent_to (make_int (16), make_int (3), buffer); 4151 Findent_to (make_int (16), make_int (3), buffer);
4152 if (keymapp) 4152 if (keymapp)
4153 buffer_insert_c_string (XBUFFER (buffer), "<< "); 4153 buffer_insert_ascstring (XBUFFER (buffer), "<< ");
4154 4154
4155 if (SYMBOLP (definition)) 4155 if (SYMBOLP (definition))
4156 { 4156 {
4157 buffer_insert1 (XBUFFER (buffer), Fsymbol_name (definition)); 4157 buffer_insert1 (XBUFFER (buffer), Fsymbol_name (definition));
4158 } 4158 }
4159 else if (STRINGP (definition) || VECTORP (definition)) 4159 else if (STRINGP (definition) || VECTORP (definition))
4160 { 4160 {
4161 buffer_insert_c_string (XBUFFER (buffer), "Kbd Macro: "); 4161 buffer_insert_ascstring (XBUFFER (buffer), "Kbd Macro: ");
4162 buffer_insert1 (XBUFFER (buffer), Fkey_description (definition)); 4162 buffer_insert1 (XBUFFER (buffer), Fkey_description (definition));
4163 } 4163 }
4164 else if (COMPILED_FUNCTIONP (definition)) 4164 else if (COMPILED_FUNCTIONP (definition))
4165 buffer_insert_c_string (XBUFFER (buffer), "Anonymous Compiled Function"); 4165 buffer_insert_ascstring (XBUFFER (buffer), "Anonymous Compiled Function");
4166 else if (CONSP (definition) && EQ (XCAR (definition), Qlambda)) 4166 else if (CONSP (definition) && EQ (XCAR (definition), Qlambda))
4167 buffer_insert_c_string (XBUFFER (buffer), "Anonymous Lambda"); 4167 buffer_insert_ascstring (XBUFFER (buffer), "Anonymous Lambda");
4168 else if (KEYMAPP (definition)) 4168 else if (KEYMAPP (definition))
4169 { 4169 {
4170 Lisp_Object name = XKEYMAP (definition)->name; 4170 Lisp_Object name = XKEYMAP (definition)->name;
4171 if (STRINGP (name) || (SYMBOLP (name) && !NILP (name))) 4171 if (STRINGP (name) || (SYMBOLP (name) && !NILP (name)))
4172 { 4172 {
4173 buffer_insert_c_string (XBUFFER (buffer), "Prefix command "); 4173 buffer_insert_ascstring (XBUFFER (buffer), "Prefix command ");
4174 if (SYMBOLP (name) 4174 if (SYMBOLP (name)
4175 && EQ (find_symbol_value (name), definition)) 4175 && EQ (find_symbol_value (name), definition))
4176 buffer_insert1 (XBUFFER (buffer), Fsymbol_name (name)); 4176 buffer_insert1 (XBUFFER (buffer), Fsymbol_name (name));
4177 else 4177 else
4178 { 4178 {
4179 buffer_insert1 (XBUFFER (buffer), Fprin1_to_string (name, Qnil)); 4179 buffer_insert1 (XBUFFER (buffer), Fprin1_to_string (name, Qnil));
4180 } 4180 }
4181 } 4181 }
4182 else 4182 else
4183 buffer_insert_c_string (XBUFFER (buffer), "Prefix Command"); 4183 buffer_insert_ascstring (XBUFFER (buffer), "Prefix Command");
4184 } 4184 }
4185 else 4185 else
4186 buffer_insert_c_string (XBUFFER (buffer), "??"); 4186 buffer_insert_ascstring (XBUFFER (buffer), "??");
4187 4187
4188 if (keymapp) 4188 if (keymapp)
4189 buffer_insert_c_string (XBUFFER (buffer), " >>"); 4189 buffer_insert_ascstring (XBUFFER (buffer), " >>");
4190 buffer_insert_c_string (XBUFFER (buffer), "\n"); 4190 buffer_insert_ascstring (XBUFFER (buffer), "\n");
4191 UNGCPRO; 4191 UNGCPRO;
4192 } 4192 }
4193 4193
4194 struct describe_map_closure 4194 struct describe_map_closure
4195 { 4195 {
4468 describe_map_parent_mapper, &describe_map_closure); 4468 describe_map_parent_mapper, &describe_map_closure);
4469 4469
4470 if (!NILP (list)) 4470 if (!NILP (list))
4471 { 4471 {
4472 list = list_sort (list, Qnil, describe_map_sort_predicate); 4472 list = list_sort (list, Qnil, describe_map_sort_predicate);
4473 buffer_insert_c_string (buf, "\n"); 4473 buffer_insert_ascstring (buf, "\n");
4474 while (!NILP (list)) 4474 while (!NILP (list))
4475 { 4475 {
4476 Lisp_Object elt = XCAR (XCAR (list)); 4476 Lisp_Object elt = XCAR (XCAR (list));
4477 Lisp_Object keysym = XCAR (elt); 4477 Lisp_Object keysym = XCAR (elt);
4478 int modifiers = XINT (XCDR (elt)); 4478 int modifiers = XINT (XCDR (elt));
4479 4479
4480 if (!NILP (elt_prefix)) 4480 if (!NILP (elt_prefix))
4481 buffer_insert_lisp_string (buf, elt_prefix); 4481 buffer_insert_lisp_string (buf, elt_prefix);
4482 4482
4483 if (modifiers & XEMACS_MOD_META) 4483 if (modifiers & XEMACS_MOD_META)
4484 buffer_insert_c_string (buf, "M-"); 4484 buffer_insert_ascstring (buf, "M-");
4485 if (modifiers & XEMACS_MOD_CONTROL) 4485 if (modifiers & XEMACS_MOD_CONTROL)
4486 buffer_insert_c_string (buf, "C-"); 4486 buffer_insert_ascstring (buf, "C-");
4487 if (modifiers & XEMACS_MOD_SUPER) 4487 if (modifiers & XEMACS_MOD_SUPER)
4488 buffer_insert_c_string (buf, "S-"); 4488 buffer_insert_ascstring (buf, "S-");
4489 if (modifiers & XEMACS_MOD_HYPER) 4489 if (modifiers & XEMACS_MOD_HYPER)
4490 buffer_insert_c_string (buf, "H-"); 4490 buffer_insert_ascstring (buf, "H-");
4491 if (modifiers & XEMACS_MOD_ALT) 4491 if (modifiers & XEMACS_MOD_ALT)
4492 buffer_insert_c_string (buf, "Alt-"); 4492 buffer_insert_ascstring (buf, "Alt-");
4493 if (modifiers & XEMACS_MOD_SHIFT) 4493 if (modifiers & XEMACS_MOD_SHIFT)
4494 buffer_insert_c_string (buf, "Sh-"); 4494 buffer_insert_ascstring (buf, "Sh-");
4495 if (SYMBOLP (keysym)) 4495 if (SYMBOLP (keysym))
4496 { 4496 {
4497 Lisp_Object code = Fget (keysym, Qcharacter_of_keysym, Qnil); 4497 Lisp_Object code = Fget (keysym, Qcharacter_of_keysym, Qnil);
4498 Ichar c = (CHAR_OR_CHAR_INTP (code) 4498 Ichar c = (CHAR_OR_CHAR_INTP (code)
4499 ? XCHAR_OR_CHAR_INT (code) : (Ichar) -1); 4499 ? XCHAR_OR_CHAR_INT (code) : (Ichar) -1);
4500 /* Calling Fsingle_key_description() would cons more */ 4500 /* Calling Fsingle_key_description() would cons more */
4501 #if 0 /* This is bogus */ 4501 #if 0 /* This is bogus */
4502 if (EQ (keysym, QKlinefeed)) 4502 if (EQ (keysym, QKlinefeed))
4503 buffer_insert_c_string (buf, "LFD"); 4503 buffer_insert_ascstring (buf, "LFD");
4504 else if (EQ (keysym, QKtab)) 4504 else if (EQ (keysym, QKtab))
4505 buffer_insert_c_string (buf, "TAB"); 4505 buffer_insert_ascstring (buf, "TAB");
4506 else if (EQ (keysym, QKreturn)) 4506 else if (EQ (keysym, QKreturn))
4507 buffer_insert_c_string (buf, "RET"); 4507 buffer_insert_ascstring (buf, "RET");
4508 else if (EQ (keysym, QKescape)) 4508 else if (EQ (keysym, QKescape))
4509 buffer_insert_c_string (buf, "ESC"); 4509 buffer_insert_ascstring (buf, "ESC");
4510 else if (EQ (keysym, QKdelete)) 4510 else if (EQ (keysym, QKdelete))
4511 buffer_insert_c_string (buf, "DEL"); 4511 buffer_insert_ascstring (buf, "DEL");
4512 else if (EQ (keysym, QKspace)) 4512 else if (EQ (keysym, QKspace))
4513 buffer_insert_c_string (buf, "SPC"); 4513 buffer_insert_ascstring (buf, "SPC");
4514 else if (EQ (keysym, QKbackspace)) 4514 else if (EQ (keysym, QKbackspace))
4515 buffer_insert_c_string (buf, "BS"); 4515 buffer_insert_ascstring (buf, "BS");
4516 else 4516 else
4517 #endif 4517 #endif
4518 if (c >= printable_min) 4518 if (c >= printable_min)
4519 buffer_insert_emacs_char (buf, c); 4519 buffer_insert_emacs_char (buf, c);
4520 else buffer_insert1 (buf, Fsymbol_name (keysym)); 4520 else buffer_insert1 (buf, Fsymbol_name (keysym));
4521 } 4521 }
4522 else if (CHARP (keysym)) 4522 else if (CHARP (keysym))
4523 buffer_insert_emacs_char (buf, XCHAR (keysym)); 4523 buffer_insert_emacs_char (buf, XCHAR (keysym));
4524 else 4524 else
4525 buffer_insert_c_string (buf, "---bad keysym---"); 4525 buffer_insert_ascstring (buf, "---bad keysym---");
4526 4526
4527 if (elided) 4527 if (elided)
4528 elided = 0; 4528 elided = 0;
4529 else 4529 else
4530 { 4530 {
4536 list = XCDR (list); 4536 list = XCDR (list);
4537 } 4537 }
4538 if (k != 0) 4538 if (k != 0)
4539 { 4539 {
4540 if (k == 1) 4540 if (k == 1)
4541 buffer_insert_c_string (buf, ", "); 4541 buffer_insert_ascstring (buf, ", ");
4542 else 4542 else
4543 buffer_insert_c_string (buf, " .. "); 4543 buffer_insert_ascstring (buf, " .. ");
4544 elided = 1; 4544 elided = 1;
4545 continue; 4545 continue;
4546 } 4546 }
4547 } 4547 }
4548 4548