comparison src/window.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 a5954632b187
children 047d37eb70d7
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
166 print_window (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) 166 print_window (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
167 { 167 {
168 if (print_readably) 168 if (print_readably)
169 printing_unreadable_object ("#<window 0x%x>", XWINDOW (obj)->header.uid); 169 printing_unreadable_object ("#<window 0x%x>", XWINDOW (obj)->header.uid);
170 170
171 write_c_string ("#<window", printcharfun); 171 write_c_string (printcharfun, "#<window");
172 if (!NILP (XWINDOW (obj)->buffer)) 172 if (!NILP (XWINDOW (obj)->buffer))
173 { 173 {
174 Lisp_Object name = XBUFFER (XWINDOW (obj)->buffer)->name; 174 Lisp_Object name = XBUFFER (XWINDOW (obj)->buffer)->name;
175 write_fmt_string_lisp (printcharfun, " on %S", 1, name); 175 write_fmt_string_lisp (printcharfun, " on %S", 1, name);
176 } 176 }
1599 return ncol; 1599 return ncol;
1600 } 1600 }
1601 1601
1602 #if 0 /* bogus FSF crock */ 1602 #if 0 /* bogus FSF crock */
1603 1603
1604 xxDEFUN ("window-redisplay-end-trigger", 1604 DEFUN ("window-redisplay-end-trigger",
1605 Fwindow_redisplay_end_trigger, 0, 1, 0, /* 1605 Fwindow_redisplay_end_trigger, 0, 1, 0, /*
1606 Return WINDOW's redisplay end trigger value. 1606 Return WINDOW's redisplay end trigger value.
1607 See `set-window-redisplay-end-trigger' for more information. 1607 See `set-window-redisplay-end-trigger' for more information.
1608 */ 1608 */
1609 (window)) 1609 (window))
1610 { 1610 {
1611 return decode_window (window)->redisplay_end_trigger; 1611 return decode_window (window)->redisplay_end_trigger;
1612 } 1612 }
1613 1613
1614 xxDEFUN ("set-window-redisplay-end-trigger", 1614 DEFUN ("set-window-redisplay-end-trigger",
1615 Fset_window_redisplay_end_trigger, 2, 2, 0, /* 1615 Fset_window_redisplay_end_trigger, 2, 2, 0, /*
1616 Set WINDOW's redisplay end trigger value to VALUE. 1616 Set WINDOW's redisplay end trigger value to VALUE.
1617 VALUE should be a buffer position (typically a marker) or nil. 1617 VALUE should be a buffer position (typically a marker) or nil.
1618 If it is a buffer position, then if redisplay in WINDOW reaches a position 1618 If it is a buffer position, then if redisplay in WINDOW reaches a position
1619 beyond VALUE, the functions in `redisplay-end-trigger-functions' are called 1619 beyond VALUE, the functions in `redisplay-end-trigger-functions' are called
5156 { 5156 {
5157 struct window_config *config = XWINDOW_CONFIGURATION (obj); 5157 struct window_config *config = XWINDOW_CONFIGURATION (obj);
5158 if (print_readably) 5158 if (print_readably)
5159 printing_unreadable_object ("#<window-configuration 0x%x>", 5159 printing_unreadable_object ("#<window-configuration 0x%x>",
5160 config->header.uid); 5160 config->header.uid);
5161 write_c_string ("#<window-configuration ", printcharfun); 5161 write_c_string (printcharfun, "#<window-configuration ");
5162 write_fmt_string (printcharfun, "0x%x>", config->header.uid); 5162 write_fmt_string (printcharfun, "0x%x>", config->header.uid);
5163 } 5163 }
5164 5164
5165 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration", 5165 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration",
5166 window_configuration, 5166 window_configuration,
6047 6047
6048 for (i = first_line; i < Dynarr_length (dla); i++) 6048 for (i = first_line; i < Dynarr_length (dla); i++)
6049 { 6049 {
6050 dl = Dynarr_atp (dla, i); 6050 dl = Dynarr_atp (dla, i);
6051 /* find the vertical location first */ 6051 /* find the vertical location first */
6052 if (point >= dl->charbpos && point <= dl->end_charbpos) 6052 if (point >= dl->charpos && point <= dl->end_charpos)
6053 { 6053 {
6054 db = get_display_block_from_line (dl, TEXT); 6054 db = get_display_block_from_line (dl, TEXT);
6055 for (i = 0; i < Dynarr_length (db->runes); i++) 6055 for (i = 0; i < Dynarr_length (db->runes); i++)
6056 { 6056 {
6057 rb = Dynarr_atp (db->runes, i); 6057 rb = Dynarr_atp (db->runes, i);
6058 if (point <= rb->charbpos) 6058 if (point <= rb->charpos)
6059 goto found_charbpos; 6059 goto found_charpos;
6060 } 6060 }
6061 return Qnil; 6061 return Qnil;
6062 } 6062 }
6063 } 6063 }
6064 return Qnil; 6064 return Qnil;
6065 found_charbpos: 6065 found_charpos:
6066 ; 6066 ;
6067 } 6067 }
6068 else 6068 else
6069 { 6069 {
6070 /* optimized case */ 6070 /* optimized case */