Merge pull request #4834 from koying/fixdroidctrl

FIX: [droid] handle CTRL meta

diff --git a/xbmc/android/activity/AndroidExtra.h b/xbmc/android/activity/AndroidExtra.h
index 7b1c9ff..2fa0583 100644 (file)
--- a/xbmc/android/activity/AndroidExtra.h
+++ b/xbmc/android/activity/AndroidExtra.h
@@ -43,6 +43,9 @@ extern typeof(AMotionEvent_getButtonState) *p_AMotionEvent_getButtonState;
 #define AKEYCODE_MEDIA_PLAY 126
 #define AKEYCODE_MEDIA_EJECT 129
 
+#define AMETA_CTRL_LEFT_ON 0x2000
+#define AMETA_CTRL_RIGHT_ON 0x4000
+
 //Additional defines from android.view.MotionEvent (http://developer.android.com/reference/android/view/MotionEvent.html)
 #define AMOTION_EVENT_ACTION_SCROLL 0x08
 

diff --git a/xbmc/android/activity/AndroidKey.cpp b/xbmc/android/activity/AndroidKey.cpp
index 2574393..4b43141 100644 (file)
--- a/xbmc/android/activity/AndroidKey.cpp
+++ b/xbmc/android/activity/AndroidKey.cpp
@@ -194,6 +194,10 @@ bool CAndroidKey::onKeyboardEvent(AInputEvent *event)
     modifiers |= XBMCKMOD_LSHIFT;
   if (state & AMETA_SHIFT_RIGHT_ON)
     modifiers |= XBMCKMOD_RSHIFT;
+  if (state & AMETA_CTRL_LEFT_ON)
+    modifiers |= XBMCKMOD_LCTRL;
+  if (state & AMETA_CTRL_RIGHT_ON)
+    modifiers |= XBMCKMOD_RCTRL;
   /* TODO:
   if (state & AMETA_SYM_ON)
     modifiers |= 0x000?;*/