Mercurial > hg > xemacs-beta
view src/cm.c @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Mar 2010 04:08:17 -0600 |
parents | 6f2158fa75ed |
children | 308d34e9f07d |
line wrap: on
line source
/* Cursor motion subroutines for XEmacs. Copyright (C) 1985, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 2010 Ben Wing. loosely based primarily on public domain code written by Chris Torek This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.30. Substantially different from FSF. */ /* #### This file is extremely junky and needs major fixup. */ #include <config.h> #include "lisp.h" #include "device.h" #include "frame.h" #include "lstream.h" #include "redisplay.h" #include "console-tty-impl.h" #define EXPENSIVE 2000 EXTERN_C char *tgoto (const char *cm, int hpos, int vpos); EXTERN_C int tputs (const char *, int, void (*)(int)); static void cmgoto_for_real (struct console *c, int row, int col); static int cm_cost_counter; /* sums up costs */ static void evalcost (int UNUSED (c)) { cm_cost_counter++; } /* Ugh -- cmputc() can't take a console argument, so we pass it in a global */ struct console *cmputc_console; void send_string_to_tty_console (struct console *c, unsigned char *str, int len) { /* #### Ben sez: don't some terminals need nulls outputted for proper timing? */ Lstream *lstr = XLSTREAM (CONSOLE_TTY_DATA (c)->outstream); if (CONSOLE_TTY_REAL_CURSOR_X (c) != CONSOLE_TTY_CURSOR_X (c) || CONSOLE_TTY_REAL_CURSOR_Y (c) != CONSOLE_TTY_CURSOR_Y (c)) { int row = CONSOLE_TTY_CURSOR_Y (c); int col = CONSOLE_TTY_CURSOR_X (c); cmgoto_for_real (c, row, col); } if (len == 1) Lstream_putc (lstr, *str); else if (len > 0) Lstream_write (lstr, str, len); } void cmputc (int c) { unsigned char ch = (unsigned char) c; if (termscript) fputc (c, termscript); send_string_to_tty_console (cmputc_console, &ch, 1); } #if 0 /* * Terminals with magicwrap (xn) don't all behave identically. * The VT100 leaves the cursor in the last column but will wrap before * printing the next character. I hear that the Concept terminal does * the wrap immediately but ignores the next newline it sees. And some * terminals just have buggy firmware, and think that the cursor is still * in limbo if we use direct cursor addressing from the phantom column. * The only guaranteed safe thing to do is to emit a CRLF immediately * after we reach the last column; this takes us to a known state. */ void cmcheckmagic (void) { if (curX == FrameCols) { assert (MagicWrap && curY < FrameRows - 1); if (termscript) putc ('\r', termscript); putchar ('\r'); if (termscript) putc ('\n', termscript); putchar ('\n'); curX = 0; curY++; } } #endif /* 0 */ /* * (Re)Initialize the cost factors, given the output speed of the * terminal in DEVICE_TTY_DATA (dev)->ospeed. (Note: this holds B300, * B9600, etc -- ie stuff out of <sgtty.h>.) */ void cm_cost_init (struct console *c) { char *tmp; cm_cost_counter = 0; #define COST(x,e) (x \ ? (cm_cost_counter = 0, tputs (x, 1, e), cm_cost_counter) \ : EXPENSIVE) #define MINCOST(x,e) ((x == 0) \ ? EXPENSIVE \ : (tmp = tgoto(x, 0, 0), COST(tmp,e))) TTY_COST (c).cm_up = COST (TTY_CM (c).up, evalcost); TTY_COST (c).cm_down = COST (TTY_CM (c).down, evalcost); TTY_COST (c).cm_left = COST (TTY_CM (c).left, evalcost); TTY_COST (c).cm_right = COST (TTY_CM (c).right, evalcost); TTY_COST (c).cm_home = COST (TTY_CM (c).home, evalcost); TTY_COST (c).cm_low_left = COST (TTY_CM (c).low_left, evalcost); TTY_COST (c).cm_car_return = COST (TTY_CM (c).car_return, evalcost); /* * These last three are actually minimum costs. When (if) they are * candidates for the least-cost motion, the real cost is computed. * (Note that "0" is the assumed to generate the minimum cost. * While this is not necessarily true, I have yet to see a terminal * for which is not; all the terminals that have variable-cost * cursor motion seem to take straight numeric values. --ACT) */ TTY_COST (c).cm_abs = MINCOST (TTY_CM (c).abs, evalcost); TTY_COST (c).cm_hor_abs = MINCOST (TTY_CM (c).hor_abs, evalcost); TTY_COST (c).cm_ver_abs = MINCOST (TTY_CM (c).ver_abs, evalcost); #undef MINCOST #undef COST } /* * Calculate the cost to move from (srcy, srcx) to (dsty, dstx) using * up and down, and left and right, and motions. If doit is set * actually perform the motion. */ #ifdef NOT_YET static int calccost (struct frame *f, int srcy, int srcx, int dsty, int dstx, int doit) { struct console *c = XCONSOLE (FRAME_CONSOLE (f)); int totalcost = 0; int deltay, deltax; char *motion; int motion_cost; #if 0 int ntabs, n2tabs, tabx, tab2x, tabcost; #endif cmputc_console = c; #if 0 /* If have just wrapped on a terminal with xn, don't believe the cursor position: give up here and force use of absolute positioning. */ if (curX == Wcm.cm_cols) goto fail; #endif deltay = dsty - srcy; if (!deltay) goto calculate_x; if (deltay < 0) { motion = TTY_CM (c).up; motion_cost = TTY_COST (c).cm_up; deltay = -deltay; } else { motion = TTY_CM (c).down; motion_cost = TTY_COST (c).cm_down; } if (motion_cost == EXPENSIVE) { /* if (doit) */ /* #### printing OOF is not acceptable */ return motion_cost; } totalcost = motion_cost * deltay; if (doit) while (--deltay >= 0) tputs (motion, 1, cmputc); calculate_x: deltax = dstx - srcx; if (!deltax) goto done; if (deltax < 0) { motion = TTY_CM (c).left; motion_cost = TTY_COST (c).cm_left; deltax = -deltax; } else { motion = TTY_CM (c).right; motion_cost = TTY_COST (c).cm_right; } if (motion_cost == EXPENSIVE) { /* if (doit) */ /* #### printing OOF is not acceptable */ return motion_cost; } totalcost += motion_cost * deltax; if (doit) while (--deltax >= 0) tputs (motion, 1, cmputc); done: return totalcost; } #endif /* NOT_YET */ #define USEREL 0 #define USEHOME 1 #define USELL 2 #define USECR 3 #ifdef OLD_CURSOR_MOTION_SHIT void cmgoto (struct frame *f, int row, int col) { struct console *c = XCONSOLE (FRAME_CONSOLE (f)); char *motion; #if 0 int frame_x = FRAME_CURSOR_X(f); int frame_y = FRAME_CURSOR_Y(f); int relcost, directcost, llcost; int homecost; int use; char *dcm; #endif cmputc_console = c; /* First the degenerate case */ #if 0 if (row == frame_y && col == frame_x) return; #endif /* #### something is fucked with the non-absolute cases */ motion = tgoto (TTY_CM (c).abs, col, row); tputs (motion, 1, cmputc); CONSOLE_TTY_DATA (c)->cursor_x = col; CONSOLE_TTY_DATA (c)->cursor_y = row; return; #if 0 if (frame_y >= 0 && frame_x >= 0) { /* * Pick least-cost motions */ relcost = calccost (f, frame_y, frame_x, row, col, 0); use = USEREL; homecost = TTY_COST (c).cm_home; if (homecost < EXPENSIVE) homecost += calccost (f, 0, 0, row, col, 0); if (homecost < relcost) { relcost = homecost; use = USEHOME; } llcost = TTY_COST (c).cm_low_left; if (llcost < EXPENSIVE) llcost += calccost (f, frame_y - 1, 0, row, col, 0); if (llcost < relcost) { relcost = llcost; use = USELL; } #if 0 if ((crcost = Wcm.cc_cr) < BIG) { if (Wcm.cm_autolf) if (curY + 1 >= Wcm.cm_rows) crcost = BIG; else crcost += calccost (curY + 1, 0, row, col, 0); else crcost += calccost (curY, 0, row, col, 0); } if (crcost < relcost) relcost = crcost, use = USECR; #endif directcost = TTY_COST (c).cm_abs; dcm = TTY_CM (c).abs; if (row == frame_y && TTY_COST (c).cm_hor_abs < EXPENSIVE) { directcost = TTY_COST (c).cm_hor_abs; dcm = TTY_CM (c).hor_abs; } else if (col == frame_x && TTY_COST (c).cm_ver_abs < EXPENSIVE) { directcost = TTY_COST (c).cm_ver_abs; dcm = TTY_CM (c).ver_abs; } } else { directcost = 0; relcost = 100000; dcm = TTY_CM (c).abs; } /* * In the following comparison, the = in <= is because when the costs * are the same, it looks nicer (I think) to move directly there. */ if (directcost <= relcost) { /* compute REAL direct cost */ cm_cost_counter = 0; motion = (dcm == TTY_CM (c).hor_abs ? tgoto (dcm, row, col) : tgoto (dcm, col, row)); tputs (motion, 1, evalcost); if (cm_cost_counter <= relcost) { /* really is cheaper */ tputs (motion, 1, cmputc); FRAME_CURSOR_Y (f) = row; FRAME_CURSOR_X (f) = col; return; } } switch (use) { case USEHOME: tputs (TTY_CM (c).home, 1, cmputc); FRAME_CURSOR_X (f) = 0; FRAME_CURSOR_Y (f) = 0; break; case USELL: tputs (TTY_CM (c).low_left, 1, cmputc); FRAME_CURSOR_Y (f) = FRAME_HEIGHT (f) - 1; FRAME_CURSOR_X (f) = 0; break; #if 0 case USECR: tputs (Wcm.cm_cr, 1, cmputc); if (Wcm.cm_autolf) curY++; curX = 0; break; #endif } calccost (f, FRAME_CURSOR_Y (f), FRAME_CURSOR_X (f), row, col, 1); FRAME_CURSOR_Y (f) = row; FRAME_CURSOR_X (f) = col; #endif } #endif /* OLD_CURSOR_MOTION_SHIT */ /***************************************************************************** cmgoto This function is responsible for getting the cursor from its current location to the passed location in the most efficient manner possible. ****************************************************************************/ static void cmgoto_for_real (struct console *c, int row, int col) { char *motion; cmputc_console = c; /* First make sure that we actually have to do any work at all. */ if (CONSOLE_TTY_REAL_CURSOR_X (c) == col && CONSOLE_TTY_REAL_CURSOR_Y (c) == row) return; CONSOLE_TTY_REAL_CURSOR_X (c) = col; CONSOLE_TTY_REAL_CURSOR_Y (c) = row; /* #### Need to reimplement cost analysis and potential relative movement. */ /* If all else fails, use absolute movement. */ motion = tgoto (TTY_CM (c).abs, col, row); tputs (motion, 1, cmputc); CONSOLE_TTY_CURSOR_X (c) = col; CONSOLE_TTY_CURSOR_Y (c) = row; } void cmgoto (struct frame *f, int row, int col) { /* We delay cursor motion until we do something other than cursor motion, to optimize the case where cmgoto() is called twice in a row. */ struct console *c = XCONSOLE (FRAME_CONSOLE (f)); CONSOLE_TTY_CURSOR_X (c) = col; CONSOLE_TTY_CURSOR_Y (c) = row; } #if 0 /* Clear out all terminal info. Used before copying into it the info on the actual terminal. */ void Wcm_clear (void) { xzero (Wcm); UP = 0; BC = 0; } #endif #if 0 /* * Initialized stuff * Return 0 if can do CM. * Return -1 if cannot. * Return -2 if size not specified. */ int Wcm_init (void) { #if 0 if (Wcm.cm_abs && !Wcm.cm_ds) return 0; #endif if (Wcm.cm_abs) return 0; /* Require up and left, and, if no absolute, down and right */ if (!Wcm.cm_up || !Wcm.cm_left) return - 1; if (!Wcm.cm_abs && (!Wcm.cm_down || !Wcm.cm_right)) return - 1; /* Check that we know the size of the frame.... */ if (Wcm.cm_rows <= 0 || Wcm.cm_cols <= 0) return - 2; return 0; } #endif