Merge lp:~unity-team/compiz-core/compiz-core.one_property_decor into lp:compiz-core/trunk

[Sam Spilsbury]

Fixes LP#795071

Stuff all data into one single property, so that we aren't using two and aren't chained to the idea of having to have an active and inactive default decoration (esp when it might not be necessary, though that optimization hasn't been made yet).

Also add workaround for KDE4 Support.

Stuff all data into one single property, so that we aren't using two and aren't chained to the idea of having to have an active and inactive default decoration (esp when it might not be necessary, though that optimization hasn't been made yet).

Also add workaround for KDE4 Support.

[Jason Smith (jassmith)]

+1 code looks good

review: Approve

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2011-05-20 16:52:31 +0000
+++ gtk/window-decorator/decorator.c	2011-05-20 16:52:31 +0000
@@ -1070,15 +1070,12 @@
 {
     unsigned int frame_state = 0;
 
-    if (!d->win)
-        return frame_state;
-
-    WnckWindowState win_state = wnck_window_get_state (d->win);
+    WnckWindowState win_state;
     const unsigned int n_state_bits = 3;
     unsigned int i;
 
     if (d->active)
-        frame_state &= DECOR_WINDOW_STATE_FOCUS;
+        frame_state |= DECOR_WINDOW_STATE_FOCUS;
 
     struct typestrings {
         unsigned int wnck_flag;
@@ -1090,6 +1087,13 @@
         { WNCK_WINDOW_STATE_SHADED, DECOR_WINDOW_STATE_SHADED }
     };
 
+    /* Not possible to match further than active or not if there is
+     * no window but FIXME we might want to do that later down the line */
+    if (!d->win)
+        return frame_state == 0;
+
+    win_state = wnck_window_get_state (d->win);
+
     for (i = 0; i < n_state_bits; i++)
     {
         if (win_state & state_bits[i].wnck_flag)
@@ -1256,11 +1260,11 @@
 void
 update_default_decorations (GdkScreen *screen)
 {
-    long	    *active_data, *inactive_data;
+    long	    *data;
     Window	    xroot;
     GdkDisplay	    *gdkdisplay = gdk_display_get_default ();
     Display	    *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay);
-    Atom	    bareAtom, normalAtom, activeAtom;
+    Atom	    bareAtom, activeAtom;
     decor_frame_t   *frame;
     decor_frame_t   *bare_frame = gwd_get_decor_frame ("bare");
     decor_extents_t extents;
@@ -1269,7 +1273,6 @@
     xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen));
 
     bareAtom   = XInternAtom (xdisplay, DECOR_BARE_ATOM_NAME, FALSE);
-    normalAtom = XInternAtom (xdisplay, DECOR_NORMAL_ATOM_NAME, FALSE);
     activeAtom = XInternAtom (xdisplay, DECOR_ACTIVE_ATOM_NAME, FALSE);
 
     if (bare_frame->border_shadow)
@@ -1302,11 +1305,6 @@
 	if (minimal)
 	{
 	    XChangeProperty (xdisplay, xroot,
-			     normalAtom,
-			     XA_INTEGER,
-			     32, PropModeReplace, (guchar *) data,
-			     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
-	    XChangeProperty (xdisplay, xroot,
 			     activeAtom,
 			     XA_INTEGER,
 			     32, PropModeReplace, (guchar *) data,
@@ -1321,7 +1319,6 @@
 
 	if (minimal)
 	{
-	    XDeleteProperty (xdisplay, xroot, normalAtom);
 	    XDeleteProperty (xdisplay, xroot, activeAtom);
 	}
     }
@@ -1335,63 +1332,40 @@
     XDeleteProperty (xdisplay, xroot,
                      activeAtom);
 
-    XDeleteProperty (xdisplay, xroot,
-                     normalAtom);
-
-    active_data = decor_alloc_property (WINDOW_TYPE_FRAMES_NUM, WINDOW_DECORATION_TYPE_PIXMAP);
-    inactive_data = decor_alloc_property (WINDOW_TYPE_FRAMES_NUM, WINDOW_DECORATION_TYPE_PIXMAP);
-
-    for (i = 0; i < WINDOW_TYPE_FRAMES_NUM; i++)
+    data = decor_alloc_property (WINDOW_TYPE_FRAMES_NUM * 2, WINDOW_DECORATION_TYPE_PIXMAP);
+
+    /* All active states and all inactive states */
+    for (i = 0; i < WINDOW_TYPE_FRAMES_NUM * 2; i++)
     {
         frame = gwd_get_decor_frame (default_frames[i].name);
         extents = frame->win_extents;
 
-        if (default_frames[i].active_d)
-        {
-            if (default_frames[i].active_d->pixmap)
-                g_object_unref (G_OBJECT (default_frames[i].active_d->pixmap));
-
-            free (default_frames[i].active_d);
-        }
-
-        if (default_frames[i].inactive_d)
-        {
-            if (default_frames[i].inactive_d->pixmap)
-                g_object_unref (G_OBJECT (default_frames[i].inactive_d->pixmap));
-
-            free (default_frames[i].inactive_d);
-        }
-
-        default_frames[i].active_d = calloc (1, sizeof (decor_t));
-        default_frames[i].inactive_d = calloc (1, sizeof (decor_t));
-
-        default_frames[i].active_d->context = &frame->window_context;
-        default_frames[i].inactive_d->context = &frame->window_context;
-        default_frames[i].active_d->shadow  = frame->border_shadow;
-        default_frames[i].inactive_d->shadow  = frame->border_shadow;
-        default_frames[i].active_d->layout  = pango_layout_new (frame->pango_context);
-        default_frames[i].inactive_d->layout  = pango_layout_new (frame->pango_context);
-
-        decor_get_default_layout (default_frames[i].active_d->context, 1, 1, &default_frames[i].active_d->border_layout);
-        decor_get_default_layout (default_frames[i].inactive_d->context, 1, 1, &default_frames[i].inactive_d->border_layout);
-
-        default_frames[i].active_d->width  = default_frames[i].active_d->border_layout.width;
-        default_frames[i].active_d->height = default_frames[i].active_d->border_layout.height;
-
-        default_frames[i].active_d->frame = frame;
-
-        default_frames[i].inactive_d->width  = default_frames[i].inactive_d->border_layout.width;
-        default_frames[i].inactive_d->height = default_frames[i].inactive_d->border_layout.height;
-
-        default_frames[i].inactive_d->frame = frame;
+        if (default_frames[i].d)
+        {
+            if (default_frames[i].d->pixmap)
+                g_object_unref (G_OBJECT (default_frames[i].d->pixmap));
+
+            free (default_frames[i].d);
+        }
+
+        default_frames[i].d = calloc (1, sizeof (decor_t));
+
+        default_frames[i].d->context = &frame->window_context;
+        default_frames[i].d->shadow  = frame->border_shadow;
+        default_frames[i].d->layout  = pango_layout_new (frame->pango_context);
+
+        decor_get_default_layout (default_frames[i].d->context, 1, 1, &default_frames[i].d->border_layout);
+
+        default_frames[i].d->width  = default_frames[i].d->border_layout.width;
+        default_frames[i].d->height = default_frames[i].d->border_layout.height;
+
+        default_frames[i].d->frame = frame;
+        default_frames[i].d->active = i < WINDOW_TYPE_FRAMES_NUM ? TRUE : FALSE;
 
         extents.top += frame->titlebar_height;
 
-        default_frames[i].inactive_d->draw = theme_draw_window_decoration;
-        default_frames[i].active_d->draw = theme_draw_window_decoration;
-
-        default_frames[i].active_d->pixmap = create_pixmap (default_frames[i].active_d->width, default_frames[i].active_d->height, frame->style_window_rgba);
-        default_frames[i].inactive_d->pixmap = create_pixmap (default_frames[i].active_d->width, default_frames[i].active_d->height, frame->style_window_rgba);
+        default_frames[i].d->draw = theme_draw_window_decoration;
+        default_frames[i].d->pixmap = create_pixmap (default_frames[i].d->width, default_frames[i].d->height, frame->style_window_rgba);
 
 	unsigned int j, k;
 
@@ -1399,61 +1373,34 @@
 	{
 	    for (k = 0; k < 3; k++)
 	    {
-		default_frames[i].active_d->event_windows[j][k].window = None;
-		default_frames[i].inactive_d->event_windows[j][k].window = None;
+		default_frames[i].d->event_windows[j][k].window = None;
 	    }
 	}
 
 	for (j = 0; j < BUTTON_NUM; j++)
 	{
-	    default_frames[i].active_d->button_windows[j].window = None;
-	    default_frames[i].active_d->button_states[j] = 0;
-	    default_frames[i].inactive_d->button_windows[j].window = None;
-	    default_frames[i].inactive_d->button_states[j] = 0;
+	    default_frames[i].d->button_windows[j].window = None;
+	    default_frames[i].d->button_states[j] = 0;
 	}
 
-        if (default_frames[i].active_d->pixmap)
-        {
-            gint	    nQuad;
-            unsigned int   frame_type = populate_frame_type (default_frames[i].active_d);
-            unsigned int   frame_state = populate_frame_state (default_frames[i].active_d);
-            unsigned int   frame_actions = populate_frame_actions (default_frames[i].active_d);
-            decor_quad_t    quads[N_QUADS_MAX];
-
-            nQuad = decor_set_lSrStSbS_window_quads (quads, default_frames[i].active_d->context,
-                                                     &default_frames[i].active_d->border_layout);
-
-            default_frames[i].active_d->active = TRUE;
-            default_frames[i].active_d->picture = XRenderCreatePicture (xdisplay,
-                                                                          GDK_PIXMAP_XID (default_frames[i].active_d->pixmap),
-                                                                          xformat_rgba, 0, NULL);
-
-            (*default_frames[i].active_d->draw) (default_frames[i].active_d);
-
-            decor_quads_to_property (active_data, i, GDK_PIXMAP_XID (default_frames[i].active_d->pixmap),
-                                     &extents, &extents,
-                                     &extents, &extents, 0, 0, quads, nQuad, frame_type, frame_state, frame_actions);
-        }
-
-        if (default_frames[i].inactive_d->pixmap)
-        {
-            gint	    nQuad;
-            unsigned int   frame_type = populate_frame_type (default_frames[i].inactive_d);
-            unsigned int   frame_state = populate_frame_state (default_frames[i].inactive_d);
-            unsigned int   frame_actions = populate_frame_actions (default_frames[i].inactive_d);
-            decor_quad_t    quads[N_QUADS_MAX];
-
-            nQuad = decor_set_lSrStSbS_window_quads (quads, default_frames[i].inactive_d->context,
-                                                     &default_frames[i].inactive_d->border_layout);
-
-            default_frames[i].inactive_d->active = FALSE;
-            default_frames[i].inactive_d->picture = XRenderCreatePicture (xdisplay,
-                                                                          GDK_PIXMAP_XID (default_frames[i].inactive_d->pixmap),
-                                                                          xformat_rgba, 0, NULL);
-
-            (*default_frames[i].inactive_d->draw) (default_frames[i].inactive_d);
-
-            decor_quads_to_property (inactive_data, i, GDK_PIXMAP_XID (default_frames[i].inactive_d->pixmap),
+        if (default_frames[i].d->pixmap)
+        {
+            gint	    nQuad;
+            unsigned int   frame_type = populate_frame_type (default_frames[i].d);
+            unsigned int   frame_state = populate_frame_state (default_frames[i].d);
+            unsigned int   frame_actions = populate_frame_actions (default_frames[i].d);
+            decor_quad_t    quads[N_QUADS_MAX];
+
+            nQuad = decor_set_lSrStSbS_window_quads (quads, default_frames[i].d->context,
+                                                     &default_frames[i].d->border_layout);
+
+            default_frames[i].d->picture = XRenderCreatePicture (xdisplay,
+                                                                          GDK_PIXMAP_XID (default_frames[i].d->pixmap),
+                                                                          xformat_rgba, 0, NULL);
+
+            (*default_frames[i].d->draw) (default_frames[i].d);
+
+            decor_quads_to_property (data, i, GDK_PIXMAP_XID (default_frames[i].d->pixmap),
                                      &extents, &extents,
                                      &extents, &extents, 0, 0, quads, nQuad, frame_type, frame_state, frame_actions);
         }
@@ -1464,18 +1411,10 @@
     XChangeProperty (xdisplay, xroot,
                      activeAtom,
                      XA_INTEGER,
-                     32, PropModeAppend, (guchar *) active_data,
-                     PROP_HEADER_SIZE + (WINDOW_TYPE_FRAMES_NUM) * (BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX));
-
-
-    XChangeProperty (xdisplay, xroot,
-                     normalAtom,
-                     XA_INTEGER,
-                     32, PropModeAppend, (guchar *) inactive_data,
-                     PROP_HEADER_SIZE + (WINDOW_TYPE_FRAMES_NUM) * (BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX));
-
-    free (active_data);
-    free (inactive_data);
+                     32, PropModeAppend, (guchar *) data,
+                     PROP_HEADER_SIZE + (WINDOW_TYPE_FRAMES_NUM * 2) * (BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX));
+
+    free (data);
 
     gwd_decor_frame_unref (bare_frame);
 }
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2011-05-20 16:52:31 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2011-05-20 16:52:31 +0000
@@ -83,7 +83,14 @@
 };
 
 #define WINDOW_TYPE_FRAMES_NUM 5
-struct _default_frame_references default_frames[WINDOW_TYPE_FRAMES_NUM] = {
+struct _default_frame_references default_frames[WINDOW_TYPE_FRAMES_NUM  * 2] = {
+    /* active */
+    {"normal", NULL },
+    {"dialog", NULL },
+    {"modal_dialog", NULL },
+    {"menu", NULL },
+    {"utility", NULL},
+    /* inactive */
     {"normal", NULL },
     {"dialog", NULL },
     {"modal_dialog", NULL },
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2011-05-20 16:52:31 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2011-05-20 16:52:31 +0000
@@ -459,9 +459,8 @@
 struct _default_frame_references
 {
     char     *name;
-    decor_t  *active_d;
-    decor_t  *inactive_d;
-} extern default_frames[WINDOW_TYPE_FRAMES_NUM];
+    decor_t  *d;
+} extern default_frames[WINDOW_TYPE_FRAMES_NUM * 2];
 const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
 
 void     (*theme_draw_window_decoration)    (decor_t *d);
 
=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2011-05-20 16:52:31 +0000
+++ gtk/window-decorator/wnck.c	2011-05-20 16:52:31 +0000
@@ -690,19 +690,19 @@
     GList *windows;
 
     g_signal_connect_object (G_OBJECT (screen), "active_window_changed",
-			     G_CALLBACK (active_window_changed),
-			     0, 0);
+                             G_CALLBACK (active_window_changed),
+                             0, 0);
     g_signal_connect_object (G_OBJECT (screen), "window_opened",
-			     G_CALLBACK (window_opened),
-			     0, 0);
+                             G_CALLBACK (window_opened),
+                             0, 0);
     g_signal_connect_object (G_OBJECT (screen), "window_closed",
-			     G_CALLBACK (window_closed),
-			     0, 0);
+                             G_CALLBACK (window_closed),
+                             0, 0);
 
     windows = wnck_screen_get_windows (screen);
     while (windows != NULL)
     {
-	window_opened (screen, windows->data);
-	windows = windows->next;
+        window_opened (screen, windows->data);
+        windows = windows->next;
     }
 }
 
=== modified file 'include/decoration.h'
--- include/decoration.h	2011-05-20 16:52:31 +0000
+++ include/decoration.h	2011-05-20 16:52:31 +0000
@@ -38,7 +38,6 @@
 
 #define DECOR_SUPPORTING_DM_CHECK_ATOM_NAME     "_COMPIZ_SUPPORTING_DM_CHECK"
 #define DECOR_BARE_ATOM_NAME                    "_COMPIZ_WINDOW_DECOR_BARE"
-#define DECOR_NORMAL_ATOM_NAME                  "_COMPIZ_WINDOW_DECOR_NORMAL"
 #define DECOR_ACTIVE_ATOM_NAME                  "_COMPIZ_WINDOW_DECOR_ACTIVE"
 #define DECOR_WINDOW_ATOM_NAME                  "_COMPIZ_WINDOW_DECOR"
 #define DECOR_BLUR_ATOM_NAME                    "_COMPIZ_WM_WINDOW_BLUR_DECOR"
 
=== modified file 'kde/window-decorator-kde4/decorator.cpp'
--- kde/window-decorator-kde4/decorator.cpp	2011-05-20 16:52:31 +0000
+++ kde/window-decorator-kde4/decorator.cpp	2011-05-20 16:52:31 +0000
@@ -63,6 +63,10 @@
 WId KWD::Decorator::mActiveId;
 decor_shadow_options_t KWD::Decorator::mShadowOptions;
 
+KWD::Window *KWD::Decorator::mDecorNormal = NULL;
+KWD::Window *KWD::Decorator::mDecorActive = NULL;
+KWD::Decorator *KWD::Decorator::mSelf = NULL;
+
 struct _cursor cursors[3][3] = {
     { C (top_left_corner), C (top_side), C (top_right_corner) },
     { C (left_side), C (left_ptr), C (right_side) },
@@ -88,6 +92,8 @@
     XSetWindowAttributes attr;
     int			 i, j;
 
+    mSelf = this;
+
     mRootInfo = new NETRootInfo (QX11Info::display (), 0);
 
     mActiveId = 0;
@@ -192,9 +198,10 @@
 
     updateShadow ();
 
+    /* FIXME: Implement proper decoration lists and remove this */
     mDecorNormal = new KWD::Window (mCompositeWindow,
-				    QX11Info::appRootWindow (),
-				    0, Window::Default);
+                                    QX11Info::appRootWindow (),
+                                    0, Window::Default);
     mDecorActive = new KWD::Window (mCompositeWindow,
 				    QX11Info::appRootWindow (),
 				    0, Window::DefaultActive);
 
=== modified file 'kde/window-decorator-kde4/decorator.h'
--- kde/window-decorator-kde4/decorator.h	2010-08-20 15:29:13 +0000
+++ kde/window-decorator-kde4/decorator.h	2011-05-20 16:52:31 +0000
@@ -108,6 +108,21 @@
 	    return &mShadowOptions;
 	}
 
