Re: Proposing changes to adjust_frame_size

[martin rudalics <rudalics@gmx.at>]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

 >> But thhis last ConfigureNotify event is not explicable to me, values
 >> like 789x845 are unprecedented so far.  Does your WM deliberately
 >> resize the frame?
 >
 > Yes, pretty much like Emacs splits windows into two balanced halves.  I
 > have a 1600 pixel wide screen, 3 pixels gap between WM windows, and 3
 > pixel window borders.  That makes 1579 pixels width for actual WM
 > windows, divided by two (I've had a terminal at the left and emacs at
 > the right), makes 789.5 pixels per window.

Elementary.  But why should it react so allergically to our resize
request?  Basically, we have no choice: For some "normal" WMs we have to
tell them the size we want when the frame is mapped because before that
they may ignore our resize requests and after that the frame has already
appeared with its wrong size.  For a tiling WM requesting a size when
the frame is mapped is apparently a mortal sin.

Whatever it be, I attach a patch to address this issue.  It basically
means that on a tiling WM you cannot start with an iconic frame (but
doing so should not make sense anyway).  If people still want to do
that, we probably need a customizable variable where users tell Emacs
what kind of WM they use.

martin





[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Tassilo.diff --]
[-- Type: text/x-patch; name="Tassilo.diff", Size: 2844 bytes --]

diff --git a/src/frame.h b/src/frame.h
index 744b95e1e0..75a0b184c1 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -456,7 +456,11 @@ #define EMACS_FRAME_H
   /* True when new_width or new_height were set by change_frame_size,
      false when they were set by adjust_frame_size internally or not
      set.  */
-  bool_bf new_size_p;
+  bool_bf new_size_p : 1;
+
+  /* True when frame was invisible before first MapNotify event.  Used
+     in X builds only.  */
+  bool_bf was_invisible : 1;

   /* Bitfield area ends here.  */

diff --git a/src/nsfns.m b/src/nsfns.m
index 1f281f75fd..d14f7b51ea 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1404,6 +1404,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side.
       else
         {
 	  /* Must have been Qnil.  */
+	  f->was_invisible = true;
         }
     }

diff --git a/src/w32fns.c b/src/w32fns.c
index 66baeaecbd..e5edd62abb 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6107,6 +6107,8 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,

 	  if (!NILP (visibility))
 	    w32_make_frame_visible (f);
+	  else
+	    f->was_invisible = true;
 	}

       store_frame_param (f, Qvisibility, visibility);
diff --git a/src/xfns.c b/src/xfns.c
index 782e0a483c..82ad15c52c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4140,6 +4140,8 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,

 	  if (!NILP (visibility))
 	    x_make_frame_visible (f);
+	  else
+	    f->was_invisible = true;
 	}

       store_frame_param (f, Qvisibility, visibility);
diff --git a/src/xterm.c b/src/xterm.c
index 9edaed9a34..a663a0f184 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8181,8 +8181,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #if defined USE_GTK && defined HAVE_GTK3
 	      /* If GTK3 wants to impose some old size here (Bug#24526),
 		 tell it that the current size is what we want.  */
-	      xg_frame_set_char_size
-		(f, FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
+	      if (f->was_invisible)
+		{
+		  xg_frame_set_char_size
+		    (f, FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
+		  f->was_invisible = false;
+		}
 #endif
 	      XSETFRAME (inev.ie.frame_or_window, f);
 	    }
@@ -8443,8 +8447,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #if defined USE_GTK && defined HAVE_GTK3
 	      /* If GTK3 wants to impose some old size here (Bug#24526),
 		 tell it that the current size is what we want.  */
-	      xg_frame_set_char_size
-		(f, FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
+	      if (f->was_invisible)
+		{
+		  xg_frame_set_char_size
+		    (f, FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
+		  f->was_invisible = false;
+		}
 #endif
 	      f->output_data.x->has_been_visible = true;
 	    }