LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-07 19:57:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

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
Notes: sideshowbarker 2024-07-17 11:13:57 +09:00 
Author: https://github.com/supercomputer7
Commit: https://github.com/SerenityOS/serenity/commit/b69c8b48fc
Pull-request: https://github.com/SerenityOS/serenity/pull/13933
2 changed files with 13 additions and 10 deletions
Show Stats 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)
old_screen.scale_factor_changed();
}
@ -157,7 +157,7 @@ bool Screen::apply_layout(ScreenLayout&& screen_layout, String& error_msg)
return false;
}
screen->update_virtual_rect();
screen->update_virtual_and_physical_rects();
if (!need_to_open_device && screens_with_scale_change.contains(screen))
screen->scale_factor_changed();
@ -215,7 +215,7 @@ Screen::Screen(size_t screen_index)
, m_flush_rects(adopt_own(*new FlushRectData()))
, m_compositor_screen_data(Compositor::create_screen_data({}))
{
update_virtual_rect();
update_virtual_and_physical_rects();
open_device();
}
@ -260,11 +260,12 @@ void Screen::close_device()
m_backend = nullptr;
}
void Screen::update_virtual_rect()
void Screen::update_virtual_and_physical_rects()
{
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 } };
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()
@ -351,7 +352,7 @@ bool Screen::set_resolution(bool initial)
auto mode_setting = TRY(m_backend->get_head_mode_setting());
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
// 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()
{
MUST(m_backend->write_all_contents(m_virtual_rect));
MUST(m_backend->write_all_contents(m_physical_rect));
}
void Screen::flush_display_entire_framebuffer()

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

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