diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/features.txt | 4 | ||||
-rw-r--r-- | apps/lang/english-us.lang | 17 | ||||
-rw-r--r-- | apps/lang/english.lang | 17 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 7 | ||||
-rw-r--r-- | apps/settings.c | 4 | ||||
-rw-r--r-- | apps/settings.h | 4 | ||||
-rw-r--r-- | apps/settings_list.c | 8 |
7 files changed, 61 insertions, 0 deletions
diff --git a/apps/features.txt b/apps/features.txt index 63f023458f..d9ca1a3ece 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -199,6 +199,10 @@ lineout_poweroff | |||
199 | touchscreen | 199 | touchscreen |
200 | #endif | 200 | #endif |
201 | 201 | ||
202 | #if defined(HAVE_TOUCHPAD_DEADZONE) | ||
203 | touchpad_deadzone | ||
204 | #endif | ||
205 | |||
202 | #if defined(HAVE_IMX233_CODEC) || defined(HAVE_WM8750) || defined(HAVE_WM8978) | 206 | #if defined(HAVE_IMX233_CODEC) || defined(HAVE_WM8750) || defined(HAVE_WM8978) |
203 | depth_3d | 207 | depth_3d |
204 | #endif | 208 | #endif |
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang index a6549dafd5..4a316cedca 100644 --- a/apps/lang/english-us.lang +++ b/apps/lang/english-us.lang | |||
@@ -10606,6 +10606,23 @@ | |||
10606 | </voice> | 10606 | </voice> |
10607 | </phrase> | 10607 | </phrase> |
10608 | <phrase> | 10608 | <phrase> |
10609 | id: LANG_DEADZONE | ||
10610 | desc: touchpad deadzone setting | ||
10611 | user: core | ||
10612 | <source> | ||
10613 | *: none | ||
10614 | sansafuzeplus: "Touchpad Dead Zone" | ||
10615 | </source> | ||
10616 | <dest> | ||
10617 | *: none | ||
10618 | sansafuzeplus: "Touchpad Dead Zone" | ||
10619 | </dest> | ||
10620 | <voice> | ||
10621 | *: none | ||
10622 | sansafuzeplus: "Touchpad Dead Zone" | ||
10623 | </voice> | ||
10624 | </phrase> | ||
10625 | <phrase> | ||
10609 | id: LANG_HIGH | 10626 | id: LANG_HIGH |
10610 | desc: in settings_menu | 10627 | desc: in settings_menu |
10611 | user: core | 10628 | user: core |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 9914b160f1..113570522c 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -10693,6 +10693,23 @@ | |||
10693 | </voice> | 10693 | </voice> |
10694 | </phrase> | 10694 | </phrase> |
10695 | <phrase> | 10695 | <phrase> |
10696 | id: LANG_DEADZONE | ||
10697 | desc: touchpad deadzone setting | ||
10698 | user: core | ||
10699 | <source> | ||
10700 | *: none | ||
10701 | sansafuzeplus: "Touchpad Dead Zone" | ||
10702 | </source> | ||
10703 | <dest> | ||
10704 | *: none | ||
10705 | sansafuzeplus: "Touchpad Dead Zone" | ||
10706 | </dest> | ||
10707 | <voice> | ||
10708 | *: none | ||
10709 | sansafuzeplus: "Touchpad Dead Zone" | ||
10710 | </voice> | ||
10711 | </phrase> | ||
10712 | <phrase> | ||
10696 | id: LANG_HIGH | 10713 | id: LANG_HIGH |
10697 | desc: in settings_menu | 10714 | desc: in settings_menu |
10698 | user: core | 10715 | user: core |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 0d2a7febf1..130f5be1a2 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -317,6 +317,10 @@ MENUITEM_SETTING(buttonlight_brightness, &global_settings.buttonlight_brightness | |||
317 | MENUITEM_SETTING(touchpad_sensitivity, &global_settings.touchpad_sensitivity, NULL); | 317 | MENUITEM_SETTING(touchpad_sensitivity, &global_settings.touchpad_sensitivity, NULL); |
318 | #endif | 318 | #endif |
319 | 319 | ||
320 | #ifdef HAVE_TOUCHPAD_DEADZONE | ||
321 | MENUITEM_SETTING(touchpad_deadzone, &global_settings.touchpad_deadzone, NULL); | ||
322 | #endif | ||
323 | |||
320 | #ifdef HAVE_QUICKSCREEN | 324 | #ifdef HAVE_QUICKSCREEN |
321 | MENUITEM_SETTING(shortcuts_replaces_quickscreen, &global_settings.shortcuts_replaces_qs, NULL); | 325 | MENUITEM_SETTING(shortcuts_replaces_quickscreen, &global_settings.shortcuts_replaces_qs, NULL); |
322 | #endif | 326 | #endif |
@@ -363,6 +367,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
363 | #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING | 367 | #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING |
364 | &touchpad_sensitivity, | 368 | &touchpad_sensitivity, |
365 | #endif | 369 | #endif |
370 | #ifdef HAVE_TOUCHPAD_DEADZONE | ||
371 | &touchpad_deadzone, | ||
372 | #endif | ||
366 | #ifdef USB_ENABLE_HID | 373 | #ifdef USB_ENABLE_HID |
367 | &usb_hid, | 374 | &usb_hid, |
368 | &usb_keypad_mode, | 375 | &usb_keypad_mode, |
diff --git a/apps/settings.c b/apps/settings.c index 819924a421..515e7cb5f3 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -1061,6 +1061,10 @@ void settings_apply(bool read_disk) | |||
1061 | touchpad_set_sensitivity(global_settings.touchpad_sensitivity); | 1061 | touchpad_set_sensitivity(global_settings.touchpad_sensitivity); |
1062 | #endif | 1062 | #endif |
1063 | 1063 | ||
1064 | #ifdef HAVE_TOUCHPAD_DEADZONE | ||
1065 | touchpad_set_deadzone(global_settings.touchpad_deadzone); | ||
1066 | #endif | ||
1067 | |||
1064 | #ifdef HAVE_USB_CHARGING_ENABLE | 1068 | #ifdef HAVE_USB_CHARGING_ENABLE |
1065 | usb_charging_enable(global_settings.usb_charging); | 1069 | usb_charging_enable(global_settings.usb_charging); |
1066 | #endif | 1070 | #endif |
diff --git a/apps/settings.h b/apps/settings.h index 60658f6857..3ec5ee6207 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -460,6 +460,10 @@ struct user_settings | |||
460 | int touchpad_sensitivity; | 460 | int touchpad_sensitivity; |
461 | #endif | 461 | #endif |
462 | 462 | ||
463 | #ifdef HAVE_TOUCHPAD_DEADZONE | ||
464 | int touchpad_deadzone; | ||
465 | #endif | ||
466 | |||
463 | int pause_rewind; /* time in s to rewind when pausing */ | 467 | int pause_rewind; /* time in s to rewind when pausing */ |
464 | #ifdef HAVE_HEADPHONE_DETECTION | 468 | #ifdef HAVE_HEADPHONE_DETECTION |
465 | int unplug_mode; /* pause on headphone unplug */ | 469 | int unplug_mode; /* pause on headphone unplug */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 53acb78d98..cddc062d40 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -2024,6 +2024,14 @@ const struct settings_list settings[] = { | |||
2024 | ID2P(LANG_NORMAL), ID2P(LANG_HIGH)), | 2024 | ID2P(LANG_NORMAL), ID2P(LANG_HIGH)), |
2025 | #endif /* boolean or analogig values */ | 2025 | #endif /* boolean or analogig values */ |
2026 | #endif /* HAVE_TOUCHPAD_SENSITIVITY_SETTING */ | 2026 | #endif /* HAVE_TOUCHPAD_SENSITIVITY_SETTING */ |
2027 | |||
2028 | #ifdef HAVE_TOUCHPAD_DEADZONE | ||
2029 | INT_SETTING(F_NO_WRAP, touchpad_deadzone, LANG_DEADZONE, | ||
2030 | DEFAULT_TOUCHPAD_DEADZONE_SETTING, "touchpad deadzone", UNIT_INT, | ||
2031 | MIN_TOUCHPAD_DEADSPACE_SETTING, MAX_TOUCHPAD_DEADSPACE_SETTING, 1, | ||
2032 | NULL, NULL, touchpad_set_deadzone), | ||
2033 | #endif | ||
2034 | |||
2027 | #ifdef HAVE_QUICKSCREEN | 2035 | #ifdef HAVE_QUICKSCREEN |
2028 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_TOP], LANG_TOP_QS_ITEM, | 2036 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_TOP], LANG_TOP_QS_ITEM, |
2029 | NULL, "qs top", | 2037 | NULL, "qs top", |