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

Helped BWindow for calling the apropriate BView hook methods on some mouse and keyboard events

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11242 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca
2005-02-03 22:50:48 +00:00
parent 79c8040e93
commit 998521f78d
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/server/RootLayer.cpp
+4 -5
View File
@@ -1288,10 +1288,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
} }
keymsg.AddString("bytes",string); keymsg.AddString("bytes",string);
// keymsg.AddInt32("raw_char",raw_char); // keymsg.AddInt32("raw_char",raw_char);
keymsg.AddInt32("haiku:token", target->fViewToken);
printf("RootLayer keyboard message:\n");
keymsg.PrintToStream();
printf("\n");
win->SendMessageToClient(&keymsg); win->SendMessageToClient(&keymsg);
} }
} }
@@ -1386,7 +1384,8 @@ printf("\n");
} }
keymsg.AddString("bytes",string); keymsg.AddString("bytes",string);
keymsg.AddInt32("raw_char",raw_char); keymsg.AddInt32("raw_char",raw_char);
keymsg.AddInt32("haiku:token", target->fViewToken);
win->SendMessageToClient(&keymsg); win->SendMessageToClient(&keymsg);
} }
} }
src/servers/app/server/WinBorder.cpp
+6 -3
View File
@@ -220,7 +220,8 @@ void WinBorder::MouseDown(PointerEvent& evt, bool sendMessage)
} }
} }
} }
else if (sendMessage && target && target != fTopLayer){ else if (sendMessage && target && target != fTopLayer)
{
BMessage msg; BMessage msg;
msg.what = B_MOUSE_DOWN; msg.what = B_MOUSE_DOWN;
msg.AddInt64("when", evt.when); msg.AddInt64("when", evt.when);
@@ -360,13 +361,15 @@ void WinBorder::MouseUp(PointerEvent& evt)
return; return;
} }
if (fTopLayer->fFullVisible.Contains(evt.where)) Layer *target = LayerAt(evt.where);
if (target && target != fTopLayer)
{ {
BMessage upmsg(B_MOUSE_UP); BMessage upmsg(B_MOUSE_UP);
upmsg.AddInt64("when",evt.when); upmsg.AddInt64("when",evt.when);
upmsg.AddPoint("where",evt.where); upmsg.AddPoint("where",evt.where);
upmsg.AddInt32("modifiers",evt.modifiers); upmsg.AddInt32("modifiers",evt.modifiers);
upmsg.AddInt32("haiku:token", target? target->fViewToken: B_NULL_TOKEN);
Window()->SendMessageToClient(&upmsg); Window()->SendMessageToClient(&upmsg);
} }
} }