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

nitpicker: add hover report

Browse Source 
The hover reports provides information about the session currently
pointed-to, i.e., hovered session. It can be enabled by the 'hover'
attribute of nitpicker's 'report' configuration element

  <report hover="yes" />

Fixes #1442
This commit is contained in:
Christian Helmuth
2014-12-04 15:30:38 +01:00
parent 2a4b67f90b
commit d8e50dd366
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
repos/os/src/server/nitpicker/README
View File

@ -189,6 +189,7 @@ outside world via report sessions. The reporting can be enabled using the
! ... ! ...
! </config> ! </config>
The 'hover' attribute enables the reporting of the currently hovered session.
The 'focus' attribute enables the reporting of the currently focused session. The 'focus' attribute enables the reporting of the currently focused session.
The 'pointer' attribute enables the reporting of the current absolute pointer The 'pointer' attribute enables the reporting of the current absolute pointer
position. position.

24
repos/os/src/server/nitpicker/main.cc
View File

@ -76,18 +76,18 @@ Framebuffer::Session *tmp_fb;
** Utilities ** ** Utilities **
***************/ ***************/
static void report_focus(Genode::Reporter &reporter, Session *focused_session) static void report_session(Genode::Reporter &reporter, Session *session)
{ {
if (!reporter.is_enabled()) if (!reporter.is_enabled())
return; return;
Genode::Reporter::Xml_generator xml(reporter, [&] () Genode::Reporter::Xml_generator xml(reporter, [&] ()
{ {
if (focused_session) { if (session) {
xml.attribute("label", focused_session->label().string()); xml.attribute("label", session->label().string());
xml.attribute("domain", focused_session->domain_name().string()); xml.attribute("domain", session->domain_name().string());
Color const color = focused_session->color(); Color const color = session->color();
char buf[32]; char buf[32];
Genode::snprintf(buf, sizeof(buf), "#%02x%02x%02x", Genode::snprintf(buf, sizeof(buf), "#%02x%02x%02x",
color.r, color.g, color.b); color.r, color.g, color.b);
@ -918,7 +918,7 @@ class Nitpicker::Session_component : public Genode::Rpc_object<Session>,
if (session) if (session)
session->release(); session->release();
report_focus(_focus_reporter, session); report_session(_focus_reporter, session);
} }
void session_control(Label suffix, Session_control control) override void session_control(Label suffix, Session_control control) override
@ -1152,6 +1152,7 @@ struct Nitpicker::Main
Genode::Sliced_heap sliced_heap = { env()->ram_session(), env()->rm_session() }; Genode::Sliced_heap sliced_heap = { env()->ram_session(), env()->rm_session() };
Genode::Reporter pointer_reporter = { "pointer" }; Genode::Reporter pointer_reporter = { "pointer" };
Genode::Reporter hover_reporter = { "hover" };
Genode::Reporter focus_reporter = { "focus" }; Genode::Reporter focus_reporter = { "focus" };
Genode::Reporter xray_reporter = { "xray" }; Genode::Reporter xray_reporter = { "xray" };
@ -1226,6 +1227,7 @@ void Nitpicker::Main::handle_input(unsigned)
do { do {
Point const old_pointer_pos = user_state.pointer_pos(); Point const old_pointer_pos = user_state.pointer_pos();
::Session * const old_pointed_session = user_state.pointed_session();
::Session * const old_focused_session = user_state.Mode::focused_session(); ::Session * const old_focused_session = user_state.Mode::focused_session();
bool const old_kill_mode = user_state.kill(); bool const old_kill_mode = user_state.kill();
bool const old_xray_mode = user_state.xray(); bool const old_xray_mode = user_state.xray();
@ -1235,6 +1237,7 @@ void Nitpicker::Main::handle_input(unsigned)
import_input_events(ev_buf, input.flush(), user_state); import_input_events(ev_buf, input.flush(), user_state);
Point const new_pointer_pos = user_state.pointer_pos(); Point const new_pointer_pos = user_state.pointer_pos();
::Session * const new_pointed_session = user_state.pointed_session();
::Session * const new_focused_session = user_state.Mode::focused_session(); ::Session * const new_focused_session = user_state.Mode::focused_session();
bool const new_kill_mode = user_state.kill(); bool const new_kill_mode = user_state.kill();
bool const new_xray_mode = user_state.xray(); bool const new_xray_mode = user_state.xray();
@ -1257,9 +1260,13 @@ void Nitpicker::Main::handle_input(unsigned)
}); });
} }
/* report hover changes */
if (old_pointed_session != new_pointed_session)
report_session(hover_reporter, new_pointed_session);
/* report focus changes */ /* report focus changes */
if (old_focused_session != new_focused_session) if (old_focused_session != new_focused_session)
report_focus(focus_reporter, new_focused_session); report_session(focus_reporter, new_focused_session);
/* report kill mode */ /* report kill mode */
if (old_kill_mode != new_kill_mode) { if (old_kill_mode != new_kill_mode) {
@ -1268,7 +1275,7 @@ void Nitpicker::Main::handle_input(unsigned)
report_kill_focus(focus_reporter); report_kill_focus(focus_reporter);
if (!new_kill_mode) if (!new_kill_mode)
report_focus(focus_reporter, new_focused_session); report_session(focus_reporter, new_focused_session);
} }
/* /*
@ -1340,6 +1347,7 @@ void Nitpicker::Main::handle_config(unsigned)
} catch (...) { } } catch (...) { }
configure_reporter(pointer_reporter); configure_reporter(pointer_reporter);
configure_reporter(hover_reporter);
configure_reporter(focus_reporter); configure_reporter(focus_reporter);
configure_reporter(xray_reporter); configure_reporter(xray_reporter);

2
repos/os/src/server/nitpicker/user_state.h
View File

@ -72,6 +72,8 @@ class User_state : public Mode, public View_stack
* Accessors * Accessors
*/ */
Point pointer_pos() { return _pointer_pos; } Point pointer_pos() { return _pointer_pos; }
Session *pointed_session() { return _pointed_session; }
/** /**
* (Re-)apply origin policy to all views * (Re-)apply origin policy to all views