Mercurial > hg > xemacs-beta
annotate src/cm.c @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | 3d8143fc88e1 |
| children | 6f2158fa75ed |
| rev | line source |
|---|---|
| 428 | 1 /* Cursor motion subroutines for XEmacs. |
| 2 Copyright (C) 1985, 1994, 1995 Free Software Foundation, Inc. | |
| 3 loosely based primarily on public domain code written by Chris Torek | |
| 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: FSF 19.30. Substantially different from FSF. */ | |
| 23 | |
| 24 /* #### This file is extremely junky and needs major fixup. */ | |
| 25 | |
| 26 #include <config.h> | |
| 27 #include "lisp.h" | |
| 28 | |
| 800 | 29 #include "device.h" |
| 428 | 30 #include "frame.h" |
| 31 #include "lstream.h" | |
| 32 #include "redisplay.h" | |
| 33 | |
| 872 | 34 #include "console-tty-impl.h" |
| 800 | 35 |
| 428 | 36 #define EXPENSIVE 2000 |
| 37 | |
| 442 | 38 EXTERN_C char *tgoto (const char *cm, int hpos, int vpos); |
| 39 EXTERN_C int tputs (const char *, int, void (*)(int)); | |
| 428 | 40 |
| 41 static void cmgoto_for_real (struct console *c, int row, int col); | |
| 42 | |
| 43 static int cm_cost_counter; /* sums up costs */ | |
| 44 | |
| 45 static void | |
| 2286 | 46 evalcost (int UNUSED (c)) |
| 428 | 47 { |
| 48 cm_cost_counter++; | |
| 49 } | |
| 50 | |
| 51 /* Ugh -- cmputc() can't take a console argument, so we pass it in a global */ | |
| 52 struct console *cmputc_console; | |
| 53 | |
| 54 void | |
| 55 send_string_to_tty_console (struct console *c, unsigned char *str, int len) | |
| 56 { | |
| 57 /* #### Ben sez: don't some terminals need nulls outputted | |
| 58 for proper timing? */ | |
| 59 Lstream *lstr = XLSTREAM (CONSOLE_TTY_DATA (c)->outstream); | |
| 60 | |
| 61 if (CONSOLE_TTY_REAL_CURSOR_X (c) != CONSOLE_TTY_CURSOR_X (c) | |
| 62 || CONSOLE_TTY_REAL_CURSOR_Y (c) != CONSOLE_TTY_CURSOR_Y (c)) | |
| 63 { | |
| 64 int row = CONSOLE_TTY_CURSOR_Y (c); | |
| 65 int col = CONSOLE_TTY_CURSOR_X (c); | |
| 66 cmgoto_for_real (c, row, col); | |
| 67 } | |
| 68 | |
| 69 if (len == 1) | |
| 70 Lstream_putc (lstr, *str); | |
| 71 else if (len > 0) | |
| 72 Lstream_write (lstr, str, len); | |
| 73 } | |
| 74 | |
| 75 void | |
| 76 cmputc (int c) | |
| 77 { | |
| 78 unsigned char ch = (unsigned char) c; | |
| 79 | |
| 80 if (termscript) | |
| 81 fputc (c, termscript); | |
| 82 | |
| 83 send_string_to_tty_console (cmputc_console, &ch, 1); | |
| 84 } | |
| 85 | |
| 86 #if 0 | |
| 87 | |
| 88 /* | |
| 89 * Terminals with magicwrap (xn) don't all behave identically. | |
| 90 * The VT100 leaves the cursor in the last column but will wrap before | |
| 91 * printing the next character. I hear that the Concept terminal does | |
| 92 * the wrap immediately but ignores the next newline it sees. And some | |
| 93 * terminals just have buggy firmware, and think that the cursor is still | |
| 94 * in limbo if we use direct cursor addressing from the phantom column. | |
| 95 * The only guaranteed safe thing to do is to emit a CRLF immediately | |
| 96 * after we reach the last column; this takes us to a known state. | |
| 97 */ | |
| 98 void | |
| 99 cmcheckmagic (void) | |
| 100 { | |
| 101 if (curX == FrameCols) | |
| 102 { | |
| 103 if (!MagicWrap || curY >= FrameRows - 1) | |
| 2500 | 104 ABORT (); |
| 428 | 105 if (termscript) |
| 106 putc ('\r', termscript); | |
| 107 putchar ('\r'); | |
| 108 if (termscript) | |
| 109 putc ('\n', termscript); | |
| 110 putchar ('\n'); | |
| 111 curX = 0; | |
| 112 curY++; | |
| 113 } | |
| 114 } | |
| 115 | |
| 116 #endif /* 0 */ | |
| 117 | |
| 118 /* | |
| 119 * (Re)Initialize the cost factors, given the output speed of the | |
| 120 * terminal in DEVICE_TTY_DATA (dev)->ospeed. (Note: this holds B300, | |
| 121 * B9600, etc -- ie stuff out of <sgtty.h>.) | |
| 122 */ | |
| 123 void | |
| 124 cm_cost_init (struct console *c) | |
| 125 { | |
| 126 char *tmp; | |
| 127 | |
| 128 cm_cost_counter = 0; | |
| 129 #define COST(x,e) (x \ | |
| 130 ? (cm_cost_counter = 0, tputs (x, 1, e), cm_cost_counter) \ | |
| 131 : EXPENSIVE) | |
| 132 #define MINCOST(x,e) ((x == 0) \ | |
| 133 ? EXPENSIVE \ | |
| 134 : (tmp = tgoto(x, 0, 0), COST(tmp,e))) | |
| 135 | |
| 136 TTY_COST (c).cm_up = COST (TTY_CM (c).up, evalcost); | |
| 137 TTY_COST (c).cm_down = COST (TTY_CM (c).down, evalcost); | |
| 138 TTY_COST (c).cm_left = COST (TTY_CM (c).left, evalcost); | |
| 139 TTY_COST (c).cm_right = COST (TTY_CM (c).right, evalcost); | |
| 140 TTY_COST (c).cm_home = COST (TTY_CM (c).home, evalcost); | |
| 141 TTY_COST (c).cm_low_left = COST (TTY_CM (c).low_left, evalcost); | |
| 142 TTY_COST (c).cm_car_return = COST (TTY_CM (c).car_return, evalcost); | |
| 143 | |
| 144 /* | |
| 145 * These last three are actually minimum costs. When (if) they are | |
| 146 * candidates for the least-cost motion, the real cost is computed. | |
| 147 * (Note that "0" is the assumed to generate the minimum cost. | |
| 148 * While this is not necessarily true, I have yet to see a terminal | |
| 149 * for which is not; all the terminals that have variable-cost | |
| 150 * cursor motion seem to take straight numeric values. --ACT) | |
| 151 */ | |
| 152 | |
| 153 TTY_COST (c).cm_abs = MINCOST (TTY_CM (c).abs, evalcost); | |
| 154 TTY_COST (c).cm_hor_abs = MINCOST (TTY_CM (c).hor_abs, evalcost); | |
| 155 TTY_COST (c).cm_ver_abs = MINCOST (TTY_CM (c).ver_abs, evalcost); | |
| 156 | |
| 157 #undef MINCOST | |
| 158 #undef COST | |
| 159 } | |
| 160 | |
| 161 /* | |
| 162 * Calculate the cost to move from (srcy, srcx) to (dsty, dstx) using | |
| 163 * up and down, and left and right, and motions. If doit is set | |
| 164 * actually perform the motion. | |
| 165 */ | |
| 166 | |
| 167 #ifdef NOT_YET | |
| 168 static int | |
| 169 calccost (struct frame *f, int srcy, int srcx, int dsty, int dstx, int doit) | |
| 170 { | |
| 171 struct console *c = XCONSOLE (FRAME_CONSOLE (f)); | |
| 172 int totalcost = 0; | |
| 173 int deltay, deltax; | |
| 174 char *motion; | |
| 175 int motion_cost; | |
| 176 | |
| 177 #if 0 | |
| 178 int ntabs, n2tabs, tabx, tab2x, tabcost; | |
| 179 #endif | |
| 180 | |
| 181 cmputc_console = c; | |
| 182 #if 0 | |
| 183 /* If have just wrapped on a terminal with xn, | |
| 184 don't believe the cursor position: give up here | |
| 185 and force use of absolute positioning. */ | |
| 186 if (curX == Wcm.cm_cols) | |
| 187 goto fail; | |
| 188 #endif | |
| 189 | |
| 190 deltay = dsty - srcy; | |
| 191 if (!deltay) | |
| 192 goto calculate_x; | |
| 193 | |
| 194 if (deltay < 0) | |
| 195 { | |
| 196 motion = TTY_CM (c).up; | |
| 197 motion_cost = TTY_COST (c).cm_up; | |
| 198 deltay = -deltay; | |
| 199 } | |
| 200 else | |
| 201 { | |
| 202 motion = TTY_CM (c).down; | |
| 203 motion_cost = TTY_COST (c).cm_down; | |
| 204 } | |
| 205 | |
| 206 if (motion_cost == EXPENSIVE) | |
| 207 { | |
| 208 /* if (doit) */ | |
| 209 /* #### printing OOF is not acceptable */ | |
| 210 return motion_cost; | |
| 211 } | |
| 212 | |
| 213 totalcost = motion_cost * deltay; | |
| 214 | |
| 215 if (doit) | |
| 216 while (--deltay >= 0) | |
| 217 tputs (motion, 1, cmputc); | |
| 218 | |
| 219 calculate_x: | |
| 220 | |
| 221 deltax = dstx - srcx; | |
| 222 if (!deltax) | |
| 223 goto done; | |
| 224 | |
| 225 if (deltax < 0) | |
| 226 { | |
| 227 motion = TTY_CM (c).left; | |
| 228 motion_cost = TTY_COST (c).cm_left; | |
| 229 deltax = -deltax; | |
| 230 } | |
| 231 else | |
| 232 { | |
| 233 motion = TTY_CM (c).right; | |
| 234 motion_cost = TTY_COST (c).cm_right; | |
| 235 } | |
| 236 | |
| 237 if (motion_cost == EXPENSIVE) | |
| 238 { | |
| 239 /* if (doit) */ | |
| 240 /* #### printing OOF is not acceptable */ | |
| 241 return motion_cost; | |
| 242 } | |
| 243 | |
| 244 totalcost += motion_cost * deltax; | |
| 245 | |
| 246 if (doit) | |
| 247 while (--deltax >= 0) | |
| 248 tputs (motion, 1, cmputc); | |
| 249 | |
| 250 done: | |
| 251 return totalcost; | |
| 252 } | |
| 253 #endif /* NOT_YET */ | |
| 254 | |
| 255 #define USEREL 0 | |
| 256 #define USEHOME 1 | |
| 257 #define USELL 2 | |
| 258 #define USECR 3 | |
| 259 | |
| 778 | 260 #ifdef OLD_CURSOR_MOTION_SHIT |
| 428 | 261 void |
| 262 cmgoto (struct frame *f, int row, int col) | |
| 263 { | |
| 264 struct console *c = XCONSOLE (FRAME_CONSOLE (f)); | |
| 265 char *motion; | |
| 266 #if 0 | |
| 267 int frame_x = FRAME_CURSOR_X(f); | |
| 268 int frame_y = FRAME_CURSOR_Y(f); | |
| 269 int relcost, directcost, llcost; | |
| 270 int homecost; | |
| 271 int use; | |
| 272 char *dcm; | |
| 273 #endif | |
| 274 | |
| 275 cmputc_console = c; | |
| 276 | |
| 277 /* First the degenerate case */ | |
| 278 #if 0 | |
| 279 if (row == frame_y && col == frame_x) | |
| 280 return; | |
| 281 #endif | |
| 282 | |
| 283 /* #### something is fucked with the non-absolute cases */ | |
| 284 motion = tgoto (TTY_CM (c).abs, col, row); | |
| 285 tputs (motion, 1, cmputc); | |
| 286 CONSOLE_TTY_DATA (c)->cursor_x = col; | |
| 287 CONSOLE_TTY_DATA (c)->cursor_y = row; | |
| 288 return; | |
| 289 | |
| 290 #if 0 | |
| 291 if (frame_y >= 0 && frame_x >= 0) | |
| 292 { | |
| 293 /* | |
| 294 * Pick least-cost motions | |
| 295 */ | |
| 296 | |
| 297 relcost = calccost (f, frame_y, frame_x, row, col, 0); | |
| 298 use = USEREL; | |
| 299 | |
| 300 homecost = TTY_COST (c).cm_home; | |
| 301 if (homecost < EXPENSIVE) | |
| 302 homecost += calccost (f, 0, 0, row, col, 0); | |
| 303 | |
| 304 if (homecost < relcost) | |
| 305 { | |
| 306 relcost = homecost; | |
| 307 use = USEHOME; | |
| 308 } | |
| 309 | |
| 310 llcost = TTY_COST (c).cm_low_left; | |
| 311 if (llcost < EXPENSIVE) | |
| 312 llcost += calccost (f, frame_y - 1, 0, row, col, 0); | |
| 313 | |
| 314 if (llcost < relcost) | |
| 315 { | |
| 316 relcost = llcost; | |
| 317 use = USELL; | |
| 318 } | |
| 319 | |
| 320 #if 0 | |
| 321 if ((crcost = Wcm.cc_cr) < BIG) { | |
| 322 if (Wcm.cm_autolf) | |
| 323 if (curY + 1 >= Wcm.cm_rows) | |
| 324 crcost = BIG; | |
| 325 else | |
| 326 crcost += calccost (curY + 1, 0, row, col, 0); | |
| 327 else | |
| 328 crcost += calccost (curY, 0, row, col, 0); | |
| 329 } | |
| 330 if (crcost < relcost) | |
| 331 relcost = crcost, use = USECR; | |
| 332 #endif | |
| 333 | |
| 334 directcost = TTY_COST (c).cm_abs; | |
| 335 dcm = TTY_CM (c).abs; | |
| 336 | |
| 337 if (row == frame_y && TTY_COST (c).cm_hor_abs < EXPENSIVE) | |
| 338 { | |
| 339 directcost = TTY_COST (c).cm_hor_abs; | |
| 340 dcm = TTY_CM (c).hor_abs; | |
| 341 } | |
| 342 else if (col == frame_x && TTY_COST (c).cm_ver_abs < EXPENSIVE) | |
| 343 { | |
| 344 directcost = TTY_COST (c).cm_ver_abs; | |
| 345 dcm = TTY_CM (c).ver_abs; | |
| 346 } | |
| 347 } | |
| 348 else | |
| 349 { | |
| 350 directcost = 0; | |
| 351 relcost = 100000; | |
| 352 dcm = TTY_CM (c).abs; | |
| 353 } | |
| 354 | |
| 355 /* | |
| 356 * In the following comparison, the = in <= is because when the costs | |
| 357 * are the same, it looks nicer (I think) to move directly there. | |
| 358 */ | |
| 359 if (directcost <= relcost) | |
| 360 { | |
| 361 /* compute REAL direct cost */ | |
| 362 cm_cost_counter = 0; | |
| 363 motion = (dcm == TTY_CM (c).hor_abs | |
| 364 ? tgoto (dcm, row, col) | |
| 365 : tgoto (dcm, col, row)); | |
| 366 tputs (motion, 1, evalcost); | |
| 367 if (cm_cost_counter <= relcost) | |
| 368 { /* really is cheaper */ | |
| 369 tputs (motion, 1, cmputc); | |
| 370 FRAME_CURSOR_Y (f) = row; | |
| 371 FRAME_CURSOR_X (f) = col; | |
| 372 return; | |
| 373 } | |
| 374 } | |
| 375 | |
| 376 switch (use) | |
| 377 { | |
| 378 case USEHOME: | |
| 379 tputs (TTY_CM (c).home, 1, cmputc); | |
| 380 FRAME_CURSOR_X (f) = 0; | |
| 381 FRAME_CURSOR_Y (f) = 0; | |
| 382 break; | |
| 383 | |
| 384 case USELL: | |
| 385 tputs (TTY_CM (c).low_left, 1, cmputc); | |
| 386 FRAME_CURSOR_Y (f) = FRAME_HEIGHT (f) - 1; | |
| 387 FRAME_CURSOR_X (f) = 0; | |
| 388 break; | |
| 389 | |
| 390 #if 0 | |
| 391 case USECR: | |
| 392 tputs (Wcm.cm_cr, 1, cmputc); | |
| 393 if (Wcm.cm_autolf) | |
| 394 curY++; | |
| 395 curX = 0; | |
| 396 break; | |
| 397 #endif | |
| 398 } | |
| 399 | |
| 400 calccost (f, FRAME_CURSOR_Y (f), FRAME_CURSOR_X (f), row, col, 1); | |
| 401 FRAME_CURSOR_Y (f) = row; | |
| 402 FRAME_CURSOR_X (f) = col; | |
| 403 #endif | |
| 404 } | |
| 405 #endif /* OLD_CURSOR_MOTION_SHIT */ | |
| 406 | |
| 407 /***************************************************************************** | |
| 408 cmgoto | |
| 409 | |
| 410 This function is responsible for getting the cursor from its current | |
| 411 location to the passed location in the most efficient manner | |
| 412 possible. | |
| 413 ****************************************************************************/ | |
| 414 static void | |
| 415 cmgoto_for_real (struct console *c, int row, int col) | |
| 416 { | |
| 417 char *motion; | |
| 418 | |
| 419 cmputc_console = c; | |
| 420 | |
| 421 /* First make sure that we actually have to do any work at all. */ | |
| 422 if (CONSOLE_TTY_REAL_CURSOR_X (c) == col | |
| 423 && CONSOLE_TTY_REAL_CURSOR_Y (c) == row) | |
| 424 return; | |
| 425 | |
| 426 CONSOLE_TTY_REAL_CURSOR_X (c) = col; | |
| 427 CONSOLE_TTY_REAL_CURSOR_Y (c) = row; | |
| 428 | |
| 429 /* #### Need to reimplement cost analysis and potential relative | |
| 430 movement. */ | |
| 431 | |
| 432 /* If all else fails, use absolute movement. */ | |
| 433 motion = tgoto (TTY_CM (c).abs, col, row); | |
| 434 tputs (motion, 1, cmputc); | |
| 435 CONSOLE_TTY_CURSOR_X (c) = col; | |
| 436 CONSOLE_TTY_CURSOR_Y (c) = row; | |
| 437 } | |
| 438 | |
| 439 void | |
| 440 cmgoto (struct frame *f, int row, int col) | |
| 441 { | |
| 442 /* We delay cursor motion until we do something other than cursor motion, | |
| 443 to optimize the case where cmgoto() is called twice in a row. */ | |
| 444 struct console *c = XCONSOLE (FRAME_CONSOLE (f)); | |
| 445 CONSOLE_TTY_CURSOR_X (c) = col; | |
| 446 CONSOLE_TTY_CURSOR_Y (c) = row; | |
| 447 } | |
| 448 | |
| 449 #if 0 | |
| 450 /* Clear out all terminal info. | |
| 451 Used before copying into it the info on the actual terminal. | |
| 452 */ | |
| 453 | |
| 454 void | |
| 455 Wcm_clear (void) | |
| 456 { | |
| 457 xzero (Wcm); | |
| 458 UP = 0; | |
| 459 BC = 0; | |
| 460 } | |
| 461 #endif | |
| 462 | |
| 463 #if 0 | |
| 464 /* | |
| 465 * Initialized stuff | |
| 466 * Return 0 if can do CM. | |
| 467 * Return -1 if cannot. | |
| 468 * Return -2 if size not specified. | |
| 469 */ | |
| 470 | |
| 471 int | |
| 472 Wcm_init (void) | |
| 473 { | |
| 474 #if 0 | |
| 475 if (Wcm.cm_abs && !Wcm.cm_ds) | |
| 476 return 0; | |
| 477 #endif | |
| 478 if (Wcm.cm_abs) | |
| 479 return 0; | |
| 480 /* Require up and left, and, if no absolute, down and right */ | |
| 481 if (!Wcm.cm_up || !Wcm.cm_left) | |
| 482 return - 1; | |
| 483 if (!Wcm.cm_abs && (!Wcm.cm_down || !Wcm.cm_right)) | |
| 484 return - 1; | |
| 485 /* Check that we know the size of the frame.... */ | |
| 486 if (Wcm.cm_rows <= 0 || Wcm.cm_cols <= 0) | |
| 487 return - 2; | |
| 488 return 0; | |
| 489 } | |
| 490 #endif |