Attachment 11311 Details for Bug 12201 – adds the 'zoom only on mouse grab' option

[patch] adds the 'zoom only on mouse grab' option

compiz-zoom_grab_only-bob03.diff (text/plain), 2.64 KB, created by Bob Majdak Jr on 2007-08-28 13:27:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Majdak Jr

Created: 2007-08-28 13:27:53 UTC

Size: 2.64 KB

patch

obsolete

>diff --git a/metadata/rotate.xml.in b/metadata/rotate.xml.in
>index afba392..78cc26f 100644
>--- a/metadata/rotate.xml.in
>+++ b/metadata/rotate.xml.in
>@@ -233,6 +233,11 @@
> 		<max>2.0</max>
> 		<precision>0.1</precision>
> 	    </option>
>+	    <option name="zoom_grab_only" type="bool">
>+		<_short>Zoom on Mouse Grab Only</_short>
>+		<_long>Only zoom the cube out when it is grabbed with the mouse.</_long>
>+		<default>true</default>
>+	    </option>
> 	</screen>
>     </plugin>
> </compiz>
>diff --git a/plugins/rotate.c b/plugins/rotate.c
>index 45f0987..59ab8d8 100644
>--- a/plugins/rotate.c
>+++ b/plugins/rotate.c
>@@ -96,7 +96,9 @@ typedef struct _RotateDisplay {
> #define ROTATE_SCREEN_OPTION_SPEED		 4
> #define ROTATE_SCREEN_OPTION_TIMESTEP		 5
> #define ROTATE_SCREEN_OPTION_ZOOM		 6
>-#define ROTATE_SCREEN_OPTION_NUM		 7
>+#define ROTATE_SCREEN_OPTION_ZOOM_GRAB_ONLY 7
>+#define ROTATE_SCREEN_OPTION_NUM		 8
>+
> 
> typedef struct _RotateScreen {
>     PreparePaintScreenProc	 preparePaintScreen;
>@@ -129,6 +131,7 @@ typedef struct _RotateScreen {
> 
>     XPoint savedPointer;
>     Bool   grabbed;
>+    Bool   wasGrabbed;
> 
>     CompTimeoutHandle rotateHandle;
>     Bool	      slow;
>@@ -561,7 +564,10 @@ rotatePaintOutput (CompScreen		   *s,
> 
>     if (rs->grabIndex || rs->moving || rs->zoomTranslate != 0.0f)
>     {
>-	sA.zCamera -= rs->zoomTranslate;
>+     if (rs->wasGrabbed || (!rs->wasGrabbed && !rs->opt[ROTATE_SCREEN_OPTION_ZOOM_GRAB_ONLY].value.b)) {
>+	  sA.zCamera -= rs->zoomTranslate;
>+	}
>+	
> 	mask &= ~PAINT_SCREEN_REGION_MASK;
> 	mask |= PAINT_SCREEN_TRANSFORMED_MASK;
>     }
>@@ -626,6 +632,8 @@ rotateInitiate (CompDisplay     *d,
> 		x = getIntOptionNamed (option, nOption, "x", 0);
> 		y = getIntOptionNamed (option, nOption, "y", 0);
> 
>+		rs->wasGrabbed = FALSE;
>+		
> 		rs->savedPointer.x = x;
> 		rs->savedPointer.y = y;
> 	    }
>@@ -639,13 +647,19 @@ rotateInitiate (CompDisplay     *d,
> 	    rs->snapTop = rs->opt[ROTATE_SCREEN_OPTION_SNAP_TOP].value.b;
> 
> 	    if (state & CompActionStateInitButton)
>-		action->state |= CompActionStateTermButton;
>+	     {
>+		   action->state |= CompActionStateTermButton;
>+		   rs->wasGrabbed = TRUE;
>+		}
> 
> 	    if (state & CompActionStateInitKey)
>-		action->state |= CompActionStateTermKey;
>+	    {
>+		   action->state |= CompActionStateTermKey;
>+		   rs->wasGrabbed = FALSE;
>+	    }
> 	}
>     }
>-
>+    
>     return TRUE;
> }
> 
>@@ -1786,7 +1800,8 @@ static const CompMetadataOptionInfo rota
>     { "snap_top", "bool", 0, 0, 0 },
>     { "speed", "float", "<min>0.1</min>", 0, 0 },
>     { "timestep", "float", "<min>0.1</min>", 0, 0 },
>-    { "zoom", "float", 0, 0, 0 }
>+    { "zoom", "float", 0, 0, 0 },
>+    { "zoom_grab_only", "bool", 0, 0, 0 }
> };
> 
> static Bool

Actions: View | Splinter Review

Attachments on bug 12201: 11311

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.