summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdk/broadway/gdkwindow-broadway.c27
-rw-r--r--gdk/gdk.c7
-rw-r--r--gdk/gdkinternals.h1
-rw-r--r--gdk/gdkwindow.c726
-rw-r--r--gdk/gdkwindow.h2
-rw-r--r--gdk/gdkwindowimpl.h11
-rw-r--r--gdk/mir/gdkmirwindowimpl.c32
-rw-r--r--gdk/quartz/gdkwindow-quartz.c16
-rw-r--r--gdk/wayland/gdkwindow-wayland.c27
-rw-r--r--gdk/win32/gdkwindow-win32.c61
-rw-r--r--gdk/x11/gdkgeometry-x11.c44
-rw-r--r--gdk/x11/gdkprivate-x11.h5
-rw-r--r--gdk/x11/gdkproperty-x11.c6
-rw-r--r--gdk/x11/gdkselection-x11.c12
-rw-r--r--gdk/x11/gdkwindow-x11.c285
15 files changed, 118 insertions, 1144 deletions
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 5004d4c31b..2d68880fdf 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -385,11 +385,6 @@ _gdk_broadway_window_destroy (GdkWindow *window,
impl->id);
}
-static void
-gdk_broadway_window_destroy_foreign (GdkWindow *window)
-{
-}
-
/* This function is called when the XWindow is really gone.
*/
static void
@@ -523,12 +518,6 @@ gdk_window_broadway_raise (GdkWindow *window)
}
static void
-gdk_window_broadway_restack_under (GdkWindow *window,
- GList *native_siblings /* in requested order, first is bottom-most */)
-{
-}
-
-static void
gdk_window_broadway_restack_toplevel (GdkWindow *window,
GdkWindow *sibling,
gboolean above)
@@ -1012,18 +1001,6 @@ gdk_broadway_window_set_functions (GdkWindow *window,
return;
}
-static cairo_region_t *
-gdk_broadway_window_get_shape (GdkWindow *window)
-{
- return NULL;
-}
-
-static cairo_region_t *
-gdk_broadway_window_get_input_shape (GdkWindow *window)
-{
- return NULL;
-}
-
static void
gdk_broadway_window_end_paint (GdkWindow *window)
{
@@ -1516,7 +1493,6 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
impl_class->get_events = gdk_window_broadway_get_events;
impl_class->raise = gdk_window_broadway_raise;
impl_class->lower = gdk_window_broadway_lower;
- impl_class->restack_under = gdk_window_broadway_restack_under;
impl_class->restack_toplevel = gdk_window_broadway_restack_toplevel;
impl_class->move_resize = gdk_window_broadway_move_resize;
impl_class->reparent = gdk_window_broadway_reparent;
@@ -1527,9 +1503,6 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
impl_class->shape_combine_region = gdk_window_broadway_shape_combine_region;
impl_class->input_shape_combine_region = gdk_window_broadway_input_shape_combine_region;
impl_class->destroy = _gdk_broadway_window_destroy;
- impl_class->destroy_foreign = gdk_broadway_window_destroy_foreign;
- impl_class->get_shape = gdk_broadway_window_get_shape;
- impl_class->get_input_shape = gdk_broadway_window_get_input_shape;
impl_class->end_paint = gdk_broadway_window_end_paint;
impl_class->beep = gdk_broadway_window_beep;
diff --git a/gdk/gdk.c b/gdk/gdk.c
index abcbfd28d4..5d4cf35799 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -316,13 +316,6 @@ gdk_pre_parse (void)
(GDebugKey *) gdk_vulkan_keys,
G_N_ELEMENTS (gdk_vulkan_keys));
- if (getenv ("GDK_NATIVE_WINDOWS"))
- {
- g_warning ("The GDK_NATIVE_WINDOWS environment variable is not supported in GTK3.\n"
- "See the documentation for gdk_window_ensure_native() on how to get native windows.");
- g_unsetenv ("GDK_NATIVE_WINDOWS");
- }
-
rendering_mode = g_getenv ("GDK_RENDERING");
if (rendering_mode)
{
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index ab6ef3b15e..5b2193c891 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -192,7 +192,6 @@ struct _GdkWindow
GList *filters;
GList *children;
GList children_list_node;
- GList *native_children;
struct {
/* The temporary surface that we're painting to. This will be composited
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 0ce2fb8997..356fb87baa 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -79,15 +79,9 @@
*
* With the addition of client side windows this changes a bit. The
* application-visible GdkWindow object behaves as it did before, but
- * not all such windows now have a corresponding native
- * window. Instead windows that are “client side” are emulated by the
- * gdk code such that clipping, drawing, moving, events etc work as
- * expected.
- *
- * For GdkWindows that have a native window the “impl” object is the
- * same as before. However, for all client side windows the impl object
- * is shared with its parent (i.e. all client windows descendants of one
- * native window has the same impl.
+ * such windows now don't a corresponding native window. Instead subwindows
+ * windows are “client side”, i.e. emulated by the gdk code such
+ * that clipping, drawing, moving, events etc work as expected.
*
* GdkWindows have a pointer to the “impl window” they are in, i.e.
* the topmost GdkWindow which have the same “impl” value. This is stored
@@ -97,15 +91,6 @@
* (x, y), the size of the window (width, height), the position of the window
* with respect to the impl window (abs_x, abs_y). We also track the clip
* region of the window wrt parent windows, in window-relative coordinates (clip_region).
- *
- * All toplevel windows are native windows, but also child windows can
- * be native. We always listen to a basic set of events (see
- * get_native_event_mask) for these windows so that we can emulate
- * events for any client side children.
- *
- * For native windows we apply the calculated clip region as a window shape
- * so that eg. client side siblings that overlap the native child properly
- * draws over the native child window.
*/
/* This adds a local value to the GdkVisibilityState enum */
@@ -141,7 +126,6 @@ static void gdk_window_clear_backing_region (GdkWindow *window);
static void recompute_visible_regions (GdkWindow *private,
gboolean recalculate_children);
static void gdk_window_invalidate_in_parent (GdkWindow *private);
-static void move_native_children (GdkWindow *private);
static void update_cursor (GdkDisplay *display,
GdkDevice *device);
static void impl_window_add_update_area (GdkWindow *impl_window,
@@ -519,7 +503,6 @@ remove_sibling_overlapped_area (GdkWindow *window,
cairo_region_t *child_region;
GdkRectangle r;
GList *l;
- cairo_region_t *shape;
parent = window->parent;
@@ -553,15 +536,6 @@ remove_sibling_overlapped_area (GdkWindow *window,
cairo_region_intersect (child_region, sibling->shape);
cairo_region_translate (sibling->shape, -sibling->x, -sibling->y);
}
- else if (window->window_type == GDK_WINDOW_FOREIGN)
- {
- shape = GDK_WINDOW_IMPL_GET_CLASS (sibling)->get_shape (sibling);
- if (shape)
- {
- cairo_region_intersect (child_region, shape);
- cairo_region_destroy (shape);
- }
- }
cairo_region_subtract (region, child_region);
cairo_region_destroy (child_region);
@@ -582,7 +556,6 @@ remove_child_area (GdkWindow *window,
cairo_region_t *child_region;
GdkRectangle r;
GList *l;
- cairo_region_t *shape;
for (l = window->children; l; l = l->next)
{
@@ -614,29 +587,11 @@ remove_child_area (GdkWindow *window,
cairo_region_intersect (child_region, child->shape);
cairo_region_translate (child->shape, -child->x, -child->y);
}
- else if (window->window_type == GDK_WINDOW_FOREIGN)
- {
- shape = GDK_WINDOW_IMPL_GET_CLASS (child)->get_shape (child);
- if (shape)
- {
- cairo_region_intersect (child_region, shape);
- cairo_region_destroy (shape);
- }
- }
if (for_input)
{
if (child->input_shape)
cairo_region_intersect (child_region, child->input_shape);
- else if (window->window_type == GDK_WINDOW_FOREIGN)
- {
- shape = GDK_WINDOW_IMPL_GET_CLASS (child)->get_input_shape (child);
- if (shape)
- {
- cairo_region_intersect (child_region, shape);
- cairo_region_destroy (shape);
- }
- }
}
cairo_region_subtract (region, child_region);
@@ -708,8 +663,7 @@ should_apply_clip_as_shape (GdkWindow *window)
return
gdk_window_has_impl (window) &&
/* Not for non-shaped toplevels */
- (!gdk_window_is_toplevel (window) ||
- window->shape != NULL || window->applied_shape) &&
+ (window->shape != NULL || window->applied_shape) &&
/* or for foreign windows */
window->window_type != GDK_WINDOW_FOREIGN &&
/* or for the root window */
@@ -967,64 +921,6 @@ _gdk_window_update_size (GdkWindow *window)
recompute_visible_regions (window, FALSE);
}
-/* Find the native window that would be just above "child"
- * in the native stacking order if “child” was a native window
- * (it doesn’t have to be native). If there is no such native
- * window inside this native parent then NULL is returned.
- * If child is NULL, find lowest native window in parent.
- */
-static GdkWindow *
-find_native_sibling_above_helper (GdkWindow *parent,
- GdkWindow *child)
-{
- GdkWindow *w;
- GList *l;
-
- if (child)
- {
- l = g_list_find (parent->children, child);
- g_assert (l != NULL); /* Better be a child of its parent... */
- l = l->prev; /* Start looking at the one above the child */
- }
- else
- l = g_list_last (parent->children);
-
- for (; l != NULL; l = l->prev)
- {
- w = l->data;
-
- if (gdk_window_has_impl (w))
- return w;
-
- g_assert (parent != w);
- w = find_native_sibling_above_helper (w, NULL);
- if (w)
- return w;
- }
-
- return NULL;
-}
-
-
-static GdkWindow *
-find_native_sibling_above (GdkWindow *parent,
- GdkWindow *child)
-{
- GdkWindow *w;
-
- if (!parent)
- return NULL;
-
- w = find_native_sibling_above_helper (parent, child);
- if (w)
- return w;
-
- if (gdk_window_has_impl (parent))
- return NULL;
- else
- return find_native_sibling_above (parent->parent, parent);
-}
-
static GdkEventMask
get_native_device_event_mask (GdkWindow *private,
GdkDevice *device)
@@ -1057,32 +953,11 @@ get_native_device_event_mask (GdkWindow *private,
mask |=
GDK_EXPOSURE_MASK |
GDK_VISIBILITY_NOTIFY_MASK |
- GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK;
-
- /* Additionally we select for pointer and button events
- * for toplevels as we need to get these to emulate
- * them for non-native subwindows. Even though we don't
- * select on them for all native windows we will get them
- * as the events are propagated out to the first window
- * that select for them.
- * Not selecting for button press on all windows is an
- * important thing, because in X only one client can do
- * so, and we don't want to unexpectedly prevent another
- * client from doing it.
- *
- * We also need to do the same if the app selects for button presses
- * because then we will get implicit grabs for this window, and the
- * event mask used for that grab is based on the rest of the mask
- * for the window, but we might need more events than this window
- * lists due to some non-native child window.
- */
- if (gdk_window_is_toplevel (private) ||
- mask & GDK_BUTTON_PRESS_MASK)
- mask |=
- GDK_TOUCH_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_SCROLL_MASK;
+ GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+ GDK_TOUCH_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+ GDK_SCROLL_MASK;
return mask;
}
@@ -1094,28 +969,6 @@ get_native_event_mask (GdkWindow *private)
return get_native_device_event_mask (private, NULL);
}
-/* Puts the native window in the right order wrt the other native windows
- * in the hierarchy, given the position it has in the client side data.
- * This is useful if some operation changed the stacking order.
- * This calls assumes the native window is now topmost in its native parent.
- */
-static void
-sync_native_window_stack_position (GdkWindow *window)
-{
- GdkWindow *above;
- GdkWindowImplClass *impl_class;
- GList listhead = {0};
-
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
-
- above = find_native_sibling_above (window->parent, window);
- if (above)
- {
- listhead.data = window;
- impl_class->restack_under (above, &listhead);
- }
-}
-
GdkWindow*
gdk_window_new (GdkWindow *parent,
GdkWindowAttr *attributes)
@@ -1181,7 +1034,7 @@ gdk_window_new (GdkWindow *parent,
case GDK_WINDOW_TEMP:
if (GDK_WINDOW_TYPE (parent) != GDK_WINDOW_ROOT)
g_warning (G_STRLOC "Toplevel windows must be created as children of\n"
- "of a window of type GDK_WINDOW_ROOT or GDK_WINDOW_FOREIGN");
+ "a window of type GDK_WINDOW_ROOT");
break;
case GDK_WINDOW_SUBSURFACE:
#ifdef GDK_WINDOWING_WAYLAND
@@ -1193,6 +1046,13 @@ gdk_window_new (GdkWindow *parent,
#endif
break;
case GDK_WINDOW_CHILD:
+ if (GDK_WINDOW_TYPE (parent) == GDK_WINDOW_ROOT ||
+ GDK_WINDOW_TYPE (parent) == GDK_WINDOW_FOREIGN)
+ {
+ g_warning (G_STRLOC "Child windows must not be created as children of\n"
+ "a window of type GDK_WINDOW_ROOT or GDK_WINDOW_FOREIGN");
+ return NULL;
+ }
break;
default:
g_warning (G_STRLOC "cannot make windows of type %d", window->window_type);
@@ -1235,13 +1095,6 @@ gdk_window_new (GdkWindow *parent,
/* Create the impl */
_gdk_display_create_window_impl (display, window, parent, screen, event_mask, attributes);
window->impl_window = window;
-
- parent->impl_window->native_children = g_list_prepend (parent->impl_window->native_children, window);
-
- /* This will put the native window topmost in the native parent, which may
- * be wrong wrt other native windows in the non-native hierarchy, so restack */
- if (!_gdk_window_has_impl (parent))
- sync_native_window_stack_position (window);
}
else
{
@@ -1478,49 +1331,12 @@ change_impl (GdkWindow *private,
{
child = l->data;
- if (child->impl == old_impl)
- change_impl (child, impl_window, new);
- else
- {
- /* The child is a native, update native_children */
- old_impl_window->native_children =
- g_list_remove (old_impl_window->native_children, child);
- impl_window->native_children =
- g_list_prepend (impl_window->native_children, child);
- }
- }
-}
-
-static void
-reparent_to_impl (GdkWindow *private)
-{
- GList *l;
- GdkWindow *child;
- gboolean show;
- GdkWindowImplClass *impl_class;
-
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (private->impl);
-
- /* Enumerate in reverse order so we get the right order for the native
- windows (first in childrens list is topmost, and reparent places on top) */
- for (l = g_list_last (private->children); l != NULL; l = l->prev)
- {
- child = l->data;
+ g_assert (child->impl == old_impl); /* All children should be the same impl */
- if (child->impl == private->impl)
- reparent_to_impl (child);
- else
- {
- show = impl_class->reparent ((GdkWindow *)child,
- (GdkWindow *)private,
- child->x, child->y);
- if (show)
- gdk_window_show_unraised ((GdkWindow *)child);
- }
+ change_impl (child, impl_window, new);
}
}
-
/**
* gdk_window_reparent:
* @window: a #GdkWindow
@@ -1541,7 +1357,6 @@ gdk_window_reparent (GdkWindow *window,
GdkWindow *old_parent;
GdkScreen *screen;
gboolean show, was_mapped;
- gboolean do_reparent_to_impl;
GdkEventMask old_native_event_mask;
GdkWindowImplClass *impl_class;
@@ -1557,6 +1372,21 @@ gdk_window_reparent (GdkWindow *window,
if (!new_parent)
new_parent = gdk_screen_get_root_window (screen);
+ /* Don't allow reparenting to/from toplevel status */
+ if (!gdk_window_is_toplevel (window) && (new_parent->window_type == GDK_WINDOW_ROOT ||
+ new_parent->window_type == GDK_WINDOW_FOREIGN))
+ {
+ g_warning ("Can't reparent to toplevel");
+ return;
+ }
+
+ if (gdk_window_is_toplevel (window) && (new_parent->window_type != GDK_WINDOW_ROOT ||
+ new_parent->window_type != GDK_WINDOW_FOREIGN))
+ {
+ g_warning ("Can't reparent from toplevel");
+ return;
+ }
+
/* No input-output children of input-only windows */
if (new_parent->input_only && !window->input_only)
return;
@@ -1570,29 +1400,26 @@ gdk_window_reparent (GdkWindow *window,
was_mapped = GDK_WINDOW_IS_MAPPED (window);
- /* Reparenting to toplevel. Ensure we have a native window so this can work */
- if (new_parent->window_type == GDK_WINDOW_ROOT ||
- new_parent->window_type == GDK_WINDOW_FOREIGN)
- gdk_window_ensure_native (window);
-
old_native_event_mask = 0;
- do_reparent_to_impl = FALSE;
if (gdk_window_has_impl (window))
{
+ /* This shouldn't happen, check anyway to see if that ever fails */
+ g_assert (new_parent->window_type == GDK_WINDOW_ROOT ||
+ new_parent->window_type == GDK_WINDOW_FOREIGN);
+
old_native_event_mask = get_native_event_mask (window);
/* Native window */
show = impl_class->reparent (window, new_parent, x, y);
}
else
{
- /* This shouldn't happen, as we created a native in this case, check anyway to see if that ever fails */
+ /* This shouldn't happen, check anyway to see if that ever fails */
g_assert (new_parent->window_type != GDK_WINDOW_ROOT &&
new_parent->window_type != GDK_WINDOW_FOREIGN);
show = was_mapped;
gdk_window_hide (window);
- do_reparent_to_impl = TRUE;
change_impl (window,
new_parent->impl_window,
new_parent->impl);
@@ -1607,13 +1434,7 @@ gdk_window_reparent (GdkWindow *window,
}
if (old_parent)
- {
- old_parent->children = g_list_remove_link (old_parent->children, &window->children_list_node);
-
- if (gdk_window_has_impl (window))
- old_parent->impl_window->native_children =
- g_list_remove (old_parent->impl_window->native_children, window);
- }
+ old_parent->children = g_list_remove_link (old_parent->children, &window->children_list_node);
window->parent = new_parent;
window->x = x;
@@ -1621,9 +1442,6 @@ gdk_window_reparent (GdkWindow *window,
new_parent->children = g_list_concat (&window->children_list_node, new_parent->children);
- if (gdk_window_has_impl (window))
- new_parent->impl_window->native_children = g_list_prepend (new_parent->impl_window->native_children, window);
-
/* Switch the window type as appropriate */
switch (GDK_WINDOW_TYPE (new_parent))
@@ -1685,17 +1503,6 @@ gdk_window_reparent (GdkWindow *window,
recompute_visible_regions (window, FALSE);
- if (do_reparent_to_impl)
- reparent_to_impl (window);
- else
- {
- /* The reparent will have put the native window topmost in the native parent,
- * which may be wrong wrt other native windows in the non-native hierarchy,
- * so restack */
- if (!gdk_window_has_impl (new_parent))
- sync_native_window_stack_position (window);
- }
-
if (show)
gdk_window_show_unraised (window);
else
@@ -1703,93 +1510,6 @@ gdk_window_reparent (GdkWindow *window,
}
/**
- * gdk_window_ensure_native:
- * @window: a #GdkWindow
- *
- * Tries to ensure that there is a window-system native window for this
- * GdkWindow. This may fail in some situations, returning %FALSE.
- *
- * Some backends may not support native child windows.
- *
- * Returns: %TRUE if the window has a native window, %FALSE otherwise
- *
- * Since: 2.18
- */
-gboolean
-gdk_window_ensure_native (GdkWindow *window)
-{
- GdkWindow *impl_window;
- GdkWindowImpl *new_impl, *old_impl;
- GdkDisplay *display;
- GdkScreen *screen;
- GdkWindow *above, *parent;
- GList listhead;
- GdkWindowImplClass *impl_class;
-
- g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
-
- if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_ROOT ||
- GDK_WINDOW_DESTROYED (window))
- return FALSE;
-
- impl_window = gdk_window_get_impl_window (window);
-
- if (impl_window == window)
- /* Already has an impl. */
- return TRUE;
-
- /* Need to create a native window */
-
- screen = gdk_window_get_screen (window);
- display = gdk_screen_get_display (screen);
- parent = window->parent;
-
- old_impl = window->impl;
- _gdk_display_create_window_impl (display,
- window, parent,
- screen,
- get_native_event_mask (window),
- NULL);
- new_impl = window->impl;
-
- parent->impl_window->native_children =
- g_list_prepend (parent->impl_window->native_children, window);
-
- window->impl = old_impl;
- change_impl (window, window, new_impl);
-
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
-
- /* Native window creation will put the native window topmost in the
- * native parent, which may be wrong wrt the position of the previous
- * non-native window wrt to the other non-native children, so correct this.
- */
- above = find_native_sibling_above (parent, window);
- if (above)
- {
- listhead.data = window;
- listhead.prev = NULL;
- listhead.next = NULL;
- impl_class->restack_under ((GdkWindow *)above, &listhead);
- }
-
- recompute_visible_regions (window, FALSE);
-
- reparent_to_impl (window);
-
- impl_class->input_shape_combine_region (window,
- window->input_shape,
- 0, 0);
-
- if (gdk_window_is_viewable (window))
- impl_class->show (window, FALSE);
-
- gdk_window_invalidate_in_parent (window);
-
- return TRUE;
-}
-
-/**
* _gdk_event_filter_unref:
* @window: (allow-none): A #GdkWindow, or %NULL to be the global window
* @filter: A window filter
@@ -1934,21 +1654,7 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
case GDK_WINDOW_SUBSURFACE:
if (window->window_type == GDK_WINDOW_FOREIGN && !foreign_destroy)
{
- /* Logically, it probably makes more sense to send
- * a "destroy yourself" message to the foreign window
- * whether or not it's in our hierarchy; but for historical
- * reasons, we only send "destroy yourself" messages to
- * foreign windows in our hierarchy.
- */
- if (window->parent)
- {
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
-
- if (gdk_window_has_impl (window))
- impl_class->destroy_foreign (window);
- }
-
- /* Also for historical reasons, we remove any filters
+ /* For historical reasons, we remove any filters
* on a foreign window when it or a parent is destroyed;
* this likely causes problems if two separate portions
* of code are maintaining filter lists on a foreign window.
@@ -1962,10 +1668,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
if (window->parent->children)
window->parent->children = g_list_remove_link (window->parent->children, &window->children_list_node);
- if (gdk_window_has_impl (window))
- window->parent->impl_window->native_children =
- g_list_remove (window->parent->impl_window->native_children, window);
-
if (!recursing &&
GDK_WINDOW_IS_MAPPED (window))
{
@@ -2009,10 +1711,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
recursing_native || gdk_window_has_impl (window),
foreign_destroy);
}
-
-
- if (gdk_window_has_impl (window))
- g_assert (window->native_children == NULL);
}
_gdk_window_clear_update_area (window);
@@ -2407,8 +2105,11 @@ gdk_window_add_filter (GdkWindow *window,
/* Filters are for the native events on the native window, so
ensure there is a native window. */
- if (window)
- gdk_window_ensure_native (window);
+ if (window && !gdk_window_has_impl (window))
+ {
+ g_warning ("Filters only work on toplevel windows");
+ return;
+ }
if (window)
tmp_list = window->filters;
@@ -3296,18 +2997,8 @@ _gdk_window_process_updates_recurse (GdkWindow *window,
static void
gdk_window_update_native_shapes (GdkWindow *window)
{
- GdkWindow *child;
- GList *l;
-
if (should_apply_clip_as_shape (window))
apply_clip_as_shape (window);
-
- for (l = window->native_children; l != NULL; l = l->next)
- {
- child = l->data;
-
- gdk_window_update_native_shapes (child);
- }
}
/* Process and remove any invalid area on the native window by creating
@@ -3470,86 +3161,6 @@ static void
gdk_window_invalidate_maybe_recurse_full (GdkWindow *window,
const cairo_region_t *region,
GdkWindowChildFunc child_func,
- gpointer user_data);
-
-/* Returns true if window is a decendant of parent, but stops looking
- * at the first native window. Also ensures that all parents match
- * child_func if non-null..
- *
- * This is useful in combination with
- * window->impl_window->native_children as it lets you find all native
- * decendants in an efficient way (assuming few children are native).
- */
-static gboolean
-has_visible_ancestor_in_impl (GdkWindow *window,
- GdkWindow *ancestor,
- GdkWindowChildFunc child_func,
- gpointer user_data)
-{
- GdkWindow *p;
- GdkWindow *stop_at;
-
- p = window->parent;
- stop_at = p->impl_window;
- while (p != NULL)
- {
- if (!p->viewable)
- return FALSE;
- if (child_func &&
- !(*child_func) ((GdkWindow *)p, user_data))
- return FALSE;
- if (p == ancestor)
- return TRUE;
- if (p == stop_at)
- return FALSE;
- p = p->parent;
- }
- return FALSE;
-}
-
-static void
-invalidate_impl_subwindows (GdkWindow *window,
- const cairo_region_t *region,
- GdkWindowChildFunc child_func,
- gpointer user_data)
-{
- GList *l;
-
- /* Iterate over all native children of the native window
- that window is in. */
- for (l = window->impl_window->native_children;
- l != NULL;
- l = l->next)
- {
- GdkWindow *native_child = l->data;
- cairo_region_t *tmp;
- int dx, dy;
-
- if (native_child->input_only)
- continue;
-
- /* Then skip any that does not have window as an ancestor,
- * also checking that the ancestors are visible and pass child_func
- * This is fast if we assume native children are rare */
- if (!has_visible_ancestor_in_impl (native_child, window,
- child_func, user_data))
- continue;
-
- dx = native_child->parent->abs_x + native_child->x - window->abs_x;
- dy = native_child->parent->abs_y + native_child->y - window->abs_y;
-
- tmp = cairo_region_copy (region);
- cairo_region_translate (tmp, -dx, -dy);
- gdk_window_invalidate_maybe_recurse_full (native_child,
- tmp, child_func, user_data);
- cairo_region_destroy (tmp);
- }
-}
-
-static void
-gdk_window_invalidate_maybe_recurse_full (GdkWindow *window,
- const cairo_region_t *region,
- GdkWindowChildFunc child_func,
gpointer user_data)
{
cairo_region_t *visible_region;
@@ -3571,9 +3182,6 @@ gdk_window_invalidate_maybe_recurse_full (GdkWindow *window,
visible_region = cairo_region_copy (region);
- if (child_func)
- invalidate_impl_subwindows (window, region, child_func, user_data);
-
while (window != NULL &&
!cairo_region_is_empty (visible_region))
{
@@ -3688,8 +3296,7 @@ gdk_window_invalidate_region (GdkWindow *window,
*
* This version of invalidation is used when you recieve expose events
* from the native window system. It exposes the native window, plus
- * any non-native child windows (but not native child windows, as those would
- * have gotten their own expose events).
+ * any non-native child windows.
**/
void
_gdk_window_invalidate_for_expose (GdkWindow *window,
@@ -4094,32 +3701,11 @@ gdk_get_default_root_window (void)
return gdk_screen_get_root_window (gdk_screen_get_default ());
}
-static void
-get_all_native_children (GdkWindow *window,
- GList **native)
-{
- GdkWindow *child;
- GList *l;
-
- for (l = window->children; l != NULL; l = l->next)
- {
- child = l->data;
-
- if (gdk_window_has_impl (child))
- *native = g_list_prepend (*native, child);
- else
- get_all_native_children (child, native);
- }
-}
-
static gboolean
gdk_window_raise_internal (GdkWindow *window)
{
GdkWindow *parent = window->parent;
- GdkWindow *above;
- GList *native_children;
- GList *l, listhead;
GdkWindowImplClass *impl_class;
gboolean did_raise = FALSE;
@@ -4131,51 +3717,10 @@ gdk_window_raise_internal (GdkWindow *window)
}
impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
+
/* Just do native raise for toplevels */
- if (gdk_window_is_toplevel (window) ||
- /* The restack_under codepath should work correctly even if the parent
- is native, but it relies on the order of ->children to be correct,
- and some apps like SWT reorder the x windows without gdks knowledge,
- so we use raise directly in order to make these behave as before
- when using native windows */
- (gdk_window_has_impl (window) && gdk_window_has_impl (parent)))
- {
+ if (gdk_window_has_impl (window))
impl_class->raise (window);
- }
- else if (gdk_window_has_impl (window))
- {
- above = find_native_sibling_above (parent, window);
- if (above)
- {
- listhead.data = window;
- listhead.next = NULL;
- listhead.prev = NULL;
- impl_class->restack_under ((GdkWindow *)above,
- &listhead);
- }
- else
- impl_class->raise (window);
- }
- else
- {
- native_children = NULL;
- get_all_native_children (window, &native_children);
- if (native_children != NULL)
- {
- above = find_native_sibling_above (parent, window);
-
- if (above)
- impl_class->restack_under (above, native_children);
- else
- {
- /* Right order, since native_children is bottom-topmost first */
- for (l = native_children; l != NULL; l = l->next)
- impl_class->raise (l->data);
- }
-
- g_list_free (native_children);
- }
- }
return did_raise;
}
@@ -4186,7 +3731,6 @@ set_viewable (GdkWindow *w,
gboolean val)
{
GdkWindow *child;
- GdkWindowImplClass *impl_class;
GList *l;
if (w->viewable == val)
@@ -4201,47 +3745,10 @@ set_viewable (GdkWindow *w,
{
child = l->data;
- if (GDK_WINDOW_IS_MAPPED (child) &&
- child->window_type != GDK_WINDOW_FOREIGN)
+ if (GDK_WINDOW_IS_MAPPED (child))
set_viewable (child, val);
}
- if (gdk_window_has_impl (w) &&
- w->window_type != GDK_WINDOW_FOREIGN &&
- !gdk_window_is_toplevel (w))
- {
- /* For most native windows we show/hide them not when they are
- * mapped/unmapped, because that may not produce the correct results.
- * For instance, if a native window have a non-native parent which is
- * hidden, but its native parent is viewable then showing the window
- * would make it viewable to X but its not viewable wrt the non-native
- * hierarchy. In order to handle this we track the gdk side viewability
- * and only map really viewable windows.
- *
- * There are two exceptions though:
- *
- * For foreign windows we don't want ever change the mapped state
- * except when explicitly done via gdk_window_show/hide, as this may
- * cause problems for client owning the foreign window when its window
- * is suddenly mapped or unmapped.
- *
- * For toplevel windows embedded in a foreign window (e.g. a plug)
- * we sometimes synthesize a map of a window, but the native
- * window is really shown by the embedder, so we don't want to
- * do the show ourselves. We can't really tell this case from the normal
- * toplevel show as such toplevels are seen by gdk as parents of the
- * root window, so we make an exception for all toplevels.
- */
-
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (w->impl);
- if (val)
- impl_class->show ((GdkWindow *)w, FALSE);
- else
- impl_class->hide ((GdkWindow *)w);
-
- return TRUE;
- }
-
return FALSE;
}
@@ -4388,9 +3895,6 @@ gdk_window_lower_internal (GdkWindow *window)
{
GdkWindow *parent = window->parent;
GdkWindowImplClass *impl_class;
- GdkWindow *above;
- GList *native_children;
- GList *l, listhead;
if (parent)
{
@@ -4399,52 +3903,10 @@ gdk_window_lower_internal (GdkWindow *window)
}
impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
- /* Just do native lower for toplevels */
- if (gdk_window_is_toplevel (window) ||
- /* The restack_under codepath should work correctly even if the parent
- is native, but it relies on the order of ->children to be correct,
- and some apps like SWT reorder the x windows without gdks knowledge,
- so we use lower directly in order to make these behave as before
- when using native windows */
- (gdk_window_has_impl (window) && gdk_window_has_impl (parent)))
- {
- impl_class->lower (window);
- }
- else if (gdk_window_has_impl (window))
- {
- above = find_native_sibling_above (parent, window);
- if (above)
- {
- listhead.data = window;
- listhead.next = NULL;
- listhead.prev = NULL;
- impl_class->restack_under ((GdkWindow *)above, &listhead);
- }
- else
- impl_class->raise (window);
- }
- else
- {
- native_children = NULL;
- get_all_native_children (window, &native_children);
- if (native_children != NULL)
- {
- above = find_native_sibling_above (parent, window);
- if (above)
- impl_class->restack_under ((GdkWindow *)above,
- native_children);
- else
- {
- /* Right order, since native_children is bottom-topmost first */
- for (l = native_children; l != NULL; l = l->next)
- impl_class->raise (l->data);
- }
-
- g_list_free (native_children);
- }
-
- }
+ /* Just do native lower for toplevels */
+ if (gdk_window_has_impl (window))
+ impl_class->lower (window);
}
static void
@@ -4526,10 +3988,7 @@ gdk_window_restack (GdkWindow *window,
{
GdkWindowImplClass *impl_class;
GdkWindow *parent;
- GdkWindow *above_native;
GList *sibling_link;
- GList *native_children;
- GList *l, listhead;
g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (sibling == NULL || GDK_IS_WINDOW (sibling));
@@ -4571,41 +4030,6 @@ gdk_window_restack (GdkWindow *window,
parent->children = list_insert_link_before (parent->children,
sibling_link->next,
&window->children_list_node);
-
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
- if (gdk_window_has_impl (window))
- {
- above_native = find_native_sibling_above (parent, window);
- if (above_native)
- {
- listhead.data = window;
- listhead.next = NULL;
- listhead.prev = NULL;
- impl_class->restack_under (above_native, &listhead);
- }
- else
- impl_class->raise (window);
- }
- else
- {
- native_children = NULL;
- get_all_native_children (window, &native_children);
- if (native_children != NULL)
- {
- above_native = find_native_sibling_above (parent, window);
- if (above_native)
- impl_class->restack_under (above_native,
- native_children);
- else
- {
- /* Right order, since native_children is bottom-topmost first */
- for (l = native_children; l != NULL; l = l->next)
- impl_class->raise (l->data);
- }
-
- g_list_free (native_children);
- }
- }
}
_gdk_synthesize_crossing_events_for_geometry_change (window);
@@ -4981,29 +4405,6 @@ gdk_window_move_resize_toplevel (GdkWindow *window,
static void
-move_native_children (GdkWindow *private)
-{
- GList *l;
- GdkWindow *child;
- GdkWindowImplClass *impl_class;
-
- for (l = private->children; l; l = l->next)
- {
- child = l->data;
-
- if (child->impl != private->impl)
- {
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (child->impl);
- impl_class->move_resize (child, TRUE,
- child->x, child->y,
- child->width, child->height);
- }
- else
- move_native_children (child);
- }
-}
-
-static void
gdk_window_move_resize_internal (GdkWindow *window,
gboolean with_move,
gint x,
@@ -5012,9 +4413,7 @@ gdk_window_move_resize_internal (GdkWindow *window,
gint height)
{
cairo_region_t *old_region, *new_region;
- GdkWindowImplClass *impl_class;
gboolean expose;
- int old_abs_x, old_abs_y;
g_return_if_fail (GDK_IS_WINDOW (window));
@@ -5072,25 +4471,8 @@ gdk_window_move_resize_internal (GdkWindow *window,
window->height = height;
}
- old_abs_x = window->abs_x;
- old_abs_y = window->abs_y;
-
recompute_visible_regions (window, FALSE);
- if (gdk_window_has_impl (window))
- {
- impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
-
- /* Do the actual move after recomputing things, as this will have set the shape to
- the now correct one, thus avoiding copying regions that should not be copied. */
- impl_class->move_resize (window, TRUE,
- window->x, window->y,
- window->width, window->height);
- }
- else if (old_abs_x != window->abs_x ||
- old_abs_y != window->abs_y)
- move_native_children (window);
-
if (expose)
{
GdkRectangle r;
@@ -5289,8 +4671,6 @@ gdk_window_scroll (GdkWindow *window,
recompute_visible_regions (window, TRUE);
- move_native_children (window);
-
gdk_window_invalidate_rect_full (window, NULL, TRUE);
_gdk_synthesize_crossing_events_for_geometry_change (window);
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 0ddc53178a..0acd77c1d8 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -516,8 +516,6 @@ void gdk_window_move_region (GdkWindow *window,
const cairo_region_t *region,
gint dx,
gint dy);
-GDK_AVAILABLE_IN_ALL
-gboolean gdk_window_ensure_native (GdkWindow *window);
/*
* This allows for making shaped (partially transparent) windows
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index e4539aba94..2a8d6aebb4 100644
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -63,8 +63,6 @@ struct _GdkWindowImplClass
void (* withdraw) (GdkWindow *window);
void (* raise) (GdkWindow *window);
void (* lower) (GdkWindow *window);
- void (* restack_under) (GdkWindow *window,
- GList *native_siblings);
void (* restack_toplevel) (GdkWindow *window,
GdkWindow *sibling,
gboolean above);
@@ -114,8 +112,6 @@ struct _GdkWindowImplClass
gboolean (* begin_paint) (GdkWindow *window);
void (* end_paint) (GdkWindow *window);
- cairo_region_t * (* get_shape) (GdkWindow *window);
- cairo_region_t * (* get_input_shape) (GdkWindow *window);
void (* shape_combine_region) (GdkWindow *window,
const cairo_region_t *shape_region,
gint offset_x,
@@ -150,13 +146,6 @@ struct _GdkWindowImplClass
gboolean foreign_destroy);
- /* Called when gdk_window_destroy() is called on a foreign window
- * or an ancestor of the foreign window. It should generally reparent
- * the window out of it's current heirarchy, hide it, and then
- * send a message to the owner requesting that the window be destroyed.
- */
- void (*destroy_foreign) (GdkWindow *window);
-
/* optional */
gboolean (* beep) (GdkWindow *window);
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 07e10c265b..e8cdde9ce0 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -732,14 +732,6 @@ gdk_mir_window_impl_lower (GdkWindow *window)
}
static void
-gdk_mir_window_impl_restack_under (GdkWindow *window,
- GList *native_siblings)
-{
- //g_printerr ("gdk_mir_window_impl_restack_under window=%p\n", window);
- /* We don't support client window stacking */
-}
-
-static void
gdk_mir_window_impl_restack_toplevel (GdkWindow *window,
GdkWindow *sibling,
gboolean above)
@@ -980,20 +972,6 @@ gdk_mir_window_impl_end_paint (GdkWindow *window)
send_buffer (window);
}
-static cairo_region_t *
-gdk_mir_window_impl_get_shape (GdkWindow *window)
-{
- //g_printerr ("gdk_mir_window_impl_get_shape window=%p\n", window);
- return NULL;
-}
-
-static cairo_region_t *
-gdk_mir_window_impl_get_input_shape (GdkWindow *window)
-{
- //g_printerr ("gdk_mir_window_impl_get_input_shape window=%p\n", window);
- return NULL;
-}
-
static void
gdk_mir_window_impl_shape_combine_region (GdkWindow *window,
const cairo_region_t *shape_region,
@@ -1025,12 +1003,6 @@ gdk_mir_window_impl_destroy (GdkWindow *window,
}
static void
-gdk_mir_window_impl_destroy_foreign (GdkWindow *window)
-{
- //g_printerr ("gdk_mir_window_impl_destroy_foreign window=%p\n", window);
-}
-
-static void
gdk_mir_window_impl_focus (GdkWindow *window,
guint32 timestamp)
{
@@ -1695,7 +1667,6 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
impl_class->withdraw = gdk_mir_window_impl_withdraw;
impl_class->raise = gdk_mir_window_impl_raise;
impl_class->lower = gdk_mir_window_impl_lower;
- impl_class->restack_under = gdk_mir_window_impl_restack_under;
impl_class->restack_toplevel = gdk_mir_window_impl_restack_toplevel;
impl_class->move_resize = gdk_mir_window_impl_move_resize;
impl_class->move_to_rect = gdk_mir_window_impl_move_to_rect;
@@ -1708,12 +1679,9 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
impl_class->get_device_state = gdk_mir_window_impl_get_device_state;
impl_class->begin_paint = gdk_mir_window_impl_begin_paint;
impl_class->end_paint = gdk_mir_window_impl_end_paint;
- impl_class->get_shape = gdk_mir_window_impl_get_shape;
- impl_class->get_input_shape = gdk_mir_window_impl_get_input_shape;
impl_class->shape_combine_region = gdk_mir_window_impl_shape_combine_region;
impl_class->input_shape_combine_region = gdk_mir_window_impl_input_shape_combine_region;
impl_class->destroy = gdk_mir_window_impl_destroy;
- impl_class->destroy_foreign = gdk_mir_window_impl_destroy_foreign;
impl_class->focus = gdk_mir_window_impl_focus;
impl_class->set_type_hint = gdk_mir_window_impl_set_type_hint;
impl_class->get_type_hint = gdk_mir_window_impl_get_type_hint;
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 3f68c68020..b8adfd19eb 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2752,20 +2752,6 @@ gdk_quartz_window_set_shadow_width (GdkWindow *window,
_gdk_quartz_window_update_has_shadow (impl);
}
-static cairo_region_t *
-gdk_quartz_window_get_shape (GdkWindow *window)
-{
- /* FIXME: implement */
- return NULL;
-}
-
-static cairo_region_t *
-gdk_quartz_window_get_input_shape (GdkWindow *window)
-{
- /* FIXME: implement */
- return NULL;
-}
-
/* Protocol to build cleanly for OSX < 10.7 */
@protocol ScaleFactor
- (CGFloat) backingScaleFactor;
@@ -2817,8 +2803,6 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
impl_class->input_shape_combine_region = gdk_window_quartz_input_shape_combine_region;
impl_class->destroy = gdk_quartz_window_destroy;
impl_class->destroy_foreign = gdk_quartz_window_destroy_foreign;
- impl_class->get_shape = gdk_quartz_window_get_shape;
- impl_class->get_input_shape = gdk_quartz_window_get_input_shape;
impl_class->begin_paint = gdk_window_impl_quartz_begin_paint;
impl_class->get_scale_factor = gdk_quartz_window_get_scale_factor;
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index eb28ec54be..d1a5df4a17 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -2567,12 +2567,6 @@ gdk_window_wayland_lower (GdkWindow *window)
}
static void
-gdk_window_wayland_restack_under (GdkWindow *window,
- GList *native_siblings)
-{
-}
-
-static void
gdk_window_wayland_restack_toplevel (GdkWindow *window,
GdkWindow *sibling,
gboolean above)
@@ -2813,23 +2807,6 @@ gdk_wayland_window_destroy (GdkWindow *window,
}
static void
-gdk_window_wayland_destroy_foreign (GdkWindow *window)
-{
-}
-
-static cairo_region_t *
-gdk_wayland_window_get_shape (GdkWindow *window)
-{
- return NULL;
-}
-
-static cairo_region_t *
-gdk_wayland_window_get_input_shape (GdkWindow *window)
-{
- return NULL;
-}
-
-static void
gdk_wayland_window_focus (GdkWindow *window,
guint32 timestamp)
{
@@ -3617,7 +3594,6 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
impl_class->get_events = gdk_window_wayland_get_events;
impl_class->raise = gdk_window_wayland_raise;
impl_class->lower = gdk_window_wayland_lower;
- impl_class->restack_under = gdk_window_wayland_restack_under;
impl_class->restack_toplevel = gdk_window_wayland_restack_toplevel;
impl_class->move_resize = gdk_window_wayland_move_resize;
impl_class->move_to_rect = gdk_window_wayland_move_to_rect;
@@ -3629,9 +3605,6 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
impl_class->shape_combine_region = gdk_window_wayland_shape_combine_region;
impl_class->input_shape_combine_region = gdk_window_wayland_input_shape_combine_region;
impl_class->destroy = gdk_wayland_window_destroy;
- impl_class->destroy_foreign = gdk_window_wayland_destroy_foreign;
- impl_class->get_shape = gdk_wayland_window_get_shape;
- impl_class->get_input_shape = gdk_wayland_window_get_input_shape;
impl_class->begin_paint = gdk_window_impl_wayland_begin_paint;
impl_class->end_paint = gdk_window_impl_wayland_end_paint;
impl_class->beep = gdk_window_impl_wayland_beep;
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 7d1a3b2680..d68601e958 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -951,9 +951,8 @@ gdk_win32_window_foreign_new_for_display (GdkDisplay *display,
impl->wrapper = window;
parent = GetParent (anid);
- window->parent = gdk_win32_handle_table_lookup (parent);
- if (!window->parent || GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_FOREIGN)
- window->parent = gdk_get_default_root_window ();
+ /* Always treat foreigns as toplevels */
+ window->parent = gdk_get_default_root_window ();
window->parent->children = g_list_concat (&window->children_list_node, window->parent->children);
window->parent->impl_window->native_children =
@@ -1040,18 +1039,6 @@ gdk_win32_window_destroy (GdkWindow *window,
}
}
-static void
-gdk_win32_window_destroy_foreign (GdkWindow *window)
-{
- /* It's somebody else's window, but in our hierarchy, so reparent it
- * to the desktop, and then try to destroy it.
- */
- gdk_window_hide (window);
- gdk_window_reparent (window, NULL, 0, 0);
-
- PostMessage (GDK_WINDOW_HWND (window), WM_CLOSE, 0, 0);
-}
-
/* This function is called when the window really gone.
*/
static void
@@ -2302,13 +2289,6 @@ gdk_win32_window_get_root_coords (GdkWindow *window,
}
static void
-gdk_win32_window_restack_under (GdkWindow *window,
- GList *native_siblings)
-{
- // ### TODO
-}
-
-static void
gdk_win32_window_restack_toplevel (GdkWindow *window,
GdkWindow *sibling,
gboolean above)
@@ -5595,35 +5575,6 @@ gdk_win32_window_set_opacity (GdkWindow *window,
}
}
-static cairo_region_t *
-gdk_win32_window_get_shape (GdkWindow *window)
-{
- HRGN hrgn = CreateRectRgn (0, 0, 0, 0);
- int type = GetWindowRgn (GDK_WINDOW_HWND (window), hrgn);
- GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
-
- if (type == SIMPLEREGION || type == COMPLEXREGION)
- {
- cairo_region_t *region = _gdk_win32_hrgn_to_region (hrgn, impl->window_scale);
-
- DeleteObject (hrgn);
- return region;
- }
-
- return NULL;
-}
-
-static void
-gdk_win32_input_shape_combine_region (GdkWindow *window,
- const cairo_region_t *shape_region,
- gint offset_x,
- gint offset_y)
-{
- /* Partial input shape support is implemented by handling the
- * WM_NCHITTEST message.
- */
-}
-
gboolean
gdk_win32_window_is_win32 (GdkWindow *window)
{
@@ -6058,7 +6009,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
impl_class->get_events = gdk_win32_window_get_events;
impl_class->raise = gdk_win32_window_raise;
impl_class->lower = gdk_win32_window_lower;
- impl_class->restack_under = gdk_win32_window_restack_under;
impl_class->restack_toplevel = gdk_win32_window_restack_toplevel;
impl_class->move_resize = gdk_win32_window_move_resize;
impl_class->reparent = gdk_win32_window_reparent;
@@ -6070,9 +6020,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
impl_class->shape_combine_region = gdk_win32_window_shape_combine_region;
impl_class->input_shape_combine_region = gdk_win32_input_shape_combine_region;
impl_class->destroy = gdk_win32_window_destroy;
- impl_class->destroy_foreign = gdk_win32_window_destroy_foreign;
- impl_class->get_shape = gdk_win32_window_get_shape;
- //FIXME?: impl_class->get_input_shape = gdk_win32_window_get_input_shape;
impl_class->begin_paint = gdk_win32_window_begin_paint;
impl_class->end_paint = gdk_win32_window_end_paint;
@@ -6135,10 +6082,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
HGDIOBJ
gdk_win32_window_get_handle (GdkWindow *window)
{
- /* Try to ensure the window has a native window */
- if (!_gdk_window_has_impl (window))
- gdk_window_ensure_native (window);
-
if (!GDK_WINDOW_IS_WIN32 (window))
{
g_warning (G_STRLOC " window is not a native Win32 window");
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index c5bfb7759e..6d299fe475 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -35,50 +35,6 @@ struct _GdkWindowQueueItem
cairo_region_t *antiexpose_area;
};
-void
-_gdk_x11_window_move_resize_child (GdkWindow *window,
- gint x,
- gint y,
- gint width,
- gint height)
-{
- GdkWindowImplX11 *impl;
-
- g_return_if_fail (window != NULL);
- g_return_if_fail (GDK_IS_WINDOW (window));
-
- impl = GDK_WINDOW_IMPL_X11 (window->impl);
-
- if (width * impl->window_scale > 65535 ||
- height * impl->window_scale > 65535)
- {
- g_warning ("Native children wider or taller than 65535 pixels are not supported");
-
- if (width * impl->window_scale > 65535)
- width = 65535 / impl->window_scale;
- if (height * impl->window_scale > 65535)
- height = 65535 / impl->window_scale;
- }
-
- window->x = x;
- window->y = y;
- impl->unscaled_width = width * impl->window_scale;
- impl->unscaled_height = height * impl->window_scale;
- window->width = width;
- window->height = height;
-
- /* We don't really care about origin overflow, because on overflow
- * the window won't be visible anyway and thus it will be shaped
- * to nothing
- */
- XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- (window->x + window->parent->abs_x) * impl->window_scale,
- (window->y + window->parent->abs_y) * impl->window_scale,
- width * impl->window_scale,
- height * impl->window_scale);
-}
-
static Bool
expose_serial_predicate (Display *xdisplay,
XEvent *xev,
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index e785af4995..ce6a9e69ff 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -70,11 +70,6 @@ gint _gdk_x11_display_send_xevent (GdkDisplay *display,
XEvent *event_send);
/* Routines from gdkgeometry-x11.c */
-void _gdk_x11_window_move_resize_child (GdkWindow *window,
- gint x,
- gint y,
- gint width,
- gint height);
void _gdk_x11_window_process_expose (GdkWindow *window,
gulong serial,
GdkRectangle *area);
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 7a8046e3a0..4fabb97f66 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -525,7 +525,11 @@ _gdk_x11_window_change_property (GdkWindow *window,
if (GDK_WINDOW_DESTROYED (window))
return;
- gdk_window_ensure_native (window);
+ if (!gdk_window_has_native (window))
+ {
+ g_warning ("Can't change property on non-native window");
+ return;
+ }
display = gdk_window_get_display (window);
xproperty = gdk_x11_atom_to_xatom_for_display (display, property);
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index c4e73227e3..ede48170af 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -121,7 +121,11 @@ _gdk_x11_display_set_selection_owner (GdkDisplay *display,
if (GDK_WINDOW_DESTROYED (owner) || !GDK_WINDOW_IS_X11 (owner))
return FALSE;
- gdk_window_ensure_native (owner);
+ if (!gdk_window_has_native (owner))
+ {
+ g_warning ("Can't use selectors on non-native window");
+ return FALSE;
+ }
xdisplay = GDK_WINDOW_XDISPLAY (owner);
xwindow = GDK_WINDOW_XID (owner);
}
@@ -191,7 +195,11 @@ _gdk_x11_display_convert_selection (GdkDisplay *display,
if (GDK_WINDOW_DESTROYED (requestor) || !GDK_WINDOW_IS_X11 (requestor))
return;
- gdk_window_ensure_native (requestor);
+ if (!gdk_window_has_native (requestor))
+ {
+ g_warning ("Can't use selections on non-native window");
+ return;
+ }
XConvertSelection (GDK_WINDOW_XDISPLAY (requestor),
gdk_x11_atom_to_xatom_for_display (display, selection),
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index b2eb6eef2f..55fb693545 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -943,6 +943,11 @@ _gdk_x11_display_create_window_impl (GdkDisplay *display,
/* The common code warns for this case */
xparent = GDK_SCREEN_XROOTWIN (screen);
}
+ break;
+
+ case GDK_WINDOW_CHILD:
+ g_assert_not_reached ();
+ break;
}
if (!window->input_only)
@@ -1037,8 +1042,7 @@ _gdk_x11_display_create_window_impl (GdkDisplay *display,
connect_frame_clock (window);
- if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
- gdk_window_freeze_toplevel_updates (window);
+ gdk_window_freeze_toplevel_updates (window);
}
static GdkEventMask
@@ -1124,14 +1128,10 @@ gdk_x11_window_foreign_new_for_display (GdkDisplay *display,
impl->wrapper = win;
impl->window_scale = GDK_X11_SCREEN (screen)->window_scale;
- win->parent = gdk_x11_window_lookup_for_display (display, parent);
-
- if (!win->parent || GDK_WINDOW_TYPE (win->parent) == GDK_WINDOW_FOREIGN)
- win->parent = gdk_screen_get_root_window (screen);
+ /* Always treat foreigns as toplevels */
+ win->parent = gdk_screen_get_root_window (screen);
win->parent->children = g_list_concat (&win->children_list_node, win->parent->children);
- win->parent->impl_window->native_children =
- g_list_prepend (win->parent->impl_window->native_children, win);
impl->xid = window;
@@ -1224,46 +1224,6 @@ gdk_x11_window_destroy (GdkWindow *window,
XDestroyWindow (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window));
}
-static void
-gdk_x11_window_destroy_foreign (GdkWindow *window)
-{
- /* It's somebody else's window, but in our hierarchy,
- * so reparent it to the root window, and then send
- * it a delete event, as if we were a WM
- */
- XClientMessageEvent xclient;
- GdkDisplay *display;
-
- display = GDK_WINDOW_DISPLAY (window);
- gdk_x11_display_error_trap_push (display);
- gdk_window_hide (window);
- gdk_window_reparent (window, NULL, 0, 0);
-
- memset (&xclient, 0, sizeof (xclient));
- xclient.type = ClientMessage;
- xclient.window = GDK_WINDOW_XID (window);
- xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "WM_PROTOCOLS");
- xclient.format = 32;
- xclient.data.l[0] = gdk_x11_get_xatom_by_name_for_display (display, "WM_DELETE_WINDOW");
- xclient.data.l[1] = CurrentTime;
- xclient.data.l[2] = 0;
- xclient.data.l[3] = 0;
- xclient.data.l[4] = 0;
-
- XSendEvent (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- False, 0, (XEvent *)&xclient);
- gdk_x11_display_error_trap_pop_ignored (display);
-}
-
-static GdkWindow *
-get_root (GdkWindow *window)
-{
- GdkScreen *screen = gdk_window_get_screen (window);
-
- return gdk_screen_get_root_window (screen);
-}
-
/* This function is called when the XWindow is really gone.
*/
static void
@@ -1532,34 +1492,6 @@ gdk_window_x11_show (GdkWindow *window, gboolean already_mapped)
}
static void
-post_unmap (GdkWindow *window)
-{
- GdkWindow *start_window = NULL;
-
- if (window->input_only)
- return;
-
- if (window->window_type == GDK_WINDOW_CHILD)
- start_window = _gdk_window_get_impl_window ((GdkWindow *)window->parent);
- else if (window->window_type == GDK_WINDOW_TEMP)
- start_window = get_root (window);
-
- if (start_window)
- {
- if (window->window_type == GDK_WINDOW_CHILD && window->parent)
- {
- GdkRectangle invalid_rect;
-
- gdk_window_get_position (window, &invalid_rect.x, &invalid_rect.y);
- invalid_rect.width = gdk_window_get_width (window);
- invalid_rect.height = gdk_window_get_height (window);
- gdk_window_invalidate_rect ((GdkWindow *)window->parent,
- &invalid_rect, TRUE);
- }
- }
-}
-
-static void
gdk_window_x11_hide (GdkWindow *window)
{
/* We'll get the unmap notify eventually, and handle it then,
@@ -1587,7 +1519,6 @@ gdk_window_x11_hide (GdkWindow *window)
XUnmapWindow (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window));
- post_unmap (window);
}
static void
@@ -1604,8 +1535,6 @@ gdk_window_x11_withdraw (GdkWindow *window)
XWithdrawWindow (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window), 0);
-
- post_unmap (window);
}
}
@@ -1616,25 +1545,14 @@ window_x11_move (GdkWindow *window,
{
GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
- if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
- {
- /* The window isn't actually damaged, but it's parent is */
- window_pre_damage (window);
- _gdk_x11_window_move_resize_child (window,
- x, y,
- window->width, window->height);
- }
- else
- {
- XMoveWindow (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- x * impl->window_scale, y * impl->window_scale);
+ XMoveWindow (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (window),
+ x * impl->window_scale, y * impl->window_scale);
- if (impl->override_redirect)
- {
- window->x = x;
- window->y = y;
- }
+ if (impl->override_redirect)
+ {
+ window->x = x;
+ window->y = y;
}
}
@@ -1643,6 +1561,8 @@ window_x11_resize (GdkWindow *window,
gint width,
gint height)
{
+ GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
+
if (width < 1)
width = 1;
@@ -1651,33 +1571,22 @@ window_x11_resize (GdkWindow *window,
window_pre_damage (window);
- if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
+ XResizeWindow (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (window),
+ width * impl->window_scale, height * impl->window_scale);
+
+ if (impl->override_redirect)
{
- _gdk_x11_window_move_resize_child (window,
- window->x, window->y,
- width, height);
+ impl->unscaled_width = width * impl->window_scale;
+ impl->unscaled_height = height * impl->window_scale;
+ window->width = width;
+ window->height = height;
+ _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
}
else
{
- GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
-
- XResizeWindow (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- width * impl->window_scale, height * impl->window_scale);
-
- if (impl->override_redirect)
- {
- impl->unscaled_width = width * impl->window_scale;
- impl->unscaled_height = height * impl->window_scale;
- window->width = width;
- window->height = height;
- _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
- }
- else
- {
- if (width * impl->window_scale != impl->unscaled_width || height * impl->window_scale != impl->unscaled_height)
- window->resize_count += 1;
- }
+ if (width * impl->window_scale != impl->unscaled_width || height * impl->window_scale != impl->unscaled_height)
+ window->resize_count += 1;
}
}
@@ -1688,6 +1597,8 @@ window_x11_move_resize (GdkWindow *window,
gint width,
gint height)
{
+ GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
+
if (width < 1)
width = 1;
@@ -1696,37 +1607,27 @@ window_x11_move_resize (GdkWindow *window,
window_pre_damage (window);
- if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
+ XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (window),
+ x * impl->window_scale, y * impl->window_scale,
+ width * impl->window_scale, height * impl->window_scale);
+
+ if (impl->override_redirect)
{
- _gdk_x11_window_move_resize_child (window, x, y, width, height);
+ window->x = x;
+ window->y = y;
+
+ impl->unscaled_width = width * impl->window_scale;
+ impl->unscaled_height = height * impl->window_scale;
+ window->width = width;
+ window->height = height;
+
_gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
}
else
{
- GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
-
- XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- x * impl->window_scale, y * impl->window_scale,
- width * impl->window_scale, height * impl->window_scale);
-
- if (impl->override_redirect)
- {
- window->x = x;
- window->y = y;
-
- impl->unscaled_width = width * impl->window_scale;
- impl->unscaled_height = height * impl->window_scale;
- window->width = width;
- window->height = height;
-
- _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
- }
- else
- {
- if (width * impl->window_scale != impl->unscaled_width || height * impl->window_scale != impl->unscaled_height)
- window->resize_count += 1;
- }
+ if (width * impl->window_scale != impl->unscaled_width || height * impl->window_scale != impl->unscaled_height)
+ window->resize_count += 1;
}
}
@@ -1749,23 +1650,6 @@ gdk_window_x11_move_resize (GdkWindow *window,
}
}
-static void
-set_scale_recursive (GdkWindow *window, int scale)
-{
- GdkWindow *child;
- GList *l;
-
- for (l = window->children; l; l = l->next)
- {
- child = l->data;
-
- if (child->impl != window->impl)
- _gdk_x11_window_set_window_scale (child, scale);
- else
- set_scale_recursive (child, scale);
- }
-}
-
void
_gdk_x11_window_set_window_scale (GdkWindow *window,
int scale)
@@ -1798,7 +1682,7 @@ _gdk_x11_window_set_window_scale (GdkWindow *window,
GDK_WINDOW_XID (window),
(window->x + window->parent->abs_x) * impl->window_scale,
(window->y + window->parent->abs_y) * impl->window_scale);
- else if (WINDOW_IS_TOPLEVEL(window))
+ else
{
if (impl->override_redirect)
{
@@ -1811,22 +1695,8 @@ _gdk_x11_window_set_window_scale (GdkWindow *window,
window->width * impl->window_scale,
window->height * impl->window_scale);
}
- else
- {
- impl->unscaled_width = window->width * impl->window_scale;
- impl->unscaled_height = window->height * impl->window_scale;
-
- XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- (window->x + window->parent->abs_x) * impl->window_scale,
- (window->y + window->parent->abs_y) * impl->window_scale,
- window->width * impl->window_scale,
- window->height * impl->window_scale);
- }
gdk_window_invalidate_rect (window, NULL, TRUE);
-
- set_scale_recursive (window, scale);
}
static gboolean
@@ -1909,28 +1779,6 @@ gdk_window_x11_raise (GdkWindow *window)
}
static void
-gdk_window_x11_restack_under (GdkWindow *window,
- GList *native_siblings /* in requested order, first is bottom-most */)
-{
- Window *windows;
- int n_windows, i;
- GList *l;
-
- n_windows = g_list_length (native_siblings) + 1;
- windows = g_new (Window, n_windows);
-
- windows[0] = GDK_WINDOW_XID (window);
- /* Reverse order, as input order is bottom-most first */
- i = n_windows - 1;
- for (l = native_siblings; l != NULL; l = l->next)
- windows[i--] = GDK_WINDOW_XID (l->data);
-
- XRestackWindows (GDK_WINDOW_XDISPLAY (window), windows, n_windows);
-
- g_free (windows);
-}
-
-static void
gdk_window_x11_restack_toplevel (GdkWindow *window,
GdkWindow *sibling,
gboolean above)
@@ -4257,39 +4105,6 @@ _gdk_x11_xwindow_get_shape (Display *xdisplay,
return shape;
}
-
-static cairo_region_t *
-gdk_x11_window_get_shape (GdkWindow *window)
-{
- GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
-
- if (!GDK_WINDOW_DESTROYED (window) &&
- gdk_display_supports_shapes (GDK_WINDOW_DISPLAY (window)))
- return _gdk_x11_xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- impl->window_scale,
- ShapeBounding);
-
- return NULL;
-}
-
-static cairo_region_t *
-gdk_x11_window_get_input_shape (GdkWindow *window)
-{
-#if defined(ShapeInput)
- GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
-
- if (!GDK_WINDOW_DESTROYED (window) &&
- gdk_display_supports_input_shapes (GDK_WINDOW_DISPLAY (window)))
- return _gdk_x11_xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- impl->window_scale,
- ShapeInput);
-#endif
-
- return NULL;
-}
-
/* From the WM spec */
#define _NET_WM_MOVERESIZE_SIZE_TOPLEFT 0
#define _NET_WM_MOVERESIZE_SIZE_TOP 1
@@ -5310,7 +5125,6 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
impl_class->get_events = gdk_window_x11_get_events;
impl_class->raise = gdk_window_x11_raise;
impl_class->lower = gdk_window_x11_lower;
- impl_class->restack_under = gdk_window_x11_restack_under;
impl_class->restack_toplevel = gdk_window_x11_restack_toplevel;
impl_class->move_resize = gdk_window_x11_move_resize;
impl_class->reparent = gdk_window_x11_reparent;
@@ -5322,9 +5136,6 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
impl_class->input_shape_combine_region = gdk_window_x11_input_shape_combine_region;
impl_class->queue_antiexpose = _gdk_x11_window_queue_antiexpose;
impl_class->destroy = gdk_x11_window_destroy;
- impl_class->destroy_foreign = gdk_x11_window_destroy_foreign;
- impl_class->get_shape = gdk_x11_window_get_shape;
- impl_class->get_input_shape = gdk_x11_window_get_input_shape;
impl_class->beep = gdk_x11_window_beep;
impl_class->focus = gdk_x11_window_focus;
View Lorry Controller Status