From 4f8e7ecc5a6fe3cf1c1de6ca1add47e03fc2ac82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 8 Dec 2008 20:50:16 +0000 Subject: [PATCH] * use the keymap control and command keys to trigger the team monitor * this fixes part of #3176 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28782 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../input_server/devices/keyboard/KeyboardInputDevice.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp index 1027411142..3ec0be9859 100644 --- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp +++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp @@ -636,8 +636,8 @@ KeyboardDevice::_ControlThread() } if (isKeyDown && keycode == 0x34 // DELETE KEY - && (states[0x5c >> 3] & (1 << (7 - (0x5c & 0x7)))) - && (states[0x5d >> 3] & (1 << (7 - (0x5d & 0x7))))) { + && (states[fCommandKey >> 3] & (1 << (7 - (fCommandKey & 0x7)))) + && (states[fControlKey >> 3] & (1 << (7 - (fControlKey & 0x7))))) { LOG_EVENT("TeamMonitor called\n"); // show the team monitor @@ -825,6 +825,8 @@ KeyboardDevice::_UpdateSettings(uint32 opcode) fKeymap.LoadCurrent(); fModifiers = fKeymap.Locks(); _UpdateLEDs(); + fControlKey = fKeymap.KeyForModifier(B_LEFT_CONTROL_KEY); + fCommandKey = fKeymap.KeyForModifier(B_LEFT_COMMAND_KEY); } }