diff options
| author | Dmitry Antipov | 2013-01-24 09:41:28 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-01-24 09:41:28 +0400 |
| commit | edfa7fa092c303265edeb2a0b530463cdfe63ab7 (patch) | |
| tree | 509264878099f61ea1290ca65f93401a1bdf9926 /src/window.c | |
| parent | 5ad86e34d86173f6495b38336d377de5b69da853 (diff) | |
| download | emacs-edfa7fa092c303265edeb2a0b530463cdfe63ab7.tar.gz emacs-edfa7fa092c303265edeb2a0b530463cdfe63ab7.zip | |
Drop async_visible and async_iconified fields of struct frame.
This is possible because async input is gone; for details, see
http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00734.html.
* frame.h (struct frame): Remove async_visible and async_iconified
members, convert garbaged to unsigned bitfield. Adjust comments.
(FRAME_SAMPLE_VISIBILITY): Remove. Adjust all users.
(SET_FRAME_VISIBLE, SET_FRAME_ICONIFIED): New macros.
* frame.c, gtkutil.c, term.c, w32fns.c, window.c, xdisp.c:
Consistently use SET_FRAME_VISIBLE, SET_FRAME_ICONIFIED,
FRAME_VISIBLE_P and FRAME_ICONIFIED_P macros where appropriate.
* w32term.c: Ditto.
(w32_read_socket): Save iconified state to generate DEICONIFY_EVENT
properly. Likewise for obscured.
* xterm.c: Ditto.
(handle_one_xevent): Save visible state go generate ICONIFY_EVENT
properly.
* nsterm.m: Ditto.
(windowDidDeminiaturize): Generate DEICONIFY_EVENT.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index db00bc26482..a0ebe4b4484 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -2231,7 +2231,6 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf | |||
| 2231 | } | 2231 | } |
| 2232 | else if (EQ (all_frames, Qvisible)) | 2232 | else if (EQ (all_frames, Qvisible)) |
| 2233 | { | 2233 | { |
| 2234 | FRAME_SAMPLE_VISIBILITY (f); | ||
| 2235 | candidate_p = FRAME_VISIBLE_P (f) | 2234 | candidate_p = FRAME_VISIBLE_P (f) |
| 2236 | && (FRAME_TERMINAL (XFRAME (w->frame)) | 2235 | && (FRAME_TERMINAL (XFRAME (w->frame)) |
| 2237 | == FRAME_TERMINAL (XFRAME (selected_frame))); | 2236 | == FRAME_TERMINAL (XFRAME (selected_frame))); |
| @@ -2239,7 +2238,6 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf | |||
| 2239 | } | 2238 | } |
| 2240 | else if (INTEGERP (all_frames) && XINT (all_frames) == 0) | 2239 | else if (INTEGERP (all_frames) && XINT (all_frames) == 0) |
| 2241 | { | 2240 | { |
| 2242 | FRAME_SAMPLE_VISIBILITY (f); | ||
| 2243 | candidate_p = (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f) | 2241 | candidate_p = (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f) |
| 2244 | #ifdef HAVE_X_WINDOWS | 2242 | #ifdef HAVE_X_WINDOWS |
| 2245 | /* Yuck!! If we've just created the frame and the | 2243 | /* Yuck!! If we've just created the frame and the |