i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keymap: activate popup for all modifiers

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

Also check for control+click == RMB
This commit is contained in:
John Scipione
2014-02-20 15:03:44 -05:00
parent f97a4a3ceb
commit ab0f7d6627
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/KeyboardLayoutView.cpp
+30 -8
View File
@@ -163,8 +163,10 @@ KeyboardLayoutView::MouseDown(BPoint point)
return; return;
} }
if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) { if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0
if (fKeymap->IsModifierKey(key->code)) { || ((buttons & B_PRIMARY_MOUSE_BUTTON) != 0
&& (modifiers() & B_CONTROL_KEY) != 0)) {
if (_IsMappableToModifierKey(key->code)) {
// pop up the modifier keys menu // pop up the modifier keys menu
BPopUpMenu* modifiersPopUp = new BPopUpMenu("Modifiers pop up", BPopUpMenu* modifiersPopUp = new BPopUpMenu("Modifiers pop up",
true, true, B_ITEMS_IN_COLUMN); true, true, B_ITEMS_IN_COLUMN);
@@ -243,8 +245,7 @@ KeyboardLayoutView::MouseDown(BPoint point)
&& (fButtons & B_TERTIARY_MOUSE_BUTTON) == 0) { && (fButtons & B_TERTIARY_MOUSE_BUTTON) == 0) {
// toggle the "deadness" of dead keys via middle mouse button // toggle the "deadness" of dead keys via middle mouse button
bool isEnabled = false; bool isEnabled = false;
uint8 deadKey uint8 deadKey = fKeymap->DeadKey(key->code, fModifiers, &isEnabled);
= fKeymap->DeadKey(key->code, fModifiers, &isEnabled);
if (deadKey > 0) { if (deadKey > 0) {
fKeymap->SetDeadKeyEnabled(key->code, fModifiers, !isEnabled); fKeymap->SetDeadKeyEnabled(key->code, fModifiers, !isEnabled);
_InvalidateKey(key); _InvalidateKey(key);
@@ -290,10 +291,13 @@ KeyboardLayoutView::MouseUp(BPoint point)
return; return;
} }
if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) { if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0
// do nothing || ((buttons & B_PRIMARY_MOUSE_BUTTON) != 0
} else if ((fButtons & B_TERTIARY_MOUSE_BUTTON) != 0 && (modifiers() & B_CONTROL_KEY) != 0)) {
&& (buttons & B_TERTIARY_MOUSE_BUTTON) == 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); _SetKeyState(key->code, false);
_InvalidateKey(key); _InvalidateKey(key);
fButtons = buttons; fButtons = buttons;
@@ -1309,3 +1313,21 @@ KeyboardLayoutView::_NameForModifier(uint32 modifier, bool pretty) const
return NULL; 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
}
src/preferences/keymap/KeyboardLayoutView.h
+1
View File
@@ -96,6 +96,7 @@ private:
uint32 new_code); uint32 new_code);
const char* _NameForModifier(uint32 modifier, const char* _NameForModifier(uint32 modifier,
bool pretty = false) const; bool pretty = false) const;
bool _IsMappableToModifierKey(uint32 keyCode) const;
BBitmap* fOffscreenBitmap; BBitmap* fOffscreenBitmap;
BView* fOffscreenView; BView* fOffscreenView;