ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-17 22:58:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New Input::Event::FOCUS, rename keycode to code

Browse Source 
This patch introduces keyboard-focus events to the 'Input::Event' class
and changes the name 'Input::Event::keycode' to 'code'. The 'code'
represents the key code for PRESS/RELEASE events, and the focus state
for FOCUS events (0 - unfocused, 1 - focused).

Furthermore, nitpicker has been adapted to deliver FOCUS events to its
clients.

Fixes #609
This commit is contained in:
Norman Feske
2013-01-12 23:34:49 +01:00
parent 267817c2c5
commit af66043b79
20 changed files with 115 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
os/src/server/loader/input.h
View File

@ -80,14 +80,14 @@ namespace Input {
Input::Event &ev = _ev_buf[i];
if ((ev.type() == Input::Event::MOTION)
|| (ev.type() == Input::Event::WHEEL)
|| (ev.keycode() == Input::BTN_LEFT)
|| (ev.keycode() == Input::BTN_RIGHT)
|| (ev.keycode() == Input::BTN_MIDDLE)) {
if ((ev.type() == Input::Event::MOTION)
|| (ev.type() == Input::Event::WHEEL)
|| (ev.code() == Input::BTN_LEFT)
|| (ev.code() == Input::BTN_RIGHT)
|| (ev.code() == Input::BTN_MIDDLE)) {
ev = Input::Event(ev.type(),
ev.keycode(),
ev.code(),
ev.ax() - delta.x,
ev.ay() - delta.y,
ev.rx(),

2
os/src/server/nit_fb/main.cc
View File

@ -97,7 +97,7 @@ namespace Input {
/* apply view offset to absolute motion events */
if (e.is_absolute_motion())
e = Event(e.type(), e.keycode(),
e = Event(e.type(), e.code(),
e.ax() + _dx, e.ay() + _dy, 0, 0);
_to_ev_buf[i] = e;
}

41
os/src/server/nitpicker/common/user_state.cc
View File

@ -51,12 +51,12 @@ void User_state::handle_event(Input::Event ev)
* Mangle incoming events
*/
int keycode = ev.keycode();
int keycode = ev.code();
int ax = _mouse_pos.x(), ay = _mouse_pos.y();
int rx = 0, ry = 0; /* skip info about relative motion per default */
/* KEY_PRINT and KEY_SYSRQ both enter kill mode */
if ((ev.type() == Event::PRESS) && (ev.keycode() == KEY_SYSRQ))
if ((ev.type() == Event::PRESS) && (ev.code() == KEY_SYSRQ))
keycode = KEY_PRINT;
/* transparently handle absolute and relative motion events */
@ -106,7 +106,7 @@ void User_state::handle_event(Input::Event ev)
* Detect mouse press event in kill mode, used to select the session
* to lock out.
*/
if (kill() && ev.type() == Event::PRESS && ev.keycode() == Input::BTN_LEFT) {
if (kill() && ev.type() == Event::PRESS && ev.code() == Input::BTN_LEFT) {
if (pointed_view && pointed_view->session())
lock_out_session(pointed_view->session());
@ -120,16 +120,35 @@ void User_state::handle_event(Input::Event ev)
/* update focused view */
if (pointed_view != focused_view()
&& _mouse_button(ev.keycode())) {
&& _mouse_button(ev.code())) {
bool const focus_stays_in_session =
(_focused_view && pointed_view &&
_focused_view->session() == pointed_view->session());
/*
* Do not update the whole screen when clicking on another
* view of the already focused session.
* Update the whole screen when the focus change results in
* changing the focus to another session.
*/
if (flat() && _focused_view && pointed_view
&& _focused_view->session() != pointed_view->session())
if (flat() && !focus_stays_in_session)
update_all = true;
/*
* Notify both the old focussed session and the new one.
*/
if (!focus_stays_in_session) {
if (_focused_view) {
Input::Event unfocus_ev(Input::Event::FOCUS, 0, ax, ay, 0, 0);
_focused_view->session()->submit_input_event(&unfocus_ev);
}
if (pointed_view) {
Input::Event focus_ev(Input::Event::FOCUS, 1, ax, ay, 0, 0);
pointed_view->session()->submit_input_event(&focus_ev);
}
}
if (!flat() || !_focused_view || !pointed_view)
update_all = true;
@ -137,9 +156,9 @@ void User_state::handle_event(Input::Event ev)
}
/* toggle kill and xray modes */
if (ev.keycode() == KILL_KEY || ev.keycode() == XRAY_KEY) {
if (ev.code() == KILL_KEY || ev.code() == XRAY_KEY) {
Mode::_mode ^= ev.keycode() == KILL_KEY ? KILL : XRAY;
Mode::_mode ^= ev.code() == KILL_KEY ? KILL : XRAY;
update_all = true;
}
}
@ -186,7 +205,7 @@ void User_state::handle_event(Input::Event ev)
/* deliver press/release event to session with focused view */
if (ev.type() == Event::PRESS || ev.type() == Event::RELEASE)
if (!_masked_key(ev.keycode()) && focused_view())
if (!_masked_key(ev.code()) && focused_view())
focused_view()->session()->submit_input_event(&ev);
}

2
os/src/server/nitpicker/genode/main.cc
View File

@ -513,7 +513,7 @@ namespace Nitpicker {
*/
Event e = *ev;
if (e.ax() || e.ay())
e = Event(e.type(), e.keycode(), e.ax(),
e = Event(e.type(), e.code(), e.ax(),
max(0, e.ay() - v_offset()), e.rx(), e.ry());
_input_session_component.submit(&e);