comparison src/glyphs-msw.c @ 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
28 28
29 #define NEED_MSWINDOWS_COMMCTRL 29 #define NEED_MSWINDOWS_COMMCTRL
30 30
31 #include <config.h> 31 #include <config.h>
32 #include "lisp.h" 32 #include "lisp.h"
33
34 #include "device.h"
35 #include "elhash.h"
36 #include "faces.h"
37 #include "file-coding.h"
38 #include "frame.h"
39 #include "gui.h"
40 #include "imgproc.h"
41 #include "insdel.h"
33 #include "lstream.h" 42 #include "lstream.h"
43 #include "opaque.h"
44 #include "sysdep.h"
45 #include "sysfile.h"
46 #include "window.h"
34 47
35 #include "console-msw.h" 48 #include "console-msw.h"
36 #include "glyphs-msw.h" 49 #include "glyphs-msw.h"
37 #include "objects-msw.h" 50 #include "objects-msw.h"
38
39 #include "window.h"
40 #include "elhash.h"
41 #include "buffer.h"
42 #include "frame.h"
43 #include "insdel.h"
44 #include "opaque.h"
45 #include "sysdep.h"
46 #include "sysfile.h"
47 #include "faces.h"
48 #include "imgproc.h"
49 #include "file-coding.h"
50 51
51 #define WIDGET_GLYPH_SLOT 0 52 #define WIDGET_GLYPH_SLOT 0
52 53
53 DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing); 54 DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing);
54 DECLARE_IMAGE_INSTANTIATOR_FORMAT (string); 55 DECLARE_IMAGE_INSTANTIATOR_FORMAT (string);
1701 static void 1702 static void
1702 mswindows_print_image_instance (Lisp_Image_Instance *p, 1703 mswindows_print_image_instance (Lisp_Image_Instance *p,
1703 Lisp_Object printcharfun, 1704 Lisp_Object printcharfun,
1704 int escapeflag) 1705 int escapeflag)
1705 { 1706 {
1706 char buf[100];
1707
1708 switch (IMAGE_INSTANCE_TYPE (p)) 1707 switch (IMAGE_INSTANCE_TYPE (p))
1709 { 1708 {
1710 case IMAGE_MONO_PIXMAP: 1709 case IMAGE_MONO_PIXMAP:
1711 case IMAGE_COLOR_PIXMAP: 1710 case IMAGE_COLOR_PIXMAP:
1712 case IMAGE_POINTER: 1711 case IMAGE_POINTER:
1713 sprintf (buf, " (0x%lx", 1712 write_fmt_string (printcharfun, " (0x%lx",
1714 (unsigned long) IMAGE_INSTANCE_MSWINDOWS_BITMAP (p)); 1713 (unsigned long) IMAGE_INSTANCE_MSWINDOWS_BITMAP (p));
1715 write_c_string (buf, printcharfun);
1716 if (IMAGE_INSTANCE_MSWINDOWS_MASK (p)) 1714 if (IMAGE_INSTANCE_MSWINDOWS_MASK (p))
1717 { 1715 {
1718 sprintf (buf, "/0x%lx", 1716 write_fmt_string (printcharfun, "/0x%lx",
1719 (unsigned long) IMAGE_INSTANCE_MSWINDOWS_MASK (p)); 1717 (unsigned long) IMAGE_INSTANCE_MSWINDOWS_MASK (p));
1720 write_c_string (buf, printcharfun);
1721 } 1718 }
1722 write_c_string (")", printcharfun); 1719 write_c_string (")", printcharfun);
1723 break; 1720 break;
1724 1721
1725 default: 1722 default:
2858 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 2855 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
2859 2856
2860 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (ii)) 2857 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (ii))
2861 { 2858 {
2862 Lisp_Object val; 2859 Lisp_Object val;
2863 #ifdef ERROR_CHECK_GLYPHS
2864 assert (GUI_ITEMP (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii)));
2865 #endif
2866 val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii))->value; 2860 val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii))->value;
2867 #ifdef DEBUG_WIDGET_OUTPUT 2861 #ifdef DEBUG_WIDGET_OUTPUT
2868 stderr_out ("progress gauge displayed value on %p updated to %ld\n", 2862 stderr_out ("progress gauge displayed value on %p updated to %ld\n",
2869 WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii), 2863 WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii),
2870 XINT(val)); 2864 XINT(val));