Bug 968196 - Use GDK error handler for X window error events. r=karlt

toolkit/xre/moz.build

@@ -56,6 +56,11 @@ else:
         'nsNativeAppSupportDefault.cpp',
     ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+    UNIFIED_SOURCES += [
+        'nsGDKErrorHandler.cpp',
+    ]
+
 if CONFIG['MOZ_X11']:
     UNIFIED_SOURCES += [
         'nsX11ErrorHandler.cpp',

toolkit/xre/nsAppRunner.cpp

@@ -191,7 +191,6 @@
 
 extern uint32_t gRestartMode;
 extern void InstallSignalHandlers(const char *ProgramName);
-#include "nsX11ErrorHandler.h"
 
 #define FILE_COMPATIBILITY_INFO NS_LITERAL_CSTRING("compatibility.ini")
 #define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")
@@ -3533,7 +3532,7 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
 #endif /* defined(MOZ_WIDGET_GTK) */
 #ifdef MOZ_X11
   // Do this after initializing GDK, or GDK will install its own handler.
-  InstallX11ErrorHandler();
+  XRE_InstallX11ErrorHandler();
 #endif
 
   // Call the code to install our handler

toolkit/xre/nsEmbedFunctions.cpp

@@ -48,6 +48,7 @@
 #include "chrome/common/mach_ipc_mac.h"
 #endif
 #include "nsX11ErrorHandler.h"
+#include "nsGDKErrorHandler.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ -789,7 +790,11 @@ XRE_ShutdownTestShell()
 void
 XRE_InstallX11ErrorHandler()
 {
+#if (MOZ_WIDGET_GTK == 3)
+  InstallGdkErrorHandler();
+#else
   InstallX11ErrorHandler();
+#endif
 }
 #endif
 

toolkit/xre/nsGDKErrorHandler.cpp

@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsGDKErrorHandler.h"
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <errno.h>
+
+#include "nsX11ErrorHandler.h"
+
+#include "prenv.h"
+
+
+/* See https://bugzilla.gnome.org/show_bug.cgi?id=629608#c8
+ *
+ * GDK implements X11 error traps to ignore X11 errors.
+ * Unfortunatelly We don't know which X11 events can be ignored
+ * so we have to utilize the Gdk error handler to avoid
+ * false alarms in Gtk3.
+ */
+static void
+GdkErrorHandler(const gchar *log_domain, GLogLevelFlags log_level,
+                const gchar *message,  gpointer user_data)
+{
+  if (strstr(message, "X Window System error")) {
+    XErrorEvent event;
+    nsDependentCString buffer(message);
+    char *endptr;
+
+    /* Parse Gdk X Window error message which has this format:
+     * (Details: serial XXXX error_code XXXX request_code XXXX (XXXX) minor_code XXXX)
+     */
+    NS_NAMED_LITERAL_CSTRING(serialString, "(Details: serial ");
+    int32_t start = buffer.Find(serialString);
+    if (start == kNotFound)
+      NS_RUNTIMEABORT(message);
+
+    start += serialString.Length();
+    errno = 0;
+    event.serial = strtol(buffer.BeginReading() + start, &endptr, 10);
+    if (errno)
+      NS_RUNTIMEABORT(message);
+
+    NS_NAMED_LITERAL_CSTRING(errorCodeString, " error_code ");    
+    if (!StringBeginsWith(Substring(endptr, buffer.EndReading()), errorCodeString))
+      NS_RUNTIMEABORT(message);
+
+    errno = 0;
+    event.error_code = strtol(endptr + errorCodeString.Length(), &endptr, 10);
+    if (errno)
+      NS_RUNTIMEABORT(message);
+
+    NS_NAMED_LITERAL_CSTRING(requestCodeString, " request_code ");
+    if (!StringBeginsWith(Substring(endptr, buffer.EndReading()), requestCodeString))
+      NS_RUNTIMEABORT(message);
+
+    errno = 0;
+    event.request_code = strtol(endptr + requestCodeString.Length(), &endptr, 10);
+    if (errno)
+      NS_RUNTIMEABORT(message);
+
+    NS_NAMED_LITERAL_CSTRING(minorCodeString, " minor_code ");
+    start = buffer.Find(minorCodeString, endptr - buffer.BeginReading());
+    if (!start)
+      NS_RUNTIMEABORT(message);
+
+    errno = 0;
+    event.minor_code = strtol(buffer.BeginReading() + start + minorCodeString.Length(), nullptr, 10);
+    if (errno)
+      NS_RUNTIMEABORT(message);
+
+    event.display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+    // Gdk does not provide resource ID
+    event.resourceid = 0;
+
+    X11Error(event.display, &event);
+  } else {
+    g_log_default_handler(log_domain, log_level, message, user_data);
+    NS_RUNTIMEABORT(message);
+  }
+}
+
+void
+InstallGdkErrorHandler()
+{
+  g_log_set_handler("Gdk",
+                    (GLogLevelFlags)(G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION),
+                    GdkErrorHandler,
+                    nullptr);
+  if (PR_GetEnv("MOZ_X_SYNC")) {
+    XSynchronize(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), True);
+  }
+}

toolkit/xre/nsGDKErrorHandler.h

@@ -0,0 +1,8 @@
+/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#if (MOZ_WIDGET_GTK == 3)
+void InstallGdkErrorHandler();
+#endif

toolkit/xre/nsX11ErrorHandler.cpp

@@ -16,7 +16,7 @@
 #define BUFSIZE 2048 // What Xlib uses with XGetErrorDatabaseText
 
 extern "C" {
-static int
+int
 X11Error(Display *display, XErrorEvent *event) {
   // Get an indication of how long ago the request that caused the error was
   // made.
@@ -159,6 +159,7 @@ X11Error(Display *display, XErrorEvent *event) {
 }
 }
 
+#if (MOZ_WIDGET_GTK == 2)
 void
 InstallX11ErrorHandler()
 {
@@ -170,3 +171,4 @@ InstallX11ErrorHandler()
     XSynchronize(display, True);
   }
 }
+#endif

toolkit/xre/nsX11ErrorHandler.h

@@ -4,5 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef MOZ_X11
+#include <X11/Xlib.h>
+#if (MOZ_WIDGET_GTK == 2)
 void InstallX11ErrorHandler();
 #endif
+extern "C" int X11Error(Display *display, XErrorEvent *event);
+#endif