From ab0f7d6627fe32e98d4713352896f2a7f66f9854 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Wed, 4 Sep 2013 23:47:18 -0400
Subject: [PATCH] Keymap: activate popup for all modifiers

not just those that have a modifier key mapped to them already

Also check for control+click == RMB
---
 src/preferences/keymap/KeyboardLayoutView.cpp | 38 +++++++++++++++----
 src/preferences/keymap/KeyboardLayoutView.h   |  1 +
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/preferences/keymap/KeyboardLayoutView.cpp b/src/preferences/keymap/KeyboardLayoutView.cpp
index 5e2f9b308b..ed6ad486e9 100644
--- a/src/preferences/keymap/KeyboardLayoutView.cpp
+++ b/src/preferences/keymap/KeyboardLayoutView.cpp
@@ -163,8 +163,10 @@ KeyboardLayoutView::MouseDown(BPoint point)
 		return;
 	}
 
-	if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) {
-		if (fKeymap->IsModifierKey(key->code)) {
+	if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0
+		|| ((buttons & B_PRIMARY_MOUSE_BUTTON) != 0
+			&& (modifiers() & B_CONTROL_KEY) != 0)) {
+		if (_IsMappableToModifierKey(key->code)) {
 			// pop up the modifier keys menu
 			BPopUpMenu* modifiersPopUp = new BPopUpMenu("Modifiers pop up",
 				true, true, B_ITEMS_IN_COLUMN);
@@ -243,8 +245,7 @@ KeyboardLayoutView::MouseDown(BPoint point)
 		&& (fButtons & B_TERTIARY_MOUSE_BUTTON) == 0) {
 		// toggle the "deadness" of dead keys via middle mouse button
 		bool isEnabled = false;
-		uint8 deadKey
-			= fKeymap->DeadKey(key->code, fModifiers, &isEnabled);
+		uint8 deadKey = fKeymap->DeadKey(key->code, fModifiers, &isEnabled);
 		if (deadKey > 0) {
 			fKeymap->SetDeadKeyEnabled(key->code, fModifiers, !isEnabled);
 			_InvalidateKey(key);
@@ -290,10 +291,13 @@ KeyboardLayoutView::MouseUp(BPoint point)
 		return;
 	}
 
-	if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) {
-		// do nothing
-	} else if ((fButtons & B_TERTIARY_MOUSE_BUTTON) != 0
-		&& (buttons & B_TERTIARY_MOUSE_BUTTON) == 0) {
+	if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0
+		|| ((buttons & B_PRIMARY_MOUSE_BUTTON) != 0
+			&& (modifiers() & B_CONTROL_KEY) != 0)) {
+		; // do nothing
+	} else if ((buttons & B_TERTIARY_MOUSE_BUTTON) != 0
+		&& (fButtons & B_TERTIARY_MOUSE_BUTTON) == 0) {
+		// toggle the "deadness" of dead keys via middle mouse button
 		_SetKeyState(key->code, false);
 		_InvalidateKey(key);
 		fButtons = buttons;
@@ -1309,3 +1313,21 @@ KeyboardLayoutView::_NameForModifier(uint32 modifier, bool pretty) const
 
 	return NULL;
 }
+
+
+bool
+KeyboardLayoutView::_IsMappableToModifierKey(uint32 keyCode) const
+{
+	return keyCode == 0x3b	// caps lock
+		|| keyCode == 0x22	// num lock
+		|| keyCode == 0x0f	// scroll lock
+		|| keyCode == 0x4b	// left shift
+		|| keyCode == 0x56	// right shift
+		|| keyCode == 0x5d	// left command
+		|| keyCode == 0x5f	// right command
+		|| keyCode == 0x5c	// left control
+		|| keyCode == 0x60	// right control
+		|| keyCode == 0x66	// left option
+		|| keyCode == 0x67	// right option
+		|| keyCode == 0x68;	// menu
+}
diff --git a/src/preferences/keymap/KeyboardLayoutView.h b/src/preferences/keymap/KeyboardLayoutView.h
index f3c4b96d64..01a9d7aa2c 100644
--- a/src/preferences/keymap/KeyboardLayoutView.h
+++ b/src/preferences/keymap/KeyboardLayoutView.h
@@ -96,6 +96,7 @@ private:
 									uint32 new_code);
 			const char*			_NameForModifier(uint32 modifier,
 									bool pretty = false) const;
+			bool				_IsMappableToModifierKey(uint32 keyCode) const;
 
 			BBitmap*			fOffscreenBitmap;
 			BView*				fOffscreenView;