comparison src/glyphs.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 2b676dc88c66
children 2b6fa2618f76
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
644 /* This function can GC */ 644 /* This function can GC */
645 /* value can be nil; we cache failures as well as successes */ 645 /* value can be nil; we cache failures as well as successes */
646 if (!NILP (value)) 646 if (!NILP (value))
647 { 647 {
648 Lisp_Object window; 648 Lisp_Object window;
649 VOID_TO_LISP (window, flag_closure); 649 window = VOID_TO_LISP (flag_closure);
650 assert (EQ (XIMAGE_INSTANCE_DOMAIN (value), window)); 650 assert (EQ (XIMAGE_INSTANCE_DOMAIN (value), window));
651 } 651 }
652 652
653 return 0; 653 return 0;
654 } 654 }
946 IMAGE_INSTANCE_PIXMAP_WIDTH (ii), 946 IMAGE_INSTANCE_PIXMAP_WIDTH (ii),
947 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii)); 947 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii));
948 if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) || 948 if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) ||
949 !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))) 949 !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)))
950 { 950 {
951 write_c_string (" @", printcharfun); 951 write_c_string (printcharfun, " @");
952 if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii))) 952 if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)))
953 write_fmt_string (printcharfun, "%ld", 953 write_fmt_string (printcharfun, "%ld",
954 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii))); 954 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)));
955 else 955 else
956 write_c_string ("??", printcharfun); 956 write_c_string (printcharfun, "??");
957 write_c_string (",", printcharfun); 957 write_c_string (printcharfun, ",");
958 if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))) 958 if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)))
959 write_fmt_string (printcharfun, "%ld", 959 write_fmt_string (printcharfun, "%ld",
960 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))); 960 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)));
961 else 961 else
962 write_c_string ("??", printcharfun); 962 write_c_string (printcharfun, "??");
963 } 963 }
964 if (!NILP (IMAGE_INSTANCE_PIXMAP_FG (ii)) || 964 if (!NILP (IMAGE_INSTANCE_PIXMAP_FG (ii)) ||
965 !NILP (IMAGE_INSTANCE_PIXMAP_BG (ii))) 965 !NILP (IMAGE_INSTANCE_PIXMAP_BG (ii)))
966 { 966 {
967 write_c_string (" (", printcharfun); 967 write_c_string (printcharfun, " (");
968 if (!NILP (IMAGE_INSTANCE_PIXMAP_FG (ii))) 968 if (!NILP (IMAGE_INSTANCE_PIXMAP_FG (ii)))
969 { 969 {
970 print_internal 970 print_internal
971 (XCOLOR_INSTANCE 971 (XCOLOR_INSTANCE
972 (IMAGE_INSTANCE_PIXMAP_FG (ii))->name, printcharfun, 0); 972 (IMAGE_INSTANCE_PIXMAP_FG (ii))->name, printcharfun, 0);
973 } 973 }
974 write_c_string ("/", printcharfun); 974 write_c_string (printcharfun, "/");
975 if (!NILP (IMAGE_INSTANCE_PIXMAP_BG (ii))) 975 if (!NILP (IMAGE_INSTANCE_PIXMAP_BG (ii)))
976 { 976 {
977 print_internal 977 print_internal
978 (XCOLOR_INSTANCE 978 (XCOLOR_INSTANCE
979 (IMAGE_INSTANCE_PIXMAP_BG (ii))->name, printcharfun, 0); 979 (IMAGE_INSTANCE_PIXMAP_BG (ii))->name, printcharfun, 0);
980 } 980 }
981 write_c_string (")", printcharfun); 981 write_c_string (printcharfun, ")");
982 } 982 }
983 break; 983 break;
984 984
985 case IMAGE_WIDGET: 985 case IMAGE_WIDGET:
986 print_internal (IMAGE_INSTANCE_WIDGET_TYPE (ii), printcharfun, 0); 986 print_internal (IMAGE_INSTANCE_WIDGET_TYPE (ii), printcharfun, 0);
1000 1000
1001 /* This is stolen from frame.c. Subwindows are strange in that they 1001 /* This is stolen from frame.c. Subwindows are strange in that they
1002 are specific to a particular frame so we want to print in their 1002 are specific to a particular frame so we want to print in their
1003 description what that frame is. */ 1003 description what that frame is. */
1004 1004
1005 write_c_string (" on #<", printcharfun); 1005 write_c_string (printcharfun, " on #<");
1006 { 1006 {
1007 struct frame* f = XFRAME (IMAGE_INSTANCE_FRAME (ii)); 1007 struct frame* f = XFRAME (IMAGE_INSTANCE_FRAME (ii));
1008 1008
1009 if (!FRAME_LIVE_P (f)) 1009 if (!FRAME_LIVE_P (f))
1010 write_c_string ("dead", printcharfun); 1010 write_c_string (printcharfun, "dead");
1011 else 1011 else
1012 write_c_string (DEVICE_TYPE_NAME (XDEVICE (FRAME_DEVICE (f))), 1012 write_c_string (printcharfun,
1013 printcharfun); 1013 DEVICE_TYPE_NAME (XDEVICE (FRAME_DEVICE (f))));
1014 } 1014 }
1015 write_c_string ("-frame>", printcharfun); 1015 write_c_string (printcharfun, "-frame>");
1016 write_fmt_string (printcharfun, " 0x%p", 1016 write_fmt_string (printcharfun, " 0x%p",
1017 IMAGE_INSTANCE_SUBWINDOW_ID (ii)); 1017 IMAGE_INSTANCE_SUBWINDOW_ID (ii));
1018 1018
1019 break; 1019 break;
1020 1020
2343 for (i = 0; i < NUM_LEADING_BYTES; i++) 2343 for (i = 0; i < NUM_LEADING_BYTES; i++)
2344 { 2344 {
2345 if (charsets[i]) 2345 if (charsets[i])
2346 { 2346 {
2347 return FACE_CACHEL_FONT (cachel, 2347 return FACE_CACHEL_FONT (cachel,
2348 CHARSET_BY_LEADING_BYTE (i + 2348 charset_by_leading_byte (i +
2349 MIN_LEADING_BYTE)); 2349 MIN_LEADING_BYTE));
2350 2350
2351 } 2351 }
2352 } 2352 }
2353 2353
2536 invalid_argument ("Width must be a natural number", width); 2536 invalid_argument ("Width must be a natural number", width);
2537 2537
2538 if (!NATNUMP (height)) 2538 if (!NATNUMP (height))
2539 invalid_argument ("Height must be a natural number", height); 2539 invalid_argument ("Height must be a natural number", height);
2540 2540
2541 if (((XINT (width) * XINT (height)) / 8) > XSTRING_CHAR_LENGTH (bits)) 2541 if (((XINT (width) * XINT (height)) / 8) > string_char_length (bits))
2542 invalid_argument ("data is too short for width and height", 2542 invalid_argument ("data is too short for width and height",
2543 vector3 (width, height, bits)); 2543 vector3 (width, height, bits));
2544 } 2544 }
2545 2545
2546 /* Validate method for XBM's. */ 2546 /* Validate method for XBM's. */
4869 continue; 4869 continue;
4870 } 4870 }
4871 else if (CHAR_TABLEP (table) 4871 else if (CHAR_TABLEP (table)
4872 && XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_CHAR) 4872 && XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_CHAR)
4873 { 4873 {
4874 return get_char_table (ch, XCHAR_TABLE (table)); 4874 return get_char_table (ch, table);
4875 } 4875 }
4876 else if (CHAR_TABLEP (table) 4876 else if (CHAR_TABLEP (table)
4877 && XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_GENERIC) 4877 && XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_GENERIC)
4878 { 4878 {
4879 Lisp_Object gotit = get_char_table (ch, XCHAR_TABLE (table)); 4879 Lisp_Object gotit = get_char_table (ch, table);
4880 if (!NILP (gotit)) 4880 if (!NILP (gotit))
4881 return gotit; 4881 return gotit;
4882 else 4882 else
4883 continue; 4883 continue;
4884 } 4884 }