comparison src/ui-gtk.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 776fcda0ee36
children 6728e641994e
comparison
equal deleted inserted replaced
799:03d9f9084848 800:a5954632b187
308 } 308 }
309 309
310 static void 310 static void
311 ffi_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) 311 ffi_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
312 { 312 {
313 char buf[200];
314
315 if (print_readably) 313 if (print_readably)
316 printing_unreadable_object ("#<ffi %p>", XFFI (obj)->function_ptr); 314 printing_unreadable_object ("#<ffi %p>", XFFI (obj)->function_ptr);
317 315
318 write_c_string ("#<ffi ", printcharfun); 316 write_fmt_string_lisp (printcharfun, "#<ffi %S", 1, XFFI (obj)->function_name);
319 print_internal (XFFI (obj)->function_name, printcharfun, 1);
320 if (XFFI (obj)->n_args) 317 if (XFFI (obj)->n_args)
321 { 318 write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args);
322 sprintf (buf, " %d arguments", XFFI (obj)->n_args); 319 write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr);
323 write_c_string (buf, printcharfun);
324 }
325 sprintf (buf, " %p>", (void *)XFFI (obj)->function_ptr);
326 write_c_string (buf, printcharfun);
327 } 320 }
328 321
329 DEFINE_LRECORD_IMPLEMENTATION ("ffi", emacs_ffi, 322 DEFINE_LRECORD_IMPLEMENTATION ("ffi", emacs_ffi,
330 mark_ffi_data, ffi_object_printer, 323 mark_ffi_data, ffi_object_printer,
331 0, 0, 0, NULL, emacs_ffi_data); 324 0, 0, 0, NULL, emacs_ffi_data);
773 766
774 /* GtkObject wrapping for Lisp */ 767 /* GtkObject wrapping for Lisp */
775 static void 768 static void
776 emacs_gtk_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) 769 emacs_gtk_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
777 { 770 {
778 char buf[200];
779
780 if (print_readably) 771 if (print_readably)
781 printing_unreadable_object ("#<GtkObject %p>", XGTK_OBJECT (obj)->object); 772 printing_unreadable_object ("#<GtkObject %p>", XGTK_OBJECT (obj)->object);
782 773
783 write_c_string ("#<GtkObject (", printcharfun); 774 write_c_string ("#<GtkObject (", printcharfun);
784 if (XGTK_OBJECT (obj)->alive_p) 775 if (XGTK_OBJECT (obj)->alive_p)
785 write_c_string (gtk_type_name (GTK_OBJECT_TYPE (XGTK_OBJECT (obj)->object)), printcharfun); 776 write_c_string (gtk_type_name (GTK_OBJECT_TYPE (XGTK_OBJECT (obj)->object)), printcharfun);
786 else 777 else
787 write_c_string ("dead", printcharfun); 778 write_c_string ("dead", printcharfun);
788 sprintf (buf, ") %p>", (void *) XGTK_OBJECT (obj)->object); 779 write_fmt_string (printcharfun, ") %p>", (void *) XGTK_OBJECT (obj)->object);
789 write_c_string (buf, printcharfun);
790 } 780 }
791 781
792 static Lisp_Object 782 static Lisp_Object
793 object_getprop (Lisp_Object obj, Lisp_Object prop) 783 object_getprop (Lisp_Object obj, Lisp_Object prop)
794 { 784 {
1084 1074
1085 /* GTK_TYPE_BOXED wrapper for Emacs lisp */ 1075 /* GTK_TYPE_BOXED wrapper for Emacs lisp */
1086 static void 1076 static void
1087 emacs_gtk_boxed_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) 1077 emacs_gtk_boxed_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
1088 { 1078 {
1089 char buf[200];
1090
1091 if (print_readably) 1079 if (print_readably)
1092 printing_unreadable_object ("#<GtkBoxed %p>", XGTK_BOXED (obj)->object); 1080 printing_unreadable_object ("#<GtkBoxed %p>", XGTK_BOXED (obj)->object);
1093 1081
1094 write_c_string ("#<GtkBoxed (", printcharfun); 1082 write_c_string ("#<GtkBoxed (", printcharfun);
1095 write_c_string (gtk_type_name (XGTK_BOXED (obj)->object_type), printcharfun); 1083 write_c_string (gtk_type_name (XGTK_BOXED (obj)->object_type), printcharfun);
1096 sprintf (buf, ") %p>", (void *) XGTK_BOXED (obj)->object); 1084 write_fmt_string (printcharfun, ") %p>", (void *) XGTK_BOXED (obj)->object);
1097 write_c_string (buf, printcharfun);
1098 } 1085 }
1099 1086
1100 static int 1087 static int
1101 emacs_gtk_boxed_equality (Lisp_Object o1, Lisp_Object o2, int depth) 1088 emacs_gtk_boxed_equality (Lisp_Object o1, Lisp_Object o2, int depth)
1102 { 1089 {