summaryrefslogtreecommitdiff
path: root/hw/xquartz/darwin.c
diff options
context:
space:
mode:
authorBen Byer <bbyer@apple.com>2008-04-17 02:21:11 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-17 10:41:50 -0700
commita440eebf2541ae0bb06bf65281b5facff2f04e00 (patch)
tree10a75979e71a371b9559b1fa37133a80670021f5 /hw/xquartz/darwin.c
parent612e901ef6aa3edc54b39e55e8040cda0e5ab7b6 (diff)
add support for horizontal scrolling (buttons 6 and 7)
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
Diffstat (limited to 'hw/xquartz/darwin.c')
-rw-r--r--hw/xquartz/darwin.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 002ea413d..7d81a0269 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -337,7 +337,7 @@ static int DarwinMouseProc(
DeviceIntPtr pPointer,
int what )
{
- CARD8 map[6];
+ CARD8 map[8] = {0, 1, 2, 3, 4, 5, 6, 7};
switch (what) {
@@ -345,15 +345,10 @@ static int DarwinMouseProc(
pPointer->public.on = FALSE;
// Set button map.
- map[1] = 1;
- map[2] = 2;
- map[3] = 3;
- map[4] = 4;
- map[5] = 5;
- InitPointerDeviceStruct( (DevicePtr)pPointer, map, 5,
+ InitPointerDeviceStruct( (DevicePtr)pPointer, map, 7,
GetMotionHistory,
(PtrCtrlProcPtr)NoopDDA,
- GetMotionHistorySize(), 5);
+ GetMotionHistorySize(), 7);
InitProximityClassDeviceStruct( (DevicePtr)pPointer);
break;