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

* For dead keys, the keyboard input device now sends a B_UNMAPPED_KEY_DOWN

Browse Source 
event.
* This allows applications to listen to keys independent to their dead key
  status.
* The app_server keyboard filter now also check for B_UNMAPPED_KEY_DOWN.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34112 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-18 13:47:08 +00:00
parent bac2cf0b57
commit 0296ba19bb
2 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+58 -53
View File
@@ -711,55 +711,57 @@ KeyboardDevice::_ControlThread()
if (activeDeadKey == 0 || !isKeyDown) if (activeDeadKey == 0 || !isKeyDown)
newDeadKey = fKeymap.IsDeadKey(keycode, fModifiers); newDeadKey = fKeymap.IsDeadKey(keycode, fModifiers);
char* string = NULL;
char* rawString = NULL;
int32 numBytes = 0, rawNumBytes = 0;
if (newDeadKey == 0) { if (newDeadKey == 0) {
char* string = NULL;
char* rawString = NULL;
int32 numBytes = 0, rawNumBytes = 0;
fKeymap.GetChars(keycode, fModifiers, activeDeadKey, &string, fKeymap.GetChars(keycode, fModifiers, activeDeadKey, &string,
&numBytes); &numBytes);
fKeymap.GetChars(keycode, 0, 0, &rawString, &rawNumBytes); }
fKeymap.GetChars(keycode, 0, 0, &rawString, &rawNumBytes);
BMessage* msg = new BMessage; BMessage* msg = new BMessage;
if (msg == NULL) { if (msg == NULL) {
delete[] string; delete[] string;
delete[] rawString;
continue;
}
if (numBytes > 0)
msg->what = isKeyDown ? B_KEY_DOWN : B_KEY_UP;
else
msg->what = isKeyDown ? B_UNMAPPED_KEY_DOWN : B_UNMAPPED_KEY_UP;
msg->AddInt64("when", timestamp);
msg->AddInt32("key", keycode);
msg->AddInt32("modifiers", fModifiers);
msg->AddData("states", B_UINT8_TYPE, states, 16);
if (numBytes > 0) {
for (int i = 0; i < numBytes; i++)
msg->AddInt8("byte", (int8)string[i]);
msg->AddData("bytes", B_STRING_TYPE, string, numBytes + 1);
if (rawNumBytes <= 0) {
rawNumBytes = 1;
delete[] rawString; delete[] rawString;
continue; rawString = string;
}
if (numBytes > 0)
msg->what = isKeyDown ? B_KEY_DOWN : B_KEY_UP;
else
msg->what = isKeyDown ? B_UNMAPPED_KEY_DOWN : B_UNMAPPED_KEY_UP;
msg->AddInt64("when", timestamp);
msg->AddInt32("key", keycode);
msg->AddInt32("modifiers", fModifiers);
msg->AddData("states", B_UINT8_TYPE, states, 16);
if (numBytes > 0) {
for (int i = 0; i < numBytes; i++)
msg->AddInt8("byte", (int8)string[i]);
msg->AddData("bytes", B_STRING_TYPE, string, numBytes + 1);
if (rawNumBytes <= 0) {
rawNumBytes = 1;
delete[] rawString;
rawString = string;
} else
delete[] string;
if (isKeyDown && lastKeyCode == keycode) {
repeatCount++;
msg->AddInt32("be:key_repeat", repeatCount);
} else
repeatCount = 1;
} else } else
delete[] string; delete[] string;
if (rawNumBytes > 0) if (isKeyDown && lastKeyCode == keycode) {
msg->AddInt32("raw_char", (uint32)((uint8)rawString[0] & 0x7f)); repeatCount++;
msg->AddInt32("be:key_repeat", repeatCount);
} else
repeatCount = 1;
} else
delete[] string;
delete[] rawString; if (rawNumBytes > 0)
msg->AddInt32("raw_char", (uint32)((uint8)rawString[0] & 0x7f));
delete[] rawString;
if (newDeadKey == 0) {
if (isKeyDown && !modifiers && activeDeadKey != 0) { if (isKeyDown && !modifiers && activeDeadKey != 0) {
// a dead key was completed // a dead key was completed
activeDeadKey = 0; activeDeadKey = 0;
@@ -768,23 +770,26 @@ KeyboardDevice::_ControlThread()
string, true, msg); string, true, msg);
_EnqueueInlineInputMethod(B_INPUT_METHOD_STOPPED); _EnqueueInlineInputMethod(B_INPUT_METHOD_STOPPED);
fInputMethodStarted = false; fInputMethodStarted = false;
} else if (fOwner->EnqueueMessage(msg) != B_OK) msg = NULL;
delete msg; }
} else if (fOwner->EnqueueMessage(msg) != B_OK)
delete msg;
} else if (isKeyDown) {
// start of a dead key
if (_EnqueueInlineInputMethod(B_INPUT_METHOD_STARTED) == B_OK) {
char* string = NULL;
int32 numBytes = 0;
fKeymap.GetChars(keycode, fModifiers, 0, &string, &numBytes);
if (_EnqueueInlineInputMethod(B_INPUT_METHOD_CHANGED, string) == B_OK)
fInputMethodStarted = true;
activeDeadKey = newDeadKey;
} }
} else if (isKeyDown
&& _EnqueueInlineInputMethod(B_INPUT_METHOD_STARTED) == B_OK) {
// start of a dead key
char* string = NULL;
int32 numBytes = 0;
fKeymap.GetChars(keycode, fModifiers, 0, &string, &numBytes);
if (_EnqueueInlineInputMethod(B_INPUT_METHOD_CHANGED, string)
== B_OK)
fInputMethodStarted = true;
activeDeadKey = newDeadKey;
} }
if (msg != NULL && fOwner->EnqueueMessage(msg) != B_OK)
delete msg;
lastKeyCode = isKeyDown ? keycode : 0; lastKeyCode = isKeyDown ? keycode : 0;
} }
src/servers/app/Desktop.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target,
int32 key = 0; int32 key = 0;
int32 modifiers; int32 modifiers;
if (message->what == B_KEY_DOWN if ((message->what == B_KEY_DOWN || message->what == B_UNMAPPED_KEY_DOWN)
&& message->FindInt32("key", &key) == B_OK && message->FindInt32("key", &key) == B_OK
&& message->FindInt32("modifiers", &modifiers) == B_OK) { && message->FindInt32("modifiers", &modifiers) == B_OK) {
// Check for safe video mode (cmd + ctrl + escape) // Check for safe video mode (cmd + ctrl + escape)