Merge pull request emacs-mirror#10 from fejfighter/pgtk-no-conn

Revert pgtkconn removal

Author: Yuuki Harano

configure.ac

@@ -2822,7 +2822,7 @@ LIBS=$OLD_LIBS
 PGTK_OBJ=
 PGTK_LIBS=
 if test "$window_system" = "pgtk"; then
-  PGTK_OBJ="pgtkfns.o pgtkterm.o pgtkselect.o pgtkmenu.o pgtkim.o xsettings.o"
+  PGTK_OBJ="pgtkconn.o pgtkfns.o pgtkterm.o pgtkselect.o pgtkmenu.o pgtkim.o xsettings.o"
   PGTK_LIBS="$GTK_LIBS -ldl"
   AC_DEFINE([HAVE_PGTK], 1, [Define to 1 if you have pure Gtk+-3.])
 fi

src/pgtkconn.c

@@ -0,0 +1,103 @@
+/* Pure Gtk+-3 communication module.      -*- coding: utf-8 -*-
+
+Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2018 Free Software
+Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* This should be the first include, as it may set up #defines affecting
+   interpretation of even the system includes. */
+#include <config.h>
+
+#include "lisp.h"
+#include "dynlib.h"
+#include "pgtkconn.h"
+
+
+/***
+ * Detect socket to display server, with display type specific functions.
+ ***/
+
+#ifdef GDK_WINDOWING_WAYLAND
+
+#include <gdk/gdkwayland.h>
+
+static int pgtk_detect_wayland_connection(dynlib_handle_ptr h, GdkDisplay *gdpy)
+{
+  /* Check gdpy is an instance of GdkWaylandDisplay. */
+  if (!GDK_IS_WAYLAND_DISPLAY (gdpy))
+    return -1;
+
+  /* Obtain Wayland Display from GdkWaylandDisplay,
+     and get file descriptor from it. */
+  struct wl_display *dpy = gdk_wayland_display_get_wl_display (gdpy);
+
+  int (*fn)(void *) = dynlib_sym(h, "wl_display_get_fd");
+  if (fn == NULL)
+    return -1;
+  return fn (dpy);
+}
+
+#endif
+
+#ifdef GDK_WINDOWING_X11
+
+#include <gdk/gdkx.h>
+
+static int pgtk_detect_x11_connection(dynlib_handle_ptr h, GdkDisplay *gdpy)
+{
+  /* Check gdpy is an instance of GdkX11Display. */
+  if (!GDK_IS_X11_DISPLAY (gdpy))
+    return -1;
+
+  /* Obtain X Display from GdkX11Display, and get file descriptor from it. */
+  Display *dpy = gdk_x11_display_get_xdisplay (gdpy);
+
+  int (*fn)(void *) = dynlib_sym(h, "XConnectionNumber");
+  if (fn == NULL)
+    return -1;
+  return fn (dpy);
+}
+
+#endif
+
+int pgtk_detect_connection(GdkDisplay *gdpy)
+{
+  static dynlib_handle_ptr h = NULL;
+  int fd;
+
+  if (h == NULL) {
+    if ((h = dynlib_open(NULL)) == NULL) {
+      error("dynlib_open failed.");
+      return -1;
+    }
+  }
+
+#ifdef GDK_WINDOWING_X11
+  if ((fd = pgtk_detect_x11_connection(h, gdpy)) != -1)
+    return fd;
+#endif
+
+#ifdef GDK_WINDOWING_WAYLAND
+  if ((fd = pgtk_detect_wayland_connection(h, gdpy)) != -1)
+    return fd;
+#endif
+
+  /* I don't know how to detect fd if using other backend. */
+
+  error("socket detection failed.");
+  return -1;
+}

src/pgtkconn.h

