mousetweaks r137 - in trunk: . src

[gerdk svn gnome org]

Author: gerdk
Date: Sun Apr  6 19:31:22 2008
New Revision: 137
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=137&view=rev

Log:
2008-04-06 Gerd Kohlberger <gerdk svn gnome org>

	* src/mt-timer.c: Remove unused variables.
	* src/mt-main.c: Don't send right-clicks too fast. This helps
	to avoid running into active pointer grabs. (eg. gnome-panel)



Modified:
   trunk/ChangeLog
   trunk/src/mt-main.c
   trunk/src/mt-timer.c

Modified: trunk/src/mt-main.c
==============================================================================
--- trunk/src/mt-main.c	(original)
+++ trunk/src/mt-main.c	Sun Apr  6 19:31:22 2008
@@ -210,6 +210,16 @@
     }
 }
 
+static gboolean
+right_click_timeout (gpointer data)
+{
+    MTClosure *mt = (MTClosure *) data;
+
+    SPI_generateMouseEvent (mt->pointer_x, mt->pointer_y, "b3c");
+
+    return FALSE;
+}
+
 static void
 delay_timer_finished (MtTimer *timer, gpointer data)
 {
@@ -218,7 +228,9 @@
     mt_cursor_manager_restore_all (mt_cursor_manager_get_default ());
 
     SPI_generateMouseEvent (0, 0, "b1r");
-    SPI_generateMouseEvent (mt->pointer_x, mt->pointer_y, "b3c");
+    SPI_generateMouseEvent (mt->pointer_x, mt->pointer_y, "abs");
+
+    g_timeout_add (100, right_click_timeout, data);
 }
 
 /* at-spi callbacks */
@@ -278,8 +290,6 @@
     cairo_t *cr;
     gdouble target;
 
-    target = mt_timer_get_target (timer);
-
     surface = cairo_image_surface_create_for_data (image,
 						   CAIRO_FORMAT_ARGB32,
 						   width, height,
@@ -291,6 +301,7 @@
     if (cairo_status (cr) != CAIRO_STATUS_SUCCESS)
 	return FALSE;
 
+    target = mt_timer_get_target (timer);
     cairo_set_operator (cr, CAIRO_OPERATOR_ATOP);
     cairo_rectangle (cr, 0, 0, width, height / (target / time));
     cairo_set_source_rgba (cr, 0., 0., 0., 0.75);

Modified: trunk/src/mt-timer.c
==============================================================================
--- trunk/src/mt-timer.c	(original)
+++ trunk/src/mt-timer.c	Sun Apr  6 19:31:22 2008
@@ -185,7 +185,7 @@
 {
     g_return_val_if_fail (MT_IS_TIMER (timer), FALSE);
 
-    return (MT_TIMER_GET_PRIVATE (timer)->tid != 0);
+    return MT_TIMER_GET_PRIVATE (timer)->tid != 0;
 }
 
 gdouble
@@ -199,8 +199,6 @@
 gdouble
 mt_timer_get_target (MtTimer *timer)
 {
-    MtTimerPrivate *priv;
-
     g_return_val_if_fail (MT_IS_TIMER (timer), 0.0);
 
     return MT_TIMER_GET_PRIVATE (timer)->target;
@@ -209,8 +207,6 @@
 void
 mt_timer_set_target (MtTimer *timer, gdouble time)
 {
-    MtTimerPrivate *priv;
-
     g_return_if_fail (MT_IS_TIMER (timer));
     g_return_if_fail (time >= 0.5);