diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
| commit | f586b49ae23c573681b939ca44b3f418c83c84b2 (patch) | |
| tree | ffafe2da4517c5121ab4a8c64966e72829147215 /xorg-server/hw/xfree86/common/xf86str.h | |
| parent | 728ff03357b2dfd7048ab093183a239a0ba044c4 (diff) | |
| parent | 3a82f8a35b2c6d094cf9d0d5a3ccb9dd9b85f626 (diff) | |
| download | vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.gz vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.bz2 vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.zip | |
svn merge "^/branches/released" .
Solved mouse motion bug in new version of dix/getevents.c
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86str.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86str.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h index 9d52661a7..0b7685012 100644 --- a/xorg-server/hw/xfree86/common/xf86str.h +++ b/xorg-server/hw/xfree86/common/xf86str.h @@ -402,14 +402,6 @@ typedef struct { } GDevRec, *GDevPtr;
typedef struct {
- char * identifier;
- char * driver;
- pointer commonOptions;
- pointer extraOptions;
- InputAttributes *attrs;
-} IDevRec, *IDevPtr;
-
-typedef struct {
int frameX0;
int frameY0;
int virtualX;
@@ -478,11 +470,13 @@ typedef struct _screenlayoutrec { confScreenPtr refscreen;
} screenLayoutRec, *screenLayoutPtr;
+typedef struct _InputInfoRec InputInfoRec;
+
typedef struct _serverlayoutrec {
char * id;
screenLayoutPtr screens;
GDevPtr inactives;
- IDevPtr* inputs; /* NULL terminated */
+ InputInfoRec** inputs; /* NULL terminated */
pointer options;
} serverLayoutRec, *serverLayoutPtr;
|