summaryrefslogtreecommitdiff
path: root/beryl-plugins/src
diff options
context:
space:
mode:
authorixce <ixce@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-31 18:54:57 +0000
committerixce <ixce@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-31 18:54:57 +0000
commit91eedb1d86befd286876912d6c602afeb8878561 (patch)
tree5bffeb900440fd7715f4a74f77ab4e683660d9c9 /beryl-plugins/src
parent9554e4819a7cf71708c68520be0a0ed0cc9b9c7f (diff)
downloadmarex-dev-91eedb1d86befd286876912d6c602afeb8878561.tar.gz
marex-dev-91eedb1d86befd286876912d6c602afeb8878561.tar.bz2
* Output devices handling improvements (David Reveman), fix typos
git-svn-id: file:///beryl/trunk@933 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src')
-rw-r--r--beryl-plugins/src/cube.c4
-rw-r--r--beryl-plugins/src/rotate.c8
-rw-r--r--beryl-plugins/src/scale.c6
-rw-r--r--beryl-plugins/src/switcher.c5
4 files changed, 11 insertions, 12 deletions
diff --git a/beryl-plugins/src/cube.c b/beryl-plugins/src/cube.c
index 6a6f4c0..ebcef31 100644
--- a/beryl-plugins/src/cube.c
+++ b/beryl-plugins/src/cube.c
@@ -1621,7 +1621,7 @@ cubePaintTransformedScreen (CompScreen * s,
if (cs->sky.name)
{
- if (mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK)
+ if ((mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK) && !output)
glClear (GL_STENCIL_BUFFER_BIT);
screenLighting (s, FALSE);
@@ -1644,7 +1644,7 @@ cubePaintTransformedScreen (CompScreen * s,
glCallList (cs->skyListId);
glPopMatrix ();
}
- else
+ else if (!output)
{
if (mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK)
glClear (GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c
index 62d3afa..46b50e9 100644
--- a/beryl-plugins/src/rotate.c
+++ b/beryl-plugins/src/rotate.c
@@ -1028,7 +1028,7 @@ rotateInitiate (CompDisplay * d,
{
ROTATE_SCREEN (s);
- if (s->hsize < 4)
+ if (s->hsize < 2)
return FALSE;
if (rs->rotateHandle && rs->grabWindow)
@@ -1139,7 +1139,7 @@ rotate (CompDisplay * d,
ROTATE_SCREEN (s);
- if (s->hsize < 4)
+ if (s->hsize < 2)
return FALSE;
if (otherScreenGrabExist (s, "rotate", "move", "switcher", "cube", 0))
@@ -1266,7 +1266,7 @@ rotateWithWindow (CompDisplay * d,
ROTATE_SCREEN (s);
- if (s->hsize < 4)
+ if (s->hsize < 2)
return FALSE;
direction = getIntOptionNamed (option, nOption, "direction", 0);
@@ -1725,7 +1725,7 @@ rotateEdgeFlip (CompScreen * s,
ROTATE_DISPLAY (s->display);
- if (s->hsize < 4)
+ if (s->hsize < 2)
return;
if (otherScreenGrabExist (s, "rotate", "move", 0))
diff --git a/beryl-plugins/src/scale.c b/beryl-plugins/src/scale.c
index b56d2c2..c094ce7 100644
--- a/beryl-plugins/src/scale.c
+++ b/beryl-plugins/src/scale.c
@@ -654,6 +654,9 @@ isScaleWin (CompWindow * w)
if (w->state & CompWindowStateShadedMask)
return FALSE;
+ if (!w->mapNum || w->attrib.map_state != IsViewable)
+ return FALSE;
+
if (!(ss->wMask & w->type))
return FALSE;
@@ -2845,9 +2848,6 @@ scaleInit (CompPlugin * p)
if (displayPrivateIndex < 0)
return FALSE;
- if (!w->mapNum || w->attrib.map_state != IsViewable)
- return FALSE;
-
return TRUE;
}
diff --git a/beryl-plugins/src/switcher.c b/beryl-plugins/src/switcher.c
index 831ca8b..a6cc896 100644
--- a/beryl-plugins/src/switcher.c
+++ b/beryl-plugins/src/switcher.c
@@ -1549,9 +1549,8 @@ switchPaintScreen (CompScreen * s,
switcher->destroyed = saveDestroyed;
glPushMatrix ();
- glTranslatef (-0.5f, -0.5f, -DEFAULT_Z_CAMERA);
- glScalef (1.0f / s->width, -1.0f / s->height, 1.0f);
- glTranslatef (0.0f, -s->height, 0.0f);
+
+ prepareXCoords (s, output, -DEFAULT_Z_CAMERA);
if (!switcher->destroyed &&
switcher->attrib.map_state == IsViewable && switcher->damaged)