Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The keyboard focus is now always updated if the message is a B_[UNMAPPED_]KEY_DOWN or a

Browse Source 
B_MODIFIERS_CHANGED message.
This fixes bug #175 (which was probably caused by a bug in our old BMessage implementation,
see TODO item in line 141).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16414 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-02-15 18:38:39 +00:00
parent aaa1e815fa
commit 36e8fa618f
1 changed files with 74 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/servers/app/Desktop.cpp
View File

@ -59,6 +59,8 @@ class KeyboardFilter : public EventFilter {
int32* _viewToken, BMessage* latestMouseMoved); int32* _viewToken, BMessage* latestMouseMoved);
private: private:
void _UpdateFocus(int32 key, EventTarget** _target);
Desktop* fDesktop; Desktop* fDesktop;
EventTarget* fLastFocus; EventTarget* fLastFocus;
bigtime_t fTimestamp; bigtime_t fTimestamp;
@ -88,68 +90,14 @@ KeyboardFilter::KeyboardFilter(Desktop* desktop)
} }
filter_result void
KeyboardFilter::Filter(BMessage* message, EventTarget** _target, KeyboardFilter::_UpdateFocus(int32 key, EventTarget** _target)
int32* /*_viewToken*/, BMessage* /*latestMouseMoved*/)
{ {
int32 key; if (!fDesktop->LockSingleWindow())
int32 modifiers; return;
if (message->what != B_KEY_DOWN
|| message->FindInt32("key", &key) != B_OK
|| message->FindInt32("modifiers", &modifiers) != B_OK)
return B_DISPATCH_MESSAGE;
// Check for safe video mode (F12 + l-cmd + l-ctrl + l-shift)
if (key == 0x0d
&& (modifiers & (B_LEFT_COMMAND_KEY
| B_LEFT_CONTROL_KEY | B_LEFT_SHIFT_KEY)) != 0)
{
// TODO: Set to Safe Mode in KeyboardEventHandler:B_KEY_DOWN.
STRACE(("Safe Video Mode invoked - code unimplemented\n"));
return B_SKIP_MESSAGE;
}
if (key > 0x01 && key < 0x0e) {
// workspace change, F1-F12
#if !TEST_MODE
if (modifiers & B_COMMAND_KEY)
#else
if (modifiers & B_CONTROL_KEY)
#endif
{
STRACE(("Set Workspace %ld\n", key - 1));
fDesktop->SetWorkspace(key - 2);
return B_SKIP_MESSAGE;
}
}
// TODO: this should be moved client side!
// (that's how it is done in BeOS, clients could need this key for
// different purposes - also, it's preferrable to let the client
// write the dump within his own environment)
if (key == 0xe) {
// screen dump, PrintScreen
char filename[128];
BEntry entry;
int32 index = 1;
do {
sprintf(filename, "/boot/home/screen%ld.png", index++);
entry.SetTo(filename);
} while(entry.Exists());
fDesktop->GetDrawingEngine()->DumpToFile(filename);
return B_SKIP_MESSAGE;
}
bigtime_t now = system_time(); bigtime_t now = system_time();
if (!fDesktop->LockSingleWindow())
return B_DISPATCH_MESSAGE;
EventTarget* focus = NULL; EventTarget* focus = NULL;
if (fDesktop->FocusWindow() != NULL) if (fDesktop->FocusWindow() != NULL)
focus = &fDesktop->FocusWindow()->EventTarget(); focus = &fDesktop->FocusWindow()->EventTarget();
@ -168,7 +116,7 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target,
// it, and the event focus passed in is always valid (or NULL) // it, and the event focus passed in is always valid (or NULL)
*_target = focus; *_target = focus;
fLastFocus = focus; fLastFocus = focus;
} }
fDesktop->UnlockSingleWindow(); fDesktop->UnlockSingleWindow();
@ -177,6 +125,73 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target,
fTimestamp = 0; fTimestamp = 0;
else else
fTimestamp = now; fTimestamp = now;
}
filter_result
KeyboardFilter::Filter(BMessage* message, EventTarget** _target,
int32* /*_viewToken*/, BMessage* /*latestMouseMoved*/)
{
int32 key = 0;
int32 modifiers;
if (message->what == B_KEY_DOWN
&& message->FindInt32("key", &key) == B_OK
&& message->FindInt32("modifiers", &modifiers) == B_OK) {
// TODO: for some reason, one of the above is failing when pressing
// a modifier key at least with the old BMessage implementation
// (a message dump shows all entries, though)
// Try again with BMessage4!
// Check for safe video mode (F12 + l-cmd + l-ctrl + l-shift)
if (key == 0x0d
&& (modifiers & (B_LEFT_COMMAND_KEY
| B_LEFT_CONTROL_KEY | B_LEFT_SHIFT_KEY)) != 0) {
// TODO: Set to Safe Mode in KeyboardEventHandler:B_KEY_DOWN.
STRACE(("Safe Video Mode invoked - code unimplemented\n"));
return B_SKIP_MESSAGE;
}
if (key > 0x01 && key < 0x0e) {
// workspace change, F1-F12
#if !TEST_MODE
if (modifiers & B_COMMAND_KEY)
#else
if (modifiers & B_CONTROL_KEY)
#endif
{
STRACE(("Set Workspace %ld\n", key - 1));
fDesktop->SetWorkspace(key - 2);
return B_SKIP_MESSAGE;
}
}
// TODO: this should be moved client side!
// (that's how it is done in BeOS, clients could need this key for
// different purposes - also, it's preferrable to let the client
// write the dump within his own environment)
if (key == 0xe) {
// screen dump, PrintScreen
char filename[128];
BEntry entry;
int32 index = 1;
do {
sprintf(filename, "/boot/home/screen%ld.png", index++);
entry.SetTo(filename);
} while(entry.Exists());
fDesktop->GetDrawingEngine()->DumpToFile(filename);
return B_SKIP_MESSAGE;
}
}
if (message->what == B_KEY_DOWN
|| message->what == B_MODIFIERS_CHANGED
|| message->what == B_UNMAPPED_KEY_DOWN)
_UpdateFocus(key, _target);
return B_DISPATCH_MESSAGE; return B_DISPATCH_MESSAGE;
} }