RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:17:44 +00:00
Code Issues Activity Actions

WindowServer: Re-use existing Screen instances and improve fallbacks

Browse source 
If a screen layout cannot be applied, instead of failing to start
WindowServer try to fall back to an auto-generated screen layout with
the devices that are detected.

Also, be a bit smarter about changing the current screen layout.
Instead of closing all framebuffers and bringing them back up, keep
what we can and only change resolution on those that we need to change
them on. To make this work we also need to move away from using an
array of structures to hold compositor related per-screen data to
attaching it to the Screen itself, which makes re-using a screen much
simpler.
This commit is contained in:
Tom 2021-07-18 10:24:41 -06:00 • committed by Andreas Kling
parent 1ecb725357
commit dbb9f891fb
7 changed files with 483 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

115
Userland/Services/WindowServer/Compositor.h
View file

@ -18,6 +18,7 @@ namespace WindowServer {
class Animation;
class ClientConnection;
class Compositor;
class Cursor;
class MultiScaleBitmaps;
class Window;
@ -31,8 +32,62 @@ enum class WallpaperMode {
Unchecked
};
struct CompositorScreenData {
RefPtr<Gfx::Bitmap> m_front_bitmap;
RefPtr<Gfx::Bitmap> m_back_bitmap;
RefPtr<Gfx::Bitmap> m_temp_bitmap;
OwnPtr<Gfx::Painter> m_back_painter;
OwnPtr<Gfx::Painter> m_front_painter;
OwnPtr<Gfx::Painter> m_temp_painter;
RefPtr<Gfx::Bitmap> m_cursor_back_bitmap;
OwnPtr<Gfx::Painter> m_cursor_back_painter;
Gfx::IntRect m_last_cursor_rect;
OwnPtr<ScreenNumberOverlay> m_screen_number_overlay;
OwnPtr<WindowStackSwitchOverlay> m_window_stack_switch_overlay;
bool m_buffers_are_flipped { false };
bool m_screen_can_set_buffer { false };
bool m_has_flipped { false };
bool m_cursor_back_is_valid { false };
bool m_have_flush_rects { false };
Gfx::DisjointRectSet m_flush_rects;
Gfx::DisjointRectSet m_flush_transparent_rects;
Gfx::DisjointRectSet m_flush_special_rects;
Gfx::Painter& overlay_painter() { return *m_temp_painter; }
void init_bitmaps(Compositor&, Screen&);
void flip_buffers(Screen&);
void draw_cursor(Screen&, const Gfx::IntRect&);
bool restore_cursor_back(Screen&, Gfx::IntRect&);
template<typename F>
IterationDecision for_each_intersected_flushing_rect(Gfx::IntRect const& intersecting_rect, F f)
{
auto iterate_flush_rects = [&](Gfx::DisjointRectSet const& flush_rects) {
for (auto& rect : flush_rects.rects()) {
auto intersection = intersecting_rect.intersected(rect);
if (intersection.is_empty())
continue;
IterationDecision decision = f(intersection);
if (decision != IterationDecision::Continue)
return decision;
}
return IterationDecision::Continue;
};
auto decision = iterate_flush_rects(m_flush_rects);
if (decision != IterationDecision::Continue)
return decision;
// We do not have to iterate m_flush_special_rects here as these
// technically should be removed anyway. m_flush_rects and
// m_flush_transparent_rects should cover everything already
return iterate_flush_rects(m_flush_transparent_rects);
}
};
class Compositor final : public Core::Object {
C_OBJECT(Compositor)
friend struct CompositorScreenData;
friend class Overlay;
public:
@ -127,6 +182,11 @@ public:
void set_flash_flush(bool b) { m_flash_flush = b; }
static NonnullOwnPtr<CompositorScreenData> create_screen_data(Badge<Screen>)
{
return adopt_own(*new CompositorScreenData());
}
private:
Compositor();
void init_bitmaps();
@ -160,61 +220,6 @@ private:
bool m_invalidated_cursor { false };
bool m_overlay_rects_changed { false };
struct ScreenData {
RefPtr<Gfx::Bitmap> m_front_bitmap;
RefPtr<Gfx::Bitmap> m_back_bitmap;
RefPtr<Gfx::Bitmap> m_temp_bitmap;
OwnPtr<Gfx::Painter> m_back_painter;
OwnPtr<Gfx::Painter> m_front_painter;
OwnPtr<Gfx::Painter> m_temp_painter;
RefPtr<Gfx::Bitmap> m_cursor_back_bitmap;
OwnPtr<Gfx::Painter> m_cursor_back_painter;
Gfx::IntRect m_last_cursor_rect;
OwnPtr<ScreenNumberOverlay> m_screen_number_overlay;
OwnPtr<WindowStackSwitchOverlay> m_window_stack_switch_overlay;
bool m_buffers_are_flipped { false };
bool m_screen_can_set_buffer { false };
bool m_has_flipped { false };
bool m_cursor_back_is_valid { false };
bool m_have_flush_rects { false };
Gfx::DisjointRectSet m_flush_rects;
Gfx::DisjointRectSet m_flush_transparent_rects;
Gfx::DisjointRectSet m_flush_special_rects;
Gfx::Painter& overlay_painter() { return *m_temp_painter; }
void init_bitmaps(Compositor&, Screen&);
void flip_buffers(Screen&);
void draw_cursor(Screen&, const Gfx::IntRect&);
bool restore_cursor_back(Screen&, Gfx::IntRect&);
template<typename F>
IterationDecision for_each_intersected_flushing_rect(Gfx::IntRect const& intersecting_rect, F f)
{
auto iterate_flush_rects = [&](Gfx::DisjointRectSet const& flush_rects) {
for (auto& rect : flush_rects.rects()) {
auto intersection = intersecting_rect.intersected(rect);
if (intersection.is_empty())
continue;
IterationDecision decision = f(intersection);
if (decision != IterationDecision::Continue)
return decision;
}
return IterationDecision::Continue;
};
auto decision = iterate_flush_rects(m_flush_rects);
if (decision != IterationDecision::Continue)
return decision;
// We do not have to iterate m_flush_special_rects here as these
// technically should be removed anyway. m_flush_rects and
// m_flush_transparent_rects should cover everything already
return iterate_flush_rects(m_flush_transparent_rects);
}
};
friend struct ScreenData;
Vector<ScreenData, default_screen_count> m_screen_data;
IntrusiveList<Overlay, RawPtr<Overlay>, &Overlay::m_list_node> m_overlay_list;
Gfx::DisjointRectSet m_overlay_rects;
Gfx::DisjointRectSet m_dirty_screen_rects;