ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-19 08:36:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nitpicker: don't use fallback if capture present

Browse Source 
This patch prevents the use of stale information (bounding box of most
recently closed capture session) unless no capture session is present.
Otherwise, an intermediately but no longer present capture client
(a high-res display at boot positioned at panorama position (0, 0))
would permit the pointer to move at the originally occupied area even
though the current capture client do not capture this whole area.

Issue #5370
This commit is contained in:
Norman Feske 2025-03-06 17:47:14 +01:00
parent 5b9a9f4d9e
commit 2e48641c13
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,16 +297,26 @@ class Nitpicker::Capture_root : public Root_component<Capture_session>
session.screen_size_changed(); });
}
void _for_each_session_bb(auto const &fn) const
{
bool any_session_exists = false;
_sessions.for_each([&] (Capture_session const &session) {
any_session_exists = true;
fn(session.bounding_box()); });
if (!any_session_exists)
fn(_fallback_bounding_box);
}
/**
* Determine the bounding box of all capture clients
*/
Rect bounding_box() const
{
Rect bb { };
_sessions.for_each([&] (Capture_session const &session) {
bb = Rect::compound(bb, session.bounding_box()); });
return bb.valid() ? bb : _fallback_bounding_box;
Rect result { };
_for_each_session_bb([&] (Rect const &bb) {
result = Rect::compound(result, bb); });
return result;
}
/**
@ -317,11 +327,9 @@ class Nitpicker::Capture_root : public Root_component<Capture_session>
bool result = false;
pointer.with_result(
[&] (Point const p) {
_sessions.for_each([&] (Capture_session const &session) {
if (!result && session.bounding_box().contains(p))
_for_each_session_bb([&] (Rect const &bb) {
if (!result && bb.contains(p))
result = true; });
if (!result)
result = _fallback_bounding_box.contains(p);
},
[&] (Nowhere) { });
return result;