beryl-*

-add basic support for plugin categories, haven't done libbs stuff yet


git-svn-id: file:///beryl/trunk@1759 d7aaf104-2d23-0410-ae22-9d23157bf5a3

36 files changed, 91 insertions, 39 deletions

diff --git a/beryl-core/include/beryl.h b/beryl-core/include/beryl.h
index 074de61..88f2672 100644
--- a/beryl-core/include/beryl.h
+++ b/beryl-core/include/beryl.h
@@ -26,7 +26,7 @@
 #ifndef _BERYL_H
 #define _BERYL_H
 
-#define BERYL_VERSION 34
+#define BERYL_VERSION 35
 
 #define BERYL_ABI_INFO \
     BERYL_VERSION, \
@@ -2552,6 +2552,7 @@ typedef void (*FiniPluginProc) (CompPlugin *plugin);
 typedef enum {
     CompPluginRuleBefore,
     CompPluginRuleAfter,
+	CompPluginRuleAfterCategory,
     CompPluginRuleRequire
 } CompPluginRule;
 
@@ -2606,6 +2607,8 @@ typedef struct _CompPluginVTable {
     unsigned int  struct_icon_size;
 
     char * gettext_domain;
+
+	char * category;
 } CompPluginVTable;
 
 typedef CompPluginVTable *(*PluginGetInfoProc) (void);
diff --git a/beryl-core/src/plugin.c b/beryl-core/src/plugin.c
index 8e2d14b..1aa217e 100644
--- a/beryl-core/src/plugin.c
+++ b/beryl-core/src/plugin.c
@@ -496,6 +496,13 @@ static int comparePluginDeps(CompPlugin * new, CompPlugin * existing)
 				return -1;
 			}
 			break;
