window-actor: Don't do any special initialization in _new

https://bugzilla.gnome.org/show_bug.cgi?id=678989
Allow potentially supporting multiple MetaWindowActors per window
2013-12-06 16:24:01 -05:00 · 2013-12-06 16:24:01 -05:00 · 2013-12-06 16:24:01 -05:00 · 2013-12-06 16:24:01 -05:00 · 2013-12-06 16:24:00 -05:00 · 2013-12-06 16:23:49 -05:00
19 changed files with 795 additions and 1010 deletions
--- a/21
+++ b/21
@@ -1,24 +1,3 @@
-3.11.3
-======
-* xrandr: Use "hotplug_mode_update" property [Marc-André; #711216]
-* Fix position of attached dialogs for CSD windows [Giovanni, Owen; #707194]
-* Fix focus issues with external OSKs [Jasper; #715030]
-* Add a MetaCullable interface [Jasper; #714706]
-* Fix window group paint volume [Owen; #719669]
-* Fix frame extents problems [Owen; #714707]
-* Add shortcut to move windows between monitors [Florian; #671054]
-* Fix problems with focus tracking [Owen; #720558]
-* Misc. bug fixes and cleanups [Rui, Jasper, Owen; #712833, #678989, #720106,
-  #720417, #720630]
-
-Contributors:
-  Robert Bragg, Giovanni Campagna, Marc-André Lureau, Rui Matos, Alberto Milone,
-  Florian Müllner, Sindhu S, Jasper St. Pierre, Rico Tzschichholz,
-  Owen W. Taylor
-
-Translations:
-  甘露(Gan  Lu) [zh_CN], Khaled Hosny [ar]
-
 3.11.2
 ======
 * Fix resize operations using mouse-button-modifier [Lionel; #710251]
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4])

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [11])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_micro_version], [2])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 06:55+0200\n"
-"PO-Revision-Date: 2013-12-11 06:57+0200\n"
+"POT-Creation-Date: 2013-10-07 17:09+0200\n"
+"PO-Revision-Date: 2013-10-07 17:09+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -212,7 +212,7 @@ msgstr "المنظور مقسوم على اليسار"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:571
+#: ../src/compositor/compositor.c:596
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -255,12 +255,12 @@ msgstr "ا_نتظر"
 msgid "_Force Quit"
 msgstr "أ_جبر الإنهاء"

-#: ../src/core/display.c:415
+#: ../src/core/display.c:422
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "الامتداد %s مفقود، لكنه مطلوب للتركيب"

-#: ../src/core/display.c:507
+#: ../src/core/display.c:514
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "فشل فتح عرض نظام نوافذ إكس '%s'\n"
@@ -314,16 +314,16 @@ msgstr "تعذّر إيجاد سِمة! تأكد من وجود %s و احتوا

 #: ../src/core/monitor.c:696
 msgid "Built-in display"
-msgstr "شاشة مدمجة"
+msgstr ""

 #. TRANSLATORS: this is a monitor name (in case we don't know
 #. the vendor), it's Unknown followed by a size in inches,
 #. like 'Unknown 15"'
 #.
 #: ../src/core/monitor.c:724
-#, c-format
+#, fuzzy, c-format
 msgid "Unknown %s"
-msgstr "غير معروفة %s"
+msgstr "عنصر مجهول %s"

 #: ../src/core/mutter.c:40
 #, c-format
@@ -382,12 +382,12 @@ msgstr ""
 msgid "Workspace %d"
 msgstr "مساحة العمل %d"

-#: ../src/core/screen.c:540
+#: ../src/core/screen.c:537
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "الشاشة %d على العرض '%s' غير صحيحة\n"

-#: ../src/core/screen.c:556
+#: ../src/core/screen.c:553
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -396,18 +396,18 @@ msgstr ""
 "الشاشة %d على العرض \"%s\" لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل "
 "--replace لتحُلّ محلّ مدير النوافذ الحالي.\n"

-#: ../src/core/screen.c:583
+#: ../src/core/screen.c:580
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "لا يمكن الحصول على اختيار مدير النوافذ على الشاشة %d العرض \"%s\"\n"

-#: ../src/core/screen.c:661
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "الشاشة %d على العرض \"%s\" لها مدير نوافذ بالفعل\n"

-#: ../src/core/screen.c:853
+#: ../src/core/screen.c:850
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "لا يمكن ترك الشاشة %d على العرض \"%s\"\n"
@@ -503,7 +503,7 @@ msgid "Window manager error: "
 msgstr "خطأ مدير النوافذ: "

 #. first time through
-#: ../src/core/window.c:7615
+#: ../src/core/window.c:7515
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -519,7 +519,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8537
+#: ../src/core/window.c:8345
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -528,22 +528,22 @@ msgstr ""
 "ضبطت النافذة %s تلميحة MWM يدل على انه لا يمكن تحجيمها، لكنها تضبط الحجم "
 "الأدنى %d x %d و الحجم الأقصى %d x %d، هذا ليس له أي معنى.\n"

-#: ../src/core/window-props.c:350
+#: ../src/core/window-props.c:347
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "ضبط التطبيق رمز NET_WM_PID غير مفهوم %lu\n"

-#: ../src/core/window-props.c:466
+#: ../src/core/window-props.c:463
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (على %s)"

-#: ../src/core/window-props.c:1549
+#: ../src/core/window-props.c:1546
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "نافذة WM_TRANSIENT_FOR  0x%lx غير صحيحة ل %s.\n"

-#: ../src/core/window-props.c:1560
+#: ../src/core/window-props.c:1557
 #, fuzzy, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "نافذة WM_TRANSIENT_FOR  0x%lx غير صحيحة ل %s.\n"
@@ -929,8 +929,8 @@ msgid ""
 "GTK custom color specification must have color name and fallback in "
 "parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr ""
-"يحب أن يكون لتخصيص حالة ألوان جتك قوس غلق قائم بعد الحالة/ مثال "
-"gtk:fg[NORMAL]، NORMAL هنا هو الحالة، لا يمكن تحليل \"%s\""
+"يحب أن يكون لتخصيص حالة ألوان جتك قوس غلق قائم بعد الحالة/ مثال gtk:"
+"fg[NORMAL]، NORMAL هنا هو الحالة، لا يمكن تحليل \"%s\""

 #: ../src/ui/theme.c:1219
 #, c-format
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -17,6 +17,8 @@ struct _MetaCompositor
 {
  MetaDisplay    *display;

+  Atom            atom_x_root_pixmap;
+  Atom            atom_net_wm_window_opacity;
  guint           repaint_func_id;

  ClutterActor   *shadow_src;
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -150,10 +150,28 @@ add_win (MetaWindow *window)
 {
  MetaScreen		*screen = meta_window_get_screen (window);
  MetaCompScreen        *info = meta_screen_get_compositor_data (screen);
+  MetaWindowActor       *actor;
+  ClutterActor          *window_group;

  g_return_if_fail (info != NULL);

-  meta_window_actor_new (window);
+  actor = meta_window_actor_new (window);
+
+  window->core_actor = actor;
+
+  if (window->layer == META_LAYER_OVERRIDE_REDIRECT)
+    window_group = info->top_window_group;
+  else
+    window_group = info->window_group;
+  clutter_actor_add_child (window_group, CLUTTER_ACTOR (actor));
+
+  clutter_actor_set_reactive (CLUTTER_ACTOR (actor), TRUE);
+  clutter_actor_hide (CLUTTER_ACTOR (actor));
+
+  /* Initial position in the stack is arbitrary; stacking will be synced
+   * before we first paint.
+   */
+  info->windows = g_list_append (info->windows, actor);

  sync_actor_stacking (info);
 }
@@ -163,16 +181,26 @@ process_damage (MetaCompositor     *compositor,
                XDamageNotifyEvent *event,
                MetaWindow         *window)
 {
-  MetaWindowActor *window_actor;
+  GSList *iter;

  if (window == NULL)
    return;

-  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  if (window_actor == NULL)
+  for (iter = window->actors; iter != NULL; iter = iter->next)
+    meta_window_actor_process_damage (META_WINDOW_ACTOR (iter->data), event);
+}
+
+static void
+process_property_notify (MetaCompositor	*compositor,
+                         XPropertyEvent *event,
+                         MetaWindow     *window)
+{
+  if (window == NULL || window->core_actor == NULL)
    return;

-  meta_window_actor_process_damage (window_actor, event);
+  /* Check for the opacity changing */
+  if (event->atom == compositor->atom_net_wm_window_opacity)
+    meta_window_actor_update_opacity (window->core_actor);
 }

 static Window
@@ -764,27 +792,30 @@ void
 meta_compositor_remove_window (MetaCompositor *compositor,
                               MetaWindow     *window)
 {
-  MetaWindowActor         *window_actor     = NULL;
  MetaScreen *screen;
  MetaCompScreen *info;
+  GSList *iter;

  DEBUG_TRACE ("meta_compositor_remove_window\n");
-  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  if (!window_actor)
-    return;

  screen = meta_window_get_screen (window);
  info = meta_screen_get_compositor_data (screen);

-  if (window_actor == info->unredirected_window)
+  if (window->core_actor == info->unredirected_window)
    {
-      meta_window_actor_set_redirected (window_actor, TRUE);
-      meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)),
-                                 NULL);
+      meta_window_actor_set_redirected (info->unredirected_window, TRUE);
+      meta_shape_cow_for_window (meta_window_get_screen (window), NULL);
      info->unredirected_window = NULL;
    }

-  meta_window_actor_destroy (window_actor);
+  window->core_actor = NULL;
+
+  for (iter = window->actors; iter != NULL; iter = iter->next)
+    {
+      MetaWindowActor *actor = META_WINDOW_ACTOR (iter->data);
+      meta_window_actor_destroy (actor);
+      info->windows = g_list_remove (info->windows, (gconstpointer) actor);
+    }
 }

 void
@@ -844,24 +875,10 @@ void
 meta_compositor_window_shape_changed (MetaCompositor *compositor,
                                      MetaWindow     *window)
 {
-  MetaWindowActor *window_actor;
-  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  if (!window_actor)
-    return;
+  GSList *iter;

-  meta_window_actor_update_shape (window_actor);
-}
-
-void
-meta_compositor_window_opacity_changed (MetaCompositor *compositor,
-                                        MetaWindow     *window)
-{
-  MetaWindowActor *window_actor;
-  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  if (!window_actor)
-    return;
-
-  meta_window_actor_update_opacity (window_actor);
+  for (iter = window->actors; iter != NULL; iter = iter->next)
+    meta_window_actor_update_shape (META_WINDOW_ACTOR (iter->data));
 }

 /* Clutter makes the assumption that there is only one X window
@@ -970,19 +987,28 @@ meta_compositor_process_event (MetaCompositor *compositor,
 	}
    }

-  if (event->type == meta_display_get_damage_event_base (compositor->display) + XDamageNotify)
+  switch (event->type)
    {
-      /* Core code doesn't handle damage events, so we need to extract the MetaWindow
-       * ourselves
-       */
-      if (window == NULL)
-        {
-          Window xwin = ((XDamageNotifyEvent *) event)->drawable;
-          window = meta_display_lookup_x_window (compositor->display, xwin);
-        }
+    case PropertyNotify:
+      process_property_notify (compositor, (XPropertyEvent *) event, window);
+      break;

-      DEBUG_TRACE ("meta_compositor_process_event (process_damage)\n");
-      process_damage (compositor, (XDamageNotifyEvent *) event, window);
+    default:
+      if (event->type == meta_display_get_damage_event_base (compositor->display) + XDamageNotify)
+        {
+          /* Core code doesn't handle damage events, so we need to extract the MetaWindow
+           * ourselves
+           */
+          if (window == NULL)
+            {
+              Window xwin = ((XDamageNotifyEvent *) event)->drawable;
+              window = meta_display_lookup_x_window (compositor->display, xwin);
+            }
+
+	  DEBUG_TRACE ("meta_compositor_process_event (process_damage)\n");
+          process_damage (compositor, (XDamageNotifyEvent *) event, window);
+        }
+      break;
    }

  /* Clutter needs to know about MapNotify events otherwise it will
@@ -1015,12 +1041,8 @@ meta_compositor_show_window (MetaCompositor *compositor,
 			     MetaWindow	    *window,
                             MetaCompEffect  effect)
 {
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  DEBUG_TRACE ("meta_compositor_show_window\n");
-  if (!window_actor)
-    return;
-
-  meta_window_actor_show (window_actor, effect);
+  if (window->core_actor != NULL)
+    meta_window_actor_show (window->core_actor, effect);
 }

 void
@@ -1028,12 +1050,8 @@ meta_compositor_hide_window (MetaCompositor *compositor,
                             MetaWindow     *window,
                             MetaCompEffect  effect)
 {
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  DEBUG_TRACE ("meta_compositor_hide_window\n");
-  if (!window_actor)
-    return;
-
-  meta_window_actor_hide (window_actor, effect);
+  if (window->core_actor != NULL)
+    meta_window_actor_hide (window->core_actor, effect);
 }

 void
@@ -1042,12 +1060,8 @@ meta_compositor_maximize_window (MetaCompositor    *compositor,
 				 MetaRectangle	   *old_rect,
 				 MetaRectangle	   *new_rect)
 {
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  DEBUG_TRACE ("meta_compositor_maximize_window\n");
-  if (!window_actor)
-    return;
-
-  meta_window_actor_maximize (window_actor, old_rect, new_rect);
+  if (window->core_actor != NULL)
+    meta_window_actor_maximize (window->core_actor, old_rect, new_rect);
 }

 void
@@ -1056,12 +1070,8 @@ meta_compositor_unmaximize_window (MetaCompositor    *compositor,
 				   MetaRectangle     *old_rect,
 				   MetaRectangle     *new_rect)
 {
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  DEBUG_TRACE ("meta_compositor_unmaximize_window\n");
-  if (!window_actor)
-    return;
-
-  meta_window_actor_unmaximize (window_actor, old_rect, new_rect);
+  if (window->core_actor != NULL)
+    meta_window_actor_unmaximize (window->core_actor, old_rect, new_rect);
 }

 void
@@ -1237,7 +1247,7 @@ meta_compositor_sync_stack (MetaCompositor  *compositor,
      while (stack)
        {
          stack_window = stack->data;
-          stack_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (stack_window));
+          stack_actor = stack_window->core_actor;
          if (!stack_actor)
            {
              meta_verbose ("Failed to find corresponding MetaWindowActor "
@@ -1286,24 +1296,16 @@ void
 meta_compositor_window_mapped (MetaCompositor *compositor,
                               MetaWindow     *window)
 {
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  DEBUG_TRACE ("meta_compositor_window_mapped\n");
-  if (!window_actor)
-    return;
-
-  meta_window_actor_mapped (window_actor);
+  if (window->core_actor != NULL)
+    meta_window_actor_mapped (window->core_actor);
 }

 void
 meta_compositor_window_unmapped (MetaCompositor *compositor,
                                 MetaWindow     *window)
 {
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  DEBUG_TRACE ("meta_compositor_window_unmapped\n");
-  if (!window_actor)
-    return;
-
-  meta_window_actor_unmapped (window_actor);
+  if (window->core_actor != NULL)
+    meta_window_actor_unmapped (window->core_actor);
 }

 void
@@ -1311,17 +1313,8 @@ meta_compositor_sync_window_geometry (MetaCompositor *compositor,
 				      MetaWindow *window,
                                      gboolean did_placement)
 {
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  MetaScreen      *screen = meta_window_get_screen (window);
-  MetaCompScreen  *info = meta_screen_get_compositor_data (screen);
-
-  DEBUG_TRACE ("meta_compositor_sync_window_geometry\n");
-  g_return_if_fail (info);
-
-  if (!window_actor)
-    return;
-
-  meta_window_actor_sync_actor_geometry (window_actor, did_placement);
+  if (window->core_actor != NULL)
+    meta_window_actor_sync_actor_geometry (window->core_actor, did_placement);
 }

 void
@@ -1486,7 +1479,13 @@ on_shadow_factory_changed (MetaShadowFactory *factory,
 MetaCompositor *
 meta_compositor_new (MetaDisplay *display)
 {
+  char *atom_names[] = {
+    "_XROOTPMAP_ID",
+    "_NET_WM_WINDOW_OPACITY",
+  };
+  Atom                   atoms[G_N_ELEMENTS(atom_names)];
  MetaCompositor        *compositor;
+  Display               *xdisplay = meta_display_get_xdisplay (display);

  if (!composite_at_least_version (display, 0, 3))
    return NULL;
@@ -1498,11 +1497,18 @@ meta_compositor_new (MetaDisplay *display)
  if (g_getenv("META_DISABLE_MIPMAPS"))
    compositor->no_mipmaps = TRUE;

+  meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names));
+  XInternAtoms (xdisplay, atom_names, G_N_ELEMENTS (atom_names),
+                False, atoms);
+
  g_signal_connect (meta_shadow_factory_get_default (),
                    "changed",
                    G_CALLBACK (on_shadow_factory_changed),
                    compositor);

+  compositor->atom_x_root_pixmap = atoms[0];
+  compositor->atom_net_wm_window_opacity = atoms[1];
+
  compositor->repaint_func_id = clutter_threads_add_repaint_func (meta_repaint_func,
                                                                  compositor,
                                                                  NULL);
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -34,14 +34,7 @@
 #include "monitor-private.h"
 #include "meta-cullable.h"

-enum {
-  POSITION_CHANGED,
-  SIZE_CHANGED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
+static void meta_window_actor_queue_create_pixmap (MetaWindowActor *self);

 struct _MetaWindowActorPrivate
 {
@@ -68,6 +61,8 @@ struct _MetaWindowActorPrivate

  Damage            damage;

+  guint8            opacity;
+
  /* A region that matches the shape of the window, including frame bounds */
  cairo_region_t   *shape_region;
  /* If the window has an input shape, a region that matches the shape */
@@ -245,19 +240,6 @@ meta_window_actor_class_init (MetaWindowActorClass *klass)
  g_object_class_install_property (object_class,
                                   PROP_SHADOW_CLASS,
                                   pspec);
-
-  signals[POSITION_CHANGED] =
-    g_signal_new ("position-changed",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-  signals[SIZE_CHANGED] =
-    g_signal_new ("size-changed",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
 }

 static void
@@ -268,7 +250,11 @@ meta_window_actor_init (MetaWindowActor *self)
  priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
 						   META_TYPE_WINDOW_ACTOR,
 						   MetaWindowActorPrivate);
+  priv->opacity = 0xff;
  priv->shadow_class = NULL;
+
+  priv->last_width = -1;
+  priv->last_height = -1;
 }

 static void
@@ -302,6 +288,8 @@ window_decorated_notify (MetaWindow *mw,
      priv->damage = None;
    }

+  priv->xwindow = meta_window_get_toplevel_xwindow (priv->window);
+
  /*
   * Recreate the contents.
   */
@@ -316,15 +304,6 @@ window_appears_focused_notify (MetaWindow *mw,
  clutter_actor_queue_redraw (CLUTTER_ACTOR (data));
 }

-static gboolean
-is_non_opaque (MetaWindowActor *self)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  MetaWindow *window = priv->window;
-
-  return priv->argb32 || (window->opacity != 0xFF);
-}
-
 static void
 meta_window_actor_constructed (GObject *object)
 {
@@ -362,13 +341,34 @@ meta_window_actor_constructed (GObject *object)
       * We will release it in dispose().
       */
      g_object_ref (priv->actor);
+
+      g_signal_connect_object (window, "notify::decorated",
+                               G_CALLBACK (window_decorated_notify), self, 0);
+      g_signal_connect_object (window, "notify::appears-focused",
+                               G_CALLBACK (window_appears_focused_notify), self, 0);
    }

  meta_window_actor_update_opacity (self);
