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 /firmware/target/hosted | |
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 'firmware/target/hosted')
-rw-r--r-- | firmware/target/hosted/android/button-android.c | 5 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/button-sdl.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c index ee8b32d704..b4f3d1bd90 100644 --- a/firmware/target/hosted/android/button-android.c +++ b/firmware/target/hosted/android/button-android.c | |||
@@ -129,6 +129,11 @@ void button_init_device(void) | |||
129 | set_rockbox_ready(); | 129 | set_rockbox_ready(); |
130 | } | 130 | } |
131 | 131 | ||
132 | void touchscreen_enable_device(bool en) | ||
133 | { | ||
134 | (void)en; /* FIXME: do something smart */ | ||
135 | } | ||
136 | |||
132 | int button_read_device(int *data) | 137 | int button_read_device(int *data) |
133 | { | 138 | { |
134 | int btn = last_btns; | 139 | int btn = last_btns; |
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index 4bd4b8de64..f69c0a509b 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c | |||
@@ -393,10 +393,14 @@ static void button_event(int key, bool pressed) | |||
393 | #endif | 393 | #endif |
394 | default: | 394 | default: |
395 | #ifdef HAVE_TOUCHSCREEN | 395 | #ifdef HAVE_TOUCHSCREEN |
396 | new_btn = key_to_touch(key, mouse_coords); | 396 | if(touchscreen_is_enabled()) |
397 | new_btn = key_to_touch(key, mouse_coords); | ||
397 | if (!new_btn) | 398 | if (!new_btn) |
398 | #endif | 399 | #endif |
399 | new_btn = key_to_button(key); | 400 | new_btn = key_to_button(key); |
401 | #ifdef HAVE_TOUCHPAD | ||
402 | new_btn = touchpad_filter(new_btn); | ||
403 | #endif | ||
400 | break; | 404 | break; |
401 | } | 405 | } |
402 | /* Call to make up for scrollwheel target implementation. This is | 406 | /* Call to make up for scrollwheel target implementation. This is |