Merge lp:~ksamak/compiz/showmouse_autostart_option into lp:compiz/0.9.13

[ksamak]

showmouse: added autostart option

added startup option to showmouse plugin

[Sam Spilsbury (smspillaz)]

review: Needs Fixing

[lp:~ksamak/compiz/showmouse_autostart_option]

4108. By ksamak <ksamak@ksalaptop> on 2017-03-02

fix indentation

[ksamak (ksamak)]

hi,
fixed indentation, and commented on timer use.
thanks for your time.

[lp:~ksamak/compiz/showmouse_autostart_option]

4109. By ksamak <ksamak@ksalaptop> on 2017-04-20

showmouse: used Notify trick to implement startup mechanism

4110. By ksamak <ksamak@ksalaptop> on 2017-04-20

coding style

Unmerged revisions

=== modified file 'plugins/showmouse/showmouse.xml.in'
--- plugins/showmouse/showmouse.xml.in	2016-05-31 17:30:42 +0000
+++ plugins/showmouse/showmouse.xml.in	2017-03-02 07:54:34 +0000
@@ -19,6 +19,11 @@
 		<options>
 			<group>
 				<_short>General</_short>
+				<option name="activate_at_startup" type="bool">
+					<_short>plugin should be active at startup</_short>
+					<_long>If active, the plugin will start active, with the mouse enhanced</_long>
+					<default>false</default>
+				</option>
 				<option name="initiate" type="key">
 					<_short>Initiate</_short>
 					<_long>Toggle the mouse pointer trail.</_long>
 
=== modified file 'plugins/showmouse/src/showmouse.cpp'
--- plugins/showmouse/src/showmouse.cpp	2016-05-31 17:30:42 +0000
+++ plugins/showmouse/src/showmouse.cpp	2017-03-02 07:54:34 +0000
@@ -660,6 +660,17 @@
     return true;
 }
 
+bool ShowmouseScreen::checkStartup () {
+    if (optionGetActivateAtStartup()) {
+        active = true;
+        toggleFunctions (true);
+        gScreen->glPaintOutputSetEnabled (gScreen, true);
+    }
+    timeoutHandle.stop();
+    return false;
+}
+
+
 ShowmouseScreen::ShowmouseScreen (CompScreen *screen) :
     PluginClassHandler <ShowmouseScreen, CompScreen> (screen),
     cScreen (CompositeScreen::get (screen)),
@@ -687,6 +698,11 @@
 						this,  _1, _2, _3));
     optionSetInitiateEdgeTerminate (boost::bind (&ShowmouseScreen::terminate,
 						 this,  _1, _2, _3));
+
+
+    timeoutHandle.setTimes (1, 2);
+    timeoutHandle.setCallback (boost::bind (&ShowmouseScreen::checkStartup, this));
+    timeoutHandle.start ();
 }
 
 ShowmouseScreen::~ShowmouseScreen ()
 
=== modified file 'plugins/showmouse/src/showmouse.h'
--- plugins/showmouse/src/showmouse.h	2016-05-31 17:30:42 +0000
+++ plugins/showmouse/src/showmouse.h	2017-03-02 07:54:34 +0000
@@ -138,6 +138,9 @@
 	float	       rot;
 
 	MousePoller    pollHandle;
+	CompTimer      timeoutHandle;
+
+	bool checkStartup ();
 
 	void
 	preparePaint (int);