+  meta_window_actor_sync_actor_position (self);
+
+  priv->mapped = meta_window_toplevel_is_mapped (priv->window);
+  if (priv->mapped)
+    meta_window_actor_queue_create_pixmap (self);
+
+  meta_window_actor_set_updates_frozen (self,
+                                        meta_window_updates_are_frozen (priv->window));
+
+  /* If a window doesn't start off with updates frozen, we should
+   * we should send a _NET_WM_FRAME_DRAWN immediately after the first drawn.
+   */
+  if (priv->window->extended_sync_request_counter && !priv->updates_frozen)
+    meta_window_actor_queue_frame_drawn (self, FALSE);

  /* Start off with an empty region to maintain the invariant that
     the shape region is always set */
  priv->shape_region = cairo_region_create ();
+
+  G_OBJECT_CLASS (meta_window_actor_parent_class)->constructed (object);
 }

 static void
@@ -379,7 +379,6 @@ meta_window_actor_dispose (GObject *object)
  MetaScreen             *screen;
  MetaDisplay            *display;
  Display                *xdisplay;
-  MetaCompScreen         *info;

  if (priv->disposed)
    return;
@@ -389,7 +388,6 @@ meta_window_actor_dispose (GObject *object)
  screen   = priv->screen;
  display  = meta_screen_get_display (screen);
  xdisplay = meta_display_get_xdisplay (display);
