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

mouse & keyboard messages now use the full power of application_kit

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11281 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca 2005-02-07 00:32:32 +00:00
parent fde1c7aa30
commit 7b76dd8073
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/kits/interface/Window.cpp
View File

@ -788,13 +788,10 @@ void BWindow::DispatchMessage(BMessage *msg, BHandler *target)
uint32 modifiers;
int32 raw_char;
const char *string=NULL;
int32 viewToken;
msg->FindInt32( "modifiers", (int32*)&modifiers );
msg->FindInt32( "raw_char", &raw_char );
msg->FindString( "bytes", &string );
msg->FindInt32( "haiku:token", &viewToken );
msg->RemoveName("haiku:token");
if ( !handleKeyDown( string[0], (uint32)modifiers) )
{
@ -808,11 +805,8 @@ void BWindow::DispatchMessage(BMessage *msg, BHandler *target)
case B_KEY_UP:
{
const char *string=NULL;
int32 viewToken;
msg->FindString( "bytes", &string );
msg->FindInt32( "haiku:token", &viewToken );
msg->RemoveName("haiku:token");
if(fFocus)
fFocus->KeyUp( string, strlen(string)-1 );
@ -857,21 +851,16 @@ void BWindow::DispatchMessage(BMessage *msg, BHandler *target)
uint32 modifiers;
uint32 buttons;
int32 clicks;
int32 viewToken;
BView *targetView;
msg->FindPoint( "where", &where );
msg->FindInt32( "modifiers", (int32*)&modifiers );
msg->FindInt32( "buttons", (int32*)&buttons );
msg->FindInt32( "clicks", &clicks );
msg->FindInt32( "haiku:token", &viewToken );
msg->RemoveName("haiku:token");
targetView = findView(top_view, viewToken);
if (viewToken != B_NULL_TOKEN && targetView)
if (target && target != this && target != top_view)
{
targetView->ConvertFromScreen(&where);
targetView->MouseDown(where);
((BView*)target)->ConvertFromScreen(&where);
((BView*)target)->MouseDown(where);
}
// TODO: use the following line later, instead of the above.
@ -882,19 +871,14 @@ void BWindow::DispatchMessage(BMessage *msg, BHandler *target)
{
BPoint where;
uint32 modifiers;
int32 viewToken;
BView *targetView;
msg->FindPoint( "where", &where );
msg->FindInt32( "modifiers", (int32*)&modifiers );
msg->FindInt32( "haiku:token", &viewToken );
msg->RemoveName("haiku:token");
targetView = findView(top_view, viewToken);
if (viewToken != B_NULL_TOKEN && targetView)
if (target && target != this && target != top_view)
{
targetView->ConvertFromScreen(&where);
targetView->MouseUp(where);
((BView*)target)->ConvertFromScreen(&where);
((BView*)target)->MouseUp(where);
}
// TODO: use the following line later, instead of the above.
@ -2272,7 +2256,9 @@ void BWindow::InitData( BRect frame, const char* title, window_look look,
void BWindow::task_looper()
{
STRACE(("info: BWindow::task_looper() started.\n"));
BLooper::task_looper();
}
/*
// Check that looper is locked (should be)
AssertLocked();
@ -2391,7 +2377,7 @@ void BWindow::task_looper()
}
}
*/
//------------------------------------------------------------------------------
window_type BWindow::composeType(window_look look,