summaryrefslogtreecommitdiff
path: root/beryl-plugins-unsupported/src/plane.c
diff options
context:
space:
mode:
Diffstat (limited to 'beryl-plugins-unsupported/src/plane.c')
-rw-r--r--beryl-plugins-unsupported/src/plane.c35
1 files changed, 16 insertions, 19 deletions
diff --git a/beryl-plugins-unsupported/src/plane.c b/beryl-plugins-unsupported/src/plane.c
index 353836a..241f374 100644
--- a/beryl-plugins-unsupported/src/plane.c
+++ b/beryl-plugins-unsupported/src/plane.c
@@ -230,7 +230,7 @@ static Bool end_move(void *data)
ps->timeout_handle = 0;
- focusDefaultWindow(screen->display);
+ focusDefaultWindow(screen);
return FALSE;
}
@@ -315,6 +315,7 @@ static void planePreparePaintScreen(CompScreen * s, int msSinceLastPaint)
static void
planePaintTransformedScreen(CompScreen * screen,
const ScreenPaintAttrib * sAttrib,
+ const CompTransform * transform,
Region region, int output, unsigned int mask)
{
PLANE_SCREEN(screen);
@@ -333,15 +334,14 @@ planePaintTransformedScreen(CompScreen * screen,
ScreenPaintAttrib sa = *sAttrib;
- (*screen->paintTransformedScreen) (screen, &sa, region, output, mask);
+ (*screen->paintTransformedScreen) (screen, &sa, transform, region, output, mask);
if (sa.zCamera != ps->initZoom)
{
/* If we are not moving zoom back LESS when drawing the current viewport than the others, gives a zoom of sorts to the selected viewport */
sa.zCamera = -1.5;
- (*screen->paintTransformedScreen) (screen,
- &sa, region, output, mask);
+ (*screen->paintTransformedScreen) (screen, &sa, transform, region, output, mask);
WRAP(ps, screen, paintTransformedScreen,
planePaintTransformedScreen);
@@ -407,13 +407,13 @@ planePaintTransformedScreen(CompScreen * screen,
{
glTranslatef(dx, dy, 0.0);
- (*screen->paintTransformedScreen) (screen, sAttrib, mask);
+ (*screen->paintTransformedScreen) (screen, sAttrib, transform, mask);
glTranslatef(-1.0, 0.0, 0.0);
moveScreenViewport(screen, 1, 0, FALSE);
- (*screen->paintTransformedScreen) (screen, sAttrib, mask);
+ (*screen->paintTransformedScreen) (screen, sAttrib, transform, mask);
moveScreenViewport(screen, -1, 0, FALSE);
}
@@ -421,13 +421,13 @@ planePaintTransformedScreen(CompScreen * screen,
{
glTranslatef(dx, dy, 0.0);
- (*screen->paintTransformedScreen) (screen, sAttrib, mask);
+ (*screen->paintTransformedScreen) (screen, sAttrib, transform, mask);
glTranslatef(1.0, 0.0, 0.0);
moveScreenViewport(screen, -1, 0, FALSE);
- (*screen->paintTransformedScreen) (screen, sAttrib, mask);
+ (*screen->paintTransformedScreen) (screen, sAttrib, transform, mask);
moveScreenViewport(screen, 1, 0, FALSE);
}
@@ -450,7 +450,7 @@ planePaintTransformedScreen(CompScreen * screen,
/* Provide the effect of scrolling rather than snapping */
glTranslatef(dx, -dy, 0.0);
- (*screen->paintTransformedScreen) (screen, sAttrib, region,
+ (*screen->paintTransformedScreen) (screen, sAttrib, transform, region,
output, mask);
/* Draw viewports a bit further apart if we are 'zoomed' */
float s1 = 1.05;
@@ -472,8 +472,7 @@ planePaintTransformedScreen(CompScreen * screen,
glTranslatef(s1, 0.0, 0.0);
moveScreenViewport(screen, -1, 0, FALSE);
}
- (*screen->paintTransformedScreen) (screen, sAttrib, region,
- output, mask);
+ (*screen->paintTransformedScreen) (screen, sAttrib, transform, region, output, mask);
if (dy > 0)
{
glTranslatef(0.0, s1, 0.0);
@@ -484,8 +483,7 @@ planePaintTransformedScreen(CompScreen * screen,
glTranslatef(0.0, s2, 0.0);
moveScreenViewport(screen, 0, -1, FALSE);
}
- (*screen->paintTransformedScreen) (screen, sAttrib, region,
- output, mask);
+ (*screen->paintTransformedScreen) (screen, sAttrib, region, transform, output, mask);
if (dx > 0)
{
glTranslatef(s1, 0.0, 0.0);
@@ -496,8 +494,7 @@ planePaintTransformedScreen(CompScreen * screen,
glTranslatef(s2, 0.0, 0.0);
moveScreenViewport(screen, 1, 0, FALSE);
}
- (*screen->paintTransformedScreen) (screen, sAttrib, region,
- output, mask);
+ (*screen->paintTransformedScreen) (screen, sAttrib, region, transform, output, mask);
if (dy > 0)
{
glTranslatef(0.0, s2, 0.0);
@@ -523,8 +520,7 @@ planePaintTransformedScreen(CompScreen * screen,
{
glTranslatef(i, j, 0);
moveScreenViewport(screen, -i, -j, FALSE);
- (*screen->paintTransformedScreen) (screen,
- sAttrib,
+ (*screen->paintTransformedScreen) (screen, sAttrib, transform,
region, output, mask);
glTranslatef(-i, -j, 0);
moveScreenViewport(screen, i, j, FALSE);
@@ -553,7 +549,8 @@ static void planeDonePaintScreen(CompScreen * s)
static Bool
planePaintScreen(CompScreen * s,
- const ScreenPaintAttrib * sAttrib,
+ const ScreenPaintAttrib * sAttrib,
+ const CompTransform * transform,
Region region, int output, unsigned int mask)
{
Bool status;
@@ -567,7 +564,7 @@ planePaintScreen(CompScreen * s,
}
UNWRAP(ps, s, paintScreen);
- status = (*s->paintScreen) (s, sAttrib, region, output, mask);
+ status = (*s->paintScreen) (s, sAttrib, transform, region, output, mask);
WRAP(ps, s, paintScreen, planePaintScreen);
return status;