@@ -0,0 +1,26 @@
+/* Definitions and headers for communication with pure Gtk+3.
+   Copyright (C) 1989, 1993, 2005, 2008-2018 Free Software Foundation,
+   Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_PGTK
+
+#include <gdk/gdk.h>
+
+extern int pgtk_detect_connection(GdkDisplay *gdpy);
+
+#endif

src/pgtkterm.c

@@ -58,6 +58,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "font.h"
 #include "xsettings.h"
 #include "pgtkselect.h"
+#include "pgtkconn.h"
 
 #define STORE_KEYSYM_FOR_DEBUG(keysym) ((void)0)
 
@@ -95,6 +96,7 @@ static void pgtk_clip_to_row (struct window *w, struct glyph_row *row,
 static struct frame *
 pgtk_any_window_to_frame (GdkWindow *window);
 
+
 static void evq_enqueue(union buffered_input_event *ev)
 {
   struct event_queue_t *evq = &event_q;
@@ -4302,7 +4304,17 @@ pgtk_delete_terminal (struct terminal *terminal)
       dpyinfo->gdpy = NULL;
     }
 
-  delete_keyboard_wait_descriptor(0);
+  /* ...but if called from x_connection_closed, the display may already
+     be closed and dpyinfo->display was set to 0 to indicate that.  Since
+     X server is most likely gone, explicit close is the only reliable
+     way to continue and avoid Bug#19147.  */
+  else if (dpyinfo->connection >= 0)
+    emacs_close (dpyinfo->connection);
+
+  /* No more input on this descriptor.  */
+  delete_keyboard_wait_descriptor (dpyinfo->connection);
+  /* Mark as dead. */
+  dpyinfo->connection = -1;
 
   pgtk_delete_display (dpyinfo);
   unblock_input ();
@@ -6112,6 +6124,7 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
   static char *initial_display = NULL;
   char *dpy_name;
   Lisp_Object lisp_dpy_name = Qnil;
+  int conn_fd;
 
   block_input ();
 
@@ -6127,6 +6140,11 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
       ++x_initialized;
     }
 
+#if 0
+  if (! x_display_ok (SSDATA (display_name)))
+    error ("Display %s can't be opened", SSDATA (display_name));
+#endif
+
   dpy_name = SSDATA (display_name);
   if (strlen(dpy_name) == 0 && initial_display != NULL)
     dpy_name = initial_display;
@@ -6194,7 +6212,14 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
       return 0;
     }
 
+  conn_fd = pgtk_detect_connection(dpy);
+  if (conn_fd < 0) {
+    unblock_input();
+    return 0;
+  }
+
   /* We have definitely succeeded.  Record the new connection.  */
+
   dpyinfo = xzalloc (sizeof *dpyinfo);
   pgtk_initialize_display_info (dpyinfo);
   terminal = pgtk_create_terminal (dpyinfo);
@@ -6226,6 +6251,7 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
 
   dpyinfo->name_list_element = Fcons (lisp_dpy_name, Qnil);
   dpyinfo->gdpy = dpy;
+  dpyinfo->connection = conn_fd;
 
   /* https://lists.gnu.org/r/emacs-devel/2015-11/msg00194.html  */
   dpyinfo->smallest_font_height = 1;
@@ -6271,10 +6297,16 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
 
   xsettings_initialize (dpyinfo);
 
-  /* According to w32term.c this will stop the emacs console handling
-     code from handling keyboard input when we want gtk to do that for
-     us */
-  add_keyboard_wait_descriptor (0);
+  /* This is only needed for distinguishing keyboard and process input.  */
+  if (dpyinfo->connection != 0)
+    add_keyboard_wait_descriptor (dpyinfo->connection);
+
+#ifdef F_SETOWN
+  fcntl (dpyinfo->connection, F_SETOWN, getpid ());
+#endif /* ! defined (F_SETOWN) */
+
+  if (interrupt_input)
+    init_sigio (dpyinfo->connection);
 
   pgtk_selection_init();
 

src/pgtkterm.h

@@ -131,6 +131,9 @@ struct pgtk_display_info
   /* This says how to access this display in Gdk.  */
   GdkDisplay *gdpy;
 
+  /* A connection number (file descriptor) for the display.  */
+  int connection;
+
   /* This is a cons cell of the form (NAME . FONT-LIST-CACHE).  */
   Lisp_Object name_list_element;