Bläddra i källkod

WindowServer: Add Optional<Gfx::IntRect> argument to get_screen_bitmap()

This way, we can optionally specify a region of the display to capture.
Defaults to entire screen if no rectangle is given.
Valtteri Koskivuori 4 år sedan
förälder
incheckning
4864ef9440

+ 5 - 1
Userland/Services/WindowServer/ClientConnection.cpp

@@ -863,8 +863,12 @@ void ClientConnection::did_become_responsive()
     set_unresponsive(false);
 }
 
-Messages::WindowServer::GetScreenBitmapResponse ClientConnection::get_screen_bitmap()
+Messages::WindowServer::GetScreenBitmapResponse ClientConnection::get_screen_bitmap(Optional<Gfx::IntRect> const& rect)
 {
+    if (rect.has_value()) {
+        auto bitmap = Compositor::the().front_bitmap_for_screenshot({}).cropped(rect.value());
+        return bitmap->to_shareable_bitmap();
+    }
     auto& bitmap = Compositor::the().front_bitmap_for_screenshot({});
     return bitmap.to_shareable_bitmap();
 }

+ 3 - 1
Userland/Services/WindowServer/ClientConnection.h

@@ -9,10 +9,12 @@
 #include <AK/Badge.h>
 #include <AK/Function.h>
 #include <AK/HashMap.h>
+#include <AK/Optional.h>
 #include <AK/OwnPtr.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/Object.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/Rect.h>
 #include <LibIPC/ClientConnection.h>
 #include <WindowServer/Event.h>
 #include <WindowServer/Menu.h>
@@ -144,7 +146,7 @@ private:
     virtual Messages::WindowServer::GetMouseAccelerationResponse get_mouse_acceleration() override;
     virtual void set_scroll_step_size(u32) override;
     virtual Messages::WindowServer::GetScrollStepSizeResponse get_scroll_step_size() override;
-    virtual Messages::WindowServer::GetScreenBitmapResponse get_screen_bitmap() override;
+    virtual Messages::WindowServer::GetScreenBitmapResponse get_screen_bitmap(Optional<Gfx::IntRect> const&) override;
     virtual void set_double_click_speed(i32) override;
     virtual Messages::WindowServer::GetDoubleClickSpeedResponse get_double_click_speed() override;
     virtual void set_window_modified(i32, bool) override;

+ 1 - 1
Userland/Services/WindowServer/WindowServer.ipc

@@ -120,7 +120,7 @@ endpoint WindowServer
     set_scroll_step_size(u32 step_size) => ()
     get_scroll_step_size() => (u32 step_size)
 
-    get_screen_bitmap() => (Gfx::ShareableBitmap bitmap)
+    get_screen_bitmap(Optional<Gfx::IntRect> rect) => (Gfx::ShareableBitmap bitmap)
 
     pong() =|
 

+ 1 - 1
Userland/Utilities/shot.cpp

@@ -34,7 +34,7 @@ int main(int argc, char** argv)
 
     auto app = GUI::Application::construct(argc, argv);
     sleep(delay);
-    auto shared_bitmap = GUI::WindowServerConnection::the().get_screen_bitmap();
+    auto shared_bitmap = GUI::WindowServerConnection::the().get_screen_bitmap({});
 
     auto* bitmap = shared_bitmap.bitmap();
     if (!bitmap) {