Merge pull request #1056 from Montellese/jsonrpc_sendkey

JSON-RPC SendKey, ExecuteAction, ShowCodec and ShowOSD in Input namespace

xbmc/Application.cpp

@@ -3061,6 +3061,16 @@ bool CApplication::ProcessJsonRpcButtons()
 {
 #ifdef HAS_JSONRPC
   CKey tempKey(JSONRPC::CInputOperations::GetKey());
+  if (tempKey.GetButtonCode() == KEY_UNICODE && tempKey.GetUnicode() != 0)
+  {
+    XBMC_Event event = { 0 };
+    event.type = XBMC_KEYDOWN;
+    event.key.type = XBMC_KEYDOWN;
+    event.key.keysym.unicode = (uint16_t)tempKey.GetUnicode();
+    event.key.keysym.sym = (XBMCKey)tempKey.GetUnicode();
+
+    return OnEvent(event);
+  }
   if (tempKey.GetButtonCode() != KEY_INVALID)
   {
     tempKey.SetFromService(true);

xbmc/dialogs/GUIDialogKeyboard.cpp

@@ -34,6 +34,7 @@
 #include "Application.h"
 #include "settings/AdvancedSettings.h"
 #include "guilib/LocalizeStrings.h"
+#include "interfaces/AnnouncementManager.h"
 
 // Symbol mapping (based on MS virtual keyboard - may need improving)
 static char symbol_map[37] = ")!@#$%^&*([]{}-_=+;:\'\",.<>/?\\|`~    ";
@@ -98,6 +99,11 @@ void CGUIDialogKeyboard::OnInitWindow()
   {
     SET_CONTROL_HIDDEN(CTL_LABEL_HEADING);
   }
+
+  CVariant data;
+  data["title"] = m_strHeading;
+  data["type"] = "keyboard";
+  ANNOUNCEMENT::CAnnouncementManager::Announce(ANNOUNCEMENT::Input, "xbmc", "OnInputRequested", data);
 }
 
 bool CGUIDialogKeyboard::OnAction(const CAction &action)
@@ -255,6 +261,14 @@ bool CGUIDialogKeyboard::OnMessage(CGUIMessage& message)
       }
     }
     break;
+
+  case GUI_MSG_SET_TEXT:
+    SetText(message.GetLabel());
+
+    // close the dialog if requested
+    if (message.GetParam1() > 0)
+      OnOK();
+    break;
   }
 
   return true;
@@ -664,6 +678,8 @@ void CGUIDialogKeyboard::OnDeinitWindow(int nextWindowID)
   CGUIDialog::OnDeinitWindow(nextWindowID);
   // reset the heading (we don't always have this)
   m_strHeading = "";
+
+  ANNOUNCEMENT::CAnnouncementManager::Announce(ANNOUNCEMENT::Input, "xbmc", "OnInputFinished");
 }
 
 void CGUIDialogKeyboard::MoveCursor(int iAmount)

xbmc/dialogs/GUIDialogNumeric.cpp

@@ -27,6 +27,7 @@
 #include "input/XBMC_vkeys.h"
 #include "utils/StringUtils.h"
 #include "guilib/LocalizeStrings.h"
+#include "interfaces/AnnouncementManager.h"
 
 #define CONTROL_HEADING_LABEL  1
 #define CONTROL_INPUT_LABEL    4
@@ -54,6 +55,51 @@ CGUIDialogNumeric::~CGUIDialogNumeric(void)
 {
 }
 
