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

Keymap: Add caps modifiers remapping

Browse Source 
Refactored some functions.

Change-Id: Idb16b1298fcd8f2fbca256275d16fbc3584bdb55
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6842
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Jorge Acereda
2023-09-14 06:36:09 +00:00
committed by Jérôme Duval
parent d7b59fd308
commit d51ee1e8bd
2 changed files with 176 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/ModifierKeysWindow.cpp
+166 -307
View File
@@ -1,9 +1,10 @@
/* /*
* Copyright 2011-2014 Haiku, Inc. All rights reserved. * Copyright 2011-2023 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* John Scipione, [email protected] * John Scipione, [email protected]
* Jorge Acereda, [email protected]
*/ */
@@ -44,26 +45,30 @@
enum { enum {
SHIFT_KEY = 0x00000001, CAPS_KEY = 0x00000001,
CONTROL_KEY = 0x00000002, SHIFT_KEY = 0x00000002,
OPTION_KEY = 0x00000004, CONTROL_KEY = 0x00000004,
COMMAND_KEY = 0x00000008 OPTION_KEY = 0x00000008,
COMMAND_KEY = 0x00000010,
}; };
enum { enum {
MENU_ITEM_SHIFT = 0, MENU_ITEM_CAPS,
MENU_ITEM_SHIFT,
MENU_ITEM_CONTROL, MENU_ITEM_CONTROL,
MENU_ITEM_OPTION, MENU_ITEM_OPTION,
MENU_ITEM_COMMAND, MENU_ITEM_COMMAND,
MENU_ITEM_SEPERATOR, MENU_ITEM_SEPARATOR,
MENU_ITEM_DISABLED MENU_ITEM_DISABLED,
MENU_ITEM_FIRST = MENU_ITEM_CAPS,
MENU_ITEM_LAST = MENU_ITEM_DISABLED
}; };
static const uint32 kMsgHideShowIcons = 'icon'; static const uint32 kMsgUpdateModifier = 'upmd';
static const uint32 kMsgUpdateModifier = 'upmd'; static const uint32 kMsgApplyModifiers = 'apmd';
static const uint32 kMsgApplyModifiers = 'apmd'; static const uint32 kMsgRevertModifiers = 'rvmd';
static const uint32 kMsgRevertModifiers = 'rvmd';
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
@@ -126,8 +131,7 @@ void
ConflictView::SetStopIcon(bool show) ConflictView::SetStopIcon(bool show)
{ {
fIcon = show ? fStopIcon : NULL; fIcon = show ? fStopIcon : NULL;
const char* tip = show ? B_TRANSLATE("Error: duplicate keys") const char* tip = show ? B_TRANSLATE("Error: duplicate keys") : NULL;
: NULL;
SetToolTip(tip); SetToolTip(tip);
} }
@@ -137,9 +141,7 @@ void
ConflictView::SetWarnIcon(bool show) ConflictView::SetWarnIcon(bool show)
{ {
fIcon = show ? fWarnIcon : NULL; fIcon = show ? fWarnIcon : NULL;
const char* tip = show const char* tip = show ? B_TRANSLATE("Warning: left and right key roles do not match") : NULL;
? B_TRANSLATE("Warning: left and right key roles do not match")
: NULL;
SetToolTip(tip); SetToolTip(tip);
} }
@@ -153,8 +155,7 @@ ConflictView::_FillIcons()
{ {
if (fStopIcon == NULL) { if (fStopIcon == NULL) {
// Allocate the fStopIcon bitmap // Allocate the fStopIcon bitmap
fStopIcon = new (std::nothrow) BBitmap(Bounds(), 0, fStopIcon = new (std::nothrow) BBitmap(Bounds(), 0, B_RGBA32);
B_RGBA32);
if (fStopIcon->InitCheck() != B_OK) { if (fStopIcon->InitCheck() != B_OK) {
FTRACE((stderr, "_FillIcons() - No memory for stop bitmap\n")); FTRACE((stderr, "_FillIcons() - No memory for stop bitmap\n"));
delete fStopIcon; delete fStopIcon;
@@ -172,8 +173,7 @@ ConflictView::_FillIcons()
if (fWarnIcon == NULL) { if (fWarnIcon == NULL) {
// Allocate the fWarnIcon bitmap // Allocate the fWarnIcon bitmap
fWarnIcon = new (std::nothrow) BBitmap(Bounds(), 0, fWarnIcon = new (std::nothrow) BBitmap(Bounds(), 0, B_RGBA32);
B_RGBA32);
if (fWarnIcon->InitCheck() != B_OK) { if (fWarnIcon->InitCheck() != B_OK) {
FTRACE((stderr, "_FillIcons() - No memory for warn bitmap\n")); FTRACE((stderr, "_FillIcons() - No memory for warn bitmap\n"));
delete fWarnIcon; delete fWarnIcon;
@@ -197,8 +197,7 @@ ConflictView::_FillIcons()
ModifierKeysWindow::ModifierKeysWindow() ModifierKeysWindow::ModifierKeysWindow()
: :
BWindow(BRect(0, 0, 360, 220), B_TRANSLATE("Modifier keys"), BWindow(BRect(0, 0, 360, 220), B_TRANSLATE("Modifier keys"),
B_FLOATING_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE B_FLOATING_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
| B_AUTO_UPDATE_SIZE_LIMITS)
{ {
get_key_map(&fCurrentMap, &fCurrentBuffer); get_key_map(&fCurrentMap, &fCurrentBuffer);
get_key_map(&fSavedMap, &fSavedBuffer); get_key_map(&fSavedMap, &fSavedBuffer);
@@ -213,17 +212,28 @@ ModifierKeysWindow::ModifierKeysWindow()
keyLabel->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); keyLabel->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
keyLabel->SetFont(be_bold_font); keyLabel->SetFont(be_bold_font);
BMenuField* shiftMenuField = _CreateShiftMenuField(); BMenuField* capsMenuField;
shiftMenuField->SetAlignment(B_ALIGN_RIGHT); _CreateMenuField(&fCapsMenu, &capsMenuField, MENU_ITEM_CAPS,
B_TRANSLATE_COMMENT("Caps:", "Caps key role name"));
BMenuField* controlMenuField = _CreateControlMenuField(); BMenuField* shiftMenuField;
controlMenuField->SetAlignment(B_ALIGN_RIGHT); _CreateMenuField(&fShiftMenu, &shiftMenuField, MENU_ITEM_SHIFT,
B_TRANSLATE_COMMENT("Shift:", "Shift key role name"));
BMenuField* optionMenuField = _CreateOptionMenuField(); BMenuField* controlMenuField;
optionMenuField->SetAlignment(B_ALIGN_RIGHT); _CreateMenuField(&fControlMenu, &controlMenuField, MENU_ITEM_CONTROL,
B_TRANSLATE_COMMENT("Control:", "Control key role name"));
BMenuField* commandMenuField = _CreateCommandMenuField(); BMenuField* optionMenuField;
commandMenuField->SetAlignment(B_ALIGN_RIGHT); _CreateMenuField(&fOptionMenu, &optionMenuField, MENU_ITEM_OPTION,
B_TRANSLATE_COMMENT("Option:", "Option key role name"));
BMenuField* commandMenuField;
_CreateMenuField(&fCommandMenu, &commandMenuField, MENU_ITEM_COMMAND,
B_TRANSLATE_COMMENT("Command:", "Command key role name"));
fCapsConflictView = new ConflictView("caps lock warning view");
fCapsConflictView->SetExplicitMaxSize(fCapsConflictView->Bounds().Size());
fShiftConflictView = new ConflictView("shift warning view"); fShiftConflictView = new ConflictView("shift warning view");
fShiftConflictView->SetExplicitMaxSize(fShiftConflictView->Bounds().Size()); fShiftConflictView->SetExplicitMaxSize(fShiftConflictView->Bounds().Size());
@@ -253,29 +263,36 @@ ModifierKeysWindow::ModifierKeysWindow()
.Add(keyRole, 0, 0) .Add(keyRole, 0, 0)
.Add(keyLabel, 1, 0) .Add(keyLabel, 1, 0)
.Add(shiftMenuField->CreateLabelLayoutItem(), 0, 1) .Add(capsMenuField->CreateLabelLayoutItem(), 0, 1)
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 1) .AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 1)
.Add(capsMenuField->CreateMenuBarLayoutItem())
.Add(fCapsConflictView)
.End()
.Add(shiftMenuField->CreateLabelLayoutItem(), 0, 2)
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 2)
.Add(shiftMenuField->CreateMenuBarLayoutItem()) .Add(shiftMenuField->CreateMenuBarLayoutItem())
.Add(fShiftConflictView) .Add(fShiftConflictView)
.End() .End()
.Add(controlMenuField->CreateLabelLayoutItem(), 0, 2) .Add(controlMenuField->CreateLabelLayoutItem(), 0, 3)
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 2) .AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 3)
.Add(controlMenuField->CreateMenuBarLayoutItem()) .Add(controlMenuField->CreateMenuBarLayoutItem())
.Add(fControlConflictView) .Add(fControlConflictView)
.End() .End()
.Add(optionMenuField->CreateLabelLayoutItem(), 0, 3) .Add(optionMenuField->CreateLabelLayoutItem(), 0, 4)
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 3) .AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 4)
.Add(optionMenuField->CreateMenuBarLayoutItem()) .Add(optionMenuField->CreateMenuBarLayoutItem())
.Add(fOptionConflictView) .Add(fOptionConflictView)
.End() .End()
.Add(commandMenuField->CreateLabelLayoutItem(), 0, 4) .Add(commandMenuField->CreateLabelLayoutItem(), 0, 5)
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 4) .AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 1, 5)
.Add(commandMenuField->CreateMenuBarLayoutItem()) .Add(commandMenuField->CreateMenuBarLayoutItem())
.Add(fCommandConflictView) .Add(fCommandConflictView)
.End() .End()
.End() .End()
.AddGlue() .AddGlue()
.AddGroup(B_HORIZONTAL) .AddGroup(B_HORIZONTAL)
@@ -289,8 +306,6 @@ ModifierKeysWindow::ModifierKeysWindow()
_MarkMenuItems(); _MarkMenuItems();
_ValidateDuplicateKeys(); _ValidateDuplicateKeys();
PostMessage(kMsgHideShowIcons);
} }
@@ -304,16 +319,12 @@ void
ModifierKeysWindow::MessageReceived(BMessage* message) ModifierKeysWindow::MessageReceived(BMessage* message)
{ {
switch (message->what) { switch (message->what) {
case kMsgHideShowIcons:
_HideShowIcons();
break;
case kMsgUpdateModifier: case kMsgUpdateModifier:
{ {
int32 menuitem = MENU_ITEM_SHIFT; int32 menuitem = MENU_ITEM_FIRST;
int32 key = -1; int32 key = -1;
for (; menuitem <= MENU_ITEM_COMMAND; menuitem++) { for (; menuitem <= MENU_ITEM_LAST; menuitem++) {
if (message->FindInt32(_KeyToString(menuitem), &key) == B_OK) if (message->FindInt32(_KeyToString(menuitem), &key) == B_OK)
break; break;
} }
@@ -324,35 +335,40 @@ ModifierKeysWindow::MessageReceived(BMessage* message)
// menuitem contains the item we want to set // menuitem contains the item we want to set
// key contains the item we want to set it to. // key contains the item we want to set it to.
uint32 leftKey = _KeyToKeyCode(key);
uint32 rightKey = _KeyToKeyCode(key, true);
switch (menuitem) { switch (menuitem) {
case MENU_ITEM_CAPS:
fCurrentMap->caps_key = leftKey;
break;
case MENU_ITEM_SHIFT: case MENU_ITEM_SHIFT:
fCurrentMap->left_shift_key = _KeyToKeyCode(key); fCurrentMap->left_shift_key = leftKey;
fCurrentMap->right_shift_key = _KeyToKeyCode(key, true); fCurrentMap->right_shift_key = rightKey;
break; break;
case MENU_ITEM_CONTROL: case MENU_ITEM_CONTROL:
fCurrentMap->left_control_key = _KeyToKeyCode(key); fCurrentMap->left_control_key = leftKey;
fCurrentMap->right_control_key = _KeyToKeyCode(key, true); fCurrentMap->right_control_key = rightKey;
break; break;
case MENU_ITEM_OPTION: case MENU_ITEM_OPTION:
fCurrentMap->left_option_key = _KeyToKeyCode(key); fCurrentMap->left_option_key = leftKey;
fCurrentMap->right_option_key = _KeyToKeyCode(key, true); fCurrentMap->right_option_key = rightKey;
break; break;
case MENU_ITEM_COMMAND: case MENU_ITEM_COMMAND:
fCurrentMap->left_command_key = _KeyToKeyCode(key); fCurrentMap->left_command_key = leftKey;
fCurrentMap->right_command_key = _KeyToKeyCode(key, true); fCurrentMap->right_command_key = rightKey;
break; break;
} }
_MarkMenuItems(); _MarkMenuItems();
_ValidateDuplicateKeys(); _ValidateDuplicateKeys();
_HideShowIcons();
// enable/disable revert button // enable/disable revert button
fRevertButton->SetEnabled( fRevertButton->SetEnabled(memcmp(fCurrentMap, fSavedMap, sizeof(key_map)));
memcmp(fCurrentMap, fSavedMap, sizeof(key_map)));
break; break;
} }
@@ -365,47 +381,32 @@ ModifierKeysWindow::MessageReceived(BMessage* message)
BMessage* updateModifiers = new BMessage(kMsgUpdateModifierKeys); BMessage* updateModifiers = new BMessage(kMsgUpdateModifierKeys);
if (fCurrentMap->left_shift_key != fSavedMap->left_shift_key) { if (fCurrentMap->left_shift_key != fSavedMap->left_shift_key)
updateModifiers->AddUInt32("left_shift_key", updateModifiers->AddUInt32("left_shift_key", fCurrentMap->left_shift_key);
fCurrentMap->left_shift_key);
}
if (fCurrentMap->right_shift_key != fSavedMap->right_shift_key) { if (fCurrentMap->right_shift_key != fSavedMap->right_shift_key)
updateModifiers->AddUInt32("right_shift_key", updateModifiers->AddUInt32("right_shift_key", fCurrentMap->right_shift_key);
fCurrentMap->right_shift_key);
}
if (fCurrentMap->left_control_key != fSavedMap->left_control_key) { if (fCurrentMap->left_control_key != fSavedMap->left_control_key)
updateModifiers->AddUInt32("left_control_key", updateModifiers->AddUInt32("left_control_key", fCurrentMap->left_control_key);
fCurrentMap->left_control_key);
}
if (fCurrentMap->right_control_key if (fCurrentMap->right_control_key != fSavedMap->right_control_key)
!= fSavedMap->right_control_key) { updateModifiers->AddUInt32("right_control_key", fCurrentMap->right_control_key);
updateModifiers->AddUInt32("right_control_key",
fCurrentMap->right_control_key);
}
if (fCurrentMap->left_option_key != fSavedMap->left_option_key) { if (fCurrentMap->left_option_key != fSavedMap->left_option_key)
updateModifiers->AddUInt32("left_option_key", updateModifiers->AddUInt32("left_option_key", fCurrentMap->left_option_key);
fCurrentMap->left_option_key);
}
if (fCurrentMap->right_option_key != fSavedMap->right_option_key) { if (fCurrentMap->right_option_key != fSavedMap->right_option_key)
updateModifiers->AddUInt32("right_option_key", updateModifiers->AddUInt32("right_option_key", fCurrentMap->right_option_key);
fCurrentMap->right_option_key);
}
if (fCurrentMap->left_command_key != fSavedMap->left_command_key) { if (fCurrentMap->left_command_key != fSavedMap->left_command_key)
updateModifiers->AddUInt32("left_command_key", updateModifiers->AddUInt32("left_command_key", fCurrentMap->left_command_key);
fCurrentMap->left_command_key);
}
if (fCurrentMap->right_command_key if (fCurrentMap->right_command_key != fSavedMap->right_command_key)
!= fSavedMap->right_command_key) { updateModifiers->AddUInt32("right_command_key", fCurrentMap->right_command_key);
updateModifiers->AddUInt32("right_command_key",
fCurrentMap->right_command_key); if (fCurrentMap->caps_key != fSavedMap->caps_key)
} updateModifiers->AddUInt32("caps_key", fCurrentMap->caps_key);
// KeymapWindow updates the modifiers // KeymapWindow updates the modifiers
be_app->PostMessage(updateModifiers); be_app->PostMessage(updateModifiers);
@@ -421,7 +422,6 @@ ModifierKeysWindow::MessageReceived(BMessage* message)
_MarkMenuItems(); _MarkMenuItems();
_ValidateDuplicateKeys(); _ValidateDuplicateKeys();
_HideShowIcons();
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
break; break;
@@ -434,177 +434,74 @@ ModifierKeysWindow::MessageReceived(BMessage* message)
// #pragma mark - ModifierKeysWindow private methods // #pragma mark - ModifierKeysWindow private methods
void
BMenuField* ModifierKeysWindow::_CreateMenuField(
ModifierKeysWindow::_CreateShiftMenuField() BPopUpMenu** outMenu, BMenuField** outField, uint32 inKey, const char* comment)
{ {
fShiftMenu = new BPopUpMenu( const char* sKey = _KeyToString(inKey);
B_TRANSLATE_NOCOLLECT(_KeyToString(MENU_ITEM_SHIFT)), true, true); const char* tKey = B_TRANSLATE_NOCOLLECT(sKey);
BPopUpMenu* menu = new BPopUpMenu(tKey, true, true);
for (int32 key = MENU_ITEM_SHIFT; key <= MENU_ITEM_DISABLED; key++) { for (int32 key = MENU_ITEM_FIRST; key <= MENU_ITEM_LAST; key++) {
if (key == MENU_ITEM_SEPERATOR) { if (key == MENU_ITEM_SEPARATOR) {
// add separator item // add separator item
BSeparatorItem* separator = new BSeparatorItem; BSeparatorItem* separator = new BSeparatorItem;
fShiftMenu->AddItem(separator, MENU_ITEM_SEPERATOR); menu->AddItem(separator, MENU_ITEM_SEPARATOR);
continue; continue;
} }
BMessage* message = new BMessage(kMsgUpdateModifier); BMessage* message = new BMessage(kMsgUpdateModifier);
message->AddInt32(_KeyToString(MENU_ITEM_SHIFT), key); message->AddInt32(sKey, key);
BMenuItem* item = new BMenuItem( BMenuItem* item = new BMenuItem(B_TRANSLATE_NOCOLLECT(_KeyToString(key)), message);
B_TRANSLATE_NOCOLLECT(_KeyToString(key)), message); menu->AddItem(item, key);
fShiftMenu->AddItem(item, key);
} }
fShiftMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, menu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_VERTICAL_UNSET));
B_ALIGN_VERTICAL_UNSET));
return new BMenuField(B_TRANSLATE_COMMENT("Shift:", "Shift key role name"), BMenuField* menuField = new BMenuField(comment, menu);
fShiftMenu); menuField->SetAlignment(B_ALIGN_RIGHT);
}
*outMenu = menu;
BMenuField* *outField = menuField;
ModifierKeysWindow::_CreateControlMenuField()
{
fControlMenu = new BPopUpMenu(
B_TRANSLATE_NOCOLLECT(_KeyToString(MENU_ITEM_CONTROL)), true, true);
for (int32 key = MENU_ITEM_SHIFT; key <= MENU_ITEM_DISABLED; key++) {
if (key == MENU_ITEM_SEPERATOR) {
// add separator item
BSeparatorItem* separator = new BSeparatorItem;
fControlMenu->AddItem(separator, MENU_ITEM_SEPERATOR);
continue;
}
BMessage* message = new BMessage(kMsgUpdateModifier);
message->AddInt32(_KeyToString(MENU_ITEM_CONTROL), key);
BMenuItem* item = new BMenuItem(
B_TRANSLATE_NOCOLLECT(_KeyToString(key)), message);
fControlMenu->AddItem(item, key);
}
fControlMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_VERTICAL_UNSET));
return new BMenuField(B_TRANSLATE_COMMENT("Control:",
"Control key role name"), fControlMenu);
}
BMenuField*
ModifierKeysWindow::_CreateOptionMenuField()
{
fOptionMenu = new BPopUpMenu(
B_TRANSLATE_NOCOLLECT(_KeyToString(MENU_ITEM_OPTION)), true, true);
for (int32 key = MENU_ITEM_SHIFT; key <= MENU_ITEM_DISABLED; key++) {
if (key == MENU_ITEM_SEPERATOR) {
// add separator item
BSeparatorItem* separator = new BSeparatorItem;
fOptionMenu->AddItem(separator, MENU_ITEM_SEPERATOR);
continue;
}
BMessage* message = new BMessage(kMsgUpdateModifier);
message->AddInt32(_KeyToString(MENU_ITEM_OPTION), key);
BMenuItem* item = new BMenuItem(
B_TRANSLATE_NOCOLLECT(_KeyToString(key)), message);
fOptionMenu->AddItem(item, key);
}
fOptionMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_VERTICAL_UNSET));
return new BMenuField(B_TRANSLATE_COMMENT("Option:",
"Option key role name"), fOptionMenu);
}
BMenuField*
ModifierKeysWindow::_CreateCommandMenuField()
{
fCommandMenu = new BPopUpMenu(
B_TRANSLATE_NOCOLLECT(_KeyToString(MENU_ITEM_COMMAND)), true, true);
for (int32 key = MENU_ITEM_SHIFT; key <= MENU_ITEM_DISABLED; key++) {
if (key == MENU_ITEM_SEPERATOR) {
// add separator item
BSeparatorItem* separator = new BSeparatorItem;
fCommandMenu->AddItem(separator, MENU_ITEM_SEPERATOR);
continue;
}
BMessage* message = new BMessage(kMsgUpdateModifier);
message->AddInt32(_KeyToString(MENU_ITEM_COMMAND), key);
BMenuItem* item = new BMenuItem(
B_TRANSLATE_NOCOLLECT(_KeyToString(key)), message);
fCommandMenu->AddItem(item, key);
}
fCommandMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_VERTICAL_UNSET));
return new BMenuField(B_TRANSLATE_COMMENT("Command:",
"Command key role name"), fCommandMenu);
} }
void void
ModifierKeysWindow::_MarkMenuItems() ModifierKeysWindow::_MarkMenuItems()
{ {
for (int32 key = MENU_ITEM_SHIFT; key <= MENU_ITEM_DISABLED; key++) { _MarkMenuItem(fShiftMenu, fShiftConflictView,
if (key == MENU_ITEM_SEPERATOR) fCurrentMap->left_shift_key, fCurrentMap->right_shift_key);
_MarkMenuItem(fControlMenu, fControlConflictView,
fCurrentMap->left_control_key, fCurrentMap->right_control_key);
_MarkMenuItem(fOptionMenu, fOptionConflictView,
fCurrentMap->left_option_key, fCurrentMap->right_option_key);
_MarkMenuItem(fCommandMenu, fCommandConflictView,
fCurrentMap->left_command_key, fCurrentMap->right_command_key);
_MarkMenuItem(fCapsMenu, fCapsConflictView,
fCurrentMap->caps_key, fCurrentMap->caps_key);
}
void
ModifierKeysWindow::_MarkMenuItem(BPopUpMenu* menu, ConflictView* conflictView,
uint32 leftKey, uint32 rightKey)
{
for (int32 key = MENU_ITEM_FIRST; key <= MENU_ITEM_LAST; key++) {
if (key == MENU_ITEM_SEPARATOR)
continue; continue;
if (fCurrentMap->left_shift_key == _KeyToKeyCode(key) if (leftKey == _KeyToKeyCode(key) && rightKey == _KeyToKeyCode(key, true))
&& fCurrentMap->right_shift_key == _KeyToKeyCode(key, true)) { menu->ItemAt(key)->SetMarked(true);
fShiftMenu->ItemAt(key)->SetMarked(true);
}
if (fCurrentMap->left_control_key == _KeyToKeyCode(key)
&& fCurrentMap->right_control_key == _KeyToKeyCode(key, true)) {
fControlMenu->ItemAt(key)->SetMarked(true);
}
if (fCurrentMap->left_option_key == _KeyToKeyCode(key)
&& fCurrentMap->right_option_key == _KeyToKeyCode(key, true)) {
fOptionMenu->ItemAt(key)->SetMarked(true);
}
if (fCurrentMap->left_command_key == _KeyToKeyCode(key)
&& fCurrentMap->right_command_key == _KeyToKeyCode(key, true)) {
fCommandMenu->ItemAt(key)->SetMarked(true);
}
} }
// Set the warning icon if not marked // Set the warning icon if not marked
BBitmap* shiftIcon = fShiftConflictView->Icon(); BBitmap* icon = conflictView->Icon();
BBitmap* controlIcon = fControlConflictView->Icon();
BBitmap* optionIcon = fOptionConflictView->Icon();
BBitmap* commandIcon = fCommandConflictView->Icon();
fShiftConflictView->SetWarnIcon(fShiftMenu->FindMarked() == NULL); conflictView->SetWarnIcon(menu->FindMarked() == NULL);
fControlConflictView->SetWarnIcon(fControlMenu->FindMarked() == NULL);
fOptionConflictView->SetWarnIcon(fOptionMenu->FindMarked() == NULL);
fCommandConflictView->SetWarnIcon(fCommandMenu->FindMarked() == NULL);
// if there was a change invalidate the view // if there was a change invalidate the view
if (shiftIcon != fShiftConflictView->Icon()) if (icon != conflictView->Icon())
fShiftConflictView->Invalidate(); conflictView->Invalidate();
if (controlIcon != fControlConflictView->Icon())
fControlConflictView->Invalidate();
if (optionIcon != fOptionConflictView->Icon())
fOptionConflictView->Invalidate();
if (commandIcon != fCommandConflictView->Icon())
fCommandConflictView->Invalidate();
} }
@@ -613,6 +510,10 @@ const char*
ModifierKeysWindow::_KeyToString(int32 key) ModifierKeysWindow::_KeyToString(int32 key)
{ {
switch (key) { switch (key) {
case MENU_ITEM_CAPS:
return B_TRANSLATE_COMMENT("Caps key",
"Label of key above Shift, usually Caps Lock");
case MENU_ITEM_SHIFT: case MENU_ITEM_SHIFT:
return B_TRANSLATE_COMMENT("Shift key", return B_TRANSLATE_COMMENT("Shift key",
"Label of key above Ctrl, usually Shift"); "Label of key above Ctrl, usually Shift");
@@ -643,6 +544,9 @@ uint32
ModifierKeysWindow::_KeyToKeyCode(int32 key, bool right) ModifierKeysWindow::_KeyToKeyCode(int32 key, bool right)
{ {
switch (key) { switch (key) {
case MENU_ITEM_CAPS:
return 0x3b;
case MENU_ITEM_SHIFT: case MENU_ITEM_SHIFT:
if (right) if (right)
return 0x56; return 0x56;
@@ -676,54 +580,42 @@ void
ModifierKeysWindow::_ValidateDuplicateKeys() ModifierKeysWindow::_ValidateDuplicateKeys()
{ {
uint32 dupMask = _DuplicateKeys(); uint32 dupMask = _DuplicateKeys();
_ValidateDuplicateKey(fCapsConflictView, CAPS_KEY & dupMask);
BBitmap* shiftIcon = fShiftConflictView->Icon(); _ValidateDuplicateKey(fShiftConflictView, SHIFT_KEY & dupMask);
BBitmap* controlIcon = fControlConflictView->Icon(); _ValidateDuplicateKey(fControlConflictView, CONTROL_KEY & dupMask);
BBitmap* optionIcon = fOptionConflictView->Icon(); _ValidateDuplicateKey(fOptionConflictView, OPTION_KEY & dupMask);
BBitmap* commandIcon = fCommandConflictView->Icon(); _ValidateDuplicateKey(fCommandConflictView, COMMAND_KEY & dupMask);
if ((dupMask & SHIFT_KEY) != 0)
fShiftConflictView->SetStopIcon(true);
if ((dupMask & CONTROL_KEY) != 0)
fControlConflictView->SetStopIcon(true);
if ((dupMask & OPTION_KEY) != 0)
fOptionConflictView->SetStopIcon(true);
if ((dupMask & COMMAND_KEY) != 0)
fCommandConflictView->SetStopIcon(true);
fOkButton->SetEnabled(dupMask == 0); fOkButton->SetEnabled(dupMask == 0);
}
void
ModifierKeysWindow::_ValidateDuplicateKey(ConflictView* view, uint32 mask)
{
BBitmap* icon = view->Icon();
view->SetStopIcon(mask != 0);
// if there was a change invalidate the view // if there was a change invalidate the view
if (shiftIcon != fShiftConflictView->Icon()) if (icon != view->Icon())
fShiftConflictView->Invalidate(); view->Invalidate();
if (controlIcon != fControlConflictView->Icon())
fControlConflictView->Invalidate();
if (optionIcon != fOptionConflictView->Icon())
fOptionConflictView->Invalidate();
if (commandIcon != fCommandConflictView->Icon())
fCommandConflictView->Invalidate();
} }
// return a mask marking which keys are duplicates of each other for // return a mask marking which keys are duplicates of each other for
// validation. Shift = 0, Control = 1, Option = 2, Command = 3 // validation.
uint32 uint32
ModifierKeysWindow::_DuplicateKeys() ModifierKeysWindow::_DuplicateKeys()
{ {
uint32 duplicateMask = 0; uint32 duplicateMask = 0;
for (int32 testKey = MENU_ITEM_SHIFT; testKey <= MENU_ITEM_COMMAND; for (int32 testKey = MENU_ITEM_FIRST; testKey <= MENU_ITEM_LAST; testKey++) {
testKey++) {
uint32 testLeft = 0; uint32 testLeft = 0;
uint32 testRight = 0; uint32 testRight = 0;
switch (testKey) { switch (testKey) {
case MENU_ITEM_CAPS:
testLeft = fCurrentMap->caps_key;
break;
case MENU_ITEM_SHIFT: case MENU_ITEM_SHIFT:
testLeft = fCurrentMap->left_shift_key; testLeft = fCurrentMap->left_shift_key;
testRight = fCurrentMap->right_shift_key; testRight = fCurrentMap->right_shift_key;
@@ -748,7 +640,7 @@ ModifierKeysWindow::_DuplicateKeys()
if (testLeft == 0 && testRight == 0) if (testLeft == 0 && testRight == 0)
continue; continue;
for (int32 key = MENU_ITEM_SHIFT; key <= MENU_ITEM_COMMAND; key++) { for (int32 key = MENU_ITEM_FIRST; key <= MENU_ITEM_LAST; key++) {
if (key == testKey) { if (key == testKey) {
// skip over yourself // skip over yourself
continue; continue;
@@ -758,6 +650,10 @@ ModifierKeysWindow::_DuplicateKeys()
uint32 right = 0; uint32 right = 0;
switch (key) { switch (key) {
case MENU_ITEM_CAPS:
left = fCurrentMap->caps_key;
break;
case MENU_ITEM_SHIFT: case MENU_ITEM_SHIFT:
left = fCurrentMap->left_shift_key; left = fCurrentMap->left_shift_key;
right = fCurrentMap->right_shift_key; right = fCurrentMap->right_shift_key;
@@ -791,40 +687,3 @@ ModifierKeysWindow::_DuplicateKeys()
return duplicateMask; return duplicateMask;
} }
void
ModifierKeysWindow::_HideShowIcons()
{
if (fShiftConflictView->Icon() == NULL) {
while (!fShiftConflictView->IsHidden())
fShiftConflictView->Hide();
} else {
while (fShiftConflictView->IsHidden())
fShiftConflictView->Show();
}
if (fControlConflictView->Icon() == NULL) {
while (!fControlConflictView->IsHidden())
fControlConflictView->Hide();
} else {
while (fControlConflictView->IsHidden())
fControlConflictView->Show();
}
if (fOptionConflictView->Icon() == NULL) {
while (!fOptionConflictView->IsHidden())
fOptionConflictView->Hide();
} else {
while (fOptionConflictView->IsHidden())
fOptionConflictView->Show();
}
if (fCommandConflictView->Icon() == NULL) {
while (!fCommandConflictView->IsHidden())
fCommandConflictView->Hide();
} else {
while (fCommandConflictView->IsHidden())
fCommandConflictView->Show();
}
}
src/preferences/keymap/ModifierKeysWindow.h
+10 -6
View File
@@ -1,9 +1,10 @@
/* /*
* Copyright 2011-2014 Haiku, Inc. All rights reserved. * Copyright 2011-2023 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* John Scipione, [email protected] * John Scipione, [email protected]
* Jorge Acereda, [email protected]
*/ */
#ifndef MODIFIER_KEYS_WINDOW_H #ifndef MODIFIER_KEYS_WINDOW_H
#define MODIFIER_KEYS_WINDOW_H #define MODIFIER_KEYS_WINDOW_H
@@ -45,25 +46,28 @@ public:
virtual void MessageReceived(BMessage* message); virtual void MessageReceived(BMessage* message);
private: private:
BMenuField* _CreateShiftMenuField(); void _CreateMenuField(
BMenuField* _CreateControlMenuField(); BPopUpMenu** outMenu, BMenuField** outField,
BMenuField* _CreateOptionMenuField(); uint32 inKey, const char* comment);
BMenuField* _CreateCommandMenuField();
void _MarkMenuItems(); void _MarkMenuItems();
void _MarkMenuItem(BPopUpMenu* menu, ConflictView* conflictView,
uint32 leftKey, uint32 rightKey);
const char* _KeyToString(int32 key); const char* _KeyToString(int32 key);
uint32 _KeyToKeyCode(int32 key, uint32 _KeyToKeyCode(int32 key,
bool right = false); bool right = false);
int32 _LastKey(); int32 _LastKey();
void _ValidateDuplicateKeys(); void _ValidateDuplicateKeys();
void _ValidateDuplicateKey(ConflictView* view, uint32 mask);
uint32 _DuplicateKeys(); uint32 _DuplicateKeys();
void _HideShowIcons();
BPopUpMenu* fCapsMenu;
BPopUpMenu* fShiftMenu; BPopUpMenu* fShiftMenu;
BPopUpMenu* fControlMenu; BPopUpMenu* fControlMenu;
BPopUpMenu* fOptionMenu; BPopUpMenu* fOptionMenu;
BPopUpMenu* fCommandMenu; BPopUpMenu* fCommandMenu;
ConflictView* fCapsConflictView;
ConflictView* fShiftConflictView; ConflictView* fShiftConflictView;
ConflictView* fControlConflictView; ConflictView* fControlConflictView;
ConflictView* fOptionConflictView; ConflictView* fOptionConflictView;