diff options
| -rw-r--r-- | src/hwdata.h | 6 | ||||
| -rw-r--r-- | src/multitouch.c | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/hwdata.h b/src/hwdata.h index c00fb39..81d847b 100644 --- a/src/hwdata.h +++ b/src/hwdata.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include "common.h" | 25 | #include "common.h" |
| 26 | 26 | ||
| 27 | #define DIM_BUTTON 7 | 27 | #define DIM_BUTTON 11 |
| 28 | 28 | ||
| 29 | #define MT_BUTTON_LEFT 0 | 29 | #define MT_BUTTON_LEFT 0 |
| 30 | #define MT_BUTTON_MIDDLE 1 | 30 | #define MT_BUTTON_MIDDLE 1 |
| @@ -33,6 +33,10 @@ | |||
| 33 | #define MT_BUTTON_WHEEL_DOWN 4 | 33 | #define MT_BUTTON_WHEEL_DOWN 4 |
| 34 | #define MT_BUTTON_HWHEEL_LEFT 5 | 34 | #define MT_BUTTON_HWHEEL_LEFT 5 |
| 35 | #define MT_BUTTON_HWHEEL_RIGHT 6 | 35 | #define MT_BUTTON_HWHEEL_RIGHT 6 |
| 36 | #define MT_BUTTON_SWIPE_UP 7 | ||
| 37 | #define MT_BUTTON_SWIPE_DOWN 8 | ||
| 38 | #define MT_BUTTON_SWIPE_LEFT 9 | ||
| 39 | #define MT_BUTTON_SWIPE_RIGHT 10 | ||
| 36 | 40 | ||
| 37 | #define BIT_MT_TOUCH_MAJOR 0 | 41 | #define BIT_MT_TOUCH_MAJOR 0 |
| 38 | #define BIT_MT_TOUCH_MINOR 1 | 42 | #define BIT_MT_TOUCH_MINOR 1 |
diff --git a/src/multitouch.c b/src/multitouch.c index ebc0033..f0e572d 100644 --- a/src/multitouch.c +++ b/src/multitouch.c | |||
| @@ -74,13 +74,20 @@ static void initButtonLabels(Atom map[DIM_BUTTON]) | |||
| 74 | PROPMAP(map, MT_BUTTON_WHEEL_DOWN, BTN_LABEL_PROP_BTN_WHEEL_DOWN); | 74 | PROPMAP(map, MT_BUTTON_WHEEL_DOWN, BTN_LABEL_PROP_BTN_WHEEL_DOWN); |
| 75 | PROPMAP(map, MT_BUTTON_HWHEEL_LEFT, BTN_LABEL_PROP_BTN_HWHEEL_LEFT); | 75 | PROPMAP(map, MT_BUTTON_HWHEEL_LEFT, BTN_LABEL_PROP_BTN_HWHEEL_LEFT); |
| 76 | PROPMAP(map, MT_BUTTON_HWHEEL_RIGHT, BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); | 76 | PROPMAP(map, MT_BUTTON_HWHEEL_RIGHT, BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); |
| 77 | /* how to map swipe buttons? */ | ||
| 78 | PROPMAP(map, MT_BUTTON_SWIPE_UP, BTN_LABEL_PROP_BTN_0); | ||
| 79 | PROPMAP(map, MT_BUTTON_SWIPE_DOWN, BTN_LABEL_PROP_BTN_1); | ||
| 80 | PROPMAP(map, MT_BUTTON_SWIPE_LEFT, BTN_LABEL_PROP_BTN_2); | ||
| 81 | PROPMAP(map, MT_BUTTON_SWIPE_RIGHT, BTN_LABEL_PROP_BTN_3); | ||
| 77 | } | 82 | } |
| 78 | #endif | 83 | #endif |
| 79 | 84 | ||
| 80 | static int device_init(DeviceIntPtr dev, LocalDevicePtr local) | 85 | static int device_init(DeviceIntPtr dev, LocalDevicePtr local) |
| 81 | { | 86 | { |
| 82 | struct MTouch *mt = local->private; | 87 | struct MTouch *mt = local->private; |
| 83 | unsigned char btmap[DIM_BUTTON + 1] = { 0, 1, 2, 3, 4, 5, 6, 7 }; | 88 | unsigned char btmap[DIM_BUTTON + 1] = { |
| 89 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 | ||
| 90 | }; | ||
| 84 | #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 | 91 | #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
| 85 | Atom axes_labels[2], btn_labels[DIM_BUTTON]; | 92 | Atom axes_labels[2], btn_labels[DIM_BUTTON]; |
| 86 | initAxesLabels(axes_labels); | 93 | initAxesLabels(axes_labels); |
