summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/cube.c
diff options
context:
space:
mode:
authorracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-27 21:07:48 +0000
committerracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-27 21:07:48 +0000
commite853729cb4382b7702c30ee64e34a404c06c9580 (patch)
tree39e384893acc31eb82dc0332bb8d7afa9316a513 /beryl-plugins/src/cube.c
parentbc1049616aa03f12e8dec2a3f2cc2e9536d0977c (diff)
downloadmarex-dev-e853729cb4382b7702c30ee64e34a404c06c9580.tar.gz
marex-dev-e853729cb4382b7702c30ee64e34a404c06c9580.tar.bz2
Work with beryl desktop manager ARGB backgrounds even when opaque
git-svn-id: file:///beryl/trunk@3267 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/cube.c')
-rw-r--r--beryl-plugins/src/cube.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/beryl-plugins/src/cube.c b/beryl-plugins/src/cube.c
index c47c2f8..69c8bdc 100644
--- a/beryl-plugins/src/cube.c
+++ b/beryl-plugins/src/cube.c
@@ -1602,7 +1602,7 @@ cubePaintScreen(CompScreen * s,
if (cs->grabIndex
|| (cs->opt[CUBE_SCREEN_OPTION_TRANSPARENT].value.b
- && (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged)))
+ && ((cs->desktopOpacity != OPAQUE || s->berylDesktopManaged) || s->berylDesktopManaged)))
mask &= ~PAINT_SCREEN_REGION_MASK;
cs->finalPaint=TRUE;
@@ -1614,7 +1614,7 @@ cubePaintScreen(CompScreen * s,
if ((!mask & PAINT_SCREEN_TRANSFORMED_MASK) &&
(cs->opt[CUBE_SCREEN_OPTION_TRANSPARENT].value.b &&
- (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged)))
+ ((cs->desktopOpacity != OPAQUE || s->berylDesktopManaged) || s->berylDesktopManaged)))
{
cs->finalPaint=!(cs->opt[CUBE_SCREEN_OPTION_STUCK_TO_SCREEN].value.b);
if (cs->sky.name)
@@ -1845,7 +1845,7 @@ cubeMoveViewportAndPaint(CompScreen * s,
cs->finalPaint=!(cs->opt[CUBE_SCREEN_OPTION_STUCK_TO_SCREEN].value.b);
if (dView != 0 && !screenGrabExist(s, "rotate", 0) &&
- ((cs->desktopOpacity != OPAQUE)))
+ (((cs->desktopOpacity != OPAQUE || s->berylDesktopManaged))))
cs->noManaged = TRUE;
@@ -1860,7 +1860,7 @@ cubeMoveViewportAndPaint(CompScreen * s,
if (dx != 0)
cs->finalPaint=!(cs->opt[CUBE_SCREEN_OPTION_STUCK_TO_SCREEN].value.b);
if (dx != 0 && !screenGrabExist(s, "rotate", 0) &&
- cs->desktopOpacity != OPAQUE)
+ (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged))
cs->noManaged = TRUE;
moveScreenViewport(s, dx, 0, FALSE);
(*s->paintTransformedScreen) (s, sAttrib, &s->region, output, mask);
@@ -2108,7 +2108,7 @@ cubePaintTransformedScreen(CompScreen * s,
if (cs->grabIndex || hsize > 4 ||
(cs->opt[CUBE_SCREEN_OPTION_TRANSPARENT].value.b &&
- cs->desktopOpacity != OPAQUE) ||
+ (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged)) ||
compDisplayGetRequestFlagForAny(s->display, "DRAW_ALL_FACES"))
{
int i;
@@ -2205,14 +2205,14 @@ cubePaintTransformedScreen(CompScreen * s,
int num = 0, j;
if (cs->opt[CUBE_SCREEN_OPTION_TRANSPARENT].value.b &&
- cs->desktopOpacity != OPAQUE)
+ (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged))
mask |= PAINT_SCREEN_TRANSFORMED_MASK;
if ((cs->opt[CUBE_SCREEN_OPTION_TRANSPARENT].value.b ||
compDisplayGetRequestFlagForAny(s->display, "DRAW_ALL_FACES"))
&& cs->invert == 1)
{
- if (glIsEnabled(GL_CULL_FACE) && cs->desktopOpacity != OPAQUE)
+ if (glIsEnabled(GL_CULL_FACE) && (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged))
{
disabledCull = TRUE;
glDisable(GL_CULL_FACE);
@@ -2263,7 +2263,7 @@ cubePaintTransformedScreen(CompScreen * s,
if (cs->grabIndex == 0 && (hsize > 2) &&
(cs->invert != 1 || sa.vRotate != 0.0f || sa.yTranslate != 0.0f
|| (cs->opt[CUBE_SCREEN_OPTION_TRANSPARENT].value.b
- && cs->desktopOpacity != OPAQUE))
+ && (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged)))
&& cs->opt[CUBE_SCREEN_OPTION_DRAW_CAPS].value.b
&& !compDisplayGetRequestFlagForAny(s->display, "NO_CUBE_CAPS"))
{
@@ -2321,13 +2321,13 @@ cubePaintTransformedScreen(CompScreen * s,
}
if (glIsEnabled(GL_CULL_FACE)
- && cs->desktopOpacity != OPAQUE && cs->invert == 1)
+ && (cs->desktopOpacity != OPAQUE || s->berylDesktopManaged) && cs->invert == 1)
{
disabledCull = TRUE;
glDisable(GL_CULL_FACE);
}
- if (cs->desktopOpacity != OPAQUE)
+ if ((cs->desktopOpacity != OPAQUE || s->berylDesktopManaged))
{
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -2470,7 +2470,7 @@ cubePaintBackground(CompScreen * s, Region region, unsigned int mask)
&& !(mask & PAINT_BACKGROUND_WITH_STENCIL_MASK))
return;
- if (cs->desktopOpacity != OPAQUE)
+ if ((cs->desktopOpacity != OPAQUE || s->berylDesktopManaged))
{
if (s->desktopWindowCount)
{
@@ -2490,7 +2490,7 @@ cubePaintBackground(CompScreen * s, Region region, unsigned int mask)
(*s->paintBackground) (s, region, mask);
WRAP(cs, s, paintBackground, cubePaintBackground);
- if (cs->desktopOpacity != OPAQUE)
+ if ((cs->desktopOpacity != OPAQUE || s->berylDesktopManaged))
{
if (s->desktopWindowCount)
{