+	static KWD::Window *defaultNormal ()
+	{
+	    return mDecorNormal;
+	}
+
+	static KWD::Window *defaultActive ()
+	{
+	    return mDecorActive;
+	}
+
+	static KWD::Decorator *self ()
+	{
+	    return mSelf;
+	}
+
 	static void sendClientMessage (WId  eventWid,
 				       WId  wid,
 				       Atom atom,
@@ -152,8 +167,8 @@
 	static NETRootInfo *mRootInfo;
 	static WId mActiveId;
 
-	KWD::Window *mDecorNormal;
-	KWD::Window *mDecorActive;
+	static KWD::Window *mDecorNormal;
+	static KWD::Window *mDecorActive;
 	QMap <WId, KWD::Window *>mClients;
 	QMap <WId, KWD::Window *>mFrames;
 	KConfig *mConfig;
@@ -162,6 +177,8 @@
 	WId mCompositeWindow;
 
 	Switcher *mSwitcher;
+
+        static KWD::Decorator *mSelf; /* XXX: Remove */
     };
 }
 
 
=== modified file 'kde/window-decorator-kde4/utils.cpp'
--- kde/window-decorator-kde4/utils.cpp	2010-10-24 14:42:07 +0000
+++ kde/window-decorator-kde4/utils.cpp	2011-05-20 16:52:31 +0000
@@ -221,8 +221,6 @@
     compizShadowColor =
 	XInternAtom (xdisplay, "_COMPIZ_NET_CM_SHADOW_COLOR", false);
     netWindowDecor = XInternAtom (xdisplay, DECOR_WINDOW_ATOM_NAME, false);