+		case CompPluginRuleAfterCategory:
+			if (!strcmp(deps->name, existing->vTable->category)) {
+				pr_debug_verbose(stderr, _("%s: '%s' plugin must be loaded after category '%s'"
+							" which contains '%s' plugin"),programName,new->vTable->name,
+						deps->name,existing->vTable->name);
+				return 1;
+			}
 		case CompPluginRuleAfter:
 			if (!strcmp(deps->name, existing->vTable->name)) {
 				pr_debug_verbose(stderr,
diff --git a/beryl-dbus/src/dbus.c b/beryl-dbus/src/dbus.c
index 448eff4..b67fbcf 100644
--- a/beryl-dbus/src/dbus.c
+++ b/beryl-dbus/src/dbus.c
@@ -1346,7 +1346,8 @@ CompPluginVTable dbusVTable = {
     0, /* Features */
     0, /* nFeatures */
     BERYL_ABI_INFO,
-    "beryl-dbus"
+    "beryl-dbus",
+	"misc"
 };
 
 CompPluginVTable *
diff --git a/beryl-plugins/src/3d.c b/beryl-plugins/src/3d.c
index edf68af..0b09787 100644
--- a/beryl-plugins/src/3d.c
+++ b/beryl-plugins/src/3d.c
@@ -1044,7 +1044,8 @@ static CompPluginVTable tdVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"effects"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/animation.c b/beryl-plugins/src/animation.c
index 263fc21..5f5e553 100644
--- a/beryl-plugins/src/animation.c
+++ b/beryl-plugins/src/animation.c
@@ -6536,7 +6536,8 @@ CompPluginVTable animVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"effects"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/annotate.c b/beryl-plugins/src/annotate.c
index 37aacfd..784bcb8 100644
--- a/beryl-plugins/src/annotate.c
+++ b/beryl-plugins/src/annotate.c
@@ -1444,7 +1444,8 @@ static CompPluginVTable annoVTable = {
 	0,			/* Features */
 	0,			/* nFeatures */
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"misc"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/bench.c b/beryl-plugins/src/bench.c
index c8defe3..761d29d 100644
--- a/beryl-plugins/src/bench.c
+++ b/beryl-plugins/src/bench.c
@@ -717,7 +717,8 @@ CompPluginVTable benchVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"misc"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/blurfx.h b/beryl-plugins/src/blurfx.h
index d692a25..6b9cb85 100644
--- a/beryl-plugins/src/blurfx.h
+++ b/beryl-plugins/src/blurfx.h
@@ -381,7 +381,8 @@ CompPluginVTable blurfxVTable = {
     0,
     0,
     BERYL_ABI_INFO,
-    "beryl-plugins"
+    "beryl-plugins",
+	"effects"
 };
 
 #endif
diff --git a/beryl-plugins/src/clone.c b/beryl-plugins/src/clone.c
index 18d7aa7..347993c 100644
--- a/beryl-plugins/src/clone.c
+++ b/beryl-plugins/src/clone.c
@@ -828,7 +828,8 @@ CompPluginVTable cloneVTable = {
 	0,			/* Features */
 	0,			/* nFeatures */
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"desktop"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/crashhandler.c b/beryl-plugins/src/crashhandler.c
index 1c8234e..94c7650 100644
--- a/beryl-plugins/src/crashhandler.c
+++ b/beryl-plugins/src/crashhandler.c
@@ -272,7 +272,8 @@ CompPluginVTable crashhandlerVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"core"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/cube.c b/beryl-plugins/src/cube.c
index 1f29041..f28b44a 100644
--- a/beryl-plugins/src/cube.c
+++ b/beryl-plugins/src/cube.c
@@ -2965,6 +2965,7 @@ CompPluginDep cubeDeps[] = {
 	,
 	{CompPluginRuleAfter, "3d"}
 	,
+		{CompPluginRuleAfterCategory, "imageformat"},
 };
 
 CompPluginFeature cubeFeatures[] = {
@@ -2994,7 +2995,8 @@ CompPluginVTable cubeVTable = {
 	cubeFeatures,
 	sizeof(cubeFeatures) / sizeof(cubeFeatures[0]),
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"desktop"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/decoration.c b/beryl-plugins/src/decoration.c
index 3afdff3..ed7dd6f 100644
--- a/beryl-plugins/src/decoration.c
+++ b/beryl-plugins/src/decoration.c
@@ -1618,7 +1618,8 @@ static CompPluginVTable decorVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"effects"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/fade.c b/beryl-plugins/src/fade.c
index 2799177..98e4600 100644
--- a/beryl-plugins/src/fade.c
+++ b/beryl-plugins/src/fade.c
@@ -415,7 +415,8 @@ static CompPluginVTable fadeVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"effects"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/group.c b/beryl-plugins/src/group.c
index cfa8aba..f8e3aac 100644
--- a/beryl-plugins/src/group.c
+++ b/beryl-plugins/src/group.c
@@ -2141,7 +2141,8 @@ CompPluginVTable groupVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 /*
diff --git a/beryl-plugins/src/inputzoom.c b/beryl-plugins/src/inputzoom.c
index d9ca8e4..c0c2c2b 100644
--- a/beryl-plugins/src/inputzoom.c
+++ b/beryl-plugins/src/inputzoom.c
@@ -998,7 +998,8 @@ CompPluginVTable zoomVTable = {
 	zoomFeatures,
 	sizeof(zoomFeatures) / sizeof(zoomFeatures[0]),
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"accessability"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/move.c b/beryl-plugins/src/move.c
index 2121596..20bf7ba 100644
--- a/beryl-plugins/src/move.c
+++ b/beryl-plugins/src/move.c
@@ -917,7 +917,8 @@ CompPluginVTable moveVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/neg.c b/beryl-plugins/src/neg.c
index 1505db7..311418a 100644
--- a/beryl-plugins/src/neg.c
+++ b/beryl-plugins/src/neg.c
@@ -919,7 +919,8 @@ CompPluginVTable NEGVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"accessability"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/place.c b/beryl-plugins/src/place.c
index 22829cc..b1732e5 100644
--- a/beryl-plugins/src/place.c
+++ b/beryl-plugins/src/place.c
@@ -1243,7 +1243,8 @@ static CompPluginVTable placeVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/plane.c b/beryl-plugins/src/plane.c
index dc891ea..cea9303 100644
--- a/beryl-plugins/src/plane.c
+++ b/beryl-plugins/src/plane.c
@@ -1055,7 +1055,8 @@ CompPluginVTable planeVTable = {
 	planeFeatures,
 	sizeof(planeFeatures) / sizeof(planeFeatures[0]),
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"desktop"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/png.c b/beryl-plugins/src/png.c
index 5078fe5..b483c64 100644
--- a/beryl-plugins/src/png.c
+++ b/beryl-plugins/src/png.c
@@ -534,7 +534,8 @@ CompPluginVTable pngVTable = {
     0, /* Features */
     0,  /* nFeatures */
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"imageformat"
 };
 
 CompPluginVTable *
diff --git a/beryl-plugins/src/put.c b/beryl-plugins/src/put.c
index 72c8ee5..0f7afb7 100644
--- a/beryl-plugins/src/put.c
+++ b/beryl-plugins/src/put.c
@@ -2432,7 +2432,8 @@ CompPluginVTable putVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/resize.c b/beryl-plugins/src/resize.c
index fbd14e1..39410c7 100644
--- a/beryl-plugins/src/resize.c
+++ b/beryl-plugins/src/resize.c
@@ -1437,7 +1437,8 @@ CompPluginVTable resizeVTable = {
 	resizeFeatures,
 	sizeof(resizeFeatures) / sizeof(resizeFeatures[0]),
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c
index d9786e5..80eb89a 100644
--- a/beryl-plugins/src/rotate.c
+++ b/beryl-plugins/src/rotate.c
@@ -2881,7 +2881,8 @@ CompPluginVTable rotateVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"desktop"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/scale.c b/beryl-plugins/src/scale.c
index 0ee1372..8b97d22 100644
--- a/beryl-plugins/src/scale.c
+++ b/beryl-plugins/src/scale.c
@@ -3288,7 +3288,8 @@ CompPluginVTable scaleVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/screenshot.c b/beryl-plugins/src/screenshot.c
index 2a31833..6c2ca18 100644
--- a/beryl-plugins/src/screenshot.c
+++ b/beryl-plugins/src/screenshot.c
@@ -499,6 +499,10 @@ static void shotFini(CompPlugin * p)
 		freeDisplayPrivateIndex(displayPrivateIndex);
 }
 
+CompPluginDep shotDeps[] = {
+	{CompPluginRuleAfterCategory, "imageformat"},
+};
+
 static CompPluginVTable shotVTable = {
 	"screenshot",
 	N_("Screenshot"),
@@ -515,12 +519,13 @@ static CompPluginVTable shotVTable = {
 	shotSetDisplayOption,
 	0,			/* GetScreenOptions */
 	0,			/* SetScreenOption */
-	NULL,
-	0,
+	shotDeps,
+	sizeof(shotDeps)/sizeof(shotDeps[0]),
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"misc"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/settings.c b/beryl-plugins/src/settings.c
index f8b9a93..6fe9fb4 100644
--- a/beryl-plugins/src/settings.c
+++ b/beryl-plugins/src/settings.c
@@ -538,7 +538,8 @@ CompPluginVTable setVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"settings"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/showdesktop.c b/beryl-plugins/src/showdesktop.c
index 7865c9e..9174263 100644
--- a/beryl-plugins/src/showdesktop.c
+++ b/beryl-plugins/src/showdesktop.c
@@ -1181,7 +1181,8 @@ static CompPluginVTable showdesktopVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"desktop"
 };
 
 /* send plugin info */
diff --git a/beryl-plugins/src/splash.c b/beryl-plugins/src/splash.c
index f5cbe49..845e1f1 100644
--- a/beryl-plugins/src/splash.c
+++ b/beryl-plugins/src/splash.c
@@ -895,6 +895,9 @@ static void splashFini(CompPlugin * p)
 		freeDisplayPrivateIndex(displayPrivateIndex);
 }
 
+CompPluginDep splashDeps[] = {
+		{CompPluginRuleAfterCategory, "imageloader"},
+};
 
 CompPluginVTable splashVTable = {
 	"splash",
@@ -912,12 +915,13 @@ CompPluginVTable splashVTable = {
 	splashSetDisplayOption,
 	0,
 	0,
-	0,
-	0,
+	splashDeps,
+	sizeof(splashDeps) / sizeof(splashDeps[0]),
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"misc"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/state.c b/beryl-plugins/src/state.c
index 3e1423a..d15f4c4 100644
--- a/beryl-plugins/src/state.c
+++ b/beryl-plugins/src/state.c
@@ -1205,7 +1205,8 @@ static CompPluginVTable stateVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/svg.c b/beryl-plugins/src/svg.c
index 4bbe922..f0bb6ea 100644
--- a/beryl-plugins/src/svg.c
+++ b/beryl-plugins/src/svg.c
@@ -236,7 +236,8 @@ CompPluginVTable svgVTable = {
     0, /* Features */
     0, /* nFeatures */
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"imageformat"
 };
 
 CompPluginVTable *
diff --git a/beryl-plugins/src/switcher.c b/beryl-plugins/src/switcher.c
index d47e087..0e790d7 100644
--- a/beryl-plugins/src/switcher.c
+++ b/beryl-plugins/src/switcher.c
@@ -2240,7 +2240,8 @@ CompPluginVTable switchVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"wm"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/trailfocus.c b/beryl-plugins/src/trailfocus.c
index c92c0b7..8fa46d5 100644
--- a/beryl-plugins/src/trailfocus.c
+++ b/beryl-plugins/src/trailfocus.c
@@ -172,7 +172,8 @@ static CompPluginVTable trailFocusVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"effects"
 };
 
 
diff --git a/beryl-plugins/src/water.c b/beryl-plugins/src/water.c
index c67a656..04c9e35 100644
--- a/beryl-plugins/src/water.c
+++ b/beryl-plugins/src/water.c
@@ -2195,7 +2195,8 @@ static CompPluginVTable waterVTable = {
 	0,
 	0,
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"misc"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/wobbly.c b/beryl-plugins/src/wobbly.c
index bc3e9ee..c50f627 100644
--- a/beryl-plugins/src/wobbly.c
+++ b/beryl-plugins/src/wobbly.c
@@ -3792,7 +3792,8 @@ CompPluginVTable wobblyVTable = {
 	wobblyFeatures,
 	sizeof(wobblyFeatures) / sizeof(wobblyFeatures[0]),
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"effects"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-plugins/src/zoom.c b/beryl-plugins/src/zoom.c
index 874701c..ab71c01 100644
--- a/beryl-plugins/src/zoom.c
+++ b/beryl-plugins/src/zoom.c
@@ -1071,7 +1071,8 @@ CompPluginVTable zoomVTable = {
 	zoomFeatures,
 	sizeof(zoomFeatures) / sizeof(zoomFeatures[0]),
 	BERYL_ABI_INFO,
-	"beryl-plugins"
+	"beryl-plugins",
+	"accessability"
 };
 
 CompPluginVTable *getCompPluginInfo(void)
diff --git a/beryl-vidcap/capture.c b/beryl-vidcap/capture.c
index 3ce8e3f..cb2f60f 100644
--- a/beryl-vidcap/capture.c
+++ b/beryl-vidcap/capture.c
@@ -655,7 +655,8 @@ static CompPluginVTable captureVTable = {
     0,
     0,
     BERYL_ABI_INFO,
-    "beryl-vidcap"
+    "beryl-vidcap",
+	"misc"
 };
 
 CompPluginVTable *