From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: Proposing changes to adjust_frame_size Date: Mon, 10 May 2021 14:27:52 +0200 Message-ID: <36f3b7b6-b81c-2e89-99c8-0a8837ef7869@gmx.at> References: <69a5e928-2998-f776-fa0d-f35e6ab1e65d@gmx.at> <20210505.230733.1330791046879877132.masm@luna.pink.masm11.me> <87a6p9knr9.fsf@gnu.org> <9712b3f0-c442-61fc-93a6-773ffcde1c2e@gmx.at> <87y2cswam6.fsf@gnu.org> <1b11ac72-6687-f2d4-1d9f-0619d6d2462c@gmx.at> <87v97ww8h4.fsf@gnu.org> <87eaa667-b3cd-0274-669c-3cb4e0076ce0@gmx.at> <87sg30vy7w.fsf@gnu.org> <87pmy3x620.fsf@gnu.org> <52a5361a-451e-7167-edfd-09066dfdcc3e@gmx.at> <875yzt907k.fsf@gnu.org> <0633b8ac-de8e-b57a-f3f4-804c5efb009a@gmx.at> <874kfdtj5l.fsf@gnu.org> <37f3ce19-d858-111e-a5aa-06c24803e17b@gmx.at> <87v97tvt7e.fsf@gnu.org> <726883d4-8d13-a3cb-30b7-a74c4b44f8ed@gmx.at> <87a6p3iv9q.fsf@gnu.org> <48753133-11a3-a21f-a1f9-4e58508079ac@gmx.at> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------F16A2E51396CF19F1654AC5D" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="854"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Garjola Dindi , emacs-devel@gnu.org To: Tassilo Horn Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon May 10 14:43:59 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lg5GR-00005E-DB for ged-emacs-devel@m.gmane-mx.org; Mon, 10 May 2021 14:43:59 +0200 Original-Received: from localhost ([::1]:43562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lg5GQ-0001d0-G2 for ged-emacs-devel@m.gmane-mx.org; Mon, 10 May 2021 08:43:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lg510-00025t-96 for emacs-devel@gnu.org; Mon, 10 May 2021 08:28:02 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:38369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lg50w-0004KJ-23; Mon, 10 May 2021 08:28:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1620649673; bh=lZuTqWYvv8vxEGAUXYtcEGeRFaduG0MvsX8wXdBnebw=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=DxF6/tpoWwn8Py7ZLgxWzOUOObBT34pBuoECLaYouDVRazOXgzg+bQGPxAvnA+1Zf 8G6sqwf/v3ALoijMtjDVeqzwSfZzi11T89NGB2j6jjbg2Nar0Yn37E2YikmjYRLBhs zO5Kx9f9gERTZmk3ZlKq9CTIoQ1Jd74SB8h+XY9c= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.102] ([213.142.96.152]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Ml6mE-1lEgkv2qaq-00lUEc; Mon, 10 May 2021 14:27:53 +0200 In-Reply-To: <48753133-11a3-a21f-a1f9-4e58508079ac@gmx.at> Content-Language: en-US X-Provags-ID: V03:K1:LGCKV9hlV7cAOimfnRbwNZr0enXQ1IDgs8nbgP4aE85cjeWUFeL hcpaThgIHtGLeIRZugocuYP9H2sZ+jGuolc8r8SyM6v9OqBfpiMvyd6J4no86WHc/wP8kbc JdB4P+IPOffsOZDX+hZL4w30lhWqr+R2y56zZYmJrjpgwbXcIqi2e4xxxi/iK2WNJyKGkmh o6SOQkmlgrVCyvyArxAnw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Iw+Q+JunVCw=:u+6z59ErWpvYH3GYlonRn4 STL9EPL+sQ3J2wQ66fo/Xdhe6eUJ8g/wCgsIIK6BBu9+HOWZrpieNraJs7+aU54syEhHxhKsJ noUbFxnGwplVl7uyytxOFfBCrvyJN897cM5XxgCLMuS6jf1EaeesYs3jgKtAJ1ZgFa4R0i78L /GPNitl3BFAAYz3k8iCsJ3j2GfPRisjhjXmKnlbhq0qOSBKq6si4JYORaG49e8tQj5W7kRMmj hJznHHG1U+SgoYjW0P4OHeXgpllzmbNuGNtkp1ArMZxOYQ2iAw5flOkaaVZbBYrRof8wq2ZVj nOs24zh+rS+HCg0ULobjx+yznchXKtugHzQYI22SOAehM4o2esn3BHNMcpBcGbP8iMmSAoz/8 NSBTWM3HV3hS2iZUvHBwOGUrvd5iKxrhWD/kNstYE5ydgUtK2rdAi3eCjCNa9b74fJewzDvD7 SAbg2N2gDB1vi2uUmcHjmXnsj13h3GiRwa5Ocp7SbBu8meynbOp2LKSGPeo6GWkQ/bOMBy7SM 0VrL0RxQZGrFrsoj4CAW59IAc3h1rNvMBobN3/lSOk5aDnawNtguy29FAQmYz6xJNUaeptMUt NdI/SH29LC/VvbjO7G+FIzmV3yB9umaFwog6RrHauzNKJdjHf1Fzn7tG2/I4JdQhke8+ajEAv wc2gctO9sFlHY+tCn3HjG31FgjqvaOr/owaAZspACS6mPSz8Y+EPNlPbrFbP1tVN7h6sTFP8K RrbCXBNJP7vfGTQsx9d6Fv2I87KjcY3Zl5jMXgDXaIIrCo8BUQMNtlFsh5ejXda2lazE5CPN Received-SPF: pass client-ip=212.227.15.19; envelope-from=rudalics@gmx.at; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:269110 Archived-At: This is a multi-part message in MIME format. --------------F16A2E51396CF19F1654AC5D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit I attach a new patch. Maybe we're more lucky this time. Dindi, maybe you can try it as well. Thanks, martin --------------F16A2E51396CF19F1654AC5D Content-Type: text/x-patch; name="frame-was-visible.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="frame-was-visible.diff" diff --git a/lisp/faces.el b/lisp/faces.el index 68bfbbae38..0719816320 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2118,6 +2118,10 @@ x-create-frame-with-faces (x-handle-reverse-video frame parameters) (frame-set-background-mode frame t) (face-set-after-frame-default frame parameters) + (set-frame-was-invisible + frame + (and visibility-spec + (memq (cdr visibility-spec) '(nil icon)))) (if (null visibility-spec) (make-frame-visible frame) (modify-frame-parameters frame (list visibility-spec))) diff --git a/src/frame.c b/src/frame.c index 738bfe9a5c..21c078c23e 100644 --- a/src/frame.c +++ b/src/frame.c @@ -971,6 +971,7 @@ make_frame (bool mini_p) f->no_accept_focus =3D false; f->z_group =3D z_group_none; f->tooltip =3D false; + f->was_invisible =3D false; f->child_frame_border_width =3D -1; f->last_tab_bar_item =3D -1; #ifndef HAVE_EXT_TOOL_BAR @@ -5907,7 +5908,18 @@ DEFUN ("frame-pointer-visible-p", Fframe_pointer_v= isible_p, return decode_any_frame (frame)->pointer_invisible ? Qnil : Qt; } =20 +DEFUN ("set-frame-was-invisible", Fset_frame_was_invisible, + Sset_frame_was_invisible, 2, 2, 0, + doc: /* Set frame's was-invisible flag. +For internal use only. */) + (Lisp_Object frame, Lisp_Object was_invisible) +{ + struct frame *f =3D decode_live_frame (frame); + + f->was_invisible =3D NILP (was_invisible) ? false : true; =20 + return Qnil; +} =0C /***********************************************************************= Multimonitor data @@ -6547,6 +6559,7 @@ focus (where a frame immediately loses focus when i= t's left by the mouse defsubr (&Sframe_position); defsubr (&Sset_frame_position); defsubr (&Sframe_pointer_visible_p); + defsubr (&Sset_frame_was_invisible); defsubr (&Sframe_window_state_change); defsubr (&Sset_frame_window_state_change); defsubr (&Sframe_scale_factor); 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; =20 /* Bitfield area ends here. */ =20 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 fo= r tracking on lisp side. else { /* Must have been Qnil. */ + f->was_invisible =3D true; } } =20 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, =20 if (!NILP (visibility)) w32_make_frame_visible (f); + else + f->was_invisible =3D true; } =20 store_frame_param (f, Qvisibility, visibility); diff --git a/src/xfns.c b/src/xfns.c index 782e0a483c..fa95a57ce2 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4127,12 +4127,17 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_crea= te_frame, cannot control visibility, so don't try. */ if (!f->output_data.x->explicit_parent) { + /* When called from `x-create-frame-with-faces' visibility is + always explicitly nil. */ Lisp_Object visibility =3D gui_display_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL); =20 if (EQ (visibility, Qicon)) - x_iconify_frame (f); + { + f->was_invisible =3D true; + x_iconify_frame (f); + } else { if (EQ (visibility, Qunbound)) @@ -4140,6 +4145,8 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create= _frame, =20 if (!NILP (visibility)) x_make_frame_visible (f); + else + f->was_invisible =3D true; } =20 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 =3D 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 =3D false; + } #endif f->output_data.x->has_been_visible =3D true; } --------------F16A2E51396CF19F1654AC5D--