-    netWindowDecorNormal =
-	XInternAtom (xdisplay, DECOR_NORMAL_ATOM_NAME, false);
     netWindowDecorActive =
 	XInternAtom (xdisplay, DECOR_ACTIVE_ATOM_NAME, false);
     netWindowDecorBare =
 
=== modified file 'kde/window-decorator-kde4/window.cpp'
--- kde/window-decorator-kde4/window.cpp	2011-05-20 16:52:31 +0000
+++ kde/window-decorator-kde4/window.cpp	2011-05-20 16:52:31 +0000
@@ -185,6 +185,8 @@
 {
     if (mType == DefaultActive)
 	return true;
+    else if (mType == Default)
+        return false;
 
     return Decorator::activeId () == mClientId;
 }
@@ -1004,7 +1006,30 @@
     if (mPaintRedirector)
 	mUpdateProperty = true;
     else
-	updateProperty ();
+    {
+        long         *data = NULL;
+        unsigned int propSize = 0;
+        KWD::Window  *otherUpdate = NULL;
+
+        if (mType == Default || mType == DefaultActive)
+        {
+            propSize = 2;
+            data = decor_alloc_property (propSize, WINDOW_DECORATION_TYPE_PIXMAP);
+
+            if (mType == Default)
+                otherUpdate = KWD::Decorator::self ()->defaultActive ();
+            else if (mType == DefaultActive)
+                otherUpdate = KWD::Decorator::self ()->defaultNormal ();
+        }
+
+        data = updateProperty (data, propSize);
+
+        if (otherUpdate && data)
+        {
+            otherUpdate->updateProperty (data, propSize);
+            free (data);
+        }
+    }
 }
 
 void
