[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110991: * frame.h (struct frame): Re
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110991: * frame.h (struct frame): Remove display_preempted member |
Date: |
Fri, 23 Nov 2012 19:39:48 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110991
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-23 19:39:48 +0400
message:
* 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.
modified:
src/ChangeLog
src/frame.h
src/nsterm.h
src/w32menu.c
src/w32term.h
src/xterm.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-23 08:47:34 +0000
+++ b/src/ChangeLog 2012-11-23 15:39:48 +0000
@@ -1,3 +1,19 @@
+2012-11-23 Dmitry Antipov <address@hidden>
+
+ * 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.
+
2012-11-23 Eli Zaretskii <address@hidden>
* makefile.w32-in (globals.h, gl-stamp): Use $(SWITCHCHAR) instead
=== modified file 'src/frame.h'
--- a/src/frame.h 2012-11-22 09:32:32 +0000
+++ b/src/frame.h 2012-11-23 15:39:48 +0000
@@ -357,9 +357,6 @@
unsigned int external_menu_bar : 1;
#endif
- /* Nonzero if last attempt at redisplay on this frame was preempted. */
- unsigned display_preempted : 1;
-
/* visible is nonzero if the frame is currently displayed; we check
it to see if we should bother updating the frame's contents.
DON'T SET IT DIRECTLY; instead, use FRAME_SET_VISIBLE.
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2012-10-11 16:23:37 +0000
+++ b/src/nsterm.h 2012-11-23 15:39:48 +0000
@@ -630,8 +630,7 @@
/* this dummy decl needed to support TTYs */
struct x_output
{
- unsigned long background_pixel;
- unsigned long foreground_pixel;
+ int unused;
};
=== modified file 'src/w32menu.c'
--- a/src/w32menu.c 2012-10-08 12:53:18 +0000
+++ b/src/w32menu.c 2012-11-23 15:39:48 +0000
@@ -114,17 +114,6 @@
void w32_free_menu_strings (HWND);
-
-
-/* This is set nonzero after the user activates the menu bar, and set
- to zero again after the menu bars are redisplayed by prepare_menu_bar.
- While it is nonzero, all calls to set_frame_menubar go deep.
-
- I don't understand why this is needed, but it does seem to be
- needed on Motif, according to Marcus Daniels <address@hidden>. */
-
-int pending_menu_activation;
-
#ifdef HAVE_MENUS
DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
@@ -389,8 +378,6 @@
if (! menubar_widget)
deep_p = 1;
- else if (pending_menu_activation && !deep_p)
- deep_p = 1;
if (deep_p)
{
=== modified file 'src/w32term.h'
--- a/src/w32term.h 2012-11-21 04:47:55 +0000
+++ b/src/w32term.h 2012-11-23 15:39:48 +0000
@@ -251,16 +251,10 @@
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 @@
/* 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
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2012-11-08 09:26:40 +0000
+++ b/src/xterm.h 2012-11-23 15:39:48 +0000
@@ -506,12 +506,6 @@
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;
@@ -574,13 +568,13 @@
/* 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). */
@@ -634,7 +628,7 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110991: * frame.h (struct frame): Remove display_preempted member,
Dmitry Antipov <=