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

WindowServer: Separate physical resolution from scaling factors

Browse source 
Physical hardware doesn't care about scale factors as this is a concept
being related to WindowServer and userland applications. To ensure we
provide the correct display resolution details to HardwareScreenBackend
objects, we must keep a separate Gfx::IntRect object that reserve the
correct details.
This commit is contained in:
Liav A 2022-05-06 18:47:10 +03:00 • committed by Andreas Kling
parent f7c9bd0760
commit b69c8b48fc
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Services/WindowServer/Screen.cpp
View file

@ -125,7 +125,7 @@ bool Screen::apply_layout(ScreenLayout&& screen_layout, String& error_msg)
} }
} }
old_screen.update_virtual_rect(); old_screen.update_virtual_and_physical_rects();
if (changed_scale) if (changed_scale)
old_screen.scale_factor_changed(); old_screen.scale_factor_changed();
} }
@ -157,7 +157,7 @@ bool Screen::apply_layout(ScreenLayout&& screen_layout, String& error_msg)
return false; return false;
} }
screen->update_virtual_rect(); screen->update_virtual_and_physical_rects();
if (!need_to_open_device && screens_with_scale_change.contains(screen)) if (!need_to_open_device && screens_with_scale_change.contains(screen))
screen->scale_factor_changed(); screen->scale_factor_changed();
@ -215,7 +215,7 @@ Screen::Screen(size_t screen_index)
, m_flush_rects(adopt_own(*new FlushRectData())) , m_flush_rects(adopt_own(*new FlushRectData()))
, m_compositor_screen_data(Compositor::create_screen_data({})) , m_compositor_screen_data(Compositor::create_screen_data({}))
{ {
update_virtual_rect(); update_virtual_and_physical_rects();
open_device(); open_device();
} }
@ -260,11 +260,12 @@ void Screen::close_device()
m_backend = nullptr; m_backend = nullptr;
} }
void Screen::update_virtual_rect() void Screen::update_virtual_and_physical_rects()
{ {
auto& screen_info = screen_layout_info(); auto& screen_info = screen_layout_info();
m_virtual_rect = { screen_info.location, { screen_info.resolution.width() / screen_info.scale_factor, screen_info.resolution.height() / screen_info.scale_factor } }; m_virtual_rect = { screen_info.location, { screen_info.resolution.width() / screen_info.scale_factor, screen_info.resolution.height() / screen_info.scale_factor } };
dbgln("update_virtual_rect for screen #{}: {}", index(), m_virtual_rect); m_physical_rect = { Gfx::IntPoint { 0, 0 }, { screen_info.resolution.width(), screen_info.resolution.height() } };
dbgln("update_virtual_and_physical_rects for screen #{}: {}", index(), m_virtual_rect);
} }
void Screen::scale_factor_changed() void Screen::scale_factor_changed()
@ -351,7 +352,7 @@ bool Screen::set_resolution(bool initial)
auto mode_setting = TRY(m_backend->get_head_mode_setting()); auto mode_setting = TRY(m_backend->get_head_mode_setting());
info.resolution = { mode_setting.horizontal_active, mode_setting.vertical_active }; info.resolution = { mode_setting.horizontal_active, mode_setting.vertical_active };
update_virtual_rect(); update_virtual_and_physical_rects();
// Since pending flush rects are affected by the scale factor // Since pending flush rects are affected by the scale factor
// update even if only the scale factor changed // update even if only the scale factor changed
@ -559,7 +560,7 @@ void Screen::flush_display(int buffer_index)
void Screen::write_all_display_contents() void Screen::write_all_display_contents()
{ {
MUST(m_backend->write_all_contents(m_virtual_rect)); MUST(m_backend->write_all_contents(m_physical_rect));
} }
void Screen::flush_display_entire_framebuffer() void Screen::flush_display_entire_framebuffer()

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

@ -152,8 +152,8 @@ public:
void set_buffer(int index); void set_buffer(int index);
size_t buffer_offset(int index) const; size_t buffer_offset(int index) const;
int physical_width() const { return width() * scale_factor(); } int physical_width() const { return m_physical_rect.width(); }
int physical_height() const { return height() * scale_factor(); } int physical_height() const { return m_physical_rect.height(); }
size_t pitch() const { return m_backend->m_pitch; } size_t pitch() const { return m_backend->m_pitch; }
int width() const { return m_virtual_rect.width(); } int width() const { return m_virtual_rect.width(); }
@ -197,7 +197,7 @@ private:
bool is_opened() const { return m_backend != nullptr; } bool is_opened() const { return m_backend != nullptr; }
void set_index(size_t index) { m_index = index; } void set_index(size_t index) { m_index = index; }
void update_virtual_rect(); void update_virtual_and_physical_rects();
ScreenLayout::Screen& screen_layout_info() { return s_layout.screens[m_index]; } ScreenLayout::Screen& screen_layout_info() { return s_layout.screens[m_index]; }
ScreenLayout::Screen const& screen_layout_info() const { return s_layout.screens[m_index]; } ScreenLayout::Screen const& screen_layout_info() const { return s_layout.screens[m_index]; }
@ -211,6 +211,8 @@ private:
OwnPtr<ScreenBackend> m_backend; OwnPtr<ScreenBackend> m_backend;
Gfx::IntRect m_virtual_rect; Gfx::IntRect m_virtual_rect;
Gfx::IntRect m_physical_rect;
NonnullOwnPtr<FlushRectData> m_flush_rects; NonnullOwnPtr<FlushRectData> m_flush_rects;
NonnullOwnPtr<CompositorScreenData> m_compositor_screen_data; NonnullOwnPtr<CompositorScreenData> m_compositor_screen_data;
}; };