@@ -1111,22 +1136,50 @@
     }
 }
 
-void
-KWD::Window::updateProperty (void)
+long *
+KWD::Window::updateProperty (long         *data,
+                             unsigned int propSize)
 {
     Atom	    atom = Atoms::netWindowDecor;
     decor_extents_t maxExtents, normExtents;
     decor_quad_t    quads[N_QUADS_MAX];
+    unsigned int    nOffset = 1;
+    unsigned int    frameType = 0xffffff;
+    unsigned int    frameState = 0;
+    unsigned int    frameActions = 0;
     int		    nQuad = 0;
-    unsigned int    nOffset = 1, frameType = 0, frameState = 0, frameActions = 0;
-    long	    *data = NULL;
     int             left, right, top, bottom, width, height;
     unsigned int    saveState;
-
-    if (mType == Default)
-	atom = Atoms::netWindowDecorNormal;
-    else if (mType == DefaultActive)
-	atom = Atoms::netWindowDecorActive;
+    bool            allocated = false;
+
+    if (!propSize)
+        propSize = nOffset;
+
+    /* FIXME: This is essentially a hack to put the default
+     * active and inactive decorations in the same property,
+     * since we take an existing allocated property and return
+     * the data in there and then pass it to the next KWD::Window
+     * to update the property again. That's sub-optimal, but
+     * its the best solution until we implement proper decoration
+     * lists inside of kde4-window-decorator */
+
+    if (mType != Normal && mType != Normal2D)
+    {
+        atom = Atoms::netWindowDecorActive;
+
+        if (mType == Default)
+        {
+            frameState &= ~(DECOR_WINDOW_STATE_FOCUS);
+            nOffset = 2;
+        }
+        else if (mType == DefaultActive)
+        {
+            frameState |= DECOR_WINDOW_STATE_FOCUS;
+            nOffset = 1;
+        }
+    }
+    else if (!propSize)
+        propSize = nOffset;
 
     saveState = mState;
     mState = NET::MaxVert | NET::MaxHoriz;
@@ -1148,7 +1201,11 @@
 
     if (mType != Normal2D)
     {
-      data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
+      if (!data)
+      {
+          allocated = true;
+          data = decor_alloc_property (propSize, WINDOW_DECORATION_TYPE_PIXMAP);
+      }
       if (mType == Normal)
       {
 	  decor_quad_t *q = quads;
@@ -1246,7 +1303,11 @@
     }
     else
     {
-        data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_WINDOW);
+        if (!data)
+        {
+            allocated = true;
+            data = decor_alloc_property (propSize, WINDOW_DECORATION_TYPE_PIXMAP);
+        }
         decor_gen_window_property (data, nOffset - 1, &normExtents, &maxExtents, 1, 0, frameType, frameState, frameActions);
     }
 
@@ -1254,12 +1315,18 @@
     XChangeProperty (QX11Info::display(), mClientId, atom,
 		     XA_INTEGER,
 		     32, PropModeReplace, (unsigned char *) data,
-		     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
+		     PROP_HEADER_SIZE + propSize * (BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX));
     KWD::popXError ();
 
-    free (data);
+    if (allocated)
+    {
+        free (data);
+        data = NULL;
+    }
 
     mUpdateProperty = false;
+
+    return data;
 }
 
 void
