[fusion-commits] Addhelper plugin: Changes to 'master' (91c1367dc46d54956489b2df5e7bebf1f90fd613)

[kristian at server.opencompositing.org]

New commits:
commit 91c1367dc46d54956489b2df5e7bebf1f90fd613
Author: Kristian Lyngstol <kristian at yoda.lyngstol.net>
Date:   Wed May 21 16:36:23 2008 +0200

    Add an option to enable ADD Helper automatically on start


 addhelper.c      |   13 ++++++++++---
 addhelper.xml.in |    5 +++++
 2 files changed, 15 insertions(+), 3 deletions(-)


Modified: fusion/plugins/addhelper/addhelper.c
===================================================================
--- fusion/plugins/addhelper/addhelper.c
+++ fusion/plugins/addhelper/addhelper.c
@@ -185,7 +185,6 @@ addhelperToggle (CompDisplay     *d,
 		 int             nOption)
 {
     ADD_DISPLAY (d);
-
     ad->toggle = !ad->toggle;
     walkWindows (d);
 
@@ -210,6 +209,9 @@ addhelperDisplayOptionChanged (CompDisplay             *d,
     case AddhelperDisplayOptionOpacity:
 	ad->opacity = (addhelperGetOpacity(d) * 0xffff) / 100;
 	break;
+    case AddhelperDisplayOptionOnoninit:
+	ad->toggle = addhelperGetOnoninit (d);
+	break;
     default:
 	break;
     }
@@ -222,6 +224,7 @@ addhelperInitWindow (CompPlugin *p,
     AddHelperWindow *aw;
 
     ADD_SCREEN (w->screen);
+    ADD_DISPLAY (w->screen->display);
 
     aw = malloc (sizeof (AddHelperWindow));
     if (!aw)
@@ -229,7 +232,10 @@ addhelperInitWindow (CompPlugin *p,
 
     w->base.privates[as->windowPrivateIndex].ptr = aw;
 
-    aw->dim = FALSE;
+    if (ad->toggle && w->id != w->screen->display->activeWindow)
+	aw->dim = TRUE;
+    else
+	aw->dim = FALSE;
 
     return TRUE;
 }
@@ -306,11 +312,12 @@ addhelperInitDisplay (CompPlugin  *p,
     addhelperSetBrightnessNotify (d, addhelperDisplayOptionChanged);
     addhelperSetOpacityNotify (d, addhelperDisplayOptionChanged);
     addhelperSetSaturationNotify (d, addhelperDisplayOptionChanged);
+    addhelperSetOnoninitNotify (d, addhelperDisplayOptionChanged);
 
-    ad->toggle = FALSE;
     ad->brightness = (addhelperGetBrightness (d) * BRIGHT) / 100;
     ad->opacity = (addhelperGetOpacity (d) * OPAQUE) / 100;
     ad->saturation = (addhelperGetSaturation (d) * COLOR) / 100;
+    ad->toggle = addhelperGetOnoninit (d);
 
     WRAP (ad, d, handleEvent, addhelperHandleEvent);
 

Modified: fusion/plugins/addhelper/addhelper.xml.in
===================================================================
--- fusion/plugins/addhelper/addhelper.xml.in
+++ fusion/plugins/addhelper/addhelper.xml.in
@@ -25,6 +25,11 @@
           <_long>Window types that should be Opacified.</_long>
           <default>Toolbar | Utility | Dialog | ModalDialog | Fullscreen | Normal</default>
         </option>
+	<option name="ononinit" type="bool">
+	  <_short>Enable ADD Helper on start</_short>
+	  <_long>Enables ADD helper when it is first loaded.</_long>
+	  <default>false</default>
+	</option>
         <option name="brightness" type="int">
           <_short>Brightness</_short>
           <_long>Brightness of faded windows</_long>