Improve toggling fullscreen state of frames.

* frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
Rename frame parameter `maximized' to `fullscreen-restore'.
Restore fullwidth/-height after fullboth state.  Update
doc-strings.
* w32term.c (w32_read_socket): In SIZE_MAXIMIZED and
SIZE_RESTORED cases correctly handle `maximized' value for the
`fullscreen' parameter.  Don't use the 'maximized' parameter any
more.
(w32fullscreen_hook): Include menu bar height when calculating
new text height in FULLSCREEN_BOTH case.
* xterm.c (do_ewmh_fullscreen): Handle transition from
FULLSCREEN_BOTH to FULLSCREEN_MAXIMIZED when
x_frame_normalize_before_maximize is set.
* frames.texi (Size Parameters): Update description of
fullscreen frame parameter.

3 files changed, 42 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4abdc59045..f8e65d5d91d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2015-02-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * w32term.c (w32_read_socket): In SIZE_MAXIMIZED and
+        SIZE_RESTORED cases correctly handle `maximized' value for the
+        `fullscreen' parameter.  Don't use 'maximized' frame parameter
+        any more.
+        (w32fullscreen_hook): Include menu bar height when calculating
+        new text height in FULLSCREEN_BOTH case.
+        * xterm.c (do_ewmh_fullscreen): Handle transition from
+        FULLSCREEN_BOTH to FULLSCREEN_MAXIMIZED when
+        x_frame_normalize_before_maximize is set.
+
 2015-02-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for boolean in xdisp.c
diff --git a/src/w32term.c b/src/w32term.c
index fb9d2388d6b..a9ed2a852da 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5052,6 +5052,7 @@ w32_read_socket (struct terminal *terminal,
                 case SIZE_MAXIMIZED:
                   {
                     bool iconified = FRAME_ICONIFIED_P (f);
+                    Lisp_Object fullscreen = get_frame_param (f, Qfullscreen);
 
                     SET_FRAME_VISIBLE (f, 1);
                     SET_FRAME_ICONIFIED (f, false);
@@ -5082,12 +5083,22 @@ w32_read_socket (struct terminal *terminal,
                          to update the frame titles
                          in case this is the second frame.  */
                       record_asynch_buffer_change ();
-                  }
 
-                  if (EQ (get_frame_param (f, Qfullscreen), Qnil))
-                    set_frame_param (f, Qfullscreen, Qmaximized);
-                  else if (! EQ (get_frame_param (f, Qfullscreen), Qmaximized))
-                    set_frame_param (f, Qmaximized, Qmaximized);
+                  /* Windows can send us a SIZE_MAXIMIZED message even
+                     when fullscreen is fullboth.  The following is a
+                     simple hack to check that based on the fact that
+                     only a maximized fullscreen frame should have both
+                     top/left outside the screen.  */
+                  if (EQ (fullscreen, Qfullwidth) || EQ (fullscreen, Qfullheight)
+                      || NILP (fullscreen))
+                      {
+                        int x, y;
+
+                        x_real_positions (f, &x, &y);
+                        if (x < 0 && y < 0)
+                          store_frame_param (f, Qfullscreen, Qmaximized);
+                      }
+                  }
 
                   break;
 
@@ -5128,9 +5139,7 @@ w32_read_socket (struct terminal *terminal,
                   }
 
                   if (EQ (get_frame_param (f, Qfullscreen), Qmaximized))
-                    set_frame_param (f, Qfullscreen, Qnil);
-                  else if (! EQ (get_frame_param (f, Qmaximized), Qnil))
-                    set_frame_param (f, Qmaximized, Qnil);
+                    store_frame_param (f, Qfullscreen, Qnil);
 
                   break;
                 }
@@ -6008,6 +6017,8 @@ w32fullscreen_hook (struct frame *f)
         }
       else if (f->want_fullscreen == FULLSCREEN_BOTH)
         {
+          int menu_bar_height = GetSystemMetrics (SM_CYMENU);
+
           w32_fullscreen_rect (hwnd, f->want_fullscreen,
                                FRAME_NORMAL_PLACEMENT (f).rcNormalPosition, &rect);
           SetWindowLong (hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW);
@@ -6016,7 +6027,8 @@ w32fullscreen_hook (struct frame *f)
                         SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
           change_frame_size
             (f, FRAME_PIXEL_TO_TEXT_WIDTH (f, rect.right - rect.left),
-             FRAME_PIXEL_TO_TEXT_HEIGHT (f, rect.bottom - rect.top),
+             FRAME_PIXEL_TO_TEXT_HEIGHT (f, (rect.bottom - rect.top
+                                             - menu_bar_height)),
              0, 1, 0, 1);
         }
       else
diff --git a/src/xterm.c b/src/xterm.c
index 6a63a454bac..0b3efe7b4b6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9271,7 +9271,15 @@ do_ewmh_fullscreen (struct frame *f)
             }
           break;
         case FULLSCREEN_MAXIMIZED:
-          if (x_frame_normalize_before_maximize && cur == FULLSCREEN_WIDTH)
+          if (x_frame_normalize_before_maximize && cur == FULLSCREEN_BOTH)
+            {
+              set_wm_state (frame, false,
+                            dpyinfo->Xatom_net_wm_state_fullscreen, None);
+              set_wm_state (frame, true,
+                            dpyinfo->Xatom_net_wm_state_maximized_horz,
+                            dpyinfo->Xatom_net_wm_state_maximized_vert);
+            }
+          else if (x_frame_normalize_before_maximize && cur == FULLSCREEN_WIDTH)
             {
               set_wm_state (frame, false,
                             dpyinfo->Xatom_net_wm_state_maximized_horz, None);