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

[Martin Rudalics]

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

Modified files:
        src            : ChangeLog frame.c 

Log message:
        (x_set_frame_parameters): Make sure height (width) get
        applied when fullwidth (fullheight) is set.  (Bug#1522)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7256&r2=1.7257
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.407&r2=1.408

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7256
retrieving revision 1.7257
diff -u -b -r1.7256 -r1.7257
--- ChangeLog   4 Jan 2009 20:14:13 -0000       1.7256
+++ ChangeLog   5 Jan 2009 10:29:41 -0000       1.7257
@@ -1,3 +1,8 @@
+2009-01-05  Martin Rudalics  <address@hidden>
+
+       * frame.c (x_set_frame_parameters): Make sure height (width) get
+       applied when fullwidth (fullheight) is set.  (Bug#1522)
+
 2009-01-04  Juanma Barranquero  <address@hidden>
 
        * w32.c: Use 64-bit arithmetic to do FILETIME conversions.  (Bug#1766)

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -b -r1.407 -r1.408
--- frame.c     1 Jan 2009 19:58:02 -0000       1.407
+++ frame.c     5 Jan 2009 10:29:43 -0000       1.408
@@ -2925,6 +2925,8 @@
   int left_no_change = 0, top_no_change = 0;
   int icon_left_no_change = 0, icon_top_no_change = 0;
   int fullscreen_is_being_set = 0;
+  int height_for_full_width = 0;
+  int width_for_full_height = 0;
 
   struct gcpro gcpro1, gcpro2;
 
@@ -3006,9 +3008,9 @@
       val = values[i];
 
       if (EQ (prop, Qwidth) && NATNUMP (val))
-       width = XFASTINT (val);
+       width_for_full_height = width = XFASTINT (val);
       else if (EQ (prop, Qheight) && NATNUMP (val))
-       height = XFASTINT (val);
+       height_for_full_width = height = XFASTINT (val);
       else if (EQ (prop, Qtop))
        top = val;
       else if (EQ (prop, Qleft))
@@ -3088,6 +3090,15 @@
       x_fullscreen_adjust (f, &width, &height, &new_top, &new_left);
       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))
+       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))
+       width = width_for_full_height;
     }
 
   /* Don't set these parameters unless they've been explicitly