Merge lp:~compiz-team/compiz-core/compiz-core.fix_873136 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Bug 873136

=== modified file 'gtk/window-decorator/cairo.c'
--- gtk/window-decorator/cairo.c	2011-05-07 08:58:10 +0000
+++ gtk/window-decorator/cairo.c	2011-10-15 07:11:59 +0000
@@ -766,7 +766,10 @@
 	if (w < top_width)
 	    top_width = MAX (ICON_SPACE + d->button_width, w);
 
-	decor_get_default_layout (&d->frame->window_context, top_width, 1, &layout);
+	if (d->active)
+	    decor_get_default_layout (&d->frame->window_context_active, top_width, 1, &layout);
+	else
+	    decor_get_default_layout (&d->frame->window_context_inactive, top_width, 1, &layout);
 
 	if (!d->context || memcmp (&layout, &d->border_layout, sizeof (layout)))
 	{
@@ -774,8 +777,16 @@
 	    *height = layout.height;
 
 	    d->border_layout = layout;
-	    d->context       = &d->frame->window_context;
-	    d->shadow        = d->frame->border_shadow;
+	    if (d->active)
+	    {
+		d->context       = &d->frame->window_context_active;
+		d->shadow        = d->frame->border_shadow_active;
+	    }
+	    else
+	    {
+		d->context       = &d->frame->window_context_inactive;
+		d->shadow        = d->frame->border_shadow_inactive;
+	    }
 
 	    return TRUE;
 	}
@@ -797,8 +808,16 @@
 	*height = layout.height;
 
 	d->border_layout = layout;
-	d->context = &d->frame->window_context_no_shadow;
-	d->shadow = d->frame->border_no_shadow;
+	if (d->active)
+	{
+	    d->context       = &d->frame->window_context_active;
+	    d->shadow        = d->frame->border_shadow_active;
+	}
+	else
+	{
+	    d->context       = &d->frame->window_context_inactive;
+	    d->shadow        = d->frame->border_shadow_inactive;
+	}
 
 	return TRUE;
     }

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2011-05-08 13:45:38 +0000
+++ gtk/window-decorator/decorator.c	2011-10-15 07:11:59 +0000
@@ -60,9 +60,11 @@
     frame->win_extents = _win_extents;
     frame->max_win_extents = _max_win_extents;
     frame->update_shadow = decor_frame_update_shadow;
-    frame->window_context = _window_context;
+    frame->window_context_active = _window_context;
+    frame->window_context_inactive = _window_context;
     frame->window_context_no_shadow = _window_context_no_shadow;
-    frame->max_window_context = _max_window_context;
+    frame->max_window_context_active = _max_window_context;
+    frame->max_window_context_inactive = _max_window_context;
     frame->max_window_context_no_shadow = _max_window_context_no_shadow;
 
     return frame;
@@ -89,9 +91,11 @@
     frame->win_extents = _shadow_extents;
     frame->max_win_extents = _shadow_extents;
     frame->win_extents = _shadow_extents;
-    frame->window_context = _shadow_context;
+    frame->window_context_active = _shadow_context;
+    frame->window_context_inactive = _shadow_context;
     frame->window_context_no_shadow = _shadow_context;
-    frame->max_window_context = _shadow_context;
+    frame->max_window_context_active = _shadow_context;
+    frame->max_window_context_inactive = _shadow_context;
     frame->max_window_context_no_shadow = _shadow_context;
     frame->update_shadow = bare_frame_update_shadow;
 
@@ -696,7 +700,20 @@
 
     memset (&d, 0, sizeof (d));
 
-    d.frame = info->frame;
+    if (info)
+    {
+	gwd_decor_frame_ref (info->frame);
+
+	d.frame = info->frame;
+	d.state = info->state;
+	d.actions = info->active;
+    }
+    else
+    {
+	d.frame = gwd_get_decor_frame ("normal");
+	d.state = 0;
+	d.active = TRUE;
+    }
 
     d.pixmap  = gdk_pixmap_foreign_new_for_display (gdk_display_get_default (),
 						    pixmap);
@@ -759,19 +776,23 @@
  */
 void
 bare_frame_update_shadow (Display		  *xdisplay,
-			  Screen		  *screen,
-			  decor_frame_t		 *frame,
-			  decor_shadow_info_t    *info,
-			  decor_shadow_options_t *opt_shadow,
-			  decor_shadow_options_t *opt_no_shadow)
+			   Screen		  *screen,
+			   decor_frame_t	  *frame,
+			   decor_shadow_t	  **shadow_normal,
+			   decor_context_t	  *context_normal,
+			   decor_shadow_t	  **shadow_max,
+			   decor_context_t	  *context_max,
+			   decor_shadow_info_t    *info,
+			   decor_shadow_options_t *opt_shadow,
+			   decor_shadow_options_t *opt_no_shadow)
 {
-    if (frame->border_shadow)
+    if (frame->border_shadow_active)
     {
-	decor_shadow_destroy (xdisplay, frame->border_shadow);
-	frame->border_shadow = NULL;
+	decor_shadow_destroy (xdisplay, frame->border_shadow_active);
+	frame->border_shadow_active = NULL;
     }
 
-    frame->border_shadow = decor_shadow_create (xdisplay,
+    frame->border_shadow_active = decor_shadow_create (xdisplay,
 					    screen,
 					    1, 1,
 					    0,
@@ -780,7 +801,7 @@
 					    0,
 					    0, 0, 0, 0,
 					    opt_shadow,
-					    &frame->window_context,
+					    &frame->window_context_active,
 					    decor_draw_simple,
 					    NULL);
 }
@@ -789,17 +810,21 @@
 switcher_frame_update_shadow (Display		  *xdisplay,
 			      Screen		  *screen,
 			      decor_frame_t	  *frame,
+			      decor_shadow_t	  **shadow_normal,
+			      decor_context_t	  *context_normal,
+			      decor_shadow_t	  **shadow_max,
+			      decor_context_t	  *context_max,
 			      decor_shadow_info_t    *info,
 			      decor_shadow_options_t *opt_shadow,
 			      decor_shadow_options_t *opt_no_shadow)
 {
-    if (frame->border_shadow)
+    if (frame->border_shadow_active)
     {
-	decor_shadow_destroy (xdisplay, frame->border_shadow);
-	frame->border_shadow = NULL;
+	decor_shadow_destroy (xdisplay, frame->border_shadow_active);
+	frame->border_shadow_active = NULL;
     }
 
-    frame->border_shadow = decor_shadow_create (xdisplay,
+    frame->border_shadow_active = decor_shadow_create (xdisplay,
 						screen,
 						1, 1,
 						frame->win_extents.left,
@@ -815,7 +840,7 @@
 						frame->win_extents.bottom -
 						TRANSLUCENT_CORNER_SIZE,
 						opt_shadow,
-						&frame->window_context,
+						&frame->window_context_active,
 						decor_draw_simple,
 						NULL);
 }
@@ -824,17 +849,21 @@
 decor_frame_update_shadow (Display		  *xdisplay,
 			   Screen		  *screen,
 			   decor_frame_t	  *frame,
+			   decor_shadow_t	  **shadow_normal,
+			   decor_context_t	  *context_normal,
+			   decor_shadow_t	  **shadow_max,
+			   decor_context_t	  *context_max,
 			   decor_shadow_info_t    *info,
 			   decor_shadow_options_t *opt_shadow,
 			   decor_shadow_options_t *opt_no_shadow)
 {
-    if (frame->border_shadow)
+    if (*shadow_normal)
     {
-	decor_shadow_destroy (xdisplay, frame->border_shadow);
-	frame->border_shadow = NULL;
+	decor_shadow_destroy (xdisplay, *shadow_normal);
+	*shadow_normal = NULL;
     }
 
-    frame->border_shadow = decor_shadow_create (xdisplay,
+    *shadow_normal = decor_shadow_create (xdisplay,
 						 screen,
 						 1, 1,
 						 frame->win_extents.left,
@@ -850,46 +879,21 @@
 						 frame->win_extents.bottom -
 						 TRANSLUCENT_CORNER_SIZE,
 						 opt_shadow,
-						 &frame->window_context,
+						 context_normal,
 						 draw_border_shape,
 						 (void *) info);
-    if (frame->border_no_shadow)
-    {
-	decor_shadow_destroy (xdisplay, frame->border_no_shadow);
-	frame->border_no_shadow = NULL;
-    }
-
-    frame->border_no_shadow = decor_shadow_create (xdisplay,
-					 screen,
-					 1, 1,
-					 frame->win_extents.left,
-					 frame->win_extents.right,
-					 frame->win_extents.top + frame->titlebar_height,
-					 frame->win_extents.bottom,
-					 frame->win_extents.left -
-					 TRANSLUCENT_CORNER_SIZE,
-					 frame->win_extents.right -
-					 TRANSLUCENT_CORNER_SIZE,
-					 frame->win_extents.top + frame->titlebar_height -
-					 TRANSLUCENT_CORNER_SIZE,
-					 frame->win_extents.bottom -
-					 TRANSLUCENT_CORNER_SIZE,
-					 opt_no_shadow,
-					 &frame->window_context_no_shadow,
-					 draw_border_shape,
-					 0);
 
     /* Maximized border shadow pixmap mode */
-    if (frame->max_border_shadow)
+    if (*shadow_max)
     {
-	decor_shadow_destroy (xdisplay, frame->max_border_shadow);
-	frame->max_border_shadow = NULL;
+	decor_shadow_destroy (xdisplay, *shadow_max);
+	*shadow_max = NULL;
     }
 
     info->state = (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
 		   WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY);
 
-    frame->max_border_shadow =
+    *shadow_max =
 	decor_shadow_create (xdisplay,
 			     screen,
 			     1, 1,
@@ -903,54 +907,48 @@
 			     TRANSLUCENT_CORNER_SIZE,
 			     frame->max_win_extents.bottom - TRANSLUCENT_CORNER_SIZE,
 			     opt_shadow,
-			     &frame->max_window_context,
-			     draw_border_shape,
-			     (void *) info);
-
-    /* Enforced maximize zero shadow reparenting mode */
-    if (frame->max_border_no_shadow)
-    {
-	decor_shadow_destroy (xdisplay, frame->max_border_shadow);
-	frame->max_border_shadow = NULL;
-    }
-
-    frame->max_border_no_shadow =
-	decor_shadow_create (xdisplay,
-			     screen,
-			     1, 1,
-			     frame->max_win_extents.left,
-			     frame->max_win_extents.right,
-			     frame->max_win_extents.top + frame->max_titlebar_height,
-			     frame->max_win_extents.bottom,
-			     frame->max_win_extents.left - TRANSLUCENT_CORNER_SIZE,
-			     frame->max_win_extents.right - TRANSLUCENT_CORNER_SIZE,
-			     frame->max_win_extents.top + frame->max_titlebar_height -
-			     TRANSLUCENT_CORNER_SIZE,
-			     frame->max_win_extents.bottom - TRANSLUCENT_CORNER_SIZE,
-			     opt_no_shadow,
-			     &frame->max_window_context_no_shadow,
-			     draw_border_shape,
-			     (void *) info);
+			     context_max,
+			     draw_border_shape,
+			     (void *) info);
+
+    /* Reset info->state */
+    info->state = 0;
 }
 
 
 typedef struct _tdtd_shadow_options
 {
-    decor_shadow_options_t *shadow;
-    decor_shadow_options_t *no_shadow;
+    decor_shadow_options_t *active_shadow;
+    decor_shadow_options_t *inactive_shadow;
 } tdtd_shadow_options_t;
 
 void
 frame_update_shadow (decor_frame_t	    *frame,
 		     decor_shadow_info_t    *info,
-		     decor_shadow_options_t *opt_shadow,
-		     decor_shadow_options_t *opt_no_shadow)
+		     decor_shadow_options_t *opt_active_shadow,
+		     decor_shadow_options_t *opt_inactive_shadow)
 {
     gwd_decor_frame_ref (frame);
 
+    info->active = TRUE;
+
     (*frame->update_shadow) (gdk_x11_get_default_xdisplay (),
 			     gdk_x11_screen_get_xscreen (gdk_screen_get_default ()),
-			     frame, info, opt_shadow, opt_no_shadow);
+			     frame, &frame->border_shadow_active,
+			     &frame->window_context_active,
+			     &frame->max_border_shadow_inactive,
+			     &frame->max_window_context_active,
+			     info, opt_active_shadow, opt_inactive_shadow);
+
+    info->active = FALSE;
+
+    (*frame->update_shadow) (gdk_x11_get_default_xdisplay (),
+                             gdk_x11_screen_get_xscreen (gdk_screen_get_default ()),
+                             frame, &frame->border_shadow_inactive,
+                             &frame->window_context_inactive,
+                             &frame->max_border_shadow_inactive,
+                             &frame->max_window_context_inactive,
+                             info, opt_inactive_shadow, opt_active_shadow);
 
     gwd_decor_frame_unref (frame);
 }
