comparison src/redisplay-output.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents 6504113e7c2d
children e7ee5f8bde58
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
846 846
847 For the given window W, move the cursor to NEW_POINT. Returns a 847 For the given window W, move the cursor to NEW_POINT. Returns a
848 boolean indicating success or failure. 848 boolean indicating success or failure.
849 ****************************************************************************/ 849 ****************************************************************************/
850 850
851 #define ADJ_CHARBPOS (rb->charbpos + dl->offset) 851 #define ADJ_CHARPOS (rb->charpos + dl->offset)
852 #define ADJ_ENDPOS (rb->endpos + dl->offset) 852 #define ADJ_ENDPOS (rb->endpos + dl->offset)
853 853
854 int 854 int
855 redisplay_move_cursor (struct window *w, Charbpos new_point, int no_output_end) 855 redisplay_move_cursor (struct window *w, Charbpos new_point, int no_output_end)
856 { 856 {
886 886
887 rb = Dynarr_atp (db->runes, x); 887 rb = Dynarr_atp (db->runes, x);
888 888
889 if (rb->cursor_type == CURSOR_OFF) 889 if (rb->cursor_type == CURSOR_OFF)
890 return 0; 890 return 0;
891 else if (ADJ_CHARBPOS == new_point 891 else if (ADJ_CHARPOS == new_point
892 || (ADJ_ENDPOS && (new_point >= ADJ_CHARBPOS) 892 || (ADJ_ENDPOS && (new_point >= ADJ_CHARPOS)
893 && (new_point <= ADJ_ENDPOS))) 893 && (new_point <= ADJ_ENDPOS)))
894 { 894 {
895 w->last_point_x[CURRENT_DISP] = x; 895 w->last_point_x[CURRENT_DISP] = x;
896 w->last_point_y[CURRENT_DISP] = y; 896 w->last_point_y[CURRENT_DISP] = y;
897 Fset_marker (w->last_point[CURRENT_DISP], make_int (ADJ_CHARBPOS), 897 Fset_marker (w->last_point[CURRENT_DISP], make_int (ADJ_CHARPOS),
898 w->buffer); 898 w->buffer);
899 dl->cursor_elt = x; 899 dl->cursor_elt = x;
900 return 1; 900 return 1;
901 } 901 }
902 else 902 else
951 { 951 {
952 int cur_rb = 0; 952 int cur_rb = 0;
953 int first = 0; 953 int first = 0;
954 int cur_dl, up; 954 int cur_dl, up;
955 955
956 if (ADJ_CHARBPOS < new_point) 956 if (ADJ_CHARPOS < new_point)
957 { 957 {
958 up = 1; 958 up = 1;
959 cur_rb = x + 1; 959 cur_rb = x + 1;
960 cur_dl = y; 960 cur_dl = y;
961 } 961 }
989 { 989 {
990 rb = Dynarr_atp (db->runes, cur_rb); 990 rb = Dynarr_atp (db->runes, cur_rb);
991 991
992 if (rb->cursor_type != IGNORE_CURSOR 992 if (rb->cursor_type != IGNORE_CURSOR
993 && rb->cursor_type != NO_CURSOR && 993 && rb->cursor_type != NO_CURSOR &&
994 (ADJ_CHARBPOS == new_point 994 (ADJ_CHARPOS == new_point
995 || (ADJ_ENDPOS && (new_point >= ADJ_CHARBPOS) 995 || (ADJ_ENDPOS && (new_point >= ADJ_CHARPOS)
996 && (new_point <= ADJ_CHARBPOS)))) 996 && (new_point <= ADJ_CHARPOS))))
997 { 997 {
998 rb->cursor_type = CURSOR_ON; 998 rb->cursor_type = CURSOR_ON;
999 dl->cursor_elt = cur_rb; 999 dl->cursor_elt = cur_rb;
1000 1000
1001 1001
1003 rb->xpos + rb->width); 1003 rb->xpos + rb->width);
1004 1004
1005 w->last_point_x[CURRENT_DISP] = cur_rb; 1005 w->last_point_x[CURRENT_DISP] = cur_rb;
1006 w->last_point_y[CURRENT_DISP] = cur_dl; 1006 w->last_point_y[CURRENT_DISP] = cur_dl;
1007 Fset_marker (w->last_point[CURRENT_DISP], 1007 Fset_marker (w->last_point[CURRENT_DISP],
1008 make_int (ADJ_CHARBPOS), w->buffer); 1008 make_int (ADJ_CHARPOS), w->buffer);
1009 1009
1010 if (!no_output_end) 1010 if (!no_output_end)
1011 { 1011 {
1012 MAYBE_DEVMETH (d, window_output_end, (w)); 1012 MAYBE_DEVMETH (d, window_output_end, (w));
1013 MAYBE_DEVMETH (d, frame_output_end, (f)); 1013 MAYBE_DEVMETH (d, frame_output_end, (f));
1028 MAYBE_DEVMETH (d, window_output_end, (w)); 1028 MAYBE_DEVMETH (d, window_output_end, (w));
1029 MAYBE_DEVMETH (d, frame_output_end, (f)); 1029 MAYBE_DEVMETH (d, frame_output_end, (f));
1030 } 1030 }
1031 return 0; 1031 return 0;
1032 } 1032 }
1033 #undef ADJ_CHARBPOS 1033 #undef ADJ_CHARPOS
1034 #undef ADJ_ENDPOS 1034 #undef ADJ_ENDPOS
1035 1035
1036 /***************************************************************************** 1036 /*****************************************************************************
1037 redraw_cursor_in_window 1037 redraw_cursor_in_window
1038 1038
2139 2139
2140 MAYBE_DEVMETH (d, window_output_begin, (w)); 2140 MAYBE_DEVMETH (d, window_output_begin, (w));
2141 2141
2142 while (first_line <= last_line) 2142 while (first_line <= last_line)
2143 { 2143 {
2144 Charcount old_len = (Dynarr_atp (cdla, first_line)->end_charbpos - 2144 Charcount old_len = (Dynarr_atp (cdla, first_line)->end_charpos -
2145 Dynarr_atp (cdla, first_line)->charbpos); 2145 Dynarr_atp (cdla, first_line)->charpos);
2146 Charcount new_len = (Dynarr_atp (ddla, first_line)->end_charbpos - 2146 Charcount new_len = (Dynarr_atp (ddla, first_line)->end_charpos -
2147 Dynarr_atp (ddla, first_line)->charbpos); 2147 Dynarr_atp (ddla, first_line)->charpos);
2148 2148
2149 assert (Dynarr_length (cdla) == Dynarr_length (ddla)); 2149 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
2150 2150
2151 /* Output the changes. */ 2151 /* Output the changes. */
2152 output_display_line (w, cdla, ddla, first_line, -1, -1); 2152 output_display_line (w, cdla, ddla, first_line, -1, -1);