+void CGUIDialogNumeric::OnInitWindow()
+{
+  CGUIDialog::OnInitWindow();
+
+  CVariant data;
+  switch (m_mode)
+  {
+  case INPUT_TIME:
+    data["type"] = "time";
+    break;
+  case INPUT_DATE:
+    data["type"] = "date";
+    break;
+  case INPUT_IP_ADDRESS:
+    data["type"] = "ip";
+    break;
+  case INPUT_PASSWORD:
+    data["type"] = "password";
+    break;
+  case INPUT_NUMBER:
+    data["type"] = "number";
+    break;
+  case INPUT_TIME_SECONDS:
+    data["type"] = "seconds";
+    break;
+  default:
+    data["type"] = "keyboard";
+    break;
+  }
+
+  const CGUILabelControl *control = (const CGUILabelControl *)GetControl(CONTROL_HEADING_LABEL);
+  if (control != NULL)
+    data["title"] = control->GetDescription();
+
+  ANNOUNCEMENT::CAnnouncementManager::Announce(ANNOUNCEMENT::Input, "xbmc", "OnInputRequested", data);
+}
+
+void CGUIDialogNumeric::OnDeinitWindow(int nextWindowID)
+{
+  // call base class
+  CGUIDialog::OnDeinitWindow(nextWindowID);
+
+  ANNOUNCEMENT::CAnnouncementManager::Announce(ANNOUNCEMENT::Input, "xbmc", "OnInputFinished");
+}
+
 bool CGUIDialogNumeric::OnAction(const CAction &action)
 {
   if (action.GetID() == ACTION_NEXT_ITEM)
@@ -139,6 +185,14 @@ bool CGUIDialogNumeric::OnMessage(CGUIMessage& message)
       }
     }
     break;
+
+  case GUI_MSG_SET_TEXT:
+    SetMode(m_mode, message.GetLabel());
+
+    // close the dialog if requested
+    if (message.GetParam1() > 0)
+      OnOK();
+    break;
   }
   return CGUIDialog::OnMessage(message);
 }
@@ -462,7 +516,7 @@ void CGUIDialogNumeric::SetMode(INPUT_MODE mode, void *initial)
     m_datetime = *(SYSTEMTIME *)initial;
     m_lastblock = (m_mode == INPUT_DATE) ? 2 : 1;
   }
-  if (m_mode == INPUT_IP_ADDRESS)
+  else if (m_mode == INPUT_IP_ADDRESS)
   {
     m_lastblock = 3;
     m_ip[0] = m_ip[1] = m_ip[2] = m_ip[3] = 0;
@@ -484,10 +538,51 @@ void CGUIDialogNumeric::SetMode(INPUT_MODE mode, void *initial)
       }
     }
   }
-  if (m_mode == INPUT_NUMBER || m_mode == INPUT_PASSWORD)
-  {
+  else if (m_mode == INPUT_NUMBER || m_mode == INPUT_PASSWORD)
     m_number = *(CStdString *)initial;
+}
+
+void CGUIDialogNumeric::SetMode(INPUT_MODE mode, const CStdString &initial)
+{
+  m_mode = mode;
+  m_block = 0;
+  m_lastblock = 0;
+  if (m_mode == INPUT_TIME || m_mode == INPUT_TIME_SECONDS || m_mode == INPUT_DATE)
+  {
+    CDateTime dateTime;
+    if (m_mode == INPUT_TIME || m_mode == INPUT_TIME_SECONDS)
+    {
+      // check if we have a pure number
+      if (initial.find_first_not_of("0123456789") == std::string::npos)
+      {
+        long seconds = strtol(initial.c_str(), NULL, 10);
+        dateTime = seconds;
+      }
+      else
+      {
+        CStdString tmp = initial;
+        // if we are handling seconds and if the string only contains
+        // "mm:ss" we need to add dummy "hh:" to get "hh:mm:ss"
+        if (m_mode == INPUT_TIME_SECONDS && tmp.size() <= 5)
+          tmp = "00:" + tmp;
+        dateTime.SetFromDBTime(tmp);
+      }
+    }
+    else if (m_mode == INPUT_DATE)
+    {
+      CStdString tmp = initial;
+      tmp.Replace("/", ".");
+      dateTime.SetFromDBDate(tmp);
+    }
+
+    if (!dateTime.IsValid())
+      return;
+
+    dateTime.GetAsSystemTime(m_datetime);
+    m_lastblock = (m_mode == INPUT_DATE) ? 2 : 1;
   }
+  else
+    SetMode(mode, (void*)&initial);
 }
 
 void CGUIDialogNumeric::GetOutput(void *output)

