summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-16 16:42:53 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-16 16:42:53 +0000
commit756bdee62f61899c9af7e2885f1181d2bfb107a9 (patch)
treec0b38cc537bfb5435825d78ee9e639c7bb5d4b73
parent18a88ca24821c0d1a69c6fd45517c0f7ce5d7222 (diff)
downloadmarex-dev-756bdee62f61899c9af7e2885f1181d2bfb107a9.tar.gz
marex-dev-756bdee62f61899c9af7e2885f1181d2bfb107a9.tar.bz2
beryl-plugins:
- re-sorted rependencies so that all plugins properly use the fade plugin - make wall avoid fade by using a dependency - converted "before" rules to "after" rules git-svn-id: file:///beryl/trunk@4104 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--beryl-plugins/src/addhelper.c8
-rw-r--r--beryl-plugins/src/animation.c3
-rw-r--r--beryl-plugins/src/cube.c20
-rw-r--r--beryl-plugins/src/fade.c8
-rw-r--r--beryl-plugins/src/group/init.c3
-rw-r--r--beryl-plugins/src/inputzoom.c9
-rw-r--r--beryl-plugins/src/move.c8
-rw-r--r--beryl-plugins/src/opacify.c8
-rw-r--r--beryl-plugins/src/resize.c8
-rw-r--r--beryl-plugins/src/switcher.c3
-rw-r--r--beryl-plugins/src/wall.c21
11 files changed, 49 insertions, 50 deletions
diff --git a/beryl-plugins/src/addhelper.c b/beryl-plugins/src/addhelper.c
index 5af2e50..f86fa8f 100644
--- a/beryl-plugins/src/addhelper.c
+++ b/beryl-plugins/src/addhelper.c
@@ -399,6 +399,10 @@ static void addhelperFini(CompPlugin * p)
freeDisplayPrivateIndex(displayPrivateIndex);
}
+CompPluginDep addhelperDeps[] = {
+ {CompPluginRuleAfter, "fade"}
+};
+
CompPluginVTable addhelperVTable = {
"addhelper",
N_("AddHelper"),
@@ -415,8 +419,8 @@ CompPluginVTable addhelperVTable = {
addhelperSetDisplayOptions,
0, //addhelperGetScreenOptions,
0, //addhelperSetScreenOptions,
- 0,
- 0,
+ addhelperDeps,
+ sizeof(addhelperDeps) / sizeof(addhelperDeps[0]),
0,
0,
BERYL_ABI_INFO,
diff --git a/beryl-plugins/src/animation.c b/beryl-plugins/src/animation.c
index 2041df3..cf45104 100644
--- a/beryl-plugins/src/animation.c
+++ b/beryl-plugins/src/animation.c
@@ -10051,8 +10051,7 @@ static void animFini(CompPlugin * p)
}
CompPluginDep animDeps[] = {
- {CompPluginRuleAfter, "decoration"},
- {CompPluginRuleAfter, "wall"}
+ {CompPluginRuleAfter, "decoration"}
};
CompPluginVTable animVTable = {
diff --git a/beryl-plugins/src/cube.c b/beryl-plugins/src/cube.c
index 5fe0929..bad5626 100644
--- a/beryl-plugins/src/cube.c
+++ b/beryl-plugins/src/cube.c
@@ -3145,20 +3145,12 @@ static void cubeFini(CompPlugin * p)
}
CompPluginDep cubeDeps[] = {
- {CompPluginRuleAfter, "animation"}
- ,
- {CompPluginRuleAfter, "decoration"}
- ,
- {CompPluginRuleAfter, "fade"}
- ,
- {CompPluginRuleAfter, "wobbly"}
- ,
- {CompPluginRuleAfter, "inputzoom"}
- ,
- {CompPluginRuleAfter, "3d"}
- ,
- {CompPluginRuleAfter, "wall"}
- ,
+ {CompPluginRuleAfter, "animation"},
+ {CompPluginRuleAfter, "decoration"},
+ {CompPluginRuleAfter, "fade"},
+ {CompPluginRuleAfter, "wobbly"},
+ {CompPluginRuleAfter, "inputzoom"},
+ {CompPluginRuleAfter, "3d"},
{CompPluginRuleAfterCategory, "imageformat"}
,
};
diff --git a/beryl-plugins/src/fade.c b/beryl-plugins/src/fade.c
index 5313938..a009742 100644
--- a/beryl-plugins/src/fade.c
+++ b/beryl-plugins/src/fade.c
@@ -421,12 +421,8 @@ static void fadeFini(CompPlugin * p)
}
CompPluginDep fadeDeps[] = {
- {CompPluginRuleAfter, "animation"}
- ,
- {CompPluginRuleAfter, "decoration"}
- ,
- {CompPluginRuleAfter, "wobbly"}
- ,
+ {CompPluginRuleAfter, "animation"},
+ {CompPluginRuleAfter, "wall"}
};
static CompPluginVTable fadeVTable = {
diff --git a/beryl-plugins/src/group/init.c b/beryl-plugins/src/group/init.c
index cc640cb..8f0ac6a 100644
--- a/beryl-plugins/src/group/init.c
+++ b/beryl-plugins/src/group/init.c
@@ -342,7 +342,8 @@ void groupFini(CompPlugin * p)
*/
static CompPluginDep groupDeps[] = {
- {CompPluginRuleAfter, "place"}
+ {CompPluginRuleAfter, "place"},
+ {CompPluginRuleAfter, "fade"}
};
static GroupDesc groupGroupDescs[] = {
diff --git a/beryl-plugins/src/inputzoom.c b/beryl-plugins/src/inputzoom.c
index 471d1f9..c11b67e 100644
--- a/beryl-plugins/src/inputzoom.c
+++ b/beryl-plugins/src/inputzoom.c
@@ -1165,11 +1165,6 @@ static void zoomFini(CompPlugin * p)
freeDisplayPrivateIndex(displayPrivateIndex);
}
-CompPluginDep zoomDeps[] = {
- {CompPluginRuleBefore, "cube"}
- ,
-};
-
CompPluginFeature zoomFeatures[] = {
{"zoom"}
};
@@ -1190,8 +1185,8 @@ CompPluginVTable zoomVTable = {
zoomSetDisplayOption,
zoomGetScreenOptions,
zoomSetScreenOption,
- zoomDeps,
- sizeof(zoomDeps) / sizeof(zoomDeps[0]),
+ 0,
+ 0,
zoomFeatures,
sizeof(zoomFeatures) / sizeof(zoomFeatures[0]),
BERYL_ABI_INFO,
diff --git a/beryl-plugins/src/move.c b/beryl-plugins/src/move.c
index 94535d7..f764a85 100644
--- a/beryl-plugins/src/move.c
+++ b/beryl-plugins/src/move.c
@@ -965,6 +965,10 @@ static void moveFini(CompPlugin * p)
freeDisplayPrivateIndex(displayPrivateIndex);
}
+CompPluginDep moveDeps[] = {
+ {CompPluginRuleAfter, "fade"}
+};
+
CompPluginVTable moveVTable = {
"move",
N_("Move Window"),
@@ -981,8 +985,8 @@ CompPluginVTable moveVTable = {
moveSetDisplayOption,
0, /* GetScreenOptions */
0, /* SetScreenOption */
- NULL,
- 0,
+ moveDeps,
+ sizeof(moveDeps) / sizeof(moveDeps[0]),
0,
0,
BERYL_ABI_INFO,
diff --git a/beryl-plugins/src/opacify.c b/beryl-plugins/src/opacify.c
index ec49f1e..37b0e5f 100644
--- a/beryl-plugins/src/opacify.c
+++ b/beryl-plugins/src/opacify.c
@@ -774,6 +774,10 @@ static void opacifyFini(CompPlugin * p)
freeDisplayPrivateIndex(displayPrivateIndex);
}
+CompPluginDep opacifyDeps[] = {
+ {CompPluginRuleAfter, "fade"}
+};
+
CompPluginVTable opacifyVTable = {
"opacify",
N_("Opacify"),
@@ -790,8 +794,8 @@ CompPluginVTable opacifyVTable = {
opacifySetDisplayOptions,
opacifyGetScreenOptions,
opacifySetScreenOptions,
- 0,
- 0,
+ opacifyDeps,
+ sizeof(opacifyDeps) / sizeof(opacifyDeps[0]),
0,
0,
BERYL_ABI_INFO,
diff --git a/beryl-plugins/src/resize.c b/beryl-plugins/src/resize.c
index e38e1de..dba4005 100644
--- a/beryl-plugins/src/resize.c
+++ b/beryl-plugins/src/resize.c
@@ -1506,6 +1506,10 @@ static void resizeFini(CompPlugin * p)
freeDisplayPrivateIndex(displayPrivateIndex);
}
+CompPluginDep resizeDeps[] = {
+ {CompPluginRuleAfter, "fade"}
+};
+
CompPluginFeature resizeFeatures[] = {
{"resize"}
};
@@ -1526,8 +1530,8 @@ CompPluginVTable resizeVTable = {
resizeSetDisplayOption,
0, /* GetScreenOptions */
0, /* SetScreenOption */
- NULL,
- 0,
+ resizeDeps,
+ sizeof(resizeDeps) / sizeof(resizeDeps[0]),
resizeFeatures,
sizeof(resizeFeatures) / sizeof(resizeFeatures[0]),
BERYL_ABI_INFO,
diff --git a/beryl-plugins/src/switcher.c b/beryl-plugins/src/switcher.c
index 5d57a48..ae55368 100644
--- a/beryl-plugins/src/switcher.c
+++ b/beryl-plugins/src/switcher.c
@@ -2803,7 +2803,8 @@ static void switchFini(CompPlugin * p)
CompPluginDep setDeps[] = {
{CompPluginRuleAfter, "cube"},
- {CompPluginRuleAfter, "decoration"},
+ {CompPluginRuleAfter, "fade"},
+ {CompPluginRuleAfter, "decoration"}
};
CompPluginVTable switchVTable = {
diff --git a/beryl-plugins/src/wall.c b/beryl-plugins/src/wall.c
index a942f44..6e75613 100644
--- a/beryl-plugins/src/wall.c
+++ b/beryl-plugins/src/wall.c
@@ -174,7 +174,7 @@ typedef struct _WallScreen
PaintScreenProc paintScreen;
PreparePaintScreenProc preparePaintScreen;
PaintTransformedScreenProc paintTransformedScreen;
- DrawWindowProc drawWindow;
+ PaintWindowProc paintWindow;
DamageWindowRectProc damageWindowRect;
WindowGrabNotifyProc windowGrabNotify;
WindowUngrabNotifyProc windowUngrabNotify;
@@ -1625,16 +1625,16 @@ static void wallPaintTransformedScreen(CompScreen * s,
}
static Bool
-wallDrawWindow(CompWindow * w,
+wallPaintWindow(CompWindow * w,
+ const WindowPaintAttrib *attrib,
const CompTransform *transform,
- const FragmentAttrib * attrib,
Region region, unsigned int mask)
{
WALL_SCREEN(w->screen);
WALL_DISPLAY(w->screen->display);
Bool status;
- FragmentAttrib pA = *attrib;
+ WindowPaintAttrib pA = *attrib;
if (ws->expoCam > 0.0)
{
@@ -1705,9 +1705,9 @@ wallDrawWindow(CompWindow * w,
COLOR);
}
- UNWRAP(ws, w->screen, drawWindow);
- status = (*w->screen->drawWindow) (w, transform, &pA, region, mask);
- WRAP(ws, w->screen, drawWindow, wallDrawWindow);
+ UNWRAP(ws, w->screen, paintWindow);
+ status = (*w->screen->paintWindow) (w, &pA, transform, region, mask);
+ WRAP(ws, w->screen, paintWindow, wallPaintWindow);
return status;
}
@@ -2251,7 +2251,7 @@ static Bool wallInitScreen(CompPlugin * p, CompScreen * s)
WRAP(ws, s, donePaintScreen, wallDonePaintScreen);
WRAP(ws, s, paintTransformedScreen, wallPaintTransformedScreen);
WRAP(ws, s, preparePaintScreen, wallPreparePaintScreen);
- WRAP(ws, s, drawWindow, wallDrawWindow);
+ WRAP(ws, s, paintWindow, wallPaintWindow);
WRAP(ws, s, windowGrabNotify, wallWindowGrabNotify);
WRAP(ws, s, windowUngrabNotify, wallWindowUngrabNotify);
WRAP(ws, s, damageWindowRect, wallDamageWindowRect);
@@ -2274,7 +2274,7 @@ static void wallFiniScreen(CompPlugin * p, CompScreen * s)
UNWRAP(ws, s, donePaintScreen);
UNWRAP(ws, s, paintTransformedScreen);
UNWRAP(ws, s, preparePaintScreen);
- UNWRAP(ws, s, drawWindow);
+ UNWRAP(ws, s, paintWindow);
UNWRAP(ws, s, windowGrabNotify);
UNWRAP(ws, s, windowUngrabNotify);
UNWRAP(ws, s, damageWindowRect);
@@ -2329,8 +2329,7 @@ CompPluginFeature wallFeatures[] = {
CompPluginDep wallDeps[] = {
{CompPluginRuleAfter, "decoration"},
- {CompPluginRuleAfter, "inputzoom"},
- {CompPluginRuleAfter, "group"}
+ {CompPluginRuleAfter, "inputzoom"}
};
CompPluginVTable wallVTable = {