@@ -961,7 +959,19 @@
 		       gpointer user_data)
 {
     decor_frame_t	  *frame = (decor_frame_t *) value;
-    tdtd_shadow_options_t *opts =  (tdtd_shadow_options_t *) user_data;
+    tdtd_shadow_options_t  *opts;
+    decor_shadow_options_t active_o, inactive_o;
+
+    opts = malloc (sizeof (tdtd_shadow_options_t));
+
+    if (!opts)
+	return;
+
+    opts->active_shadow = &active_o;
+    opts->inactive_shadow = &inactive_o;
+
+    (*theme_get_shadow) (frame, opts->active_shadow, TRUE);
+    (*theme_get_shadow) (frame, opts->inactive_shadow, FALSE);
 
     gwd_decor_frame_ref (frame);
 
@@ -973,48 +983,67 @@
     info->frame = frame;
     info->state = 0;
 
-    frame_update_shadow (frame, info, opts->shadow, opts->no_shadow);
+    frame_update_shadow (frame, info, opts->active_shadow, opts->inactive_shadow);
 
     gwd_decor_frame_unref (frame);
 
     free (info);
     info = NULL;
 
+    free (opts);
+    opts = NULL;
+
+}
+
+void
+cairo_get_shadow (decor_frame_t *d, decor_shadow_options_t *opts, gboolean active)
+{
+    if (active)
+    {
+	memcpy (opts->shadow_color, settings->active_shadow_color, sizeof (settings->active_shadow_color));
+	opts->shadow_radius = settings->active_shadow_radius;
+	opts->shadow_offset_x = settings->active_shadow_offset_x;
+	opts->shadow_offset_y = settings->active_shadow_offset_y;
+	opts->shadow_opacity = settings->active_shadow_opacity;
+    }
+    /* TODO: Inactive shadows */
+    else
+    {
+	memcpy (opts->shadow_color, settings->inactive_shadow_color, sizeof (settings->inactive_shadow_color));
+	opts->shadow_radius = settings->inactive_shadow_radius;
+	opts->shadow_offset_x = settings->inactive_shadow_offset_x;
+	opts->shadow_offset_y = settings->inactive_shadow_offset_y;
+	opts->shadow_opacity = settings->inactive_shadow_opacity;
+    }
+}
+
+void
+meta_get_shadow (decor_frame_t *frame, decor_shadow_options_t *opts, gboolean active)
+{
+    if (active)
+    {
+	memcpy (opts->shadow_color, settings->active_shadow_color, sizeof (settings->active_shadow_color));
+	opts->shadow_radius = settings->active_shadow_radius;
+	opts->shadow_offset_x = settings->active_shadow_offset_x;
+	opts->shadow_offset_y = settings->active_shadow_offset_y;
+	opts->shadow_opacity = settings->active_shadow_opacity;
+    }
+    /* TODO: Inactive shadows */
+    else
+    {
+	memcpy (opts->shadow_color, settings->inactive_shadow_color, sizeof (settings->inactive_shadow_color));
+	opts->shadow_radius = settings->inactive_shadow_radius;
+	opts->shadow_offset_x = settings->inactive_shadow_offset_x;
+	opts->shadow_offset_y = settings->inactive_shadow_offset_y;
+	opts->shadow_opacity = settings->inactive_shadow_opacity;
+    }
+
 }
 
 int
 update_shadow (void)
 {
-    decor_shadow_options_t opt_shadow;
-    decor_shadow_options_t opt_no_shadow;
-    tdtd_shadow_options_t  *opts;
-
-    opts = malloc (sizeof (tdtd_shadow_options_t));
-
-    if (!opts)
-	return 0;
-
-    opt_shadow.shadow_radius  = settings->shadow_radius;
-    opt_shadow.shadow_opacity = settings->shadow_opacity;
-
-    memcpy (opt_shadow.shadow_color, settings->shadow_color, sizeof (settings->shadow_color));
-
-    opt_shadow.shadow_offset_x = settings->shadow_offset_x;
-    opt_shadow.shadow_offset_y = settings->shadow_offset_y;
-
-    opt_no_shadow.shadow_radius  = 0;
-    opt_no_shadow.shadow_opacity = 0;
-
-    opt_no_shadow.shadow_offset_x = 0;
-    opt_no_shadow.shadow_offset_y = 0;
-
-    opts->shadow = &opt_shadow;
-    opts->no_shadow = &opt_no_shadow;
-
-    gwd_frames_foreach (update_frames_shadows, (gpointer ) opts);
-
-    if (opts)
-	free (opts);
+    gwd_frames_foreach (update_frames_shadows, NULL);
 
     return 1;
 }
@@ -1275,7 +1304,7 @@
     bareAtom   = XInternAtom (xdisplay, DECOR_BARE_ATOM_NAME, FALSE);
     activeAtom = XInternAtom (xdisplay, DECOR_ACTIVE_ATOM_NAME, FALSE);
 
