summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Crouse <jordan.crouse@amd.com>2008-09-08 15:20:51 -0600
committerJordan Crouse <jordan.crouse@amd.com>2008-09-08 15:20:51 -0600
commit85d2103a90e6ab422246b66d252dbee19c96a0d7 (patch)
tree70bf71bcf1880a3e5e665b174cb0629355bfaad6
parentf8a09702f0905d45a03cc71ae67767b7effc1500 (diff)
XINPUT_ABI bumped on us and broke the previous evil workaround
for the miPointerPosition issue.
-rw-r--r--src/gx_randr.c6
-rw-r--r--src/lx_randr.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gx_randr.c b/src/gx_randr.c
index 553fce2..2b5a97c 100644
--- a/src/gx_randr.c
+++ b/src/gx_randr.c
@@ -248,7 +248,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
miPointerGetPosition(inputInfo.pointer, &px, &py);
#else
miPointerPosition(&px, &py);
@@ -292,7 +292,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
if (pScreen == miPointerGetScreen(inputInfo.pointer))
#else
if (pScreen == miPointerCurrentScreen())
@@ -305,7 +305,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
/* FIXME: we don't have a new video ABI yet */
(*pScreen->SetCursorPosition) (
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
inputInfo.pointer,
#endif
pScreen,
diff --git a/src/lx_randr.c b/src/lx_randr.c
index e22466c..0604727 100644
--- a/src/lx_randr.c
+++ b/src/lx_randr.c
@@ -247,7 +247,7 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
miPointerGetPosition(inputInfo.pointer, &px, &py);
#else
miPointerPosition(&px, &py);
@@ -291,7 +291,7 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
if (pScreen == miPointerGetScreen(inputInfo.pointer))
#else
if (pScreen == miPointerCurrentScreen())
@@ -304,7 +304,7 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
(*pScreen->SetCursorPosition) (
/* FIXME: we don't have a new video ABI yet */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
inputInfo.pointer,
#endif
pScreen,