RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:48:10 +00:00
Code Issues Activity Actions

WindowServer: Add the ability to animate cursors

Browse source 
This adds the ability to specify cursor attributes as part of their
file names, which allows us to remove hard coded values like the hot
spot from the code. The attributes can be specified between the last
two dots of the file name. Each attribute begins with a character,
followed by one or more digits that specify a uint value.

Supported attributes:
x: The x-coordinate of the cursor hotspot
y: The y-coordinate of the cursor hotspot
f: The number of animated frames horizontally in the image
t: The number of milliseconds per frame

For example, the filename wait.f14t100.png specifies that the image
contains 14 frames that should be cycled through at a rate of 100ms.
The hotspot is not specified, so it defaults to the center.
This commit is contained in:
Tom 2020-12-16 22:15:14 -07:00 • committed by Andreas Kling
parent 853664bd3c
commit 07badd9530
12 changed files with 188 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Services/WindowServer/WindowManager.cpp
View file

@ -83,23 +83,14 @@ WindowManager::~WindowManager()
{
}
NonnullRefPtr<Cursor> WindowManager::get_cursor(const String& name, const Gfx::IntPoint& hotspot)
{
auto path = m_config->read_entry("Cursor", name, "/res/cursors/arrow.png");
auto gb = Gfx::Bitmap::load_from_file(path);
if (gb)
return Cursor::create(*gb, hotspot);
return Cursor::create(*Gfx::Bitmap::load_from_file("/res/cursors/arrow.png"));
}
NonnullRefPtr<Cursor> WindowManager::get_cursor(const String& name)
{
auto path = m_config->read_entry("Cursor", name, "/res/cursors/arrow.png");
static const auto s_default_cursor_path = "/res/cursors/arrow.x2y2.png";
auto path = m_config->read_entry("Cursor", name, s_default_cursor_path);
auto gb = Gfx::Bitmap::load_from_file(path);
if (gb)
return Cursor::create(*gb);
return Cursor::create(*Gfx::Bitmap::load_from_file("/res/cursors/arrow.png"));
return Cursor::create(*gb, path);
return Cursor::create(*Gfx::Bitmap::load_from_file(s_default_cursor_path), s_default_cursor_path);
}
void WindowManager::reload_config(bool set_screen)
@ -113,9 +104,9 @@ void WindowManager::reload_config(bool set_screen)
}
m_hidden_cursor = get_cursor("Hidden");
m_arrow_cursor = get_cursor("Arrow", { 2, 2 });
m_hand_cursor = get_cursor("Hand", { 8, 4 });
m_help_cursor = get_cursor("Help", { 1, 1 });
m_arrow_cursor = get_cursor("Arrow");
m_hand_cursor = get_cursor("Hand");
m_help_cursor = get_cursor("Help");
m_resize_horizontally_cursor = get_cursor("ResizeH");
m_resize_vertically_cursor = get_cursor("ResizeV");
m_resize_diagonally_tlbr_cursor = get_cursor("ResizeDTLBR");