diff options
author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 19:22:44 +0000 |
---|---|---|
committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 19:22:44 +0000 |
commit | a89a7314517eda116348ae314289cde228fc637b (patch) | |
tree | a0247c61a7236df87b7f14ee48160dcf8e4cec2b /gfx/gtk_preserve_window.cc | |
parent | 34c190328b287081617fc0f36592ac4a45c2a213 (diff) | |
download | chromium_src-a89a7314517eda116348ae314289cde228fc637b.zip chromium_src-a89a7314517eda116348ae314289cde228fc637b.tar.gz chromium_src-a89a7314517eda116348ae314289cde228fc637b.tar.bz2 |
Alternative to overlays on X windows.
Created a new GTK widget that gives us more control over when X windows (associated with GL contexts) are created and destroyed. This achieves the same thing as the overlay code (now reverted). It fixes two regressions with the overlay code:
- maps.google.com and html5test.com now work (switching between software and hardware rendering)
- expose events now get through in accelerated mode
BUG=58862,59887
TEST=Go to html5test.com. Should switch contents to show results. Disable compositing window manager. Go to http://peter.sh/2010/06/chromium-now-features-gpu-acceleration-and-css-3d-transforms/. Adjust the rotate z slider to enable accelerated compositing. Drag a different window over top. Redraws should happen.
Review URL: http://codereview.chromium.org/3973009
Patch from Jonathan Backer <backer@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/gtk_preserve_window.cc')
-rw-r--r-- | gfx/gtk_preserve_window.cc | 164 |
1 files changed, 164 insertions, 0 deletions
diff --git a/gfx/gtk_preserve_window.cc b/gfx/gtk_preserve_window.cc new file mode 100644 index 0000000..576ddfa --- /dev/null +++ b/gfx/gtk_preserve_window.cc @@ -0,0 +1,164 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "gfx/gtk_preserve_window.h" + +#include <gdk/gdkwindow.h> +#include <gtk/gtk.h> +#include <gtk/gtkwidget.h> +#include <gtk/gtkfixed.h> + +G_BEGIN_DECLS + +#define GTK_PRESERVE_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ + GTK_TYPE_PRESERVE_WINDOW, \ + GtkPreserveWindowPrivate)) + +typedef struct _GtkPreserveWindowPrivate GtkPreserveWindowPrivate; + +struct _GtkPreserveWindowPrivate { + // If true, don't create/destroy windows on realize/unrealize. + gboolean preserve_window; +}; + +G_DEFINE_TYPE(GtkPreserveWindow, gtk_preserve_window, GTK_TYPE_FIXED) + +static void gtk_preserve_window_destroy(GtkObject* object); +static void gtk_preserve_window_realize(GtkWidget* widget); +static void gtk_preserve_window_unrealize(GtkWidget* widget); + +static void gtk_preserve_window_class_init(GtkPreserveWindowClass *klass) { + GtkWidgetClass* widget_class = reinterpret_cast<GtkWidgetClass*>(klass); + widget_class->realize = gtk_preserve_window_realize; + widget_class->unrealize = gtk_preserve_window_unrealize; + + GtkObjectClass* object_class = reinterpret_cast<GtkObjectClass*>(klass); + object_class->destroy = gtk_preserve_window_destroy; + + GObjectClass* gobject_class = G_OBJECT_CLASS(klass); + g_type_class_add_private(gobject_class, sizeof(GtkPreserveWindowPrivate)); +} + +static void gtk_preserve_window_init(GtkPreserveWindow* widget) { + GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget); + priv->preserve_window = FALSE; + + // These widgets always have their own window. + gtk_fixed_set_has_window(GTK_FIXED(widget), TRUE); +} + +GtkWidget* gtk_preserve_window_new() { + return GTK_WIDGET(g_object_new(GTK_TYPE_PRESERVE_WINDOW, NULL)); +} + +static void gtk_preserve_window_destroy(GtkObject* object) { + GtkWidget* widget = reinterpret_cast<GtkWidget*>(object); + + if (widget->window) { + gdk_window_set_user_data(widget->window, NULL); + gdk_window_destroy(widget->window); + widget->window = NULL; + } + + GTK_OBJECT_CLASS(gtk_preserve_window_parent_class)->destroy(object); +} + +static void gtk_preserve_window_realize(GtkWidget* widget) { + g_return_if_fail(GTK_IS_PRESERVE_WINDOW(widget)); + + if (widget->window) { + gdk_window_reparent(widget->window, + gtk_widget_get_parent_window(widget), + widget->allocation.x, + widget->allocation.y); + widget->style = gtk_style_attach(widget->style, widget->window); + gdk_window_set_user_data(widget->window, widget); + + // Deprecated as of GTK 2.22. Used for compatibility. + // It should be: gtk_widget_set_realized(widget, TRUE) + GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED); + } else { + GTK_WIDGET_CLASS(gtk_preserve_window_parent_class)->realize(widget); + } +} + +static void gtk_preserve_window_unrealize(GtkWidget* widget) { + g_return_if_fail(GTK_IS_PRESERVE_WINDOW(widget)); + + GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget); + if (priv->preserve_window) { + GtkWidgetClass* widget_class = + GTK_WIDGET_CLASS(gtk_preserve_window_parent_class); + GtkContainerClass* container_class = + GTK_CONTAINER_CLASS(gtk_preserve_window_parent_class); + + // Deprecated as of GTK 2.22. Used for compatibility. + // It should be: gtk_widget_get_mapped() + if (GTK_WIDGET_MAPPED(widget)) { + widget_class->unmap(widget); + + // Deprecated as of GTK 2.22. Used for compatibility. + // It should be: gtk_widget_set_mapped(widget, FALSE) + GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED); + } + + // This is the behavior from GtkWidget, inherited by GtkFixed. + // It is unclear why we should not call the potentially overridden + // unrealize method (via the callback), but doing so causes errors. + container_class->forall( + GTK_CONTAINER(widget), FALSE, + reinterpret_cast<GtkCallback>(gtk_widget_unrealize), NULL); + + gtk_style_detach(widget->style); + gdk_window_reparent(widget->window, gdk_get_default_root_window(), 0, 0); + gtk_selection_remove_all(widget); + gdk_window_set_user_data(widget->window, NULL); + + // Deprecated as of GTK 2.22. Used for compatibility. + // It should be: gtk_widget_set_realized(widget, FALSE) + GTK_WIDGET_UNSET_FLAGS(widget, GTK_REALIZED); + } else { + GTK_WIDGET_CLASS(gtk_preserve_window_parent_class)->unrealize(widget); + } +} + +gboolean gtk_preserve_window_get_preserve(GtkPreserveWindow* window) { + g_return_val_if_fail(GTK_IS_PRESERVE_WINDOW(window), FALSE); + GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(window); + + return priv->preserve_window; +} + +void gtk_preserve_window_set_preserve(GtkPreserveWindow* window, + gboolean value) { + g_return_if_fail(GTK_IS_PRESERVE_WINDOW(window)); + GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(window); + priv->preserve_window = value; + + GtkWidget* widget = GTK_WIDGET(window); + if (value && !widget->window) { + GdkWindowAttr attributes; + gint attributes_mask; + + // We may not know the width and height, so we rely on the fact + // that a size-allocation will resize it later. + attributes.width = 1; + attributes.height = 1; + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.wclass = GDK_INPUT_OUTPUT; + + attributes.visual = gtk_widget_get_visual(widget); + attributes.colormap = gtk_widget_get_colormap(widget); + + attributes.event_mask = gtk_widget_get_events(widget); + attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK; + + attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP; + widget->window = gdk_window_new( + gdk_get_default_root_window(), &attributes, attributes_mask); + } +} + +G_END_DECLS |