@@ -1874,7 +1941,30 @@
     }
 
     if (mUpdateProperty)
-	updateProperty ();
+    {
+        long         *data = NULL;
+        unsigned int propSize = 0;
+        KWD::Window  *otherUpdate = NULL;
+
+        if (mType == Default || mType == DefaultActive)
+        {
+            propSize = 2;
+            data = decor_alloc_property (propSize, WINDOW_DECORATION_TYPE_PIXMAP);
+
+            if (mType == Default)
+                otherUpdate = KWD::Decorator::self ()->defaultActive ();
+            else if (mType == DefaultActive)
+                otherUpdate = KWD::Decorator::self ()->defaultNormal ();
+        }
+
+        data = updateProperty (data, propSize);
+
+        if (otherUpdate && data)
+        {
+            otherUpdate->updateProperty (data, propSize);
+            free (data);
+        }
+    }
 }
 
 QWidget *
 
=== modified file 'kde/window-decorator-kde4/window.h'
--- kde/window-decorator-kde4/window.h	2010-02-12 20:11:21 +0000
+++ kde/window-decorator-kde4/window.h	2011-05-20 16:52:31 +0000
@@ -206,7 +206,7 @@
 				 int bottomOffset,
 				 int leftOffset,
 				 int rightOffset);
-	void updateProperty (void);
+	long * updateProperty (long *, unsigned int);
 	void getWindowProtocols (void);
 
 	Options::MouseCommand buttonToCommand (Qt::MouseButtons button);
 
