Mir

Merge lp:~ken-vandine/mir/touchpad_pointer into lp:~mir-team/mir/silo0

  1. touchpad_pointer
  2. Merge into silo0
Proposed by Ken VanDine on 2015-08-17
Status: Merged
Merged at revision: 2705
Proposed branch: lp:~ken-vandine/mir/touchpad_pointer
Merge into: lp:~mir-team/mir/silo0
Diff against target: 51 lines (+4/-4)
4 files modified
3rd_party/android-deps/android/input.h (+1/-1)
src/client/events/event_builders.cpp (+1/-1)
src/client/input/input_event.cpp (+1/-1)
tests/unit-tests/input/test_input_event.cpp (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/mir/touchpad_pointer
Reviewer Review Type Date Requested Status
Daniel van Vugt 2015-08-17 Resubmit on 2015-08-18
Review via email: mp+268274@code.launchpad.net

Commit Message

Use input class pointer for touchpad

Description of the Change

Use input class pointer for touchpad

To post a comment you must log in.
Daniel van Vugt (vanvugt) wrote :

Hmm, might be useful. Can you please propose it to the trunk first though?... lp:mir

review: Resubmit
Ken VanDine (ken-vandine) wrote :

> Hmm, might be useful. Can you please propose it to the trunk first though?...
> lp:mir

Have all the changes in the silo0 branch been merged into trunk yet? I specifically wanted to test this with the silo0 changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '3rd_party/android-deps/android/input.h'
2--- 3rd_party/android-deps/android/input.h 2013-09-20 11:55:05 +0000
3+++ 3rd_party/android-deps/android/input.h 2015-08-17 20:53:16 +0000
4@@ -443,7 +443,7 @@
5 AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
6 AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
7 AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
8- AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
9+ AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POINTER,
10 AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
11
12 AINPUT_SOURCE_ANY = 0xffffff00
13
14=== modified file 'src/client/events/event_builders.cpp'
15--- src/client/events/event_builders.cpp 2015-07-28 14:03:47 +0000
16+++ src/client/events/event_builders.cpp 2015-08-17 20:53:16 +0000
17@@ -119,7 +119,7 @@
18 AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
19 AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
20 AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
21- AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
22+ AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POINTER,
23 AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
24
25 AINPUT_SOURCE_ANY = 0xffffff00
26
27=== modified file 'src/client/input/input_event.cpp'
28--- src/client/input/input_event.cpp 2015-07-28 14:03:47 +0000
29+++ src/client/input/input_event.cpp 2015-08-17 20:53:16 +0000
30@@ -76,7 +76,7 @@
31 AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
32 AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
33 AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
34- AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
35+ AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POINTER,
36 AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
37
38 AINPUT_SOURCE_ANY = 0xffffff00
39
40=== modified file 'tests/unit-tests/input/test_input_event.cpp'
41--- tests/unit-tests/input/test_input_event.cpp 2015-06-17 05:20:42 +0000
42+++ tests/unit-tests/input/test_input_event.cpp 2015-08-17 20:53:16 +0000
43@@ -52,7 +52,7 @@
44 AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
45 AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
46 AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
47- AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
48+ AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POINTER,
49 AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
50
51 AINPUT_SOURCE_ANY = 0xffffff00

Subscribers

People subscribed via source and target branches