jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-27 20:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: move non-X11 mousewheel support patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-10-13 19:41:56 +02:00
parent b37493f278
commit 651fa5f390
3 changed files with 210 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
packages/mediacenter/kodi/patches/kodi-999.51-nonX11-mousewheel-support.patch Normal file
View File

@ -0,0 +1,210 @@
From 958d47339a2427b66568fe7c2ea69831f111742a Mon Sep 17 00:00:00 2001
From: Roman Kraevskiy <rkraevskiy@gmail.com>
Date: Fri, 10 Jul 2015 23:36:34 +0300
Subject: [PATCH 059/100] Mouse wheel support for X11-less linux distros
(openelec)
---
xbmc/input/linux/LinuxInputDevices.cpp | 125 +++++++++++++++++++++------------
xbmc/input/linux/LinuxInputDevices.h | 2 +
2 files changed, 82 insertions(+), 45 deletions(-)
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 32a3b46..b028cd1 100644
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -558,22 +558,27 @@ bool CLinuxInputDevice::KeyEvent(const struct input_event& levt, XBMC_Event& dev
*/
bool CLinuxInputDevice::RelEvent(const struct input_event& levt, XBMC_Event& devt)
{
+ bool motion = false;
+ bool wheel = false;
+
switch (levt.code)
{
case REL_X:
m_mouseX += levt.value;
devt.motion.xrel = levt.value;
devt.motion.yrel = 0;
+ motion = true;
break;
-
case REL_Y:
m_mouseY += levt.value;
devt.motion.xrel = 0;
devt.motion.yrel = levt.value;
+ motion = true;
break;
-
- case REL_Z:
case REL_WHEEL:
+ wheel = (levt.value != 0); // process wheel event only when there was some delta
+ break;
+ case REL_Z:
default:
CLog::Log(LOGWARNING, "CLinuxInputDevice::RelEvent: Unknown rel event code: %d\n", levt.code);
return false;
@@ -588,13 +593,35 @@ bool CLinuxInputDevice::RelEvent(const struct input_event& levt, XBMC_Event& dev
m_mouseY = std::max(0, m_mouseY);
- devt.type = XBMC_MOUSEMOTION;
- devt.motion.type = XBMC_MOUSEMOTION;
- devt.motion.x = m_mouseX;
- devt.motion.y = m_mouseY;
- devt.motion.state = 0;
- devt.motion.which = m_deviceIndex;
-
+ if (motion)
+ {
+ devt.type = XBMC_MOUSEMOTION;
+ devt.motion.type = XBMC_MOUSEMOTION;
+ devt.motion.x = m_mouseX;
+ devt.motion.y = m_mouseY;
+ devt.motion.state = 0;
+ devt.motion.which = m_deviceIndex;
+ }
+ else if (wheel)
+ {
+ devt.type = XBMC_MOUSEBUTTONUP;
+ devt.button.state = XBMC_RELEASED;
+ devt.button.type = devt.type;
+ devt.button.x = m_mouseX;
+ devt.button.y = m_mouseY;
+ devt.button.button = (levt.value<0) ? XBMC_BUTTON_WHEELDOWN:XBMC_BUTTON_WHEELUP;
+
+ /* but WHEEL up enent to the queue */
+ m_equeue.push_back(devt);
+
+ /* prepare and return WHEEL down event */
+ devt.button.state = XBMC_PRESSED;
+ devt.type = XBMC_MOUSEBUTTONDOWN;
+ }
+ else
+ {
+ return false;
+ }
return true;
}
@@ -693,57 +720,65 @@ XBMC_Event CLinuxInputDevice::ReadEvent()
XBMC_Event devt;
- while (1)
+ if (m_equeue.empty())
{
- bzero(&levt, sizeof(levt));
+ while (1)
+ {
+ bzero(&levt, sizeof(levt));
- bzero(&devt, sizeof(devt));
- devt.type = XBMC_NOEVENT;
+ bzero(&devt, sizeof(devt));
+ devt.type = XBMC_NOEVENT;
- if(m_devicePreferredId == LI_DEVICE_NONE)
- return devt;
+ if(m_devicePreferredId == LI_DEVICE_NONE)
+ return devt;
- readlen = read(m_fd, &levt, sizeof(levt));
+ readlen = read(m_fd, &levt, sizeof(levt));
- if (readlen <= 0)
- {
- if (errno == ENODEV)
+ if (readlen <= 0)
{
- CLog::Log(LOGINFO,"input device was unplugged %s",m_deviceName);
- m_bUnplugged = true;
+ if (errno == ENODEV)
+ {
+ CLog::Log(LOGINFO,"input device was unplugged %s",m_deviceName);
+ m_bUnplugged = true;
+ }
+
+ break;
}
- break;
- }
+ //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str());
- //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str());
+ // sanity check if we realy read the event
+ if(readlen != sizeof(levt))
+ {
+ printf("CLinuxInputDevice: read error : %s\n", strerror(errno));
+ break;
+ }
- // sanity check if we realy read the event
- if(readlen != sizeof(levt))
- {
- printf("CLinuxInputDevice: read error : %s\n", strerror(errno));
- break;
- }
+ if (!TranslateEvent(levt, devt))
+ continue;
- if (!TranslateEvent(levt, devt))
- continue;
+ /* Flush previous event with DIEF_FOLLOW? */
+ if (devt.type != XBMC_NOEVENT)
+ {
+ //printf("new event! type = %d\n", devt.type);
+ //printf("key: %d %d %d %c\n", devt.key.keysym.scancode, devt.key.keysym.sym, devt.key.keysym.mod, devt.key.keysym.unicode);
- /* Flush previous event with DIEF_FOLLOW? */
- if (devt.type != XBMC_NOEVENT)
- {
- //printf("new event! type = %d\n", devt.type);
- //printf("key: %d %d %d %c\n", devt.key.keysym.scancode, devt.key.keysym.sym, devt.key.keysym.mod, devt.key.keysym.unicode);
+ if (m_hasLeds && (m_keyMods != m_lastKeyMods))
+ {
+ SetLed(LED_NUML, m_keyMods & XBMCKMOD_NUM);
+ SetLed(LED_CAPSL, m_keyMods & XBMCKMOD_CAPS);
+ m_lastKeyMods = m_keyMods;
+ }
- if (m_hasLeds && (m_keyMods != m_lastKeyMods))
- {
- SetLed(LED_NUML, m_keyMods & XBMCKMOD_NUM);
- SetLed(LED_CAPSL, m_keyMods & XBMCKMOD_CAPS);
- m_lastKeyMods = m_keyMods;
+ break;
}
-
- break;
}
}
+ else
+ {
+ devt = m_equeue.front();
+ m_equeue.pop_front();
+ }
return devt;
}
diff --git a/xbmc/input/linux/LinuxInputDevices.h b/xbmc/input/linux/LinuxInputDevices.h
index cf1c5ce..954d823 100644
--- a/xbmc/input/linux/LinuxInputDevices.h
+++ b/xbmc/input/linux/LinuxInputDevices.h
@@ -22,6 +22,7 @@
#include <vector>
#include <string>
+#include <deque>
#include "windowing/XBMC_events.h"
#include "input/XBMC_keyboard.h"
#include "threads/SingleLock.h"
@@ -79,6 +80,7 @@ class CLinuxInputDevice
int m_deviceMaxAxis;
bool m_bSkipNonKeyEvents;
bool m_bUnplugged;
+ std::deque<XBMC_Event> m_equeue;
};
class CLinuxInputDevices

211
projects/RPi/patches/kodi/kodi-001-isengard-rpb-backports.patch
View File

@ -5720,217 +5720,6 @@ index f6c8df0..5c2b583 100644
#endif #endif
From 958d47339a2427b66568fe7c2ea69831f111742a Mon Sep 17 00:00:00 2001
From: Roman Kraevskiy <rkraevskiy@gmail.com>
Date: Fri, 10 Jul 2015 23:36:34 +0300
Subject: [PATCH 059/100] Mouse wheel support for X11-less linux distros
(openelec)
---
xbmc/input/linux/LinuxInputDevices.cpp | 125 +++++++++++++++++++++------------
xbmc/input/linux/LinuxInputDevices.h | 2 +
2 files changed, 82 insertions(+), 45 deletions(-)
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 32a3b46..b028cd1 100644
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -558,22 +558,27 @@ bool CLinuxInputDevice::KeyEvent(const struct input_event& levt, XBMC_Event& dev
*/
bool CLinuxInputDevice::RelEvent(const struct input_event& levt, XBMC_Event& devt)
{
+ bool motion = false;
+ bool wheel = false;
+
switch (levt.code)
{
case REL_X:
m_mouseX += levt.value;
devt.motion.xrel = levt.value;
devt.motion.yrel = 0;
+ motion = true;
break;
-
case REL_Y:
m_mouseY += levt.value;
devt.motion.xrel = 0;
devt.motion.yrel = levt.value;
+ motion = true;
break;
-
- case REL_Z:
case REL_WHEEL:
+ wheel = (levt.value != 0); // process wheel event only when there was some delta
+ break;
+ case REL_Z:
default:
CLog::Log(LOGWARNING, "CLinuxInputDevice::RelEvent: Unknown rel event code: %d\n", levt.code);
return false;
@@ -588,13 +593,35 @@ bool CLinuxInputDevice::RelEvent(const struct input_event& levt, XBMC_Event& dev
m_mouseY = std::max(0, m_mouseY);
- devt.type = XBMC_MOUSEMOTION;
- devt.motion.type = XBMC_MOUSEMOTION;
- devt.motion.x = m_mouseX;
- devt.motion.y = m_mouseY;
- devt.motion.state = 0;
- devt.motion.which = m_deviceIndex;
-
+ if (motion)
+ {
+ devt.type = XBMC_MOUSEMOTION;
+ devt.motion.type = XBMC_MOUSEMOTION;
+ devt.motion.x = m_mouseX;
+ devt.motion.y = m_mouseY;
+ devt.motion.state = 0;
+ devt.motion.which = m_deviceIndex;
+ }
+ else if (wheel)
+ {
+ devt.type = XBMC_MOUSEBUTTONUP;
+ devt.button.state = XBMC_RELEASED;
+ devt.button.type = devt.type;
+ devt.button.x = m_mouseX;
+ devt.button.y = m_mouseY;
+ devt.button.button = (levt.value<0) ? XBMC_BUTTON_WHEELDOWN:XBMC_BUTTON_WHEELUP;
+
+ /* but WHEEL up enent to the queue */
+ m_equeue.push_back(devt);
+
+ /* prepare and return WHEEL down event */
+ devt.button.state = XBMC_PRESSED;
+ devt.type = XBMC_MOUSEBUTTONDOWN;
+ }
+ else
+ {
+ return false;
+ }
return true;
}
@@ -693,57 +720,65 @@ XBMC_Event CLinuxInputDevice::ReadEvent()
XBMC_Event devt;
- while (1)
+ if (m_equeue.empty())
{
- bzero(&levt, sizeof(levt));
+ while (1)
+ {
+ bzero(&levt, sizeof(levt));
- bzero(&devt, sizeof(devt));
- devt.type = XBMC_NOEVENT;
+ bzero(&devt, sizeof(devt));
+ devt.type = XBMC_NOEVENT;
- if(m_devicePreferredId == LI_DEVICE_NONE)
- return devt;
+ if(m_devicePreferredId == LI_DEVICE_NONE)
+ return devt;
- readlen = read(m_fd, &levt, sizeof(levt));
+ readlen = read(m_fd, &levt, sizeof(levt));
- if (readlen <= 0)
- {
- if (errno == ENODEV)
+ if (readlen <= 0)
{
- CLog::Log(LOGINFO,"input device was unplugged %s",m_deviceName);
- m_bUnplugged = true;
+ if (errno == ENODEV)
+ {
+ CLog::Log(LOGINFO,"input device was unplugged %s",m_deviceName);
+ m_bUnplugged = true;
+ }
+
+ break;
}
- break;
- }
+ //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str());
- //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str());
+ // sanity check if we realy read the event
+ if(readlen != sizeof(levt))
+ {
+ printf("CLinuxInputDevice: read error : %s\n", strerror(errno));
+ break;
+ }
- // sanity check if we realy read the event
- if(readlen != sizeof(levt))
- {
- printf("CLinuxInputDevice: read error : %s\n", strerror(errno));
- break;
- }
+ if (!TranslateEvent(levt, devt))
+ continue;
- if (!TranslateEvent(levt, devt))
- continue;
+ /* Flush previous event with DIEF_FOLLOW? */
+ if (devt.type != XBMC_NOEVENT)
+ {
+ //printf("new event! type = %d\n", devt.type);
+ //printf("key: %d %d %d %c\n", devt.key.keysym.scancode, devt.key.keysym.sym, devt.key.keysym.mod, devt.key.keysym.unicode);
- /* Flush previous event with DIEF_FOLLOW? */
- if (devt.type != XBMC_NOEVENT)
- {
- //printf("new event! type = %d\n", devt.type);
- //printf("key: %d %d %d %c\n", devt.key.keysym.scancode, devt.key.keysym.sym, devt.key.keysym.mod, devt.key.keysym.unicode);
+ if (m_hasLeds && (m_keyMods != m_lastKeyMods))
+ {
+ SetLed(LED_NUML, m_keyMods & XBMCKMOD_NUM);
+ SetLed(LED_CAPSL, m_keyMods & XBMCKMOD_CAPS);
+ m_lastKeyMods = m_keyMods;
+ }
- if (m_hasLeds && (m_keyMods != m_lastKeyMods))
- {
- SetLed(LED_NUML, m_keyMods & XBMCKMOD_NUM);
- SetLed(LED_CAPSL, m_keyMods & XBMCKMOD_CAPS);
- m_lastKeyMods = m_keyMods;
+ break;
}
-
- break;
}
}
+ else
+ {
+ devt = m_equeue.front();
+ m_equeue.pop_front();
+ }
return devt;
}
diff --git a/xbmc/input/linux/LinuxInputDevices.h b/xbmc/input/linux/LinuxInputDevices.h
index cf1c5ce..954d823 100644
--- a/xbmc/input/linux/LinuxInputDevices.h
+++ b/xbmc/input/linux/LinuxInputDevices.h
@@ -22,6 +22,7 @@
#include <vector>
#include <string>
+#include <deque>
#include "windowing/XBMC_events.h"
#include "input/XBMC_keyboard.h"
#include "threads/SingleLock.h"
@@ -79,6 +80,7 @@ class CLinuxInputDevice
int m_deviceMaxAxis;
bool m_bSkipNonKeyEvents;
bool m_bUnplugged;
+ std::deque<XBMC_Event> m_equeue;
};
class CLinuxInputDevices
From 73f943c955674662396b11be531b060e48e4c47f Mon Sep 17 00:00:00 2001 From 73f943c955674662396b11be531b060e48e4c47f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com> From: popcornmix <popcornmix@gmail.com>
Date: Mon, 22 Jun 2015 22:06:53 +0100 Date: Mon, 22 Jun 2015 22:06:53 +0100

211
projects/RPi2/patches/kodi/kodi-001-isengard-rpb-backports.patch
View File

@ -5720,217 +5720,6 @@ index f6c8df0..5c2b583 100644
#endif #endif
From 958d47339a2427b66568fe7c2ea69831f111742a Mon Sep 17 00:00:00 2001
From: Roman Kraevskiy <rkraevskiy@gmail.com>
Date: Fri, 10 Jul 2015 23:36:34 +0300
Subject: [PATCH 059/100] Mouse wheel support for X11-less linux distros
(openelec)
---
xbmc/input/linux/LinuxInputDevices.cpp | 125 +++++++++++++++++++++------------
xbmc/input/linux/LinuxInputDevices.h | 2 +
2 files changed, 82 insertions(+), 45 deletions(-)
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 32a3b46..b028cd1 100644
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -558,22 +558,27 @@ bool CLinuxInputDevice::KeyEvent(const struct input_event& levt, XBMC_Event& dev
*/
bool CLinuxInputDevice::RelEvent(const struct input_event& levt, XBMC_Event& devt)
{
+ bool motion = false;
+ bool wheel = false;
+
switch (levt.code)
{
case REL_X:
m_mouseX += levt.value;
devt.motion.xrel = levt.value;
devt.motion.yrel = 0;
+ motion = true;
break;
-
case REL_Y:
m_mouseY += levt.value;
devt.motion.xrel = 0;
devt.motion.yrel = levt.value;
+ motion = true;
break;
-
- case REL_Z:
case REL_WHEEL:
+ wheel = (levt.value != 0); // process wheel event only when there was some delta
+ break;
+ case REL_Z:
default:
CLog::Log(LOGWARNING, "CLinuxInputDevice::RelEvent: Unknown rel event code: %d\n", levt.code);
return false;
@@ -588,13 +593,35 @@ bool CLinuxInputDevice::RelEvent(const struct input_event& levt, XBMC_Event& dev
m_mouseY = std::max(0, m_mouseY);
- devt.type = XBMC_MOUSEMOTION;
- devt.motion.type = XBMC_MOUSEMOTION;
- devt.motion.x = m_mouseX;
- devt.motion.y = m_mouseY;
- devt.motion.state = 0;
- devt.motion.which = m_deviceIndex;
-
+ if (motion)
+ {
+ devt.type = XBMC_MOUSEMOTION;
+ devt.motion.type = XBMC_MOUSEMOTION;
+ devt.motion.x = m_mouseX;
+ devt.motion.y = m_mouseY;
+ devt.motion.state = 0;
+ devt.motion.which = m_deviceIndex;
+ }
+ else if (wheel)
+ {
+ devt.type = XBMC_MOUSEBUTTONUP;
+ devt.button.state = XBMC_RELEASED;
+ devt.button.type = devt.type;
+ devt.button.x = m_mouseX;
+ devt.button.y = m_mouseY;
+ devt.button.button = (levt.value<0) ? XBMC_BUTTON_WHEELDOWN:XBMC_BUTTON_WHEELUP;
+
+ /* but WHEEL up enent to the queue */
+ m_equeue.push_back(devt);
+
+ /* prepare and return WHEEL down event */
+ devt.button.state = XBMC_PRESSED;
+ devt.type = XBMC_MOUSEBUTTONDOWN;
+ }
+ else
+ {
+ return false;
+ }
return true;
}
@@ -693,57 +720,65 @@ XBMC_Event CLinuxInputDevice::ReadEvent()
XBMC_Event devt;
- while (1)
+ if (m_equeue.empty())
{
- bzero(&levt, sizeof(levt));
+ while (1)
+ {
+ bzero(&levt, sizeof(levt));
- bzero(&devt, sizeof(devt));
- devt.type = XBMC_NOEVENT;
+ bzero(&devt, sizeof(devt));
+ devt.type = XBMC_NOEVENT;
- if(m_devicePreferredId == LI_DEVICE_NONE)
- return devt;
+ if(m_devicePreferredId == LI_DEVICE_NONE)
+ return devt;
- readlen = read(m_fd, &levt, sizeof(levt));
+ readlen = read(m_fd, &levt, sizeof(levt));
- if (readlen <= 0)
- {
- if (errno == ENODEV)
+ if (readlen <= 0)
{
- CLog::Log(LOGINFO,"input device was unplugged %s",m_deviceName);
- m_bUnplugged = true;
+ if (errno == ENODEV)
+ {
+ CLog::Log(LOGINFO,"input device was unplugged %s",m_deviceName);
+ m_bUnplugged = true;
+ }
+
+ break;
}
- break;
- }
+ //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str());
- //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str());
+ // sanity check if we realy read the event
+ if(readlen != sizeof(levt))
+ {
+ printf("CLinuxInputDevice: read error : %s\n", strerror(errno));
+ break;
+ }
- // sanity check if we realy read the event
- if(readlen != sizeof(levt))
- {
- printf("CLinuxInputDevice: read error : %s\n", strerror(errno));
- break;
- }
+ if (!TranslateEvent(levt, devt))
+ continue;
- if (!TranslateEvent(levt, devt))
- continue;
+ /* Flush previous event with DIEF_FOLLOW? */
+ if (devt.type != XBMC_NOEVENT)
+ {
+ //printf("new event! type = %d\n", devt.type);
+ //printf("key: %d %d %d %c\n", devt.key.keysym.scancode, devt.key.keysym.sym, devt.key.keysym.mod, devt.key.keysym.unicode);
- /* Flush previous event with DIEF_FOLLOW? */
- if (devt.type != XBMC_NOEVENT)
- {
- //printf("new event! type = %d\n", devt.type);
- //printf("key: %d %d %d %c\n", devt.key.keysym.scancode, devt.key.keysym.sym, devt.key.keysym.mod, devt.key.keysym.unicode);
+ if (m_hasLeds && (m_keyMods != m_lastKeyMods))
+ {
+ SetLed(LED_NUML, m_keyMods & XBMCKMOD_NUM);
+ SetLed(LED_CAPSL, m_keyMods & XBMCKMOD_CAPS);
+ m_lastKeyMods = m_keyMods;
+ }
- if (m_hasLeds && (m_keyMods != m_lastKeyMods))
- {
- SetLed(LED_NUML, m_keyMods & XBMCKMOD_NUM);
- SetLed(LED_CAPSL, m_keyMods & XBMCKMOD_CAPS);
- m_lastKeyMods = m_keyMods;
+ break;
}
-
- break;
}
}
+ else
+ {
+ devt = m_equeue.front();
+ m_equeue.pop_front();
+ }
return devt;
}
diff --git a/xbmc/input/linux/LinuxInputDevices.h b/xbmc/input/linux/LinuxInputDevices.h
index cf1c5ce..954d823 100644
--- a/xbmc/input/linux/LinuxInputDevices.h
+++ b/xbmc/input/linux/LinuxInputDevices.h
@@ -22,6 +22,7 @@
#include <vector>
#include <string>
+#include <deque>
#include "windowing/XBMC_events.h"
#include "input/XBMC_keyboard.h"
#include "threads/SingleLock.h"
@@ -79,6 +80,7 @@ class CLinuxInputDevice
int m_deviceMaxAxis;
bool m_bSkipNonKeyEvents;
bool m_bUnplugged;
+ std::deque<XBMC_Event> m_equeue;
};
class CLinuxInputDevices
From 73f943c955674662396b11be531b060e48e4c47f Mon Sep 17 00:00:00 2001 From 73f943c955674662396b11be531b060e48e4c47f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com> From: popcornmix <popcornmix@gmail.com>
Date: Mon, 22 Jun 2015 22:06:53 +0100 Date: Mon, 22 Jun 2015 22:06:53 +0100