[beryl-commits] r2281 - trunk/beryl-plugins/src

[kristian at server.beryl-project.org]

Author: kristian
Date: 2007-01-02 14:35:22 +0000 (Tue, 02 Jan 2007)
New Revision: 2281

Modified:
   trunk/beryl-plugins/src/opacify.c
Log:
opacify.c: 
	- Add option that defines inital state of opacify (toggle on/off)
	- Adjust option-grouping slightly. 


Modified: trunk/beryl-plugins/src/opacify.c
===================================================================
--- trunk/beryl-plugins/src/opacify.c	2007-01-02 14:34:21 UTC (rev 2280)
+++ trunk/beryl-plugins/src/opacify.c	2007-01-02 14:35:22 UTC (rev 2281)
@@ -39,7 +39,8 @@
 
 #define OPACIFY_DISPLAY_OPTION_TOGGLE 0
 #define OPACIFY_DISPLAY_OPTION_TOGGLE_FREEZE 1
-#define OPACIFY_DISPLAY_OPTION_NUM 2
+#define OPACIFY_DISPLAY_OPTION_INIT_TOGGLE 2
+#define OPACIFY_DISPLAY_OPTION_NUM 3
 
 #define OPACIFY_TOGGLE_KEY "o"
 #define OPACIFY_TOGGLE_MOD CompSuperMask
@@ -363,7 +364,7 @@
 	o = &os->opt[OPACIFY_SCREEN_OPTION_ONLY_IF_BLOCK];
 	o->name = "only_if_block";
 	o->group = N_("Misc. options");
-	o->subGroup = N_("Special cases");
+	o->subGroup = N_("");
 	o->displayHints = "";
 	o->shortDesc = N_("Only increase opacity if a window is blocking");
 	o->longDesc =
@@ -378,7 +379,7 @@
 	o = &os->opt[OPACIFY_SCREEN_OPTION_ACTIVE_OP];
 	o->name = "active_op";
 	o->group = N_("Misc. options");
-	o->subGroup = N_("");
+	o->subGroup = N_("Opacity levels");
 	o->displayHints = "";
 	o->shortDesc = N_("Active Opacity");
 	o->longDesc =
@@ -394,7 +395,7 @@
 	o = &os->opt[OPACIFY_SCREEN_OPTION_PASSIVE_OP];
 	o->name = "passive_op";
 	o->group = N_("Misc. options");
-	o->subGroup = N_("");
+	o->subGroup = N_("Opacity levels");
 	o->displayHints = "";
 	o->shortDesc = N_("Passive Opacity");
 	o->longDesc =
@@ -422,10 +423,11 @@
 		o->value.list.value[i].s = strdup(winType[i]);
 	o->rest.s.string = (char **)windowTypeString;
 	o->rest.s.nString = nWindowTypeString;
-	o->advanced = False;
+	o->advanced = True;
 	os->wMask = compWindowTypeMaskFromStringList(&o->value);
 
 
+
 }
 
 static Bool opacifyInitScreen(CompPlugin * p, CompScreen * s)
@@ -491,7 +493,6 @@
 	o->value.action.key.modifiers = OPACIFY_TOGGLE_MOD;
 	o->value.action.key.keysym = XStringToKeysym(OPACIFY_TOGGLE_KEY);
 	o->advanced = False;
-	od->toggle = TRUE;
 
 	o = &od->opt[OPACIFY_DISPLAY_OPTION_TOGGLE_FREEZE];
 	o->name = "toggle_reset";
@@ -507,6 +508,21 @@
 	o->value.b = TRUE;
 	o->advanced = False;
 	od->toggle_reset = TRUE;
+
+	o = &od->opt[OPACIFY_DISPLAY_OPTION_INIT_TOGGLE];
+	o->name = "init_toggle";
+	o->group = N_("Misc. options");
+	o->subGroup = N_("");
+	o->displayHints = "";
+	o->shortDesc = N_("Toggle opacify on by default");
+	o->longDesc =
+			N_
+			("With this enabled, opacify will be on when you load opacify, "
+			 "which is usually when you start Beryl.");
+	o->type = CompOptionTypeBool;
+	o->value.b = True;
+	o->advanced = False;
+	od->toggle = True;
 }
 
 static Bool opacifySetDisplayOptions(CompDisplay * display, char *name,
@@ -527,6 +543,12 @@
 		if (setDisplayAction(display, o, value))
 			return TRUE;
 		break;
+	case OPACIFY_DISPLAY_OPTION_INIT_TOGGLE:
+		if (compSetBoolOption(o, value)) {
+			od->toggle = o->value.b; 
+			return TRUE;
+		}
+		break;
 	case OPACIFY_DISPLAY_OPTION_TOGGLE_FREEZE:
 		if (compSetBoolOption(o, value))
 		{