summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2008-11-22 17:36:14 +0100
committerMatthieu Herrb <matthieu.herrb@laas.fr>2008-11-22 17:36:40 +0100
commit1e23b944aae3ef50cc764e6d2f0198deabe790ad (patch)
treeac661e32cb9ec088603ce99f46c6d420bc48ba1a
parente7e3cd9bed2bfeb848d62062d0859aa813bf786d (diff)
W axis support for bsd_mouse.
-rw-r--r--src/bsd_mouse.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
index ede7612..83054eb 100644
--- a/src/bsd_mouse.c
+++ b/src/bsd_mouse.c
@@ -429,6 +429,11 @@ wsconsReadInput(InputInfoPtr pInfo)
dz = event->value;
break;
#endif
+#ifdef WSCONS_EVENT_MOUSE_DELTA_W
+ case WSCONS_EVENT_MOUSE_DELTA_W:
+ dw = event->value;
+ break;
+#endif
default:
xf86Msg(X_WARNING, "%s: bad wsmouse event type=%d\n", pInfo->name,
event->type);
@@ -491,6 +496,7 @@ typedef struct _UsbMseRec {
hid_item_t loc_x; /* x locator item */
hid_item_t loc_y; /* y locator item */
hid_item_t loc_z; /* z (wheel) locator item */
+ hid_item_t loc_w; /* z (wheel) locator item */
hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */
unsigned char *buffer;
} UsbMseRec, *UsbMsePtr;
@@ -610,6 +616,7 @@ usbReadInput(InputInfoPtr pInfo)
dx = hid_get_data(pBuf, &pUsbMse->loc_x);
dy = hid_get_data(pBuf, &pUsbMse->loc_y);
dz = hid_get_data(pBuf, &pUsbMse->loc_z);
+ dw = hid_get_data(pBuf, &pUsbMse->loc_w);
buttons = 0;
for (n = 0; n < pMse->buttons; n++) {