Mercurial > hg > xemacs-beta
comparison src/glyphs-x.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 |
---|---|
51 | 51 |
52 /* Mule-ized last 6-22-00 */ | 52 /* Mule-ized last 6-22-00 */ |
53 | 53 |
54 #include <config.h> | 54 #include <config.h> |
55 #include "lisp.h" | 55 #include "lisp.h" |
56 | |
57 #include "buffer.h" | |
58 #include "device.h" | |
59 #include "faces.h" | |
60 #include "file-coding.h" | |
61 #include "frame.h" | |
62 #include "gui.h" | |
63 #include "imgproc.h" | |
64 #include "insdel.h" | |
56 #include "lstream.h" | 65 #include "lstream.h" |
66 #include "opaque.h" | |
67 #include "window.h" | |
68 | |
57 #include "console-x.h" | 69 #include "console-x.h" |
58 #include "glyphs-x.h" | 70 #include "glyphs-x.h" |
59 #include "objects-x.h" | 71 #include "objects-x.h" |
60 #ifdef HAVE_X_WIDGETS | 72 #ifdef HAVE_X_WIDGETS |
61 #include "gui-x.h" | 73 #include "gui-x.h" |
62 #endif | 74 #endif |
63 #include "xmu.h" | 75 #include "xmu.h" |
64 | 76 |
65 #include "buffer.h" | |
66 #include "window.h" | |
67 #include "frame.h" | |
68 #include "insdel.h" | |
69 #include "opaque.h" | |
70 #include "gui.h" | |
71 #include "faces.h" | |
72 | |
73 #include "imgproc.h" | |
74 | |
75 #include "sysfile.h" | 77 #include "sysfile.h" |
76 #include "sysproc.h" /* for qxe_getpid() */ | 78 #include "sysproc.h" /* for qxe_getpid() */ |
77 | 79 |
78 #include <setjmp.h> | 80 #include <setjmp.h> |
79 | |
80 #include "file-coding.h" | |
81 | 81 |
82 #ifdef LWLIB_WIDGETS_MOTIF | 82 #ifdef LWLIB_WIDGETS_MOTIF |
83 #include <Xm/Xm.h> | 83 #include <Xm/Xm.h> |
84 #include <Xm/Scale.h> | 84 #include <Xm/Scale.h> |
85 #endif | 85 #endif |
367 static void | 367 static void |
368 x_print_image_instance (Lisp_Image_Instance *p, | 368 x_print_image_instance (Lisp_Image_Instance *p, |
369 Lisp_Object printcharfun, | 369 Lisp_Object printcharfun, |
370 int escapeflag) | 370 int escapeflag) |
371 { | 371 { |
372 char buf[100]; | |
373 | |
374 switch (IMAGE_INSTANCE_TYPE (p)) | 372 switch (IMAGE_INSTANCE_TYPE (p)) |
375 { | 373 { |
376 case IMAGE_MONO_PIXMAP: | 374 case IMAGE_MONO_PIXMAP: |
377 case IMAGE_COLOR_PIXMAP: | 375 case IMAGE_COLOR_PIXMAP: |
378 case IMAGE_POINTER: | 376 case IMAGE_POINTER: |
379 sprintf (buf, " (0x%lx", (unsigned long) IMAGE_INSTANCE_X_PIXMAP (p)); | 377 write_fmt_string (printcharfun, " (0x%lx", |
380 write_c_string (buf, printcharfun); | 378 (unsigned long) IMAGE_INSTANCE_X_PIXMAP (p)); |
381 if (IMAGE_INSTANCE_X_MASK (p)) | 379 if (IMAGE_INSTANCE_X_MASK (p)) |
382 { | 380 { |
383 sprintf (buf, "/0x%lx", (unsigned long) IMAGE_INSTANCE_X_MASK (p)); | 381 write_fmt_string (printcharfun, "/0x%lx", |
384 write_c_string (buf, printcharfun); | 382 (unsigned long) IMAGE_INSTANCE_X_MASK (p)); |
385 } | 383 } |
386 write_c_string (")", printcharfun); | 384 write_c_string (")", printcharfun); |
387 break; | 385 break; |
388 default: | 386 default: |
389 break; | 387 break; |
2592 | 2590 |
2593 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p)) | 2591 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p)) |
2594 { | 2592 { |
2595 Arg al [1]; | 2593 Arg al [1]; |
2596 Lisp_Object val; | 2594 Lisp_Object val; |
2597 #ifdef ERROR_CHECK_GLYPHS | |
2598 assert (GUI_ITEMP (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p))); | |
2599 #endif | |
2600 val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p))->value; | 2595 val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p))->value; |
2601 XtSetArg (al[0], XtNvalue, XINT (val)); | 2596 XtSetArg (al[0], XtNvalue, XINT (val)); |
2602 XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (p), al, 1); | 2597 XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (p), al, 1); |
2603 } | 2598 } |
2604 } | 2599 } |