Commit c8698f92 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Move here, and save/restore the X error handler to allow people using GTK+

Thu Jan 17 13:08:34 2002  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
	here, and save/restore the X error handler to allow
	people using GTK+ to set the X error handler to something
	custom without disturbing the operation of GDK.

	* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
	* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
	dummy implementations.

	* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
	gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
	for all error trapping.

	* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.

	* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
	problem where we would add the results anyways,
	and then add it again if no error occurred, and problem
	where we could leave _gdk_error_warnings() unset.
parent 5ce4d158
Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
here, and save/restore the X error handler to allow
people using GTK+ to set the X error handler to something
custom without disturbing the operation of GDK.
* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
dummy implementations.
* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
for all error trapping.
* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
problem where we would add the results anyways,
and then add it again if no error occurred, and problem
where we could leave _gdk_error_warnings() unset.
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com> Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding * gtk/gtkfilesel.c: Fix "deleting" filename by adding
......
Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
here, and save/restore the X error handler to allow
people using GTK+ to set the X error handler to something
custom without disturbing the operation of GDK.
* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
dummy implementations.
* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
for all error trapping.
* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
problem where we would add the results anyways,
and then add it again if no error occurred, and problem
where we could leave _gdk_error_warnings() unset.
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com> Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding * gtk/gtkfilesel.c: Fix "deleting" filename by adding
......
Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
here, and save/restore the X error handler to allow
people using GTK+ to set the X error handler to something
custom without disturbing the operation of GDK.
* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
dummy implementations.
* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
for all error trapping.
* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
problem where we would add the results anyways,
and then add it again if no error occurred, and problem
where we could leave _gdk_error_warnings() unset.
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com> Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding * gtk/gtkfilesel.c: Fix "deleting" filename by adding
......
Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
here, and save/restore the X error handler to allow
people using GTK+ to set the X error handler to something
custom without disturbing the operation of GDK.
* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
dummy implementations.
* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
for all error trapping.
* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
problem where we would add the results anyways,
and then add it again if no error occurred, and problem
where we could leave _gdk_error_warnings() unset.
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com> Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding * gtk/gtkfilesel.c: Fix "deleting" filename by adding
......
Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
here, and save/restore the X error handler to allow
people using GTK+ to set the X error handler to something
custom without disturbing the operation of GDK.
* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
dummy implementations.
* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
for all error trapping.
* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
problem where we would add the results anyways,
and then add it again if no error occurred, and problem
where we could leave _gdk_error_warnings() unset.
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com> Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding * gtk/gtkfilesel.c: Fix "deleting" filename by adding
......
Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
here, and save/restore the X error handler to allow
people using GTK+ to set the X error handler to something
custom without disturbing the operation of GDK.
* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
dummy implementations.
* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
for all error trapping.
* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
problem where we would add the results anyways,
and then add it again if no error occurred, and problem
where we could leave _gdk_error_warnings() unset.
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com> Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding * gtk/gtkfilesel.c: Fix "deleting" filename by adding
......
Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
here, and save/restore the X error handler to allow
people using GTK+ to set the X error handler to something
custom without disturbing the operation of GDK.
* gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
* gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
dummy implementations.
* gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
for all error trapping.
* gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
problem where we would add the results anyways,
and then add it again if no error occurred, and problem
where we could leave _gdk_error_warnings() unset.
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com> Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding * gtk/gtkfilesel.c: Fix "deleting" filename by adding
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#endif #endif
typedef struct _GdkPredicate GdkPredicate; typedef struct _GdkPredicate GdkPredicate;
typedef struct _GdkErrorTrap GdkErrorTrap;
struct _GdkPredicate struct _GdkPredicate
{ {
...@@ -45,19 +44,12 @@ struct _GdkPredicate ...@@ -45,19 +44,12 @@ struct _GdkPredicate
gpointer data; gpointer data;
}; };
struct _GdkErrorTrap
{
gint error_warnings;
gint error_code;
};
/* Private variable declarations /* Private variable declarations
*/ */
static int gdk_initialized = 0; /* 1 if the library is initialized, static int gdk_initialized = 0; /* 1 if the library is initialized,
* 0 otherwise. * 0 otherwise.
*/ */
static GSList *gdk_error_traps = NULL; /* List of error traps */
static GSList *gdk_error_trap_free_list = NULL; /* Free list */ static GSList *gdk_error_trap_free_list = NULL; /* Free list */
static gchar *gdk_progclass = NULL; static gchar *gdk_progclass = NULL;
...@@ -432,77 +424,6 @@ gdk_exit_func (void) ...@@ -432,77 +424,6 @@ gdk_exit_func (void)
#endif #endif
/*************************************************************
* gdk_error_trap_push:
* Push an error trap. X errors will be trapped until
* the corresponding gdk_error_pop(), which will return
* the error code, if any.
* arguments:
*
* results:
*************************************************************/
void
gdk_error_trap_push (void)
{
GSList *node;
GdkErrorTrap *trap;
if (gdk_error_trap_free_list)
{
node = gdk_error_trap_free_list;
gdk_error_trap_free_list = gdk_error_trap_free_list->next;
}
else
{
node = g_slist_alloc ();
node->data = g_new (GdkErrorTrap, 1);
}
node->next = gdk_error_traps;
gdk_error_traps = node;
trap = node->data;
trap->error_code = _gdk_error_code;
trap->error_warnings = _gdk_error_warnings;
_gdk_error_code = 0;
_gdk_error_warnings = 0;
}
/*************************************************************
* gdk_error_trap_pop:
* Pop an error trap added with gdk_error_push()
* arguments:
*
* results:
* 0, if no error occured, otherwise the error code.
*************************************************************/
gint
gdk_error_trap_pop (void)
{
GSList *node;
GdkErrorTrap *trap;
gint result;
g_return_val_if_fail (gdk_error_traps != NULL, 0);
node = gdk_error_traps;
gdk_error_traps = gdk_error_traps->next;
node->next = gdk_error_trap_free_list;
gdk_error_trap_free_list = node;
result = _gdk_error_code;
trap = node->data;
_gdk_error_code = trap->error_code;
_gdk_error_warnings = trap->error_warnings;
return result;
}
void void
gdk_threads_enter () gdk_threads_enter ()
{ {
......
...@@ -1533,3 +1533,13 @@ gdk_fb_set_rotation (GdkFBAngle angle) ...@@ -1533,3 +1533,13 @@ gdk_fb_set_rotation (GdkFBAngle angle)
#endif #endif
} }
void
gdk_error_trap_push (void)
{
}
gint
gdk_error_trap_pop (void)
{
return 0;
}
...@@ -258,3 +258,14 @@ gdk_get_display (void) ...@@ -258,3 +258,14 @@ gdk_get_display (void)
{ {
return "Win32"; return "Win32";
} }
void
gdk_error_trap_push (void)
{
}
gint
gdk_error_trap_pop (void)
{
return 0;
}
...@@ -412,8 +412,6 @@ gdk_window_cache_new (void) ...@@ -412,8 +412,6 @@ gdk_window_cache_new (void)
unsigned int nchildren; unsigned int nchildren;
int i; int i;
gint old_warnings = _gdk_error_warnings;
GdkWindowCache *result = g_new (GdkWindowCache, 1); GdkWindowCache *result = g_new (GdkWindowCache, 1);
result->children = NULL; result->children = NULL;
...@@ -425,35 +423,26 @@ gdk_window_cache_new (void) ...@@ -425,35 +423,26 @@ gdk_window_cache_new (void)
result->old_event_mask | SubstructureNotifyMask); result->old_event_mask | SubstructureNotifyMask);
gdk_window_add_filter (_gdk_parent_root, gdk_window_add_filter (_gdk_parent_root,
gdk_window_cache_filter, result); gdk_window_cache_filter, result);
_gdk_error_code = 0;
_gdk_error_warnings = 0;
if (XQueryTree(gdk_display, _gdk_root_window, gdk_error_trap_push ();
&root, &parent, &children, &nchildren) == 0)
return result; if (!XQueryTree(gdk_display, _gdk_root_window,
&root, &parent, &children, &nchildren))
{
gdk_error_trap_pop ();
return result;
}
for (i = 0; i < nchildren ; i++) for (i = 0; i < nchildren ; i++)
{ {
XGetWindowAttributes (gdk_display, children[i], &xwa); if (XGetWindowAttributes (gdk_display, children[i], &xwa))
gdk_window_cache_add (result, children[i],
gdk_window_cache_add (result, children[i], xwa.x, xwa.y, xwa.width, xwa.height,
xwa.x, xwa.y, xwa.width, xwa.height, xwa.map_state != IsUnmapped);
xwa.map_state != IsUnmapped);
if (_gdk_error_code)
_gdk_error_code = 0;
else
{
gdk_window_cache_add (result, children[i],
xwa.x, xwa.y, xwa.width, xwa.height,
(xwa.map_state != IsUnmapped));
}
} }
XFree (children); XFree (children);
gdk_error_trap_pop ();
_gdk_error_warnings = old_warnings;
return result; return result;
} }
...@@ -491,16 +480,10 @@ get_client_window_at_coords_recurse (Window win, ...@@ -491,16 +480,10 @@ get_client_window_at_coords_recurse (Window win,
if (!wm_state_atom) if (!wm_state_atom)
wm_state_atom = gdk_x11_get_xatom_by_name ("WM_STATE"); wm_state_atom = gdk_x11_get_xatom_by_name ("WM_STATE");
XGetWindowProperty (gdk_display, win, if (XGetWindowProperty (gdk_display, win,
wm_state_atom, 0, 0, False, AnyPropertyType, wm_state_atom, 0, 0, False, AnyPropertyType,
&type, &format, &nitems, &after, &data); &type, &format, &nitems, &after, &data) != Success)
return None;
if (_gdk_error_code)
{
_gdk_error_code = 0;
return None;
}
if (type != None) if (type != None)
{ {
...@@ -510,45 +493,33 @@ get_client_window_at_coords_recurse (Window win, ...@@ -510,45 +493,33 @@ get_client_window_at_coords_recurse (Window win,
#if 0 #if 0
/* This is beautiful! Damn Enlightenment and click-to-focus */ /* This is beautiful! Damn Enlightenment and click-to-focus */
XTranslateCoordinates (gdk_display, _gdk_root_window, win, if (!XTranslateCoordinates (gdk_display, _gdk_root_window, win,
x_root, y_root, &dest_x, &dest_y, &child); x_root, y_root, &dest_x, &dest_y, &child))
return None;
if (_gdk_error_code)
{
_gdk_error_code = 0;
return None;
}
#else #else
if (XQueryTree(gdk_display, win, if (!XQueryTree(gdk_display, win,
&root, &tmp_parent, &children, &nchildren) == 0) &root, &tmp_parent, &children, &nchildren))
return 0; return 0;
if (!_gdk_error_code) for (i = nchildren - 1; (i >= 0) && (child == None); i--)
{ {
for (i = nchildren - 1; (i >= 0) && (child == None); i--) XWindowAttributes xwa;
if (XGetWindowAttributes (gdk_display, children[i], &xwa))
{ {
XWindowAttributes xwa; if ((xwa.map_state == IsViewable) && (xwa.class == InputOutput) &&
(x >= xwa.x) && (x < xwa.x + (gint)xwa.width) &&
XGetWindowAttributes (gdk_display, children[i], &xwa); (y >= xwa.y) && (y < xwa.y + (gint)xwa.height))
if (_gdk_error_code)
_gdk_error_code = 0;
else if ((xwa.map_state == IsViewable) && (xwa.class == InputOutput) &&
(x >= xwa.x) && (x < xwa.x + (gint)xwa.width) &&
(y >= xwa.y) && (y < xwa.y + (gint)xwa.height))
{ {
x -= xwa.x; x -= xwa.x;
y -= xwa.y; y -= xwa.y;
child = children[i]; child = children[i];
} }
} }
XFree (children);
} }
else
_gdk_error_code = 0; XFree (children);
#endif #endif
if (child) if (child)
...@@ -566,11 +537,8 @@ get_client_window_at_coords (GdkWindowCache *cache, ...@@ -566,11 +537,8 @@ get_client_window_at_coords (GdkWindowCache *cache,
GList *tmp_list; GList *tmp_list;
Window retval = None; Window retval = None;
gint old_warnings = _gdk_error_warnings; gdk_error_trap_push ();
_gdk_error_code = 0;
_gdk_error_warnings = 0;
tmp_list = cache->children; tmp_list = cache->children;
while (tmp_list && !retval) while (tmp_list && !retval)
...@@ -593,114 +561,13 @@ get_client_window_at_coords (GdkWindowCache *cache, ...@@ -593,114 +561,13 @@ get_client_window_at_coords (GdkWindowCache *cache,
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
} }
_gdk_error_warnings = old_warnings; gdk_error_trap_pop ();
if (retval)
return retval;
else
return _gdk_root_window;
}
#if 0
static Window
get_client_window_at_coords_recurse (Window win,
gint x_root,
gint y_root)
{
Window child;
Atom type = None;
int format;
unsigned long nitems, after;
unsigned char *data;
int dest_x, dest_y;
static Atom wm_state_atom = None;
if (!wm_state_atom)
wm_state_atom = gdk_x11_get_xatom_by_name ("WM_STATE");
XGetWindowProperty (gdk_display, win,
wm_state_atom, 0, 0, False, AnyPropertyType,
&type, &format, &nitems, &after, &data);
if (_gdk_error_code)
{
_gdk_error_code = 0;
return None;
}
if (type != None)
{
XFree (data);
return win;
}
XTranslateCoordinates (gdk_display, _gdk_root_window, win,
x_root, y_root, &dest_x, &dest_y, &child);
if (_gdk_error_code)
{
_gdk_error_code = 0;
return None;
}
if (child)
return get_client_window_at_coords_recurse (child, x_root, y_root);
else
return None;
}
static Window
get_client_window_at_coords (Window ignore,
gint x_root,
gint y_root)
{
Window root, parent, *children;
unsigned int nchildren;
int i;
Window retval = None;
gint old_warnings = _gdk_error_warnings;
_gdk_error_code = 0;
_gdk_error_warnings = 0;
if (XQueryTree(gdk_display, _gdk_root_window,
&root, &parent, &children, &nchildren) == 0)
return 0;
for (i = nchildren - 1; (i >= 0) && (retval == None); i--)
{
if (children[i] != ignore)
{
XWindowAttributes xwa;
XGetWindowAttributes (gdk_display, children[i], &xwa);
if (_gdk_error_code)
_gdk_error_code = 0;
else if ((xwa.map_state == IsViewable) &&
(x_root >= xwa.x) && (x_root < xwa.x + (gint)xwa.width) &&
(y_root >= xwa.y) && (y_root < xwa.y + (gint)xwa.height))
{