0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-03 21:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

WindowServer: Allow overriding position when getting bitmap

Browse source
This commit is contained in:
FrHun 2022-12-04 19:16:09 +01:00 committed by Sam Atkins
parent d856dae07c
commit 6d4e37138e
Notes: sideshowbarker 2024-07-17 02:57:43 +09:00 
Author: https://github.com/frhun
Commit: https://github.com/SerenityOS/serenity/commit/6d4e37138e
Pull-request: https://github.com/SerenityOS/serenity/pull/16328
Issue: https://github.com/SerenityOS/serenity/issues/8370
Reviewed-by: https://github.com/AtkinsSJ ✅
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Userland/Services/WindowServer/ConnectionFromClient.cpp
View file

@ -1193,10 +1193,14 @@ Messages::WindowServer::GetScreenBitmapResponse ConnectionFromClient::get_screen
}
Messages::WindowServer::GetScreenBitmapAroundCursorResponse ConnectionFromClient::get_screen_bitmap_around_cursor(Gfx::IntSize size)
{
return get_screen_bitmap_around_location(size, ScreenInput::the().cursor_location()).bitmap();
}
Messages::WindowServer::GetScreenBitmapAroundLocationResponse ConnectionFromClient::get_screen_bitmap_around_location(Gfx::IntSize size, Gfx::IntPoint location)
{
// TODO: Mixed scale setups at what scale? Lowest? Highest? Configurable?
auto cursor_location = ScreenInput::the().cursor_location();
Gfx::Rect rect { cursor_location.x() - (size.width() / 2), cursor_location.y() - (size.height() / 2), size.width(), size.height() };
Gfx::Rect rect { location.x() - (size.width() / 2), location.y() - (size.height() / 2), size.width(), size.height() };
// Recompose the screen to make sure the cursor is painted in the location we think it is.
// FIXME: This is rather wasteful. We can probably think of a way to avoid this.
@ -1210,10 +1214,9 @@ Messages::WindowServer::GetScreenBitmapAroundCursorResponse ConnectionFromClient
return IterationDecision::Continue;
});
auto screen_scale_factor = ScreenInput::the().cursor_location_screen().scale_factor();
if (intersecting_with_screens == 1) {
auto& screen = Screen::closest_to_rect(rect);
auto crop_rect = rect.translated(-screen.rect().location()) * screen_scale_factor;
auto crop_rect = rect.translated(-screen.rect().location()) * screen.scale_factor();
auto bitmap_or_error = Compositor::the().front_bitmap_for_screenshot({}, screen).cropped(crop_rect);
if (bitmap_or_error.is_error()) {
dbgln("get_screen_bitmap_around_cursor: Failed to crop screenshot: {}", bitmap_or_error.error());

1
Userland/Services/WindowServer/ConnectionFromClient.h
View file

@ -174,6 +174,7 @@ private:
virtual Messages::WindowServer::GetScrollStepSizeResponse get_scroll_step_size() override;
virtual Messages::WindowServer::GetScreenBitmapResponse get_screen_bitmap(Optional<Gfx::IntRect> const&, Optional<u32> const&) override;
virtual Messages::WindowServer::GetScreenBitmapAroundCursorResponse get_screen_bitmap_around_cursor(Gfx::IntSize) override;
virtual Messages::WindowServer::GetScreenBitmapAroundLocationResponse get_screen_bitmap_around_location(Gfx::IntSize, Gfx::IntPoint) override;
virtual void set_double_click_speed(i32) override;
virtual Messages::WindowServer::GetDoubleClickSpeedResponse get_double_click_speed() override;
virtual void set_mouse_buttons_switched(bool) override;

1
Userland/Services/WindowServer/WindowServer.ipc
View file

@ -168,6 +168,7 @@ endpoint WindowServer
get_screen_bitmap(Optional<Gfx::IntRect> rect, Optional<u32> screen_index) => (Gfx::ShareableBitmap bitmap)
get_screen_bitmap_around_cursor(Gfx::IntSize size) => (Gfx::ShareableBitmap bitmap)
get_screen_bitmap_around_location(Gfx::IntSize size, Gfx::IntPoint location) => (Gfx::ShareableBitmap bitmap)
get_color_under_cursor() => (Optional<Gfx::Color> color)
pong() =|