summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/rotate.c
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-19 08:45:19 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-19 08:45:19 +0000
commitcd1d027ee6a587a626358c715a9a7cc3556ca019 (patch)
tree8009e750b036a9f9c454f7dd780b35160a848aa4 /beryl-plugins/src/rotate.c
parented435c9ece61a69b1f87df76deb6bcb4895afe4d (diff)
downloadmarex-dev-cd1d027ee6a587a626358c715a9a7cc3556ca019.tar.gz
marex-dev-cd1d027ee6a587a626358c715a9a7cc3556ca019.tar.bz2
rotate plugin: prepare for DnD of group slots
git-svn-id: file:///beryl/trunk@2866 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/rotate.c')
-rw-r--r--beryl-plugins/src/rotate.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c
index 844d2d6..d6f581c 100644
--- a/beryl-plugins/src/rotate.c
+++ b/beryl-plugins/src/rotate.c
@@ -1168,7 +1168,7 @@ rotate(CompDisplay * d,
return FALSE;
if (otherScreenGrabExist
- (s, "rotate", "move", "switcher", "cube", "scale", 0))
+ (s, "rotate", "move", "switcher", "cube", "scale", "group-drag", 0))
return FALSE;
/* FIXME: this is sort of a hack - we check if
@@ -1587,7 +1587,7 @@ static Bool rotateFlip(CompScreen * s, int direction)
rs->moveTo = 0.0f;
rs->slow = FALSE;
- if (otherScreenGrabExist(s, "rotate", "move", 0))
+ if (otherScreenGrabExist(s, "rotate", "move", "group-drag", 0))
return FALSE;
if (direction == 1)
@@ -1663,7 +1663,7 @@ rotateEdgeFlip(CompScreen * s,
if (s->hsize < 2)
return;
- if (otherScreenGrabExist(s, "rotate", "move", 0))
+ if (otherScreenGrabExist(s, "rotate", "move", "group-drag", 0))
return;
if (state & CompActionStateInitEdgeDnd)
@@ -1688,6 +1688,11 @@ rotateEdgeFlip(CompScreen * s,
CompWindowStateFullscreenMask))
return;
}
+ else if (screenGrabExist(s, "group-drag", 0))
+ {
+ if (!rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_DND].value.b)
+ return;
+ }
else
{
if (!rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_POINTER].value.b)