mirror
/
libx52
mirror of https://github.com/nirenjan/libx52.git
1
0
Fork 0
Code Releases Wiki Activity

fix build

mouse-isometric-mode
nirenjan 2026-04-01 14:06:42 -07:00
parent 434f64c60f
commit 22ee7ed19f
5 changed files with 153 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/meson.build
View File

@ -32,9 +32,11 @@ x52d_sources = [
] ]
dep_threads = dependency('threads') dep_threads = dependency('threads')
dep_math = dependency('m', required: false) # Sometimes not a separate library
# Comm sources are compiled into x52d (same as Autotools); libx52dcomm is only for x52ctl. # Comm sources are compiled into x52d (same as Autotools); libx52dcomm is only for x52ctl.
x52d_linkwith = [lib_libx52, lib_vkm, lib_libx52io] x52d_linkwith = [lib_libx52, lib_vkm, lib_libx52io]
x52d_deps = [dep_pinelog, dep_inih, dep_threads, dep_intl] x52d_deps = [dep_pinelog, dep_inih, dep_threads, dep_math, dep_intl]
x52d_cflags = [] x52d_cflags = []
exe_x52d = executable('x52d', x52d_sources + libx52dcomm_sources, exe_x52d = executable('x52d', x52d_sources + libx52dcomm_sources,

10
daemon/x52d_mouse.c
View File

@ -89,7 +89,7 @@ void x52d_cfg_set_Mouse_Speed(int speed)
new_mult = MOUSE_MULT_FACTOR + (speed - max_base_speed); new_mult = MOUSE_MULT_FACTOR + (speed - max_base_speed);
} }
sensitivity = round(10000000.0 / new_delay * new_mult / (double)MOUSE_MULT_FACTOR); sensitivity = round(1e6 / new_delay * new_mult / (double)MOUSE_MULT_FACTOR);
PINELOG_INFO(_("Migrating legacy mouse speed '%d' to sensitivity '%d%%'"), PINELOG_INFO(_("Migrating legacy mouse speed '%d' to sensitivity '%d%%'"),
speed, (int)sensitivity); speed, (int)sensitivity);
@ -109,14 +109,14 @@ void x52d_cfg_set_Mouse_ReverseScroll(bool enabled)
} }
} }
void x52d_config_set_Mouse_IsometricMode(bool enabled) void x52d_cfg_set_Mouse_IsometricMode(bool enabled)
{ {
PINELOG_DEBUG(_("Setting mouse isometric mode to %s"), PINELOG_DEBUG(_("Setting mouse isometric mode to %s"),
enabled ? _("on") : _("off")); enabled ? _("on") : _("off"));
mouse_isometric_mode = enabled; mouse_isometric_mode = enabled;
} }
void x52d_config_set_Mouse_Sensitivity(int factor) void x52d_cfg_set_Mouse_Sensitivity(int factor)
{ {
mouse_sensitivity = clamp_int(_("sensitivity"), factor, mouse_sensitivity = clamp_int(_("sensitivity"), factor,
MIN_SENSITIVITY, MAX_SENSITIVITY); MIN_SENSITIVITY, MAX_SENSITIVITY);
@ -124,7 +124,7 @@ void x52d_config_set_Mouse_Sensitivity(int factor)
PINELOG_DEBUG(_("Setting mouse sensitivity to %d%%"), mouse_sensitivity); PINELOG_DEBUG(_("Setting mouse sensitivity to %d%%"), mouse_sensitivity);
} }
void x52d_config_set_Mouse_CurveFactor(int factor) void x52d_cfg_set_Mouse_CurveFactor(int factor)
{ {
// Factor ranges from 1-5, clamp it in this range // Factor ranges from 1-5, clamp it in this range
factor = clamp_int(_("curve factor"), factor, 1, 5); factor = clamp_int(_("curve factor"), factor, 1, 5);
@ -133,7 +133,7 @@ void x52d_config_set_Mouse_CurveFactor(int factor)
PINELOG_DEBUG(_("Setting mouse curve factor to %f"), mouse_curve_factor); PINELOG_DEBUG(_("Setting mouse curve factor to %f"), mouse_curve_factor);
} }
void x52d_config_set_Mouse_Deadzone(int factor) void x52d_cfg_set_Mouse_Deadzone(int factor)
{ {
// Factor ranges from 0-12, clamp it in this range // Factor ranges from 0-12, clamp it in this range
factor = clamp_int(_("deadzone factor"), factor, 0, 11); factor = clamp_int(_("deadzone factor"), factor, 0, 11);

4
daemon/x52d_mouse_test.c
View File

@ -91,14 +91,14 @@ static void test_mouse_speed_max_hyper(void **state)
{ {
(void)state; (void)state;
x52d_cfg_set_Mouse_Speed(32); x52d_cfg_set_Mouse_Speed(32);
assert_int_equal(mouse_sensitivity, 600); assert_int_equal(mouse_sensitivity, 500);
} }
static void test_mouse_speed_above_max(void **state) static void test_mouse_speed_above_max(void **state)
{ {
(void)state; (void)state;
x52d_cfg_set_Mouse_Speed(33); x52d_cfg_set_Mouse_Speed(33);
assert_int_equal(mouse_sensitivity, 600); assert_int_equal(mouse_sensitivity, 500);
} }
static void test_mouse_reverse_scroll_enabled(void **state) static void test_mouse_reverse_scroll_enabled(void **state)

84
po/libx52.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: libx52 0.3.3\n" "Project-Id-Version: libx52 0.3.3\n"
"Report-Msgid-Bugs-To: https://github.com/nirenjan/libx52/issues\n" "Report-Msgid-Bugs-To: https://github.com/nirenjan/libx52/issues\n"
"POT-Creation-Date: 2026-03-27 20:52-0700\n" "POT-Creation-Date: 2026-04-01 14:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -142,13 +142,13 @@ msgstr ""
msgid "Unknown LED state %d" msgid "Unknown LED state %d"
msgstr "" msgstr ""
#: libx52/x52_stringify.c:47 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:32 #: libx52/x52_stringify.c:47 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:63
#: daemon/x52d_mouse.c:66 #: daemon/x52d_mouse.c:103 daemon/x52d_mouse.c:115
msgid "off" msgid "off"
msgstr "" msgstr ""
#: libx52/x52_stringify.c:48 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:32 #: libx52/x52_stringify.c:48 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:63
#: daemon/x52d_mouse.c:66 #: daemon/x52d_mouse.c:103 daemon/x52d_mouse.c:115
msgid "on" msgid "on"
msgstr "" msgstr ""
@ -864,63 +864,105 @@ msgstr ""
msgid "Shutting down X52 I/O driver thread" msgid "Shutting down X52 I/O driver thread"
msgstr "" msgstr ""
#: daemon/x52d_mouse.c:31 #: daemon/x52d_mouse.c:46 daemon/x52d_mouse.c:52
#, c-format
msgid "Clamping %s value %d to range [%d..%d]"
msgstr ""
#: daemon/x52d_mouse.c:62
#, c-format #, c-format
msgid "Setting mouse enable to %s" msgid "Setting mouse enable to %s"
msgstr "" msgstr ""
#: daemon/x52d_mouse.c:45 #: daemon/x52d_mouse.c:79
#, c-format msgid ""
msgid "Ignoring mouse speed %d outside supported range (0-%d)" "Config option 'mouse.speed' is DEPRECATED. Please use 'mouse.sensitivity' "
"instead"
msgstr "" msgstr ""
#: daemon/x52d_mouse.c:57 #: daemon/x52d_mouse.c:94
#, c-format #, c-format
msgid "Setting mouse speed to %d (delay %d ms, multiplier %f)" msgid "Migrating legacy mouse speed '%d' to sensitivity '%d%%'"
msgstr "" msgstr ""
#: daemon/x52d_mouse.c:65 #: daemon/x52d_mouse.c:96
msgid "speed -> sensitivity"
msgstr ""
#: daemon/x52d_mouse.c:102
#, c-format #, c-format
msgid "Setting mouse reverse scroll to %s" msgid "Setting mouse reverse scroll to %s"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:43 #: daemon/x52d_mouse.c:114
#, c-format
msgid "Setting mouse isometric mode to %s"
msgstr ""
#: daemon/x52d_mouse.c:121
msgid "sensitivity"
msgstr ""
#: daemon/x52d_mouse.c:124
#, c-format
msgid "Setting mouse sensitivity to %d%%"
msgstr ""
#: daemon/x52d_mouse.c:130
msgid "curve factor"
msgstr ""
#: daemon/x52d_mouse.c:133
#, c-format
msgid "Setting mouse curve factor to %f"
msgstr ""
#: daemon/x52d_mouse.c:139
msgid "deadzone factor"
msgstr ""
#: daemon/x52d_mouse.c:142
#, c-format
msgid "Setting mouse deadzone to %f"
msgstr ""
#: daemon/x52d_mouse_handler.c:44
#, c-format #, c-format
msgid "Error %d writing mouse button event (button %d, state %d)" msgid "Error %d writing mouse button event (button %d, state %d)"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:81 #: daemon/x52d_mouse_handler.c:82
#, c-format #, c-format
msgid "Error writing mouse wheel event %d" msgid "Error writing mouse wheel event %d"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:120 #: daemon/x52d_mouse_handler.c:175
#, c-format #, c-format
msgid "Error %d writing mouse axis event (dx %d, dy %d)" msgid "Error %d writing mouse axis event (dx %d, dy %d)"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:132 #: daemon/x52d_mouse_handler.c:187
msgid "Error writing mouse sync event" msgid "Error writing mouse sync event"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:151 #: daemon/x52d_mouse_handler.c:206
msgid "Starting X52 virtual mouse driver thread" msgid "Starting X52 virtual mouse driver thread"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:170 #: daemon/x52d_mouse_handler.c:225
#, c-format #, c-format
msgid "Error %d initializing mouse thread: %s" msgid "Error %d initializing mouse thread: %s"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:177 #: daemon/x52d_mouse_handler.c:232
msgid "Shutting down X52 virtual mouse driver thread" msgid "Shutting down X52 virtual mouse driver thread"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:184 #: daemon/x52d_mouse_handler.c:239
msgid "Virtual mouse not created. Ignoring thread state change" msgid "Virtual mouse not created. Ignoring thread state change"
msgstr "" msgstr ""
#: daemon/x52d_mouse_handler.c:236 daemon/x52d_mouse_handler.c:244 #: daemon/x52d_mouse_handler.c:291 daemon/x52d_mouse_handler.c:299
#, c-format #, c-format
msgid "Error %d creating X52 virtual mouse" msgid "Error %d creating X52 virtual mouse"
msgstr "" msgstr ""

112
po/xx_PL.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: libx52 0.2.3\n" "Project-Id-Version: libx52 0.2.3\n"
"Report-Msgid-Bugs-To: https://github.com/nirenjan/libx52/issues\n" "Report-Msgid-Bugs-To: https://github.com/nirenjan/libx52/issues\n"
"POT-Creation-Date: 2026-03-27 20:52-0700\n" "POT-Creation-Date: 2026-04-01 14:00-0700\n"
"PO-Revision-Date: 2026-03-27 08:33-0700\n" "PO-Revision-Date: 2026-03-27 08:33-0700\n"
"Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n" "Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n"
"Language-Team: Dummy Language for testing i18n\n" "Language-Team: Dummy Language for testing i18n\n"
@ -142,13 +142,13 @@ msgstr "YYay-MMay-DDay"
msgid "Unknown LED state %d" msgid "Unknown LED state %d"
msgstr "Unknownay EDLay atestay %d" msgstr "Unknownay EDLay atestay %d"
#: libx52/x52_stringify.c:47 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:32 #: libx52/x52_stringify.c:47 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:63
#: daemon/x52d_mouse.c:66 #: daemon/x52d_mouse.c:103 daemon/x52d_mouse.c:115
msgid "off" msgid "off"
msgstr "offay" msgstr "offay"
#: libx52/x52_stringify.c:48 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:32 #: libx52/x52_stringify.c:48 daemon/x52d_clock.c:29 daemon/x52d_mouse.c:63
#: daemon/x52d_mouse.c:66 #: daemon/x52d_mouse.c:103 daemon/x52d_mouse.c:115
msgid "on" msgid "on"
msgstr "onay" msgstr "onay"
@ -234,34 +234,32 @@ msgid "Read timeout"
msgstr "Eadray imeouttay" msgstr "Eadray imeouttay"
#: vkm/vkm_common.c:26 #: vkm/vkm_common.c:26
#, fuzzy
msgid "Unknown error" msgid "Unknown error"
msgstr "Unknownay erroray %d" msgstr "Unknownay erroray"
#: vkm/vkm_common.c:27 #: vkm/vkm_common.c:27
msgid "Not ready" msgid "Not ready"
msgstr "" msgstr "Otnay eadyray"
#: vkm/vkm_common.c:28 #: vkm/vkm_common.c:28
msgid "Out of memory" msgid "Out of memory"
msgstr "" msgstr "Outay ofay emorymay"
#: vkm/vkm_common.c:30 #: vkm/vkm_common.c:30
#, fuzzy
msgid "Not supported" msgid "Not supported"
msgstr "Operationay otnay upportedsay" msgstr "Otnay upportedsay"
#: vkm/vkm_common.c:31 #: vkm/vkm_common.c:31
msgid "Virtual device failure" msgid "Virtual device failure"
msgstr "" msgstr "Irtualvay eviceday ailurefay"
#: vkm/vkm_common.c:32 #: vkm/vkm_common.c:32
msgid "Unable to write event" msgid "Unable to write event"
msgstr "" msgstr "Unableay otay itewray eventay"
#: vkm/vkm_common.c:33 #: vkm/vkm_common.c:33
msgid "No state change" msgid "No state change"
msgstr "" msgstr "Onay atestay angechay"
#: evtest/ev_test.c:110 #: evtest/ev_test.c:110
#, c-format #, c-format
@ -919,64 +917,106 @@ msgstr "Erroray %d initializingay I/O iverdray eadthray: %s"
msgid "Shutting down X52 I/O driver thread" msgid "Shutting down X52 I/O driver thread"
msgstr "Uttingshay ownday X52 I/O iverdray eadthray" msgstr "Uttingshay ownday X52 I/O iverdray eadthray"
#: daemon/x52d_mouse.c:31 #: daemon/x52d_mouse.c:46 daemon/x52d_mouse.c:52
#, c-format
msgid "Clamping %s value %d to range [%d..%d]"
msgstr ""
#: daemon/x52d_mouse.c:62
#, c-format #, c-format
msgid "Setting mouse enable to %s" msgid "Setting mouse enable to %s"
msgstr "Ettingsay ousemay enableay otay %s" msgstr "Ettingsay ousemay enableay otay %s"
#: daemon/x52d_mouse.c:45 #: daemon/x52d_mouse.c:79
#, c-format msgid ""
msgid "Ignoring mouse speed %d outside supported range (0-%d)" "Config option 'mouse.speed' is DEPRECATED. Please use 'mouse.sensitivity' "
msgstr "Ignoringay ousemay eedspay %d outsideay upportedsay angeray (0-%d)" "instead"
msgstr ""
#: daemon/x52d_mouse.c:57 #: daemon/x52d_mouse.c:94
#, c-format #, c-format
msgid "Setting mouse speed to %d (delay %d ms, multiplier %f)" msgid "Migrating legacy mouse speed '%d' to sensitivity '%d%%'"
msgstr "Ettingsay ousemay eedspay otay %d (elayday %d ms, ultipliermay %f)" msgstr ""
#: daemon/x52d_mouse.c:65 #: daemon/x52d_mouse.c:96
msgid "speed -> sensitivity"
msgstr ""
#: daemon/x52d_mouse.c:102
#, c-format #, c-format
msgid "Setting mouse reverse scroll to %s" msgid "Setting mouse reverse scroll to %s"
msgstr "Ettingsay ousemay everseray ollscray otay %s" msgstr "Ettingsay ousemay everseray ollscray otay %s"
#: daemon/x52d_mouse_handler.c:43 #: daemon/x52d_mouse.c:114
#, c-format
msgid "Setting mouse isometric mode to %s"
msgstr "Ettingsay ousemay isometricay odemay otay %s"
#: daemon/x52d_mouse.c:121
msgid "sensitivity"
msgstr "ensitivitysay"
#: daemon/x52d_mouse.c:124
#, c-format
msgid "Setting mouse sensitivity to %d%%"
msgstr "Ettingsay ousemay ensitivitysay otay %s"
#: daemon/x52d_mouse.c:130
msgid "curve factor"
msgstr "urvecay actorfay"
#: daemon/x52d_mouse.c:133
#, c-format
msgid "Setting mouse curve factor to %f"
msgstr "Ettingsay ousemay urvecay actorfay otay %s"
#: daemon/x52d_mouse.c:139
msgid "deadzone factor"
msgstr "eadzoneday actorfay"
#: daemon/x52d_mouse.c:142
#, c-format
msgid "Setting mouse deadzone to %f"
msgstr "Ettingsay ousemay eadzoneday otay %s"
#: daemon/x52d_mouse_handler.c:44
#, c-format #, c-format
msgid "Error %d writing mouse button event (button %d, state %d)" msgid "Error %d writing mouse button event (button %d, state %d)"
msgstr "" msgstr ""
"Erroray %d itingwray ousemay uttonbay eventay (uttonbay %d, atestay %d)" "Erroray %d itingwray ousemay uttonbay eventay (uttonbay %d, atestay %d)"
#: daemon/x52d_mouse_handler.c:81 #: daemon/x52d_mouse_handler.c:82
#, c-format #, c-format
msgid "Error writing mouse wheel event %d" msgid "Error writing mouse wheel event %d"
msgstr "Erroray itingwray ousemay eelwhay eventay %d" msgstr "Erroray itingwray ousemay eelwhay eventay %d"
#: daemon/x52d_mouse_handler.c:120 #: daemon/x52d_mouse_handler.c:175
#, c-format #, c-format
msgid "Error %d writing mouse axis event (dx %d, dy %d)" msgid "Error %d writing mouse axis event (dx %d, dy %d)"
msgstr "Erroray %d itingwray ousemay axisay eventay (xday %d, yday %d)" msgstr "Erroray %d itingwray ousemay axisay eventay (xday %d, yday %d)"
#: daemon/x52d_mouse_handler.c:132 #: daemon/x52d_mouse_handler.c:187
msgid "Error writing mouse sync event" msgid "Error writing mouse sync event"
msgstr "Erroray itingwray ousemay yncsay eventay" msgstr "Erroray itingwray ousemay yncsay eventay"
#: daemon/x52d_mouse_handler.c:151 #: daemon/x52d_mouse_handler.c:206
msgid "Starting X52 virtual mouse driver thread" msgid "Starting X52 virtual mouse driver thread"
msgstr "Artingstay X52 irtualvay ousemay iverdray eadthray" msgstr "Artingstay X52 irtualvay ousemay iverdray eadthray"
#: daemon/x52d_mouse_handler.c:170 #: daemon/x52d_mouse_handler.c:225
#, c-format #, c-format
msgid "Error %d initializing mouse thread: %s" msgid "Error %d initializing mouse thread: %s"
msgstr "Erroray %d initializingay ousemay eadthray: %s" msgstr "Erroray %d initializingay ousemay eadthray: %s"
#: daemon/x52d_mouse_handler.c:177 #: daemon/x52d_mouse_handler.c:232
msgid "Shutting down X52 virtual mouse driver thread" msgid "Shutting down X52 virtual mouse driver thread"
msgstr "Uttingshay ownday X52 irtualvay ousemay iverdray eadthray" msgstr "Uttingshay ownday X52 irtualvay ousemay iverdray eadthray"
#: daemon/x52d_mouse_handler.c:184 #: daemon/x52d_mouse_handler.c:239
msgid "Virtual mouse not created. Ignoring thread state change" msgid "Virtual mouse not created. Ignoring thread state change"
msgstr "Irtualvay ousemay otnay eatedcray. Ignoringa eadthray atestay angechay" msgstr "Irtualvay ousemay otnay eatedcray. Ignoringa eadthray atestay angechay"
#: daemon/x52d_mouse_handler.c:236 daemon/x52d_mouse_handler.c:244 #: daemon/x52d_mouse_handler.c:291 daemon/x52d_mouse_handler.c:299
#, c-format #, c-format
msgid "Error %d creating X52 virtual mouse" msgid "Error %d creating X52 virtual mouse"
msgstr "Erroray %d eatingcray X52 irtualvay ousemay" msgstr "Erroray %d eatingcray X52 irtualvay ousemay"
@ -1039,3 +1079,11 @@ msgstr "Argumentay engthlay ootay onglay\n"
#, c-format #, c-format
msgid "Running in interactive mode, ignoring extra arguments\n" msgid "Running in interactive mode, ignoring extra arguments\n"
msgstr "Unningray inay interactiveay odemay, ignoringay extraay argumentsay\n" msgstr "Unningray inay interactiveay odemay, ignoringay extraay argumentsay\n"
#, c-format
#~ msgid "Ignoring mouse speed %d outside supported range (0-%d)"
#~ msgstr "Ignoringay ousemay eedspay %d outsideay upportedsay angeray (0-%d)"
#, c-format
#~ msgid "Setting mouse speed to %d (delay %d ms, multiplier %f)"
#~ msgstr "Ettingsay ousemay eedspay otay %d (elayday %d ms, ultipliermay %f)"