-    if (bare_frame->border_shadow)
+    if (bare_frame->border_shadow_active)
     {
 	decor_layout_t layout;
 	unsigned int   frame_type = 0;
@@ -1286,12 +1315,12 @@
 
 	long *data = decor_alloc_property (1, WINDOW_DECORATION_TYPE_PIXMAP);
 
-	decor_get_default_layout (&bare_frame->window_context, 1, 1, &layout);
+	decor_get_default_layout (&bare_frame->window_context_active, 1, 1, &layout);
 
-	nQuad = decor_set_lSrStSbS_window_quads (quads, &bare_frame->window_context,
+	nQuad = decor_set_lSrStSbS_window_quads (quads, &bare_frame->window_context_active,
 						 &layout);
 
-	decor_quads_to_property (data, 0, bare_frame->border_shadow->pixmap,
+	decor_quads_to_property (data, 0, bare_frame->border_shadow_active->pixmap,
 				 &bare_frame->win_extents, &bare_frame->win_extents,
 				 &bare_frame->win_extents, &bare_frame->win_extents,
 				 0, 0, quads, nQuad, frame_type, frame_state, frame_actions);
@@ -1350,8 +1379,8 @@
 
         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->context = i < WINDOW_TYPE_FRAMES_NUM ? &frame->window_context_active : &frame->window_context_inactive;
+        default_frames[i].d->shadow  =  i < WINDOW_TYPE_FRAMES_NUM ? frame->border_shadow_active : frame->border_shadow_inactive;
         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);

=== modified file 'gtk/window-decorator/decorprops.c'
--- gtk/window-decorator/decorprops.c	2011-05-07 08:58:10 +0000
+++ gtk/window-decorator/decorprops.c	2011-10-15 07:11:59 +0000
@@ -139,12 +139,12 @@
     GtkStyle     *style;
     long         fgColor[4];
     
-    nQuad = decor_set_lSrStSbX_window_quads (quads, &d->frame->window_context,
+    nQuad = decor_set_lSrStSbX_window_quads (quads, &d->frame->window_context_active,
 					     &d->border_layout,
 					     d->border_layout.top.x2 -
 					     d->border_layout.top.x1 -
-					     d->frame->window_context.extents.left -
-						 d->frame->window_context.extents.right -
+					     d->frame->window_context_active.extents.left -
+						 d->frame->window_context_active.extents.right -
 						     32);
     
     data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2011-02-28 12:57:42 +0000
+++ gtk/window-decorator/events.c	2011-10-15 07:11:59 +0000
@@ -86,7 +86,8 @@
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     guint   state = d->button_states[button];
 
-    handle_tooltip_event (win, gtkwd_event, gtkwd_type, state, tooltip);
+    if (settings->use_tooltips)
+	handle_tooltip_event (win, gtkwd_event, gtkwd_type, state, tooltip);
 
     if (d->frame_window && gtkwd_type == GEnterNotify)
     {
@@ -164,7 +165,18 @@
 	{
 	    if (state == BUTTON_EVENT_ACTION_STATE)
 	    {
-		if (gtkwd_event->button == 2)
+		if (gtkwd_event->button == 1)
+		{
+		    if (wnck_window_is_maximized (win))
+			wnck_window_unmaximize (win);
+		    else if (wnck_window_is_maximized_vertically (win))
+			wnck_window_unmaximize_vertically (win);
+		    else if (wnck_window_is_maximized_horizontally (win))
+			wnck_window_unmaximize_horizontally (win);
+		    else
+			wnck_window_maximize (win);
+		}
+		else if (gtkwd_event->button == 2)
 		{
 		    if (wnck_window_is_maximized_vertically (win))
 			wnck_window_unmaximize_vertically (win);
@@ -178,13 +190,6 @@
 		    else
 			wnck_window_maximize_horizontally (win);
 		}
-		else
-		{
-		    if (wnck_window_is_maximized (win))
-			wnck_window_unmaximize (win);
-		    else
-			wnck_window_maximize (win);
-		}
 	    }
 	}
 	break;

=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2011-05-07 08:58:10 +0000
+++ gtk/window-decorator/frames.c	2011-10-15 07:11:59 +0000
@@ -34,10 +34,11 @@
 void
 decor_frame_refresh (decor_frame_t *frame)
 {
-    decor_shadow_options_t opt_shadow;
-    decor_shadow_options_t opt_no_shadow;
+    decor_shadow_options_t active_o, inactive_o;
     decor_shadow_info_t *info;
 
+    gwd_decor_frame_ref (frame);
+
     update_style (frame->style_window_rgba);
     update_style (frame->style_window_rgb);
 
@@ -53,19 +54,8 @@
 	strcmp (frame->type, "bare") != 0)
 	(*theme_update_border_extents) (frame);
 
-    opt_shadow.shadow_radius  = settings->shadow_radius;
-    opt_shadow.shadow_opacity = settings->shadow_opacity;
-
-    memcpy (opt_shadow.shadow_color, settings->shadow_color, sizeof (settings->shadow_color));
-
-    opt_shadow.shadow_offset_x = settings->shadow_offset_x;
-    opt_shadow.shadow_offset_y = settings->shadow_offset_y;
-
-    opt_no_shadow.shadow_radius  = 0;
-    opt_no_shadow.shadow_opacity = 0;
-
-    opt_no_shadow.shadow_offset_x = 0;
-    opt_no_shadow.shadow_offset_y = 0;
+    (*theme_get_shadow) (frame, &active_o, TRUE);
+    (*theme_get_shadow) (frame, &inactive_o, FALSE);
 
     info = malloc (sizeof (decor_shadow_info_t));
 
@@ -75,7 +65,9 @@
     info->frame = frame;
     info->state = 0;
 
-    frame_update_shadow (frame, info, &opt_shadow, &opt_no_shadow);
+    frame_update_shadow (frame, info, &active_o, &inactive_o);
+
+    gwd_decor_frame_unref (frame);
 
     free (info);
     info = NULL;
@@ -221,10 +213,12 @@
     frame->refcount = 0;
     frame->titlebar_height = 17;
     frame->max_titlebar_height = 17;
-    frame->border_shadow = NULL;
+    frame->border_shadow_active = NULL;
+    frame->border_shadow_inactive = NULL;
     frame->border_no_shadow = NULL;
     frame->max_border_no_shadow = NULL;
-    frame->max_border_shadow = NULL;
+    frame->max_border_shadow_active = NULL;
+    frame->max_border_shadow_inactive = NULL;
     frame->titlebar_font = NULL;
 
     frame->style_window_rgba = gtk_window_new (GTK_WINDOW_POPUP);
@@ -269,14 +263,20 @@
 {
     Display *xdisplay = gdk_x11_get_default_xdisplay ();
 
-    if (frame->border_shadow)
-	decor_shadow_destroy (xdisplay, frame->border_shadow);
+    if (frame->border_shadow_active)
+	decor_shadow_destroy (xdisplay, frame->border_shadow_active);
+
+    if (frame->border_shadow_inactive)
+	decor_shadow_destroy (xdisplay, frame->border_shadow_inactive);
 
     if (frame->border_no_shadow)
 	decor_shadow_destroy (xdisplay, frame->border_no_shadow);
 
-    if (frame->max_border_shadow)
-	decor_shadow_destroy (xdisplay, frame->max_border_shadow);
+    if (frame->max_border_shadow_active)
+	decor_shadow_destroy (xdisplay, frame->max_border_shadow_active);
+
+    if (frame->max_border_shadow_inactive)
+	decor_shadow_destroy (xdisplay, frame->max_border_shadow_inactive);
 
     if (frame->max_border_no_shadow)
 	decor_shadow_destroy (xdisplay, frame->max_border_no_shadow);

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2011-05-08 13:45:38 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2011-10-15 07:11:59 +0000
@@ -83,7 +83,7 @@
 };
 
 #define WINDOW_TYPE_FRAMES_NUM 5
-struct _default_frame_references default_frames[WINDOW_TYPE_FRAMES_NUM  * 2] = {
+default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM  * 2] = {
     /* active */
     {"normal", NULL },
     {"dialog", NULL },
@@ -164,14 +164,22 @@
     settings->blur_type = BLUR_TYPE_NONE;
     settings->use_system_font = FALSE;
 
-    settings->shadow_radius   = SHADOW_RADIUS;
-    settings->shadow_opacity  = SHADOW_OPACITY;
-    settings->shadow_color[0] = SHADOW_COLOR_RED;
-    settings->shadow_color[1] = SHADOW_COLOR_GREEN;
-    settings->shadow_color[2] = SHADOW_COLOR_BLUE;
-    settings->shadow_offset_x = SHADOW_OFFSET_X;
-    settings->shadow_offset_y = SHADOW_OFFSET_Y;
+    settings->active_shadow_radius   = SHADOW_RADIUS;
+    settings->active_shadow_opacity  = SHADOW_OPACITY;
+    settings->active_shadow_color[0] = SHADOW_COLOR_RED;
+    settings->active_shadow_color[1] = SHADOW_COLOR_GREEN;
+    settings->active_shadow_color[2] = SHADOW_COLOR_BLUE;
+    settings->active_shadow_offset_x = SHADOW_OFFSET_X;
+    settings->active_shadow_offset_y = SHADOW_OFFSET_Y;
+    settings->inactive_shadow_radius   = SHADOW_RADIUS;
+    settings->inactive_shadow_opacity  = SHADOW_OPACITY;
+    settings->inactive_shadow_color[0] = SHADOW_COLOR_RED;
+    settings->inactive_shadow_color[1] = SHADOW_COLOR_GREEN;
+    settings->inactive_shadow_color[2] = SHADOW_COLOR_BLUE;
+    settings->inactive_shadow_offset_x = SHADOW_OFFSET_X;
+    settings->inactive_shadow_offset_y = SHADOW_OFFSET_Y;
     settings->decoration_alpha = 0.5;
+    settings->use_tooltips = TRUE;
 
 #ifdef USE_METACITY
 
@@ -185,6 +193,9 @@
 
     settings->font = strdup ("Sans Bold 12");
 
+    settings->mutter_draggable_border_width = 10;
+    settings->mutter_attach_modal_dialogs = FALSE;
+
     for (i = 0; i < argc; i++)
     {
 	if (strcmp (argv[i], "--minimal") == 0)
@@ -338,6 +349,7 @@
     theme_get_event_window_position = get_event_window_position;
     theme_get_button_position       = get_button_position;
     theme_get_title_scale	    = get_title_scale;
+    theme_get_shadow                = cairo_get_shadow;
 
 #ifdef USE_METACITY
     if (meta_theme)
@@ -360,6 +372,7 @@
 	theme_get_event_window_position = meta_get_event_window_position;
 	theme_get_button_position	    = meta_get_button_position;
 	theme_get_title_scale	    = meta_get_title_scale;
+	theme_get_shadow            = meta_get_shadow;
     }
 #endif
 

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2011-05-08 13:45:38 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2011-10-15 07:11:59 +0000
@@ -110,6 +110,7 @@
 #endif
 
 #define METACITY_GCONF_DIR "/apps/metacity/general"
+#define MUTTER_GCONF_DIR "/apps/mutter/general"
 
 #define COMPIZ_USE_SYSTEM_FONT_KEY		    \
 METACITY_GCONF_DIR "/titlebar_uses_system_font"
@@ -126,22 +127,11 @@
 #define COMPIZ_RIGHT_CLICK_TITLEBAR_KEY	       \
 METACITY_GCONF_DIR "/action_right_click_titlebar"
 
-#define COMPIZ_GCONF_DIR1 "/apps/compiz/plugins/decoration/allscreens/options"
-
-#define COMPIZ_SHADOW_RADIUS_KEY \
-COMPIZ_GCONF_DIR1 "/shadow_radius"
-
-#define COMPIZ_SHADOW_OPACITY_KEY \
-COMPIZ_GCONF_DIR1 "/shadow_opacity"
-
-#define COMPIZ_SHADOW_COLOR_KEY \
-COMPIZ_GCONF_DIR1 "/shadow_color"
-
-#define COMPIZ_SHADOW_OFFSET_X_KEY \
-COMPIZ_GCONF_DIR1 "/shadow_x_offset"
-
-#define COMPIZ_SHADOW_OFFSET_Y_KEY \
-COMPIZ_GCONF_DIR1 "/shadow_y_offset"
+#define MUTTER_DRAGGABLE_BORDER_WIDTH_KEY \
+MUTTER_GCONF_DIR "/draggable_border_width"
+
+#define MUTTER_ATTACH_MODAL_DIALOGS_KEY \
+MUTTER_GCONF_DIR "/attach_modal_dialogs"
 
 #define META_THEME_KEY		\
 METACITY_GCONF_DIR "/theme"
@@ -172,6 +162,9 @@
 #define WHEEL_ACTION_KEY   \
 GCONF_DIR "/mouse_wheel_action"
 
+#define USE_TOOLTIPS_KEY \
+GCONF_DIR "/use_tooltips"
+
 #define DBUS_DEST       "org.freedesktop.compiz"
 #define DBUS_PATH       "/org/freedesktop/compiz/decor/screen0"
 #define DBUS_INTERFACE  "org.freedesktop.compiz"
@@ -256,11 +249,16 @@
     int middle_click_action;
     int right_click_action;
     int wheel_action;
-    gdouble shadow_radius;
-    gdouble shadow_opacity;
-    gushort shadow_color[3];
-    gint    shadow_offset_x;
-    gint    shadow_offset_y;
+    gdouble active_shadow_radius;
+    gdouble active_shadow_opacity;
+    gushort active_shadow_color[3];
+    gint    active_shadow_offset_x;
+    gint    active_shadow_offset_y;
+    gdouble inactive_shadow_radius;
+    gdouble inactive_shadow_opacity;
+    gushort inactive_shadow_color[3];
+    gint    inactive_shadow_offset_x;
+    gint    inactive_shadow_offset_y;
 #ifdef USE_METACITY
     double   meta_opacity;
     gboolean meta_shade_opacity;
@@ -274,6 +272,9 @@
     gboolean		    use_system_font;
     gint		    blur_type;
     gchar		    *font;
+    guint    mutter_draggable_border_width;
+    gboolean mutter_attach_modal_dialogs;
+    gboolean use_tooltips;
 } decor_settings_t;
 
 #define DOUBLE_CLICK_ACTION_DEFAULT CLICK_ACTION_MAXIMIZE
@@ -381,11 +382,16 @@
 {
     decor_frame_t *frame;
     unsigned int  state;
+    gboolean      active;
 };
 
 typedef void (*frame_update_shadow_proc) (Display		 *display,
 					  Screen		 *screen,
 					  decor_frame_t		 *frame,
+					  decor_shadow_t	  **shadow_normal,
+					  decor_context_t	  *context_normal,
+					  decor_shadow_t	  **shadow_max,
+					  decor_context_t	  *context_max,
 					  decor_shadow_info_t    *info,
 					  decor_shadow_options_t *opt_shadow,
 					  decor_shadow_options_t *opt_no_shadow);
@@ -398,13 +404,17 @@
     decor_extents_t max_win_extents;
     int		    titlebar_height;
     int		    max_titlebar_height;
-    decor_shadow_t *border_shadow;
+    decor_shadow_t *border_shadow_active;
+    decor_shadow_t *border_shadow_inactive;
     decor_shadow_t *border_no_shadow;
-    decor_shadow_t *max_border_shadow;
+    decor_shadow_t *max_border_shadow_active;
+    decor_shadow_t *max_border_shadow_inactive;
     decor_shadow_t *max_border_no_shadow;
-    decor_context_t window_context;
+    decor_context_t window_context_active;
+    decor_context_t window_context_inactive;
     decor_context_t window_context_no_shadow;
-    decor_context_t max_window_context;
+    decor_context_t max_window_context_active;
+    decor_context_t max_window_context_inactive;
     decor_context_t max_window_context_no_shadow;
     PangoFontDescription *titlebar_font;
     PangoContext	 *pango_context;
@@ -456,13 +466,19 @@
 } decor_t;
 
 #define WINDOW_TYPE_FRAMES_NUM 5
-struct _default_frame_references
+typedef struct _default_frame_references
 {
     char     *name;
     decor_t  *d;
-} extern default_frames[WINDOW_TYPE_FRAMES_NUM * 2];
+} default_frame_references_t;
+
+extern default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM * 2];
 const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
 
+void     (*theme_get_shadow)		    (decor_frame_t *d,
+					     decor_shadow_options_t *,
+					     gboolean);
+
 void     (*theme_draw_window_decoration)    (decor_t *d);
 gboolean (*theme_calc_decoration_size)      (decor_t *d,
 					     int     client_width,
@@ -580,6 +596,10 @@
 bare_frame_update_shadow (Display		  *xdisplay,
 			   Screen		  *screen,
 			   decor_frame_t	  *frame,
+			   decor_shadow_t	  **shadow_normal,
+			   decor_context_t	  *context_normal,
+			   decor_shadow_t	  **shadow_max,
+			   decor_context_t	  *context_max,
 			   decor_shadow_info_t    *info,
 			   decor_shadow_options_t *opt_shadow,
 			   decor_shadow_options_t *opt_no_shadow);
@@ -588,6 +608,10 @@
 decor_frame_update_shadow (Display		  *xdisplay,
 			   Screen		  *screen,
 			   decor_frame_t	  *frame,
+			   decor_shadow_t	  **shadow_normal,
+			   decor_context_t	  *context_normal,
+			   decor_shadow_t	  **shadow_max,
+			   decor_context_t	  *context_max,
 			   decor_shadow_info_t    *info,
 			   decor_shadow_options_t *opt_shadow,
 			   decor_shadow_options_t *opt_no_shadow);
@@ -795,6 +819,9 @@
 gfloat
 get_title_scale (decor_frame_t *frame);
 
+void
+cairo_get_shadow (decor_frame_t *, decor_shadow_options_t *opts, gboolean active);
+
 /* gdk.c */
 
 void
@@ -881,6 +908,10 @@
 
 void
 meta_update_button_layout (const char *value);
+
+void
+meta_get_shadow (decor_frame_t *, decor_shadow_options_t *opts, gboolean active);
+
 #endif
 /* switcher.c */
 
@@ -890,6 +921,10 @@
 switcher_frame_update_shadow (Display		  *xdisplay,
 			      Screen		  *screen,
 			      decor_frame_t	  *frame,
+			      decor_shadow_t	  **shadow_normal,
+			      decor_context_t	  *context_normal,
+			      decor_shadow_t	  **shadow_max,
+			      decor_context_t	  *context_max,
 			      decor_shadow_info_t    *info,
 			      decor_shadow_options_t *opt_shadow,
 			      decor_shadow_options_t *opt_no_shadow);

=== modified file 'gtk/window-decorator/gwd.schemas.in'
--- gtk/window-decorator/gwd.schemas.in	2007-09-09 06:55:46 +0000
+++ gtk/window-decorator/gwd.schemas.in	2011-10-15 07:11:59 +0000
@@ -77,5 +77,16 @@
                 <long>Shade active windows with metacity theme decorations from opaque to translucent</long>
             </locale>
         </schema>
+        <schema>
+            <key>/schemas/apps/gwd/use_tooltops</key>
+            <applyto>/apps/gwd/use_tooltips</applyto>
+            <owner>gwd</owner>
+            <type>bool</type>
+            <default>true</default>
+            <locale name="C">
+                <short>Use tooltips</short>
+                <long>Show tooltip windows on decorator functions</long>
+            </locale>
+        </schema>
     </schemalist>  
 </gconfschemafile>

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2011-06-23 03:03:04 +0000
+++ gtk/window-decorator/metacity.c	2011-10-15 07:11:59 +0000
@@ -40,19 +40,31 @@
     Display	    *xdisplay =
 	GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
     gint	    nQuad;
-    decor_extents_t win_extents = d->frame->win_extents;
-    decor_extents_t max_win_extents = d->frame->max_win_extents;
+    decor_extents_t win_extents, frame_win_extents;
+    decor_extents_t max_win_extents, frame_max_win_extents;
     decor_quad_t    quads[N_QUADS_MAX];
     unsigned int    nOffset = 1;
-    unsigned int   frame_type = populate_frame_type (d);
-    unsigned int   frame_state = populate_frame_state (d);
-    unsigned int   frame_actions = populate_frame_actions (d);
+    unsigned int    frame_type = populate_frame_type (d);
+    unsigned int    frame_state = populate_frame_state (d);
+    unsigned int    frame_actions = populate_frame_actions (d);
     gint            w, lh, rh;
     gint	    top_stretch_offset;
     gint	    bottom_stretch_offset;
     gint	    left_stretch_offset;
     gint	    right_stretch_offset;
 
+    win_extents = frame_win_extents = d->frame->win_extents;
+    max_win_extents = frame_max_win_extents = d->frame->max_win_extents;
+
+    /* Add the invisible grab area padding, but only for
+     * pixmap type decorations */
+    if (!d->frame_window)
+    {
+       frame_win_extents.left += settings->mutter_draggable_border_width;
+       frame_win_extents.right += settings->mutter_draggable_border_width;
+       frame_win_extents.bottom += settings->mutter_draggable_border_width;
+    }
+
     w = d->border_layout.top.x2 - d->border_layout.top.x1 -
 	d->context->left_space - d->context->right_space;
 
@@ -82,25 +94,29 @@
 					     bottom_stretch_offset);
 
     win_extents.top += d->frame->titlebar_height;
+    frame_win_extents.top += d->frame->titlebar_height;
     max_win_extents.top += d->frame->max_titlebar_height;
+    frame_max_win_extents.top += d->frame->max_titlebar_height;
 
     if (d->frame_window)
     {
-        data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_WINDOW);
-        decor_gen_window_property (data, nOffset - 1, &win_extents, &max_win_extents, 20, 20, frame_type, frame_state, frame_actions);
+	data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_WINDOW);
+	decor_gen_window_property (data, nOffset - 1, &win_extents, &max_win_extents, 20, 20,
+				   frame_type, frame_state, frame_actions);
     }
     else
     {
-        data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
-        decor_quads_to_property (data, nOffset - 1, GDK_PIXMAP_XID (d->pixmap),
-                                 &win_extents, &win_extents,
-				 &max_win_extents, &max_win_extents,
+	data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
+	decor_quads_to_property (data, nOffset - 1, GDK_PIXMAP_XID (d->pixmap),
+				 &frame_win_extents, &win_extents,
+				 &frame_max_win_extents, &max_win_extents,
 				 ICON_SPACE + d->button_width,
 				 0,
-				 quads, nQuad, 0, 0, 0);
+				 quads, nQuad, frame_type, frame_state, frame_actions);
     }
 
     gdk_error_trap_push ();
