callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make gdk_window_foreign_new fail gracefully

Browse Source
This commit is contained in:
Elliot Lee
1998-07-16 19:41:12 +00:00
parent 8f733319d1
commit 5e3acecc12
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/gdkwindow.c
View File

@ -465,17 +465,21 @@ gdk_window_foreign_new (guint32 anid)
GdkWindowPrivate *parent_private; GdkWindowPrivate *parent_private;
XWindowAttributes attrs; XWindowAttributes attrs;
Window root, parent; Window root, parent;
Window *children; Window *children = NULL;
guint nchildren; guint nchildren;
if(!XGetWindowAttributes (gdk_display, anid, &attrs)) {
g_warning("XGetWindowAttributes failed on window ID %d\n", anid);
return NULL;
}
private = g_new (GdkWindowPrivate, 1); private = g_new (GdkWindowPrivate, 1);
window = (GdkWindow*) private; window = (GdkWindow*) private;
XGetWindowAttributes (gdk_display, anid, &attrs);
/* FIXME: This is pretty expensive. Maybe the caller should supply /* FIXME: This is pretty expensive. Maybe the caller should supply
* the parent */ * the parent */
XQueryTree (gdk_display, anid, &root, &parent, &children, &nchildren); XQueryTree (gdk_display, anid, &root, &parent, &children, &nchildren);
if (children) if (children)
XFree (children); XFree (children);
private->parent = gdk_xid_table_lookup (parent); private->parent = gdk_xid_table_lookup (parent);

10
gdk/x11/gdkwindow-x11.c
View File

@ -465,17 +465,21 @@ gdk_window_foreign_new (guint32 anid)
GdkWindowPrivate *parent_private; GdkWindowPrivate *parent_private;
XWindowAttributes attrs; XWindowAttributes attrs;
Window root, parent; Window root, parent;
Window *children; Window *children = NULL;
guint nchildren; guint nchildren;
if(!XGetWindowAttributes (gdk_display, anid, &attrs)) {
g_warning("XGetWindowAttributes failed on window ID %d\n", anid);
return NULL;
}
private = g_new (GdkWindowPrivate, 1); private = g_new (GdkWindowPrivate, 1);
window = (GdkWindow*) private; window = (GdkWindow*) private;
XGetWindowAttributes (gdk_display, anid, &attrs);
/* FIXME: This is pretty expensive. Maybe the caller should supply /* FIXME: This is pretty expensive. Maybe the caller should supply
* the parent */ * the parent */
XQueryTree (gdk_display, anid, &root, &parent, &children, &nchildren); XQueryTree (gdk_display, anid, &root, &parent, &children, &nchildren);
if (children) if (children)
XFree (children); XFree (children);
private->parent = gdk_xid_table_lookup (parent); private->parent = gdk_xid_table_lookup (parent);