-  info     = meta_screen_get_compositor_data (screen);

  meta_window_actor_detach (self);

@@ -419,8 +417,6 @@ meta_window_actor_dispose (GObject *object)
      priv->damage = None;
    }

-  info->windows = g_list_remove (info->windows, (gconstpointer) self);
-
  g_clear_object (&priv->window);

  /*
@@ -455,11 +451,6 @@ meta_window_actor_set_property (GObject      *object,
    {
    case PROP_META_WINDOW:
      priv->window = g_value_dup_object (value);
-
-      g_signal_connect_object (priv->window, "notify::decorated",
-                               G_CALLBACK (window_decorated_notify), self, 0);
-      g_signal_connect_object (priv->window, "notify::appears-focused",
-                               G_CALLBACK (window_appears_focused_notify), self, 0);
      break;
    case PROP_NO_SHADOW:
      {
@@ -602,7 +593,7 @@ clip_shadow_under_window (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;

-  return is_non_opaque (self) && priv->window->frame;
+  return (priv->argb32 || priv->opacity != 0xff) && priv->window->frame;
 }

 static void
@@ -628,7 +619,6 @@ meta_window_actor_paint (ClutterActor *actor)
      MetaShadowParams params;
      cairo_rectangle_int_t shape_bounds;
      cairo_region_t *clip = priv->shadow_clip;
-      MetaWindow *window = priv->window;

      meta_window_actor_get_shape_bounds (self, &shape_bounds);
      meta_window_actor_get_shadow_params (self, appears_focused, &params);
@@ -652,7 +642,7 @@ meta_window_actor_paint (ClutterActor *actor)
                         params.y_offset + shape_bounds.y,
                         shape_bounds.width,
                         shape_bounds.height,
-                         (clutter_actor_get_paint_opacity (actor) * params.opacity * window->opacity) / (255 * 255),
+                         (clutter_actor_get_paint_opacity (actor) * params.opacity * priv->opacity) / (255 * 255),
                         clip,
                         clip_shadow_under_window (self)); /* clip_strictly - not just as an optimization */