+
     XChangeProperty (xdisplay, d->prop_xid,
 		     win_decor_atom,
 		     XA_INTEGER,
@@ -109,14 +125,14 @@
     gdk_display_sync (gdk_display_get_default ());
     gdk_error_trap_pop ();
 
+    free (data);
+
     decor_update_blur_property (d,
 				w, lh,
 				top, top_stretch_offset,
 				bottom, bottom_stretch_offset,
 				left, left_stretch_offset,
 				right, right_stretch_offset);
-
-    free (data);
 }
 
 static void
@@ -496,7 +512,7 @@
     if (d->active)
 	*flags |= (MetaFrameFlags ) META_FRAME_HAS_FOCUS;
 
-    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+    if ((d->state & META_MAXIMIZED))
 	*flags |= (MetaFrameFlags ) META_FRAME_MAXIMIZED;
 
     if (d->state & WNCK_WINDOW_STATE_STICKY)
@@ -618,8 +634,6 @@
     meta_get_decoration_geometry (d, theme, &flags, &fgeom, &button_layout,
 				  frame_type, &clip);
 
-    /* we only have to redraw the shadow background when decoration
-       changed size */
     if ((d->prop_xid || !d->buffer_pixmap) && !d->frame_window)
 	draw_shadow_background (d, cr, d->shadow, d->context);
 
@@ -967,6 +981,7 @@
     MetaFrameGeometry fgeom;
     MetaFrameFlags    flags;
     MetaTheme	      *theme;
+
     GdkRectangle      clip;
 
 #ifdef HAVE_METACITY_2_15_21
@@ -1081,6 +1096,10 @@
 	*x += d->frame->win_extents.left + 4;
 	*y += d->frame->win_extents.top + 2;
     }
+    else
+    {
+	*x += settings->mutter_draggable_border_width;
+    }
 
     return TRUE;
 }
@@ -1114,12 +1133,20 @@
     decor_context_t *context;
     decor_shadow_t  *shadow;
 
-    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+    if ((d->state & META_MAXIMIZED))
     {
 	if (!d->frame_window)
 	{
-	    context = &d->frame->max_window_context;
-	    shadow  = d->frame->max_border_shadow;
+	    if (d->active)
+	    {
+		context = &d->frame->max_window_context_active;
+		shadow  = d->frame->max_border_shadow_active;
+	    }
+	    else
+	    {
+		context = &d->frame->max_window_context_inactive;
+		shadow  = d->frame->max_border_shadow_inactive;
+	    }
 	}
 	else
 	{
@@ -1131,8 +1158,16 @@
     {
 	if (!d->frame_window)
 	{
-	    context = &d->frame->window_context;
-	    shadow  = d->frame->border_shadow;
+	    if (d->active)
+	    {
+		context = &d->frame->window_context_active;
+		shadow  = d->frame->border_shadow_active;
+	    }
+	    else
+	    {
+		context = &d->frame->window_context_inactive;
+		shadow  = d->frame->border_shadow_inactive;
+	    }
 	}
 	else
 	{
@@ -1162,7 +1197,7 @@
     }
     else
     {
-	if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+	if ((d->state & META_MAXIMIZED))
 	    decor_get_default_layout (context, d->client_width,
 				      d->client_height - d->frame->titlebar_height,
 				      &layout);
@@ -1249,6 +1284,14 @@
 	    }
 	    *w = fgeom.right_width + RESIZE_EXTENDS;
 	    *h = fgeom.bottom_height + RESIZE_EXTENDS;
+
+	    if (!d->frame_window)
+	    {
+		*x += settings->mutter_draggable_border_width;
+		*w += settings->mutter_draggable_border_width;
+		*h += settings->mutter_draggable_border_width;
+	    }
+
 	    break;
 	case 1: /* bottom */
 	    *x = fgeom.left_width + RESIZE_EXTENDS;
@@ -1258,6 +1301,14 @@
 	    *w = width - fgeom.left_width - fgeom.right_width -
 		 (2 * RESIZE_EXTENDS);
 	    *h = fgeom.bottom_height;
+
+	    if (!d->frame_window)
+	    {
+		*x -= settings->mutter_draggable_border_width;
+		*h += settings->mutter_draggable_border_width;
+		*w += settings->mutter_draggable_border_width * 2;
+	    }
+
 	    break;
 	case 0: /* bottom left */
 	default:
@@ -1270,6 +1321,13 @@
 	    }
 	    *w = fgeom.left_width + RESIZE_EXTENDS;
 	    *h = fgeom.bottom_height + RESIZE_EXTENDS;
+
+	    if (!d->frame_window)
+	    {
+		*w += settings->mutter_draggable_border_width;
+		*h += settings->mutter_draggable_border_width;
+	    }
+
 	    break;
 	}
 	break;
@@ -1277,17 +1335,33 @@
 	switch (j) {
 	case 2: /* right */
 	    *x = width - fgeom.right_width;
+	    *y = fgeom.top_height + RESIZE_EXTENDS;
 	    if (d->frame_window)
 		*x += d->frame->win_extents.left + 2;
 	    *w = fgeom.right_width;
 	    *h = height - fgeom.top_height - fgeom.bottom_height -
 		 (2 * RESIZE_EXTENDS);
+
+	   if (!d->frame_window)
+	   {
+	       *x += settings->mutter_draggable_border_width;
+	       *w += settings->mutter_draggable_border_width;
+	       *h += settings->mutter_draggable_border_width;
+	   }
+
+
 	    break;
 	case 1: /* middle */
 	    *x = fgeom.left_width;
 	    *y = fgeom.title_rect.y + TOP_RESIZE_HEIGHT;
 	    *w = width - fgeom.left_width - fgeom.right_width;
 	    *h = height - fgeom.top_titlebar_edge - fgeom.bottom_height;
+
+	    if (!d->frame_window)
+	    {
+		*x += settings->mutter_draggable_border_width;
+	    }
+
 	    break;
 	case 0: /* left */
 	default:
@@ -1298,6 +1372,14 @@
 	    *w = fgeom.left_width;
 	    *h = height - fgeom.top_height - fgeom.bottom_height -
 		 (2 * RESIZE_EXTENDS);
+
+	    if (!d->frame_window)
+	    {
+		*h += settings->mutter_draggable_border_width;
+		*w += settings->mutter_draggable_border_width;
+	    }
+
+
 	    break;
 	}
 	break;
@@ -1314,6 +1396,12 @@
 	    }
 	    *w = fgeom.right_width + RESIZE_EXTENDS;
 	    *h = fgeom.top_height + RESIZE_EXTENDS;
