diff options
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/xterm.h b/src/xterm.h index a2fd4b7142b..b241ff23559 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -474,12 +474,13 @@ struct x_output GtkWidget *menubar_widget; /* The tool bar in this frame */ GtkWidget *toolbar_widget; - /* The handle box that makes the tool bar detachable. */ +#ifdef HAVE_GTK_HANDLE_BOX_NEW +/* The handle box that makes the tool bar detachable. */ GtkWidget *handlebox_widget; - /* Non-zero if the tool bar is detached. */ - int toolbar_detached; +#endif /* Non-zero if tool bar is packed into the hbox widget (i.e. vertical). */ - int toolbar_in_hbox; + bool toolbar_in_hbox; + bool toolbar_is_packed; /* The last size hints set. */ GdkGeometry size_hints; @@ -507,12 +508,6 @@ struct x_output value contains an ID of the fontset, else -1. */ int fontset; - /* Pixel values used for various purposes. - border_pixel may be -1 meaning use a gray tile. */ -#if 0 /* These are also defined in struct frame. Use that instead. */ - unsigned long background_pixel; - unsigned long foreground_pixel; -#endif unsigned long cursor_pixel; unsigned long border_pixel; unsigned long mouse_pixel; @@ -575,13 +570,13 @@ struct x_output /* Nonzero means our parent is another application's window and was explicitly specified. */ - char explicit_parent; + unsigned explicit_parent : 1; /* Nonzero means tried already to make this frame visible. */ - char asked_for_visible; + unsigned asked_for_visible : 1; /* Nonzero if this frame was ever previously visible. */ - char has_been_visible; + unsigned has_been_visible : 1; #ifdef HAVE_X_I18N /* Input context (currently, this means Compose key handler setup). */ @@ -635,7 +630,7 @@ struct x_output int top_before_move; /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame. */ - int net_wm_state_hidden_seen; + unsigned net_wm_state_hidden_seen : 1; }; #define No_Cursor (None) @@ -891,10 +886,8 @@ struct scroll_bar by this structure. */ /* For an event of kind SELECTION_REQUEST_EVENT, - this structure really describes the contents. - **Don't make this struct longer!** - If it overlaps the frame_or_window field of struct input_event, - that will cause GC to crash. */ + this structure really describes the contents. */ + struct selection_input_event { int kind; |