From cb6fe48ccdf1e5483c66cf7b55a55042febe9793 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Sat, 11 Nov 2006 10:44:02 +0000
Subject: [PATCH] Fix behavior so that when Alt is down, it appears as if no
 other modifier

2006-11-11  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpselectiontool.c
	(gimp_selection_tool_modifier_key): Fix behavior so that when Alt
	is down, it appears as if no other modifier was pressed.
	Fixes bug #349338.
---
 ChangeLog                     |  7 ++++
 app/tools/gimpselectiontool.c | 62 +++++++++++++++++++----------------
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a32c478741..b8b14ff364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-11  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimpselectiontool.c
+	(gimp_selection_tool_modifier_key): Fix behavior so that when Alt
+	is down, it appears as if no other modifier was pressed.
+	Fixes bug #349338.
+
 2006-11-09  Kevin Cozens  <kcozens@cvs.gnome.org>
 
 	* plug-ins/script-fu/scheme-wrapper.c (marshall_proc_db_call): Use
diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c
index 9bbf4b6868..9b837c51f8 100644
--- a/app/tools/gimpselectiontool.c
+++ b/app/tools/gimpselectiontool.c
@@ -124,43 +124,47 @@ gimp_selection_tool_modifier_key (GimpTool        *tool,
     {
       GimpChannelOps button_op = options->operation;
 
-      if (state & GDK_MOD1_MASK)
+      if (press)
         {
-          button_op = selection_tool->saved_operation;
+          if (key == (state & (GDK_SHIFT_MASK   |
+                               GDK_CONTROL_MASK |
+                               GDK_MOD1_MASK)))
+            {
+              /*  first modifier pressed  */
+
+              selection_tool->saved_operation = options->operation;
+            }
         }
       else
         {
-          if (press)
+          if (! (state & (GDK_SHIFT_MASK   |
+                          GDK_CONTROL_MASK |
+                          GDK_MOD1_MASK)))
             {
-              if (key == (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
-                {
-                  /*  first modifier pressed  */
+              /*  last modifier released  */
 
-                  selection_tool->saved_operation = options->operation;
-                }
+              button_op = selection_tool->saved_operation;
             }
-          else
-            {
-              if (! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
-                {
-                  /*  last modifier released  */
+        }
 
-                  button_op = selection_tool->saved_operation;
-                }
-            }
-
-          if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK))
-            {
-              button_op = GIMP_CHANNEL_OP_INTERSECT;
-            }
-          else if (state & GDK_SHIFT_MASK)
-            {
-              button_op = GIMP_CHANNEL_OP_ADD;
-            }
-          else if (state & GDK_CONTROL_MASK)
-            {
-              button_op = GIMP_CHANNEL_OP_SUBTRACT;
-            }
+      if (state & GDK_MOD1_MASK)
+        {
+          /*  if alt is down, pretend that neither
+           *  shift nor control are down
+           */
+          button_op = selection_tool->saved_operation;
+        }
+      else if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK))
+        {
+          button_op = GIMP_CHANNEL_OP_INTERSECT;
+        }
+      else if (state & GDK_SHIFT_MASK)
+        {
+          button_op = GIMP_CHANNEL_OP_ADD;
+        }
+      else if (state & GDK_CONTROL_MASK)
+        {
+          button_op = GIMP_CHANNEL_OP_SUBTRACT;
         }
 
       if (button_op != options->operation)