ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-12 07:24:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nit_fb: fix translation of absolute motion events

Browse Source
This commit is contained in:
Norman Feske 2014-08-22 15:34:56 +02:00
parent ddb81fa361
commit 6a4f232d60
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/os/src/server/nit_fb/main.cc
View File

@ -54,8 +54,9 @@ long config_arg(const char *attr, long default_value)
/** /**
* Translate input event * Translate input event
*/ */
static Input::Event translate_event(Input::Event const ev, static Input::Event translate_event(Input::Event const ev,
Nit_fb::Point const input_origin) Nit_fb::Point const input_origin,
Nit_fb::Area const boundary)
{ {
switch (ev.type()) { switch (ev.type()) {
@ -65,9 +66,14 @@ static Input::Event translate_event(Input::Event const ev,
case Input::Event::FOCUS: case Input::Event::FOCUS:
case Input::Event::LEAVE: case Input::Event::LEAVE:
{ {
Nit_fb::Point abs_pos = Nit_fb::Point(ev.ax(), ev.ay()) + input_origin; Nit_fb::Point abs_pos = Nit_fb::Point(ev.ax(), ev.ay()) - input_origin;
using namespace Genode;
return Input::Event(ev.type(), ev.code(), return Input::Event(ev.type(), ev.code(),
abs_pos.x(), abs_pos.y(), 0, 0); min((int)boundary.w() - 1, max(0, abs_pos.x())),
min((int)boundary.h() - 1, max(0, abs_pos.y())),
0, 0);
} }
case Input::Event::INVALID: case Input::Event::INVALID:
@ -288,7 +294,7 @@ struct Nit_fb::Main : View_updater
unsigned const num = nitpicker.input()->flush(); unsigned const num = nitpicker.input()->flush();
for (unsigned i = 0; i < num; i++) for (unsigned i = 0; i < num; i++)
input_session.submit(translate_event(events[i], position)); input_session.submit(translate_event(events[i], position, fb_session.size()));
} }
Signal_rpc_member<Main> input_dispatcher = Signal_rpc_member<Main> input_dispatcher =