bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Sean Whitton]

In a terminal emulator where DISPLAY is ":0",

1. src/emacs --daemon -Q
2. lib-src/emacsclient -c
3. M-: (getenv "DISPLAY") RET

Value is "wayland-0" instead of ":0".  This is under Sway on Debian.
The problem does not occur if you launch without --daemon and then use
M-x server-start.

Seems similar to #53969.  I tried commenting out the only other Lisp
code which does (setenv "DISPLAY" ...) but that does not help.  So seems
like it is in C somewhere.

-- 
Sean Whitton

bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Sean Whitton <spwhitton@spwhitton.name> writes:

> In a terminal emulator where DISPLAY is ":0",
>
> 1. src/emacs --daemon -Q
> 2. lib-src/emacsclient -c
> 3. M-: (getenv "DISPLAY") RET
>
> Value is "wayland-0" instead of ":0".  This is under Sway on Debian.
> The problem does not occur if you launch without --daemon and then use
> M-x server-start.
>
> Seems similar to #53969.  I tried commenting out the only other Lisp
> code which does (setenv "DISPLAY" ...) but that does not help.  So seems
> like it is in C somewhere.

Yep, this is in the multi-TTY code.  I'll fix that.

bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Po Lu <luangruo@yahoo.com> writes:

> Yep, this is in the multi-TTY code.  I'll fix that.

Does this fix the problem?

diff --git a/src/callproc.c b/src/callproc.c
index 0922e10f01..1e74836682 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -85,6 +85,10 @@ #define _P_NOWAIT 1	/* from process.h */
 #include "nsterm.h"
 #endif
 
+#ifdef HAVE_PGTK
+#include "pgtkterm.h"
+#endif
+
 /* Pattern used by call-process-region to make temp files.  */
 static Lisp_Object Vtemp_file_name_pattern;
 
@@ -1812,6 +1816,18 @@ make_environment_block (Lisp_Object current_dir)
     if (NILP (display))
       {
 	Lisp_Object tmp = Fframe_parameter (selected_frame, Qdisplay);
+
+#ifdef HAVE_PGTK
+	/* The only time GDK actually returns correct information is
+	   when it's running under X Windows.  DISPLAY shouldn't be
+	   set to a Wayland display either, since that's an X specific
+	   variable.  */
+	if (FRAME_WINDOW_P (SELECTED_FRAME ())
+	    && strcmp (G_OBJECT_TYPE_NAME (FRAME_X_DISPLAY (SELECTED_FRAME ())),
+		       "GdkX11Display"))
+	  tmp = Qnil;
+#endif
+
 	if (!STRINGP (tmp) && CONSP (Vinitial_environment))
 	  /* If still not found, Look for DISPLAY in Vinitial_environment.  */
 	  tmp = Fgetenv_internal (build_string ("DISPLAY"),

bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Sean Whitton]

Hello,

On Mon 11 Apr 2022 at 09:10AM +08, Po Lu wrote:

> Po Lu <luangruo@yahoo.com> writes:
>
>> Yep, this is in the multi-TTY code.  I'll fix that.
>
> Does this fix the problem?

Thank you for the patch, but unfortunately I can still reproduce the
problem using my original recipe.

-- 
Sean Whitton

bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Sean Whitton <spwhitton@spwhitton.name> writes:

> Thank you for the patch, but unfortunately I can still reproduce the
> problem using my original recipe.

I missed something, sorry, what if you apply this in addition to the
other patch?

diff --git a/src/callproc.c b/src/callproc.c
index 0922e10f01..df673311d6 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1687,6 +1687,7 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value,
   /* For DISPLAY try to get the values from the frame or the initial env.  */
   if (strcmp (var, "DISPLAY") == 0)
     {
+#ifndef HAVE_PGTK
       Lisp_Object display
 	= Fframe_parameter (NILP (frame) ? selected_frame : frame, Qdisplay);
       if (STRINGP (display))
@@ -1695,6 +1696,7 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value,
 	  *valuelen = SBYTES (display);
 	  return 1;
 	}
+#endif
       /* If still not found, Look for DISPLAY in Vinitial_environment.  */
       if (getenv_internal_1 (var, varlen, value, valuelen,
 			     Vinitial_environment))

Thanks.

bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Sean Whitton]

Hello,

On Tue 12 Apr 2022 at 09:22AM +08, Po Lu wrote:

> Sean Whitton <spwhitton@spwhitton.name> writes:
>
>> Thank you for the patch, but unfortunately I can still reproduce the
>> problem using my original recipe.

Looks like that fixes it, thanks again!

-- 
Sean Whitton

bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Sean Whitton <spwhitton@spwhitton.name> writes:

> Looks like that fixes it, thanks again!

I installed that and am closing this bug.
Thanks for testing.