gnome-games r7734 - trunk/gnomine

[thomashpa svn gnome org]

Author: thomashpa
Date: Thu Jun 26 11:47:13 2008
New Revision: 7734
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7734&view=rev

Log:
Handle double right click regression introduced in bug #539725

Modified:
   trunk/gnomine/minefield.c

Modified: trunk/gnomine/minefield.c
==============================================================================
--- trunk/gnomine/minefield.c	(original)
+++ trunk/gnomine/minefield.c	Thu Jun 26 11:47:13 2008
@@ -1077,6 +1077,7 @@
       mfield->action = SHOW_ACTION;
       if ((event->state & GDK_SHIFT_MASK) || (mfield->bdown[2]) || (mfield->mines[c].shown))
         mfield->action = CLEAR_ACTION;
+      /* Ctrl + left = right to make game playable on touchpad */
       if (event->state & GDK_CONTROL_MASK)
         mfield->action = FLAG_ACTION;
       break;
@@ -1095,7 +1096,9 @@
     if (mfield->action == CLEAR_ACTION) {
       gtk_minefield_multi_press (mfield, x, y, c);
     } else if (mfield->action == FLAG_ACTION) {
-      gtk_minefield_toggle_mark (mfield, x, y);
+      if (mfield->bdown[2] == 1 || (event->state & GDK_CONTROL_MASK && mfield->bdown[0] == 1)) {
+        gtk_minefield_toggle_mark (mfield, x, y);
+      }
     }
     if (mfield->action != FLAG_ACTION) {
       g_signal_emit (GTK_OBJECT (mfield),