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

input: Pull TouchListener declaration to top-level 

No reason to have a struct declared inside another struct

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Keith Packard 2012-11-27 11:21:16 -08:00 committed by Peter Hutterer
parent bd91b05b63
commit 91ab237358
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/inputstr.h
View File

@ -298,6 +298,15 @@ typedef struct _ValuatorClassRec {
int v_scroll_axis; /* vert smooth-scrolling axis */ int v_scroll_axis; /* vert smooth-scrolling axis */
} ValuatorClassRec; } ValuatorClassRec;
typedef struct _TouchListener {
XID listener; /* grabs/event selection IDs receiving
* events for this touch */
enum TouchListenerType type;
enum TouchListenerState state;
enum InputLevel level; /* matters only for emulating touches */
WindowPtr window;
} TouchListener;
typedef struct _TouchPointInfo { typedef struct _TouchPointInfo {
uint32_t client_id; /* touch ID as seen in client events */ uint32_t client_id; /* touch ID as seen in client events */
int sourceid; /* Source device's ID for this touchpoint */ int sourceid; /* Source device's ID for this touchpoint */
@ -306,14 +315,7 @@ typedef struct _TouchPointInfo {
* but still owned by a grab */ * but still owned by a grab */
SpriteRec sprite; /* window trace for delivery */ SpriteRec sprite; /* window trace for delivery */
ValuatorMask *valuators; /* last recorded axis values */ ValuatorMask *valuators; /* last recorded axis values */
struct _TouchListener { TouchListener *listeners; /* set of listeners */
XID listener; /* grabs/event selection IDs receiving
* events for this touch */
enum TouchListenerType type;
enum TouchListenerState state;
enum InputLevel level; /* matters only for emulating touches */
WindowPtr window;
} *listeners;
int num_listeners; int num_listeners;
int num_grabs; /* number of open grabs on this touch int num_grabs; /* number of open grabs on this touch
* which have not accepted or rejected */ * which have not accepted or rejected */