169b00aa64
The current code assumes that an embedded window will correspond to a single MetaWindow over the entire lifetime of the icon, which is incorrect - the embedded window is unmanaged on Unmap and a new MetaWindow will be created the next time the embedded window is mapped. As we currently ignore the new MetaWindow completely, it will be shown normally in the scene instead of the embedded clone as intended. Fix this by setting up clone and window actor each time the embedded window is mapped rather than once in shell_gtk_embed_set_window(). https://bugzilla.gnome.org/show_bug.cgi?id=745824
371 lines
12 KiB
C
371 lines
12 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
#include "config.h"
|
|
|
|
#include "shell-embedded-window-private.h"
|
|
#include "shell-global.h"
|
|
|
|
#include <gdk/gdkx.h>
|
|
#include <meta/display.h>
|
|
#include <meta/window.h>
|
|
|
|
enum {
|
|
PROP_0,
|
|
|
|
PROP_WINDOW
|
|
};
|
|
|
|
struct _ShellGtkEmbedPrivate
|
|
{
|
|
ShellEmbeddedWindow *window;
|
|
|
|
ClutterActor *window_actor;
|
|
guint window_actor_destroyed_handler;
|
|
|
|
guint window_created_handler;
|
|
};
|
|
|
|
G_DEFINE_TYPE (ShellGtkEmbed, shell_gtk_embed, CLUTTER_TYPE_CLONE);
|
|
|
|
static void shell_gtk_embed_set_window (ShellGtkEmbed *embed,
|
|
ShellEmbeddedWindow *window);
|
|
|
|
static void
|
|
shell_gtk_embed_on_window_destroy (GtkWidget *object,
|
|
ShellGtkEmbed *embed)
|
|
{
|
|
shell_gtk_embed_set_window (embed, NULL);
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_remove_window_actor (ShellGtkEmbed *embed)
|
|
{
|
|
ShellGtkEmbedPrivate *priv = embed->priv;
|
|
|
|
if (priv->window_actor)
|
|
{
|
|
g_signal_handler_disconnect (priv->window_actor,
|
|
priv->window_actor_destroyed_handler);
|
|
priv->window_actor_destroyed_handler = 0;
|
|
|
|
g_object_unref (priv->window_actor);
|
|
priv->window_actor = NULL;
|
|
}
|
|
|
|
clutter_clone_set_source (CLUTTER_CLONE (embed), NULL);
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_window_created_cb (MetaDisplay *display,
|
|
MetaWindow *window,
|
|
ShellGtkEmbed *embed)
|
|
{
|
|
ShellGtkEmbedPrivate *priv = embed->priv;
|
|
Window xwindow = meta_window_get_xwindow (window);
|
|
GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (priv->window));
|
|
|
|
if (xwindow == gdk_x11_window_get_xid (gdk_window))
|
|
{
|
|
ClutterActor *window_actor =
|
|
CLUTTER_ACTOR (meta_window_get_compositor_private (window));
|
|
MetaDisplay *display = shell_global_get_display (shell_global_get ());
|
|
GCallback remove_cb = G_CALLBACK (shell_gtk_embed_remove_window_actor);
|
|
cairo_region_t *empty_region;
|
|
|
|
clutter_clone_set_source (CLUTTER_CLONE (embed), window_actor);
|
|
|
|
/* We want to explicitly clear the clone source when the window
|
|
actor is destroyed because otherwise we might end up keeping
|
|
it alive after it has been disposed. Otherwise this can cause
|
|
a crash if there is a paint after mutter notices that the top
|
|
level window has been destroyed, which causes it to dispose
|
|
the window, and before the tray manager notices that the
|
|
window is gone which would otherwise reset the window and
|
|
unref the clone */
|
|
priv->window_actor = g_object_ref (window_actor);
|
|
priv->window_actor_destroyed_handler =
|
|
g_signal_connect_swapped (window_actor,
|
|
"destroy",
|
|
remove_cb,
|
|
embed);
|
|
|
|
/* Hide the original actor otherwise it will appear in the scene
|
|
as a normal window */
|
|
clutter_actor_set_opacity (window_actor, 0);
|
|
|
|
/* Set an empty input shape on the window so that it can't get
|
|
any input. This probably isn't the ideal way to achieve this.
|
|
It would probably be better to force the window to go behind
|
|
Mutter's guard window, but this is quite difficult to do as
|
|
Mutter doesn't manage the stacking for override redirect
|
|
windows and the guard window is repeatedly lowered to the
|
|
bottom of the stack. */
|
|
empty_region = cairo_region_create ();
|
|
gdk_window_input_shape_combine_region (gdk_window,
|
|
empty_region,
|
|
0, 0 /* offset x/y */);
|
|
cairo_region_destroy (empty_region);
|
|
|
|
gdk_window_lower (gdk_window);
|
|
|
|
/* Now that we've found the window we don't need to listen for
|
|
new windows anymore */
|
|
g_signal_handler_disconnect (display,
|
|
priv->window_created_handler);
|
|
priv->window_created_handler = 0;
|
|
}
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_on_window_mapped (GtkWidget *object,
|
|
ShellGtkEmbed *embed)
|
|
{
|
|
MetaDisplay *display = shell_global_get_display (shell_global_get ());
|
|
|
|
/* Listen for new windows so we can detect when Mutter has
|
|
created a MutterWindow for this window */
|
|
embed->priv->window_created_handler =
|
|
g_signal_connect (display,
|
|
"window-created",
|
|
G_CALLBACK (shell_gtk_embed_window_created_cb),
|
|
embed);
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_set_window (ShellGtkEmbed *embed,
|
|
ShellEmbeddedWindow *window)
|
|
{
|
|
MetaDisplay *display = shell_global_get_display (shell_global_get ());
|
|
|
|
if (embed->priv->window)
|
|
{
|
|
if (embed->priv->window_created_handler)
|
|
{
|
|
g_signal_handler_disconnect (display,
|
|
embed->priv->window_created_handler);
|
|
embed->priv->window_created_handler = 0;
|
|
}
|
|
|
|
shell_gtk_embed_remove_window_actor (embed);
|
|
|
|
_shell_embedded_window_set_actor (embed->priv->window, NULL);
|
|
|
|
g_object_unref (embed->priv->window);
|
|
|
|
g_signal_handlers_disconnect_by_func (embed->priv->window,
|
|
(gpointer)shell_gtk_embed_on_window_destroy,
|
|
embed);
|
|
|
|
g_signal_handlers_disconnect_by_func (embed->priv->window,
|
|
(gpointer)shell_gtk_embed_on_window_mapped,
|
|
embed);
|
|
}
|
|
|
|
embed->priv->window = window;
|
|
|
|
if (embed->priv->window)
|
|
{
|
|
g_object_ref (embed->priv->window);
|
|
|
|
_shell_embedded_window_set_actor (embed->priv->window, embed);
|
|
|
|
g_signal_connect (embed->priv->window, "destroy",
|
|
G_CALLBACK (shell_gtk_embed_on_window_destroy), embed);
|
|
|
|
g_signal_connect (embed->priv->window, "map",
|
|
G_CALLBACK (shell_gtk_embed_on_window_mapped), embed);
|
|
}
|
|
|
|
clutter_actor_queue_relayout (CLUTTER_ACTOR (embed));
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_set_property (GObject *object,
|
|
guint prop_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (object);
|
|
|
|
switch (prop_id)
|
|
{
|
|
case PROP_WINDOW:
|
|
shell_gtk_embed_set_window (embed, (ShellEmbeddedWindow *)g_value_get_object (value));
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_get_property (GObject *object,
|
|
guint prop_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (object);
|
|
|
|
switch (prop_id)
|
|
{
|
|
case PROP_WINDOW:
|
|
g_value_set_object (value, embed->priv->window);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_get_preferred_width (ClutterActor *actor,
|
|
float for_height,
|
|
float *min_width_p,
|
|
float *natural_width_p)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (actor);
|
|
|
|
if (embed->priv->window
|
|
&& gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
|
|
{
|
|
GtkRequisition min_req, natural_req;
|
|
gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
|
|
|
|
*min_width_p = min_req.width;
|
|
*natural_width_p = natural_req.width;
|
|
}
|
|
else
|
|
*min_width_p = *natural_width_p = 0;
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_get_preferred_height (ClutterActor *actor,
|
|
float for_width,
|
|
float *min_height_p,
|
|
float *natural_height_p)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (actor);
|
|
|
|
if (embed->priv->window
|
|
&& gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
|
|
{
|
|
GtkRequisition min_req, natural_req;
|
|
gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
|
|
|
|
*min_height_p = min_req.height;
|
|
*natural_height_p = natural_req.height;
|
|
}
|
|
else
|
|
*min_height_p = *natural_height_p = 0;
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_allocate (ClutterActor *actor,
|
|
const ClutterActorBox *box,
|
|
ClutterAllocationFlags flags)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (actor);
|
|
float wx = 0.0, wy = 0.0, x, y, ax, ay;
|
|
|
|
CLUTTER_ACTOR_CLASS (shell_gtk_embed_parent_class)->
|
|
allocate (actor, box, flags);
|
|
|
|
/* Find the actor's new coordinates in terms of the stage (which is
|
|
* priv->window's parent window.
|
|
*/
|
|
while (actor)
|
|
{
|
|
clutter_actor_get_position (actor, &x, &y);
|
|
clutter_actor_get_anchor_point (actor, &ax, &ay);
|
|
|
|
wx += x - ax;
|
|
wy += y - ay;
|
|
|
|
actor = clutter_actor_get_parent (actor);
|
|
}
|
|
|
|
_shell_embedded_window_allocate (embed->priv->window,
|
|
(int)(0.5 + wx), (int)(0.5 + wy),
|
|
box->x2 - box->x1,
|
|
box->y2 - box->y1);
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_map (ClutterActor *actor)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (actor);
|
|
|
|
_shell_embedded_window_map (embed->priv->window);
|
|
|
|
CLUTTER_ACTOR_CLASS (shell_gtk_embed_parent_class)->map (actor);
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_unmap (ClutterActor *actor)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (actor);
|
|
|
|
_shell_embedded_window_unmap (embed->priv->window);
|
|
|
|
CLUTTER_ACTOR_CLASS (shell_gtk_embed_parent_class)->unmap (actor);
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_dispose (GObject *object)
|
|
{
|
|
ShellGtkEmbed *embed = SHELL_GTK_EMBED (object);
|
|
|
|
G_OBJECT_CLASS (shell_gtk_embed_parent_class)->dispose (object);
|
|
|
|
shell_gtk_embed_set_window (embed, NULL);
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_class_init (ShellGtkEmbedClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
|
|
|
|
g_type_class_add_private (klass, sizeof (ShellGtkEmbedPrivate));
|
|
|
|
object_class->get_property = shell_gtk_embed_get_property;
|
|
object_class->set_property = shell_gtk_embed_set_property;
|
|
object_class->dispose = shell_gtk_embed_dispose;
|
|
|
|
actor_class->get_preferred_width = shell_gtk_embed_get_preferred_width;
|
|
actor_class->get_preferred_height = shell_gtk_embed_get_preferred_height;
|
|
actor_class->allocate = shell_gtk_embed_allocate;
|
|
actor_class->map = shell_gtk_embed_map;
|
|
actor_class->unmap = shell_gtk_embed_unmap;
|
|
|
|
g_object_class_install_property (object_class,
|
|
PROP_WINDOW,
|
|
g_param_spec_object ("window",
|
|
"Window",
|
|
"ShellEmbeddedWindow to embed",
|
|
SHELL_TYPE_EMBEDDED_WINDOW,
|
|
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
|
|
}
|
|
|
|
static void
|
|
shell_gtk_embed_init (ShellGtkEmbed *embed)
|
|
{
|
|
embed->priv = G_TYPE_INSTANCE_GET_PRIVATE (embed, SHELL_TYPE_GTK_EMBED,
|
|
ShellGtkEmbedPrivate);
|
|
}
|
|
|
|
/*
|
|
* Public API
|
|
*/
|
|
ClutterActor *
|
|
shell_gtk_embed_new (ShellEmbeddedWindow *window)
|
|
{
|
|
g_return_val_if_fail (SHELL_IS_EMBEDDED_WINDOW (window), NULL);
|
|
|
|
return g_object_new (SHELL_TYPE_GTK_EMBED,
|
|
"window", window,
|
|
NULL);
|
|
}
|