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

[ksamak (ksamak)]

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

[Marco Trevisan (Treviño) (3v1n0)]

I'm just wondering, as Sam asked, why you need a Timer here...

[ksamak (ksamak)]

> I'm just wondering, as Sam asked, why you need a Timer here...

pasting:
I tried optionGetActivateAtStartup() in the constructor, but I think GSettings aren't initialized yet if the object isn't constructed.
The optionGetActivateAtStartup function only returns default value (0) if placed in constructor, or in function called by constructor. I don't know of any other mean to bypass this except a timer.

[Sam Spilsbury (smspillaz)]

> > I'm just wondering, as Sam asked, why you need a Timer here...
>
> pasting:
> I tried optionGetActivateAtStartup() in the constructor, but I think GSettings
> aren't initialized yet if the object isn't constructed.
> The optionGetActivateAtStartup function only returns default value (0) if
> placed in constructor, or in function called by constructor. I don't know of
> any other mean to bypass this except a timer.

I had a look around and you're right - it looks like the compizconfig plugin itself applies settings on an idle timer at startup. I'm not sure why that is exactly, but we'll have to work around it.

One option is to use timeout handler like this. I suppose another option is that if the setting will remain off by default, you could use optionGetActivateAtStartupNotify to receive a callback when the setting changes from false to true and then use that to activate the plugin.

I also note that the way the keybindings are done here are such that holding down the keys initiates the effect whereas releasing them terminates it. I would imagine such behaviour would have to be inverted in the "on-by-default" case.

[Andrea Azzarone (azzar1)]

Yes remove the timer please. Use the same "workaround" you wrote for the neg plugin.

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Any update here?

[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

[ksamak (ksamak)]

Yes, i did adapt to use the same workaround.

review: Needs Resubmitting

[ksamak (ksamak)]

> Yes, i did adapt to use the same workaround.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Ack

review: Approve

=== 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-04-20 13:04:37 +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-04-20 13:04:37 +0000
@@ -660,6 +660,17 @@
     return true;
 }
 
+void
+ShowmouseScreen::startupToggle ()
+{
+    if (optionGetActivateAtStartup ())
+    {
+	active = true;
+	toggleFunctions (true);
+	gScreen->glPaintOutputSetEnabled (gScreen, true);
+    }
+}
+
 ShowmouseScreen::ShowmouseScreen (CompScreen *screen) :
     PluginClassHandler <ShowmouseScreen, CompScreen> (screen),
     cScreen (CompositeScreen::get (screen)),
@@ -687,6 +698,8 @@
 						this,  _1, _2, _3));
     optionSetInitiateEdgeTerminate (boost::bind (&ShowmouseScreen::terminate,
 						 this,  _1, _2, _3));
+
+    optionSetActivateAtStartupNotify (boost::bind (&ShowmouseScreen::startupToggle, this));
 }
 
 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-04-20 13:04:37 +0000
@@ -140,6 +140,9 @@
 	MousePoller    pollHandle;
 
 	void
+	startupToggle ();
+
+	void
 	preparePaint (int);
 
 	bool