diff options
author | Jean-Louis Biasini <jlbiasini@gmail.com> | 2013-09-02 11:03:56 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-05 20:02:07 +0200 |
commit | df6eb82f5156256e1999374ce9b1a159610ff9a0 (patch) | |
tree | ec79d078c7deaba74ad0b83d6dc48c3776e8f7f0 /apps | |
parent | ef2dd06d5ee7415684f45afadad6deaf0fb0c615 (diff) | |
download | rockbox-df6eb82f5156256e1999374ce9b1a159610ff9a0.tar.gz rockbox-df6eb82f5156256e1999374ce9b1a159610ff9a0.zip |
touch devices: Disable touch on softlock.
Target that have a touchpad/touchscreen should disable it while
being locked (In order to avoid LCD to drain battery power due to
"key locked" constant reporting messages. If they a have a keylock
button this was already handled at driver level. If not (e.g. fuze+),
they will have to implement a switch at driver level that action.c
can operate on softlock.
This patch does the following for any target having a touchpad
or a touchscreen and no HAS_BUTTON_HOLD (ie any softlock target)
1) it implements the code to call button_enable_touch(bool en) in
action.c.
2) button_enable_touch is implemented in button.c and call
either touchpad_enable or touchscreen_enable
3) those two function are implemented respectively in touchscreen.c
and a new touchpad.c file. They provide a generic way to silents touch's
device and call a function at driver level where target specific code
can be implemented if possible/needed (for power saving for instance).
Those function name are touchpad_enable_device and touchscreen_enable_device
4) we implement an empty function at driver level of targets that need it
to have them still being able to compiled.
Change-Id: I9ead78a25bd33466a8533f5b9f259b395cb5ce49
Reviewed-on: http://gerrit.rockbox.org/569
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/apps/action.c b/apps/action.c index 2492a7d08e..25f559f7bd 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -294,6 +294,10 @@ static int get_action_worker(int context, int timeout, | |||
294 | { | 294 | { |
295 | last_button = BUTTON_NONE; | 295 | last_button = BUTTON_NONE; |
296 | keys_locked = false; | 296 | keys_locked = false; |
297 | #if defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN) | ||
298 | /* enable back touch device */ | ||
299 | button_enable_touch(true); | ||
300 | #endif | ||
297 | splash(HZ/2, str(LANG_KEYLOCK_OFF)); | 301 | splash(HZ/2, str(LANG_KEYLOCK_OFF)); |
298 | return ACTION_REDRAW; | 302 | return ACTION_REDRAW; |
299 | } | 303 | } |
@@ -307,6 +311,13 @@ static int get_action_worker(int context, int timeout, | |||
307 | return ACTION_REDRAW; | 311 | return ACTION_REDRAW; |
308 | } | 312 | } |
309 | } | 313 | } |
314 | #if defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN) | ||
315 | else | ||
316 | { | ||
317 | /* make sure touchpad get reactivated if we quit the screen */ | ||
318 | button_enable_touch(true); | ||
319 | } | ||
320 | #endif | ||
310 | context &= ~ALLOW_SOFTLOCK; | 321 | context &= ~ALLOW_SOFTLOCK; |
311 | #endif /* HAS_BUTTON_HOLD */ | 322 | #endif /* HAS_BUTTON_HOLD */ |
312 | 323 | ||
@@ -373,7 +384,10 @@ static int get_action_worker(int context, int timeout, | |||
373 | unlock_combo = button; | 384 | unlock_combo = button; |
374 | keys_locked = true; | 385 | keys_locked = true; |
375 | splash(HZ/2, str(LANG_KEYLOCK_ON)); | 386 | splash(HZ/2, str(LANG_KEYLOCK_ON)); |
376 | 387 | #if defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN) | |
388 | /* disable touch device on keylock */ | ||
389 | button_enable_touch(false); | ||
390 | #endif | ||
377 | button_clear_queue(); | 391 | button_clear_queue(); |
378 | return ACTION_REDRAW; | 392 | return ACTION_REDRAW; |
379 | } | 393 | } |