[Emacs-diffs] emacs/src ChangeLog frame.c

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       09/01/09 07:44:01

Modified files:
        src            : ChangeLog frame.c 

Log message:
        (x_set_frame_parameters): Remember requested value for
        fullscreen before it's reset by the parameter handler.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7265&r2=1.7266
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.408&r2=1.409

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7265
retrieving revision 1.7266
diff -u -b -r1.7265 -r1.7266
--- ChangeLog   9 Jan 2009 03:30:02 -0000       1.7265
+++ ChangeLog   9 Jan 2009 07:44:00 -0000       1.7266
@@ -1,3 +1,8 @@
+2009-01-09  Martin Rudalics  <address@hidden>
+
+       * frame.c (x_set_frame_parameters): Remember requested value for
+       fullscreen before it's reset by the parameter handler.
+
 2009-01-09  Glenn Morris  <address@hidden>
 
        * keyboard.c (last_command_char): For clarity, rename to...

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -b -r1.408 -r1.409
--- frame.c     5 Jan 2009 10:29:43 -0000       1.408
+++ frame.c     9 Jan 2009 07:44:01 -0000       1.409
@@ -2927,6 +2927,7 @@
   int fullscreen_is_being_set = 0;
   int height_for_full_width = 0;
   int width_for_full_height = 0;
+  enum fullscreen_type fullscreen_wanted = FULLSCREEN_NONE;
 
   struct gcpro gcpro1, gcpro2;
 
@@ -2969,7 +2970,7 @@
      They are independent of other properties, but other properties (e.g.,
      cursor_color) are dependent upon them.  */
   /* Process default font as well, since fringe widths depends on it.  */
-  /* Also, process fullscreen, width and height depend upon that */
+  /* Also, process fullscreen, width and height depend upon that.  */
   for (p = 0; p < i; p++)
     {
       Lisp_Object prop, val;
@@ -2983,6 +2984,19 @@
        {
          register Lisp_Object param_index, old_value;
 
+         if (EQ (prop, Qfullscreen))
+           {
+             /* The parameter handler can reset f->want_fullscreen to
+                FULLSCREEN_NONE.  But we need the requested value later
+                to decide whether a height or width parameter shall be
+                applied.  Therefore, we remember the requested value in
+                fullscreen_wanted for the following two cases.  */ 
+             if (EQ (val, Qfullheight))
+               fullscreen_wanted = FULLSCREEN_HEIGHT;
+             else if (EQ (val, Qfullwidth))
+               fullscreen_wanted = FULLSCREEN_WIDTH;
+           }
+
          old_value = get_frame_param (f, prop);
          fullscreen_is_being_set |= EQ (prop, Qfullscreen);
          if (NILP (Fequal (val, old_value)))
@@ -3091,13 +3105,13 @@
       if (new_top != f->top_pos || new_left != f->left_pos)
         x_set_offset (f, new_left, new_top, 1);
 
-      /* When height was set and we want fullwidth make sure
-        height gets applied.  */
-      if (height_for_full_width && (f->want_fullscreen & FULLSCREEN_WIDTH))
+      /* When both height and fullwidth were requested, make sure the
+        requested value for height gets applied.  */
+      if (height_for_full_width && fullscreen_wanted == FULLSCREEN_WIDTH)
        height = height_for_full_width;
-      /* When width was set and we want fullheight make sure
-        width gets applied.  */
-      if (width_for_full_height && (f->want_fullscreen & FULLSCREEN_HEIGHT))
+      /* When both width and fullheight were requested, make sure the
+        requested value for width gets applied.  */
+      if (width_for_full_height && fullscreen_wanted == FULLSCREEN_HEIGHT)
        width = width_for_full_height;
     }