diff options
author | roico <roico@d7aaf104-2d23-0410-ae22-9d23157bf5a3> | 2006-11-16 20:37:14 +0000 |
---|---|---|
committer | roico <roico@d7aaf104-2d23-0410-ae22-9d23157bf5a3> | 2006-11-16 20:37:14 +0000 |
commit | cb6f4b2868c90ed3b75b37cc0774257ebbbb0972 (patch) | |
tree | 6ae1abc76ef78834ecd286bb1a67f153058680f2 /beryl-plugins/src/rotate.c | |
parent | df0d337f0031cb128e3ed956e49a12a563f6c224 (diff) | |
download | marex-dev-cb6f4b2868c90ed3b75b37cc0774257ebbbb0972.tar.gz marex-dev-cb6f4b2868c90ed3b75b37cc0774257ebbbb0972.tar.bz2 |
roico: add support for 3d plugin to cube + zoom + rotate (thanks to iXce
who
made the modifications in rotate and zoom)
git-svn-id: file:///beryl/trunk@1246 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/rotate.c')
-rw-r--r-- | beryl-plugins/src/rotate.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c index b6deda2..f216baf 100644 --- a/beryl-plugins/src/rotate.c +++ b/beryl-plugins/src/rotate.c @@ -256,6 +256,7 @@ typedef struct _RotateScreen int wheelMaxDist; int previousRotationAtom; + int ipcsActiveAtom; } RotateScreen; @@ -732,7 +733,14 @@ rotatePreparePaintScreen (CompScreen * s, int msSinceLastPaint) rs->previousRotationAtom, previousRotation + tx); } - + + int atomValue = IPCS_GetInt(IPCS_OBJECT (s), + rs->ipcsActiveAtom); + + IPCS_SetInt (IPCS_OBJECT (s), + rs->ipcsActiveAtom, + --atomValue); + moveScreenViewport (s, tx, 0, TRUE); rs->xrot = 0.0f; @@ -1047,7 +1055,14 @@ rotateInitiate (CompDisplay * d, rs->movingVert = FALSE; rs->moveTo = 0.0f; rs->moveToY = 0.0f; - + + int atomValue = IPCS_GetInt(IPCS_OBJECT (s), + rs->ipcsActiveAtom); + + IPCS_SetInt (IPCS_OBJECT (s), + rs->ipcsActiveAtom, + ++atomValue); + rs->rotating = FALSE; if (!rs->grabIndex) @@ -2808,6 +2823,9 @@ rotateInitScreen (CompPlugin * p, CompScreen * s) rs->previousRotationAtom = IPCS_GetAtom (IPCS_OBJECT (s), IPCS_FLOAT, "previous_rotation", TRUE); + + rs->ipcsActiveAtom = IPCS_GetAtom (IPCS_OBJECT (s), IPCS_INT, + "3D_WINDOWS_ARE_ACTIVE", TRUE); rotateScreenInitOptions (rs); |