"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xbmc/input/InputManager.cpp" between
xbmc-18.7.1-Leia.tar.gz and xbmc-18.8-Leia.tar.gz

About: XBMC is a software media player and entertainment hub for digital media that plays almost all popular audio and video formats around (new name "Kodi").

InputManager.cpp  (xbmc-18.7.1-Leia):InputManager.cpp  (xbmc-18.8-Leia)
skipping to change at line 237 skipping to change at line 237
CLog::Log(LOGDEBUG, "ERROR mapping customcontroller action. CustomCont roller: %s %i", strMapName.c_str(), wKeyID); CLog::Log(LOGDEBUG, "ERROR mapping customcontroller action. CustomCont roller: %s %i", strMapName.c_str(), wKeyID);
} }
} }
} }
else else
{ {
CKey key; CKey key;
if (wKeyID & ES_FLAG_UNICODE) if (wKeyID & ES_FLAG_UNICODE)
{ {
key = CKey(0u, 0u, static_cast<wchar_t>(wKeyID & ~ES_FLAG_UNICODE), 0, 0 , 0, 0); key = CKey(0u, 0u, static_cast<wchar_t>(wKeyID & ~ES_FLAG_UNICODE), 0, 0 , 0, 0);
key.SetFromService(true);
return OnKey(key); return OnKey(key);
} }
if (wKeyID == KEY_BUTTON_LEFT_ANALOG_TRIGGER) if (wKeyID == KEY_BUTTON_LEFT_ANALOG_TRIGGER)
key = CKey(wKeyID, static_cast<uint8_t>(255 * fAmount), 0, 0.0, 0.0, 0.0 , 0.0, frameTime); key = CKey(wKeyID, static_cast<uint8_t>(255 * fAmount), 0, 0.0, 0.0, 0.0 , 0.0, frameTime);
else if (wKeyID == KEY_BUTTON_RIGHT_ANALOG_TRIGGER) else if (wKeyID == KEY_BUTTON_RIGHT_ANALOG_TRIGGER)
key = CKey(wKeyID, 0, static_cast<uint8_t>(255 * fAmount), 0.0, 0.0, 0.0 , 0.0, frameTime); key = CKey(wKeyID, 0, static_cast<uint8_t>(255 * fAmount), 0.0, 0.0, 0.0 , 0.0, frameTime);
else if (wKeyID == KEY_BUTTON_LEFT_THUMB_STICK_LEFT) else if (wKeyID == KEY_BUTTON_LEFT_THUMB_STICK_LEFT)
key = CKey(wKeyID, 0, 0, -fAmount, 0.0, 0.0, 0.0, frameTime); key = CKey(wKeyID, 0, 0, -fAmount, 0.0, 0.0, 0.0, frameTime);
else if (wKeyID == KEY_BUTTON_LEFT_THUMB_STICK_RIGHT) else if (wKeyID == KEY_BUTTON_LEFT_THUMB_STICK_RIGHT)
skipping to change at line 464 skipping to change at line 465
m_LastKey.Reset(); m_LastKey.Reset();
} }
else else
{ {
if (key.GetButtonCode() == m_LastKey.GetButtonCode() && (m_LastKey.GetButton Code() & CKey::MODIFIER_LONG)) if (key.GetButtonCode() == m_LastKey.GetButtonCode() && (m_LastKey.GetButton Code() & CKey::MODIFIER_LONG))
{ {
// Do not repeat long presses // Do not repeat long presses
} }
else else
{ {
if (!m_buttonTranslator->HasLongpressMapping(CServiceBroker::GetGUI()->Get // Event server keyboard doesn't give normal key up and key down, so don't
WindowManager().GetActiveWindowOrDialog(), key)) // process for long press if that is the source
if (key.GetFromService() ||
!m_buttonTranslator->HasLongpressMapping(
CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindowOrDial
og(), key))
{ {
m_LastKey.Reset(); m_LastKey.Reset();
bHandled = HandleKey(key); bHandled = HandleKey(key);
} }
else else
{ {
if (key.GetButtonCode() != m_LastKey.GetButtonCode() && (key.GetButtonCo de() & CKey::MODIFIER_LONG)) if (key.GetButtonCode() != m_LastKey.GetButtonCode() && (key.GetButtonCo de() & CKey::MODIFIER_LONG))
{ {
m_LastKey = key; // OnKey is reentrant; need to do this before enteri ng m_LastKey = key; // OnKey is reentrant; need to do this before enteri ng
bHandled = HandleKey(key); bHandled = HandleKey(key);
 End of changes. 2 change blocks. 
2 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)