summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Lyngstol <kristian@bohemians.org>2007-04-28 22:47:13 +0200
committerKristian Lyngstol <kristian@bohemians.org>2007-05-13 16:50:06 +0200
commit2c6e4b25e3b983e519e9fee06ad196ca503dcf8f (patch)
treecfbd9a97f47a198fd53d663cd9941532b67c5dfe
parentcc0e0c4e1c788ce19bf42fbea9c629e5e80e10c4 (diff)
downloadberyl-premerge-2c6e4b25e3b983e519e9fee06ad196ca503dcf8f.tar.gz
beryl-premerge-2c6e4b25e3b983e519e9fee06ad196ca503dcf8f.tar.bz2
Update for recent multiscreen fixesmultiscreen
This is for: "Make focusDefaultWindow () take a CompScreen as argument"
-rw-r--r--src/put.c2
-rw-r--r--src/wall.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/put.c b/src/put.c
index 57bf978..af1d973 100644
--- a/src/put.c
+++ b/src/put.c
@@ -189,7 +189,7 @@ static void putPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
{
/* unfocus moved window if enabled */
if (putGetUnfocusWindow(s))
- focusDefaultWindow(s->display);
+ focusDefaultWindow(s);
break;
}
}
diff --git a/src/wall.c b/src/wall.c
index 76d4280..66e92af 100644
--- a/src/wall.c
+++ b/src/wall.c
@@ -705,7 +705,7 @@ static void wallHandleEvent(CompDisplay * d, XEvent * event)
while (s->y != ws->mouseOverViewY)
moveScreenViewport(s, 0, 1, TRUE);
- focusDefaultWindow(s->display);
+ focusDefaultWindow(s);
}
damageScreen(s);
}
@@ -1127,7 +1127,7 @@ static Bool wallExpo(CompDisplay * d, CompAction * action,
}
damageScreen(s);
- focusDefaultWindow(s->display);
+ focusDefaultWindow(s);
return TRUE;
}
@@ -1684,7 +1684,7 @@ static void wallPreparePaintScreen(CompScreen * s, int ms)
if (ws->moveWindow)
wallReleaseMoveWindow(s);
else
- focusDefaultWindow(s->display);
+ focusDefaultWindow(s);
if (ws->grabIndex)
{