diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-13 08:50:32 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-13 08:50:32 +0100 |
| commit | 179ebdfaf7fe0a0017054c052b76210eeff084a9 (patch) | |
| tree | 5daa6e5583ced6a6b12b03e12c16ef2acedb5b5c /xorg-server/include/inputstr.h | |
| parent | 535951cba015f2a2b63292e0ca983d0d6e736b71 (diff) | |
| parent | eaa70945cb3f1a432b8c505ecede9ebc7769f36d (diff) | |
| download | vcxsrv-179ebdfaf7fe0a0017054c052b76210eeff084a9.tar.gz vcxsrv-179ebdfaf7fe0a0017054c052b76210eeff084a9.tar.bz2 vcxsrv-179ebdfaf7fe0a0017054c052b76210eeff084a9.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/include/inputstr.h')
| -rw-r--r-- | xorg-server/include/inputstr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index c3297db64..86db811fc 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -314,6 +314,7 @@ typedef struct _TouchPointInfo { enum TouchListenerType type; enum TouchListenerState state; enum InputLevel level; /* matters only for emulating touches */ + WindowPtr window; } *listeners; int num_listeners; int num_grabs; /* number of open grabs on this touch @@ -622,7 +623,7 @@ extern _X_EXPORT InputInfo inputInfo; /* for keeping the events for devices grabbed synchronously */ typedef struct _QdEvent *QdEventPtr; typedef struct _QdEvent { - struct list next; + struct xorg_list next; DeviceIntPtr device; ScreenPtr pScreen; /* what screen the pointer was on */ unsigned long months; /* milliseconds is in the event */ @@ -638,7 +639,7 @@ typedef struct _QdEvent { * replayed and processed as if they would come from the device directly. */ typedef struct _EventSyncInfo { - struct list pending; + struct xorg_list pending; /** The device to replay events for. Only set in AllowEvents(), in which * case it is set to the device specified in the request. */ |