Merge lp:~compiz-team/compiz/compiz.fix_1015593 into lp:compiz/0.9.8

[Sam Spilsbury]

== Problem ==

There are cases where changing the active window will re-add a context member back to undecorated windows. That causes other code to think that the window is decorated when it isn't

== Solution ==

Check if the window is decorated before doing that

== Tests ==

There is no testing framework in gtk-window-decorator.

[Daniel van Vugt (vanvugt)]

Looks OK, and seems to work.

review: Approve

=== modified file 'gtk/window-decorator/cairo.c'
--- gtk/window-decorator/cairo.c	2011-10-13 09:53:38 +0000
+++ gtk/window-decorator/cairo.c	2012-06-22 08:10:24 +0000
@@ -750,6 +750,9 @@
     decor_layout_t layout;
     int		   top_width;
 
+    if (!d->decorated)
+	return FALSE;
+
     /* To avoid wasting texture memory, we only calculate the minimal
      * required decoration size then clip and stretch the texture where
      * appropriate

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2012-03-30 07:01:48 +0000
+++ gtk/window-decorator/metacity.c	2012-06-22 08:10:24 +0000
@@ -1142,6 +1142,9 @@
     decor_context_t *context;
     decor_shadow_t  *shadow;
 
+    if (!d->decorated)
+	return FALSE;
+
     if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
     {
 	if (!d->frame_window)

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2012-06-02 09:02:39 +0000
+++ gtk/window-decorator/wnck.c	2012-06-22 08:10:24 +0000
@@ -580,6 +580,13 @@
 }
 
 static void
+set_context_if_decorated (decor_t *d, decor_context_t *context)
+{
+    if (d->decorated)
+	d->context = context;
+}
+
+static void
 active_window_changed (WnckScreen *screen)
 {
     WnckWindow *win;
@@ -601,12 +608,12 @@
 		{
 		   if (d->active)
 		   {
-		       d->context = &frame->max_window_context_active;
+		       set_context_if_decorated (d, &frame->max_window_context_active);
 		       d->shadow  = frame->max_border_shadow_active;
 		   }
 		   else
 		   {
-		       d->context = &frame->max_window_context_inactive;
+		       set_context_if_decorated (d, &frame->max_window_context_inactive);
 		       d->shadow  = frame->max_border_shadow_inactive;
 		   }
                 }
@@ -621,12 +628,12 @@
 	       {
 		   if (d->active)
 		   {
-		       d->context = &frame->window_context_active;
+		       set_context_if_decorated (d, &frame->window_context_active);
 		       d->shadow  = frame->border_shadow_active;
 		   }
 		   else
 		   {
-		       d->context = &frame->window_context_inactive;
+		       set_context_if_decorated (d, &frame->window_context_inactive);
 		       d->shadow  = frame->border_shadow_inactive;
 		   }
 	       }
@@ -670,12 +677,12 @@
 		{
 		   if (d->active)
 		   {
-		       d->context = &frame->max_window_context_active;
+		       set_context_if_decorated (d, &frame->max_window_context_active);
 		       d->shadow  = frame->max_border_shadow_active;
 		   }
 		   else
 		   {
-		       d->context = &frame->max_window_context_inactive;
+		       set_context_if_decorated (d, &frame->max_window_context_inactive);
 		       d->shadow  = frame->max_border_shadow_inactive;
 		   }
 		}
@@ -690,12 +697,12 @@
 		{
 		   if (d->active)
 		   {
-		       d->context = &frame->window_context_active;
+		       set_context_if_decorated (d, &frame->window_context_active);
 		       d->shadow  = frame->border_shadow_active;
 		   }
 		   else
 		   {
-		       d->context = &frame->window_context_inactive;
+		       set_context_if_decorated (d, &frame->window_context_inactive);
 		       d->shadow  = frame->border_shadow_inactive;
 		   }
 		}