summaryrefslogtreecommitdiff
path: root/driver/xf86-input-ws/src
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-11-25 18:14:24 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-11-25 18:14:24 +0000
commit36b0564cd07580819c7321a6b946a9675575c14a (patch)
treeafa83e5403c9a7d3ce4ea53669e0730ce1104c0f /driver/xf86-input-ws/src
parentbebb2c7aa6aa41228ee6269f5c30dcf722f45396 (diff)
No need to maintain a local cache of the pointer position anymore.
Diffstat (limited to 'driver/xf86-input-ws/src')
-rw-r--r--driver/xf86-input-ws/src/ws.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c
index b871c7093..0c6814c21 100644
--- a/driver/xf86-input-ws/src/ws.c
+++ b/driver/xf86-input-ws/src/ws.c
@@ -13,7 +13,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $OpenBSD: ws.c,v 1.19 2009/11/25 18:10:26 matthieu Exp $ */
+/* $OpenBSD: ws.c,v 1.20 2009/11/25 18:14:23 matthieu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -61,7 +61,6 @@ typedef struct WSDevice {
int type; /* ws device type */
unsigned int buttons; /* # of buttons */
unsigned int lastButtons; /* last state of buttons */
- int x, y; /* current abs coordinates */
int min_x, max_x, min_y, max_y; /* coord space */
int swap_axes;
int raw;
@@ -482,9 +481,6 @@ wsDeviceInit(DeviceIntPtr pWS)
xf86MotionHistoryAllocate(pInfo);
AssignTypeAndName(pWS, pInfo->atom, pInfo->name);
pWS->public.on = FALSE;
- /* This should correspond to the center of the screen */
- priv->x = (priv->max_x - priv->min_x) / 2;
- priv->y = (priv->max_y - priv->min_y) / 2;
if (wsOpen(pInfo) != Success) {
return !Success;
}
@@ -706,13 +702,11 @@ wsReadInput(InputInfoPtr pInfo)
/* absolute position event */
DBG(3, ErrorF("postMotionEvent X %d\n", ax));
xf86PostMotionEvent(pInfo->dev, 1, 0, 1, ax);
- priv->x = ax;
}
if (ay) {
/* absolute position event */
DBG(3, ErrorF("postMotionEvent y %d\n", ay));
xf86PostMotionEvent(pInfo->dev, 1, 1, 1, ay);
- priv->y = ay;
}
++event;
}