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

WindowServer+LibGfx: Move CursorParams to LibGfx

Browse source 
They will be used by MouseSettings in the next commit.
This commit is contained in:
Maciej Zygmanowski 2021-08-02 11:56:05 +02:00 • committed by Andreas Kling
parent 0363cd3d55
commit 3597b6eb9d
5 changed files with 145 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

92
Userland/Services/WindowServer/Cursor.cpp
View file

@ -11,93 +11,7 @@
namespace WindowServer {
CursorParams CursorParams::parse_from_filename(const StringView& cursor_path, const Gfx::IntPoint& default_hotspot)
{
LexicalPath path(cursor_path);
auto file_title = path.title();
auto last_dot_in_title = file_title.find_last('.');
if (!last_dot_in_title.has_value() || last_dot_in_title.value() == 0) {
// No encoded params in filename. Not an error, we'll just use defaults
return { default_hotspot };
}
auto params_str = file_title.substring_view(last_dot_in_title.value() + 1);
CursorParams params(default_hotspot);
bool in_display_scale_part = false;
for (size_t i = 0; i + 1 < params_str.length() && !in_display_scale_part;) {
auto property = params_str[i++];
auto value = [&]() -> Optional<size_t> {
size_t k = i;
while (k < params_str.length()) {
auto ch = params_str[k];
if (ch < '0' || ch > '9')
break;
k++;
}
if (k == i)
return {};
auto parsed_number = params_str.substring_view(i, k - i).to_uint();
if (!parsed_number.has_value())
return {};
i = k;
return parsed_number.value();
}();
if (!value.has_value()) {
dbgln("Failed to parse value for property '{}' from parsed cursor path: {}", property, cursor_path);
return { default_hotspot };
}
switch (property) {
case 'x':
params.m_hotspot.set_x(value.value());
params.m_have_hotspot = true;
break;
case 'y':
params.m_hotspot.set_y(value.value());
params.m_have_hotspot = true;
break;
case 'f':
if (value.value() > 1)
params.m_frames = value.value();
break;
case 't':
if (value.value() >= 100 && value.value() <= 1000)
params.m_frame_ms = value.value();
else
dbgln("Cursor frame rate outside of valid range (100-1000ms)");
break;
case '-':
in_display_scale_part = true;
break;
default:
dbgln("Ignore unknown property '{}' with value {} parsed from cursor path: {}", property, value.value(), cursor_path);
return { default_hotspot };
}
}
return params;
}
CursorParams CursorParams::constrained(const Gfx::Bitmap& bitmap) const
{
CursorParams params(*this);
auto rect = bitmap.rect();
if (params.m_frames > 1) {
if (rect.width() % params.m_frames == 0) {
rect.set_width(rect.width() / (int)params.m_frames);
} else {
dbgln("Cannot divide cursor dimensions {} into {} frames", rect, params.m_frames);
params.m_frames = 1;
}
}
if (params.m_have_hotspot)
params.m_hotspot.constrain(rect);
else
params.m_hotspot = rect.center();
return params;
}
Cursor::Cursor(NonnullRefPtr<Gfx::Bitmap>&& bitmap, int scale_factor, const CursorParams& cursor_params)
Cursor::Cursor(NonnullRefPtr<Gfx::Bitmap>&& bitmap, int scale_factor, Gfx::CursorParams const& cursor_params)
: m_params(cursor_params.constrained(*bitmap))
, m_rect(bitmap->rect())
{
@ -116,7 +30,7 @@ void Cursor::update_rect_if_animated()
NonnullRefPtr<Cursor> Cursor::create(NonnullRefPtr<Gfx::Bitmap>&& bitmap, int scale_factor)
{
auto hotspot = bitmap->rect().center();
return adopt_ref(*new Cursor(move(bitmap), scale_factor, CursorParams(hotspot)));
return adopt_ref(*new Cursor(move(bitmap), scale_factor, Gfx::CursorParams(hotspot)));
}
RefPtr<Cursor> Cursor::create(const StringView& filename, const StringView& default_filename)
@ -152,7 +66,7 @@ bool Cursor::load(const StringView& filename, const StringView& default_filename
if (did_load_any) {
auto& bitmap = this->bitmap(1);
m_rect = bitmap.rect();
m_params = CursorParams::parse_from_filename(filename, m_rect.center()).constrained(bitmap);
m_params = Gfx::CursorParams::parse_from_filename(filename, m_rect.center()).constrained(bitmap);
update_rect_if_animated();
}
return did_load_any;