RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:37:35 +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

25
Userland/Services/WindowServer/Screen.h
View file

@ -7,7 +7,7 @@
#pragma once
#include "ScreenLayout.h"
#include <AK/NonnullOwnPtrVector.h>
#include <AK/NonnullRefPtrVector.h>
#include <AK/OwnPtr.h>
#include <Kernel/API/KeyCode.h>
#include <LibGfx/Bitmap.h>
@ -58,14 +58,15 @@ private:
unsigned m_scroll_step_size { 1 };
};
struct CompositorScreenData;
struct ScreenFBData;
class Screen {
class Screen : public RefCounted<Screen> {
public:
template<typename... Args>
static Screen* create(Args&&... args)
{
auto screen = adopt_own(*new Screen(forward<Args>(args)...));
auto screen = adopt_ref(*new Screen(forward<Args>(args)...));
if (!screen->is_opened())
return nullptr;
auto* screen_ptr = screen.ptr();
@ -155,7 +156,7 @@ public:
int width() const { return m_virtual_rect.width(); }
int height() const { return m_virtual_rect.height(); }
int scale_factor() const { return m_info.scale_factor; }
int scale_factor() const { return screen_layout_info().scale_factor; }
Gfx::RGBA32* scanline(int buffer_index, int y);
@ -169,12 +170,16 @@ public:
void flush_display(int buffer_index);
void flush_display_front_buffer(int front_buffer_index, Gfx::IntRect&);
CompositorScreenData& compositor_screen_data() { return *m_compositor_screen_data; }
private:
Screen(ScreenLayout::Screen&);
Screen(size_t);
bool open_device();
void close_device();
void init();
void scale_factor_changed();
bool set_resolution(bool initial);
void constrain_pending_flush_rects();
static void update_indices()
{
for (size_t i = 0; i < s_screens.size(); i++)
@ -185,7 +190,12 @@ private:
bool is_opened() const { return m_framebuffer_fd >= 0; }
static NonnullOwnPtrVector<Screen, default_screen_count> s_screens;
void set_index(size_t index) { m_index = index; }
void update_virtual_rect();
ScreenLayout::Screen& screen_layout_info() { return s_layout.screens[m_index]; }
ScreenLayout::Screen const& screen_layout_info() const { return s_layout.screens[m_index]; }
static NonnullRefPtrVector<Screen, default_screen_count> s_screens;
static Screen* s_main_screen;
static Gfx::IntRect s_bounding_screens_rect;
static ScreenLayout s_layout;
@ -203,8 +213,7 @@ private:
Gfx::IntRect m_virtual_rect;
int m_framebuffer_fd { -1 };
NonnullOwnPtr<ScreenFBData> m_framebuffer_data;
ScreenLayout::Screen& m_info;
NonnullOwnPtr<CompositorScreenData> m_compositor_screen_data;
};
inline Gfx::RGBA32* Screen::scanline(int buffer_index, int y)