diff options
Diffstat (limited to 'apps/action.c')
-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 | } |