+
+	    if (!d->frame_window)
+	    {
+		*x += settings->mutter_draggable_border_width;
+		*w += settings->mutter_draggable_border_width;
+	    }
 	    break;
 	case 1: /* top */
 	    *x = fgeom.left_width + RESIZE_EXTENDS;
@@ -1323,6 +1411,13 @@
 	    *w = width - fgeom.left_width - fgeom.right_width -
 		 (2 * RESIZE_EXTENDS);
 	    *h = fgeom.title_rect.y + TOP_RESIZE_HEIGHT;
+
+	    if (!d->frame_window)
+	    {
+		*x -= settings->mutter_draggable_border_width;
+		*w += settings->mutter_draggable_border_width * 2;
+	    }
+
 	    break;
 	case 0: /* top left */
 	default:
@@ -1335,6 +1430,10 @@
 	    }
 	    *w = fgeom.left_width + RESIZE_EXTENDS;
 	    *h = fgeom.top_height + RESIZE_EXTENDS;
+
+	    if (!d->frame_window)
+		*w += settings->mutter_draggable_border_width;
+
 	    break;
 	}
     }
@@ -1354,6 +1453,7 @@
     }
 }
 
+
 static MetaButtonFunction
 meta_button_function_from_string (const char *str)
 {

=== modified file 'gtk/window-decorator/settings.c'
--- gtk/window-decorator/settings.c	2011-02-21 15:28:57 +0000
+++ gtk/window-decorator/settings.c	2011-10-15 07:11:59 +0000
@@ -46,29 +46,43 @@
     if (result != Success)
 	return FALSE;
 
-    if (n == 4)
+    if (n == 8)
     {
 	long *data      = (long *) prop_data;
-	gdouble radius  = data[0];
-	gdouble opacity = data[1];
-	gint x_off      = data[2];
-	gint y_off      = data[3];
+	gdouble aradius  = data[0];
+	gdouble aopacity = data[1];
+	gint ax_off      = data[2];
+	gint ay_off      = data[3];
 
+	gdouble iradius  = data[4];
+	gdouble iopacity = data[5];
+	gint ix_off      = data[6];
+	gint iy_off      = data[7];
 	/* Radius and Opacity are multiplied by 1000 to keep precision,
 	 * divide by that much to get our real radius and opacity
 	 */
-	radius /= 1000;
-	opacity /= 1000;
-
-	changed = radius != settings->shadow_radius   ||
-		  opacity != settings->shadow_opacity ||
-		  x_off != settings->shadow_offset_x  ||
-		  y_off != settings->shadow_offset_y;
-
-	settings->shadow_radius = (gdouble) MAX (0.0, MIN (radius, 48.0));
-	settings->shadow_opacity = (gdouble) MAX (0.0, MIN (opacity, 6.0));
-	settings->shadow_offset_x = (gint) MAX (-16, MIN (x_off, 16));
-	settings->shadow_offset_y = (gint) MAX (-16, MIN (y_off, 16));
+	aradius /= 1000;
+	aopacity /= 1000;
+	iradius /= 1000;
+	iopacity /= 1000;
+
+	changed = aradius != settings->active_shadow_radius   ||
+		  aopacity != settings->active_shadow_opacity ||
+		  ax_off != settings->active_shadow_offset_x  ||
+		  ay_off != settings->active_shadow_offset_y ||
+		  iradius != settings->inactive_shadow_radius   ||
+		  iopacity != settings->inactive_shadow_opacity ||
+		  ix_off != settings->inactive_shadow_offset_x  ||
+		  iy_off != settings->inactive_shadow_offset_y;
+
+	settings->active_shadow_radius = (gdouble) MAX (0.0, MIN (aradius, 48.0));
+	settings->active_shadow_opacity = (gdouble) MAX (0.0, MIN (aopacity, 6.0));
+	settings->active_shadow_offset_x = (gint) MAX (-16, MIN (ax_off, 16));
+	settings->active_shadow_offset_y = (gint) MAX (-16, MIN (ay_off, 16));
+	settings->inactive_shadow_radius = (gdouble) MAX (0.0, MIN (iradius, 48.0));
+	settings->inactive_shadow_opacity = (gdouble) MAX (0.0, MIN (iopacity, 6.0));
+	settings->inactive_shadow_offset_x = (gint) MAX (-16, MIN (ix_off, 16));
+	settings->inactive_shadow_offset_y = (gint) MAX (-16, MIN (iy_off, 16));
     }
 
     XFree (prop_data);
@@ -83,16 +97,25 @@
 	
 	XTextPropertyToStringList (&shadow_color_xtp, &t_data, &ret_count);
 	
-	if (ret_count == 1)
+	if (ret_count == 2)
 	{
 	    int c[4];
 
 	    if (sscanf (t_data[0], "#%2x%2x%2x%2x",
 			&c[0], &c[1], &c[2], &c[3]) == 4)
 	    {
-		settings->shadow_color[0] = c[0] << 8 | c[0];
-		settings->shadow_color[1] = c[1] << 8 | c[1];
-		settings->shadow_color[2] = c[2] << 8 | c[2];
+		settings->active_shadow_color[0] = c[0] << 8 | c[0];
+		settings->active_shadow_color[1] = c[1] << 8 | c[1];
+		settings->active_shadow_color[2] = c[2] << 8 | c[2];
+		changed = TRUE;
+	    }
+
+	    if (sscanf (t_data[1], "#%2x%2x%2x%2x",
+			&c[0], &c[1], &c[2], &c[3]) == 4)
+	    {
+		settings->inactive_shadow_color[0] = c[0] << 8 | c[0];
+		settings->inactive_shadow_color[1] = c[1] << 8 | c[1];
+		settings->inactive_shadow_color[2] = c[2] << 8 | c[2];
 		changed = TRUE;
 	    }
 	}
@@ -107,6 +130,63 @@
 
 #ifdef USE_GCONF
 static gboolean
+use_tooltips_changed (GConfClient *client)
+{
+    gboolean      new_use_tooltips;
+    gboolean      use_tooltips = settings->use_tooltips;
+
+    new_use_tooltips = gconf_client_get_bool (client,
+					      USE_TOOLTIPS_KEY,
+					      NULL);
+
+    if (new_use_tooltips != use_tooltips)
+    {
+	settings->use_tooltips = new_use_tooltips;
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+static gboolean
+mutter_draggable_border_width_changed (GConfClient *client)
+{
+    int      new_width;
+    int      width = settings->mutter_draggable_border_width;
+
+    new_width = gconf_client_get_int (client,
+				      MUTTER_DRAGGABLE_BORDER_WIDTH_KEY,
+				      NULL);
+
+    if (new_width != width)
+    {
+	settings->mutter_draggable_border_width = new_width;
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+static gboolean
+mutter_attach_modal_dialogs_changed (GConfClient *client)
+{
+    gboolean      new_attach;
+    gboolean      attach = settings->mutter_attach_modal_dialogs;
+
+    new_attach = gconf_client_get_bool (client,
+					    MUTTER_ATTACH_MODAL_DIALOGS_KEY,
+					    	NULL);
+
+    if (new_attach != attach)
+    {
+	settings->mutter_attach_modal_dialogs = new_attach;
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+static gboolean
 blur_settings_changed (GConfClient *client)
 {
     gchar *type;
@@ -184,6 +264,7 @@
 	theme_get_event_window_position = meta_get_event_window_position;
 	theme_get_button_position	= meta_get_button_position;
 	theme_get_title_scale	    	= meta_get_title_scale;
+	theme_get_shadow		= meta_get_shadow;
     }
     else
     {
@@ -193,6 +274,7 @@
 	theme_get_event_window_position = get_event_window_position;
 	theme_get_button_position	= get_button_position;
 	theme_get_title_scale	    	= get_title_scale;
+	theme_get_shadow		= cairo_get_shadow;
     }
 
     return TRUE;
@@ -203,6 +285,7 @@
     theme_get_event_window_position = get_event_window_position;
     theme_get_button_position	    = get_button_position;
     theme_get_title_scale	    = get_title_scale;
+    theme_get_shadow		    = cairo_get_shadow;
 
     return FALSE;
 #endif
@@ -486,6 +569,21 @@
 	if (theme_opacity_changed (client))
 	    changed = TRUE;
     }
+    else if (strcmp (key, MUTTER_DRAGGABLE_BORDER_WIDTH_KEY) == 0)
+    {
+        if (mutter_draggable_border_width_changed (client))
+	    changed = TRUE;
+    }
+    else if (strcmp (key, MUTTER_ATTACH_MODAL_DIALOGS_KEY) == 0)
+    {
+	if (mutter_attach_modal_dialogs_changed (client))
+	    changed = TRUE;
+    }
+    else if (strcmp (key, USE_TOOLTIPS_KEY) == 0)
+    {
+	if (use_tooltips_changed (client))
+	    changed = TRUE;
+    }
 
     if (changed)
 	decorations_changed (data);
@@ -510,6 +608,11 @@
 			  GCONF_CLIENT_PRELOAD_ONELEVEL,
 			  NULL);
 
+    gconf_client_add_dir (gconf,
+			  MUTTER_GCONF_DIR,
+			  GCONF_CLIENT_PRELOAD_ONELEVEL,
+			  NULL);
+
     g_signal_connect (G_OBJECT (gconf),
 		      "value_changed",
 		      G_CALLBACK (value_changed),
@@ -537,9 +640,13 @@
     wheel_action_changed (gconf);
     blur_settings_changed (gconf);
 
+    mutter_draggable_border_width_changed (gconf);
+    mutter_attach_modal_dialogs_changed (gconf);
+    use_tooltips_changed (gconf);
+
     g_object_unref (gconf);
 #endif
-    
+
     shadow_property_changed (screen);
 
     return TRUE;

=== modified file 'gtk/window-decorator/switcher.c'
--- gtk/window-decorator/switcher.c	2011-02-21 12:55:51 +0000
+++ gtk/window-decorator/switcher.c	2011-10-15 07:11:59 +0000
@@ -41,9 +41,11 @@
     frame->win_extents = _switcher_extents;
     frame->max_win_extents = _switcher_extents;
     frame->win_extents = _switcher_extents;
-    frame->window_context = _switcher_context;
+    frame->window_context_inactive = _switcher_context;
+    frame->window_context_active = _switcher_context;
     frame->window_context_no_shadow = _switcher_context;
-    frame->max_window_context = _switcher_context;
+    frame->max_window_context_active = _switcher_context;
+    frame->max_window_context_inactive = _switcher_context;
     frame->max_window_context_no_shadow = _switcher_context;
     frame->update_shadow = switcher_frame_update_shadow;
 
@@ -95,10 +97,10 @@
 
     top = d->frame->win_extents.top;
 
-    x1 = d->frame->window_context.left_space - d->frame->win_extents.left;
-    y1 = d->frame->window_context.top_space - d->frame->win_extents.top;
-    x2 = d->width - d->frame->window_context.right_space + d->frame->win_extents.right;
-    y2 = d->height - d->frame->window_context.bottom_space + d->frame->win_extents.bottom;
+    x1 = d->frame->window_context_active.left_space - d->frame->win_extents.left;
+    y1 = d->frame->window_context_active.top_space - d->frame->win_extents.top;
+    x2 = d->width - d->frame->window_context_active.right_space + d->frame->win_extents.right;
+    y2 = d->height - d->frame->window_context_active.bottom_space + d->frame->win_extents.bottom;
 
     h = y2 - y1 - d->frame->win_extents.top - d->frame->win_extents.top;
 
@@ -106,7 +108,7 @@
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-    draw_shadow_background (d, cr, d->frame->border_shadow, &d->frame->window_context);
+    draw_shadow_background (d, cr, d->frame->border_shadow_active, &d->frame->window_context_active);
 
     fill_rounded_rectangle (cr,
 			    x1 + 0.5,
@@ -280,10 +282,10 @@
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-    cairo_rectangle (cr, d->frame->window_context.left_space,
-		     d->height - d->frame->window_context.bottom_space,
-		     d->width - d->frame->window_context.left_space -
-		     d->frame->window_context.right_space,
+    cairo_rectangle (cr, d->frame->window_context_active.left_space,
+		     d->height - d->frame->window_context_active.bottom_space,
+		     d->width - d->frame->window_context_active.left_space -
+		     d->frame->window_context_active.right_space,
 		     SWITCHER_SPACE);
 
     gdk_cairo_set_source_color_alpha (cr,
@@ -304,7 +306,7 @@
 	pango_layout_get_pixel_size (d->layout, &w, NULL);
 
 	cairo_move_to (cr, d->width / 2 - w / 2,
-		       d->height - d->frame->window_context.bottom_space +
+		       d->height - d->frame->window_context_active.bottom_space +
 		       SWITCHER_SPACE / 2 - d->frame->text_height / 2);
 
 	pango_cairo_show_layout (cr, d->layout);
@@ -394,7 +396,7 @@
     d->draw	 = draw_switcher_decoration;
     d->frame     = gwd_get_decor_frame ("switcher");
 
-    decor_get_default_layout (&d->frame->window_context, width, 1, &d->border_layout);
+    decor_get_default_layout (&d->frame->window_context_active, width, 1, &d->border_layout);
 
     width  = d->border_layout.width;
     height = d->border_layout.height;
@@ -426,8 +428,8 @@
 	    {
 		int tw;
 
-		tw = width - d->frame->window_context.left_space -
-		    d->frame->window_context.right_space - 64;
+		tw = width - d->frame->window_context_active.left_space -
+		    d->frame->window_context_active.right_space - 64;
 		pango_layout_set_auto_dir (d->layout, FALSE);
 		pango_layout_set_width (d->layout, tw * PANGO_SCALE);
 		pango_layout_set_text (d->layout, name, name_length);
@@ -493,9 +495,6 @@
     if (d->picture)
 	XRenderFreePicture (xdisplay, d->picture);
 
-    g_object_ref (G_OBJECT (pixmap));
-    g_object_ref (G_OBJECT (buffer_pixmap));
-
     d->pixmap	     = pixmap;
     d->buffer_pixmap = buffer_pixmap;
     d->cr	     = gdk_cairo_create (pixmap);

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2011-05-08 13:45:38 +0000
+++ gtk/window-decorator/wnck.c	2011-10-15 07:11:59 +0000
@@ -588,7 +588,56 @@
 	if (d && d->pixmap)
 	{
 	    d->active = wnck_window_is_active (win);
-	    queue_decor_draw (d);
+	    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+	    {
+		if (!d->frame_window)
+		{
+		   if (d->active)
+		   {
+		       d->context = &d->frame->max_window_context_active;
+		       d->shadow  = d->frame->max_border_shadow_active;
+		   }
+		   else
+		   {
+		       d->context = &d->frame->max_window_context_inactive;
+		       d->shadow  = d->frame->max_border_shadow_inactive;
+		   }
+		 }
+		else
+	       {
+		   d->shadow  = d->frame->max_border_no_shadow;
+	       }
+	    }
+	    else
+	    {
+	       if (!d->frame_window)
+	       {
+		   if (d->active)
+		   {
+		       d->context = &d->frame->window_context_active;
+		       d->shadow  = d->frame->border_shadow_active;
+		   }
+		   else
+		   {
+		       d->context = &d->frame->window_context_inactive;
+		       d->shadow  = d->frame->border_shadow_inactive;
+		   }
+	       }
+	       else
+	       {
+		   d->shadow  = d->frame->border_no_shadow;
+	       }
+	    }
+
+	    /* We need to update the decoration size here
+	    * since the shadow size might have changed and
+	    * in that case the decoration will be redrawn,
+	    * however if the shadow size doesn't change
+	    * then we need to redraw the decoration anyways
+	    * since the image would have changed */
+	    if (!update_window_decoration_size (d->win))
+	       queue_decor_draw (d);
+
 	}
     }
 
@@ -599,7 +648,57 @@
 	if (d && d->pixmap)
 	{
 	    d->active = wnck_window_is_active (win);
-	    queue_decor_draw (d);
+
+	    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+	    {
+		if (!d->frame_window)
+		{
+		   if (d->active)
+		   {
+		       d->context = &d->frame->max_window_context_active;
+		       d->shadow  = d->frame->max_border_shadow_active;
+		   }
+		   else
+		   {
+		       d->context = &d->frame->max_window_context_inactive;
+		       d->shadow  = d->frame->max_border_shadow_inactive;
+		   }
+		}
+		else
+		{
+		   d->shadow  = d->frame->max_border_no_shadow;
+		}
+	    }
+	    else
+	    {
+		if (!d->frame_window)
+		{
+		   if (d->active)
+		   {
+		       d->context = &d->frame->window_context_active;
+		       d->shadow  = d->frame->border_shadow_active;
+		   }
+		   else
+		   {
+		       d->context = &d->frame->window_context_inactive;
+		       d->shadow  = d->frame->border_shadow_inactive;
+		   }
+		}
+		else
+		{
+		   d->shadow =  d->frame->border_no_shadow;
+		}
+	    }
+
+	    /* We need to update the decoration size here
+	    * since the shadow size might have changed and
+	    * in that case the decoration will be redrawn,
+	    * however if the shadow size doesn't change
+	    * then we need to redraw the decoration anyways
+	    * since the image would have changed */
+	    if (!update_window_decoration_size (d->win))
+	       queue_decor_draw (d);
+
 	}
     }
 }

=== modified file 'include/core/core.h'
--- include/core/core.h	2011-09-19 12:54:22 +0000
+++ include/core/core.h	2011-10-15 07:11:59 +0000
@@ -27,7 +27,7 @@
 #define _COMPIZ_CORE_H
 
 
-#define CORE_ABIVERSION 20111011
+#define CORE_ABIVERSION 20110828
 
 #include <stdio.h>
 #include <assert.h>

=== modified file 'kde/window-decorator-kde4/decorator.cpp'
--- kde/window-decorator-kde4/decorator.cpp	2011-05-08 13:46:51 +0000
+++ kde/window-decorator-kde4/decorator.cpp	2011-10-15 07:11:59 +0000
@@ -61,7 +61,8 @@
 KWD::Options *KWD::Decorator::mOptions = 0;
 NETRootInfo *KWD::Decorator::mRootInfo;
 WId KWD::Decorator::mActiveId;
-decor_shadow_options_t KWD::Decorator::mShadowOptions;
+decor_shadow_options_t KWD::Decorator::mActiveShadowOptions;
+decor_shadow_options_t KWD::Decorator::mInactiveShadowOptions;
 
 KWD::Window *KWD::Decorator::mDecorNormal = NULL;
 KWD::Window *KWD::Decorator::mDecorActive = NULL;
@@ -111,13 +112,21 @@
     mOptions = new KWD::Options (mConfig);
     mPlugins = new PluginManager (KSharedConfig::openConfig ("kwinrc"));
 
-    mShadowOptions.shadow_radius   = SHADOW_RADIUS;
-    mShadowOptions.shadow_opacity  = SHADOW_OPACITY;
-    mShadowOptions.shadow_offset_x = SHADOW_OFFSET_X;
-    mShadowOptions.shadow_offset_y = SHADOW_OFFSET_Y;
-    mShadowOptions.shadow_color[0] = SHADOW_COLOR_RED;
-    mShadowOptions.shadow_color[1] = SHADOW_COLOR_GREEN;
-    mShadowOptions.shadow_color[2] = SHADOW_COLOR_BLUE;
+    mActiveShadowOptions.shadow_radius   = SHADOW_RADIUS;
+    mActiveShadowOptions.shadow_opacity  = SHADOW_OPACITY;
+    mActiveShadowOptions.shadow_offset_x = SHADOW_OFFSET_X;
+    mActiveShadowOptions.shadow_offset_y = SHADOW_OFFSET_Y;
+    mActiveShadowOptions.shadow_color[0] = SHADOW_COLOR_RED;
+    mActiveShadowOptions.shadow_color[1] = SHADOW_COLOR_GREEN;
+    mActiveShadowOptions.shadow_color[2] = SHADOW_COLOR_BLUE;
+
+    mInactiveShadowOptions.shadow_radius   = SHADOW_RADIUS;
+    mInactiveShadowOptions.shadow_opacity  = SHADOW_OPACITY;
+    mInactiveShadowOptions.shadow_offset_x = SHADOW_OFFSET_X;
+    mInactiveShadowOptions.shadow_offset_y = SHADOW_OFFSET_Y;
+    mInactiveShadowOptions.shadow_color[0] = SHADOW_COLOR_RED;
+    mInactiveShadowOptions.shadow_color[1] = SHADOW_COLOR_GREEN;
+    mInactiveShadowOptions.shadow_color[2] = SHADOW_COLOR_BLUE;
 
     updateShadowProperties (QX11Info::appRootWindow ());
 
@@ -259,16 +268,24 @@
 }
 
 void
-KWD::Decorator::changeShadowOptions (decor_shadow_options_t *opt)
+KWD::Decorator::changeShadowOptions (decor_shadow_options_t *aopt, decor_shadow_options_t *iopt)
 {
-    QMap <WId, KWD::Window *>::ConstIterator it;
-
-    if (!memcmp (opt, &mShadowOptions, sizeof (decor_shadow_options_t)))
-	return;
-
-    mShadowOptions = *opt;
-
-    updateShadow ();
+    bool changed = false;
+
+    if (memcmp (aopt, &mActiveShadowOptions, sizeof (decor_shadow_options_t)))
+    {
+	mActiveShadowOptions = *aopt;
+	changed = true;
+    }
+
+    if (memcmp (aopt, &mInactiveShadowOptions, sizeof (decor_shadow_options_t)))
+    {
+	mInactiveShadowOptions = *iopt;
+	changed = true;
+    }
+
+    if (changed)
+	updateShadow ();
 }
 
 void
@@ -291,7 +308,7 @@
 					   0,
 					   0,
 					   0, 0, 0, 0,
-					   &mShadowOptions,
+					   &mActiveShadowOptions,
 					   &context,
 					   decor_draw_simple,
 					   0);
@@ -331,8 +348,10 @@
 {
     int nItems;
     long *data;
-    double radius, opacity;
-    int    xOffset, yOffset;
+    double aradius, aopacity;
+    int    axOffset, ayOffset;
+    double iradius, iopacity;
+    int    ixOffset, iyOffset;
     QVector<QString> shadowColor;
 
     if (id != QX11Info::appRootWindow ())
@@ -348,27 +367,40 @@
 
     data = reinterpret_cast <long *> (propData);
 
-    radius = data[0];
-    opacity = data[1];
+    aradius = data[0];
+    aopacity = data[1];
 
     /* We multiplied by 1000 in compiz to keep
       * precision, now divide by that much */
 
-    radius /= 1000;
-    opacity /= 1000;
-
-    xOffset = data[2];
-    yOffset = data[3];
-
-    shadowRadiusChanged (radius);
-    shadowOpacityChanged (opacity);
-    shadowXOffsetChanged (xOffset);
-    shadowYOffsetChanged (yOffset);
+    aradius /= 1000;
+    aopacity /= 1000;
+
+    axOffset = data[2];
+    ayOffset = data[3];
+
+    iradius = data[4];
+    iopacity = data[5];
+
+    /* We multiplied by 1000 in compiz to keep
+     * precision, now divide by that much */
+
+    iradius /= 1000;
+    iopacity /= 1000;
+
+    ixOffset = data[6];
+    iyOffset = data[7];
+
+
+    shadowRadiusChanged (aradius, iradius);
+    shadowOpacityChanged (aopacity, iopacity);
+    shadowXOffsetChanged (axOffset, ixOffset);
+    shadowYOffsetChanged (ayOffset, iyOffset);
 
     shadowColor = KWD::readPropertyString (id, Atoms::compizShadowColor);
 
-    if (shadowColor.size () == 1)
-	shadowColorChanged (shadowColor.at (0));
+    if (shadowColor.size () == 2)
+	shadowColorChanged (shadowColor.at (0), shadowColor.at (1));
 
     XFree (propData);
 }
@@ -879,61 +911,78 @@
 }
 
 void
-KWD::Decorator::shadowRadiusChanged (double value)
-{
-    decor_shadow_options_t opt = *shadowOptions ();
-
-    opt.shadow_radius = value;
-
-    changeShadowOptions (&opt);
-}
-
-void
-KWD::Decorator::shadowOpacityChanged (double value)
-{
-    decor_shadow_options_t opt = *shadowOptions ();
-
-    opt.shadow_opacity = value;
-
-    changeShadowOptions (&opt);
-}
-
-void
-KWD::Decorator::shadowXOffsetChanged (int value)
-{
-    decor_shadow_options_t opt = *shadowOptions ();
-
-    opt.shadow_offset_x = value;
-
-    changeShadowOptions (&opt);
-}
-
-void
-KWD::Decorator::shadowYOffsetChanged (int value)
-{
-    decor_shadow_options_t opt = *shadowOptions ();
-
-    opt.shadow_offset_y = value;
-
-    changeShadowOptions (&opt);
-}
-
-void
-KWD::Decorator::shadowColorChanged (QString value)
-{
-    decor_shadow_options_t opt = *shadowOptions ();
+KWD::Decorator::shadowRadiusChanged (double value_active, double value_inactive)
+{
+    decor_shadow_options_t aopt = *activeShadowOptions ();
+    decor_shadow_options_t iopt = *inactiveShadowOptions ();
+
+    aopt.shadow_radius = value_active;
+    iopt.shadow_radius = value_inactive;
+
+    changeShadowOptions (&aopt, &iopt);
+}
+
+void
+KWD::Decorator::shadowOpacityChanged (double value_active, double value_inactive)
+{
+    decor_shadow_options_t aopt = *activeShadowOptions ();
+    decor_shadow_options_t iopt = *inactiveShadowOptions ();
+
+    aopt.shadow_opacity = value_active;
+    iopt.shadow_opacity = value_inactive;
+
+    changeShadowOptions (&aopt, &iopt);
+}
+
+void
+KWD::Decorator::shadowXOffsetChanged (int value_active, int value_inactive)
+{
+    decor_shadow_options_t aopt = *activeShadowOptions ();
+    decor_shadow_options_t iopt = *inactiveShadowOptions ();
+
+    aopt.shadow_offset_x = value_active;
+    iopt.shadow_offset_x = value_inactive;
+
+    changeShadowOptions (&aopt, &iopt);
+}
+
+void
+KWD::Decorator::shadowYOffsetChanged (int value_active, double value_inactive)
+{
+    decor_shadow_options_t aopt = *activeShadowOptions ();
+    decor_shadow_options_t iopt = *inactiveShadowOptions ();
+
+    aopt.shadow_offset_y = value_active;
+    iopt.shadow_offset_y = value_inactive;
+
+    changeShadowOptions (&aopt, &iopt);
+}
+
+void
+KWD::Decorator::shadowColorChanged (QString value_active, QString value_inactive)
+{
+    decor_shadow_options_t aopt = *activeShadowOptions ();
+    decor_shadow_options_t iopt = *inactiveShadowOptions ();
 
     int c[4];
 
-    if (sscanf (value.toAscii ().data (), "#%2x%2x%2x%2x",
+    if (sscanf (value_active.toAscii ().data (), "#%2x%2x%2x%2x",
 	        &c[0], &c[1], &c[2], &c[3]) == 4)
     {
-	opt.shadow_color[0] = c[0] << 8 | c[0];
-	opt.shadow_color[1] = c[1] << 8 | c[1];
-	opt.shadow_color[2] = c[2] << 8 | c[2];
-    }
-
-    changeShadowOptions (&opt);
+	aopt.shadow_color[0] = c[0] << 8 | c[0];
+	aopt.shadow_color[1] = c[1] << 8 | c[1];
+	aopt.shadow_color[2] = c[2] << 8 | c[2];
+    }
+
+    if (sscanf (value_inactive.toAscii ().data (), "#%2x%2x%2x%2x",
+		&c[0], &c[1], &c[2], &c[3]) == 4)
+    {
+	iopt.shadow_color[0] = c[0] << 8 | c[0];
+	iopt.shadow_color[1] = c[1] << 8 | c[1];
+	iopt.shadow_color[2] = c[2] << 8 | c[2];
+    }
+
+    changeShadowOptions (&aopt, &iopt);
 }
 
 void

=== modified file 'kde/window-decorator-kde4/decorator.h'
--- kde/window-decorator-kde4/decorator.h	2011-05-08 13:46:51 +0000
+++ kde/window-decorator-kde4/decorator.h	2011-10-15 07:11:59 +0000
@@ -103,9 +103,13 @@
 	{
 	    return mActiveId;
 	}
-	static decor_shadow_options_t *shadowOptions (void)
-	{
-	    return &mShadowOptions;
+	static decor_shadow_options_t *activeShadowOptions (void)
+	{
+	    return &mActiveShadowOptions;
+	}
+	static decor_shadow_options_t *inactiveShadowOptions (void)
+	{
+	    return &mInactiveShadowOptions;
 	}
 
 	static KWD::Window *defaultNormal ()
@@ -133,7 +137,7 @@
 	
 	bool enableDecorations (Time timestamp);
 	bool x11EventFilter (XEvent *xevent);
-	void changeShadowOptions (decor_shadow_options_t *opt);
+	void changeShadowOptions (decor_shadow_options_t *aopt, decor_shadow_options_t *iopt);
 
     public slots:
 	void reconfigure (void);
@@ -151,11 +155,11 @@
 	void handleWindowChanged (WId		      id,
 				  const unsigned long *properties);
 
-	void shadowRadiusChanged (double value);
-	void shadowOpacityChanged (double value);
-	void shadowXOffsetChanged (int value);
-	void shadowYOffsetChanged (int value);
-	void shadowColorChanged (QString value);
+	void shadowRadiusChanged (double value_active, double value_inactive);
+	void shadowOpacityChanged (double value_active, double value_inactive);
+	void shadowXOffsetChanged (int value_active, int value_inactive);
+	void shadowYOffsetChanged (int value_active, double value_inactive);
+	void shadowColorChanged (QString value_active, QString value_inactive);
 
 	void plasmaThemeChanged ();
 
@@ -163,7 +167,8 @@
 	static PluginManager *mPlugins;
 	static KWD::Options *mOptions;
 	static decor_shadow_t *mNoBorderShadow;
-	static decor_shadow_options_t mShadowOptions;
+	static decor_shadow_options_t mActiveShadowOptions;
+	static decor_shadow_options_t mInactiveShadowOptions;
 	static NETRootInfo *mRootInfo;
 	static WId mActiveId;
 

=== modified file 'plugins/decor/decor.xml.in'
--- plugins/decor/decor.xml.in	2009-08-08 06:00:14 +0000
+++ plugins/decor/decor.xml.in	2011-10-15 07:11:59 +0000
@@ -17,40 +17,80 @@
 	    </relation>
 	</deps>
 	<options>
-	    <option name="shadow_radius" type="float">
-		<_short>Shadow Radius</_short>
-		<_long>Drop shadow radius</_long>
-		<default>8.0</default>
-		<min>0.1</min>
-		<max>18.0</max>
-		<precision>0.1</precision>
-	    </option>
-	    <option name="shadow_opacity" type="float">
-		<_short>Shadow Opacity</_short>
-		<_long>Drop shadow opacity</_long>
-		<default>0.5</default>
-		<min>0.01</min>
-		<max>6.0</max>
-		<precision>0.01</precision>
-	    </option>
-	    <option name="shadow_color" type="color">
-		<_short>Shadow Color</_short>
-		<_long>Drop shadow color</_long>
-	    </option>
-	    <option name="shadow_x_offset" type="int">
-		<_short>Shadow Offset X</_short>
-		<_long>Drop shadow X offset</_long>
-		<default>1</default>
-		<min>-16</min>
-		<max>16</max>
-	    </option>
-	    <option name="shadow_y_offset" type="int">
-		<_short>Shadow Offset Y</_short>
-		<_long>Drop shadow Y offset</_long>
-		<default>1</default>
-		<min>-16</min>
-		<max>16</max>
-	    </option>
+	    <subgroup>
+		<_short>Active Shadow</_short>
+		<option name="active_shadow_radius" type="float">
+		    <_short>Shadow Radius</_short>
+		    <_long>Drop shadow radius</_long>
+		    <default>8.0</default>
+		    <min>0.1</min>
+		    <max>18.0</max>
+		    <precision>0.1</precision>
+		</option>
+		<option name="active_shadow_opacity" type="float">
+		    <_short>Shadow Opacity</_short>
+		    <_long>Drop shadow opacity</_long>
+		    <default>0.5</default>
+		    <min>0.01</min>
+		    <max>6.0</max>
+		    <precision>0.01</precision>
+		</option>
+		<option name="active_shadow_color" type="color">
+		    <_short>Shadow Color</_short>
+		    <_long>Drop shadow color</_long>
+		</option>
+		<option name="active_shadow_x_offset" type="int">
+		    <_short>Shadow Offset X</_short>
+		    <_long>Drop shadow X offset</_long>
+		    <default>1</default>
+		    <min>-16</min>
+		    <max>16</max>
+		</option>
+		<option name="active_shadow_y_offset" type="int">
+		    <_short>Shadow Offset Y</_short>
+		    <_long>Drop shadow Y offset</_long>
+		    <default>1</default>
+		    <min>-16</min>
+		    <max>16</max>
+		</option>
+	    </subgroup>
+	    <subgroup>
+		<_short>Inactive Shadow</_short>
+		<option name="inactive_shadow_radius" type="float">
+		    <_short>Shadow Radius</_short>
+		    <_long>Drop shadow radius</_long>
+		    <default>8.0</default>
+		    <min>0.1</min>
+		    <max>13.0</max>
+		    <precision>0.1</precision>
+		</option>
+		<option name="inactive_shadow_opacity" type="float">
+		    <_short>Shadow Opacity</_short>
+		    <_long>Drop shadow opacity</_long>
+		    <default>0.5</default>
+		    <min>0.01</min>
+		    <max>6.0</max>
+		    <precision>0.01</precision>
+		</option>
+		<option name="inactive_shadow_color" type="color">
+		    <_short>Shadow Color</_short>
+		    <_long>Drop shadow color</_long>
+		</option>
+		<option name="inactive_shadow_x_offset" type="int">
+		    <_short>Shadow Offset X</_short>
+		    <_long>Drop shadow X offset</_long>
+		    <default>1</default>
+		    <min>-16</min>
+		    <max>16</max>
+		</option>
+		<option name="inactive_shadow_y_offset" type="int">
+		    <_short>Shadow Offset Y</_short>
+		    <_long>Drop shadow Y offset</_long>
+		    <default>1</default>
+		    <min>-16</min>
+		    <max>16</max>
+		</option>
+	    </subgroup>
 	    <option name="command" type="string">
 		<_short>Command</_short>
 		<_long>Decorator command line that is executed if no decorator is already running</_long>

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-10-11 14:55:47 +0000
+++ plugins/decor/src/decor.cpp	2011-10-15 07:11:59 +0000
@@ -1709,7 +1709,7 @@
 	parent = window->frame ();
 
     /* Determine frame extents */
-    if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+    if ((window->state () & MAXIMIZE_STATE))
     {
 	border = wd->decor->maxBorder;
 	input = wd->decor->maxInput;
@@ -1866,7 +1866,7 @@
     CompWindowExtents	 input;
 
     /* Determine frame extents */
-    if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+    if ((window->state () & MAXIMIZE_STATE))
 	input = wd->decor->maxInput;
     else
 	input = wd->decor->input;
@@ -2576,41 +2576,51 @@
 void
 DecorScreen::updateDefaultShadowProperty ()
 {
-    long data[4];
-    CompOption *colorOption = CompOption::findOption (getOptions (), "shadow_color");
-    char *colorString;
+    long data[8];
+    CompOption *activeColorOption = CompOption::findOption (getOptions (), "active_shadow_color");
+    CompOption *inactiveColorOption = CompOption::findOption (getOptions (), "inactive_shadow_color");
+    char *colorString[2];
     XTextProperty xtp;
 
-    if (!colorOption)
+    if (!activeColorOption || !inactiveColorOption)
 	return;
 
-    colorString = strdup (CompOption::colorToString (colorOption->value ().c ()).c_str ());
+    colorString[0] = strdup (CompOption::colorToString (activeColorOption->value ().c ()).c_str ());
+    colorString[1] = strdup (CompOption::colorToString (inactiveColorOption->value ().c ()).c_str ());
 
-    /* 1) Shadow Radius
-     * 2) Shadow Opacity
-     * 3) Shadow Offset X
-     * 4) Shadow Offset Y
+    /* 1) Active Shadow Radius
+     * 2) Active Shadow Opacity
+     * 3) Active Shadow Offset X
+     * 4) Active Shadow Offset Y
+     * 5) Inactive Shadow Radius
+     * 6) Inactive Shadow Opacity
+     * 7) Inactive Shadow Offset X
+     * 8) Inactive Shadow Offset Y
      */
 
     /* the precision is 0.0001, so multiply by 1000 */
-    data[0] = optionGetShadowRadius () * 1000;
-    data[1] = optionGetShadowOpacity () * 1000;
-    data[2] = optionGetShadowXOffset ();
-    data[3] = optionGetShadowYOffset ();
+    data[0] = optionGetActiveShadowRadius () * 1000;
+    data[1] = optionGetActiveShadowOpacity () * 1000;
+    data[2] = optionGetActiveShadowXOffset ();
+    data[3] = optionGetActiveShadowYOffset ();
+    data[4] = optionGetInactiveShadowRadius () * 1000;
+    data[5] = optionGetInactiveShadowOpacity () * 1000;
+    data[6] = optionGetInactiveShadowXOffset ();
+    data[7] = optionGetInactiveShadowYOffset ();
+
 
     XChangeProperty (screen->dpy (), screen->root (),
 		      shadowInfoAtom, XA_INTEGER, 32,
-		      PropModeReplace, (unsigned char *) data, 4);
+		      PropModeReplace, (unsigned char *) data, 8);
 
-    if (XStringListToTextProperty (&colorString, 1, &xtp))
+    if (XStringListToTextProperty (colorString, 2, &xtp))
     {
 	XSetTextProperty (screen->dpy (), screen->root (), &xtp, shadowColorAtom);
 	XFree (xtp.value);
     }
 
-    free (colorString);
-
-
+    free (colorString[0]);
+    free (colorString[1]);
 }
 
 bool
@@ -2657,11 +2667,16 @@
 	    foreach (CompWindow *w, screen->windows ())
 		DecorWindow::get (w)->update (true);
 	    break;
-	case DecorOptions::ShadowRadius:
-	case DecorOptions::ShadowOpacity:
-	case DecorOptions::ShadowColor:
-	case DecorOptions::ShadowXOffset:
-	case DecorOptions::ShadowYOffset:
+	case DecorOptions::ActiveShadowRadius:
+	case DecorOptions::ActiveShadowOpacity:
+	case DecorOptions::ActiveShadowColor:
+	case DecorOptions::ActiveShadowXOffset:
+	case DecorOptions::ActiveShadowYOffset:
+	case DecorOptions::InactiveShadowRadius:
+	case DecorOptions::InactiveShadowOpacity:
+	case DecorOptions::InactiveShadowColor:
+	case DecorOptions::InactiveShadowXOffset:
+	case DecorOptions::InactiveShadowYOffset:
 	    updateDefaultShadowProperty ();
 	    break;
 	default:
@@ -2780,37 +2795,34 @@
 void
 DecorWindow::stateChangeNotify (unsigned int lastState)
 {
-    if (!update (true))
+    if (wd && wd->decor)
     {
-	if (wd && wd->decor)
-	{
-	    int oldShiftX = shiftX ();
-	    int oldShiftY = shiftY ();
-	    int moveDx, moveDy;
-
-	    if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
-		window->setWindowFrameExtents (&wd->decor->maxBorder,
-					       &wd->decor->maxInput);
-	    else
-		window->setWindowFrameExtents (&wd->decor->border,
-					       &wd->decor->input);
-
-	    /* Since we immediately update the frame extents, we must
-	     * also update the stored saved window geometry in order
-	     * to prevent the window from shifting back too far once
-	     * unmaximized */
-
-	    moveDx = shiftX () - oldShiftX;
-	    moveDy = shiftY () - oldShiftY;
-
-	    if (window->saveMask () & CWX)
-		window->saveWc ().x += moveDx;
-
-	    if (window->saveMask () & CWY)
-		window->saveWc ().y += moveDy;
-
-	    updateFrame ();
-	}
+	int oldShiftX = shiftX ();
+	int oldShiftY = shiftY ();
+	int moveDx, moveDy;
+
+	if ((window->state () & MAXIMIZE_STATE))
+	    window->setWindowFrameExtents (&wd->decor->maxBorder,
+					   &wd->decor->maxInput);
+	else
+	    window->setWindowFrameExtents (&wd->decor->border,
+					   &wd->decor->input);
+
+	/* Since we immediately update the frame extents, we must
+	 * also update the stored saved window geometry in order
+	 * to prevent the window from shifting back too far once
+	 * unmaximized */
+
+	moveDx = shiftX () - oldShiftX;
+	moveDy = shiftY () - oldShiftY;
+
+	if (window->saveMask () & CWX)
+	    window->saveWc ().x += moveDx;
+
+	if (window->saveMask () & CWY)
+	    window->saveWc ().y += moveDy;
+
+	updateFrame ();
     }
 
     window->stateChangeNotify (lastState);

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-10-11 09:36:19 +0000
+++ src/window.cpp	2011-10-15 07:11:59 +0000
@@ -3876,8 +3876,8 @@
 	{
 	    saveGeometry (CWY | CWHeight);
 
-	    xwc->height = workArea.height () - serverInput.top -
-			  serverInput.bottom - old.border () * 2;
+	    xwc->height = workArea.height () - border.top -
+			  border.bottom - old.border () * 2;
 
 	    mask |= CWHeight;
 	}
@@ -3890,8 +3890,8 @@
 	{
 	    saveGeometry (CWX | CWWidth);
 
-	    xwc->width = workArea.width () - serverInput.left -
-			 serverInput.right - old.border () * 2;
+	    xwc->width = workArea.width () - border.left -
+			 border.right - old.border () * 2;
 
 	    mask |= CWWidth;
 	}
@@ -3962,7 +3962,7 @@
 		 * by the gravity value (so that the corner that the gravity specifies
 		 * is 'anchored' to that edge of the workarea) */
 
-		xwc->y = y + workArea.y () + serverInput.top;
+		xwc->y = y + workArea.y () + border.top;
 		mask |= CWY;
 
 		switch (priv->sizeHints.win_gravity)
@@ -3974,9 +3974,9 @@
 			height = xwc->height + old.border () * 2;
 
 			max = y + workArea.bottom ();
-			if (xwc->y + xwc->height + serverInput.bottom > max)
+			if (xwc->y + xwc->height + border.bottom > max)
 			{
-			    xwc->y = max - height - serverInput.bottom;
+			    xwc->y = max - height - border.bottom;
 			    mask |= CWY;
 			}
 			break;
@@ -3999,7 +3999,7 @@
 
 	    if (state & CompWindowStateMaximizedHorzMask)
 	    {
-		xwc->x = x + workArea.x () + serverInput.left;
+		xwc->x = x + workArea.x () + border.left;
 		mask |= CWX;
 
 		switch (priv->sizeHints.win_gravity)
@@ -4011,16 +4011,16 @@
 
 			max = x + workArea.right ();
 
-			if (old.x () + (int) old.width () + serverInput.right > max)
+			if (old.x () + (int) old.width () + border.right > max)
 			{
-			    xwc->x = max - width - serverInput.right;
+			    xwc->x = max - width - border.right;
 			    mask |= CWX;
 			}
-			else if (old.x () + width + serverInput.right > max)
+			else if (old.x () + width + border.right > max)
 			{
 			    xwc->x = x + workArea.x () +
-				     (workArea.width () - serverInput.left - width -
-				      serverInput.right) / 2 + serverInput.left;
+				     (workArea.width () - border.left - width -
+				      border.right) / 2 + border.left;
 			    mask |= CWX;
 			}
 		    /* For NorthGravity, SouthGravity and CenterGravity we default to the top
@@ -4110,15 +4110,15 @@
 	case NorthGravity:
 	case NorthEastGravity:
 	    if (xwcm & CWY)
-		newY = xwc->y + priv->serverInput.top * direction;
+		newY = xwc->y + priv->border.top * direction;
 	    break;
 
 	case WestGravity:
 	case CenterGravity:
 	case EastGravity:
 	    if (xwcm & CWY)
-		newY -= (xwc->height / 2 - priv->serverInput.top +
-			(priv->serverInput.top + priv->serverInput.bottom) / 2) * direction;
+		newY -= (xwc->height / 2 - priv->border.top +
+			(priv->border.top + priv->border.bottom) / 2) * direction;
 	    else
 		newY -= ((xwc->height - priv->serverGeometry.height ()) / 2) * direction;
 	    break;
@@ -4127,7 +4127,7 @@
 	case SouthGravity:
 	case SouthEastGravity:
 	    if (xwcm & CWY)
-		newY -= xwc->height + priv->serverInput.bottom * direction;
+		newY -= xwc->height + priv->border.bottom * direction;
 	    else
 		newY -= (xwc->height - priv->serverGeometry.height ()) * direction;
 	    break;