diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-11-23 19:39:48 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-11-23 19:39:48 +0400 |
| commit | f418b22ee985bb6887c45856a1cabe2f5c726fca (patch) | |
| tree | 51417635f4321a34ffb460c8266866ec87f5a94c /src/w32term.h | |
| parent | e7d0e5ee247a155a268ffbf80bedbe25e15b5032 (diff) | |
* frame.h (struct frame): Remove display_preempted member
since all users are dead long ago.
* nsterm.h (struct x_output): Use the only dummy member.
* w32menu.c (pending_menu_activation): Remove since not
really used.
(set_frame_menubar): Adjust user.
* w32term.h (struct x_output): Drop outdated #if 0 code.
(struct w32_output): Use bitfields for explicit_parent,
asked_for_visible and menubar_active members. Drop
unused pending_menu_activation member.
* xterm.h (struct x_output): Drop outdated #if 0 code.
Use bitfields for explicit_parent, asked_for_visible,
has_been_visible and net_wm_state_hidden_seen members.
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/w32term.h b/src/w32term.h index ce709c1231..28d4ca6c49 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -251,16 +251,10 @@ extern Lisp_Object x_get_focus_frame (struct frame *); diffs between X and w32 code. */ struct x_output { -#if 0 /* These are also defined in struct frame. Use that instead. */ - PIX_TYPE background_pixel; - PIX_TYPE foreground_pixel; -#endif - /* Keep track of focus. May be EXPLICIT if we received a FocusIn for this frame, or IMPLICIT if we received an EnterNotify. FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */ int focus_state; - }; enum @@ -347,17 +341,13 @@ struct w32_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 means menubar is currently active. */ - char menubar_active; - - /* Nonzero means menubar is about to become active, but should be - brought up to date first. */ - volatile char pending_menu_activation; + unsigned menubar_active : 1; /* Relief GCs, colors etc. */ struct relief |