summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-13 11:39:23 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-13 11:39:23 +0000
commit2937961c36f310074d00fc89ee8cd24e6b26b961 (patch)
tree2de4b97996348478b1af957f8009911102019fad
parentf50fd20d818098d0df4c17456cf78d3ba0f3fec4 (diff)
downloadmarex-dev-2937961c36f310074d00fc89ee8cd24e6b26b961.tar.gz
marex-dev-2937961c36f310074d00fc89ee8cd24e6b26b961.tar.bz2
wall plugin:
- removed dead code - removed debug printf - fixed viewport switch with window as a side effect ;-) git-svn-id: file:///beryl/trunk@4021 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--beryl-plugins/src/wall.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/beryl-plugins/src/wall.c b/beryl-plugins/src/wall.c
index 5465868..a774681 100644
--- a/beryl-plugins/src/wall.c
+++ b/beryl-plugins/src/wall.c
@@ -1176,16 +1176,6 @@ static void wallPreparePaintScreen(CompScreen * s, int ms)
ws->expoCam = MAX(0.0, ws->expoCam - ((float)ms / 500.0));
}
- if (ws->timer <= 0 && ws->moving)
- {
- ws->moving = FALSE;
- moveScreenViewport(s, ws->destx, ws->desty, TRUE);
- ws->timer = 0;
- if (ws->moveWindow)
- wallReleaseMoveWindow (s);
- else
- focusDefaultWindow(s);
- }
if (ws->moving)
{
ws->timer -= ms;
@@ -1200,9 +1190,6 @@ static void wallPreparePaintScreen(CompScreen * s, int ms)
(wd->opt[WALL_DISPLAY_OPTION_SLIDE_DURATION].value.f * 1000.0f *
MAX(abs(ws->destx), abs(ws->desty)));
- double xt = left*ws->destx*s->width;
- printf("xt: %f\n",xt);
-
w = findWindowAtScreen(s, ws->moveWindow);
if (w)
{
@@ -1214,12 +1201,15 @@ static void wallPreparePaintScreen(CompScreen * s, int ms)
}
}
- if (ws->timer <= 0 && ws->moving)
+ if (ws->moving && ws->timer <= 0)
{
ws->moving = FALSE;
moveScreenViewport(s, ws->destx, ws->desty, TRUE);
ws->timer = 0;
- focusDefaultWindow(s);
+ if (ws->moveWindow)
+ wallReleaseMoveWindow(s);
+ else
+ focusDefaultWindow(s);
}
UNWRAP(ws, s, preparePaintScreen);