@@ -695,11 +685,7 @@ meta_window_actor_get_paint_volume (ClutterActor       *actor,
    }

  if (priv->unobscured_region)
-    {
-      cairo_rectangle_int_t unobscured_bounds;
-      cairo_region_get_extents (priv->unobscured_region, &unobscured_bounds);
-      gdk_rectangle_intersect (&bounds, &unobscured_bounds, &bounds);
-    }
+    cairo_region_intersect_rectangle (priv->unobscured_region, &bounds);

  origin.x = bounds.x;
  origin.y = bounds.y;
@@ -743,10 +729,10 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
    return TRUE;

  /*
-   * Do not add shadows to non-opaque windows; eventually we should generate
-   * a shadow from the input shape for such windows.
+   * Do not add shadows to ARGB windows; eventually we should generate a
+   * shadow from the input shape for such windows.
   */
-  if (is_non_opaque (self))
+  if (priv->argb32 || priv->opacity != 0xff)
    return FALSE;

  /*
@@ -819,59 +805,6 @@ meta_window_actor_is_destroyed (MetaWindowActor *self)
  return self->priv->disposed;
 }

-gboolean
-meta_window_actor_is_override_redirect (MetaWindowActor *self)
-{
-  return meta_window_is_override_redirect (self->priv->window);
-}
-
-/**
- * meta_window_actor_get_workspace:
- * @self: #MetaWindowActor
- *
- * Returns the index of workspace on which this window is located; if the
- * window is sticky, or is not currently located on any workspace, returns -1.
- * This function is deprecated  and should not be used in newly written code;
- * meta_window_get_workspace() instead.
- *
- * Return value: (transfer none): index of workspace on which this window is
- * located.
- */
-gint
-meta_window_actor_get_workspace (MetaWindowActor *self)
-{
-  MetaWindowActorPrivate *priv;
-  MetaWorkspace          *workspace;
-
-  if (!self)
-    return -1;
-
-  priv = self->priv;
-
-  if (!priv->window || meta_window_is_on_all_workspaces (priv->window))
-    return -1;
-
-  workspace = meta_window_get_workspace (priv->window);
-
-  if (!workspace)
-    return -1;
-
-  return meta_workspace_index (workspace);
-}
-
-gboolean
-meta_window_actor_showing_on_its_workspace (MetaWindowActor *self)
-{
-  if (!self)
-    return FALSE;
-
-  /* If override redirect: */
-  if (!self->priv->window)
-    return TRUE;
-
-  return meta_window_showing_on_its_workspace (self->priv->window);
-}
-
 static void
 meta_window_actor_freeze (MetaWindowActor *self)
 {
@@ -1281,7 +1214,7 @@ meta_window_actor_should_unredirect (MetaWindowActor *self)
  if (meta_window_requested_dont_bypass_compositor (metaWindow))
    return FALSE;

-  if (metaWindow->opacity != 0xFF)
+  if (priv->opacity != 0xff)
    return FALSE;

  if (metaWindow->shape_region != NULL)
@@ -1335,7 +1268,6 @@ void
 meta_window_actor_destroy (MetaWindowActor *self)
 {
  MetaWindow	      *window;
-  MetaCompScreen      *info;
  MetaWindowActorPrivate *priv;
  MetaWindowType window_type;

@@ -1343,14 +1275,6 @@ meta_window_actor_destroy (MetaWindowActor *self)

  window = priv->window;
  window_type = meta_window_get_window_type (window);
-  meta_window_set_compositor_private (window, NULL);
-
-  /*
-   * We remove the window from internal lookup hashes and thus any other
-   * unmap events etc fail
-   */
-  info = meta_screen_get_compositor_data (priv->screen);
-  info->windows = g_list_remove (info->windows, (gconstpointer) self);

  if (window_type == META_WINDOW_DROPDOWN_MENU ||
      window_type == META_WINDOW_POPUP_MENU ||
@@ -1413,8 +1337,6 @@ meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
                              window_rect.x, window_rect.y);
  clutter_actor_set_size (CLUTTER_ACTOR (self),
                          window_rect.width, window_rect.height);
-
-  g_signal_emit (self, signals[POSITION_CHANGED], 0);
 }

 void
@@ -1562,56 +1484,9 @@ meta_window_actor_unmaximize (MetaWindowActor   *self,
 MetaWindowActor *
 meta_window_actor_new (MetaWindow *window)
 {
-  MetaScreen	 	 *screen = meta_window_get_screen (window);
-  MetaCompScreen         *info = meta_screen_get_compositor_data (screen);
-  MetaWindowActor        *self;
-  MetaWindowActorPrivate *priv;
-  ClutterActor           *window_group;
-
-  self = g_object_new (META_TYPE_WINDOW_ACTOR,
+  return g_object_new (META_TYPE_WINDOW_ACTOR,
                       "meta-window", window,
                       NULL);
-
-  priv = self->priv;
-
-  priv->last_width = -1;
-  priv->last_height = -1;
-
-  priv->mapped = meta_window_toplevel_is_mapped (priv->window);
-  if (priv->mapped)
-    meta_window_actor_queue_create_pixmap (self);
-
-  meta_window_actor_set_updates_frozen (self,
-                                        meta_window_updates_are_frozen (priv->window));
-
-  /* If a window doesn't start off with updates frozen, we should
-   * we should send a _NET_WM_FRAME_DRAWN immediately after the first drawn.
-   */
-  if (priv->window->extended_sync_request_counter && !priv->updates_frozen)
-    meta_window_actor_queue_frame_drawn (self, FALSE);
-
-  meta_window_actor_sync_actor_geometry (self, priv->window->placed);
-
-  /* Hang our compositor window state off the MetaWindow for fast retrieval */
-  meta_window_set_compositor_private (window, G_OBJECT (self));
-
-  if (window->layer == META_LAYER_OVERRIDE_REDIRECT)
-    window_group = info->top_window_group;
-  else
-    window_group = info->window_group;
-
-  clutter_actor_add_child (window_group, CLUTTER_ACTOR (self));
-
-  clutter_actor_hide (CLUTTER_ACTOR (self));
-
-  clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
-
-  /* Initial position in the stack is arbitrary; stacking will be synced
-   * before we first paint.
-   */
-  info->windows = g_list_append (info->windows, self);
-
-  return self;
 }

 void
@@ -1656,9 +1531,8 @@ static cairo_region_t *
 meta_window_actor_get_obscured_region (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  MetaWindow *window = priv->window;

-  if (priv->back_pixmap && window->opacity != 0xFF && !priv->window->shaded)
+  if (priv->back_pixmap && priv->opacity == 0xff && !priv->window->shaded)
    return priv->opaque_region;
  else
    return NULL;
@@ -1903,17 +1777,6 @@ check_needs_pixmap (MetaWindowActor *self)
       */
      if (G_UNLIKELY (!cogl_texture_pixmap_x11_is_using_tfp_extension (COGL_TEXTURE_PIXMAP_X11 (texture))))
        g_warning ("NOTE: Not using GLX TFP!\n");
-
-      /* ::size-changed is supposed to refer to meta_window_get_frame_rect().
-       * Emitting it here works pretty much OK because a new value of the
-       * *input* rect (which is the outer rect with the addition of invisible
-       * borders) forces a new pixmap and we get here. In the rare case where
-       * a change to the window size was exactly balanced by a change to the
-       * invisible borders, we would miss emitting the signal. We would also
-       * emit spurious signals when we get a new pixmap without a new size,
-       * but that should be mostly harmless.
-       */
-      g_signal_emit (self, signals[SIZE_CHANGED], 0);
    }

  priv->needs_pixmap = FALSE;
@@ -2572,9 +2435,23 @@ void
 meta_window_actor_update_opacity (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  MetaWindow *window = priv->window;
+  MetaDisplay *display = meta_screen_get_display (priv->screen);
+  MetaCompositor *compositor = meta_display_get_compositor (display);
+  Window xwin = meta_window_get_xwindow (priv->window);
+  gulong value;
+  guint8 opacity;

-  clutter_actor_set_opacity (self->priv->actor, window->opacity);
+  if (meta_prop_get_cardinal (display, xwin,
+                              compositor->atom_net_wm_window_opacity,
+                              &value))
+    {
+      opacity = (guint8)((gfloat)value * 255.0 / ((gfloat)0xffffffff));
+    }
+  else
+    opacity = 255;
+
+  self->priv->opacity = opacity;
+  clutter_actor_set_opacity (self->priv->actor, opacity);
 }

 void
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -412,7 +412,7 @@ switch_workspace (MetaPlugin *plugin,
      ClutterActor    *actor	    = CLUTTER_ACTOR (window_actor);
      gint             win_workspace;

-      win_workspace = meta_window_actor_get_workspace (window_actor);
+      win_workspace = meta_window_get_workspace (meta_window_actor_get_meta_window (window_actor));

      if (win_workspace == to || win_workspace == from)
        {
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -138,14 +138,6 @@ struct _MetaDisplay
   */
  guint allow_terminal_deactivation : 1;

-  /* If true, server->focus_serial refers to us changing the focus; in
-   * this case, we can ignore focus events that have exactly focus_serial,
-   * since we take care to make another request immediately afterwards.
-   * But if focus is being changed by another client, we have to accept
-   * multiple events with the same serial.
-   */
-  guint focused_by_us : 1;
-
  guint static_gravity_works : 1;
  
  /*< private-ish >*/
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1865,11 +1865,9 @@ static void
 update_focus_window (MetaDisplay *display,
                     MetaWindow  *window,
                     Window       xwindow,
-                     gulong       serial,
-                     gboolean     focused_by_us)
+                     gulong       serial)
 {
  display->focus_serial = serial;
-  display->focused_by_us = focused_by_us;

  if (display->focus_xwindow == xwindow)
    return;
@@ -1980,8 +1978,7 @@ request_xserver_input_focus_change (MetaDisplay *display,
  update_focus_window (display,
                       meta_window,
                       xwindow,
-                       serial,
-                       TRUE);
+                       serial);

  meta_error_trap_pop (display);

@@ -2095,20 +2092,12 @@ handle_window_focus_event (MetaDisplay  *display,
  else
    g_return_if_reached ();

-  /* If display->focused_by_us, then the focus_serial will be used only
-   * for a focus change we made and have already accounted for.
-   * (See request_xserver_input_focus_change().) Otherwise, we can get
-   * multiple focus events with the same serial.
-   */
-  if (display->server_focus_serial > display->focus_serial ||
-      (!display->focused_by_us &&
-       display->server_focus_serial == display->focus_serial))
+  if (display->server_focus_serial > display->focus_serial)
    {
      update_focus_window (display,
                           focus_window,
                           focus_window ? focus_window->xwindow : None,
-                           display->server_focus_serial,
-                           FALSE);
+                           display->server_focus_serial);
    }
 }

@@ -2178,8 +2167,7 @@ event_callback (XEvent   *event,
  display->current_time = event_get_time (display, event);
  display->monitor_cache_invalidated = TRUE;

-  if (display->focused_by_us &&
-      event->xany.serial > display->focus_serial &&
+  if (event->xany.serial > display->focus_serial &&
      display->focus_window &&
      !window_has_xwindow (display->focus_window, display->server_focus_window))
    {
@@ -2188,8 +2176,7 @@ event_callback (XEvent   *event,
      update_focus_window (display,
                           meta_display_lookup_x_window (display, display->server_focus_window),
                           display->server_focus_window,
-                           display->server_focus_serial,
-                           FALSE);
+                           display->server_focus_serial);
    }

  screen = meta_display_screen_for_root (display, event->xany.window);
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -41,7 +41,6 @@
 #include "ui.h"
 #include "frame.h"
 #include "place.h"
-#include "screen-private.h"
 #include <meta/prefs.h>
 #include <meta/util.h>

@@ -3974,26 +3973,6 @@ handle_move_to_workspace  (MetaDisplay    *display,
    }
 }

-static void
-handle_move_to_monitor (MetaDisplay    *display,
-                        MetaScreen     *screen,
-                        MetaWindow     *window,
-                        XIDeviceEvent  *event,
-                        MetaKeyBinding *binding,
-                        gpointer        dummy)
-{
-  gint which = binding->handler->data;
-  const MetaMonitorInfo *current, *new;
-
-  current = meta_screen_get_monitor_for_window (screen, window);
-  new = meta_screen_get_monitor_neighbor (screen, current->number, which);
-
-  if (new == NULL)
-    return;
-
-  meta_window_move_to_monitor (window, new->number);
-}
-
 static void
 handle_raise_or_lower (MetaDisplay    *display,
                       MetaScreen     *screen,
@@ -4650,34 +4629,6 @@ init_builtin_key_bindings (MetaDisplay *display)
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_DOWN,
                          handle_move_to_workspace, META_MOTION_DOWN);

-  add_builtin_keybinding (display,
-                          "move-to-monitor-left",
-                          common_keybindings,
-                          META_KEY_BINDING_PER_WINDOW,
-                          META_KEYBINDING_ACTION_MOVE_TO_MONITOR_LEFT,
-                          handle_move_to_monitor, META_SCREEN_LEFT);
-
-  add_builtin_keybinding (display,
-                          "move-to-monitor-right",
-                          common_keybindings,
-                          META_KEY_BINDING_PER_WINDOW,
-                          META_KEYBINDING_ACTION_MOVE_TO_MONITOR_RIGHT,
-                          handle_move_to_monitor, META_SCREEN_RIGHT);
-
-  add_builtin_keybinding (display,
-                          "move-to-monitor-down",
-                          common_keybindings,
-                          META_KEY_BINDING_PER_WINDOW,
-                          META_KEYBINDING_ACTION_MOVE_TO_MONITOR_DOWN,
-                          handle_move_to_monitor, META_SCREEN_DOWN);
-
-  add_builtin_keybinding (display,
-                          "move-to-monitor-up",
-                          common_keybindings,
-                          META_KEY_BINDING_PER_WINDOW,
-                          META_KEYBINDING_ACTION_MOVE_TO_MONITOR_UP,
-                          handle_move_to_monitor, META_SCREEN_UP);
-
  add_builtin_keybinding (display,
                          "raise-or-lower",
                          common_keybindings,
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -36,6 +36,7 @@

 #include <config.h>
 #include <meta/compositor.h>
+#include <meta/meta-window-actor.h>
 #include <meta/window.h>
 #include "screen-private.h"
 #include <meta/util.h>
@@ -355,9 +356,6 @@ struct _MetaWindow
  /* the input shape region for picking */
  cairo_region_t *input_region;

-  /* _NET_WM_WINDOW_OPACITY */
-  guint opacity;
-
  /* if TRUE, the we have the new form of sync request counter which
   * also handles application frames */
  guint extended_sync_request_counter : 1;
@@ -441,7 +439,10 @@ struct _MetaWindow
  /* maintained by group.c */
  MetaGroup *group;

-  GObject *compositor_private;
+  GSList *actors;
+
+  /* The core actor is the one in the window group. */
+  MetaWindowActor *core_actor;

  /* Focused window that is (directly or indirectly) attached to this one */
  MetaWindow *attached_focus_window;
@@ -698,8 +699,6 @@ void meta_window_update_input_region_x11  (MetaWindow *window);
 void meta_window_set_shape_region         (MetaWindow     *window,
                                           cairo_region_t *region);
 void meta_window_update_shape_region_x11  (MetaWindow *window);
-void meta_window_set_opacity              (MetaWindow *window,
-                                           guint       opacity);

 Window meta_window_get_toplevel_xwindow (MetaWindow *window);

--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1709,20 +1709,6 @@ reload_bypass_compositor (MetaWindow    *window,
  window->bypass_compositor = requested_value;
 }

-static void
-reload_window_opacity (MetaWindow    *window,
-                       MetaPropValue *value,
-                       gboolean       initial)
-
-{
-  int requested_value = 0xFF;
-
-  if (value->type != META_PROP_VALUE_INVALID)
-    requested_value = (int) value->v.cardinal;
-
-  meta_window_set_opacity (window, requested_value);
-}
-
 #define RELOAD_STRING(var_name, propname) \
  static void                                       \
  reload_ ## var_name (MetaWindow    *window,       \
@@ -1825,7 +1811,6 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
    { display->atom__NET_WM_STRUT,         META_PROP_VALUE_INVALID, reload_struts,            FALSE, FALSE },
    { display->atom__NET_WM_STRUT_PARTIAL, META_PROP_VALUE_INVALID, reload_struts,            FALSE, FALSE },
    { display->atom__NET_WM_BYPASS_COMPOSITOR, META_PROP_VALUE_CARDINAL,  reload_bypass_compositor, FALSE, FALSE },
-    { display->atom__NET_WM_WINDOW_OPACITY, META_PROP_VALUE_CARDINAL, reload_window_opacity,  TRUE, TRUE },
    { 0 },
  };

--- a/src/core/window.c
+++ b/src/core/window.c
@@ -194,6 +194,8 @@ enum
  FOCUS,
  RAISED,
  UNMANAGED,
+  SIZE_CHANGED,
+  POSITION_CHANGED,

  LAST_SIGNAL
 };
@@ -587,6 +589,22 @@ meta_window_class_init (MetaWindowClass *klass)
                  G_STRUCT_OFFSET (MetaWindowClass, unmanaged),
                  NULL, NULL, NULL,
                  G_TYPE_NONE, 0);
+
+  window_signals[POSITION_CHANGED] =
+    g_signal_new ("position-changed",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+
+  window_signals[SIZE_CHANGED] =
+    g_signal_new ("size-changed",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
 }

 static void
@@ -1175,7 +1193,8 @@ meta_window_new_with_attrs (MetaDisplay       *display,
  window->initial_workspace = 0; /* not used */
  window->initial_timestamp = 0; /* not used */

-  window->compositor_private = NULL;
+  window->core_actor = NULL;
+  window->actors = NULL;

  window->monitor = meta_screen_get_monitor_for_window (window->screen, window);

@@ -1201,8 +1220,6 @@ meta_window_new_with_attrs (MetaDisplay       *display,
   */
  window->stable_sequence = ++display->window_sequence_counter;

-  window->opacity = 0xFF;
-
  /* assign the window to its group, or create a new group if needed
   */
  window->group = NULL;
@@ -4983,11 +5000,6 @@ meta_window_move_resize_internal (MetaWindow          *window,
                         &old_rect,
                         &new_rect);

-  /* meta_window_constrain() might have maximized the window after placement,
-   * changing the borders.
-   */
-  meta_frame_calc_borders (window->frame, &borders);
-
  w = new_rect.width;
  h = new_rect.height;
  root_x_nw = new_rect.x;
@@ -5290,6 +5302,12 @@ meta_window_move_resize_internal (MetaWindow          *window,
  else if (is_user_action)
    save_user_window_placement (window);

+  if (need_move_frame)
+    g_signal_emit (window, window_signals[POSITION_CHANGED], 0);
+
+  if (need_resize_client)
+    g_signal_emit (window, window_signals[SIZE_CHANGED], 0);
+
  if (need_move_frame || need_resize_frame ||
      need_move_client || need_resize_client ||
      did_placement)
@@ -11047,24 +11065,15 @@ meta_window_get_gtk_menubar_object_path (MetaWindow *window)
 * meta_window_get_compositor_private:
 * @window: a #MetaWindow
 *
- * Gets the compositor's wrapper object for @window.
- *
- * Return value: (transfer none): the wrapper object.
- **/
+ * Return value: (transfer none):
+ */
 GObject *
 meta_window_get_compositor_private (MetaWindow *window)
 {
  if (!window)
    return NULL;
-  return window->compositor_private;
-}

-void
-meta_window_set_compositor_private (MetaWindow *window, GObject *priv)
-{
-  if (!window)
-    return;
-  window->compositor_private = priv;
+  return G_OBJECT (window->core_actor);
 }

 const char *
@@ -11451,13 +11460,3 @@ meta_window_get_toplevel_xwindow (MetaWindow *window)
 {
  return window->frame ? window->frame->xwindow : window->xwindow;
 }
-
-void
-meta_window_set_opacity (MetaWindow *window,
-                         guint       opacity)
-{
-  window->opacity = opacity;
-
-  if (window->display->compositor)
-    meta_compositor_window_opacity_changed (window->display->compositor, window);
-}
--- a/src/meta/atomnames.h
+++ b/src/meta/atomnames.h
@@ -179,7 +179,6 @@ item(_NET_WM_BYPASS_COMPOSITOR)
 item(_NET_WM_OPAQUE_REGION)
 item(_NET_WM_FRAME_DRAWN)
 item(_NET_WM_FRAME_TIMINGS)
-item(_NET_WM_WINDOW_OPACITY)

 #if 0
 /* We apparently never use: */
--- a/src/meta/compositor.h
+++ b/src/meta/compositor.h
@@ -66,8 +66,6 @@ void meta_compositor_unmanage_screen (MetaCompositor *compositor,

 void meta_compositor_window_shape_changed (MetaCompositor *compositor,
                                           MetaWindow     *window);
-void meta_compositor_window_opacity_changed (MetaCompositor *compositor,
-                                             MetaWindow     *window);

 gboolean meta_compositor_process_event (MetaCompositor *compositor,
                                        XEvent         *event,
--- a/src/meta/meta-window-actor.h
+++ b/src/meta/meta-window-actor.h
@@ -60,11 +60,8 @@ struct _MetaWindowActor
 GType meta_window_actor_get_type (void);

 Window             meta_window_actor_get_x_window         (MetaWindowActor *self);
-gint               meta_window_actor_get_workspace        (MetaWindowActor *self);
 MetaWindow *       meta_window_actor_get_meta_window      (MetaWindowActor *self);
 ClutterActor *     meta_window_actor_get_texture          (MetaWindowActor *self);
-gboolean           meta_window_actor_is_override_redirect (MetaWindowActor *self);
-gboolean       meta_window_actor_showing_on_its_workspace (MetaWindowActor *self);
 gboolean       meta_window_actor_is_destroyed (MetaWindowActor *self);

 #endif /* META_WINDOW_ACTOR_H */
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -243,10 +243,6 @@ void     meta_prefs_set_ignore_request_hide_titlebar (gboolean whether);
 * @META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_RIGHT: FILLME 
 * @META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_UP: FILLME 
 * @META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_DOWN: FILLME 
- * @META_KEYBINDING_ACTION_MOVE_TO_MONITOR_LEFT: FILLME
- * @META_KEYBINDING_ACTION_MOVE_TO_MONITOR_RIGHT: FILLME
- * @META_KEYBINDING_ACTION_MOVE_TO_MONITOR_UP: FILLME
- * @META_KEYBINDING_ACTION_MOVE_TO_MONITOR_DOWN: FILLME
 * @META_KEYBINDING_ACTION_RAISE_OR_LOWER: FILLME 
 * @META_KEYBINDING_ACTION_RAISE: FILLME 
 * @META_KEYBINDING_ACTION_LOWER: FILLME 
@@ -340,10 +336,6 @@ typedef enum _MetaKeyBindingAction
  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_RIGHT,
  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_UP,
  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_DOWN,
-  META_KEYBINDING_ACTION_MOVE_TO_MONITOR_LEFT,
-  META_KEYBINDING_ACTION_MOVE_TO_MONITOR_RIGHT,
-  META_KEYBINDING_ACTION_MOVE_TO_MONITOR_UP,
-  META_KEYBINDING_ACTION_MOVE_TO_MONITOR_DOWN,
  META_KEYBINDING_ACTION_RAISE_OR_LOWER,
  META_KEYBINDING_ACTION_RAISE,
  META_KEYBINDING_ACTION_LOWER,
--- a/src/meta/window.h
+++ b/src/meta/window.h
@@ -154,7 +154,6 @@ void meta_window_change_workspace_by_index (MetaWindow *window,
 void meta_window_change_workspace          (MetaWindow  *window,
                                            MetaWorkspace *workspace);
 GObject *meta_window_get_compositor_private (MetaWindow *window);
-void meta_window_set_compositor_private (MetaWindow *window, GObject *priv);
 void meta_window_configure_notify (MetaWindow *window, XConfigureEvent *event);
 const char *meta_window_get_role (MetaWindow *window);
 MetaStackLayer meta_window_get_layer (MetaWindow *window);
Author	SHA1	Message	Date
Jasper St. Pierre	8b2a85f636	window-actor: Don't do any special initialization in _new https://bugzilla.gnome.org/show_bug.cgi?id=678989	2013-12-06 16:24:01 -05:00
Jasper St. Pierre	df35234841	Allow potentially supporting multiple MetaWindowActors per window A lot of the code in mutter assumed a one to one relationship between a MetaWindow and a MetaWindowActor, and that it owns its MetaWindowActor. For the most part, we've gotten around this in GNOME Shell by creating a ClutterClone of the MetaWindowActor. In some spots, we reparent the actor owned by Mutter, and use it for our own purpose, which just plain isn't nice. Since the Clutter maintainers have plans to kill off ClutterClone, and since MetaWindowActor is already a very thin wrapper around MetaShapedTexture, we should be able to create multiple MetaWindowActors for a MetaShapedTexture. This commit replaces the "compositor_private" property on MetaWindow with a direct reference to a MetaWindowActor (which may go away at some point, see below), and a list of window actors. The direct reference is a replacement for the "compositor_private" property that has been there previously. It doesn't make sense to run mutter without compositing, so there's no real reason to keep the veil of a compositor/core split. The eventual plan I have in mind is to remove the direct reference to MetaWindowActor, and have the compositor/plugin just create a new window actor like anybody else. https://bugzilla.gnome.org/show_bug.cgi?id=678989	2013-12-06 16:24:01 -05:00
Jasper St. Pierre	84b71cf297	window-actor: Make the meta-window property construct-only We don't deal with setting this property at all, and it's unlikely to come up in future settings, so just don't allow setting it at all. https://bugzilla.gnome.org/show_bug.cgi?id=678989	2013-12-06 16:24:01 -05:00
Jasper St. Pierre	8cf420b128	window-actor: Remove meta-screen property This can be inferred from the window. Don't allow anybody to set it. https://bugzilla.gnome.org/show_bug.cgi?id=678989	2013-12-06 16:24:01 -05:00
Jasper St. Pierre	d1dda65339	window-actor: Remove (private) xwindow property This should make it easier to construct a MetaWindowActor from bindings. https://bugzilla.gnome.org/show_bug.cgi?id=678989	2013-12-06 16:24:00 -05:00
Jasper St. Pierre	057d8830e9	window: Add a simple meta_window_get_toplevel_xwindow utility To replace all the places where we do: window->frame ? window->frame->xwindow : window->xwindow or similar...	2013-12-06 16:23:49 -05:00
Jasper St. Pierre	570953819d	window-actor: Remove outdated code path The shadow is added in the paint step, not as a separate actor, so the raise is a no-op. It also gets rid of an annoying misspelling that's driving me crazy.	2013-12-06 16:20:57 -05:00
Jasper St. Pierre	0601987651	Move position-changed / size-changed signals to the MetaWindow They fit more appropriately over here...	2013-12-06 16:20:56 -05:00
Jasper St. Pierre	853098142f	window-actor: Remove old unused APIs	2013-12-06 15:31:27 -05:00