all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Kangas <stefankangas@gmail.com>
To: Angelo Graziosi <angelo.g0@libero.it>, Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: About the new frame title
Date: Sat, 19 Sep 2020 13:21:25 +0000	[thread overview]
Message-ID: <CADwFkm=TcVWTr+ZXYLZc2p1X7ZDieNrGGxxrjbaqF9k1Yzmd7Q@mail.gmail.com> (raw)
In-Reply-To: <152448855.1272757.1600098758378@mail1.libero.it>

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

Angelo Graziosi <angelo.g0@libero.it> writes:

>> > When I start Emacs clicking the icon on the task bar, its frame for less than a second is squared (its default size?) then assume the size following the above code.
>> >
>> > When it is squared, the frame title is still "emacs@myPC", only when it assume the final size it take the new frame title (buffer - GNU Emacs at ...)
>>
>> Yes, because the GUI frame initialization code writes the old string
>> to the frame's title.  See the initialization routines in the
>> xterm.c/w32term.c etc. (for example, in xterm.c, look in x_term_init).
>>
>> Is that bad? given that we also momentarily flash the "wrong"
>> dimensions of the frame?
>
> I don't know ... If the decision to change the frame title has been taken, one would expect that the old string goes away too, for coherence. After all, the old string just flashes.

We might as well try to fix it up a bit.  How does the attached patch
look?  Angelo, could you please help test it?

(Untested on MS Windows.)

[-- Attachment #2: 0001-Make-initial-frame-title-match-frame-title-format.patch --]
[-- Type: text/x-diff, Size: 2705 bytes --]

From 6a6179492c50f54dff0fe6d7d45d0318477ee86d Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 19 Sep 2020 14:13:52 +0200
Subject: [PATCH] Make initial frame title match frame-title-format

* src/xterm.c (x_term_init):
* src/w32term.c (w32_initialize_display_info): Sync initial frame
title with new value of Vframe_title_format.
Problem reported by Angelo Graziosi <angelo.g0@libero.it>.
---
 src/w32term.c | 11 ++++++-----
 src/xterm.c   | 22 ++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/w32term.c b/src/w32term.c
index 2669f29b56..9fbc054688 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -7167,13 +7167,14 @@ w32_initialize_display_info (Lisp_Object display_name)
   dpyinfo->name_list_element = Fcons (display_name, Qnil);
   if (STRINGP (Vsystem_name))
     {
-      dpyinfo->w32_id_name = xmalloc (SCHARS (Vinvocation_name)
-                                      + SCHARS (Vsystem_name) + 2);
-      sprintf (dpyinfo->w32_id_name, "%s@%s",
-               SDATA (Vinvocation_name), SDATA (Vsystem_name));
+      dpyinfo->w32_id_name = xmalloc (14 + SCHARS (Vsystem_name));
+      sprintf (dpyinfo->w32_id_name, "GNU Emacs at %s", SDATA (Vsystem_name));
     }
   else
-    dpyinfo->w32_id_name = xlispstrdup (Vinvocation_name);
+    {
+      dpyinfo->w32_id_name = xmalloc (10);
+      sprintf (dpyinfo->w32_id_name, "GNU Emacs");
+    }
 
   /* Default Console mode values - overridden when running in GUI mode
      with values obtained from system metrics.  */
diff --git a/src/xterm.c b/src/xterm.c
index 2e0407aff4..c30de05a59 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12927,19 +12927,21 @@ #define NUM_ARGV 10
 #endif
 
   Lisp_Object system_name = Fsystem_name ();
-
-  ptrdiff_t nbytes = SBYTES (Vinvocation_name) + 1;
-  if (STRINGP (system_name)
-      && INT_ADD_WRAPV (nbytes, SBYTES (system_name) + 1, &nbytes))
-    memory_full (SIZE_MAX);
-  dpyinfo->x_id = ++x_display_id;
-  dpyinfo->x_id_name = xmalloc (nbytes);
-  char *nametail = lispstpcpy (dpyinfo->x_id_name, Vinvocation_name);
   if (STRINGP (system_name))
     {
-      *nametail++ = '@';
-      lispstpcpy (nametail, system_name);
+      ptrdiff_t nbytes = 14;
+      if (INT_ADD_WRAPV (nbytes, SBYTES (system_name), &nbytes))
+	memory_full (SIZE_MAX);
+      dpyinfo->x_id_name = xmalloc (nbytes);
+      sprintf(dpyinfo->x_id_name, "GNU Emacs at %s", SDATA (system_name));
     }
+  else
+    {
+      dpyinfo->x_id_name = xmalloc (10);
+      sprintf (dpyinfo->x_id_name, "GNU Emacs");
+    }
+
+  dpyinfo->x_id = ++x_display_id;
 
   /* Figure out which modifier bits mean what.  */
   x_find_modifier_meanings (dpyinfo);
-- 
2.28.0


  reply	other threads:[~2020-09-19 13:21 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-14  8:27 About the new frame title Angelo Graziosi
2020-09-14 15:17 ` Eli Zaretskii
2020-09-14 15:52   ` Angelo Graziosi
2020-09-19 13:21     ` Stefan Kangas [this message]
2020-09-19 14:39       ` Eli Zaretskii
2020-09-24  8:57         ` Stefan Kangas
2020-09-24 14:46           ` Eli Zaretskii
2020-09-25 12:38             ` Angelo Graziosi
2020-09-25 12:41               ` Eli Zaretskii
2020-09-25 13:31                 ` Angelo Graziosi
2020-09-25 13:42                   ` Eli Zaretskii
2020-11-13 23:10             ` Stefan Kangas
2020-11-13 23:51               ` Andrea Corallo via Emacs development discussions.
2020-11-14  7:26               ` Eli Zaretskii
2020-11-14 14:47                 ` Stefan Kangas
2020-11-14 15:10                   ` Eli Zaretskii
2020-11-15  1:44                     ` Stefan Kangas
2020-09-19 21:22       ` Angelo Graziosi
2020-09-24  8:37         ` Stefan Kangas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CADwFkm=TcVWTr+ZXYLZc2p1X7ZDieNrGGxxrjbaqF9k1Yzmd7Q@mail.gmail.com' \
    --to=stefankangas@gmail.com \
    --cc=angelo.g0@libero.it \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.