xbmc/dialogs/GUIDialogNumeric.h

@@ -44,6 +44,7 @@ class CGUIDialogNumeric :
 
   void SetHeading(const CStdString &strHeading);
   void SetMode(INPUT_MODE mode, void *initial);
+  void SetMode(INPUT_MODE mode, const CStdString &initial);
   void GetOutput(void *output);
 
   static bool ShowAndGetTime(SYSTEMTIME &time, const CStdString &heading);
@@ -53,6 +54,9 @@ class CGUIDialogNumeric :
   static bool ShowAndGetSeconds(CStdString& timeString, const CStdString &heading);
 
 protected:
+  virtual void OnInitWindow();
+  virtual void OnDeinitWindow(int nextWindowID);
+
   void OnNumber(unsigned int num);
   void VerifyDate(bool checkYear);
   void OnNext();

xbmc/guilib/GUIEditControl.cpp

@@ -94,6 +94,11 @@ bool CGUIEditControl::OnMessage(CGUIMessage &message)
   {
     m_smsTimer.Stop();
   }
+  else if (message.GetMessage() == GUI_MSG_SET_TEXT)
+  {
+    SetLabel2(message.GetLabel());
+    UpdateText();
+  }
   return CGUIButtonControl::OnMessage(message);
 }
 

xbmc/guilib/GUIMessage.h

@@ -130,6 +130,8 @@
  */
 #define GUI_MSG_UNFOCUS_ALL 41
 
+#define GUI_MSG_SET_TEXT        42
+
 #define GUI_MSG_USER         1000
 
 /*!

xbmc/input/ButtonTranslator.cpp

@@ -845,6 +845,15 @@ bool CButtonTranslator::TranslateJoystickString(int window, const char* szDevice
 }
 #endif
 
+void CButtonTranslator::GetActions(std::vector<std::string> &actionList)
+{
+  unsigned int size = sizeof(actions) / sizeof(ActionMapping);
+  actionList.clear();
+  actionList.reserve(size);
+  for (unsigned int index = 0; index < size; index++)
+    actionList.push_back(actions[index].name);
+}
+
 CAction CButtonTranslator::GetAction(int window, const CKey &key, bool fallback)
 {
   CStdString strAction;

xbmc/input/ButtonTranslator.h

@@ -25,6 +25,7 @@
 #pragma once
 
 #include <map>
+#include <vector>
 #include "system.h" // for HAS_EVENT_SERVER, HAS_SDL_JOYSTICK, HAS_LIRC
 
 #ifdef HAS_EVENT_SERVER
@@ -69,6 +70,8 @@ class CButtonTranslator
   /// clears the maps
   void Clear();
 
+  static void GetActions(std::vector<std::string> &actionList);
+
   CAction GetAction(int window, const CKey &key, bool fallback = true);
 
   /*! \brief Translate between a window name and it's id

xbmc/interfaces/IAnnouncer.h

@@ -25,16 +25,17 @@ namespace ANNOUNCEMENT
 {
   enum AnnouncementFlag
   {
-    Player = 0x1,
-    GUI = 0x2,
-    System = 0x4,
-    VideoLibrary = 0x8,
-    AudioLibrary = 0x10,
-    Application = 0x20,
-    Other = 0x40
+    Player        = 0x01,
+    GUI           = 0x02,
+    System        = 0x04,
+    VideoLibrary  = 0x08,
+    AudioLibrary  = 0x10,
+    Application   = 0x20,
+    Input         = 0x40,
+    Other         = 0x80
   };
 
-  #define ANNOUNCE_ALL (Player | GUI | System | VideoLibrary | AudioLibrary | Application | Other)
+  #define ANNOUNCE_ALL (Player | GUI | System | VideoLibrary | AudioLibrary | Application | Input | Other)
 
   /*!
     \brief Returns a string representation for the 
@@ -58,6 +59,8 @@ namespace ANNOUNCEMENT
       return "AudioLibrary";
     case Application:
       return "Application";
+    case Input:
+      return "Input";
     case Other:
       return "Other";
     default: