Samsung YH820/92x keymap bugfixes

This patch fixes some (mostly small) plugin issues with the "big"
YH-keymap patch (a507b). Only one fix affects the main keymaps
(virtual keyboard "DONE" now exits after long key /release/ instead
of long button /press/).

Change-Id: Id34f925ebfa97ae4974cd9405fbe1fee4f597833

2 files changed, 7 insertions, 2 deletions

diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index bdbe4f93ad..0ff3f6c830 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -198,7 +198,8 @@
 #define ZX_LEFT         BUTTON_LEFT
 #define ZX_RIGHT        BUTTON_RIGHT
 #define ZX_SELECT       BUTTON_PLAY
-#define ZX_MENU         BUTTON_FFWD
+#define ZX_SELECT2      BUTTON_FFWD
+#define ZX_MENU         BUTTON_REW
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 
diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c
index 81a79dc70a..d618243b92 100644
--- a/apps/plugins/zxbox/zxbox.c
+++ b/apps/plugins/zxbox/zxbox.c
@@ -187,7 +187,11 @@ void spkb_process_events( int evenframe )
                 spkb_kbstate[ki].state = 0;
             }
 
-            if ( buttons & ZX_SELECT ){
+            if ( buttons & ZX_SELECT
+#ifdef ZX_SELECT2
+                || buttons & ZX_SELECT2
+#endif
+            ){
                  ki = KS_TO_KEY(SK_KP_Insert);
                 spkb_kbstate[ki].state = 1;
             }