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

nitpicker: Respond to session-local focus change

Browse Source 
This patch improves the focus handling by updating the menubar each time
the user clicks on a different view, even the old and new view belong
to the same session.
This commit is contained in:
Norman Feske 2014-02-14 14:31:03 +01:00 committed by Christian Helmuth
parent 1498bb740b
commit 57fdce0465
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
os/src/server/nitpicker/user_state.cc
View File

@ -102,17 +102,15 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
{ {
User_state &user_state; User_state &user_state;
Canvas_base &canvas; Canvas_base &canvas;
bool enabled; bool update_menubar = false;
char const *menu_title; bool update_views = false;
char const *menu_title = "";
Update_all_guard(User_state &user_state, Canvas_base &canvas) Update_all_guard(User_state &user_state, Canvas_base &canvas)
: user_state(user_state), canvas(canvas), enabled(false), menu_title("") { } : user_state(user_state), canvas(canvas) { }
~Update_all_guard() ~Update_all_guard()
{ {
if (!enabled)
return;
Menubar_state state(user_state, "", "", BLACK); Menubar_state state(user_state, "", "", BLACK);
if (user_state._input_receiver) if (user_state._input_receiver)
@ -121,8 +119,10 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
menu_title, menu_title,
user_state._input_receiver->color()); user_state._input_receiver->color());
if (update_menubar)
user_state._menubar.state(state); user_state._menubar.state(state);
if (update_menubar || update_views)
user_state.update_all_views(canvas); user_state.update_all_views(canvas);
} }
} update_all_guard(*this, canvas); } update_all_guard(*this, canvas);
@ -141,7 +141,8 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
lock_out_session(canvas, pointed_view->session()); lock_out_session(canvas, pointed_view->session());
/* leave kill mode */ /* leave kill mode */
update_all_guard.enabled = true; update_all_guard.update_menubar = true;
update_all_guard.update_views = true;
Mode::leave_kill(); Mode::leave_kill();
return; return;
} }
@ -157,8 +158,10 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
* Update the whole screen when the focus change results in * Update the whole screen when the focus change results in
* changing the focus to another session. * changing the focus to another session.
*/ */
if (flat() && !focus_stays_in_session) if (flat() && !focus_stays_in_session) {
update_all_guard.enabled = true; update_all_guard.update_menubar = true;
update_all_guard.update_views = true;
}
/* /*
* Notify both the old focussed session and the new one. * Notify both the old focussed session and the new one.
@ -176,8 +179,10 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
} }
} }
update_all_guard.update_menubar = true;
if (!flat() || !focused_view() || !pointed_view) if (!flat() || !focused_view() || !pointed_view)
update_all_guard.enabled = true; update_all_guard.update_views = true;
focused_view(pointed_view); focused_view(pointed_view);
} }
@ -197,7 +202,8 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
_global_key_sequence = true; _global_key_sequence = true;
_input_receiver = global_receiver; _input_receiver = global_receiver;
update_all_guard.menu_title = ""; update_all_guard.menu_title = "";
update_all_guard.enabled = true; update_all_guard.update_menubar = true;
update_all_guard.update_views = true;
} }
/* /*
@ -218,7 +224,9 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
if (_global_keys.is_kill_key(keycode)) Mode::toggle_kill(); if (_global_keys.is_kill_key(keycode)) Mode::toggle_kill();
if (_global_keys.is_xray_key(keycode)) Mode::toggle_xray(); if (_global_keys.is_xray_key(keycode)) Mode::toggle_xray();
update_all_guard.enabled = true; update_all_guard.update_menubar = true;
update_all_guard.update_views = true;
_input_receiver = 0; _input_receiver = 0;
} }
} }
@ -254,9 +262,13 @@ void User_state::handle_event(Input::Event ev, Canvas_base &canvas)
* Detect end of global key sequence * Detect end of global key sequence
*/ */
if (ev.type() == Event::RELEASE && _key_cnt == 0 && _global_key_sequence) { if (ev.type() == Event::RELEASE && _key_cnt == 0 && _global_key_sequence) {
_input_receiver = focused_view() ? &focused_view()->session() : 0; _input_receiver = focused_view() ? &focused_view()->session() : 0;
update_all_guard.menu_title = focused_view() ? focused_view()->title() : ""; update_all_guard.menu_title = focused_view() ? focused_view()->title() : "";
update_all_guard.enabled = true; update_all_guard.update_menubar = true;
update_all_guard.update_views = true;
_global_key_sequence = false; _global_key_sequence = false;
} }
} }