Merge lp:~nwkj86/compiz/add-background-conf-to-switcher into lp:compiz/0.9.12

[Artur]

Add additional section in switcher configuration that allows you to set background color (without alpha so far).

[Stephen M. Webb (bregma)]

The indentation is wrong in this patch. Compiz indents C and C++ code 4 spaces, tab at 8 spaces. The XML also looks inconsistent within the same file.

review: Needs Fixing

[lp:~nwkj86/compiz/add-background-conf-to-switcher]

3972. By Artur on 2015-08-18

Fix indentation

3973. By Artur on 2015-08-19

Allow to set background in staticswitcher & switcher

3974. By Artur on 2015-08-22

Post review changes.

* change setBackground to updateBackground and move it to base class
* fix typo

Unmerged revisions

=== modified file 'plugins/switcher/src/switcher.cpp'
--- plugins/switcher/src/switcher.cpp	2015-07-25 20:01:51 +0000
+++ plugins/switcher/src/switcher.cpp	2015-08-18 23:05:27 +0000
@@ -217,8 +217,35 @@
     BaseSwitchScreen::handleEvent (event);
 }
 
-void
-SwitchScreen::initiate (SwitchWindowSelection selection,
+void SwitchScreen::setBackground()
+{
+    SWITCH_SCREEN(screen);
+    if(!ss->popupWindow)
+	return;
+
+    Display *dpy = screen->dpy();
+
+    unsigned long  background_pixel = 0ul;
+    if (optionGetUseBackgroundColor())
+    {
+	Visual *visual = findArgbVisual(dpy, screen->screenNum());
+	Colormap colormap = XCreateColormap(dpy, screen->root(), visual, AllocNone);
+
+	XColor col;
+	col.red = optionGetBackgroundColorRed();
+	col.green = optionGetBackgroundColorGreen();
+	col.blue = optionGetBackgroundColorBlue();
+	XAllocColor(dpy, colormap, &col);
+
+	background_pixel = col.pixel;
+
+	unsigned short alpha = optionGetBackgroundColorAlpha();
+    }
+
+    XSetWindowBackground(dpy, ss->popupWindow, background_pixel);
+}
+
+void SwitchScreen::initiate(SwitchWindowSelection selection,
 			bool                  showPopup)
 {
     int count;
@@ -299,7 +326,8 @@
 			 XA_ATOM, 32, PropModeReplace,
 			 (unsigned char *) &Atoms::winTypeUtil, 1);
 
-	screen->setWindowProp (popupWindow, Atoms::winDesktop, 0xffffffff);
+    screen->setWindowProp(popupWindow, Atoms::winDesktop, 0xffffffff);
+    setBackground();
 
 	setSelectedWindowHint (false);
     }
@@ -1122,6 +1150,8 @@
     zooming = (optionGetZoom () > 0.05f);
 
     optionSetZoomNotify (boost::bind (&SwitchScreen::setZoom, this));
+    optionSetUseBackgroundColorNotify(boost::bind(&SwitchScreen::setBackground, this));
+    optionSetBackgroundColorNotify(boost::bind(&SwitchScreen::setBackground, this));
 
 #define SWITCHBIND(a,b,c) boost::bind (switchInitiateCommon, _1, _2, _3, a, b, c)
 

=== modified file 'plugins/switcher/src/switcher.h'
--- plugins/switcher/src/switcher.h	2012-12-10 03:28:47 +0000
+++ plugins/switcher/src/switcher.h	2015-08-18 23:05:27 +0000
@@ -71,6 +71,11 @@
 	void handleSelectionChange (bool toNext, int nextIdx);
 	int countWindows ();
 	void handleEvent (XEvent *event);
+
+    private:
+	void setBackground ();
+
+    public:
 	void initiate (SwitchWindowSelection selection,
 		       bool                  showPopup);
 	void windowRemove (CompWindow *w);
@@ -177,4 +182,3 @@
 	bool init ();
 };
 
-

=== modified file 'plugins/switcher/switcher.xml.in'
--- plugins/switcher/switcher.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/switcher/switcher.xml.in	2015-08-18 23:05:27 +0000
@@ -166,6 +166,24 @@
 		<_long>Rotate to the selected window while switching</_long>
 		<default>false</default>
 	    </option>
+	    <subgroup>
+		<_short>Background</_short>
+		<option name="use_background_color" type="bool">
+		    <_short>Set background color</_short>
+		    <_long>Set background color</_long>
+		    <default>false</default>
+		</option>
+		<option name="background_color" type="color">
+		    <_short>Bacground Color</_short>
+		    <_long>Background color of the switcher window.</_long>
+		    <default>
+			<red>0x3333</red>
+			<green>0x3333</green>
+			<blue>0x3333</blue>
+			<alpha>0xd998</alpha>
+		    </default>
+		</option>
+	    </subgroup>
 	</options>
     </plugin>
 </compiz>