Experimental Compiz/Fusilli patches! Tread with caution!

README.md

Experimental Compiz/Fusilli patches

Welcome! You've likely stumbled across this wondering, "What the heck is this?"

It's a gist of all the patches I've applied to my personal copy of compiz (likely will try to port these to fusilli too). Here's what they do:

• emerald_no_rmenu.patch: Disable the right-click menu in the decorations. It's rather unsightly since that menu is not as configurable as Compiz-Boxmenu. On an interesting note, when I disabled this, it also disabled Compiz showing the wnck_action_menu. Maybe the two are connected somehow? It'd also be nice to patch Emerald at some point to provide a custom window action menu that promotes the full power of Compiz. That'll be for tomorrow though.
• resizeinfo_border_actual_grad.patch: Bugfixes and border color config
• plugins_{extra,main}_ffamily.patch: font family configuration for the appropriate plugin packs

emerald_no_rmenu.patch

diff -aur emerald.orig/configure.ac emerald/configure.ac
--- emerald.orig/configure.ac	2015-12-07 23:47:18.388001408 -0800
+++ emerald/configure.ac	2015-12-08 00:47:42.264523871 -0800
@@ -71,6 +71,19 @@
 esac],[mime_update=false])
 AM_CONDITIONAL(MIMEUPDATE, test x$mime_update = xtrue)
 
+AC_ARG_ENABLE(rmenu,
+[  --enable-rmenu],
+[case "${enableval}" in
+  yes) disable_rmenu=true  ;;
+  no)  disable_rmenu=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-rmenu) ;;
+esac], [disable_rmenu=false])
+if test "$disable_rmenu" = false; then
+	AC_DEFINE(NO_RMENU, 1,
+	[Define if you do not want right-click menus in the decos])
+fi
+
+
 AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database)
 AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)
 AC_PATH_PROG(UPDATE_ICON_CACHE, gtk-update-icon-cache)
diff -aur emerald.orig/src/main.c emerald/src/main.c
--- emerald.orig/src/main.c	2015-12-07 23:47:18.394668577 -0800
+++ emerald/src/main.c	2015-12-08 00:50:18.668848833 -0800
@@ -88,7 +88,9 @@
 static Atom switcher_fg_atom;
 
 static Atom toolkit_action_atom;
+#ifndef NO_RMENU
 static Atom toolkit_action_window_menu_atom;
+#endif
 static Atom toolkit_action_force_quit_dialog_atom;
 
 static Atom emerald_sigusr1_atom;
@@ -121,8 +123,10 @@
 static GtkWidget *style_window;
 
 static GHashTable *frame_table;
+#ifndef NO_RMENU
 static GtkWidget *action_menu = NULL;
 static gboolean action_menu_mapped = FALSE;
+#endif
 static gint double_click_timeout = 250;
 
 static GtkWidget *tip_window;
@@ -3628,6 +3632,7 @@
     screen = gdk_display_get_default_screen(gdkdisplay);
     xroot = RootWindowOfScreen(gdk_x11_screen_get_xscreen(screen));
 
+	#ifndef NO_RMENU
     if (action_menu_mapped)
     {
 	gtk_object_destroy(GTK_OBJECT(action_menu));
@@ -3635,6 +3640,7 @@
 	action_menu = NULL;
 	return;
     }
+	#endif
 
     ev.xclient.type = ClientMessage;
     ev.xclient.display = xdisplay;
@@ -3674,6 +3680,7 @@
     screen = gdk_display_get_default_screen(gdkdisplay);
     xroot = RootWindowOfScreen(gdk_x11_screen_get_xscreen(screen));
 
+	#ifndef NO_RMENU
     if (action_menu_mapped)
     {
 	gtk_object_destroy(GTK_OBJECT(action_menu));
@@ -3681,6 +3688,7 @@
 	action_menu = NULL;
 	return;
     }
+	#endif
 
     ev.xclient.type = ClientMessage;
     ev.xclient.display = xdisplay;
@@ -3874,11 +3882,15 @@
 	    break;
     }
 }
+
+#ifndef NO_RMENU
 static void action_menu_unmap(GObject * object)
 {
     action_menu_mapped = FALSE;
 }
+#endif
 
+#ifndef NO_RMENU
 static void action_menu_map(WnckWindow * win, long button, Time time)
 {
     GdkDisplay *gdkdisplay;
@@ -3932,6 +3944,7 @@
 
     action_menu_mapped = TRUE;
 }
