2006-10-01 18:30:10 -04:00
|
|
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
|
2014-05-02 09:34:02 -04:00
|
|
|
/*
|
2001-05-30 23:30:58 -04:00
|
|
|
* Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
|
|
|
|
* code copyrighted by the GTK team.
|
2014-05-02 09:34:02 -04:00
|
|
|
*
|
2001-05-30 23:30:58 -04:00
|
|
|
* 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.
|
2014-05-02 09:34:02 -04:00
|
|
|
*
|
2001-05-30 23:30:58 -04:00
|
|
|
* You should have received a copy of the GNU General Public License
|
2014-01-11 20:42:06 -05:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2001-05-30 23:30:58 -04:00
|
|
|
*/
|
|
|
|
|
2013-03-11 11:52:36 -04:00
|
|
|
/**
|
|
|
|
* SECTION:errors
|
|
|
|
* @title: Errors
|
|
|
|
* @short_description: Mutter X error handling
|
|
|
|
*/
|
|
|
|
|
2018-07-10 04:36:24 -04:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include "meta/meta-x11-errors.h"
|
|
|
|
|
2001-05-30 23:30:58 -04:00
|
|
|
#include <errno.h>
|
2001-09-01 01:53:07 -04:00
|
|
|
#include <stdlib.h>
|
2017-08-26 12:27:50 -04:00
|
|
|
#include <gdk/gdkx.h>
|
2018-07-10 04:36:24 -04:00
|
|
|
|
2017-08-26 12:27:50 -04:00
|
|
|
#include "x11/meta-x11-display-private.h"
|
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.)
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2017-08-27 14:48:55 -04:00
|
|
|
meta_x11_error_trap_push (MetaX11Display *x11_display)
|
2010-09-20 14:42:52 -04:00
|
|
|
{
|
2017-08-26 16:52:02 -04:00
|
|
|
gdk_x11_display_error_trap_push (x11_display->gdk_display);
|
2010-09-20 14:42:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2017-08-27 14:48:55 -04:00
|
|
|
meta_x11_error_trap_pop (MetaX11Display *x11_display)
|
2010-09-20 14:42:52 -04:00
|
|
|
{
|
2017-08-26 16:52:02 -04:00
|
|
|
gdk_x11_display_error_trap_pop_ignored (x11_display->gdk_display);
|
2010-09-20 14:42:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-08-27 14:48:55 -04:00
|
|
|
meta_x11_error_trap_pop_with_return (MetaX11Display *x11_display)
|
2010-09-20 14:42:52 -04:00
|
|
|
{
|
2017-08-26 16:52:02 -04:00
|
|
|
return gdk_x11_display_error_trap_pop (x11_display->gdk_display);
|
2010-09-20 14:42:52 -04:00
|
|
|
}
|