ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-18 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nitpicker: validate pointer pos after reconfig

Browse Source 
Since the panorama depends on the config, nitpicker needs to re-evaluate
the validity of the pointer position after each reconfiguration. If the
pointer position is no longer visible, pick a new visible one.

Issue #5352
This commit is contained in:
Norman Feske 2024-10-29 14:02:30 +01:00 committed by Christian Helmuth
parent baedd79f62
commit aafd03ee74
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,16 +734,23 @@ struct Nitpicker::Main : Focus_updater, Hover_updater,
s->submit_sync(); s->submit_sync();
} }
Pointer _any_visible_pointer_position()
{
Pointer const captured_pos = _capture_root.any_visible_pointer_position();
return captured_pos.ok() ? captured_pos : _anywhere_at_fb_screen();
}
bool _visible(Pointer const p) const
{
return _capture_root.visible(p) || _visible_at_fb_screen(p);
}
/** /**
* User_state::Action interface * User_state::Action interface
*/ */
Pointer sanitized_pointer_position(Pointer const orig_pos, Point pos) override Pointer sanitized_pointer_position(Pointer const orig_pos, Point pos) override
{ {
auto visible = [&] (Pointer p)
{
return _capture_root.visible(p) || _visible_at_fb_screen(p);
};
auto for_each_value = [] (int const from, int const to, auto const &fn) auto for_each_value = [] (int const from, int const to, auto const &fn)
{ {
int const step = (from < to) ? 1 : -1; int const step = (from < to) ? 1 : -1;
@ -751,7 +758,7 @@ struct Nitpicker::Main : Focus_updater, Hover_updater,
fn(i); fn(i);
}; };
if (visible(pos)) if (_visible(pos))
return pos; return pos;
/* move pointer along screen edge */ /* move pointer along screen edge */
@ -760,7 +767,11 @@ struct Nitpicker::Main : Focus_updater, Hover_updater,
[&] (Point p) { return p; }, [&] (Point p) { return p; },
[&] (Nowhere) { return Point { }; }); [&] (Nowhere) { return Point { }; });
auto try_better = [&] (Point p) { if (visible(p)) best = p; }; /* panorama change may have made area around the pointer invisible */
if (!_visible(best))
return _any_visible_pointer_position();
auto try_better = [&] (Point p) { if (_visible(p)) best = p; };
for_each_value(best.x, pos.x, [&] (int x) { try_better({ x, best.y }); }); for_each_value(best.x, pos.x, [&] (int x) { try_better({ x, best.y }); });
for_each_value(best.y, pos.y, [&] (int y) { try_better({ best.x, y }); }); for_each_value(best.y, pos.y, [&] (int y) { try_better({ best.x, y }); });
@ -768,12 +779,7 @@ struct Nitpicker::Main : Focus_updater, Hover_updater,
return best; return best;
} }
if (visible(orig_pos)) return _any_visible_pointer_position();
return orig_pos;
Pointer const captured_pos = _capture_root.any_visible_pointer_position();
return captured_pos.ok() ? captured_pos : _anywhere_at_fb_screen();
} }
/** /**