=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-05-20 16:52:31 +0000
+++ plugins/decor/src/decor.cpp	2011-05-20 16:52:31 +0000
@@ -558,6 +558,12 @@
     decoration->maxBorder.top    = maxBorder.top;
     decoration->maxBorder.bottom = maxBorder.bottom;
 
+    /* Decoration info */
+
+    decoration->frameType = frameType;
+    decoration->frameState = frameState;
+    decoration->frameActions = frameActions;
+
     decoration->refCount = 1;
     decoration->type = type;
 
@@ -645,7 +651,7 @@
         Decoration *d = Decoration::create (id, prop, n, type, i);
 
 	if (!d)
-        {
+	{
             XFree (data);
             mList.clear ();
             return false;
@@ -1067,10 +1073,7 @@
 		!(dScreen->dmSupports & WINDOW_DECORATION_TYPE_WINDOW &&
 		  pixmapFailed))
 	    {
-		if (window->id () == screen->activeWindow ())
-		    decoration = dScreen->decor[DECOR_ACTIVE].findMatchingDecoration (window, false);
-		else
-		    decoration = dScreen->decor[DECOR_NORMAL].findMatchingDecoration (window, false);
+		decoration = dScreen->decor[DECOR_ACTIVE].findMatchingDecoration (window, false);
 
 		if (!decoration)
 		    compLogMessage ("decor", CompLogLevelWarn, "No default decoration found, placement will not be correct");
@@ -2218,9 +2221,7 @@
     winDecorAtom =
 	XInternAtom (s->dpy (), DECOR_WINDOW_ATOM_NAME, 0);
     decorAtom[DECOR_BARE] =
-	XInternAtom (s->dpy (), DECOR_BARE_ATOM_NAME, 0);
-    decorAtom[DECOR_NORMAL] =
-	XInternAtom (s->dpy (), DECOR_NORMAL_ATOM_NAME, 0);
+        XInternAtom (s->dpy (), DECOR_BARE_ATOM_NAME, 0);
     decorAtom[DECOR_ACTIVE] =
 	XInternAtom (s->dpy (), DECOR_ACTIVE_ATOM_NAME, 0);
     inputFrameAtom =
 
=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2011-05-20 16:52:31 +0000
+++ plugins/decor/src/decor.h	2011-05-20 16:52:31 +0000
@@ -45,9 +45,8 @@
 
 /* FIXME: Remove */
 #define DECOR_BARE   0
-#define DECOR_NORMAL 1
-#define DECOR_ACTIVE 2
-#define DECOR_NUM    3
+#define DECOR_ACTIVE 1
+#define DECOR_NUM    2
 
 class DecorTexture {