+#endif
 
 /* generic_button_event returns:
  * 0: nothing, hover, ButtonPress
@@ -4107,11 +4120,15 @@
     if (generic_button_event(win, xevent, B_T_HELP, B_HELP))
 	send_help_message(win);
 }
+
+#ifndef NO_RMENU
 static void menu_button_event(WnckWindow * win, XEvent * xevent)
 {
     if (generic_button_event(win, xevent, B_T_MENU, B_MENU))
 	action_menu_map(win, xevent->xbutton.button, xevent->xbutton.time);
 }
+#endif
+
 static void shade_button_event(WnckWindow * win, XEvent * xevent)
 {
     if (generic_button_event(win, xevent, B_T_SHADE, B_SHADE))
@@ -4203,10 +4220,12 @@
     }
     else if (xevent->xbutton.button == 2)
 	restack_window(win, Below);
+	#ifndef NO_RMENU
     else if (xevent->xbutton.button == 3)
     {
 	action_menu_map(win, xevent->xbutton.button, xevent->xbutton.time);
     }
+	#endif
     else if (xevent->xbutton.button == 4)
     {
 	if (!wnck_window_is_shaded(win))
@@ -4522,6 +4541,7 @@
 		unsigned long action;
 
 		action = xevent->xclient.data.l[0];
+		#ifndef NO_RMENU
 		if (action == toolkit_action_window_menu_atom)
 		{
 		    WnckWindow *win;
@@ -4534,7 +4554,13 @@
 					xevent->xclient.data.l[1]);
 		    }
 		}
+		#endif
+
+		#ifndef NO_RMENU
 		else if (action == toolkit_action_force_quit_dialog_atom)
+		#else
+		if (action == toolkit_action_force_quit_dialog_atom)
+		#endif
 		{
 		    WnckWindow *win;
 
@@ -4575,7 +4601,11 @@
 		max_button_event,
 		min_button_event,
 		help_button_event,
+		#ifndef NO_RMENU
 		menu_button_event,
+		#else
+		NULL,
+		#endif
 		shade_button_event,
 		above_button_event,
 		sticky_button_event,
@@ -4592,7 +4622,7 @@
 			    (*callback[i][j]) (win, xevent);
 
 		for (i = 0; i < B_T_COUNT; i++)
-		    if (d->button_windows[i] == xevent->xany.window)
+		    if (d->button_windows[i] == xevent->xany.window && button_callback[i] != NULL)
 			(*button_callback[i]) (win, xevent);
 	    }
 	}
@@ -5537,9 +5567,11 @@
 
     toolkit_action_atom =
 	XInternAtom(xdisplay, "_COMPIZ_TOOLKIT_ACTION", FALSE);
+	#ifndef NO_RMENU
     toolkit_action_window_menu_atom =
 	XInternAtom(xdisplay, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU",
 		    FALSE);
+	#endif
     toolkit_action_force_quit_dialog_atom =
 	XInternAtom(xdisplay, "_COMPIZ_TOOLKIT_ACTION_FORCE_QUIT_DIALOG",
 		    FALSE);
diff -aur emerald.orig/themer/main.c emerald/themer/main.c
--- emerald.orig/themer/main.c	2015-12-07 23:47:18.394668577 -0800
+++ emerald/themer/main.c	2015-12-08 00:47:42.267857226 -0800
@@ -807,7 +807,11 @@
                 _("Use colons to separate left, center, and right.\n"
                 "Anything after a third colon is ignored.\n"
                 "C=Close, N=Minimize, X/R=Restore\n"
+                #ifndef NO_RMENU
                 "I=Icon, T=Title, H=Help, M=Menu\n"
+                #else
+                "I=Icon, T=Title, H=Help\n"
+                #endif
                 "S=Shade, U/A=On Top(Up/Above)\n"
                 "Y=Sticky, (#)=# pixels space, ex: (5)\n")
                 //"U=On Top, D=On Bottom, S=Shade\n"

plugins_extra_ffamily.patch

diff -aur plugins-extra.orig/metadata/group.xml.in plugins-extra/metadata/group.xml.in
--- plugins-extra.orig/metadata/group.xml.in	2015-01-06 06:54:53.000000000 -0800
+++ plugins-extra/metadata/group.xml.in	2015-12-08 18:59:53.324751452 -0800
@@ -386,6 +386,11 @@
         </subgroup>
         <subgroup>
           <_short>Window Title Font</_short>
+			<option name="tabbar_font_family" type="string">
+				<_short>Font family</_short>
+				<_long>Name of the font to display title in the tab bar</_long>
+				<default>Sans</default>
+			</option>
           <option name="tabbar_font_size" type="int">
             <_short>Font Size</_short>
             <_long>The size of the window title font in the tab bar</_long>
diff -aur plugins-extra.orig/metadata/scalefilter.xml.in plugins-extra/metadata/scalefilter.xml.in
--- plugins-extra.orig/metadata/scalefilter.xml.in	2015-01-06 06:54:53.000000000 -0800
+++ plugins-extra/metadata/scalefilter.xml.in	2015-12-08 18:58:38.117608143 -0800
@@ -36,6 +36,11 @@
 	    </group>
 	    <group>
 		<_short>Appearance</_short>
+		<option name="font_family" type="string">
+			<_short>Font family</_short>
+			<_long>Name of the font to display title.</_long>
+			<default>Sans</default>
+		</option>
 		<option name="font_bold" type="bool">
 		    <_short>Bold Font</_short>
 		    <_long>Use bold font for window title display</_long>
diff -aur plugins-extra.orig/src/group/cairo.c plugins-extra/src/group/cairo.c
--- plugins-extra.orig/src/group/cairo.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-extra/src/group/cairo.c	2015-12-08 18:55:26.379729249 -0800
@@ -667,7 +667,7 @@
 	CompTextData    *data;
 	CompTextAttrib  textAttrib;
 
-	textAttrib.family = "Sans";
+	textAttrib.family = groupGetTabbarFontFamily(s);
 	textAttrib.size   = groupGetTabbarFontSize (s);
 
 	textAttrib.flags = CompTextFlagStyleBold | CompTextFlagEllipsized |
diff -aur plugins-extra.orig/src/group/init.c plugins-extra/src/group/init.c
--- plugins-extra.orig/src/group/init.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-extra/src/group/init.c	2015-12-08 18:56:22.216748490 -0800
@@ -55,6 +55,7 @@
 		if (group->tabBar)
 		    groupRenderTabBarBackground (group);
 	    break;
+	case GroupScreenOptionTabbarFontFamily:
 	case GroupScreenOptionTabbarFontSize:
 	case GroupScreenOptionTabbarFontColor:
 	    for (group = gs->groups; group; group = group->next)
@@ -318,6 +319,7 @@
     groupSetTabHighlightColorNotify (s, groupScreenOptionChanged);
     groupSetTabBaseColorNotify (s, groupScreenOptionChanged);
     groupSetTabBorderColorNotify (s, groupScreenOptionChanged);
+    groupSetTabbarFontFamilyNotify (s, groupScreenOptionChanged);
     groupSetTabbarFontSizeNotify (s, groupScreenOptionChanged);
     groupSetTabbarFontColorNotify (s, groupScreenOptionChanged);
     groupSetGlowNotify (s, groupScreenOptionChanged);
diff -aur plugins-extra.orig/src/scalefilter/scalefilter.c plugins-extra/src/scalefilter/scalefilter.c
--- plugins-extra.orig/src/scalefilter/scalefilter.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-extra/src/scalefilter/scalefilter.c	2015-12-08 18:57:32.137190510 -0800
@@ -163,7 +163,7 @@
     attrib.maxWidth = x2 - x1;
     attrib.maxHeight = y2 - y1;
 
-    attrib.family = "Sans";
+    attrib.family = scalefilterGetFontFamily(s);
     attrib.size = scalefilterGetFontSize (s);
     attrib.color[0] = scalefilterGetFontColorRed (s);
     attrib.color[1] = scalefilterGetFontColorGreen (s);
@@ -716,6 +716,7 @@
 {
     switch (num)
     {
+	case ScalefilterScreenOptionFontFamily:
 	case ScalefilterScreenOptionFontBold:
 	case ScalefilterScreenOptionFontSize:
 	case ScalefilterScreenOptionFontColor:
@@ -832,6 +833,7 @@
     WRAP (fs, ss, setScaledPaintAttributes,
 	  scalefilterSetScaledPaintAttributes);
 
+    scalefilterSetFontFamilyNotify (s, scalefilterScreenOptionChanged);
     scalefilterSetFontBoldNotify (s, scalefilterScreenOptionChanged);
     scalefilterSetFontSizeNotify (s, scalefilterScreenOptionChanged);
     scalefilterSetFontColorNotify (s, scalefilterScreenOptionChanged);

plugins_main_ffamily.patch

diff -aur plugins-main.orig/metadata/resizeinfo.xml.in plugins-main/metadata/resizeinfo.xml.in
--- plugins-main.orig/metadata/resizeinfo.xml.in	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/metadata/resizeinfo.xml.in	2015-12-08 18:53:54.809151850 -0800
@@ -24,6 +24,11 @@
 	  windows with a resize increment of greater than 1. </_long>
 	  <default>false</default>
 	</option>
+	<option name="text_family" type="string">
+		<_short>Font family</_short>
+		<_long>Name of the font to display resize info.</_long>
+		<default>Sans</default>
+	</option>
 	<option name="text_color" type="color">
 	  <_short> Text color. </_short>
 	  <_long> Color of text on resize popup. </_long>
diff -aur plugins-main.orig/metadata/ring.xml.in plugins-main/metadata/ring.xml.in
--- plugins-main.orig/metadata/ring.xml.in	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/metadata/ring.xml.in	2015-12-08 18:46:16.196258337 -0800
@@ -191,6 +191,13 @@
 					<_long>Show window title of currently selected window.</_long>
 					<default>true</default>
 				</option>
+
+				<option name="title_font" type="string">
+					<_short>Font family</_short>
+					<_long>Name of the font to display title.</_long>
+					<default>Sans</default>
+				</option>
+				
 				<option name="title_font_bold" type="bool">
 					<_short>Bold Font</_short>
 					<_long>Selects if the window title should be displayed in bold font or not.</_long>
diff -aur plugins-main.orig/metadata/scaleaddon.xml.in plugins-main/metadata/scaleaddon.xml.in
--- plugins-main.orig/metadata/scaleaddon.xml.in	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/metadata/scaleaddon.xml.in	2015-12-08 18:48:25.170415309 -0800
@@ -80,6 +80,12 @@
 			    <_name>All windows</_name>
 			</desc>
 		    </option>
+			<option type="string" name="title_font">
+				<_short>Font family</_short>
+				<_long>Name of the font to display title.</_long>
+				<default>Sans</default>
+			</option>
+			
 		    <option name="title_bold" type="bool">
 			<_short>Bold Font</_short>
 			<_long>Use bold font for window title display</_long>
diff -aur plugins-main.orig/metadata/shift.xml.in plugins-main/metadata/shift.xml.in
--- plugins-main.orig/metadata/shift.xml.in	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/metadata/shift.xml.in	2015-12-08 18:50:40.914599330 -0800
@@ -303,6 +303,11 @@
 					<_long>Show window title of currently selected window.</_long>
 					<default>true</default>
 				</option>
+				<option type="string" name="title_font_family">
+					<_short>Font family</_short>
+					<_long>Name of the font to display title.</_long>
+					<default>Sans</default>
+				</option>
 				<option name="title_font_bold" type="bool">
 					<_short>Bold Font</_short>
 					<_long>Selects if the window title should be displayed in bold font or not.</_long>
diff -aur plugins-main.orig/metadata/thumbnail.xml.in plugins-main/metadata/thumbnail.xml.in
--- plugins-main.orig/metadata/thumbnail.xml.in	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/metadata/thumbnail.xml.in	2015-12-08 18:49:50.460949531 -0800
@@ -84,6 +84,11 @@
             <_long>Show Window Title in Thumbnail.</_long>
             <default>true</default>
           </option>
+          <option type="string" name="font_family">
+            <_short>Font family</_short>
+            <_long>Name of the font to display title.</_long>
+            <default>Sans</default>
+          </option>
           <option name="font_bold" type="bool">
             <_short>Bold Font</_short>
             <_long>Should be the window title Bold.</_long>
diff -aur plugins-main.orig/src/resizeinfo/resizeinfo.c plugins-main/src/resizeinfo/resizeinfo.c
--- plugins-main.orig/src/resizeinfo/resizeinfo.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/src/resizeinfo/resizeinfo.c	2015-12-08 18:40:51.677408894 -0800
@@ -209,7 +209,7 @@
     font = pango_font_description_new ();
     layout = pango_cairo_create_layout (is->textLayer.cr);
   
-    pango_font_description_set_family (font,"Sans");
+    pango_font_description_set_family (font, resizeinfoGetTextFamily(s->display));
     pango_font_description_set_absolute_size (font, 12 * PANGO_SCALE);
     pango_font_description_set_style (font, PANGO_STYLE_NORMAL);
     pango_font_description_set_weight (font, PANGO_WEIGHT_BOLD);
diff -aur plugins-main.orig/src/ring/ring.c plugins-main/src/ring/ring.c
--- plugins-main.orig/src/ring/ring.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/src/ring/ring.c	2015-12-08 18:42:19.461331771 -0800
@@ -248,7 +248,7 @@
     attrib.flags = CompTextFlagWithBackground | CompTextFlagEllipsized;
     if (ringGetTitleFontBold (s))
 	attrib.flags |= CompTextFlagStyleBold;
-    attrib.family = "Sans";
+    attrib.family = ringGetTitleFont(s);
     attrib.bgHMargin = 15;
     attrib.bgVMargin = 15;
     attrib.bgColor[0] = ringGetTitleBackColorRed (s);
diff -aur plugins-main.orig/src/scaleaddon/scaleaddon.c plugins-main/src/scaleaddon/scaleaddon.c
--- plugins-main.orig/src/scaleaddon/scaleaddon.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/src/scaleaddon/scaleaddon.c	2015-12-08 18:37:57.562908309 -0800
@@ -148,7 +148,7 @@
     attrib.maxWidth = w->attrib.width * scale;
     attrib.maxHeight = w->attrib.height * scale;
 
-    attrib.family = "Sans";
+    attrib.family = scaleaddonGetTitleFont(s);
     attrib.size = scaleaddonGetTitleSize (s);
     attrib.color[0] = scaleaddonGetFontColorRed (s);
     attrib.color[1] = scaleaddonGetFontColorGreen (s);
@@ -1135,6 +1135,7 @@
     switch (num)
     {
 	case ScaleaddonScreenOptionWindowTitle:
+	case ScaleaddonScreenOptionTitleFont:
 	case ScaleaddonScreenOptionTitleBold:
 	case ScaleaddonScreenOptionTitleSize:
 	case ScaleaddonScreenOptionBorderSize:
@@ -1258,6 +1259,7 @@
 	  scaleaddonLayoutSlotsAndAssignWindows);
 
     scaleaddonSetWindowTitleNotify (s, scaleaddonScreenOptionChanged);
+    scaleaddonSetTitleFontNotify (s, scaleaddonScreenOptionChanged);
     scaleaddonSetTitleBoldNotify (s, scaleaddonScreenOptionChanged);
     scaleaddonSetTitleSizeNotify (s, scaleaddonScreenOptionChanged);
     scaleaddonSetBorderSizeNotify (s, scaleaddonScreenOptionChanged);
diff -aur plugins-main.orig/src/shift/shift.c plugins-main/src/shift/shift.c
--- plugins-main.orig/src/shift/shift.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/src/shift/shift.c	2015-12-08 18:41:44.751098579 -0800
@@ -315,7 +315,7 @@
     tA.maxWidth = (ox2 - ox1) * 3 / 4;
     tA.maxHeight = 100;
 
-    tA.family = "Sans";
+    tA.family = shiftGetTitleFontFamily(s);
     tA.size = shiftGetTitleFontSize (s);
     tA.color[0] = shiftGetTitleFontColorRed (s);
     tA.color[1] = shiftGetTitleFontColorGreen (s);
diff -aur plugins-main.orig/src/thumbnail/thumbnail.c plugins-main/src/thumbnail/thumbnail.c
--- plugins-main.orig/src/thumbnail/thumbnail.c	2015-01-06 06:54:53.000000000 -0800
+++ plugins-main/src/thumbnail/thumbnail.c	2015-12-08 18:35:36.615298827 -0800
@@ -154,7 +154,7 @@
     tA.flags      = CompTextFlagEllipsized;
     if (thumbnailGetFontBold (s))
 	tA.flags |= CompTextFlagStyleBold;
-    tA.family     = "Sans";
+    tA.family     = thumbnailGetFontFamily(s);
 
     t->textData = (td->textFunc->renderWindowTitle) (s, t->win->id, FALSE, &tA);
 }

resizeinfo_border_actual_grad.patch

diff -aur plugins-main.orig/metadata/resizeinfo.xml.in plugins-main/metadata/resizeinfo.xml.in
--- plugins-main.orig/metadata/resizeinfo.xml.in	2015-12-09 15:23:33.834222604 -0800
+++ plugins-main/metadata/resizeinfo.xml.in	2015-12-09 15:46:56.831837050 -0800
@@ -69,6 +69,16 @@
 	    <alpha> 0xcccc </alpha>
 	  </default>
 	</option>
+	<option name="border_color" type="color">
+	  <_short> Border </_short>
+	  <_long> Border color of the gradient background. </_long>
+	  <default>
+	    <red> 0xe57f </red>
+	    <green> 0xe57f </green>
+	    <blue> 0xe57f </blue>
+	    <alpha> 0xffff </alpha>
+	  </default>
+	</option>
 
       </group>
     </display>
diff -aur plugins-main.orig/src/resizeinfo/resizeinfo.c plugins-main/src/resizeinfo/resizeinfo.c
--- plugins-main.orig/src/resizeinfo/resizeinfo.c	2015-12-09 15:23:33.914223126 -0800
+++ plugins-main/src/resizeinfo/resizeinfo.c	2015-12-09 15:51:04.537772670 -0800
@@ -276,16 +276,16 @@
     a = resizeinfoGetGradient1Alpha (s->display) / (float)0xffff;
     cairo_pattern_add_color_stop_rgba (pattern, 0.00f, r, g, b, a);
 
-    r = resizeinfoGetGradient1Red (s->display) / (float)0xffff;
-    g = resizeinfoGetGradient1Green (s->display) / (float)0xffff;
-    b = resizeinfoGetGradient1Blue (s->display) / (float)0xffff;
-    a = resizeinfoGetGradient1Alpha (s->display) / (float)0xffff;
+    r = resizeinfoGetGradient2Red (s->display) / (float)0xffff;
+    g = resizeinfoGetGradient2Green (s->display) / (float)0xffff;
+    b = resizeinfoGetGradient2Blue (s->display) / (float)0xffff;
+    a = resizeinfoGetGradient2Alpha (s->display) / (float)0xffff;
     cairo_pattern_add_color_stop_rgba (pattern, 0.65f, r, g, b, a);
 
-    r = resizeinfoGetGradient1Red (s->display) / (float)0xffff;
-    g = resizeinfoGetGradient1Green (s->display) / (float)0xffff;
-    b = resizeinfoGetGradient1Blue (s->display) / (float)0xffff;
-    a = resizeinfoGetGradient1Alpha (s->display) / (float)0xffff;
+    r = resizeinfoGetGradient3Red (s->display) / (float)0xffff;
+    g = resizeinfoGetGradient3Green (s->display) / (float)0xffff;
+    b = resizeinfoGetGradient3Blue (s->display) / (float)0xffff;
+    a = resizeinfoGetGradient3Alpha (s->display) / (float)0xffff;
     cairo_pattern_add_color_stop_rgba (pattern, 0.85f, r, g, b, a);
     cairo_set_source (cr, pattern);
 	
@@ -299,7 +299,11 @@
     cairo_fill_preserve (cr);
 	
     /* Outline */
-    cairo_set_source_rgba (cr, 0.9f, 0.9f, 0.9f, 1.0f);
+    r = resizeinfoGetBorderColorRed (s->display) / (float)0xffff;
+    g = resizeinfoGetBorderColorGreen (s->display) / (float)0xffff;
+    b = resizeinfoGetBorderColorBlue (s->display) / (float)0xffff;
+    a = resizeinfoGetBorderColorAlpha (s->display) / (float)0xffff;
+    cairo_set_source_rgba (cr, r, b, g, a);
     cairo_stroke (cr);
 	
     cairo_pattern_destroy (pattern);
@@ -596,6 +600,7 @@
     resizeinfoSetGradient1Notify (d, gradientChanged);
     resizeinfoSetGradient2Notify (d, gradientChanged);
     resizeinfoSetGradient3Notify (d, gradientChanged);
+    resizeinfoSetBorderColorNotify (d, gradientChanged);
 
     id->resizeNotifyAtom = XInternAtom (d->display, "_COMPIZ_RESIZE_NOTIFY", 0);