comparison src/frame-x.c @ 1346:01c57eb70ae9

[xemacs-hg @ 2003-03-09 02:27:27 by ben] To: xemacs-patches@xemacs.org i.c: Sleep between calls to check for I/O, since these calls are non-blocking. behavior.el: Allow other keywords for forward compatibility. cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used without `finally'. cmdloop.el: Avoid truncated error messages for `end-of-file' and the like. cmdloop.el: Avoid char-int error after syncing. files.el: Eliminate byte-compile warnings. printer.el: Fix line-width calculations. #### This used to work. Someone's changes (perhaps by Michael Sperber?) seem to have messed something up. simple.el: Use new clear-left-side functions to avoid messages ending up on the same line as other output. xemacs.mak: Add override for info/ as well when separate source/build dirs. xemacs.mak: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. Makefile.in.in: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it messes up separate build/source dirs. console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions. print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr output from separate sources on separate lines. Generalize the different kinds of debugging output. Add dpa(). profile.c: Add better docs on Unix/Windows differences. regex.c: Fix problems with rel-alloc compilation caused by previous patch. emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap aborts properly. console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames, since its usage is frame-specific. Delete menubar-msw.h, gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data GCPRO'ing and add missing GCPRO recomputation in widget code.
author ben
date Sun, 09 Mar 2003 02:27:46 +0000
parents b531bf8658e9
children a8d8f419b459
comparison
equal deleted inserted replaced
1345:3b27da507d56 1346:01c57eb70ae9
68 Lisp_Object Vdefault_x_frame_plist; 68 Lisp_Object Vdefault_x_frame_plist;
69 69
70 Lisp_Object Qx_resource_name; 70 Lisp_Object Qx_resource_name;
71 71
72 static const struct memory_description x_frame_data_description_1 [] = { 72 static const struct memory_description x_frame_data_description_1 [] = {
73 { XD_LISP_OBJECT, offsetof (struct x_frame, last_menubar_buffer) },
73 { XD_LISP_OBJECT, offsetof (struct x_frame, icon_pixmap) }, 74 { XD_LISP_OBJECT, offsetof (struct x_frame, icon_pixmap) },
74 { XD_LISP_OBJECT, offsetof (struct x_frame, icon_pixmap_mask) }, 75 { XD_LISP_OBJECT, offsetof (struct x_frame, icon_pixmap_mask) },
75 { XD_END } 76 { XD_END }
76 }; 77 };
77 78
2117 { 2118 {
2118 /* zero out all slots. */ 2119 /* zero out all slots. */
2119 f->frame_data = xnew_and_zero (struct x_frame); 2120 f->frame_data = xnew_and_zero (struct x_frame);
2120 2121
2121 /* yeah, except the lisp ones */ 2122 /* yeah, except the lisp ones */
2123 FRAME_X_LAST_MENUBAR_BUFFER (f) = Qnil;
2122 FRAME_X_ICON_PIXMAP (f) = Qnil; 2124 FRAME_X_ICON_PIXMAP (f) = Qnil;
2123 FRAME_X_ICON_PIXMAP_MASK (f) = Qnil; 2125 FRAME_X_ICON_PIXMAP_MASK (f) = Qnil;
2124 } 2126 }
2125 2127
2126 2128
2192 } 2194 }
2193 2195
2194 static void 2196 static void
2195 x_mark_frame (struct frame *f) 2197 x_mark_frame (struct frame *f)
2196 { 2198 {
2199 mark_object (FRAME_X_LAST_MENUBAR_BUFFER (f));
2197 mark_object (FRAME_X_ICON_PIXMAP (f)); 2200 mark_object (FRAME_X_ICON_PIXMAP (f));
2198 mark_object (FRAME_X_ICON_PIXMAP_MASK (f)); 2201 mark_object (FRAME_X_ICON_PIXMAP_MASK (f));
2199 } 2202 }
2200 2203
2201 static void 2204 static void