frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include: add GetXI2MaskByte and GetXI2EventFilterMask to headers 

This is needed for touch event processing.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-10-28 12:55:55 +10:00
parent 372a6f10dc
commit 6cc0e6a0af
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/events.c
View File

@ -414,7 +414,7 @@ GetEventFilterMask(DeviceIntPtr dev, int evtype)
return filters[dev ? dev->id : 0][evtype]; return filters[dev ? dev->id : 0][evtype];
} }
static inline Mask inline Mask
GetXI2EventFilterMask(int evtype) GetXI2EventFilterMask(int evtype)
{ {
return (1 << (evtype % 8)); return (1 << (evtype % 8));
@ -452,7 +452,7 @@ GetEventFilter(DeviceIntPtr dev, xEvent *event)
* Return the single byte of the device's XI2 mask that contains the mask * Return the single byte of the device's XI2 mask that contains the mask
* for the event_type. * for the event_type.
*/ */
static int int
GetXI2MaskByte(XI2Mask *mask, DeviceIntPtr dev, int event_type) GetXI2MaskByte(XI2Mask *mask, DeviceIntPtr dev, int event_type)
{ {
/* we just return the matching filter because that's the only use /* we just return the matching filter because that's the only use

3
include/input.h
View File

@ -57,6 +57,7 @@ SOFTWARE.
#include "xkbrules.h" #include "xkbrules.h"
#include "events.h" #include "events.h"
#include "list.h" #include "list.h"
#include <X11/extensions/XI2.h>
#define DEVICE_INIT 0 #define DEVICE_INIT 0
#define DEVICE_ON 1 #define DEVICE_ON 1
@ -537,6 +538,8 @@ extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients); extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);
extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event); extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
extern Bool WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev); extern Bool WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev);
extern Mask GetXI2EventFilterMask(int evtype);
extern int GetXI2MaskByte(XI2Mask *mask, DeviceIntPtr dev, int event_type);
void FixUpEventFromWindow(SpritePtr pSprite, void FixUpEventFromWindow(SpritePtr pSprite,
xEvent *xE, xEvent *xE,
WindowPtr pWin, WindowPtr pWin,