[metacity] errors: simplify code
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] errors: simplify code
- Date: Wed, 25 May 2016 12:33:51 +0000 (UTC)
commit 753112c727649f25de3231eef9c8b5e4c8f89847
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed May 25 15:32:34 2016 +0300
errors: simplify code
src/compositor/compositor-xrender.c | 26 ++++++------
src/core/core.c | 2 +-
src/core/delete.c | 4 +-
src/core/display.c | 58 +++++++++++++-------------
src/core/errors.c | 33 ++-------------
src/core/frame.c | 4 +-
src/core/iconcache.c | 10 ++--
src/core/keybindings.c | 32 +++++++-------
src/core/main.c | 3 -
src/core/screen.c | 32 +++++++-------
src/core/stack.c | 10 ++--
src/core/window-props.c | 4 +-
src/core/window.c | 75 +++++++++++++++++------------------
src/core/workspace.c | 2 +-
src/core/xprops.c | 12 +++---
src/include/errors.h | 24 +----------
16 files changed, 144 insertions(+), 187 deletions(-)
---
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index 364b6cd..d5fabc6 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -42,6 +42,7 @@
#include "compositor-private.h"
#include "compositor-xrender.h"
#include "xprops.h"
+#include "util.h"
#include <X11/Xatom.h>
#include <X11/extensions/shape.h>
#include <X11/extensions/Xcomposite.h>
@@ -1175,7 +1176,7 @@ get_window_region (MetaCompWindow *cw)
meta_error_trap_push (display);
region = XFixesCreateRegionFromWindow (xdisplay, cw->id, WindowRegionBounding);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
if (region == None)
return None;
@@ -1325,7 +1326,7 @@ get_window_picture (MetaCompWindow *cw)
if (cw->back_pixmap == None)
cw->back_pixmap = XCompositeNameWindowPixmap (xdisplay, cw->id);
- error_code = meta_error_trap_pop_with_return (display, FALSE);
+ error_code = meta_error_trap_pop_with_return (display);
if (error_code != 0)
cw->back_pixmap = None;
@@ -1341,7 +1342,7 @@ get_window_picture (MetaCompWindow *cw)
meta_error_trap_push (display);
pict = XRenderCreatePicture (xdisplay, draw, format, CPSubwindowMode, &pa);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
return pict;
}
@@ -1381,7 +1382,7 @@ get_window_mask (MetaCompWindow *cw)
cw->mask_pixmap = XCreatePixmap (xdisplay, cw->id, width, height,
format->depth);
- if (meta_error_trap_pop_with_return (display, FALSE) != 0)
+ if (meta_error_trap_pop_with_return (display) != 0)
return None;
}
@@ -1430,7 +1431,7 @@ get_window_mask (MetaCompWindow *cw)
meta_error_trap_push (display);
picture = XRenderCreatePicture (xdisplay, cw->mask_pixmap, format, 0, NULL);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
return picture;
}
@@ -1805,7 +1806,7 @@ repair_screen (MetaScreen *screen)
XFixesDestroyRegion (xdisplay, info->all_damage);
info->all_damage = None;
info->clip_changed = FALSE;
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
}
@@ -1912,6 +1913,7 @@ repair_win (MetaCompWindow *cw)
XserverRegion parts;
meta_error_trap_push (display);
+
if (!cw->damaged)
{
parts = win_extents (cw);
@@ -1926,7 +1928,7 @@ repair_win (MetaCompWindow *cw)
cw->attrs.y + cw->attrs.border_width);
}
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
dump_xserver_region ("repair_win", display, parts);
add_damage (screen, parts);
@@ -1958,7 +1960,7 @@ free_win (MetaCompWindow *cw,
{
meta_error_trap_push (display);
XRenderFreePicture (xdisplay, cw->picture);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
cw->picture = None;
}
@@ -2040,7 +2042,7 @@ free_win (MetaCompWindow *cw,
if (cw->damage != None) {
meta_error_trap_push (display);
XDamageDestroy (xdisplay, cw->damage);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
cw->damage = None;
}
@@ -3006,7 +3008,7 @@ xrender_add_window (MetaCompositor *compositor,
meta_error_trap_push (xrc->display);
add_win (screen, window, xwindow);
- meta_error_trap_pop (xrc->display, FALSE);
+ meta_error_trap_pop (xrc->display);
}
static void
@@ -3315,13 +3317,13 @@ xrender_process_event (MetaCompositor *compositor,
process_shape (xrc, (XShapeEvent *) event);
else
{
- meta_error_trap_pop (xrc->display, FALSE);
+ meta_error_trap_pop (xrc->display);
return;
}
break;
}
- meta_error_trap_pop (xrc->display, FALSE);
+ meta_error_trap_pop (xrc->display);
#ifndef USE_IDLE_REPAINT
repair_display (xrc->display);
#endif
diff --git a/src/core/core.c b/src/core/core.c
index b679ebf..cae8999 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -335,7 +335,7 @@ meta_core_lower_beneath_focus_window (Display *xdisplay,
xwindow,
CWSibling | CWStackMode,
&changes);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
void
diff --git a/src/core/delete.c b/src/core/delete.c
index efc7373..831df38 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -136,7 +136,7 @@ meta_window_delete (MetaWindow *window,
window->desc);
XKillClient (window->display->xdisplay, window->xwindow);
}
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
meta_display_ping_window (window->display,
window,
@@ -213,7 +213,7 @@ meta_window_kill (MetaWindow *window)
window->desc);
meta_error_trap_push (window->display);
XKillClient (window->display->xdisplay, window->xwindow);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
void
diff --git a/src/core/display.c b/src/core/display.c
index e9ce0a9..8d02d41 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -238,7 +238,7 @@ sn_error_trap_pop (SnDisplay *sn_display,
MetaDisplay *display;
display = meta_display_for_x_display (xdisplay);
if (display != NULL)
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
#endif
@@ -742,7 +742,7 @@ meta_display_open (void)
timestamp);
}
- meta_error_trap_pop (the_display, FALSE);
+ meta_error_trap_pop (the_display);
}
meta_display_ungrab (the_display);
@@ -931,7 +931,7 @@ meta_display_screen_for_xwindow (MetaDisplay *display,
meta_error_trap_push (display);
attr.screen = NULL;
result = XGetWindowAttributes (display->xdisplay, xwindow, &attr);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
/* Note, XGetWindowAttributes is on all kinds of crack
* and returns 1 on success 0 on failure, rather than Success
@@ -1426,7 +1426,7 @@ window_raise_with_delay_callback (void *data)
window->xwindow,
&root, &child,
&root_x, &root_y, &x, &y, &mask);
- meta_error_trap_pop (window->display, TRUE);
+ meta_error_trap_pop (window->display);
point_in_window =
(window->frame && POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
@@ -2043,7 +2043,7 @@ event_callback (XEvent *event,
window->frame->xwindow);
meta_error_trap_push (display);
meta_window_destroy_frame (window->frame->window);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
else
{
@@ -2114,7 +2114,7 @@ event_callback (XEvent *event,
meta_error_trap_push (display);
result = XGetWindowAttributes (display->xdisplay, xwindow, &attr);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
if (result != 0)
{
@@ -2194,7 +2194,7 @@ event_callback (XEvent *event,
meta_error_trap_push (display);
XConfigureWindow (display->xdisplay, event->xconfigurerequest.window,
xwcm, &xwc);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
else
{
@@ -2970,7 +2970,7 @@ meta_spew_event (MetaDisplay *display,
meta_error_trap_push (display);
str = XGetAtomName (display->xdisplay,
event->xproperty.atom);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
if (event->xproperty.state == PropertyNewValue)
state = "PropertyNewValue";
@@ -3004,7 +3004,7 @@ meta_spew_event (MetaDisplay *display,
meta_error_trap_push (display);
str = XGetAtomName (display->xdisplay,
event->xclient.message_type);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
extra = g_strdup_printf ("type: %s format: %d\n",
str ? str : "(unknown atom)",
event->xclient.format);
@@ -3274,7 +3274,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
if (change_pointer)
{
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
XChangeActivePointerGrab (display->xdisplay,
GRAB_MASK,
cursor,
@@ -3283,7 +3283,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
meta_topic (META_DEBUG_WINDOW_OPS,
"Changed pointer with XChangeActivePointerGrab()\n");
- if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Error trapped from XChangeActivePointerGrab()\n");
@@ -3316,7 +3316,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
"XGrabPointer() failed time %u\n",
timestamp);
}
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
}
#undef GRAB_MASK
@@ -3483,7 +3483,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
XSyncAlarmAttributes values;
XSyncValue init;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
/* Set the counter to 0, so we know that the application's
* responses to the client messages will always trigger
@@ -3521,7 +3521,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
XSyncCAEvents,
&values);
- if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
display->grab_sync_request_alarm = None;
meta_topic (META_DEBUG_RESIZING,
@@ -3830,7 +3830,7 @@ meta_change_button_grab (MetaDisplay *display,
}
if (meta_is_debugging ())
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
/* GrabModeSync means freeze until XAllowEvents */
@@ -3850,7 +3850,7 @@ meta_change_button_grab (MetaDisplay *display,
{
int result;
- result = meta_error_trap_pop_with_return (display, FALSE);
+ result = meta_error_trap_pop_with_return (display);
if (result != Success)
meta_verbose ("Failed to %s button %d with mask 0x%x for window 0x%lx error code %d\n",
@@ -3861,7 +3861,7 @@ meta_change_button_grab (MetaDisplay *display,
++ignored_mask;
}
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
void
@@ -4054,7 +4054,7 @@ meta_display_update_active_window_hint (MetaDisplay *display)
XA_WINDOW,
32, PropModeReplace, (guchar*) data, 1);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
tmp = tmp->next;
}
@@ -4329,7 +4329,7 @@ process_request_frame_extents (MetaDisplay *display,
display->atom__NET_FRAME_EXTENTS,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 4);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
meta_XFree (hints);
}
@@ -4779,7 +4779,7 @@ convert_property (MetaDisplay *display,
conversion_targets[2] = display->atom_TIMESTAMP;
conversion_targets[3] = display->atom_VERSION;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
if (target == display->atom_TARGETS)
XChangeProperty (display->xdisplay, w, property,
XA_ATOM, 32, PropModeReplace,
@@ -4794,11 +4794,11 @@ convert_property (MetaDisplay *display,
(unsigned char *)icccm_version, 2);
else
{
- meta_error_trap_pop_with_return (display, FALSE);
+ meta_error_trap_pop (display);
return FALSE;
}
- if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
return FALSE;
/* Be sure the PropertyNotify has arrived so we
@@ -4830,7 +4830,7 @@ process_selection_request (MetaDisplay *display,
meta_error_trap_push (display);
str = XGetAtomName (display->xdisplay,
event->xselectionrequest.selection);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
meta_verbose ("Selection request with selection %s window 0x%lx not a WM_Sn selection we recognize\n",
str ? str : "(bad atom)", event->xselectionrequest.owner);
@@ -4857,18 +4857,18 @@ process_selection_request (MetaDisplay *display,
unsigned long num, rest;
unsigned char *data;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
if (XGetWindowProperty (display->xdisplay,
event->xselectionrequest.requestor,
event->xselectionrequest.property, 0, 256, False,
display->atom_ATOM_PAIR,
&type, &format, &num, &rest, &data) != Success)
{
- meta_error_trap_pop_with_return (display, TRUE);
+ meta_error_trap_pop (display);
return;
}
- if (meta_error_trap_pop_with_return (display, TRUE) == Success)
+ if (meta_error_trap_pop_with_return (display) == Success)
{
/* FIXME: to be 100% correct, should deal with rest > 0,
* but since we have 4 possible targets, we will hardly ever
@@ -4891,7 +4891,7 @@ process_selection_request (MetaDisplay *display,
event->xselectionrequest.property,
display->atom_ATOM_PAIR,
32, PropModeReplace, data, num);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
meta_XFree (data);
}
}
@@ -4947,7 +4947,7 @@ process_selection_clear (MetaDisplay *display,
meta_error_trap_push (display);
str = XGetAtomName (display->xdisplay,
event->xselectionclear.selection);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
meta_verbose ("Selection clear with selection %s window 0x%lx not a WM_Sn selection we recognize\n",
str ? str : "(bad atom)", event->xselectionclear.window);
@@ -5299,7 +5299,7 @@ meta_display_set_input_focus_window (MetaDisplay *display,
focus_frame ? window->frame->xwindow : window->xwindow,
RevertToPointerRoot,
timestamp);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
display->expected_focus_window = window;
display->last_focus_time = timestamp;
diff --git a/src/core/errors.c b/src/core/errors.c
index d1b8a23..213d2de 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -1,7 +1,5 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X error handling */
-
/*
* Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
* code copyrighted by the GTK team.
@@ -20,24 +18,11 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <config.h>
-#include "errors.h"
-#include "display-private.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <gdk/gdk.h>
+#include "config.h"
-void
-meta_errors_init (void)
-{
-}
+#include <gdk/gdk.h>
-void
-meta_errors_register_foreign_display (Display *foreign_dpy,
- ErrorHandler handler,
- gpointer data)
-{
-}
+#include "errors.h"
void
meta_error_trap_push (MetaDisplay *display)
@@ -46,21 +31,13 @@ meta_error_trap_push (MetaDisplay *display)
}
void
-meta_error_trap_pop (MetaDisplay *display,
- gboolean last_request_was_roundtrip)
+meta_error_trap_pop (MetaDisplay *display)
{
gdk_error_trap_pop_ignored ();
}
-void
-meta_error_trap_push_with_return (MetaDisplay *display)
-{
- gdk_error_trap_push ();
-}
-
int
-meta_error_trap_pop_with_return (MetaDisplay *display,
- gboolean last_request_was_roundtrip)
+meta_error_trap_pop_with_return (MetaDisplay *display)
{
return gdk_error_trap_pop ();
}
diff --git a/src/core/frame.c b/src/core/frame.c
index 5620467..bc71ce2 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -129,7 +129,7 @@ meta_window_ensure_frame (MetaWindow *window)
window->rect.x,
window->rect.y);
/* FIXME handle this error */
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
/* stick frame to the window */
window->frame = frame;
@@ -202,7 +202,7 @@ meta_window_destroy_frame (MetaWindow *window)
*/
window->frame->rect.x + borders.invisible.left,
window->frame->rect.y + borders.invisible.top);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
meta_ui_destroy_frame_window (window->screen->ui, frame->xwindow);
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index 8c5b9ca..f85cebc 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -230,7 +230,7 @@ read_rgb_icon (MetaDisplay *display,
int mini_w, mini_h;
gulong *data_as_long;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
type = None;
data = NULL;
result = XGetWindowProperty (display->xdisplay,
@@ -239,7 +239,7 @@ read_rgb_icon (MetaDisplay *display,
0, G_MAXLONG,
False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, &data);
- err = meta_error_trap_pop_with_return (display, TRUE);
+ err = meta_error_trap_pop_with_return (display);
if (err != Success ||
result != Success)
@@ -439,7 +439,7 @@ try_pixmap_and_mask (MetaDisplay *display,
w, h);
}
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
if (mask)
{
@@ -504,7 +504,7 @@ get_kwm_win_icon (MetaDisplay *display,
*pixmap = None;
*mask = None;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
icons = NULL;
result = XGetWindowProperty (display->xdisplay, xwindow,
display->atom__KWM_WIN_ICON,
@@ -515,7 +515,7 @@ get_kwm_win_icon (MetaDisplay *display,
&bytes_after, &data);
icons = (Pixmap *)data;
- err = meta_error_trap_pop_with_return (display, TRUE);
+ err = meta_error_trap_pop_with_return (display);
if (err != Success ||
result != Success)
return;
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index da3b2ac..c673e12 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -485,7 +485,8 @@ regrab_key_bindings (MetaDisplay *display)
tmp = tmp->next;
}
- meta_error_trap_pop (display, FALSE);
+
+ meta_error_trap_pop (display);
g_slist_free (windows);
}
@@ -664,7 +665,8 @@ meta_change_keygrab (MetaDisplay *display,
}
if (meta_is_debugging ())
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
+
if (grab)
XGrabKey (display->xdisplay, keycode,
modmask | ignored_mask,
@@ -680,7 +682,7 @@ meta_change_keygrab (MetaDisplay *display,
{
int result;
- result = meta_error_trap_pop_with_return (display, FALSE);
+ result = meta_error_trap_pop_with_return (display);
if (grab && result != Success)
{
@@ -696,7 +698,7 @@ meta_change_keygrab (MetaDisplay *display,
++ignored_mask;
}
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
static void
@@ -739,17 +741,14 @@ grab_keys (MetaKeyBinding *bindings,
++i;
}
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
static void
ungrab_all_keys (MetaDisplay *display,
Window xwindow)
{
- if (meta_is_debugging ())
- meta_error_trap_push_with_return (display);
- else
- meta_error_trap_push (display);
+ meta_error_trap_push (display);
XUngrabKey (display->xdisplay, AnyKey, AnyModifier,
xwindow);
@@ -758,14 +757,14 @@ ungrab_all_keys (MetaDisplay *display,
{
int result;
- result = meta_error_trap_pop_with_return (display, FALSE);
+ result = meta_error_trap_pop_with_return (display);
if (result != Success)
meta_topic (META_DEBUG_KEYBINDINGS,
"Ungrabbing all keys on 0x%lx failed\n", xwindow);
}
else
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
void
@@ -886,7 +885,7 @@ grab_keyboard (MetaDisplay *display,
/* Grab the keyboard, so we get key releases and all key
* presses
*/
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
grab_status = XGrabKeyboard (display->xdisplay,
xwindow, True,
@@ -895,7 +894,7 @@ grab_keyboard (MetaDisplay *display,
if (grab_status != GrabSuccess)
{
- meta_error_trap_pop_with_return (display, TRUE);
+ meta_error_trap_pop_with_return (display);
meta_topic (META_DEBUG_KEYBINDINGS,
"XGrabKeyboard() returned failure status %s time %u\n",
grab_status_to_string (grab_status),
@@ -904,7 +903,7 @@ grab_keyboard (MetaDisplay *display,
}
else
{
- result = meta_error_trap_pop_with_return (display, TRUE);
+ result = meta_error_trap_pop_with_return (display);
if (result != Success)
{
meta_topic (META_DEBUG_KEYBINDINGS,
@@ -927,7 +926,8 @@ ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
"Ungrabbing keyboard with timestamp %u\n",
timestamp);
XUngrabKeyboard (display->xdisplay, timestamp);
- meta_error_trap_pop (display, FALSE);
+
+ meta_error_trap_pop (display);
}
gboolean
@@ -2781,7 +2781,7 @@ handle_panel (MetaDisplay *display,
StructureNotifyMask,
(XEvent*) &ev);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
static void
diff --git a/src/core/main.c b/src/core/main.c
index aa01df3..9b05571 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -434,9 +434,6 @@ main (int argc, char **argv)
meta_ui_init (&argc, &argv);
- /* must be after UI init so we can override GDK handlers */
- meta_errors_init ();
-
/* Load prefs */
meta_prefs_init ();
meta_prefs_add_listener (prefs_changed_callback, NULL);
diff --git a/src/core/screen.c b/src/core/screen.c
index e8972b8..30b3048 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -384,11 +384,11 @@ meta_screen_new (MetaDisplay *display,
}
/* We want to find out when the current selection owner dies */
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
attrs.event_mask = StructureNotifyMask;
XChangeWindowAttributes (xdisplay,
current_wm_sn_owner, CWEventMask, &attrs);
- if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
current_wm_sn_owner = None; /* don't wait for it to die later on */
}
@@ -443,7 +443,7 @@ meta_screen_new (MetaDisplay *display,
}
/* select our root window events */
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
/* We need to or with the existing event mask since
* gtk+ may be interested in other events.
@@ -458,7 +458,7 @@ meta_screen_new (MetaDisplay *display,
FocusChangeMask | StructureNotifyMask |
ExposureMask |
attr.your_event_mask);
- if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
{
meta_warning (_("Screen %d on display \"%s\" already has a window manager\n"),
number, display->name);
@@ -669,9 +669,9 @@ meta_screen_free (MetaScreen *screen,
meta_stack_free (screen->stack);
- meta_error_trap_push_with_return (screen->display);
+ meta_error_trap_push (screen->display);
XSelectInput (screen->display->xdisplay, screen->xroot, 0);
- if (meta_error_trap_pop_with_return (screen->display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (screen->display) != Success)
meta_warning (_("Could not release screen %d on display \"%s\"\n"),
screen->number, screen->display->name);
@@ -735,12 +735,12 @@ list_windows (MetaScreen *screen)
{
WindowInfo *info = g_new0 (WindowInfo, 1);
- meta_error_trap_push_with_return (screen->display);
+ meta_error_trap_push (screen->display);
XGetWindowAttributes (screen->display->xdisplay,
children[i], &info->attrs);
- if (meta_error_trap_pop_with_return (screen->display, TRUE))
+ if (meta_error_trap_pop_with_return (screen->display))
{
meta_verbose ("Failed to get attributes for window 0x%lx\n",
children[i]);
@@ -1041,7 +1041,7 @@ set_number_of_spaces_hint (MetaScreen *screen,
screen->display->atom__NET_NUMBER_OF_DESKTOPS,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
}
static void
@@ -1062,7 +1062,7 @@ set_desktop_geometry_hint (MetaScreen *screen)
screen->display->atom__NET_DESKTOP_GEOMETRY,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 2);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
}
static void
@@ -1086,7 +1086,7 @@ set_desktop_viewport_hint (MetaScreen *screen)
screen->display->atom__NET_DESKTOP_VIEWPORT,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 2);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
}
static void
@@ -1227,7 +1227,7 @@ get_window_pixbuf (MetaWindow *window,
pixbuf = meta_ui_get_pixbuf_from_surface (surface);
cairo_surface_destroy (surface);
- if (meta_error_trap_pop_with_return (NULL, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (NULL) != Success)
g_clear_object (&pixbuf);
if (pixbuf == NULL)
@@ -1560,7 +1560,7 @@ meta_screen_get_mouse_window (MetaScreen *screen,
&win_x_return,
&win_y_return,
&mask_return);
- meta_error_trap_pop (screen->display, TRUE);
+ meta_error_trap_pop (screen->display);
window = meta_stack_get_default_focus_window_at_point (screen->stack,
screen->active_workspace,
@@ -1927,7 +1927,7 @@ set_workspace_names (MetaScreen *screen)
screen->display->atom_UTF8_STRING,
8, PropModeReplace,
(unsigned char *)flattened->str, flattened->len);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
g_string_free (flattened, TRUE);
}
@@ -2031,7 +2031,7 @@ set_work_area_hint (MetaScreen *screen)
XA_CARDINAL, 32, PropModeReplace,
(guchar*) data, num_workspaces*4);
g_free (data);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
}
static gboolean
@@ -2404,7 +2404,7 @@ meta_screen_update_showing_desktop_hint (MetaScreen *screen)
screen->display->atom__NET_SHOWING_DESKTOP,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
}
static void
diff --git a/src/core/stack.c b/src/core/stack.c
index 26d965e..386b29b 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -960,13 +960,13 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
* or restack any windows before using the XQueryTree results.
*/
- meta_error_trap_push_with_return (screen->display);
+ meta_error_trap_push (screen->display);
XQueryTree (screen->display->xdisplay,
screen->xroot,
&ignored1, &ignored2, &children, &n_children);
- if (meta_error_trap_pop_with_return (screen->display, TRUE) != Success)
+ if (meta_error_trap_pop_with_return (screen->display) != Success)
{
meta_topic (META_DEBUG_STACK,
"Error querying root children to raise window 0x%lx\n",
@@ -1011,7 +1011,7 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
xwindow,
CWSibling | CWStackMode,
&changes);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
break;
}
@@ -1027,7 +1027,7 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
meta_error_trap_push (screen->display);
XLowerWindow (screen->display->xdisplay,
xwindow);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
}
if (children)
@@ -1203,7 +1203,7 @@ stack_sync_to_server (MetaStack *stack)
}
}
- meta_error_trap_pop (stack->screen->display, FALSE);
+ meta_error_trap_pop (stack->screen->display);
/* on error, a window was destroyed; it should eventually
* get removed from the stacking list when we unmanage it
* and we'll fix stacking at that time.
diff --git a/src/core/window-props.c b/src/core/window-props.c
index 2387e63..5b64d12 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -271,7 +271,7 @@ reload_net_wm_window_type (MetaWindow *window,
{
meta_error_trap_push (window->display);
str = XGetAtomName (window->display->xdisplay, window->type_atom);
- meta_error_trap_pop (window->display, TRUE);
+ meta_error_trap_pop (window->display);
}
meta_verbose ("Window %s type atom %s\n", window->desc,
@@ -630,7 +630,7 @@ set_title_text (MetaWindow *window,
XDeleteProperty (window->display->xdisplay,
window->xwindow,
atom);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
return modified;
diff --git a/src/core/window.c b/src/core/window.c
index 61e68f9..93f5b22 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -207,15 +207,15 @@ meta_window_new (MetaDisplay *display,
* creation, to reduce XSync() calls
*/
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
if (XGetWindowAttributes (display->xdisplay,xwindow, &attrs))
{
- if(meta_error_trap_pop_with_return (display, TRUE) != Success)
+ if(meta_error_trap_pop_with_return (display) != Success)
{
meta_verbose ("Failed to get attributes for window 0x%lx\n",
xwindow);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
meta_display_ungrab (display);
return NULL;
}
@@ -224,16 +224,16 @@ meta_window_new (MetaDisplay *display,
}
else
{
- meta_error_trap_pop_with_return (display, TRUE);
+ meta_error_trap_pop_with_return (display);
meta_verbose ("Failed to get attributes for window 0x%lx\n",
xwindow);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
meta_display_ungrab (display);
return NULL;
}
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
meta_display_ungrab (display);
return window;
@@ -301,7 +301,7 @@ meta_window_new_with_attrs (MetaDisplay *display,
(state == IconicState || state == NormalState)))
{
meta_verbose ("Deciding not to manage unmapped or unviewable window 0x%lx\n", xwindow);
- meta_error_trap_pop (display, TRUE);
+ meta_error_trap_pop (display);
meta_display_ungrab (display);
return NULL;
}
@@ -311,7 +311,7 @@ meta_window_new_with_attrs (MetaDisplay *display,
wm_state_to_string (existing_wm_state));
}
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
XAddToSaveSet (display->xdisplay, xwindow);
@@ -361,11 +361,11 @@ meta_window_new_with_attrs (MetaDisplay *display,
&set_attrs);
}
- if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
{
meta_verbose ("Window 0x%lx disappeared just as we tried to manage it\n",
xwindow);
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
meta_display_ungrab (display);
return NULL;
}
@@ -799,7 +799,7 @@ meta_window_new_with_attrs (MetaDisplay *display,
if (!display->display_opening && !window->initially_iconic)
unminimize_window_and_all_transient_parents (window);
- meta_error_trap_pop (display, FALSE); /* pop the XSync()-reducing trap */
+ meta_error_trap_pop (display); /* pop the XSync()-reducing trap */
meta_display_ungrab (display);
window->constructing = FALSE;
@@ -1099,7 +1099,7 @@ meta_window_free (MetaWindow *window,
window->xwindow,
window->display->atom__NET_WM_FULLSCREEN_MONITORS);
set_wm_state (window, WithdrawnState);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
else
{
@@ -1110,7 +1110,7 @@ meta_window_free (MetaWindow *window,
{
meta_error_trap_push (window->display);
set_wm_state (window, NormalState);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
/* And we need to be sure the window is mapped so other WMs
@@ -1119,7 +1119,7 @@ meta_window_free (MetaWindow *window,
meta_error_trap_push (window->display);
XMapWindow (window->display->xdisplay,
window->xwindow);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
meta_window_ungrab_keys (window);
@@ -1128,7 +1128,6 @@ meta_window_free (MetaWindow *window,
meta_display_unregister_x_window (window->display, window->xwindow);
-
meta_error_trap_push (window->display);
/* Put back anything we messed up */
@@ -1160,7 +1159,7 @@ meta_window_free (MetaWindow *window,
if (META_DISPLAY_HAS_SHAPE (window->display))
XShapeSelectInput (window->display->xdisplay, window->xwindow, NoEventMask);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
if (window->icon)
g_object_unref (G_OBJECT (window->icon));
@@ -1206,7 +1205,7 @@ set_wm_state (MetaWindow *window,
window->display->atom_WM_STATE,
window->display->atom_WM_STATE,
32, PropModeReplace, (guchar*) data, 2);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
static void
@@ -1289,7 +1288,7 @@ set_net_wm_state (MetaWindow *window)
window->display->atom__NET_WM_STATE,
XA_ATOM,
32, PropModeReplace, (guchar*) data, i);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
if (window->fullscreen)
{
@@ -1305,7 +1304,7 @@ set_net_wm_state (MetaWindow *window)
window->display->atom__NET_WM_FULLSCREEN_MONITORS,
XA_CARDINAL, 32, PropModeReplace,
(guchar*) data, 4);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
}
@@ -2250,7 +2249,7 @@ meta_window_show (MetaWindow *window)
window->unmaps_pending += 1;
meta_error_trap_push (window->display);
XUnmapWindow (window->display->xdisplay, window->xwindow);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
if (!window->iconic)
@@ -2268,7 +2267,7 @@ meta_window_show (MetaWindow *window)
window->mapped = TRUE;
meta_error_trap_push (window->display);
XMapWindow (window->display->xdisplay, window->xwindow);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
did_show = TRUE;
if (window->was_minimized)
@@ -2370,7 +2369,7 @@ meta_window_hide (MetaWindow *window)
window->unmaps_pending += 1;
meta_error_trap_push (window->display);
XUnmapWindow (window->display->xdisplay, window->xwindow);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
did_hide = TRUE;
}
@@ -3728,7 +3727,7 @@ meta_window_move_resize_internal (MetaWindow *window,
mask,
&values);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
if (!configure_frame_first && window->frame)
@@ -4582,7 +4581,7 @@ update_net_frame_extents (MetaWindow *window)
window->display->atom__NET_FRAME_EXTENTS,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 4);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
void
@@ -4609,7 +4608,7 @@ meta_window_set_current_workspace_hint (MetaWindow *window)
window->display->atom__NET_WM_DESKTOP,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
static gboolean
@@ -4718,7 +4717,7 @@ meta_window_send_icccm_message (MetaWindow *window,
meta_error_trap_push (window->display);
XSendEvent (window->display->xdisplay,
window->xwindow, False, 0, (XEvent*) &ev);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
void
@@ -5142,14 +5141,14 @@ meta_window_client_message (MetaWindow *window,
char *str1;
char *str2;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
str1 = XGetAtomName (display->xdisplay, first);
- if (meta_error_trap_pop_with_return (display, TRUE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
str1 = NULL;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
str2 = XGetAtomName (display->xdisplay, second);
- if (meta_error_trap_pop_with_return (display, TRUE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
str2 = NULL;
meta_verbose ("Request to change _NET_WM_STATE action %lu atom1: %s atom2: %s\n",
@@ -5433,7 +5432,7 @@ meta_window_client_message (MetaWindow *window,
&query_root_x, &query_root_y,
&x, &y,
&mask);
- meta_error_trap_pop (window->display, TRUE);
+ meta_error_trap_pop (window->display);
if (mask & Button1Mask)
button = 1;
@@ -5670,7 +5669,7 @@ meta_window_notify_focus (MetaWindow *window,
meta_error_trap_push (window->display);
XInstallColormap (window->display->xdisplay,
window->colormap);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
/* move into FOCUSED_WINDOW layer */
meta_window_update_layer (window);
@@ -5732,7 +5731,7 @@ meta_window_notify_focus (MetaWindow *window,
meta_error_trap_push (window->display);
XUninstallColormap (window->display->xdisplay,
window->colormap);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
/* move out of FOCUSED_WINDOW layer */
meta_window_update_layer (window);
@@ -5827,7 +5826,7 @@ send_configure_notify (MetaWindow *window)
XSendEvent (window->display->xdisplay,
window->xwindow,
False, StructureNotifyMask, &event);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
gboolean
@@ -6391,7 +6390,7 @@ set_allowed_actions_hint (MetaWindow *window)
window->display->atom__NET_WM_ALLOWED_ACTIONS,
XA_ATOM,
32, PropModeReplace, (guchar*) data, i);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
#undef MAX_N_ACTIONS
}
@@ -7833,7 +7832,7 @@ meta_window_set_gravity (MetaWindow *window,
CWWinGravity,
&attrs);
- meta_error_trap_pop (window->display, FALSE);
+ meta_error_trap_pop (window->display);
}
static void
@@ -8278,7 +8277,7 @@ warp_grab_pointer (MetaWindow *window,
*x = CLAMP (*x, 0, window->screen->rect.width-1);
*y = CLAMP (*y, 0, window->screen->rect.height-1);
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
meta_topic (META_DEBUG_WINDOW_OPS,
"Warping pointer to %d,%d with window at %d,%d\n",
@@ -8304,7 +8303,7 @@ warp_grab_pointer (MetaWindow *window,
0, 0, 0, 0,
*x, *y);
- if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
{
meta_verbose ("Failed to warp pointer for window %s\n",
window->desc);
diff --git a/src/core/workspace.c b/src/core/workspace.c
index 88619ea..08e524f 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -527,7 +527,7 @@ set_active_space_hint (MetaScreen *screen)
screen->display->atom__NET_CURRENT_DESKTOP,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
- meta_error_trap_pop (screen->display, FALSE);
+ meta_error_trap_pop (screen->display);
}
void
diff --git a/src/core/xprops.c b/src/core/xprops.c
index c935a35..81267fe 100644
--- a/src/core/xprops.c
+++ b/src/core/xprops.c
@@ -124,7 +124,7 @@ validate_or_free_results (GetPropertyResults *results,
type_name = XGetAtomName (results->display->xdisplay, results->type);
expected_name = XGetAtomName (results->display->xdisplay, expected_type);
prop_name = XGetAtomName (results->display->xdisplay, results->xatom);
- meta_error_trap_pop (results->display, TRUE);
+ meta_error_trap_pop (results->display);
w = meta_display_lookup_x_window (results->display, results->xwindow);
@@ -191,7 +191,7 @@ get_property (MetaDisplay *display,
results->bytes_after = 0;
results->format = 0;
- meta_error_trap_push_with_return (display);
+ meta_error_trap_push (display);
if (XGetWindowProperty (display->xdisplay, xwindow, xatom,
0, G_MAXLONG,
False, req_type, &results->type, &results->format,
@@ -202,11 +202,11 @@ get_property (MetaDisplay *display,
{
if (results->prop)
XFree (results->prop);
- meta_error_trap_pop_with_return (display, TRUE);
+ meta_error_trap_pop (display);
return FALSE;
}
- if (meta_error_trap_pop_with_return (display, TRUE) != Success)
+ if (meta_error_trap_pop_with_return (display) != Success)
{
if (results->prop)
XFree (results->prop);
@@ -488,7 +488,7 @@ utf8_list_from_results (GetPropertyResults *results,
meta_error_trap_push (results->display);
name = XGetAtomName (results->display->xdisplay, results->xatom);
- meta_error_trap_pop (results->display, TRUE);
+ meta_error_trap_pop (results->display);
meta_warning (_("Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"),
name, results->xwindow, i);
meta_XFree (name);
@@ -545,7 +545,7 @@ meta_prop_set_utf8_string_hint (MetaDisplay *display,
xwindow, atom,
display->atom_UTF8_STRING,
8, PropModeReplace, (guchar*) val, strlen (val));
- meta_error_trap_pop (display, FALSE);
+ meta_error_trap_pop (display);
}
static gboolean
diff --git a/src/include/errors.h b/src/include/errors.h
index 2c82058..5703523 100644
--- a/src/include/errors.h
+++ b/src/include/errors.h
@@ -1,7 +1,5 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X error handling */
-
/*
* Copyright (C) 2001 Havoc Pennington
*
@@ -22,28 +20,12 @@
#ifndef META_ERRORS_H
#define META_ERRORS_H
-#include <X11/Xlib.h>
-
-#include "util.h"
#include "display.h"
-typedef void (* ErrorHandler) (Display *dpy,
- XErrorEvent *error,
- gpointer data);
-
-void meta_errors_init (void);
-void meta_errors_register_foreign_display (Display *foreign_dpy,
- ErrorHandler handler,
- gpointer data);
-
-void meta_error_trap_push (MetaDisplay *display);
-void meta_error_trap_pop (MetaDisplay *display,
- gboolean last_request_was_roundtrip);
+void meta_error_trap_push (MetaDisplay *display);
-void meta_error_trap_push_with_return (MetaDisplay *display);
-/* returns X error code, or 0 for no error */
-int meta_error_trap_pop_with_return (MetaDisplay *display,
- gboolean last_request_was_roundtrip);
+void meta_error_trap_pop (MetaDisplay *display);
+int meta_error_trap_pop_with_return (MetaDisplay *display);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
