comparison src/glyphs.h @ 800:a5954632b187

[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 6728e641994e
comparison
equal deleted inserted replaced
799:03d9f9084848 800:a5954632b187
1 /* Generic glyph data structures + display tables 1 /* Generic glyph data structures + display tables
2 Copyright (C) 1994 Board of Trustees, University of Illinois. 2 Copyright (C) 1994 Board of Trustees, University of Illinois.
3 Copyright (C) 1995, 1996 Ben Wing 3 Copyright (C) 1995, 1996 Ben Wing
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
23 23
24 #ifndef INCLUDED_glyphs_h_ 24 #ifndef INCLUDED_glyphs_h_
25 #define INCLUDED_glyphs_h_ 25 #define INCLUDED_glyphs_h_
26 26
27 #include "specifier.h" 27 #include "specifier.h"
28 #include "gui.h" 28 #include "window.h" /* need for GLYPH_CACHEL_WIDTH */
29 29
30 /************************************************************************/ 30 /************************************************************************/
31 /* Image Instantiators */ 31 /* Image Instantiators */
32 /************************************************************************/ 32 /************************************************************************/
33 33
1057 #define OCT_ESC_GLYPH_INDEX (glyph_index) 4 1057 #define OCT_ESC_GLYPH_INDEX (glyph_index) 4
1058 #define INVIS_GLYPH_INDEX (glyph_index) 5 1058 #define INVIS_GLYPH_INDEX (glyph_index) 5
1059 1059
1060 #ifdef ERROR_CHECK_GLYPHS 1060 #ifdef ERROR_CHECK_GLYPHS
1061 1061
1062 #include "window.h"
1063
1064 INLINE_HEADER int 1062 INLINE_HEADER int
1065 GLYPH_CACHEL_WIDTH (struct window *window, int ind); 1063 GLYPH_CACHEL_WIDTH (struct window *window, int ind);
1066 INLINE_HEADER int 1064 INLINE_HEADER int
1067 GLYPH_CACHEL_WIDTH (struct window *window, int ind) 1065 GLYPH_CACHEL_WIDTH (struct window *window, int ind)
1068 { 1066 {
1089 return wid; 1087 return wid;
1090 } 1088 }
1091 1089
1092 #else /* not ERROR_CHECK_GLYPHS */ 1090 #else /* not ERROR_CHECK_GLYPHS */
1093 1091
1094 #define GLYPH_CACHEL_WIDTH(window, ind) \ 1092 #define GLYPH_CACHEL_WIDTH(window, ind) \
1095 Dynarr_atp (window->glyph_cachels, ind)->width 1093 Dynarr_atp (window->glyph_cachels, ind)->width
1096 #define GLYPH_CACHEL_ASCENT(window, ind) \ 1094 #define GLYPH_CACHEL_ASCENT(window, ind) \
1097 Dynarr_atp (window->glyph_cachels, ind)->ascent 1095 Dynarr_atp (window->glyph_cachels, ind)->ascent
1098 #define GLYPH_CACHEL_DESCENT(window, ind) \ 1096 #define GLYPH_CACHEL_DESCENT(window, ind) \
1099 Dynarr_atp (window->glyph_cachels, ind)->descent 1097 Dynarr_atp (window->glyph_cachels, ind)->descent
1100 1098
1101 #endif /* not ERROR_CHECK_GLYPHS */ 1099 #endif /* not ERROR_CHECK_GLYPHS */
1102 1100
1103 #define GLYPH_CACHEL(window, ind) \ 1101 #define GLYPH_CACHEL(window, ind) \
1104 Dynarr_atp (window->glyph_cachels, ind) 1102 Dynarr_atp (window->glyph_cachels, ind)
1105 #define GLYPH_CACHEL_GLYPH(window, ind) \ 1103 #define GLYPH_CACHEL_GLYPH(window, ind) \
1106 Dynarr_atp (window->glyph_cachels, ind)->glyph 1104 Dynarr_atp (window->glyph_cachels, ind)->glyph
1107 #define GLYPH_CACHEL_DIRTYP(window, ind) \ 1105 #define GLYPH_CACHEL_DIRTYP(window, ind) \
1108 Dynarr_atp (window->glyph_cachels, ind)->dirty 1106 Dynarr_atp (window->glyph_cachels, ind)->dirty
1109 1107
1110 void mark_glyph_cachels (glyph_cachel_dynarr *elements); 1108 void mark_glyph_cachels (glyph_cachel_dynarr *elements);