2006-10-01 18:30:10 -04:00
|
|
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
|
Comprehensively rename to Mutter
Code:
All references in the code not related to themes, keybindings, or
GConf were changed from 'metacity' to 'mutter'. This includes, among other
things, strings, comments, the atoms used in the message protocol, and
the envvars used for debugging. The GConf schema file was reduced to
the 3 settings new to mutter.
The overall version was brought up to 2.27 to match current gnome.
Structure:
All files named '*metacity*' were renamed '*mutter*' with appropriate
changes in the automake system. Files removed are
doc/creating_themes, src/themes, doc/metacity-theme.dtd,
metacity.doap. These files will eventually end up in an external
gnome-wm-data module.
Installation location:
On the filesystem the mutter-plugindir was change from
$(libdir)/metacity/plugins/clutter to just $(libdir)/mutter/plugins.
The mutter-plugins.pc.in reflects these changes.
Note:
mutter.desktop.in and mutter-wm.desktop both continue to have
X-GNOME-WMSettingsModule=metacity set. This allows
gnome-control-center to continue using libmetacity.so for
configuration. This is fine since most the general keybindings and wm
settings are being read from /apps/metacity/* in gconf.
2009-06-10 06:29:20 -04:00
|
|
|
/* Mutter X error handling */
|
2001-05-30 23:30:58 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
|
|
|
|
* code copyrighted by the GTK team.
|
|
|
|
*
|
|
|
|
* This program 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 2 of the
|
|
|
|
* License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program 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 this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
|
|
* 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
2001-12-09 17:41:12 -05:00
|
|
|
#include <config.h>
|
2001-05-30 23:30:58 -04:00
|
|
|
#include "errors.h"
|
2008-05-18 20:00:09 -04:00
|
|
|
#include "display-private.h"
|
2001-05-30 23:30:58 -04:00
|
|
|
#include <errno.h>
|
2001-09-01 01:53:07 -04:00
|
|
|
#include <stdlib.h>
|
2001-06-20 23:40:14 -04:00
|
|
|
#include <gdk/gdk.h>
|
2010-09-20 14:42:52 -04:00
|
|
|
#include <gtk/gtk.h> /* Only for GTK_CHECK_VERSION */
|
2001-05-30 23:30:58 -04:00
|
|
|
|
2010-09-20 14:42:52 -04:00
|
|
|
/* In GTK+-3.0, the error trapping code was significantly rewritten. The new code
|
|
|
|
* has some neat features (like knowing automatically if a sync is needed or not
|
|
|
|
* and handling errors asynchronously when the error code isn't needed immediately),
|
|
|
|
* but it's basically incompatible with the hacks we played with GTK+-2.0 to
|
|
|
|
* use a custom error handler along with gdk_error_trap_push().
|
|
|
|
*
|
|
|
|
* Since the main point of our custom error trap was to get the error logged
|
|
|
|
* to the right place, with GTK+-3.0 we simply omit our own error handler and
|
|
|
|
* use the GTK+ handling straight-up.
|
|
|
|
* (See https://bugzilla.gnome.org/show_bug.cgi?id=630216 for restoring logging.)
|
|
|
|
*/
|
|
|
|
#if GTK_CHECK_VERSION(2, 90, 0)
|
|
|
|
#define USE_GDK_ERROR_HANDLERS 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef USE_GDK_ERROR_HANDLERS
|
2001-05-30 23:30:58 -04:00
|
|
|
static int x_error_handler (Display *display,
|
|
|
|
XErrorEvent *error);
|
|
|
|
static int x_io_error_handler (Display *display);
|
2010-09-20 14:42:52 -04:00
|
|
|
#endif
|
2001-05-30 23:30:58 -04:00
|
|
|
|
|
|
|
void
|
|
|
|
meta_errors_init (void)
|
|
|
|
{
|
2010-09-20 14:42:52 -04:00
|
|
|
#ifndef USE_GDK_ERROR_HANDLERS
|
2002-02-24 14:58:27 -05:00
|
|
|
XSetErrorHandler (x_error_handler);
|
|
|
|
XSetIOErrorHandler (x_io_error_handler);
|
2010-09-20 14:42:52 -04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef USE_GDK_ERROR_HANDLERS
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_error_trap_push (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
gdk_error_trap_push ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_error_trap_pop (MetaDisplay *display,
|
|
|
|
gboolean last_request_was_roundtrip)
|
|
|
|
{
|
|
|
|
gdk_error_trap_pop_ignored ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_error_trap_push_with_return (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
gdk_error_trap_push ();
|
2001-05-30 23:30:58 -04:00
|
|
|
}
|
|
|
|
|
2010-09-20 14:42:52 -04:00
|
|
|
int
|
|
|
|
meta_error_trap_pop_with_return (MetaDisplay *display,
|
|
|
|
gboolean last_request_was_roundtrip)
|
|
|
|
{
|
|
|
|
return gdk_error_trap_pop ();
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* !USE_GDK_ERROR_HANDLERS */
|
|
|
|
|
2002-10-21 17:44:35 -04:00
|
|
|
static void
|
|
|
|
meta_error_trap_push_internal (MetaDisplay *display,
|
|
|
|
gboolean need_sync)
|
2001-05-30 23:30:58 -04:00
|
|
|
{
|
2002-02-24 14:58:27 -05:00
|
|
|
/* GDK resets the error handler on each push */
|
|
|
|
int (* old_error_handler) (Display *,
|
|
|
|
XErrorEvent *);
|
|
|
|
|
2002-10-21 17:44:35 -04:00
|
|
|
if (need_sync)
|
|
|
|
{
|
|
|
|
XSync (display->xdisplay, False);
|
|
|
|
}
|
|
|
|
|
2001-06-20 23:40:14 -04:00
|
|
|
gdk_error_trap_push ();
|
2002-02-24 14:58:27 -05:00
|
|
|
|
|
|
|
/* old_error_handler will just be equal to x_error_handler
|
|
|
|
* for nested traps
|
|
|
|
*/
|
|
|
|
old_error_handler = XSetErrorHandler (x_error_handler);
|
|
|
|
|
|
|
|
/* Replace GDK handler, but save it so we can chain up */
|
|
|
|
if (display->error_trap_handler == NULL)
|
|
|
|
{
|
|
|
|
g_assert (display->error_traps == 0);
|
|
|
|
display->error_trap_handler = old_error_handler;
|
|
|
|
g_assert (display->error_trap_handler != x_error_handler);
|
|
|
|
}
|
|
|
|
|
|
|
|
display->error_traps += 1;
|
2002-10-21 17:44:35 -04:00
|
|
|
|
|
|
|
meta_topic (META_DEBUG_ERRORS, "%d traps remain\n", display->error_traps);
|
2001-05-30 23:30:58 -04:00
|
|
|
}
|
|
|
|
|
2002-10-21 17:44:35 -04:00
|
|
|
static int
|
|
|
|
meta_error_trap_pop_internal (MetaDisplay *display,
|
|
|
|
gboolean need_sync)
|
2001-05-30 23:30:58 -04:00
|
|
|
{
|
2002-02-24 14:58:27 -05:00
|
|
|
int result;
|
|
|
|
|
|
|
|
g_assert (display->error_traps > 0);
|
2002-10-21 17:44:35 -04:00
|
|
|
|
|
|
|
if (need_sync)
|
|
|
|
{
|
|
|
|
XSync (display->xdisplay, False);
|
|
|
|
}
|
2001-05-31 02:42:58 -04:00
|
|
|
|
2002-02-24 14:58:27 -05:00
|
|
|
result = gdk_error_trap_pop ();
|
|
|
|
|
|
|
|
display->error_traps -= 1;
|
|
|
|
|
|
|
|
if (display->error_traps == 0)
|
|
|
|
{
|
|
|
|
/* check that GDK put our handler back; this
|
|
|
|
* assumes that there are no pending GDK traps from GDK itself
|
|
|
|
*/
|
|
|
|
|
|
|
|
int (* restored_error_handler) (Display *,
|
|
|
|
XErrorEvent *);
|
|
|
|
|
|
|
|
restored_error_handler = XSetErrorHandler (x_error_handler);
|
|
|
|
|
|
|
|
/* remove this */
|
|
|
|
display->error_trap_handler = NULL;
|
|
|
|
}
|
|
|
|
|
2002-10-21 17:44:35 -04:00
|
|
|
meta_topic (META_DEBUG_ERRORS, "%d traps\n", display->error_traps);
|
|
|
|
|
2002-02-24 14:58:27 -05:00
|
|
|
return result;
|
2001-05-30 23:30:58 -04:00
|
|
|
}
|
|
|
|
|
2002-10-21 17:44:35 -04:00
|
|
|
void
|
|
|
|
meta_error_trap_push (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
meta_error_trap_push_internal (display, FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_error_trap_pop (MetaDisplay *display,
|
|
|
|
gboolean last_request_was_roundtrip)
|
|
|
|
{
|
|
|
|
gboolean need_sync;
|
|
|
|
|
|
|
|
/* we only have to sync when popping the outermost trap */
|
|
|
|
need_sync = (display->error_traps == 1 && !last_request_was_roundtrip);
|
|
|
|
|
|
|
|
if (need_sync)
|
2002-11-03 19:56:12 -05:00
|
|
|
meta_topic (META_DEBUG_SYNC, "Syncing on error_trap_pop, traps = %d, roundtrip = %d\n",
|
|
|
|
display->error_traps, last_request_was_roundtrip);
|
2002-10-21 17:44:35 -04:00
|
|
|
|
|
|
|
display->error_trap_synced_at_last_pop = need_sync || last_request_was_roundtrip;
|
|
|
|
|
|
|
|
meta_error_trap_pop_internal (display, need_sync);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_error_trap_push_with_return (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
gboolean need_sync;
|
|
|
|
|
|
|
|
/* We don't sync on push_with_return if there are no traps
|
|
|
|
* currently, because we assume that any errors were either covered
|
|
|
|
* by a previous pop, or were fatal.
|
|
|
|
*
|
|
|
|
* More generally, we don't sync if we were synchronized last time
|
|
|
|
* we popped. This is known to be the case if there are no traps,
|
|
|
|
* but we also keep a flag so we know whether it's the case otherwise.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (!display->error_trap_synced_at_last_pop)
|
|
|
|
need_sync = TRUE;
|
|
|
|
else
|
|
|
|
need_sync = FALSE;
|
|
|
|
|
|
|
|
if (need_sync)
|
2002-11-03 19:56:12 -05:00
|
|
|
meta_topic (META_DEBUG_SYNC, "Syncing on error_trap_push_with_return, traps = %d\n",
|
|
|
|
display->error_traps);
|
2002-10-21 17:44:35 -04:00
|
|
|
|
|
|
|
meta_error_trap_push_internal (display, FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
meta_error_trap_pop_with_return (MetaDisplay *display,
|
|
|
|
gboolean last_request_was_roundtrip)
|
|
|
|
{
|
|
|
|
if (!last_request_was_roundtrip)
|
2002-11-03 19:56:12 -05:00
|
|
|
meta_topic (META_DEBUG_SYNC, "Syncing on error_trap_pop_with_return, traps = %d, roundtrip = %d\n",
|
|
|
|
display->error_traps, last_request_was_roundtrip);
|
2002-10-21 17:44:35 -04:00
|
|
|
|
|
|
|
display->error_trap_synced_at_last_pop = TRUE;
|
|
|
|
|
|
|
|
return meta_error_trap_pop_internal (display,
|
|
|
|
!last_request_was_roundtrip);
|
|
|
|
}
|
|
|
|
|
2001-05-30 23:30:58 -04:00
|
|
|
static int
|
|
|
|
x_error_handler (Display *xdisplay,
|
|
|
|
XErrorEvent *error)
|
|
|
|
{
|
2001-09-01 01:53:07 -04:00
|
|
|
int retval;
|
|
|
|
gchar buf[64];
|
2002-02-24 14:58:27 -05:00
|
|
|
MetaDisplay *display;
|
2006-03-03 10:53:10 -05:00
|
|
|
|
2002-02-24 14:58:27 -05:00
|
|
|
XGetErrorText (xdisplay, error->error_code, buf, 63);
|
|
|
|
|
|
|
|
display = meta_display_for_x_display (xdisplay);
|
2006-01-13 14:41:01 -05:00
|
|
|
|
2009-11-20 10:42:07 -05:00
|
|
|
/* Display can be NULL here Xlib only has one global error handler; and
|
|
|
|
* there might be other displays open in the process.
|
2006-01-13 14:41:01 -05:00
|
|
|
*/
|
2009-11-20 10:42:07 -05:00
|
|
|
if (display && display->error_traps > 0)
|
2002-02-24 14:58:27 -05:00
|
|
|
{
|
|
|
|
/* we're in an error trap, chain to the trap handler
|
|
|
|
* saved from GDK
|
|
|
|
*/
|
|
|
|
meta_verbose ("X error: %s serial %ld error_code %d request_code %d minor_code %d)\n",
|
|
|
|
buf,
|
|
|
|
error->serial,
|
|
|
|
error->error_code,
|
|
|
|
error->request_code,
|
|
|
|
error->minor_code);
|
|
|
|
|
|
|
|
g_assert (display->error_trap_handler != NULL);
|
|
|
|
g_assert (display->error_trap_handler != x_error_handler);
|
|
|
|
|
|
|
|
retval = (* display->error_trap_handler) (xdisplay, error);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
meta_bug ("Unexpected X error: %s serial %ld error_code %d request_code %d minor_code %d)\n",
|
2001-09-01 01:53:07 -04:00
|
|
|
buf,
|
|
|
|
error->serial,
|
|
|
|
error->error_code,
|
|
|
|
error->request_code,
|
|
|
|
error->minor_code);
|
2002-02-24 14:58:27 -05:00
|
|
|
|
|
|
|
retval = 1; /* compiler warning */
|
|
|
|
}
|
2001-09-01 01:53:07 -04:00
|
|
|
|
|
|
|
return retval;
|
2001-05-30 23:30:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
x_io_error_handler (Display *xdisplay)
|
|
|
|
{
|
|
|
|
MetaDisplay *display;
|
|
|
|
|
|
|
|
display = meta_display_for_x_display (xdisplay);
|
|
|
|
|
|
|
|
if (errno == EPIPE)
|
|
|
|
{
|
|
|
|
meta_warning (_("Lost connection to the display '%s';\n"
|
|
|
|
"most likely the X server was shut down or you killed/destroyed\n"
|
|
|
|
"the window manager.\n"),
|
2009-11-20 10:42:07 -05:00
|
|
|
display ? display->name : DisplayString (xdisplay));
|
2001-05-30 23:30:58 -04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
meta_warning (_("Fatal IO error %d (%s) on display '%s'.\n"),
|
|
|
|
errno, g_strerror (errno),
|
2009-11-20 10:42:07 -05:00
|
|
|
display ? display->name : DisplayString (xdisplay));
|
2001-05-30 23:30:58 -04:00
|
|
|
}
|
|
|
|
|
2001-09-01 01:53:07 -04:00
|
|
|
/* Xlib would force an exit anyhow */
|
|
|
|
exit (1);
|
2001-05-30 23:30:58 -04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2010-09-20 14:42:52 -04:00
|
|
|
|
|
|
|
#endif /* USE_GDK_ERROR_HANDLERS */
|