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

Patch from barber (part of bug #141):

Browse Source 
better handling of method events


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16666 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-03-08 23:05:25 +00:00
parent abb84c7d51
commit 059b715043
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/input/InputServer.cpp
+17 -20
View File
@@ -1476,9 +1476,9 @@ InputServer::_SanitizeEvents(EventList& events)
PRINT(("SanitizeEvents: %lx, %lx\n", fKeyInfo.modifiers, PRINT(("SanitizeEvents: %lx, %lx\n", fKeyInfo.modifiers,
fKeyInfo.key_states[KEY_Spacebar >> 3])); fKeyInfo.key_states[KEY_Spacebar >> 3]));
int8 byte;
if ((fKeyInfo.modifiers & B_COMMAND_KEY) != 0 if ((fKeyInfo.modifiers & B_COMMAND_KEY) != 0
&& (fKeyInfo.key_states[KEY_Spacebar >> 3] && event->FindInt8("byte", &byte) == B_OK && byte == ' ') {
& (1 << (7 - (KEY_Spacebar % 8))))) {
SetNextMethod(!fKeyInfo.modifiers & B_SHIFT_KEY); SetNextMethod(!fKeyInfo.modifiers & B_SHIFT_KEY);
// this event isn't sent to the user // this event isn't sent to the user
@@ -1526,7 +1526,7 @@ InputServer::_MethodizeEvents(EventList& events)
if (!fInputMethodAware) { if (!fInputMethodAware) {
// special handling for non-input-method-aware views // special handling for non-input-method-aware views
for (int32 i = count; i < newCount; i++) { for (int32 i = 0; i < newCount; i++) {
BMessage* event = events.ItemAt(i); BMessage* event = events.ItemAt(i);
if (event->what != B_INPUT_METHOD_EVENT) if (event->what != B_INPUT_METHOD_EVENT)
@@ -1536,32 +1536,29 @@ InputServer::_MethodizeEvents(EventList& events)
int32 opcode; int32 opcode;
if (event->FindInt32("be:opcode", &opcode) == B_OK) { if (event->FindInt32("be:opcode", &opcode) == B_OK) {
if (fInputMethodWindow && opcode == B_INPUT_METHOD_STOPPED) {
fInputMethodWindow->PostMessage(B_QUIT_REQUESTED);
fInputMethodWindow = NULL;
continue;
}
if (fInputMethodWindow == NULL if (fInputMethodWindow == NULL
&& opcode == B_INPUT_METHOD_STARTED) && opcode == B_INPUT_METHOD_STARTED)
fInputMethodWindow = new (nothrow) BottomlineWindow(); fInputMethodWindow = new (nothrow) BottomlineWindow();
}
if (fInputMethodWindow != NULL) { if (fInputMethodWindow != NULL) {
EventList newEvents; EventList newEvents;
fInputMethodWindow->HandleInputMethodEvent(event, newEvents); fInputMethodWindow->HandleInputMethodEvent(event, newEvents);
if (!newEvents.IsEmpty()) {
fInputMethodWindow->PostMessage(B_QUIT_REQUESTED);
fInputMethodWindow = NULL;
// replace event with new events (but don't scan them again // replace event with new events (but don't scan them again
// for input method messages) // for input method messages)
events.RemoveItemAt(i); events.RemoveItemAt(i--);
delete event; delete event;
newCount--;
events.AddList(&newEvents, i); if (!newEvents.IsEmpty()) {
i += newEvents.CountItems() - 1; events.AddList(&newEvents);
newCount = events.CountItems(); opcode = B_INPUT_METHOD_STOPPED;
}
if (opcode == B_INPUT_METHOD_STOPPED) {
fInputMethodWindow->PostMessage(B_QUIT_REQUESTED);
fInputMethodWindow = NULL;
}
} }
} }
} }