From 420c29dea98c52610bd74adcbc05973ddb465cdd Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 27 Nov 2001 03:41:43 +0000 Subject: [PATCH] add error trap 2001-11-26 Havoc Pennington * src/window.c (window_query_root_pointer): add error trap --- ChangeLog | 4 ++++ src/window.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 58c47c0af..b8b510ede 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-11-26 Havoc Pennington + + * src/window.c (window_query_root_pointer): add error trap + 2001-11-27 Jesus Bravo Alvarez * configure.in: Added gl (Galician) to ALL_LINGUAS. diff --git a/src/window.c b/src/window.c index c7a3b7e90..41b002dcc 100644 --- a/src/window.c +++ b/src/window.c @@ -5021,6 +5021,8 @@ window_query_root_pointer (MetaWindow *window, int win_x_return, win_y_return; unsigned int mask_return; + meta_error_trap_push (window->display); + XQueryPointer (window->display->xdisplay, window->xwindow, &root_return, @@ -5031,6 +5033,8 @@ window_query_root_pointer (MetaWindow *window, &win_y_return, &mask_return); + meta_error_trap_pop (window->display); + if (x) *x = root_x_return; if (y)