comparison src/console-x-impl.h @ 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 79c6ff3eef26
children ecf1ebac70d8
comparison
equal deleted inserted replaced
1345:3b27da507d56 1346:01c57eb70ae9
1 /* Define X specific console, device, and frame object for XEmacs. 1 /* Define X specific console, device, and frame object for XEmacs.
2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1996, 2002 Ben Wing. 4 Copyright (C) 1996, 2002, 2003 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
243 /* Lists the widgets above the text area, in the proper order. 243 /* Lists the widgets above the text area, in the proper order.
244 Used by the EmacsManager. */ 244 Used by the EmacsManager. */
245 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; 245 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS];
246 int num_top_widgets; 246 int num_top_widgets;
247 247
248 /*************************** Miscellaneous **************************/ 248 /* lwlib ID of the tree of widgets corresponding to this popup. We pass
249 this to lw_map_widget_values() to retrieve all of our Lispy call-data
250 and accel values that need to be GCPRO'd, and store them in the
251 following list. (We used to call lw_map_widget_values() during GC
252 mark, but that isn't compatible with KKCC.) */
253 LWLIB_ID menubar_id;
254
255 /* For the frame popup data, this is the last buffer for which the
256 menubar was displayed. If the buffer has changed, we may have to
257 update things. */
258 Lisp_Object last_menubar_buffer;
259
260 /* This flag tells us if the menubar contents are up-to-date with respect
261 to the current menubar structure. If we want to actually pull down a
262 menu and this is false, then we need to update things. */
263 char menubar_contents_up_to_date;
249 264
250 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */ 265 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */
251 Lisp_Object icon_pixmap; 266 Lisp_Object icon_pixmap;
252 Lisp_Object icon_pixmap_mask; 267 Lisp_Object icon_pixmap_mask;
253 268
303 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget) 318 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget)
304 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget) 319 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget)
305 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets) 320 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets)
306 #define FRAME_X_NUM_TOP_WIDGETS(f) (FRAME_X_DATA (f)->num_top_widgets) 321 #define FRAME_X_NUM_TOP_WIDGETS(f) (FRAME_X_DATA (f)->num_top_widgets)
307 322
323 #define FRAME_X_MENUBAR_ID(f) (FRAME_X_DATA (f)->menubar_id)
324 #define FRAME_X_LAST_MENUBAR_BUFFER(f) (FRAME_X_DATA (f)->last_menubar_buffer)
325 #define FRAME_X_MENUBAR_CONTENTS_UP_TO_DATE(f) \
326 (FRAME_X_DATA (f)->menubar_contents_up_to_date)
327
308 #define FRAME_X_ICON_PIXMAP(f) (FRAME_X_DATA (f)->icon_pixmap) 328 #define FRAME_X_ICON_PIXMAP(f) (FRAME_X_DATA (f)->icon_pixmap)
309 #define FRAME_X_ICON_PIXMAP_MASK(f) (FRAME_X_DATA (f)->icon_pixmap_mask) 329 #define FRAME_X_ICON_PIXMAP_MASK(f) (FRAME_X_DATA (f)->icon_pixmap_mask)
310 330
311 #ifdef HAVE_TOOLBARS 331 #ifdef HAVE_TOOLBARS
312 #define FRAME_X_OLD_TOOLBAR_SIZE(f, pos) (FRAME_X_DATA (f)->old_toolbar_size[pos]) 332 #define FRAME_X_OLD_TOOLBAR_SIZE(f, pos) (FRAME_X_DATA (f)->old_toolbar_size[pos])