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

WindowServer: Make HighDPI aware

Browse source 
Almost all logic stays in "logical" (unscaled coordinates), which
means the patch is small and things like DnD, window moving and
resizing, menu handling, menuapplets, etc all work without changes.

Screen knows about phyiscal coordinates and mouse handling internally is
in physical coordinates (so that two 1 pixel movements in succession can
translate to one 1 logical coordinate mouse movement -- only a single
event is sent in this case, on the 2nd moved pixel).

Compositor also knows about physical pixels for its backbuffers. This is
a temporary state -- in a follow-up, I'll try to let Bitmaps know about
their intrinsic scale, then Compositor won't have to know about pixels
any longer. Most of Compositor's logic stays in view units, just
blitting to and from back buffers and the cursor save buffer has to be
done in pixels. The back buffer Painter gets a scale applied which
transparently handles all drawing. (But since the backbuffer and cursor
save buffer are also HighDPI, they currently need to be drawn using a
hack temporary unscaled Painter object. This will also go away once
Bitmaps know about their intrinsic scale.)

With this, editing WindowServer.ini to say

  Width=800
  Height=600
  ScaleFactor=2

and booting brings up a fully-functional HighDPI UI.
(Except for minimizing windows, which will crash the window server
until #4932 is merged. And I didn't test the window switcher since the
win-tab shortcut doesn't work on my system.) It's all pixel-scaled,
but it looks pretty decent :^)
This commit is contained in:
Nico Weber 2021-01-15 10:58:55 -05:00 • committed by Andreas Kling
parent 867807fb2b
commit e87b8a79ed
5 changed files with 84 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ Screen& Screen::the()
return *s_the;
}
Screen::Screen(unsigned desired_width, unsigned desired_height)
Screen::Screen(unsigned desired_width, unsigned desired_height, int scale_factor)
{
ASSERT(!s_the);
s_the = this;
@ -60,8 +60,8 @@ Screen::Screen(unsigned desired_width, unsigned desired_height)
m_can_set_buffer = true;
}
set_resolution(desired_width, desired_height);
m_cursor_location = rect().center();
set_resolution(desired_width, desired_height, scale_factor);
m_physical_cursor_location = physical_rect().center();
}
Screen::~Screen()
@ -69,26 +69,26 @@ Screen::~Screen()
close(m_framebuffer_fd);
}
bool Screen::set_resolution(int width, int height)
bool Screen::set_resolution(int width, int height, int scale_factor)
{
FBResolution resolution { 0, (unsigned)width, (unsigned)height };
int rc = fb_set_resolution(m_framebuffer_fd, &resolution);
FBResolution physical_resolution { 0, (unsigned)(width * scale_factor), (unsigned)(height * scale_factor) };
int rc = fb_set_resolution(m_framebuffer_fd, &physical_resolution);
#ifdef WSSCREEN_DEBUG
dbg() << "fb_set_resolution() - return code " << rc;
#endif
if (rc == 0) {
on_change_resolution(resolution.pitch, resolution.width, resolution.height);
on_change_resolution(physical_resolution.pitch, physical_resolution.width, physical_resolution.height, scale_factor);
return true;
}
if (rc == -1) {
dbg() << "Invalid resolution " << width << "x" << height;
on_change_resolution(resolution.pitch, resolution.width, resolution.height);
on_change_resolution(physical_resolution.pitch, physical_resolution.width, physical_resolution.height, scale_factor);
return false;
}
ASSERT_NOT_REACHED();
}
void Screen::on_change_resolution(int pitch, int width, int height)
void Screen::on_change_resolution(int pitch, int physical_width, int physical_height, int scale_factor)
{
if (m_framebuffer) {
size_t previous_size_in_bytes = m_size_in_bytes;
@ -103,10 +103,11 @@ void Screen::on_change_resolution(int pitch, int width, int height)
ASSERT(m_framebuffer && m_framebuffer != (void*)-1);
m_pitch = pitch;
m_width = width;
m_height = height;
m_width = physical_width / scale_factor;
m_height = physical_height / scale_factor;
m_scale_factor = scale_factor;
m_cursor_location.constrain(rect());
m_physical_cursor_location.constrain(physical_rect());
}
void Screen::set_buffer(int index)
@ -130,20 +131,21 @@ void Screen::set_scroll_step_size(unsigned step_size)
void Screen::on_receive_mouse_data(const MousePacket& packet)
{
auto prev_location = m_cursor_location;
auto prev_location = m_physical_cursor_location / m_scale_factor;
if (packet.is_relative) {
m_cursor_location.move_by(packet.x * m_acceleration_factor, packet.y * m_acceleration_factor);
m_physical_cursor_location.move_by(packet.x * m_acceleration_factor, packet.y * m_acceleration_factor);
#ifdef WSSCREEN_DEBUG
dbgln("Screen: New Relative mouse point @ {}", m_cursor_location);
dbgln("Screen: New Relative mouse point @ {}", m_physical_cursor_location);
#endif
} else {
m_cursor_location = { packet.x * m_width / 0xffff, packet.y * m_height / 0xffff };
m_physical_cursor_location = { packet.x * physical_width() / 0xffff, packet.y * physical_height() / 0xffff };
#ifdef WSSCREEN_DEBUG
dbgln("Screen: New Absolute mouse point @ {}", m_cursor_location);
dbgln("Screen: New Absolute mouse point @ {}", m_physical_cursor_location);
#endif
}
m_cursor_location.constrain(rect());
m_physical_cursor_location.constrain(physical_rect());
auto new_location = m_physical_cursor_location / m_scale_factor;
unsigned buttons = packet.buttons;
unsigned prev_buttons = m_mouse_button_state;
@ -152,7 +154,7 @@ void Screen::on_receive_mouse_data(const MousePacket& packet)
auto post_mousedown_or_mouseup_if_needed = [&](MouseButton button) {
if (!(changed_buttons & (unsigned)button))
return;
auto message = make<MouseEvent>(buttons & (unsigned)button ? Event::MouseDown : Event::MouseUp, m_cursor_location, buttons, button, m_modifiers);
auto message = make<MouseEvent>(buttons & (unsigned)button ? Event::MouseDown : Event::MouseUp, new_location, buttons, button, m_modifiers);
Core::EventLoop::current().post_event(WindowManager::the(), move(message));
};
post_mousedown_or_mouseup_if_needed(MouseButton::Left);
@ -160,19 +162,19 @@ void Screen::on_receive_mouse_data(const MousePacket& packet)
post_mousedown_or_mouseup_if_needed(MouseButton::Middle);
post_mousedown_or_mouseup_if_needed(MouseButton::Back);
post_mousedown_or_mouseup_if_needed(MouseButton::Forward);
if (m_cursor_location != prev_location) {
auto message = make<MouseEvent>(Event::MouseMove, m_cursor_location, buttons, MouseButton::None, m_modifiers);
if (new_location != prev_location) {
auto message = make<MouseEvent>(Event::MouseMove, new_location, buttons, MouseButton::None, m_modifiers);
if (WindowManager::the().dnd_client())
message->set_mime_data(WindowManager::the().dnd_mime_data());
Core::EventLoop::current().post_event(WindowManager::the(), move(message));
}
if (packet.z) {
auto message = make<MouseEvent>(Event::MouseWheel, m_cursor_location, buttons, MouseButton::None, m_modifiers, packet.z * m_scroll_step_size);
auto message = make<MouseEvent>(Event::MouseWheel, new_location, buttons, MouseButton::None, m_modifiers, packet.z * m_scroll_step_size);
Core::EventLoop::current().post_event(WindowManager::the(), move(message));
}
if (m_cursor_location != prev_location)
if (new_location != prev_location)
Compositor::the().invalidate_cursor();
}