sungmg/mutter-performance-source
1
0
Fork 0
Code Activity
mutter-performance-source/src/x11/meta-x11-errors.c

66 lines
2.1 KiB
C
Raw Normal View History

Stick an emacs comment directive at the beginning of all the code files so 2006-10-01 Elijah Newren <newren gmail com> * src/*.[ch]: Stick an emacs comment directive at the beginning of all the code files so that people using emacs will be more likely to get coding style correct in their patches. We still need a similar vi directive. #358866
2006-10-01 22:30:10 +00:00
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
Remove trailing whitespace
2014-05-02 13:34:02 +00:00
/*
...
2001-05-31 03:30:58 +00:00
* Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
* code copyrighted by the GTK team.
Remove trailing whitespace
2014-05-02 13:34:02 +00:00
*
...
2001-05-31 03:30:58 +00: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.
Remove trailing whitespace
2014-05-02 13:34:02 +00:00
*
...
2001-05-31 03:30:58 +00:00
* You should have received a copy of the GNU General Public License
Changed obsolete FSF postal address into generic URL. Fix https://bugzilla.gnome.org/show_bug.cgi?id=721517 #2
2014-01-12 01:42:06 +00:00
* along with this program; if not, see <http://www.gnu.org/licenses/>.
...
2001-05-31 03:30:58 +00:00
*/
Add a meaningful name and description to all sections/files in the API docs https://bugzilla.gnome.org/show_bug.cgi?id=695641
2013-03-11 15:52:36 +00:00
/**
* SECTION:errors
* @title: Errors
* @short_description: Mutter X error handling
*/
Clean up include macros mess The order and way include macros were structured was chaotic, with no real common thread between files. Try to tidy up the mess with some common scheme, to make things look less messy.
2018-07-10 08:36:24 +00:00
#include "config.h"
#include "meta/meta-x11-errors.h"
...
2001-05-31 03:30:58 +00:00
#include <errno.h>
clean up the code, and replace GDK X error handler with one that chains up 2001-09-01 Havoc Pennington <hp@pobox.com> * src/errors.c: clean up the code, and replace GDK X error handler with one that chains up to GDK but first logs the error to logfile.
2001-09-01 05:53:07 +00:00
#include <stdlib.h>
Switch meta_error_trap functions to MetaX11Display They are X11 specific functions, used for X11 code. They have been improved per jadahl's suggestion to use gdk_x11_lookup_xdisplay and gdk_x11_display_error_trap_* functions, instead of current code. https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-26 16:27:50 +00:00
#include <gdk/gdkx.h>
Clean up include macros mess The order and way include macros were structured was chaotic, with no real common thread between files. Try to tidy up the mess with some common scheme, to make things look less messy.
2018-07-10 08:36:24 +00:00
Switch meta_error_trap functions to MetaX11Display They are X11 specific functions, used for X11 code. They have been improved per jadahl's suggestion to use gdk_x11_lookup_xdisplay and gdk_x11_display_error_trap_* functions, instead of current code. https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-26 16:27:50 +00:00
#include "x11/meta-x11-display-private.h"
...
2001-05-31 03:30:58 +00:00
Use GDK error trapping straight-up The hacks we were playing by calling gdk_error_trap_push() and then resetting the error handler are incompatible with the rewrite of GDK error traps. Since the new error code has some features that simplify what we are doing (like automatically figuring out whether a XSync() is needed) and because our custom error handler didn't have a lot of a point, use a separate code path for GTK+ 3.0 builds that just uses the GDK error traps straight-up without a custom error handler. https://bugzilla.gnome.org/show_bug.cgi?id=630195
2010-09-20 18:42:52 +00: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
Rename errors.[ch] to meta-x11-errors.[ch] Also rename meta_error_trap_* to meta_x11_error_trap_* and move meta-x11-errors.c to src/x11 https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-27 18:48:55 +00:00
meta_x11_error_trap_push (MetaX11Display *x11_display)
Use GDK error trapping straight-up The hacks we were playing by calling gdk_error_trap_push() and then resetting the error handler are incompatible with the rewrite of GDK error traps. Since the new error code has some features that simplify what we are doing (like automatically figuring out whether a XSync() is needed) and because our custom error handler didn't have a lot of a point, use a separate code path for GTK+ 3.0 builds that just uses the GDK error traps straight-up without a custom error handler. https://bugzilla.gnome.org/show_bug.cgi?id=630195
2010-09-20 18:42:52 +00:00
{
Split GDK initialization from MetaUI Get rid of the deprecated gdk_display_get_default_screen () https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-26 20:52:02 +00:00
gdk_x11_display_error_trap_push (x11_display->gdk_display);
Use GDK error trapping straight-up The hacks we were playing by calling gdk_error_trap_push() and then resetting the error handler are incompatible with the rewrite of GDK error traps. Since the new error code has some features that simplify what we are doing (like automatically figuring out whether a XSync() is needed) and because our custom error handler didn't have a lot of a point, use a separate code path for GTK+ 3.0 builds that just uses the GDK error traps straight-up without a custom error handler. https://bugzilla.gnome.org/show_bug.cgi?id=630195
2010-09-20 18:42:52 +00:00
}
void
Rename errors.[ch] to meta-x11-errors.[ch] Also rename meta_error_trap_* to meta_x11_error_trap_* and move meta-x11-errors.c to src/x11 https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-27 18:48:55 +00:00
meta_x11_error_trap_pop (MetaX11Display *x11_display)
Use GDK error trapping straight-up The hacks we were playing by calling gdk_error_trap_push() and then resetting the error handler are incompatible with the rewrite of GDK error traps. Since the new error code has some features that simplify what we are doing (like automatically figuring out whether a XSync() is needed) and because our custom error handler didn't have a lot of a point, use a separate code path for GTK+ 3.0 builds that just uses the GDK error traps straight-up without a custom error handler. https://bugzilla.gnome.org/show_bug.cgi?id=630195
2010-09-20 18:42:52 +00:00
{
Split GDK initialization from MetaUI Get rid of the deprecated gdk_display_get_default_screen () https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-26 20:52:02 +00:00
gdk_x11_display_error_trap_pop_ignored (x11_display->gdk_display);
Use GDK error trapping straight-up The hacks we were playing by calling gdk_error_trap_push() and then resetting the error handler are incompatible with the rewrite of GDK error traps. Since the new error code has some features that simplify what we are doing (like automatically figuring out whether a XSync() is needed) and because our custom error handler didn't have a lot of a point, use a separate code path for GTK+ 3.0 builds that just uses the GDK error traps straight-up without a custom error handler. https://bugzilla.gnome.org/show_bug.cgi?id=630195
2010-09-20 18:42:52 +00:00
}
int
Rename errors.[ch] to meta-x11-errors.[ch] Also rename meta_error_trap_* to meta_x11_error_trap_* and move meta-x11-errors.c to src/x11 https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-27 18:48:55 +00:00
meta_x11_error_trap_pop_with_return (MetaX11Display *x11_display)
Use GDK error trapping straight-up The hacks we were playing by calling gdk_error_trap_push() and then resetting the error handler are incompatible with the rewrite of GDK error traps. Since the new error code has some features that simplify what we are doing (like automatically figuring out whether a XSync() is needed) and because our custom error handler didn't have a lot of a point, use a separate code path for GTK+ 3.0 builds that just uses the GDK error traps straight-up without a custom error handler. https://bugzilla.gnome.org/show_bug.cgi?id=630195
2010-09-20 18:42:52 +00:00
{
Split GDK initialization from MetaUI Get rid of the deprecated gdk_display_get_default_screen () https://bugzilla.gnome.org/show_bug.cgi?id=759538
2017-08-26 20:52:02 +00:00
return gdk_x11_display_error_trap_pop (x11_display->gdk_display);
Use GDK error trapping straight-up The hacks we were playing by calling gdk_error_trap_push() and then resetting the error handler are incompatible with the rewrite of GDK error traps. Since the new error code has some features that simplify what we are doing (like automatically figuring out whether a XSync() is needed) and because our custom error handler didn't have a lot of a point, use a separate code path for GTK+ 3.0 builds that just uses the GDK error traps straight-up without a custom error handler. https://bugzilla.gnome.org/show_bug.cgi?id=630195
2010-09-20 18:42:52 +00:00
}
Copy permalink