Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WindowServer: Fix partial invalidation over cursor

This commit is contained in:
Bananymous 2024-05-31 03:20:21 +03:00
parent 011a5f57e1
commit ae3ae6fd0e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
userspace/WindowServer/WindowServer.cpp
View File

@ -115,6 +115,9 @@ void WindowServer::on_mouse_move(LibInput::MouseMoveEvent event)
m_cursor.y = new_y; m_cursor.y = new_y;
auto new_cursor = cursor_area(); auto new_cursor = cursor_area();
invalidate(old_cursor);
invalidate(new_cursor);
// TODO: Really no need to loop over every window // TODO: Really no need to loop over every window
for (auto& window : m_windows_ordered) for (auto& window : m_windows_ordered)
{ {
@ -123,9 +126,6 @@ void WindowServer::on_mouse_move(LibInput::MouseMoveEvent event)
invalidate(title_bar); invalidate(title_bar);
} }
invalidate(old_cursor.get_bounding_box(old_cursor));
invalidate(new_cursor.get_bounding_box(old_cursor));
if (m_is_moving_window) if (m_is_moving_window)
{ {
auto old_window = m_focused_window->full_area(); auto old_window = m_focused_window->full_area();
@ -228,17 +228,19 @@ void WindowServer::invalidate(Rectangle area)
auto cursor = cursor_area(); auto cursor = cursor_area();
if (auto overlap = cursor.get_overlap(area); overlap.has_value()) if (auto overlap = cursor.get_overlap(area); overlap.has_value())
{ {
for (int32_t dy = overlap->y - cursor.y; dy < overlap->height; dy++) for (int32_t y_off = 0; y_off < overlap->height; y_off++)
{ {
for (int32_t dx = overlap->x - cursor.x; dx < overlap->width; dx++) for (int32_t x_off = 0; x_off < overlap->width; x_off++)
{ {
const uint32_t offset = (dy * s_cursor_width + dx) * 4; const int32_t rel_x = overlap->x - m_cursor.x + x_off;
const int32_t rel_y = overlap->y - m_cursor.y + y_off;
const uint32_t offset = (rel_y * s_cursor_width + rel_x) * 4;
uint32_t r = (((s_cursor_data[offset + 0] - 33) << 2) | ((s_cursor_data[offset + 1] - 33) >> 4)); uint32_t r = (((s_cursor_data[offset + 0] - 33) << 2) | ((s_cursor_data[offset + 1] - 33) >> 4));
uint32_t g = ((((s_cursor_data[offset + 1] - 33) & 0xF) << 4) | ((s_cursor_data[offset + 2] - 33) >> 2)); uint32_t g = ((((s_cursor_data[offset + 1] - 33) & 0xF) << 4) | ((s_cursor_data[offset + 2] - 33) >> 2));
uint32_t b = ((((s_cursor_data[offset + 2] - 33) & 0x3) << 6) | ((s_cursor_data[offset + 3] - 33))); uint32_t b = ((((s_cursor_data[offset + 2] - 33) & 0x3) << 6) | ((s_cursor_data[offset + 3] - 33)));
uint32_t color = (r << 16) | (g << 8) | b; uint32_t color = (r << 16) | (g << 8) | b;
if (color != 0xFF00FF) if (color != 0xFF00FF)
m_framebuffer.mmap[(overlap->y + dy) * m_framebuffer.width + (overlap->x + dx)] = color; m_framebuffer.mmap[(overlap->y + y_off) * m_framebuffer.width + (overlap->x + x_off)] = color;
} }
} }
} }