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

[Jan Djärv]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/09/15 18:49:57

Modified files:
        src            : ChangeLog frame.c xterm.c 

Log message:
        * xterm.c (x_new_font): Call change_frame_size before calling
        x_set_window_size, in case frame size won't change.
        
        * frame.c (x_set_font): Remove dead code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7746&r2=1.7747
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.425&r2=1.426
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1042&r2=1.1043

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7746
retrieving revision 1.7747
diff -u -b -r1.7746 -r1.7747
--- ChangeLog   15 Sep 2009 03:45:51 -0000      1.7746
+++ ChangeLog   15 Sep 2009 18:49:56 -0000      1.7747
@@ -1,3 +1,10 @@
+2009-09-15  Jan Djärv  <address@hidden>
+
+       * xterm.c (x_new_font): Call change_frame_size before calling
+       x_set_window_size, in case frame size won't change.
+
+       * frame.c (x_set_font): Remove dead code.
+
 2009-09-15  Stefan Monnier  <address@hidden>
 
        * lread.c (Fload): Also run do-after-load-evaluation while dumping.

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -b -r1.425 -r1.426
--- frame.c     11 Sep 2009 03:34:15 -0000      1.425
+++ frame.c     15 Sep 2009 18:49:57 -0000      1.426
@@ -3407,9 +3407,6 @@
     return;
 
   
-  lval = Fassq (Qfullscreen, f->param_alist);
-  if (CONSP (lval)) lval = CDR (lval);
-
   x_new_font (f, font_object, fontset);
   store_frame_param (f, Qfont, arg);
   /* Recalculate toolbar height.  */

Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1042
retrieving revision 1.1043
diff -u -b -r1.1042 -r1.1043
--- xterm.c     4 Sep 2009 05:33:13 -0000       1.1042
+++ xterm.c     15 Sep 2009 18:49:57 -0000      1.1043
@@ -8026,8 +8026,21 @@
         doing it because it's done in Fx_show_tip, and it leads to
         problems because the tip frame has no widget.  */
       if (NILP (tip_frame) || XFRAME (tip_frame) != f)
+        {
+          /* When the frame is maximized/fullscreen or running under for
+             example Xmonad, x_set_window_size will be a no-op.
+             In that case, the right thing to do is extend rows/cols to
+             the current frame size.  We do that first if x_set_window_size
+             turns out to not be a no-op (there is no way to know).
+             The size will be adjusted again if the frame gets a
+             ConfigureNotify event as a result of x_set_window_size.  */
+          int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f,
+                                                       FRAME_PIXEL_HEIGHT (f));
+          int cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f));
+          change_frame_size (f, rows, cols, 0, 1, 0);
        x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
     }
+    }
 
 #ifdef HAVE_X_I18N
   if (FRAME_XIC (f)