Re: Proposing changes to adjust_frame_size

[martin rudalics <rudalics@gmx.at>]

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

 >> please try the attached patch and tell me whether it helps.
 >
 > When I apply the patch to an unmodified xterm.c, emacs -Q has a menubar
 > but no toolbar, and the complete UI except for the menubar is just black
 > screen with no text, no modeline, no nothing!  Even resizing or typing
 > won't make anything appear.  The menubar works, though.  I can expand it
 > and press entries, and it seems it reacts to that.
 >
 > When I apply your patch and also remove the second ifdef, that doesn't
 > change.  Just a menubar with blackness on the rest of the frame.

Thanks.  That was a misguided attempt that didn't work here either.
Please try the patch I attach now, it at least doesn't break anything
here.  If this still doesn't get us anywhere, I'd like to look into your
frame size history and will tell you how to set that up.

martin

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

diff --git a/src/xterm.c b/src/xterm.c
index 9edaed9a34..153089c1dc 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8438,14 +8438,16 @@ handle_one_xevent (struct x_display_info *dpyinfo,

 	  if (not_hidden)
 	    {
-	      SET_FRAME_VISIBLE (f, 1);
-	      SET_FRAME_ICONIFIED (f, false);
 #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 (!FRAME_VISIBLE_P (f) || iconified)
+		xg_frame_set_char_size
+		  (f, FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
 #endif
+	      SET_FRAME_VISIBLE (f, 1);
+	      SET_FRAME_ICONIFIED (f, false);
+
 	      f->output_data.x->has_been_visible = true;
 	    }