Merge lp:~fginther/frame/frame-rename into lp:frame
- frame-rename
- Merge into trunk
Proposed by
Francis Ginther
Status: | Merged |
---|---|
Approved by: | Chase Douglas |
Approved revision: | 85 |
Merged at revision: | 83 |
Proposed branch: | lp:~fginther/frame/frame-rename |
Merge into: | lp:frame |
Diff against target: |
3424 lines (+458/-742) 66 files modified
.bzrignore (+10/-10) .gitignore (+2/-2) ChangeLog (+62/-62) INSTALL (+5/-5) Makefile.am (+1/-1) README (+1/-1) configure.ac (+3/-3) doc/Doxyfile (+2/-2) frame.pc.in (+2/-2) include/oif/frame.h (+14/-14) include/oif/frame_internal.h (+4/-4) include/oif/frame_x11.h (+20/-20) m4/xorg-gtest.m4 (+3/-3) src/Makefile.am (+12/-12) src/axis.cpp (+7/-7) src/axis.h (+7/-7) src/device.cpp (+9/-9) src/device.h (+7/-7) src/event.cpp (+15/-15) src/event.h (+7/-7) src/frame.cpp (+27/-27) src/frame.h (+7/-7) src/handle.cpp (+5/-5) src/handle.h (+7/-7) src/libframe.ver (+17/-25) src/property.h (+6/-6) src/touch.cpp (+31/-31) src/touch.h (+7/-7) src/typedefs.h (+6/-6) src/value.cpp (+3/-3) src/value.h (+7/-7) src/window.cpp (+3/-3) src/window.h (+7/-7) src/x11/device_x11.cpp (+11/-11) src/x11/device_x11.h (+7/-7) src/x11/frame_x11.cpp (+10/-10) src/x11/handle_x11.cpp (+4/-4) src/x11/handle_x11.h (+6/-6) src/x11/window_x11.cpp (+5/-5) src/x11/window_x11.h (+7/-7) test/integration/Makefile.am (+1/-1) test/integration/events.cpp (+5/-5) test/integration/events.h (+7/-7) test/integration/x11/device.cpp (+3/-3) test/integration/x11/dynamic_type_checking.cpp (+2/-2) test/integration/x11/fixture.cpp (+6/-6) test/integration/x11/fixture.h (+7/-7) test/integration/x11/ids.cpp (+2/-2) test/integration/x11/recording.cpp (+15/-15) test/regular/Makefile.am (+3/-3) test/regular/check-c-compile.c (+1/-1) test/regular/check-cxx-compile.cpp (+1/-1) test/regular/check-static-type-checking.c (+1/-1) test/regular/frame-fixture.h (+2/-2) tools/Makefile.am (+6/-6) tools/common-defs.h (+0/-85) tools/common/device.c (+1/-1) tools/common/device.h (+2/-2) tools/common/frame.c (+2/-2) tools/common/frame.h (+2/-2) tools/common/touch.c (+2/-2) tools/common/touch.h (+2/-2) tools/frame-test-x11.c (+4/-4) tools/frame-test-x11.txt (+5/-5) tools/utouch-frame-test-mtdev.c (+0/-169) tools/utouch-frame-test-mtdev.txt (+0/-22) |
To merge this branch: | bzr merge lp:~fginther/frame/frame-rename |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chase Douglas (community) | Approve | ||
Review via email: mp+116557@code.launchpad.net |
Commit message
Removed references to legacy project name.
Description of the change
Removed references to legacy project name.
Some includes were changed to build inside a 'clean' vm.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' | |||
2 | --- .bzrignore 2012-07-17 14:27:23 +0000 | |||
3 | +++ .bzrignore 2012-07-24 22:45:29 +0000 | |||
4 | @@ -26,14 +26,14 @@ | |||
5 | 26 | m4/lt~obsolete.m4 | 26 | m4/lt~obsolete.m4 |
6 | 27 | m4/pkg.m4 | 27 | m4/pkg.m4 |
7 | 28 | stamp-* | 28 | stamp-* |
11 | 29 | test/regular/check-c-compile | 29 | test/check-c-compile |
12 | 30 | test/regular/check-cxx-compile | 30 | test/check-cxx-compile |
13 | 31 | test/regular/check-regular | 31 | test/check-frame |
14 | 32 | test/integration/check-integration | 32 | test/integration/check-integration |
22 | 33 | tools/utouch-frame-test-mtdev | 33 | tools/frame-test-mtdev |
23 | 34 | tools/utouch-frame-test-mtdev.1 | 34 | tools/frame-test-mtdev.1 |
24 | 35 | tools/utouch-frame-test-xi2 | 35 | tools/frame-test-xi2 |
25 | 36 | tools/utouch-frame-test-xi2.1 | 36 | tools/frame-test-xi2.1 |
26 | 37 | tools/utouch-frame-test-x11 | 37 | tools/frame-test-x11 |
27 | 38 | tools/utouch-frame-test-x11.1 | 38 | tools/frame-test-x11.1 |
28 | 39 | utouch-frame.pc | 39 | frame.pc |
29 | 40 | 40 | ||
30 | === modified file '.gitignore' | |||
31 | --- .gitignore 2011-02-15 14:01:51 +0000 | |||
32 | +++ .gitignore 2012-07-24 22:45:29 +0000 | |||
33 | @@ -78,5 +78,5 @@ | |||
34 | 78 | .bzrignore | 78 | .bzrignore |
35 | 79 | .bzr | 79 | .bzr |
36 | 80 | patches | 80 | patches |
39 | 81 | tools/utouch-frame-test-mtdev | 81 | tools/frame-test-mtdev |
40 | 82 | tools/utouch-frame-test-xi2 | 82 | tools/frame-test-xi2 |
41 | 83 | 83 | ||
42 | === modified file 'ChangeLog' | |||
43 | --- ChangeLog 2012-03-31 02:31:54 +0000 | |||
44 | +++ ChangeLog 2012-07-24 22:45:29 +0000 | |||
45 | @@ -2,7 +2,7 @@ | |||
46 | 2 | revno: 78 [merge] | 2 | revno: 78 [merge] |
47 | 3 | fixes bug: https://launchpad.net/bugs/966290 | 3 | fixes bug: https://launchpad.net/bugs/966290 |
48 | 4 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 4 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
50 | 5 | branch nick: utouch-frame | 5 | branch nick: frame |
51 | 6 | timestamp: Tue 2012-03-27 17:45:08 -0700 | 6 | timestamp: Tue 2012-03-27 17:45:08 -0700 |
52 | 7 | message: | 7 | message: |
53 | 8 | Merge fix for daily build FTBFS | 8 | Merge fix for daily build FTBFS |
54 | @@ -10,14 +10,14 @@ | |||
55 | 10 | revno: 77 [merge] | 10 | revno: 77 [merge] |
56 | 11 | fixes bug: https://launchpad.net/bugs/963072 | 11 | fixes bug: https://launchpad.net/bugs/963072 |
57 | 12 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 12 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
59 | 13 | branch nick: utouch-frame | 13 | branch nick: frame |
60 | 14 | timestamp: Mon 2012-03-26 08:59:49 -0400 | 14 | timestamp: Mon 2012-03-26 08:59:49 -0400 |
61 | 15 | message: | 15 | message: |
62 | 16 | Change licensing from GPL-3+ to LGPL-3 (lp: #963072) | 16 | Change licensing from GPL-3+ to LGPL-3 (lp: #963072) |
63 | 17 | ------------------------------------------------------------ | 17 | ------------------------------------------------------------ |
64 | 18 | revno: 76 [merge] | 18 | revno: 76 [merge] |
65 | 19 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 19 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
67 | 20 | branch nick: utouch-frame | 20 | branch nick: frame |
68 | 21 | timestamp: Thu 2012-03-22 09:22:54 -0700 | 21 | timestamp: Thu 2012-03-22 09:22:54 -0700 |
69 | 22 | message: | 22 | message: |
70 | 23 | Merge fixes for issues found by compiling with -Weffc++ | 23 | Merge fixes for issues found by compiling with -Weffc++ |
71 | @@ -25,7 +25,7 @@ | |||
72 | 25 | revno: 75 [merge] | 25 | revno: 75 [merge] |
73 | 26 | fixes bug: https://launchpad.net/bugs/930143 | 26 | fixes bug: https://launchpad.net/bugs/930143 |
74 | 27 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 27 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
76 | 28 | branch nick: utouch-frame | 28 | branch nick: frame |
77 | 29 | timestamp: Thu 2012-03-22 07:55:56 -0700 | 29 | timestamp: Thu 2012-03-22 07:55:56 -0700 |
78 | 30 | message: | 30 | message: |
79 | 31 | Merge fix for missing virtual destructors in Window class | 31 | Merge fix for missing virtual destructors in Window class |
80 | @@ -33,7 +33,7 @@ | |||
81 | 33 | revno: 74 | 33 | revno: 74 |
82 | 34 | tags: v2.2.2 | 34 | tags: v2.2.2 |
83 | 35 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 35 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
85 | 36 | branch nick: utouch-frame | 36 | branch nick: frame |
86 | 37 | timestamp: Wed 2012-03-21 16:36:37 -0700 | 37 | timestamp: Wed 2012-03-21 16:36:37 -0700 |
87 | 38 | message: | 38 | message: |
88 | 39 | Release version 2.2.2 | 39 | Release version 2.2.2 |
89 | @@ -41,7 +41,7 @@ | |||
90 | 41 | revno: 73 [merge] | 41 | revno: 73 [merge] |
91 | 42 | fixes bug: https://launchpad.net/bugs/961596 | 42 | fixes bug: https://launchpad.net/bugs/961596 |
92 | 43 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 43 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
94 | 44 | branch nick: utouch-frame | 44 | branch nick: frame |
95 | 45 | timestamp: Wed 2012-03-21 16:20:10 -0700 | 45 | timestamp: Wed 2012-03-21 16:20:10 -0700 |
96 | 46 | message: | 46 | message: |
97 | 47 | Merge fix for symbol visibility for C11 _Generic property getters | 47 | Merge fix for symbol visibility for C11 _Generic property getters |
98 | @@ -49,35 +49,35 @@ | |||
99 | 49 | revno: 72 [merge] | 49 | revno: 72 [merge] |
100 | 50 | fixes bug: https://launchpad.net/bugs/961489 | 50 | fixes bug: https://launchpad.net/bugs/961489 |
101 | 51 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 51 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
103 | 52 | branch nick: utouch-frame | 52 | branch nick: frame |
104 | 53 | timestamp: Wed 2012-03-21 11:40:48 -0700 | 53 | timestamp: Wed 2012-03-21 11:40:48 -0700 |
105 | 54 | message: | 54 | message: |
106 | 55 | Merge fixes for xorg-gtest usage, symbol visibility, and automake flags | 55 | Merge fixes for xorg-gtest usage, symbol visibility, and automake flags |
107 | 56 | ------------------------------------------------------------ | 56 | ------------------------------------------------------------ |
108 | 57 | revno: 71 | 57 | revno: 71 |
109 | 58 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> | 58 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> |
111 | 59 | branch nick: utouch-frame | 59 | branch nick: frame |
112 | 60 | timestamp: Tue 2012-03-06 10:16:11 +0200 | 60 | timestamp: Tue 2012-03-06 10:16:11 +0200 |
113 | 61 | message: | 61 | message: |
114 | 62 | Changed underscores to hyphens for great justice. | 62 | Changed underscores to hyphens for great justice. |
115 | 63 | ------------------------------------------------------------ | 63 | ------------------------------------------------------------ |
116 | 64 | revno: 70 [merge] | 64 | revno: 70 [merge] |
117 | 65 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> | 65 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> |
119 | 66 | branch nick: utouch-frame | 66 | branch nick: frame |
120 | 67 | timestamp: Mon 2012-03-05 17:28:34 +0200 | 67 | timestamp: Mon 2012-03-05 17:28:34 +0200 |
121 | 68 | message: | 68 | message: |
122 | 69 | Merged build tests. | 69 | Merged build tests. |
123 | 70 | ------------------------------------------------------------ | 70 | ------------------------------------------------------------ |
124 | 71 | revno: 69 [merge] | 71 | revno: 69 [merge] |
125 | 72 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 72 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
127 | 73 | branch nick: utouch-frame | 73 | branch nick: frame |
128 | 74 | timestamp: Thu 2012-03-01 09:58:21 -0800 | 74 | timestamp: Thu 2012-03-01 09:58:21 -0800 |
129 | 75 | message: | 75 | message: |
130 | 76 | Merge miscellaneous automake cleanups | 76 | Merge miscellaneous automake cleanups |
131 | 77 | ------------------------------------------------------------ | 77 | ------------------------------------------------------------ |
132 | 78 | revno: 68 [merge] | 78 | revno: 68 [merge] |
133 | 79 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 79 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
135 | 80 | branch nick: utouch-frame | 80 | branch nick: frame |
136 | 81 | timestamp: Wed 2012-02-29 21:10:54 -0800 | 81 | timestamp: Wed 2012-02-29 21:10:54 -0800 |
137 | 82 | message: | 82 | message: |
138 | 83 | Merge XInput autotools cleanup | 83 | Merge XInput autotools cleanup |
139 | @@ -85,35 +85,35 @@ | |||
140 | 85 | revno: 67 | 85 | revno: 67 |
141 | 86 | tags: v2.2.1 | 86 | tags: v2.2.1 |
142 | 87 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 87 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
144 | 88 | branch nick: utouch-frame | 88 | branch nick: frame |
145 | 89 | timestamp: Wed 2012-02-15 09:32:01 -0500 | 89 | timestamp: Wed 2012-02-15 09:32:01 -0500 |
146 | 90 | message: | 90 | message: |
147 | 91 | Release version 2.2.1 | 91 | Release version 2.2.1 |
148 | 92 | ------------------------------------------------------------ | 92 | ------------------------------------------------------------ |
149 | 93 | revno: 66 | 93 | revno: 66 |
150 | 94 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 94 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
152 | 95 | branch nick: utouch-frame | 95 | branch nick: frame |
153 | 96 | timestamp: Wed 2012-02-15 09:21:07 -0500 | 96 | timestamp: Wed 2012-02-15 09:21:07 -0500 |
154 | 97 | message: | 97 | message: |
155 | 98 | Fixed 'make distcheck' failure. | 98 | Fixed 'make distcheck' failure. |
156 | 99 | ------------------------------------------------------------ | 99 | ------------------------------------------------------------ |
157 | 100 | revno: 65 [merge] | 100 | revno: 65 [merge] |
158 | 101 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 101 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
160 | 102 | branch nick: utouch-frame | 102 | branch nick: frame |
161 | 103 | timestamp: Mon 2012-02-13 13:52:32 -0800 | 103 | timestamp: Mon 2012-02-13 13:52:32 -0800 |
162 | 104 | message: | 104 | message: |
163 | 105 | Merge ownership event time value type fix | 105 | Merge ownership event time value type fix |
164 | 106 | ------------------------------------------------------------ | 106 | ------------------------------------------------------------ |
165 | 107 | revno: 64 [merge] | 107 | revno: 64 [merge] |
166 | 108 | committer: Chase Douglas <chase.douglas@canonical.com> | 108 | committer: Chase Douglas <chase.douglas@canonical.com> |
168 | 109 | branch nick: utouch-frame | 109 | branch nick: frame |
169 | 110 | timestamp: Mon 2012-02-13 09:46:53 -0800 | 110 | timestamp: Mon 2012-02-13 09:46:53 -0800 |
170 | 111 | message: | 111 | message: |
171 | 112 | Merge XI version query fix | 112 | Merge XI version query fix |
172 | 113 | ------------------------------------------------------------ | 113 | ------------------------------------------------------------ |
173 | 114 | revno: 63 [merge] | 114 | revno: 63 [merge] |
174 | 115 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> | 115 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> |
176 | 116 | branch nick: utouch-frame | 116 | branch nick: frame |
177 | 117 | timestamp: Wed 2012-02-01 16:28:17 +0200 | 117 | timestamp: Wed 2012-02-01 16:28:17 +0200 |
178 | 118 | message: | 118 | message: |
179 | 119 | Merged pkg-config fix. | 119 | Merged pkg-config fix. |
180 | @@ -121,28 +121,28 @@ | |||
181 | 121 | revno: 62 | 121 | revno: 62 |
182 | 122 | tags: v2.2.0 | 122 | tags: v2.2.0 |
183 | 123 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 123 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
185 | 124 | branch nick: utouch-frame | 124 | branch nick: frame |
186 | 125 | timestamp: Mon 2012-01-30 14:32:14 -0800 | 125 | timestamp: Mon 2012-01-30 14:32:14 -0800 |
187 | 126 | message: | 126 | message: |
188 | 127 | Release version 2.2.0 | 127 | Release version 2.2.0 |
189 | 128 | ------------------------------------------------------------ | 128 | ------------------------------------------------------------ |
190 | 129 | revno: 61 [merge] | 129 | revno: 61 [merge] |
191 | 130 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 130 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
193 | 131 | branch nick: utouch-frame | 131 | branch nick: frame |
194 | 132 | timestamp: Mon 2012-01-30 14:31:33 -0800 | 132 | timestamp: Mon 2012-01-30 14:31:33 -0800 |
195 | 133 | message: | 133 | message: |
196 | 134 | Merge window resolution properties | 134 | Merge window resolution properties |
197 | 135 | ------------------------------------------------------------ | 135 | ------------------------------------------------------------ |
198 | 136 | revno: 60 [merge] | 136 | revno: 60 [merge] |
199 | 137 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 137 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
201 | 138 | branch nick: utouch-frame | 138 | branch nick: frame |
202 | 139 | timestamp: Mon 2012-01-30 11:13:30 -0800 | 139 | timestamp: Mon 2012-01-30 11:13:30 -0800 |
203 | 140 | message: | 140 | message: |
204 | 141 | Merge recording fix branch | 141 | Merge recording fix branch |
205 | 142 | ------------------------------------------------------------ | 142 | ------------------------------------------------------------ |
206 | 143 | revno: 59 [merge] | 143 | revno: 59 [merge] |
207 | 144 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 144 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
209 | 145 | branch nick: utouch-frame | 145 | branch nick: frame |
210 | 146 | timestamp: Thu 2012-01-19 13:07:46 -0800 | 146 | timestamp: Thu 2012-01-19 13:07:46 -0800 |
211 | 147 | message: | 147 | message: |
212 | 148 | Merge fix for indirect touch device axis mapping | 148 | Merge fix for indirect touch device axis mapping |
213 | @@ -150,35 +150,35 @@ | |||
214 | 150 | revno: 58 | 150 | revno: 58 |
215 | 151 | tags: v2.1.0 | 151 | tags: v2.1.0 |
216 | 152 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 152 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
218 | 153 | branch nick: utouch-frame | 153 | branch nick: frame |
219 | 154 | timestamp: Tue 2012-01-17 21:35:01 +0100 | 154 | timestamp: Tue 2012-01-17 21:35:01 +0100 |
220 | 155 | message: | 155 | message: |
221 | 156 | Release version 2.1.0 | 156 | Release version 2.1.0 |
222 | 157 | ------------------------------------------------------------ | 157 | ------------------------------------------------------------ |
223 | 158 | revno: 57 | 158 | revno: 57 |
224 | 159 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 159 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
226 | 160 | branch nick: utouch-frame | 160 | branch nick: frame |
227 | 161 | timestamp: Tue 2012-01-17 21:34:08 +0100 | 161 | timestamp: Tue 2012-01-17 21:34:08 +0100 |
228 | 162 | message: | 162 | message: |
229 | 163 | Bump libtool version for additional C11 _Generic ABI | 163 | Bump libtool version for additional C11 _Generic ABI |
230 | 164 | ------------------------------------------------------------ | 164 | ------------------------------------------------------------ |
231 | 165 | revno: 56 | 165 | revno: 56 |
232 | 166 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 166 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
234 | 167 | branch nick: utouch-frame | 167 | branch nick: frame |
235 | 168 | timestamp: Tue 2012-01-17 21:22:16 +0100 | 168 | timestamp: Tue 2012-01-17 21:22:16 +0100 |
236 | 169 | message: | 169 | message: |
237 | 170 | Bump XInput dependencies | 170 | Bump XInput dependencies |
238 | 171 | ------------------------------------------------------------ | 171 | ------------------------------------------------------------ |
239 | 172 | revno: 55 [merge] | 172 | revno: 55 [merge] |
240 | 173 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 173 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
242 | 174 | branch nick: utouch-frame | 174 | branch nick: frame |
243 | 175 | timestamp: Tue 2012-01-17 21:20:41 +0100 | 175 | timestamp: Tue 2012-01-17 21:20:41 +0100 |
244 | 176 | message: | 176 | message: |
245 | 177 | Merge upstream XInput multitouch support | 177 | Merge upstream XInput multitouch support |
246 | 178 | ------------------------------------------------------------ | 178 | ------------------------------------------------------------ |
247 | 179 | revno: 54 [merge] | 179 | revno: 54 [merge] |
248 | 180 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 180 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
250 | 181 | branch nick: utouch-frame | 181 | branch nick: frame |
251 | 182 | timestamp: Thu 2012-01-12 03:22:47 -0800 | 182 | timestamp: Thu 2012-01-12 03:22:47 -0800 |
252 | 183 | message: | 183 | message: |
253 | 184 | Merge C11 _Generic support | 184 | Merge C11 _Generic support |
254 | @@ -186,56 +186,56 @@ | |||
255 | 186 | revno: 53 | 186 | revno: 53 |
256 | 187 | tags: v2.0.0 | 187 | tags: v2.0.0 |
257 | 188 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 188 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
259 | 189 | branch nick: utouch-frame | 189 | branch nick: frame |
260 | 190 | timestamp: Thu 2011-12-08 16:49:57 -0800 | 190 | timestamp: Thu 2011-12-08 16:49:57 -0800 |
261 | 191 | message: | 191 | message: |
262 | 192 | Release version 2.0.0 | 192 | Release version 2.0.0 |
263 | 193 | ------------------------------------------------------------ | 193 | ------------------------------------------------------------ |
264 | 194 | revno: 52 | 194 | revno: 52 |
265 | 195 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 195 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
267 | 196 | branch nick: utouch-frame | 196 | branch nick: frame |
268 | 197 | timestamp: Thu 2011-12-08 16:49:45 -0800 | 197 | timestamp: Thu 2011-12-08 16:49:45 -0800 |
269 | 198 | message: | 198 | message: |
270 | 199 | Silently generate manpages | 199 | Silently generate manpages |
271 | 200 | ------------------------------------------------------------ | 200 | ------------------------------------------------------------ |
272 | 201 | revno: 51 | 201 | revno: 51 |
273 | 202 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 202 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
275 | 203 | branch nick: utouch-frame | 203 | branch nick: frame |
276 | 204 | timestamp: Thu 2011-12-08 16:45:55 -0800 | 204 | timestamp: Thu 2011-12-08 16:45:55 -0800 |
277 | 205 | message: | 205 | message: |
278 | 206 | Ship Doxyfile | 206 | Ship Doxyfile |
279 | 207 | ------------------------------------------------------------ | 207 | ------------------------------------------------------------ |
280 | 208 | revno: 50 | 208 | revno: 50 |
281 | 209 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 209 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
283 | 210 | branch nick: utouch-frame | 210 | branch nick: frame |
284 | 211 | timestamp: Thu 2011-12-08 16:36:21 -0800 | 211 | timestamp: Thu 2011-12-08 16:36:21 -0800 |
285 | 212 | message: | 212 | message: |
286 | 213 | Ship test recordings | 213 | Ship test recordings |
287 | 214 | ------------------------------------------------------------ | 214 | ------------------------------------------------------------ |
288 | 215 | revno: 49 | 215 | revno: 49 |
289 | 216 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 216 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
291 | 217 | branch nick: utouch-frame | 217 | branch nick: frame |
292 | 218 | timestamp: Thu 2011-12-08 16:35:40 -0800 | 218 | timestamp: Thu 2011-12-08 16:35:40 -0800 |
293 | 219 | message: | 219 | message: |
294 | 220 | Actually throw the instantiated exceptions on testing::Device errors | 220 | Actually throw the instantiated exceptions on testing::Device errors |
295 | 221 | ------------------------------------------------------------ | 221 | ------------------------------------------------------------ |
296 | 222 | revno: 48 | 222 | revno: 48 |
297 | 223 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 223 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
299 | 224 | branch nick: utouch-frame | 224 | branch nick: frame |
300 | 225 | timestamp: Thu 2011-12-08 16:35:06 -0800 | 225 | timestamp: Thu 2011-12-08 16:35:06 -0800 |
301 | 226 | message: | 226 | message: |
302 | 227 | Ship v2/property.h and v2/typedefs.h | 227 | Ship v2/property.h and v2/typedefs.h |
303 | 228 | ------------------------------------------------------------ | 228 | ------------------------------------------------------------ |
304 | 229 | revno: 47 | 229 | revno: 47 |
305 | 230 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 230 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
307 | 231 | branch nick: utouch-frame | 231 | branch nick: frame |
308 | 232 | timestamp: Thu 2011-12-08 16:34:36 -0800 | 232 | timestamp: Thu 2011-12-08 16:34:36 -0800 |
309 | 233 | message: | 233 | message: |
310 | 234 | Only check for sudo if gcov support is enabled | 234 | Only check for sudo if gcov support is enabled |
311 | 235 | ------------------------------------------------------------ | 235 | ------------------------------------------------------------ |
312 | 236 | revno: 46 | 236 | revno: 46 |
313 | 237 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 237 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
315 | 238 | branch nick: utouch-frame | 238 | branch nick: frame |
316 | 239 | timestamp: Thu 2011-12-08 13:04:51 -0800 | 239 | timestamp: Thu 2011-12-08 13:04:51 -0800 |
317 | 240 | message: | 240 | message: |
318 | 241 | Remove erroneously left mem pool header files from src/Makefile.am | 241 | Remove erroneously left mem pool header files from src/Makefile.am |
319 | @@ -244,24 +244,24 @@ | |||
320 | 244 | ------------------------------------------------------------ | 244 | ------------------------------------------------------------ |
321 | 245 | revno: 45 [merge] | 245 | revno: 45 [merge] |
322 | 246 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 246 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
324 | 247 | branch nick: utouch-frame | 247 | branch nick: frame |
325 | 248 | timestamp: Thu 2011-12-08 12:53:48 -0800 | 248 | timestamp: Thu 2011-12-08 12:53:48 -0800 |
326 | 249 | message: | 249 | message: |
328 | 250 | Merge utouch-frame version 2 | 250 | Merge frame version 2 |
329 | 251 | 251 | ||
330 | 252 | Version 1 will be removed once its dependencies have been moved to | 252 | Version 1 will be removed once its dependencies have been moved to |
331 | 253 | version 2. | 253 | version 2. |
332 | 254 | ------------------------------------------------------------ | 254 | ------------------------------------------------------------ |
333 | 255 | revno: 44 | 255 | revno: 44 |
334 | 256 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 256 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
336 | 257 | branch nick: utouch-frame | 257 | branch nick: frame |
337 | 258 | timestamp: Wed 2011-08-31 09:24:35 -0700 | 258 | timestamp: Wed 2011-08-31 09:24:35 -0700 |
338 | 259 | message: | 259 | message: |
339 | 260 | Really fix the library version script | 260 | Really fix the library version script |
340 | 261 | ------------------------------------------------------------ | 261 | ------------------------------------------------------------ |
341 | 262 | revno: 43 | 262 | revno: 43 |
342 | 263 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 263 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
344 | 264 | branch nick: utouch-frame | 264 | branch nick: frame |
345 | 265 | timestamp: Wed 2011-08-31 09:19:52 -0700 | 265 | timestamp: Wed 2011-08-31 09:19:52 -0700 |
346 | 266 | message: | 266 | message: |
347 | 267 | Fix library version script bug in last merge | 267 | Fix library version script bug in last merge |
348 | @@ -269,7 +269,7 @@ | |||
349 | 269 | revno: 42 [merge] | 269 | revno: 42 [merge] |
350 | 270 | author: Timo Kluck | 270 | author: Timo Kluck |
351 | 271 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 271 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
353 | 272 | branch nick: utouch-frame | 272 | branch nick: frame |
354 | 273 | timestamp: Wed 2011-08-31 09:10:43 -0700 | 273 | timestamp: Wed 2011-08-31 09:10:43 -0700 |
355 | 274 | message: | 274 | message: |
356 | 275 | Merge coordinate transformation api extension | 275 | Merge coordinate transformation api extension |
357 | @@ -279,14 +279,14 @@ | |||
358 | 279 | revno: 41 | 279 | revno: 41 |
359 | 280 | tags: v1.1.4 | 280 | tags: v1.1.4 |
360 | 281 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 281 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
362 | 282 | branch nick: utouch-frame | 282 | branch nick: frame |
363 | 283 | timestamp: Tue 2011-08-09 14:29:54 -0700 | 283 | timestamp: Tue 2011-08-09 14:29:54 -0700 |
364 | 284 | message: | 284 | message: |
365 | 285 | Release version 1.1.4 | 285 | Release version 1.1.4 |
366 | 286 | ------------------------------------------------------------ | 286 | ------------------------------------------------------------ |
367 | 287 | revno: 40 [merge] | 287 | revno: 40 [merge] |
368 | 288 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 288 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
370 | 289 | branch nick: utouch-frame | 289 | branch nick: frame |
371 | 290 | timestamp: Tue 2011-08-09 13:13:14 -0700 | 290 | timestamp: Tue 2011-08-09 13:13:14 -0700 |
372 | 291 | message: | 291 | message: |
373 | 292 | Merge resolution fix and unused variable removal | 292 | Merge resolution fix and unused variable removal |
374 | @@ -294,21 +294,21 @@ | |||
375 | 294 | revno: 39 | 294 | revno: 39 |
376 | 295 | tags: v1.1.3 | 295 | tags: v1.1.3 |
377 | 296 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 296 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
379 | 297 | branch nick: utouch-frame | 297 | branch nick: frame |
380 | 298 | timestamp: Thu 2011-07-07 17:14:01 -0700 | 298 | timestamp: Thu 2011-07-07 17:14:01 -0700 |
381 | 299 | message: | 299 | message: |
382 | 300 | Release version 1.1.3 | 300 | Release version 1.1.3 |
383 | 301 | ------------------------------------------------------------ | 301 | ------------------------------------------------------------ |
384 | 302 | revno: 38 | 302 | revno: 38 |
385 | 303 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 303 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
387 | 304 | branch nick: utouch-frame | 304 | branch nick: frame |
388 | 305 | timestamp: Tue 2011-06-14 09:27:45 -0400 | 305 | timestamp: Tue 2011-06-14 09:27:45 -0400 |
389 | 306 | message: | 306 | message: |
390 | 307 | Added missing symbols for unit testing with XI2. | 307 | Added missing symbols for unit testing with XI2. |
391 | 308 | ------------------------------------------------------------ | 308 | ------------------------------------------------------------ |
392 | 309 | revno: 37 [merge] | 309 | revno: 37 [merge] |
393 | 310 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 310 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
395 | 311 | branch nick: utouch-frame | 311 | branch nick: frame |
396 | 312 | timestamp: Tue 2011-06-14 08:54:06 -0400 | 312 | timestamp: Tue 2011-06-14 08:54:06 -0400 |
397 | 313 | message: | 313 | message: |
398 | 314 | Added ELF symbol versioning. | 314 | Added ELF symbol versioning. |
399 | @@ -316,52 +316,52 @@ | |||
400 | 316 | revno: 36 [merge] | 316 | revno: 36 [merge] |
401 | 317 | author: Henrik Rydberg <rydberg@euromail.se> | 317 | author: Henrik Rydberg <rydberg@euromail.se> |
402 | 318 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 318 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
404 | 319 | branch nick: utouch-frame | 319 | branch nick: frame |
405 | 320 | timestamp: Tue 2011-06-14 08:53:08 -0400 | 320 | timestamp: Tue 2011-06-14 08:53:08 -0400 |
406 | 321 | message: | 321 | message: |
407 | 322 | Another swap problem fixed. | 322 | Another swap problem fixed. |
408 | 323 | ------------------------------------------------------------ | 323 | ------------------------------------------------------------ |
409 | 324 | revno: 35 [merge] | 324 | revno: 35 [merge] |
410 | 325 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 325 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
412 | 326 | branch nick: utouch-frame | 326 | branch nick: frame |
413 | 327 | timestamp: Wed 2011-05-18 14:16:05 -0400 | 327 | timestamp: Wed 2011-05-18 14:16:05 -0400 |
414 | 328 | message: | 328 | message: |
415 | 329 | Merge fix for XI 2.1 touch state processing | 329 | Merge fix for XI 2.1 touch state processing |
416 | 330 | ------------------------------------------------------------ | 330 | ------------------------------------------------------------ |
417 | 331 | revno: 34 [merge] | 331 | revno: 34 [merge] |
418 | 332 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> | 332 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> |
420 | 333 | branch nick: utouch-frame | 333 | branch nick: frame |
421 | 334 | timestamp: Wed 2011-05-18 09:12:48 +0300 | 334 | timestamp: Wed 2011-05-18 09:12:48 +0300 |
422 | 335 | message: | 335 | message: |
423 | 336 | Merged underscore removal. | 336 | Merged underscore removal. |
424 | 337 | ------------------------------------------------------------ | 337 | ------------------------------------------------------------ |
425 | 338 | revno: 33 [merge] | 338 | revno: 33 [merge] |
426 | 339 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 339 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
428 | 340 | branch nick: utouch-frame | 340 | branch nick: frame |
429 | 341 | timestamp: Fri 2011-04-29 09:19:10 -0400 | 341 | timestamp: Fri 2011-04-29 09:19:10 -0400 |
430 | 342 | message: | 342 | message: |
431 | 343 | Merge pbuilder fix | 343 | Merge pbuilder fix |
432 | 344 | ------------------------------------------------------------ | 344 | ------------------------------------------------------------ |
433 | 345 | revno: 32 [merge] | 345 | revno: 32 [merge] |
434 | 346 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> | 346 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> |
436 | 347 | branch nick: utouch-frame | 347 | branch nick: frame |
437 | 348 | timestamp: Fri 2011-04-29 14:43:57 +0300 | 348 | timestamp: Fri 2011-04-29 14:43:57 +0300 |
438 | 349 | message: | 349 | message: |
439 | 350 | Merged clang cleanup. | 350 | Merged clang cleanup. |
440 | 351 | ------------------------------------------------------------ | 351 | ------------------------------------------------------------ |
441 | 352 | revno: 31 [merge] | 352 | revno: 31 [merge] |
442 | 353 | committer: Chase Douglas <chase.douglas@ubuntu.com> | 353 | committer: Chase Douglas <chase.douglas@ubuntu.com> |
444 | 354 | branch nick: utouch-frame | 354 | branch nick: frame |
445 | 355 | timestamp: Wed 2011-04-27 09:00:42 -0400 | 355 | timestamp: Wed 2011-04-27 09:00:42 -0400 |
446 | 356 | message: | 356 | message: |
448 | 357 | Merge semi-mt support into utouch-frame | 357 | Merge semi-mt support into frame |
449 | 358 | 358 | ||
450 | 359 | This enables 3+ touch support on semi-multitouch trackpads like Synaptics | 359 | This enables 3+ touch support on semi-multitouch trackpads like Synaptics |
451 | 360 | clickpads. | 360 | clickpads. |
452 | 361 | ------------------------------------------------------------ | 361 | ------------------------------------------------------------ |
453 | 362 | revno: 30 [merge] | 362 | revno: 30 [merge] |
454 | 363 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> | 363 | committer: Jussi Pakkanen <jussi.pakkanen@canonical.com> |
456 | 364 | branch nick: utouch-frame | 364 | branch nick: frame |
457 | 365 | timestamp: Wed 2011-04-27 15:17:40 +0300 | 365 | timestamp: Wed 2011-04-27 15:17:40 +0300 |
458 | 366 | message: | 366 | message: |
459 | 367 | Merge pkg-config flag fix. | 367 | Merge pkg-config flag fix. |
460 | @@ -381,7 +381,7 @@ | |||
461 | 381 | branch nick: trunk | 381 | branch nick: trunk |
462 | 382 | timestamp: Tue 2011-03-15 20:15:17 +0100 | 382 | timestamp: Tue 2011-03-15 20:15:17 +0100 |
463 | 383 | message: | 383 | message: |
465 | 384 | Allow replay of device data through utouch-frame | 384 | Allow replay of device data through frame |
466 | 385 | 385 | ||
467 | 386 | This patch adds replay capabilities to test-mtdev. | 386 | This patch adds replay capabilities to test-mtdev. |
468 | 387 | If the specified device points to a valid evemu file, | 387 | If the specified device points to a valid evemu file, |
469 | @@ -394,7 +394,7 @@ | |||
470 | 394 | ------------------------------------------------------------ | 394 | ------------------------------------------------------------ |
471 | 395 | revno: 27 [merge] | 395 | revno: 27 [merge] |
472 | 396 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 396 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
474 | 397 | branch nick: utouch-frame | 397 | branch nick: frame |
475 | 398 | timestamp: Tue 2011-03-15 15:04:33 -0400 | 398 | timestamp: Tue 2011-03-15 15:04:33 -0400 |
476 | 399 | message: | 399 | message: |
477 | 400 | Added a dependency check on xorg-server-dev when building with xi2 support. | 400 | Added a dependency check on xorg-server-dev when building with xi2 support. |
478 | @@ -558,13 +558,13 @@ | |||
479 | 558 | message: | 558 | message: |
480 | 559 | Optional XI2.1 support | 559 | Optional XI2.1 support |
481 | 560 | 560 | ||
485 | 561 | This patchs adds optional XI2.1 support to utouch-frame. The | 561 | This patchs adds optional XI2.1 support to frame. The |
486 | 562 | utouch/frame-xi2.h header contains helper functions equivalent | 562 | oif/frame-xi2.h header contains helper functions equivalent |
487 | 563 | to utouch/frame-mtdev.h. In addition, the device-to-screen mapping | 563 | to oif/frame-mtdev.h In addition, the device-to-screen mapping |
488 | 564 | is handled via XEvents and optionally XIPropertyEvent. The latter | 564 | is handled via XEvents and optionally XIPropertyEvent. The latter |
489 | 565 | allows free device placement via xinput set-prop, useful in multi- | 565 | allows free device placement via xinput set-prop, useful in multi- |
490 | 566 | head setups, thanks to Chase Douglas. Touch frame events can be tested | 566 | head setups, thanks to Chase Douglas. Touch frame events can be tested |
492 | 567 | using the utouch-frame-test-xi2 tool. Use --with-xi to enable. | 567 | using the frame-test-xi2 tool. Use --with-xi to enable. |
493 | 568 | ------------------------------------------------------------ | 568 | ------------------------------------------------------------ |
494 | 569 | revno: 8 | 569 | revno: 8 |
495 | 570 | committer: Henrik Rydberg <rydberg@bitmath.org> | 570 | committer: Henrik Rydberg <rydberg@bitmath.org> |
496 | @@ -592,7 +592,7 @@ | |||
497 | 592 | onto an area on the screen, needed in particular for multihead setups. | 592 | onto an area on the screen, needed in particular for multihead setups. |
498 | 593 | Moreover, the XI2.1 backend works with screen coordinates, creating | 593 | Moreover, the XI2.1 backend works with screen coordinates, creating |
499 | 594 | an unnecessary discrepancy between backends. This patch adds the basic | 594 | an unnecessary discrepancy between backends. This patch adds the basic |
501 | 595 | transformation layer to the utouch surface, thus serving as the master | 595 | transformation layer to the oif surface, thus serving as the master |
502 | 596 | point of device-to-surface mapping. | 596 | point of device-to-surface mapping. |
503 | 597 | ------------------------------------------------------------ | 597 | ------------------------------------------------------------ |
504 | 598 | revno: 5 | 598 | revno: 5 |
505 | @@ -607,10 +607,10 @@ | |||
506 | 607 | branch nick: trunk | 607 | branch nick: trunk |
507 | 608 | timestamp: Tue 2011-02-08 19:28:09 +0100 | 608 | timestamp: Tue 2011-02-08 19:28:09 +0100 |
508 | 609 | message: | 609 | message: |
510 | 610 | Display device properties based on utouch surface instead | 610 | Display device properties based on oif surface instead |
511 | 611 | 611 | ||
512 | 612 | The current code erroneously extracts the device properties from | 612 | The current code erroneously extracts the device properties from |
514 | 613 | the evemu device, when there is a utouch surface structure to read | 613 | the evemu device, when there is a oif surface structure to read |
515 | 614 | from. Remedied. | 614 | from. Remedied. |
516 | 615 | ------------------------------------------------------------ | 615 | ------------------------------------------------------------ |
517 | 616 | revno: 3 | 616 | revno: 3 |
518 | @@ -622,7 +622,7 @@ | |||
519 | 622 | ------------------------------------------------------------ | 622 | ------------------------------------------------------------ |
520 | 623 | revno: 2 [merge] | 623 | revno: 2 [merge] |
521 | 624 | committer: Stephen M. Webb <stephen.webb@canonical.com> | 624 | committer: Stephen M. Webb <stephen.webb@canonical.com> |
523 | 625 | branch nick: utouch-frame | 625 | branch nick: frame |
524 | 626 | timestamp: Thu 2011-02-03 13:39:08 -0500 | 626 | timestamp: Thu 2011-02-03 13:39:08 -0500 |
525 | 627 | message: | 627 | message: |
526 | 628 | Changes required for uploading into Ubuntu. | 628 | Changes required for uploading into Ubuntu. |
527 | @@ -633,7 +633,7 @@ | |||
528 | 633 | branch nick: trunk | 633 | branch nick: trunk |
529 | 634 | timestamp: Thu 2010-12-30 20:23:24 +0100 | 634 | timestamp: Thu 2010-12-30 20:23:24 +0100 |
530 | 635 | message: | 635 | message: |
532 | 636 | Initial load of utouch-frame | 636 | Initial load of frame |
533 | 637 | 637 | ||
534 | 638 | Compiles and runs on mtdev. ABI proof. | 638 | Compiles and runs on mtdev. ABI proof. |
535 | 639 | ------------------------------------------------------------ | 639 | ------------------------------------------------------------ |
536 | 640 | 640 | ||
537 | === modified file 'INSTALL' | |||
538 | --- INSTALL 2010-12-30 19:23:24 +0000 | |||
539 | +++ INSTALL 2012-07-24 22:45:29 +0000 | |||
540 | @@ -1,6 +1,6 @@ | |||
542 | 1 | utouch-frame - Touch Frame Library | 1 | frame - Touch Frame Library |
543 | 2 | 2 | ||
545 | 3 | To build, you need to have the autoconf, libtool, libutouch-evemu-dev | 3 | To build, you need to have the autoconf, libtool, libevemu-dev |
546 | 4 | and mtdev-dev packages installed. Then, do | 4 | and mtdev-dev packages installed. Then, do |
547 | 5 | 5 | ||
548 | 6 | ./autogen.sh | 6 | ./autogen.sh |
549 | @@ -9,16 +9,16 @@ | |||
550 | 9 | 9 | ||
551 | 10 | To test the touch properties of an MT device at /dev/input/eventX, do | 10 | To test the touch properties of an MT device at /dev/input/eventX, do |
552 | 11 | 11 | ||
554 | 12 | sudo ./test/utouch-frame-test /dev/input/eventX | 12 | sudo ./test/frame-test /dev/input/eventX |
555 | 13 | 13 | ||
556 | 14 | You should be able to see touch events in the terminal. After five | 14 | You should be able to see touch events in the terminal. After five |
557 | 15 | seconds of inactivity, the program exits. | 15 | seconds of inactivity, the program exits. |
558 | 16 | 16 | ||
560 | 17 | To install utouch-frame, do | 17 | To install frame, do |
561 | 18 | 18 | ||
562 | 19 | sudo make install | 19 | sudo make install |
563 | 20 | 20 | ||
565 | 21 | By default, utouch-frame installs to /usr/local. To change, use the --prefix | 21 | By default, frame installs to /usr/local. To change, use the --prefix |
566 | 22 | configure option. | 22 | configure option. |
567 | 23 | 23 | ||
568 | 24 | Enjoy, | 24 | Enjoy, |
569 | 25 | 25 | ||
570 | === modified file 'Makefile.am' | |||
571 | --- Makefile.am 2012-07-17 13:55:33 +0000 | |||
572 | +++ Makefile.am 2012-07-24 22:45:29 +0000 | |||
573 | @@ -7,7 +7,7 @@ | |||
574 | 7 | 7 | ||
575 | 8 | 8 | ||
576 | 9 | pkgconfigdir = $(libdir)/pkgconfig | 9 | pkgconfigdir = $(libdir)/pkgconfig |
578 | 10 | pkgconfig_DATA = utouch-frame.pc | 10 | pkgconfig_DATA = frame.pc |
579 | 11 | 11 | ||
580 | 12 | if HAVE_GCOV | 12 | if HAVE_GCOV |
581 | 13 | .PHONY: clean-gcda | 13 | .PHONY: clean-gcda |
582 | 14 | 14 | ||
583 | === modified file 'README' | |||
584 | --- README 2010-12-30 19:23:24 +0000 | |||
585 | +++ README 2012-07-24 22:45:29 +0000 | |||
586 | @@ -1,4 +1,4 @@ | |||
588 | 1 | utouch-frame - Touch Frame Library | 1 | frame - Touch Frame Library |
589 | 2 | 2 | ||
590 | 3 | This tree handles the buildup and synchronization of a set of | 3 | This tree handles the buildup and synchronization of a set of |
591 | 4 | simultaneous touches. The library is input agnostic. | 4 | simultaneous touches. The library is input agnostic. |
592 | 5 | 5 | ||
593 | === modified file 'configure.ac' | |||
594 | --- configure.ac 2012-07-17 13:57:32 +0000 | |||
595 | +++ configure.ac 2012-07-24 22:45:29 +0000 | |||
596 | @@ -3,7 +3,7 @@ | |||
597 | 3 | AC_INIT([Touch Frame Library], | 3 | AC_INIT([Touch Frame Library], |
598 | 4 | [2.2.3], | 4 | [2.2.3], |
599 | 5 | [], | 5 | [], |
601 | 6 | [utouch-frame]) | 6 | [frame]) |
602 | 7 | AC_CONFIG_SRCDIR([Makefile.am]) | 7 | AC_CONFIG_SRCDIR([Makefile.am]) |
603 | 8 | AC_CONFIG_HEADERS([config.h]) | 8 | AC_CONFIG_HEADERS([config.h]) |
604 | 9 | AC_CONFIG_AUX_DIR([config-aux]) | 9 | AC_CONFIG_AUX_DIR([config-aux]) |
605 | @@ -25,7 +25,7 @@ | |||
606 | 25 | AC_PROG_CXX | 25 | AC_PROG_CXX |
607 | 26 | AC_PROG_INSTALL | 26 | AC_PROG_INSTALL |
608 | 27 | 27 | ||
610 | 28 | PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5], [have_evemu=yes]) | 28 | PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.5], [have_evemu=yes]) |
611 | 29 | AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = xyes]) | 29 | AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = xyes]) |
612 | 30 | 30 | ||
613 | 31 | PKG_CHECK_MODULES(XINPUT, x11 xext xorg-server [xi >= 1.5.99.1] [inputproto >= 2.1.99.6]) | 31 | PKG_CHECK_MODULES(XINPUT, x11 xext xorg-server [xi >= 1.5.99.1] [inputproto >= 2.1.99.6]) |
614 | @@ -75,7 +75,7 @@ | |||
615 | 75 | test/regular/Makefile | 75 | test/regular/Makefile |
616 | 76 | test/x11_mocks/Makefile | 76 | test/x11_mocks/Makefile |
617 | 77 | tools/Makefile | 77 | tools/Makefile |
619 | 78 | utouch-frame.pc]) | 78 | frame.pc]) |
620 | 79 | 79 | ||
621 | 80 | AC_LANG_PUSH(C++) | 80 | AC_LANG_PUSH(C++) |
622 | 81 | AC_CHECK_DECL(__clang__, CXX_LIBS="-lstdc++") | 81 | AC_CHECK_DECL(__clang__, CXX_LIBS="-lstdc++") |
623 | 82 | 82 | ||
624 | === modified file 'doc/Doxyfile' | |||
625 | --- doc/Doxyfile 2011-08-27 01:29:53 +0000 | |||
626 | +++ doc/Doxyfile 2012-07-24 22:45:29 +0000 | |||
627 | @@ -25,7 +25,7 @@ | |||
628 | 25 | # The PROJECT_NAME tag is a single word (or a sequence of words surrounded | 25 | # The PROJECT_NAME tag is a single word (or a sequence of words surrounded |
629 | 26 | # by quotes) that should identify the project. | 26 | # by quotes) that should identify the project. |
630 | 27 | 27 | ||
632 | 28 | PROJECT_NAME = uTouch-Frame | 28 | PROJECT_NAME = Frame |
633 | 29 | 29 | ||
634 | 30 | # The PROJECT_NUMBER tag can be used to enter a project or revision number. | 30 | # The PROJECT_NUMBER tag can be used to enter a project or revision number. |
635 | 31 | # This could be handy for archiving the generated documentation or | 31 | # This could be handy for archiving the generated documentation or |
636 | @@ -619,7 +619,7 @@ | |||
637 | 619 | # directories like "/usr/src/myproject". Separate the files or directories | 619 | # directories like "/usr/src/myproject". Separate the files or directories |
638 | 620 | # with spaces. | 620 | # with spaces. |
639 | 621 | 621 | ||
641 | 622 | INPUT = ../include/utouch | 622 | INPUT = ../include/oif |
642 | 623 | 623 | ||
643 | 624 | # This tag can be used to specify the character encoding of the source files | 624 | # This tag can be used to specify the character encoding of the source files |
644 | 625 | # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is | 625 | # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is |
645 | 626 | 626 | ||
646 | === renamed file 'utouch-frame.pc.in' => 'frame.pc.in' | |||
647 | --- utouch-frame.pc.in 2011-04-27 09:14:30 +0000 | |||
648 | +++ frame.pc.in 2012-07-24 22:45:29 +0000 | |||
649 | @@ -3,8 +3,8 @@ | |||
650 | 3 | libdir=@libdir@ | 3 | libdir=@libdir@ |
651 | 4 | includedir=@includedir@ | 4 | includedir=@includedir@ |
652 | 5 | 5 | ||
654 | 6 | Name: utouch-frame | 6 | Name: frame |
655 | 7 | Description: Touch Frame Library | 7 | Description: Touch Frame Library |
656 | 8 | Version: @PACKAGE_VERSION@ | 8 | Version: @PACKAGE_VERSION@ |
657 | 9 | Cflags: -I${includedir} | 9 | Cflags: -I${includedir} |
659 | 10 | Libs: -L${libdir} -lutouch-frame | 10 | Libs: -L${libdir} -lframe |
660 | 11 | 11 | ||
661 | === renamed directory 'include/utouch' => 'include/oif' | |||
662 | === modified file 'include/oif/frame.h' | |||
663 | --- include/utouch/frame.h 2012-06-18 18:28:21 +0000 | |||
664 | +++ include/oif/frame.h 2012-07-24 22:45:29 +0000 | |||
665 | @@ -1,6 +1,6 @@ | |||
666 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
667 | 2 | * | 2 | * |
669 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
670 | 4 | * | 4 | * |
671 | 5 | * Copyright (C) 2010-2012 Canonical Ltd. | 5 | * Copyright (C) 2010-2012 Canonical Ltd. |
672 | 6 | * | 6 | * |
673 | @@ -19,12 +19,12 @@ | |||
674 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
675 | 20 | 20 | ||
676 | 21 | /** | 21 | /** |
678 | 22 | * @file utouch/frame.h | 22 | * @file oif/frame.h |
679 | 23 | * Definitions of the main and platform-generic API | 23 | * Definitions of the main and platform-generic API |
680 | 24 | */ | 24 | */ |
681 | 25 | 25 | ||
684 | 26 | #ifndef UTOUCH_FRAME_UTOUCH_FRAME_H_ | 26 | #ifndef FRAME_OIF_FRAME_H_ |
685 | 27 | #define UTOUCH_FRAME_UTOUCH_FRAME_H_ | 27 | #define FRAME_OIF_FRAME_H_ |
686 | 28 | 28 | ||
687 | 29 | /* Macros that set symbol visibilities in shared libraries properly. | 29 | /* Macros that set symbol visibilities in shared libraries properly. |
688 | 30 | * Adapted from http://gcc.gnu.org/wiki/Visibility | 30 | * Adapted from http://gcc.gnu.org/wiki/Visibility |
689 | @@ -58,7 +58,7 @@ | |||
690 | 58 | 58 | ||
691 | 59 | #include <stdint.h> | 59 | #include <stdint.h> |
692 | 60 | 60 | ||
694 | 61 | /** An object for the context of the uTouch Frame instance */ | 61 | /** An object for the context of the frame instance */ |
695 | 62 | typedef struct UFHandle_* UFHandle; | 62 | typedef struct UFHandle_* UFHandle; |
696 | 63 | /** An object for an event */ | 63 | /** An object for an event */ |
697 | 64 | typedef struct UFEvent_* UFEvent; | 64 | typedef struct UFEvent_* UFEvent; |
698 | @@ -98,8 +98,8 @@ | |||
699 | 98 | * | 98 | * |
700 | 99 | * Value type: const char * | 99 | * Value type: const char * |
701 | 100 | * | 100 | * |
704 | 101 | * The uTouch frame library owns the string. The string is valid until an | 101 | * The frame library owns the string. The string is valid until an event |
705 | 102 | * event notifying removal of the device is released. | 102 | * notifying removal of the device is released. |
706 | 103 | */ | 103 | */ |
707 | 104 | UFDevicePropertyName = 0, | 104 | UFDevicePropertyName = 0, |
708 | 105 | /** | 105 | /** |
709 | @@ -216,8 +216,8 @@ | |||
710 | 216 | * | 216 | * |
711 | 217 | * This property holds the time the event occurred in display server | 217 | * This property holds the time the event occurred in display server |
712 | 218 | * timespace. The time is provided in milliseconds (ms). If the event, such as | 218 | * timespace. The time is provided in milliseconds (ms). If the event, such as |
715 | 219 | * device addition, occurred before the uTouch Frame context was created, the | 219 | * device addition, occurred before the frame context was created, the value |
716 | 220 | * value will be 0. | 220 | * will be 0. |
717 | 221 | */ | 221 | */ |
718 | 222 | UFEventPropertyTime, | 222 | UFEventPropertyTime, |
719 | 223 | } UFEventProperty; | 223 | } UFEventProperty; |
720 | @@ -343,9 +343,9 @@ | |||
721 | 343 | } UFTouchProperty; | 343 | } UFTouchProperty; |
722 | 344 | 344 | ||
723 | 345 | /** | 345 | /** |
725 | 346 | * Get the event file descriptor for the uTouch Frame context | 346 | * Get the event file descriptor for the frame context |
726 | 347 | * | 347 | * |
728 | 348 | * @param [in] handle The uTouch Frame context object | 348 | * @param [in] handle The frame context object |
729 | 349 | * @return A file descriptor for the context | 349 | * @return A file descriptor for the context |
730 | 350 | * | 350 | * |
731 | 351 | * When events are available for processing, the file descriptor will be | 351 | * When events are available for processing, the file descriptor will be |
732 | @@ -356,7 +356,7 @@ | |||
733 | 356 | int frame_get_fd(UFHandle handle); | 356 | int frame_get_fd(UFHandle handle); |
734 | 357 | 357 | ||
735 | 358 | /** | 358 | /** |
737 | 359 | * Get an event from the uTouch Frame context | 359 | * Get an event from the frame context |
738 | 360 | * | 360 | * |
739 | 361 | * @param [in] handle The context object | 361 | * @param [in] handle The context object |
740 | 362 | * @param [out] event The retrieved event | 362 | * @param [out] event The retrieved event |
741 | @@ -738,7 +738,7 @@ | |||
742 | 738 | 738 | ||
743 | 739 | /** @} */ | 739 | /** @} */ |
744 | 740 | 740 | ||
746 | 741 | #include <utouch/frame_internal.h> | 741 | #include "frame_internal.h" |
747 | 742 | 742 | ||
748 | 743 | #ifdef __cplusplus | 743 | #ifdef __cplusplus |
749 | 744 | } | 744 | } |
750 | @@ -746,4 +746,4 @@ | |||
751 | 746 | 746 | ||
752 | 747 | #undef HAS_C_GENERIC_SELECTIONS | 747 | #undef HAS_C_GENERIC_SELECTIONS |
753 | 748 | 748 | ||
755 | 749 | #endif // UTOUCH_FRAME_UTOUCH_FRAME_H_ | 749 | #endif // FRAME_OIF_FRAME_H_ |
756 | 750 | 750 | ||
757 | === modified file 'include/oif/frame_internal.h' | |||
758 | --- include/utouch/frame_internal.h 2012-03-25 22:07:41 +0000 | |||
759 | +++ include/oif/frame_internal.h 2012-07-24 22:45:29 +0000 | |||
760 | @@ -1,6 +1,6 @@ | |||
761 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
762 | 2 | * | 2 | * |
764 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
765 | 4 | * | 4 | * |
766 | 5 | * Copyright (C) 2010-2012 Canonical Ltd. | 5 | * Copyright (C) 2010-2012 Canonical Ltd. |
767 | 6 | * | 6 | * |
768 | @@ -18,8 +18,8 @@ | |||
769 | 18 | * | 18 | * |
770 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
771 | 20 | 20 | ||
774 | 21 | #ifndef UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_ | 21 | #ifndef FRAME_OIF_FRAME_INTERNAL_H_ |
775 | 22 | #define UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_ | 22 | #define FRAME_OIF_FRAME_INTERNAL_H_ |
776 | 23 | 23 | ||
777 | 24 | #ifdef HAS_C_GENERIC_SELECTIONS | 24 | #ifdef HAS_C_GENERIC_SELECTIONS |
778 | 25 | 25 | ||
779 | @@ -117,4 +117,4 @@ | |||
780 | 117 | 117 | ||
781 | 118 | #endif // HAS_C_GENERIC_SELECTIONS | 118 | #endif // HAS_C_GENERIC_SELECTIONS |
782 | 119 | 119 | ||
784 | 120 | #endif // UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_ | 120 | #endif // FRAME_OIF_FRAME_INTERNAL_H_ |
785 | 121 | 121 | ||
786 | === modified file 'include/oif/frame_x11.h' | |||
787 | --- include/utouch/frame_x11.h 2012-06-18 18:28:21 +0000 | |||
788 | +++ include/oif/frame_x11.h 2012-07-24 22:45:29 +0000 | |||
789 | @@ -1,6 +1,6 @@ | |||
790 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
791 | 2 | * | 2 | * |
793 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
794 | 4 | * | 4 | * |
795 | 5 | * Copyright (C) 2010-2012 Canonical Ltd. | 5 | * Copyright (C) 2010-2012 Canonical Ltd. |
796 | 6 | * | 6 | * |
797 | @@ -18,10 +18,10 @@ | |||
798 | 18 | * | 18 | * |
799 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
800 | 20 | 20 | ||
803 | 21 | #ifndef UTOUCH_FRAME_XI2_H | 21 | #ifndef FRAME_OIF_FRAME_X11_H_ |
804 | 22 | #define UTOUCH_FRAME_XI2_H | 22 | #define FRAME_OIF_FRAME_X11_H_ |
805 | 23 | 23 | ||
807 | 24 | #include <utouch/frame.h> | 24 | #include "frame.h" |
808 | 25 | #include <X11/Xlib.h> | 25 | #include <X11/Xlib.h> |
809 | 26 | 26 | ||
810 | 27 | #ifdef __cplusplus | 27 | #ifdef __cplusplus |
811 | @@ -34,31 +34,31 @@ | |||
812 | 34 | */ | 34 | */ |
813 | 35 | 35 | ||
814 | 36 | /** | 36 | /** |
816 | 37 | * Create a new uTouch Frame context for an X11 window server | 37 | * Create a new frame context for an X11 window server |
817 | 38 | * | 38 | * |
818 | 39 | * @param [in] display The X11 server connection | 39 | * @param [in] display The X11 server connection |
820 | 40 | * @param [out] handle The object for the new uTouch Frame instance | 40 | * @param [out] handle The object for the new frame instance |
821 | 41 | * @return UFStatusSuccess, UFStatusErrorResources, or UFStatusErrorGeneric | 41 | * @return UFStatusSuccess, UFStatusErrorResources, or UFStatusErrorGeneric |
822 | 42 | */ | 42 | */ |
823 | 43 | FRAME_PUBLIC | 43 | FRAME_PUBLIC |
824 | 44 | UFStatus frame_x11_new(Display *display, UFHandle *handle); | 44 | UFStatus frame_x11_new(Display *display, UFHandle *handle); |
825 | 45 | 45 | ||
826 | 46 | /** | 46 | /** |
828 | 47 | * Delete an X11 uTouch Frame instance | 47 | * Delete an X11 frame instance |
829 | 48 | * | 48 | * |
831 | 49 | * @param [in] handle The object for the uTouch Frame instance | 49 | * @param [in] handle The object for the frame instance |
832 | 50 | */ | 50 | */ |
833 | 51 | FRAME_PUBLIC | 51 | FRAME_PUBLIC |
834 | 52 | void frame_x11_delete(UFHandle handle); | 52 | void frame_x11_delete(UFHandle handle); |
835 | 53 | 53 | ||
836 | 54 | /** | 54 | /** |
838 | 55 | * Process an X11 input event into the uTouch Frame instance | 55 | * Process an X11 input event into the frame instance |
839 | 56 | * | 56 | * |
841 | 57 | * @param [in] handle The uTouch Frame context | 57 | * @param [in] handle The frame context |
842 | 58 | * @param [in] event The X11 generic input event cookie | 58 | * @param [in] event The X11 generic input event cookie |
843 | 59 | * @return UFStatusSuccess or UFStatusErrorGeneric | 59 | * @return UFStatusSuccess or UFStatusErrorGeneric |
844 | 60 | * | 60 | * |
846 | 61 | * The uTouch-Frame library can process XIDeviceEvent and | 61 | * The frame library can process XIDeviceEvent and |
847 | 62 | * XIHierarchyEvent events. Processing these events requires additional event | 62 | * XIHierarchyEvent events. Processing these events requires additional event |
848 | 63 | * data. This data is obtained by calling XGetEventData on the XEvent. See the | 63 | * data. This data is obtained by calling XGetEventData on the XEvent. See the |
849 | 64 | * XGetEventData and XFreeEventData man pages for more details. | 64 | * XGetEventData and XFreeEventData man pages for more details. |
850 | @@ -93,37 +93,37 @@ | |||
851 | 93 | UFTouchId touch_id); | 93 | UFTouchId touch_id); |
852 | 94 | 94 | ||
853 | 95 | /** | 95 | /** |
855 | 96 | * Get the X11 Window ID of a uTouch Frame window | 96 | * Get the X11 Window ID of a frame window |
856 | 97 | * | 97 | * |
858 | 98 | * @param [in] window_id The uTouch Frame window ID object (const) | 98 | * @param [in] window_id The frame window ID object (const) |
859 | 99 | * @return The X11 window ID | 99 | * @return The X11 window ID |
860 | 100 | */ | 100 | */ |
861 | 101 | FRAME_PUBLIC | 101 | FRAME_PUBLIC |
862 | 102 | Window frame_x11_get_window_id(UFWindowId window_id); | 102 | Window frame_x11_get_window_id(UFWindowId window_id); |
863 | 103 | 103 | ||
864 | 104 | /** | 104 | /** |
866 | 105 | * Create a new uTouch Frame window ID object for an X11 window ID | 105 | * Create a new frame window ID object for an X11 window ID |
867 | 106 | * | 106 | * |
868 | 107 | * @param [in] id The X11 ID of the window | 107 | * @param [in] id The X11 ID of the window |
870 | 108 | * @return The new uTouch Frame window ID object | 108 | * @return The new frame window ID object |
871 | 109 | */ | 109 | */ |
872 | 110 | FRAME_PUBLIC | 110 | FRAME_PUBLIC |
873 | 111 | UFWindowId frame_x11_create_window_id(Window id); | 111 | UFWindowId frame_x11_create_window_id(Window id); |
874 | 112 | 112 | ||
875 | 113 | /** | 113 | /** |
877 | 114 | * Get the X11 touch ID of a uTouch Frame touch | 114 | * Get the X11 touch ID of a frame touch |
878 | 115 | * | 115 | * |
880 | 116 | * @param [in] touch_id The uTouch Frame touch ID object (const) | 116 | * @param [in] touch_id The frame touch ID object (const) |
881 | 117 | * @return The X11 touch ID | 117 | * @return The X11 touch ID |
882 | 118 | */ | 118 | */ |
883 | 119 | FRAME_PUBLIC | 119 | FRAME_PUBLIC |
884 | 120 | unsigned int frame_x11_get_touch_id(UFTouchId touch_id); | 120 | unsigned int frame_x11_get_touch_id(UFTouchId touch_id); |
885 | 121 | 121 | ||
886 | 122 | /** | 122 | /** |
888 | 123 | * Create a new uTouch Frame touch ID object for an X11 touch ID | 123 | * Create a new frame touch ID object for an X11 touch ID |
889 | 124 | * | 124 | * |
890 | 125 | * @param [in] id The X11 ID of the touch | 125 | * @param [in] id The X11 ID of the touch |
892 | 126 | * @return The new uTouch Frame touch ID object | 126 | * @return The new frame touch ID object |
893 | 127 | */ | 127 | */ |
894 | 128 | FRAME_PUBLIC | 128 | FRAME_PUBLIC |
895 | 129 | UFTouchId frame_x11_create_touch_id(unsigned int id); | 129 | UFTouchId frame_x11_create_touch_id(unsigned int id); |
896 | @@ -136,4 +136,4 @@ | |||
897 | 136 | } | 136 | } |
898 | 137 | #endif | 137 | #endif |
899 | 138 | 138 | ||
901 | 139 | #endif | 139 | #endif // FRAME_OIF_FRAME_X11_H_ |
902 | 140 | 140 | ||
903 | === modified file 'm4/xorg-gtest.m4' | |||
904 | --- m4/xorg-gtest.m4 2012-06-18 18:28:21 +0000 | |||
905 | +++ m4/xorg-gtest.m4 2012-07-24 22:45:29 +0000 | |||
906 | @@ -74,7 +74,7 @@ | |||
907 | 74 | 74 | ||
908 | 75 | PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) | 75 | PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) |
909 | 76 | 76 | ||
911 | 77 | # Check if we should include support for utouch-evemu | 77 | # Check if we should include support for evemu |
912 | 78 | AC_ARG_WITH([evemu], | 78 | AC_ARG_WITH([evemu], |
913 | 79 | [AS_HELP_STRING([--with-evemu], | 79 | [AS_HELP_STRING([--with-evemu], |
914 | 80 | [support Linux input device recording playback | 80 | [support Linux input device recording playback |
915 | @@ -83,10 +83,10 @@ | |||
916 | 83 | [with_evemu=check]) | 83 | [with_evemu=check]) |
917 | 84 | 84 | ||
918 | 85 | AS_IF([test "x$with_evemu" = xyes], | 85 | AS_IF([test "x$with_evemu" = xyes], |
920 | 86 | [PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])], | 86 | [PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])], |
921 | 87 | [test "x$with_evemu" = xcheck], | 87 | [test "x$with_evemu" = xcheck], |
922 | 88 | [PKG_CHECK_MODULES(EVEMU, | 88 | [PKG_CHECK_MODULES(EVEMU, |
924 | 89 | [utouch-evemu], | 89 | [evemu], |
925 | 90 | [have_xorg_gtest_evemu=yes], | 90 | [have_xorg_gtest_evemu=yes], |
926 | 91 | [have_xorg_gtest_evemu=no])]) | 91 | [have_xorg_gtest_evemu=no])]) |
927 | 92 | AS_IF([test "x$have_xorg_gtest_evemu" = xyes], | 92 | AS_IF([test "x$have_xorg_gtest_evemu" = xyes], |
928 | 93 | 93 | ||
929 | === modified file 'src/Makefile.am' | |||
930 | --- src/Makefile.am 2012-06-18 18:28:21 +0000 | |||
931 | +++ src/Makefile.am 2012-07-24 22:45:29 +0000 | |||
932 | @@ -1,13 +1,13 @@ | |||
938 | 1 | version_script = $(srcdir)/libutouch-frame.ver | 1 | version_script = $(srcdir)/libframe.ver |
939 | 2 | 2 | ||
940 | 3 | lib_LTLIBRARIES = libutouch-frame.la | 3 | lib_LTLIBRARIES = libframe.la |
941 | 4 | 4 | ||
942 | 5 | libutouch_frame_la_LDFLAGS = \ | 5 | libframe_la_LDFLAGS = \ |
943 | 6 | -version-info @LIB_VERSION@ \ | 6 | -version-info @LIB_VERSION@ \ |
944 | 7 | -Wl,-z,defs -Wl,--as-needed \ | 7 | -Wl,-z,defs -Wl,--as-needed \ |
945 | 8 | -Wl,--version-script=$(version_script) | 8 | -Wl,--version-script=$(version_script) |
946 | 9 | 9 | ||
948 | 10 | libutouch_frame_la_LIBADD = \ | 10 | libframe_la_LIBADD = \ |
949 | 11 | -lm \ | 11 | -lm \ |
950 | 12 | $(EVEMU_LIBS) \ | 12 | $(EVEMU_LIBS) \ |
951 | 13 | $(MTDEV_LIBS) \ | 13 | $(MTDEV_LIBS) \ |
952 | @@ -29,13 +29,13 @@ | |||
953 | 29 | $(COVERAGE_CXXFLAGS) \ | 29 | $(COVERAGE_CXXFLAGS) \ |
954 | 30 | $(XINPUT_CFLAGS) | 30 | $(XINPUT_CFLAGS) |
955 | 31 | 31 | ||
961 | 32 | libutouch_frameincludedir = $(includedir)/utouch | 32 | libframeincludedir = $(includedir)/oif |
962 | 33 | libutouch_frameinclude_HEADERS = \ | 33 | libframeinclude_HEADERS = \ |
963 | 34 | $(top_srcdir)/include/utouch/frame.h \ | 34 | $(top_srcdir)/include/oif/frame.h \ |
964 | 35 | $(top_srcdir)/include/utouch/frame_internal.h \ | 35 | $(top_srcdir)/include/oif/frame_internal.h \ |
965 | 36 | $(top_srcdir)/include/utouch/frame_x11.h | 36 | $(top_srcdir)/include/oif/frame_x11.h |
966 | 37 | 37 | ||
968 | 38 | libutouch_frame_la_SOURCES = \ | 38 | libframe_la_SOURCES = \ |
969 | 39 | axis.h \ | 39 | axis.h \ |
970 | 40 | axis.cpp \ | 40 | axis.cpp \ |
971 | 41 | device.h \ | 41 | device.h \ |
972 | 42 | 42 | ||
973 | === modified file 'src/axis.cpp' | |||
974 | --- src/axis.cpp 2012-06-18 18:28:21 +0000 | |||
975 | +++ src/axis.cpp 2012-07-24 22:45:29 +0000 | |||
976 | @@ -1,6 +1,6 @@ | |||
977 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
978 | 2 | * | 2 | * |
980 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
981 | 4 | * | 4 | * |
982 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
983 | 6 | * | 6 | * |
984 | @@ -22,7 +22,7 @@ | |||
985 | 22 | 22 | ||
986 | 23 | #include "value.h" | 23 | #include "value.h" |
987 | 24 | 24 | ||
989 | 25 | namespace utouch { | 25 | namespace oif { |
990 | 26 | namespace frame { | 26 | namespace frame { |
991 | 27 | 27 | ||
992 | 28 | UFAxis::UFAxis(UFAxisType type, float min, float max, float resolution) | 28 | UFAxis::UFAxis(UFAxisType type, float min, float max, float resolution) |
993 | @@ -30,24 +30,24 @@ | |||
994 | 30 | } | 30 | } |
995 | 31 | 31 | ||
996 | 32 | } // namespace frame | 32 | } // namespace frame |
998 | 33 | } // namespace utouch | 33 | } // namespace oif |
999 | 34 | 34 | ||
1000 | 35 | extern "C" { | 35 | extern "C" { |
1001 | 36 | 36 | ||
1002 | 37 | UFAxisType frame_axis_get_type(UFAxis axis) { | 37 | UFAxisType frame_axis_get_type(UFAxis axis) { |
1004 | 38 | return static_cast<const utouch::frame::UFAxis*>(axis)->type(); | 38 | return static_cast<const oif::frame::UFAxis*>(axis)->type(); |
1005 | 39 | } | 39 | } |
1006 | 40 | 40 | ||
1007 | 41 | float frame_axis_get_minimum(UFAxis axis) { | 41 | float frame_axis_get_minimum(UFAxis axis) { |
1009 | 42 | return static_cast<const utouch::frame::UFAxis*>(axis)->min(); | 42 | return static_cast<const oif::frame::UFAxis*>(axis)->min(); |
1010 | 43 | } | 43 | } |
1011 | 44 | 44 | ||
1012 | 45 | float frame_axis_get_maximum(UFAxis axis) { | 45 | float frame_axis_get_maximum(UFAxis axis) { |
1014 | 46 | return static_cast<const utouch::frame::UFAxis*>(axis)->max(); | 46 | return static_cast<const oif::frame::UFAxis*>(axis)->max(); |
1015 | 47 | } | 47 | } |
1016 | 48 | 48 | ||
1017 | 49 | float frame_axis_get_resolution(UFAxis axis) { | 49 | float frame_axis_get_resolution(UFAxis axis) { |
1019 | 50 | return static_cast<const utouch::frame::UFAxis*>(axis)->resolution(); | 50 | return static_cast<const oif::frame::UFAxis*>(axis)->resolution(); |
1020 | 51 | } | 51 | } |
1021 | 52 | 52 | ||
1022 | 53 | } // extern "C" | 53 | } // extern "C" |
1023 | 54 | 54 | ||
1024 | === modified file 'src/axis.h' | |||
1025 | --- src/axis.h 2012-06-18 18:28:21 +0000 | |||
1026 | +++ src/axis.h 2012-07-24 22:45:29 +0000 | |||
1027 | @@ -1,6 +1,6 @@ | |||
1028 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1029 | 2 | * | 2 | * |
1031 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1032 | 4 | * | 4 | * |
1033 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1034 | 6 | * | 6 | * |
1035 | @@ -18,17 +18,17 @@ | |||
1036 | 18 | * | 18 | * |
1037 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1038 | 20 | 20 | ||
1041 | 21 | #ifndef UTOUCH_FRAME_AXIS_H_ | 21 | #ifndef FRAME_AXIS_H_ |
1042 | 22 | #define UTOUCH_FRAME_AXIS_H_ | 22 | #define FRAME_AXIS_H_ |
1043 | 23 | 23 | ||
1045 | 24 | #include "utouch/frame.h" | 24 | #include "oif/frame.h" |
1046 | 25 | #include "property.h" | 25 | #include "property.h" |
1047 | 26 | 26 | ||
1048 | 27 | struct UFAxis_ { | 27 | struct UFAxis_ { |
1049 | 28 | virtual ~UFAxis_() {} | 28 | virtual ~UFAxis_() {} |
1050 | 29 | }; | 29 | }; |
1051 | 30 | 30 | ||
1053 | 31 | namespace utouch { | 31 | namespace oif { |
1054 | 32 | namespace frame { | 32 | namespace frame { |
1055 | 33 | 33 | ||
1056 | 34 | class UFAxis : public UFAxis_ { | 34 | class UFAxis : public UFAxis_ { |
1057 | @@ -51,6 +51,6 @@ | |||
1058 | 51 | }; | 51 | }; |
1059 | 52 | 52 | ||
1060 | 53 | } // namespace frame | 53 | } // namespace frame |
1062 | 54 | } // namespace utouch | 54 | } // namespace oif |
1063 | 55 | 55 | ||
1065 | 56 | #endif // UTOUCH_FRAME_AXIS_H_ | 56 | #endif // FRAME_AXIS_H_ |
1066 | 57 | 57 | ||
1067 | === modified file 'src/device.cpp' | |||
1068 | --- src/device.cpp 2012-06-18 18:28:21 +0000 | |||
1069 | +++ src/device.cpp 2012-07-24 22:45:29 +0000 | |||
1070 | @@ -1,6 +1,6 @@ | |||
1071 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1072 | 2 | * | 2 | * |
1074 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1075 | 4 | * | 4 | * |
1076 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1077 | 6 | * | 6 | * |
1078 | @@ -24,7 +24,7 @@ | |||
1079 | 24 | 24 | ||
1080 | 25 | #include "axis.h" | 25 | #include "axis.h" |
1081 | 26 | 26 | ||
1083 | 27 | namespace utouch { | 27 | namespace oif { |
1084 | 28 | namespace frame { | 28 | namespace frame { |
1085 | 29 | 29 | ||
1086 | 30 | UFStatus UFDevice::GetAxisByIndex(unsigned int index, ::UFAxis* axis) const { | 30 | UFStatus UFDevice::GetAxisByIndex(unsigned int index, ::UFAxis* axis) const { |
1087 | @@ -50,7 +50,7 @@ | |||
1088 | 50 | } | 50 | } |
1089 | 51 | 51 | ||
1090 | 52 | } // namespace frame | 52 | } // namespace frame |
1092 | 53 | } // namespace utouch | 53 | } // namespace oif |
1093 | 54 | 54 | ||
1094 | 55 | extern "C" { | 55 | extern "C" { |
1095 | 56 | 56 | ||
1096 | @@ -58,7 +58,7 @@ | |||
1097 | 58 | UFStatus frame_device_get_property_string_(UFDevice device, | 58 | UFStatus frame_device_get_property_string_(UFDevice device, |
1098 | 59 | UFDeviceProperty property, | 59 | UFDeviceProperty property, |
1099 | 60 | char **value) { | 60 | char **value) { |
1101 | 61 | return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty( | 61 | return static_cast<const oif::frame::UFDevice*>(device)->GetProperty( |
1102 | 62 | property, | 62 | property, |
1103 | 63 | value); | 63 | value); |
1104 | 64 | } | 64 | } |
1105 | @@ -66,7 +66,7 @@ | |||
1106 | 66 | FRAME_PUBLIC | 66 | FRAME_PUBLIC |
1107 | 67 | UFStatus frame_device_get_property_int_(UFDevice device, | 67 | UFStatus frame_device_get_property_int_(UFDevice device, |
1108 | 68 | UFDeviceProperty property, int *value) { | 68 | UFDeviceProperty property, int *value) { |
1110 | 69 | return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty( | 69 | return static_cast<const oif::frame::UFDevice*>(device)->GetProperty( |
1111 | 70 | property, | 70 | property, |
1112 | 71 | value); | 71 | value); |
1113 | 72 | } | 72 | } |
1114 | @@ -75,7 +75,7 @@ | |||
1115 | 75 | UFStatus frame_device_get_property_unsigned_int_(UFDevice device, | 75 | UFStatus frame_device_get_property_unsigned_int_(UFDevice device, |
1116 | 76 | UFDeviceProperty property, | 76 | UFDeviceProperty property, |
1117 | 77 | unsigned int *value) { | 77 | unsigned int *value) { |
1119 | 78 | return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty( | 78 | return static_cast<const oif::frame::UFDevice*>(device)->GetProperty( |
1120 | 79 | property, | 79 | property, |
1121 | 80 | value); | 80 | value); |
1122 | 81 | } | 81 | } |
1123 | @@ -84,21 +84,21 @@ | |||
1124 | 84 | FRAME_PUBLIC | 84 | FRAME_PUBLIC |
1125 | 85 | UFStatus frame_device_get_property(UFDevice device, UFDeviceProperty property, | 85 | UFStatus frame_device_get_property(UFDevice device, UFDeviceProperty property, |
1126 | 86 | void *value) { | 86 | void *value) { |
1128 | 87 | return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty( | 87 | return static_cast<const oif::frame::UFDevice*>(device)->GetProperty( |
1129 | 88 | property, | 88 | property, |
1130 | 89 | value); | 89 | value); |
1131 | 90 | } | 90 | } |
1132 | 91 | 91 | ||
1133 | 92 | UFStatus frame_device_get_axis_by_index(UFDevice device, unsigned int index, | 92 | UFStatus frame_device_get_axis_by_index(UFDevice device, unsigned int index, |
1134 | 93 | UFAxis* axis) { | 93 | UFAxis* axis) { |
1136 | 94 | return static_cast<const utouch::frame::UFDevice*>(device)->GetAxisByIndex( | 94 | return static_cast<const oif::frame::UFDevice*>(device)->GetAxisByIndex( |
1137 | 95 | index, | 95 | index, |
1138 | 96 | axis); | 96 | axis); |
1139 | 97 | } | 97 | } |
1140 | 98 | 98 | ||
1141 | 99 | UFStatus frame_device_get_axis_by_type(UFDevice device, UFAxisType type, | 99 | UFStatus frame_device_get_axis_by_type(UFDevice device, UFAxisType type, |
1142 | 100 | UFAxis* axis) { | 100 | UFAxis* axis) { |
1144 | 101 | return static_cast<const utouch::frame::UFDevice*>(device)->GetAxisByType( | 101 | return static_cast<const oif::frame::UFDevice*>(device)->GetAxisByType( |
1145 | 102 | type, | 102 | type, |
1146 | 103 | axis); | 103 | axis); |
1147 | 104 | } | 104 | } |
1148 | 105 | 105 | ||
1149 | === modified file 'src/device.h' | |||
1150 | --- src/device.h 2012-06-18 18:28:21 +0000 | |||
1151 | +++ src/device.h 2012-07-24 22:45:29 +0000 | |||
1152 | @@ -1,6 +1,6 @@ | |||
1153 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1154 | 2 | * | 2 | * |
1156 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1157 | 4 | * | 4 | * |
1158 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1159 | 6 | * | 6 | * |
1160 | @@ -18,13 +18,13 @@ | |||
1161 | 18 | * | 18 | * |
1162 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1163 | 20 | 20 | ||
1166 | 21 | #ifndef UTOUCH_FRAME_DEVICE_H_ | 21 | #ifndef FRAME_DEVICE_H_ |
1167 | 22 | #define UTOUCH_FRAME_DEVICE_H_ | 22 | #define FRAME_DEVICE_H_ |
1168 | 23 | 23 | ||
1169 | 24 | #include <map> | 24 | #include <map> |
1170 | 25 | #include <memory> | 25 | #include <memory> |
1171 | 26 | 26 | ||
1173 | 27 | #include "utouch/frame.h" | 27 | #include "oif/frame.h" |
1174 | 28 | #include "axis.h" | 28 | #include "axis.h" |
1175 | 29 | #include "typedefs.h" | 29 | #include "typedefs.h" |
1176 | 30 | 30 | ||
1177 | @@ -32,7 +32,7 @@ | |||
1178 | 32 | virtual ~UFDevice_() {}; | 32 | virtual ~UFDevice_() {}; |
1179 | 33 | }; | 33 | }; |
1180 | 34 | 34 | ||
1182 | 35 | namespace utouch { | 35 | namespace oif { |
1183 | 36 | namespace frame { | 36 | namespace frame { |
1184 | 37 | 37 | ||
1185 | 38 | class UFDevice : public UFDevice_, public Property<UFDeviceProperty> { | 38 | class UFDevice : public UFDevice_, public Property<UFDeviceProperty> { |
1186 | @@ -52,6 +52,6 @@ | |||
1187 | 52 | }; | 52 | }; |
1188 | 53 | 53 | ||
1189 | 54 | } // namespace frame | 54 | } // namespace frame |
1191 | 55 | } // namespace utouch | 55 | } // namespace oif |
1192 | 56 | 56 | ||
1194 | 57 | #endif // UTOUCH_FRAME_DEVICE_H_ | 57 | #endif // FRAME_DEVICE_H_ |
1195 | 58 | 58 | ||
1196 | === modified file 'src/event.cpp' | |||
1197 | --- src/event.cpp 2012-06-18 18:28:21 +0000 | |||
1198 | +++ src/event.cpp 2012-07-24 22:45:29 +0000 | |||
1199 | @@ -1,6 +1,6 @@ | |||
1200 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1201 | 2 | * | 2 | * |
1203 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1204 | 4 | * | 4 | * |
1205 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1206 | 6 | * | 6 | * |
1207 | @@ -23,7 +23,7 @@ | |||
1208 | 23 | #include "event.h" | 23 | #include "event.h" |
1209 | 24 | #include "frame.h" | 24 | #include "frame.h" |
1210 | 25 | 25 | ||
1212 | 26 | namespace utouch { | 26 | namespace oif { |
1213 | 27 | namespace frame { | 27 | namespace frame { |
1214 | 28 | 28 | ||
1215 | 29 | UFEvent::UFEvent(UFEventType type, const Value* data, uint64_t time) | 29 | UFEvent::UFEvent(UFEventType type, const Value* data, uint64_t time) |
1216 | @@ -62,26 +62,26 @@ | |||
1217 | 62 | ::UFFrame frame; | 62 | ::UFFrame frame; |
1218 | 63 | 63 | ||
1219 | 64 | if (GetProperty(UFEventPropertyFrame, &frame) == UFStatusSuccess) | 64 | if (GetProperty(UFEventPropertyFrame, &frame) == UFStatusSuccess) |
1221 | 65 | static_cast<utouch::frame::UFFrame*>(frame)->ReleasePreviousFrame(); | 65 | static_cast<oif::frame::UFFrame*>(frame)->ReleasePreviousFrame(); |
1222 | 66 | } | 66 | } |
1223 | 67 | 67 | ||
1224 | 68 | } // namespace frame | 68 | } // namespace frame |
1226 | 69 | } // namespace utouch | 69 | } // namespace oif |
1227 | 70 | 70 | ||
1228 | 71 | extern "C" { | 71 | extern "C" { |
1229 | 72 | 72 | ||
1230 | 73 | void frame_event_ref(UFEvent event) { | 73 | void frame_event_ref(UFEvent event) { |
1232 | 74 | static_cast<utouch::frame::UFEvent*>(event)->Ref(); | 74 | static_cast<oif::frame::UFEvent*>(event)->Ref(); |
1233 | 75 | } | 75 | } |
1234 | 76 | 76 | ||
1235 | 77 | void frame_event_unref(UFEvent event) { | 77 | void frame_event_unref(UFEvent event) { |
1237 | 78 | static_cast<utouch::frame::UFEvent*>(event)->Unref(); | 78 | static_cast<oif::frame::UFEvent*>(event)->Unref(); |
1238 | 79 | } | 79 | } |
1239 | 80 | 80 | ||
1240 | 81 | FRAME_PUBLIC | 81 | FRAME_PUBLIC |
1241 | 82 | UFStatus frame_event_get_property_type_(UFEvent event, UFEventProperty property, | 82 | UFStatus frame_event_get_property_type_(UFEvent event, UFEventProperty property, |
1242 | 83 | UFEventType *value) { | 83 | UFEventType *value) { |
1244 | 84 | return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty( | 84 | return static_cast<const oif::frame::UFEvent*>(event)->GetProperty( |
1245 | 85 | property, | 85 | property, |
1246 | 86 | value); | 86 | value); |
1247 | 87 | } | 87 | } |
1248 | @@ -90,7 +90,7 @@ | |||
1249 | 90 | UFStatus frame_event_get_property_device_(UFEvent event, | 90 | UFStatus frame_event_get_property_device_(UFEvent event, |
1250 | 91 | UFEventProperty property, | 91 | UFEventProperty property, |
1251 | 92 | UFDevice *value) { | 92 | UFDevice *value) { |
1253 | 93 | return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty( | 93 | return static_cast<const oif::frame::UFEvent*>(event)->GetProperty( |
1254 | 94 | property, | 94 | property, |
1255 | 95 | value); | 95 | value); |
1256 | 96 | } | 96 | } |
1257 | @@ -99,7 +99,7 @@ | |||
1258 | 99 | UFStatus frame_event_get_property_frame_(UFEvent event, | 99 | UFStatus frame_event_get_property_frame_(UFEvent event, |
1259 | 100 | UFEventProperty property, | 100 | UFEventProperty property, |
1260 | 101 | UFFrame *value) { | 101 | UFFrame *value) { |
1262 | 102 | return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty( | 102 | return static_cast<const oif::frame::UFEvent*>(event)->GetProperty( |
1263 | 103 | property, | 103 | property, |
1264 | 104 | value); | 104 | value); |
1265 | 105 | } | 105 | } |
1266 | @@ -108,7 +108,7 @@ | |||
1267 | 108 | UFStatus frame_event_get_property_uint64_(UFEvent event, | 108 | UFStatus frame_event_get_property_uint64_(UFEvent event, |
1268 | 109 | UFEventProperty property, | 109 | UFEventProperty property, |
1269 | 110 | uint64_t *value) { | 110 | uint64_t *value) { |
1271 | 111 | return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty( | 111 | return static_cast<const oif::frame::UFEvent*>(event)->GetProperty( |
1272 | 112 | property, | 112 | property, |
1273 | 113 | value); | 113 | value); |
1274 | 114 | } | 114 | } |
1275 | @@ -117,15 +117,15 @@ | |||
1276 | 117 | FRAME_PUBLIC | 117 | FRAME_PUBLIC |
1277 | 118 | UFStatus frame_event_get_property(UFEvent event, UFEventProperty property, | 118 | UFStatus frame_event_get_property(UFEvent event, UFEventProperty property, |
1278 | 119 | void *value) { | 119 | void *value) { |
1280 | 120 | return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty( | 120 | return static_cast<const oif::frame::UFEvent*>(event)->GetProperty( |
1281 | 121 | property, | 121 | property, |
1282 | 122 | value); | 122 | value); |
1283 | 123 | } | 123 | } |
1284 | 124 | 124 | ||
1285 | 125 | UFEventType frame_event_get_type(UFEvent event) { | 125 | UFEventType frame_event_get_type(UFEvent event) { |
1286 | 126 | UFEventType type; | 126 | UFEventType type; |
1289 | 127 | const utouch::frame::UFEvent* ufevent = | 127 | const oif::frame::UFEvent* ufevent = |
1290 | 128 | static_cast<const utouch::frame::UFEvent*>(event); | 128 | static_cast<const oif::frame::UFEvent*>(event); |
1291 | 129 | UFStatus status = ufevent->GetProperty(UFEventPropertyType, &type); | 129 | UFStatus status = ufevent->GetProperty(UFEventPropertyType, &type); |
1292 | 130 | assert(status == UFStatusSuccess); | 130 | assert(status == UFStatusSuccess); |
1293 | 131 | return type; | 131 | return type; |
1294 | @@ -133,8 +133,8 @@ | |||
1295 | 133 | 133 | ||
1296 | 134 | uint64_t frame_event_get_time(UFEvent event) { | 134 | uint64_t frame_event_get_time(UFEvent event) { |
1297 | 135 | uint64_t time; | 135 | uint64_t time; |
1300 | 136 | const utouch::frame::UFEvent* ufevent = | 136 | const oif::frame::UFEvent* ufevent = |
1301 | 137 | static_cast<const utouch::frame::UFEvent*>(event); | 137 | static_cast<const oif::frame::UFEvent*>(event); |
1302 | 138 | UFStatus status = ufevent->GetProperty(UFEventPropertyTime, &time); | 138 | UFStatus status = ufevent->GetProperty(UFEventPropertyTime, &time); |
1303 | 139 | assert(status == UFStatusSuccess); | 139 | assert(status == UFStatusSuccess); |
1304 | 140 | return time; | 140 | return time; |
1305 | 141 | 141 | ||
1306 | === modified file 'src/event.h' | |||
1307 | --- src/event.h 2012-06-18 18:28:21 +0000 | |||
1308 | +++ src/event.h 2012-07-24 22:45:29 +0000 | |||
1309 | @@ -1,6 +1,6 @@ | |||
1310 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1311 | 2 | * | 2 | * |
1313 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1314 | 4 | * | 4 | * |
1315 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1316 | 6 | * | 6 | * |
1317 | @@ -18,19 +18,19 @@ | |||
1318 | 18 | * | 18 | * |
1319 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1320 | 20 | 20 | ||
1323 | 21 | #ifndef UTOUCH_FRAME_EVENT_H_ | 21 | #ifndef FRAME_EVENT_H_ |
1324 | 22 | #define UTOUCH_FRAME_EVENT_H_ | 22 | #define FRAME_EVENT_H_ |
1325 | 23 | 23 | ||
1326 | 24 | #include <stdint.h> | 24 | #include <stdint.h> |
1327 | 25 | 25 | ||
1329 | 26 | #include "utouch/frame.h" | 26 | #include "oif/frame.h" |
1330 | 27 | #include "property.h" | 27 | #include "property.h" |
1331 | 28 | 28 | ||
1332 | 29 | struct UFEvent_ { | 29 | struct UFEvent_ { |
1333 | 30 | virtual ~UFEvent_() {} | 30 | virtual ~UFEvent_() {} |
1334 | 31 | }; | 31 | }; |
1335 | 32 | 32 | ||
1337 | 33 | namespace utouch { | 33 | namespace oif { |
1338 | 34 | namespace frame { | 34 | namespace frame { |
1339 | 35 | 35 | ||
1340 | 36 | class Value; | 36 | class Value; |
1341 | @@ -51,6 +51,6 @@ | |||
1342 | 51 | }; | 51 | }; |
1343 | 52 | 52 | ||
1344 | 53 | } // namespace frame | 53 | } // namespace frame |
1346 | 54 | } // namespace utouch | 54 | } // namespace oif |
1347 | 55 | 55 | ||
1349 | 56 | #endif // UTOUCH_FRAME_EVENT_H | 56 | #endif // FRAME_EVENT_H |
1350 | 57 | 57 | ||
1351 | === modified file 'src/frame.cpp' | |||
1352 | --- src/frame.cpp 2012-06-18 18:28:21 +0000 | |||
1353 | +++ src/frame.cpp 2012-07-24 22:45:29 +0000 | |||
1354 | @@ -1,6 +1,6 @@ | |||
1355 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1356 | 2 | * | 2 | * |
1358 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1359 | 4 | * | 4 | * |
1360 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1361 | 6 | * | 6 | * |
1362 | @@ -26,7 +26,7 @@ | |||
1363 | 26 | #include "touch.h" | 26 | #include "touch.h" |
1364 | 27 | #include "window.h" | 27 | #include "window.h" |
1365 | 28 | 28 | ||
1367 | 29 | namespace utouch { | 29 | namespace oif { |
1368 | 30 | namespace frame { | 30 | namespace frame { |
1369 | 31 | 31 | ||
1370 | 32 | UFFrame::UFFrame(const SharedWindow& window, const SharedUFFrame& prev) | 32 | UFFrame::UFFrame(const SharedWindow& window, const SharedUFFrame& prev) |
1371 | @@ -184,7 +184,7 @@ | |||
1372 | 184 | } | 184 | } |
1373 | 185 | 185 | ||
1374 | 186 | } // namespace frame | 186 | } // namespace frame |
1376 | 187 | } // namespace utouch | 187 | } // namespace oif |
1377 | 188 | 188 | ||
1378 | 189 | extern "C" { | 189 | extern "C" { |
1379 | 190 | 190 | ||
1380 | @@ -192,8 +192,8 @@ | |||
1381 | 192 | UFStatus frame_frame_get_property_device_(UFFrame frame, | 192 | UFStatus frame_frame_get_property_device_(UFFrame frame, |
1382 | 193 | UFFrameProperty property, | 193 | UFFrameProperty property, |
1383 | 194 | UFDevice *value) { | 194 | UFDevice *value) { |
1386 | 195 | const utouch::frame::UFFrame* ufframe = | 195 | const oif::frame::UFFrame* ufframe = |
1387 | 196 | static_cast<const utouch::frame::UFFrame*>(frame); | 196 | static_cast<const oif::frame::UFFrame*>(frame); |
1388 | 197 | return ufframe->GetProperty(property, value); | 197 | return ufframe->GetProperty(property, value); |
1389 | 198 | } | 198 | } |
1390 | 199 | 199 | ||
1391 | @@ -201,8 +201,8 @@ | |||
1392 | 201 | UFStatus frame_frame_get_property_uint64_(UFFrame frame, | 201 | UFStatus frame_frame_get_property_uint64_(UFFrame frame, |
1393 | 202 | UFFrameProperty property, | 202 | UFFrameProperty property, |
1394 | 203 | uint64_t *value) { | 203 | uint64_t *value) { |
1397 | 204 | const utouch::frame::UFFrame* ufframe = | 204 | const oif::frame::UFFrame* ufframe = |
1398 | 205 | static_cast<const utouch::frame::UFFrame*>(frame); | 205 | static_cast<const oif::frame::UFFrame*>(frame); |
1399 | 206 | return ufframe->GetProperty(property, value); | 206 | return ufframe->GetProperty(property, value); |
1400 | 207 | } | 207 | } |
1401 | 208 | 208 | ||
1402 | @@ -210,8 +210,8 @@ | |||
1403 | 210 | UFStatus frame_frame_get_property_unsigned_int_(UFFrame frame, | 210 | UFStatus frame_frame_get_property_unsigned_int_(UFFrame frame, |
1404 | 211 | UFFrameProperty property, | 211 | UFFrameProperty property, |
1405 | 212 | unsigned int *value) { | 212 | unsigned int *value) { |
1408 | 213 | const utouch::frame::UFFrame* ufframe = | 213 | const oif::frame::UFFrame* ufframe = |
1409 | 214 | static_cast<const utouch::frame::UFFrame*>(frame); | 214 | static_cast<const oif::frame::UFFrame*>(frame); |
1410 | 215 | return ufframe->GetProperty(property, value); | 215 | return ufframe->GetProperty(property, value); |
1411 | 216 | } | 216 | } |
1412 | 217 | 217 | ||
1413 | @@ -219,50 +219,50 @@ | |||
1414 | 219 | FRAME_PUBLIC | 219 | FRAME_PUBLIC |
1415 | 220 | UFStatus frame_frame_get_property(UFFrame frame, UFFrameProperty property, | 220 | UFStatus frame_frame_get_property(UFFrame frame, UFFrameProperty property, |
1416 | 221 | void *value) { | 221 | void *value) { |
1419 | 222 | const utouch::frame::UFFrame* ufframe = | 222 | const oif::frame::UFFrame* ufframe = |
1420 | 223 | static_cast<const utouch::frame::UFFrame*>(frame); | 223 | static_cast<const oif::frame::UFFrame*>(frame); |
1421 | 224 | return ufframe->GetProperty(property, value); | 224 | return ufframe->GetProperty(property, value); |
1422 | 225 | } | 225 | } |
1423 | 226 | 226 | ||
1424 | 227 | UFStatus frame_frame_get_touch_by_index(UFFrame frame, unsigned int index, | 227 | UFStatus frame_frame_get_touch_by_index(UFFrame frame, unsigned int index, |
1425 | 228 | UFTouch *touch) { | 228 | UFTouch *touch) { |
1428 | 229 | const utouch::frame::UFFrame* ufframe = | 229 | const oif::frame::UFFrame* ufframe = |
1429 | 230 | static_cast<const utouch::frame::UFFrame*>(frame); | 230 | static_cast<const oif::frame::UFFrame*>(frame); |
1430 | 231 | return ufframe->GetTouchByIndex(index, touch); | 231 | return ufframe->GetTouchByIndex(index, touch); |
1431 | 232 | } | 232 | } |
1432 | 233 | 233 | ||
1433 | 234 | UFStatus frame_frame_get_touch_by_id(UFFrame frame, UFTouchId touch_id, | 234 | UFStatus frame_frame_get_touch_by_id(UFFrame frame, UFTouchId touch_id, |
1434 | 235 | UFTouch *touch) { | 235 | UFTouch *touch) { |
1437 | 236 | const utouch::frame::UFFrame* ufframe = | 236 | const oif::frame::UFFrame* ufframe = |
1438 | 237 | static_cast<const utouch::frame::UFFrame*>(frame); | 237 | static_cast<const oif::frame::UFFrame*>(frame); |
1439 | 238 | return ufframe->GetTouchById(touch_id, touch); | 238 | return ufframe->GetTouchById(touch_id, touch); |
1440 | 239 | } | 239 | } |
1441 | 240 | 240 | ||
1442 | 241 | UFStatus frame_frame_get_previous_touch_property(UFFrame frame, UFTouch touch, | 241 | UFStatus frame_frame_get_previous_touch_property(UFFrame frame, UFTouch touch, |
1443 | 242 | UFTouchProperty property, | 242 | UFTouchProperty property, |
1444 | 243 | void *value) { | 243 | void *value) { |
1447 | 244 | const utouch::frame::UFFrame* ufframe = | 244 | const oif::frame::UFFrame* ufframe = |
1448 | 245 | static_cast<const utouch::frame::UFFrame*>(frame); | 245 | static_cast<const oif::frame::UFFrame*>(frame); |
1449 | 246 | return ufframe->GetPreviousTouchProperty( | 246 | return ufframe->GetPreviousTouchProperty( |
1451 | 247 | static_cast<const utouch::frame::UFTouch*>(touch), | 247 | static_cast<const oif::frame::UFTouch*>(touch), |
1452 | 248 | property, | 248 | property, |
1453 | 249 | value); | 249 | value); |
1454 | 250 | } | 250 | } |
1455 | 251 | 251 | ||
1456 | 252 | UFStatus frame_frame_get_previous_touch_value(UFFrame frame, UFTouch touch, | 252 | UFStatus frame_frame_get_previous_touch_value(UFFrame frame, UFTouch touch, |
1457 | 253 | UFAxisType type, float *value) { | 253 | UFAxisType type, float *value) { |
1460 | 254 | const utouch::frame::UFFrame* ufframe = | 254 | const oif::frame::UFFrame* ufframe = |
1461 | 255 | static_cast<const utouch::frame::UFFrame*>(frame); | 255 | static_cast<const oif::frame::UFFrame*>(frame); |
1462 | 256 | return ufframe->GetPreviousTouchValue( | 256 | return ufframe->GetPreviousTouchValue( |
1464 | 257 | static_cast<const utouch::frame::UFTouch*>(touch), | 257 | static_cast<const oif::frame::UFTouch*>(touch), |
1465 | 258 | type, | 258 | type, |
1466 | 259 | value); | 259 | value); |
1467 | 260 | } | 260 | } |
1468 | 261 | 261 | ||
1469 | 262 | UFWindowId frame_frame_get_window_id(UFFrame frame) { | 262 | UFWindowId frame_frame_get_window_id(UFFrame frame) { |
1470 | 263 | UFWindowId window_id; | 263 | UFWindowId window_id; |
1473 | 264 | const utouch::frame::UFFrame* ufframe = | 264 | const oif::frame::UFFrame* ufframe = |
1474 | 265 | static_cast<const utouch::frame::UFFrame*>(frame); | 265 | static_cast<const oif::frame::UFFrame*>(frame); |
1475 | 266 | UFStatus status = ufframe->GetProperty(UFFramePropertyWindowId, &window_id); | 266 | UFStatus status = ufframe->GetProperty(UFFramePropertyWindowId, &window_id); |
1476 | 267 | assert(status == UFStatusSuccess); | 267 | assert(status == UFStatusSuccess); |
1477 | 268 | return window_id; | 268 | return window_id; |
1478 | @@ -270,8 +270,8 @@ | |||
1479 | 270 | 270 | ||
1480 | 271 | uint32_t frame_frame_get_num_touches(UFFrame frame) { | 271 | uint32_t frame_frame_get_num_touches(UFFrame frame) { |
1481 | 272 | unsigned int num_touches; | 272 | unsigned int num_touches; |
1484 | 273 | const utouch::frame::UFFrame* ufframe = | 273 | const oif::frame::UFFrame* ufframe = |
1485 | 274 | static_cast<const utouch::frame::UFFrame*>(frame); | 274 | static_cast<const oif::frame::UFFrame*>(frame); |
1486 | 275 | UFStatus status = ufframe->GetProperty(UFFramePropertyNumTouches, | 275 | UFStatus status = ufframe->GetProperty(UFFramePropertyNumTouches, |
1487 | 276 | &num_touches); | 276 | &num_touches); |
1488 | 277 | assert(status == UFStatusSuccess); | 277 | assert(status == UFStatusSuccess); |
1489 | @@ -280,8 +280,8 @@ | |||
1490 | 280 | 280 | ||
1491 | 281 | UFDevice frame_frame_get_device(UFFrame frame) { | 281 | UFDevice frame_frame_get_device(UFFrame frame) { |
1492 | 282 | UFDevice device; | 282 | UFDevice device; |
1495 | 283 | const utouch::frame::UFFrame* ufframe = | 283 | const oif::frame::UFFrame* ufframe = |
1496 | 284 | static_cast<const utouch::frame::UFFrame*>(frame); | 284 | static_cast<const oif::frame::UFFrame*>(frame); |
1497 | 285 | UFStatus status = ufframe->GetProperty(UFFramePropertyDevice, &device); | 285 | UFStatus status = ufframe->GetProperty(UFFramePropertyDevice, &device); |
1498 | 286 | assert(status == UFStatusSuccess); | 286 | assert(status == UFStatusSuccess); |
1499 | 287 | return device; | 287 | return device; |
1500 | 288 | 288 | ||
1501 | === modified file 'src/frame.h' | |||
1502 | --- src/frame.h 2012-06-18 18:28:21 +0000 | |||
1503 | +++ src/frame.h 2012-07-24 22:45:29 +0000 | |||
1504 | @@ -1,6 +1,6 @@ | |||
1505 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1506 | 2 | * | 2 | * |
1508 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1509 | 4 | * | 4 | * |
1510 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1511 | 6 | * | 6 | * |
1512 | @@ -18,14 +18,14 @@ | |||
1513 | 18 | * | 18 | * |
1514 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1515 | 20 | 20 | ||
1518 | 21 | #ifndef UTOUCH_FRAME_FRAME_H_ | 21 | #ifndef FRAME_FRAME_H_ |
1519 | 22 | #define UTOUCH_FRAME_FRAME_H_ | 22 | #define FRAME_FRAME_H_ |
1520 | 23 | 23 | ||
1521 | 24 | #include <map> | 24 | #include <map> |
1522 | 25 | #include <memory> | 25 | #include <memory> |
1523 | 26 | #include <vector> | 26 | #include <vector> |
1524 | 27 | 27 | ||
1526 | 28 | #include "utouch/frame.h" | 28 | #include "oif/frame.h" |
1527 | 29 | #include "property.h" | 29 | #include "property.h" |
1528 | 30 | #include "typedefs.h" | 30 | #include "typedefs.h" |
1529 | 31 | 31 | ||
1530 | @@ -33,7 +33,7 @@ | |||
1531 | 33 | virtual ~UFFrame_() {} | 33 | virtual ~UFFrame_() {} |
1532 | 34 | }; | 34 | }; |
1533 | 35 | 35 | ||
1535 | 36 | namespace utouch { | 36 | namespace oif { |
1536 | 37 | namespace frame { | 37 | namespace frame { |
1537 | 38 | 38 | ||
1538 | 39 | class UFFrame : public UFFrame_, public Property<UFFrameProperty> { | 39 | class UFFrame : public UFFrame_, public Property<UFFrameProperty> { |
1539 | @@ -64,6 +64,6 @@ | |||
1540 | 64 | }; | 64 | }; |
1541 | 65 | 65 | ||
1542 | 66 | } // namespace frame | 66 | } // namespace frame |
1544 | 67 | } // namespace utouch | 67 | } // namespace oif |
1545 | 68 | 68 | ||
1547 | 69 | #endif // UTOUCH_FRAME_FRAME_H_ | 69 | #endif // FRAME_FRAME_H_ |
1548 | 70 | 70 | ||
1549 | === modified file 'src/handle.cpp' | |||
1550 | --- src/handle.cpp 2012-06-18 18:28:21 +0000 | |||
1551 | +++ src/handle.cpp 2012-07-24 22:45:29 +0000 | |||
1552 | @@ -1,6 +1,6 @@ | |||
1553 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1554 | 2 | * | 2 | * |
1556 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1557 | 4 | * | 4 | * |
1558 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1559 | 6 | * | 6 | * |
1560 | @@ -29,7 +29,7 @@ | |||
1561 | 29 | 29 | ||
1562 | 30 | #include "event.h" | 30 | #include "event.h" |
1563 | 31 | 31 | ||
1565 | 32 | namespace utouch { | 32 | namespace oif { |
1566 | 33 | namespace frame { | 33 | namespace frame { |
1567 | 34 | 34 | ||
1568 | 35 | UFHandle::UFHandle() : event_fd_(-1), event_queue_() { | 35 | UFHandle::UFHandle() : event_fd_(-1), event_queue_() { |
1569 | @@ -71,16 +71,16 @@ | |||
1570 | 71 | } | 71 | } |
1571 | 72 | 72 | ||
1572 | 73 | } // namespace frame | 73 | } // namespace frame |
1574 | 74 | } // namespace utouch | 74 | } // namespace oif |
1575 | 75 | 75 | ||
1576 | 76 | extern "C" { | 76 | extern "C" { |
1577 | 77 | 77 | ||
1578 | 78 | int frame_get_fd(UFHandle handle) { | 78 | int frame_get_fd(UFHandle handle) { |
1580 | 79 | return static_cast<const utouch::frame::UFHandle*>(handle)->event_fd(); | 79 | return static_cast<const oif::frame::UFHandle*>(handle)->event_fd(); |
1581 | 80 | } | 80 | } |
1582 | 81 | 81 | ||
1583 | 82 | UFStatus frame_get_event(UFHandle handle, UFEvent *event) { | 82 | UFStatus frame_get_event(UFHandle handle, UFEvent *event) { |
1585 | 83 | return static_cast<utouch::frame::UFHandle*>(handle)->GetEvent(event); | 83 | return static_cast<oif::frame::UFHandle*>(handle)->GetEvent(event); |
1586 | 84 | } | 84 | } |
1587 | 85 | 85 | ||
1588 | 86 | } // extern "C" | 86 | } // extern "C" |
1589 | 87 | 87 | ||
1590 | === modified file 'src/handle.h' | |||
1591 | --- src/handle.h 2012-06-18 18:28:21 +0000 | |||
1592 | +++ src/handle.h 2012-07-24 22:45:29 +0000 | |||
1593 | @@ -1,6 +1,6 @@ | |||
1594 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1595 | 2 | * | 2 | * |
1597 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1598 | 4 | * | 4 | * |
1599 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1600 | 6 | * | 6 | * |
1601 | @@ -18,18 +18,18 @@ | |||
1602 | 18 | * | 18 | * |
1603 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1604 | 20 | 20 | ||
1607 | 21 | #ifndef UTOUCH_FRAME_HANDLE_H_ | 21 | #ifndef FRAME_HANDLE_H_ |
1608 | 22 | #define UTOUCH_FRAME_HANDLE_H_ | 22 | #define FRAME_HANDLE_H_ |
1609 | 23 | 23 | ||
1610 | 24 | #include <queue> | 24 | #include <queue> |
1611 | 25 | 25 | ||
1613 | 26 | #include "utouch/frame.h" | 26 | #include "oif/frame.h" |
1614 | 27 | 27 | ||
1615 | 28 | struct UFHandle_ { | 28 | struct UFHandle_ { |
1616 | 29 | virtual ~UFHandle_() {} | 29 | virtual ~UFHandle_() {} |
1617 | 30 | }; | 30 | }; |
1618 | 31 | 31 | ||
1620 | 32 | namespace utouch { | 32 | namespace oif { |
1621 | 33 | namespace frame { | 33 | namespace frame { |
1622 | 34 | 34 | ||
1623 | 35 | class UFEvent; | 35 | class UFEvent; |
1624 | @@ -55,6 +55,6 @@ | |||
1625 | 55 | }; | 55 | }; |
1626 | 56 | 56 | ||
1627 | 57 | } // namespace frame | 57 | } // namespace frame |
1629 | 58 | } // namespace utouch | 58 | } // namespace oif |
1630 | 59 | 59 | ||
1632 | 60 | #endif // UTOUCH_FRAME_HANDLE_H_ | 60 | #endif // FRAME_HANDLE_H_ |
1633 | 61 | 61 | ||
1634 | === renamed file 'src/libutouch-frame.ver' => 'src/libframe.ver' | |||
1635 | --- src/libutouch-frame.ver 2012-06-18 18:28:21 +0000 | |||
1636 | +++ src/libframe.ver 2012-07-24 22:45:29 +0000 | |||
1637 | @@ -1,10 +1,15 @@ | |||
1639 | 1 | UTOUCH_FRAME_2.0 { | 1 | FRAME_2.2 { |
1640 | 2 | global: | 2 | global: |
1641 | 3 | frame_get_fd; | 3 | frame_get_fd; |
1642 | 4 | frame_get_event; | 4 | frame_get_event; |
1643 | 5 | frame_device_get_property; | 5 | frame_device_get_property; |
1644 | 6 | frame_device_get_property_string_; | ||
1645 | 7 | frame_device_get_property_int_; | ||
1646 | 8 | frame_device_get_property_unsigned_int_; | ||
1647 | 6 | frame_device_get_axis_by_index; | 9 | frame_device_get_axis_by_index; |
1648 | 7 | frame_device_get_axis_by_type; | 10 | frame_device_get_axis_by_type; |
1649 | 11 | frame_device_get_window_resolution_x; | ||
1650 | 12 | frame_device_get_window_resolution_y; | ||
1651 | 8 | frame_axis_get_type; | 13 | frame_axis_get_type; |
1652 | 9 | frame_axis_get_minimum; | 14 | frame_axis_get_minimum; |
1653 | 10 | frame_axis_get_maximum; | 15 | frame_axis_get_maximum; |
1654 | @@ -12,12 +17,23 @@ | |||
1655 | 12 | frame_event_ref; | 17 | frame_event_ref; |
1656 | 13 | frame_event_unref; | 18 | frame_event_unref; |
1657 | 14 | frame_event_get_property; | 19 | frame_event_get_property; |
1658 | 20 | frame_event_get_property_type_; | ||
1659 | 21 | frame_event_get_property_device_; | ||
1660 | 22 | frame_event_get_property_frame_; | ||
1661 | 23 | frame_event_get_property_uint64_; | ||
1662 | 15 | frame_frame_get_property; | 24 | frame_frame_get_property; |
1663 | 25 | frame_frame_get_property_device_; | ||
1664 | 26 | frame_frame_get_property_uint64_; | ||
1665 | 27 | frame_frame_get_property_unsigned_int_; | ||
1666 | 16 | frame_frame_get_touch_by_index; | 28 | frame_frame_get_touch_by_index; |
1667 | 17 | frame_frame_get_touch_by_id; | 29 | frame_frame_get_touch_by_id; |
1668 | 18 | frame_frame_get_previous_touch_property; | 30 | frame_frame_get_previous_touch_property; |
1669 | 19 | frame_frame_get_previous_touch_value; | 31 | frame_frame_get_previous_touch_value; |
1670 | 20 | frame_touch_get_property; | 32 | frame_touch_get_property; |
1671 | 33 | frame_touch_get_property_uint64_; | ||
1672 | 34 | frame_touch_get_property_state_; | ||
1673 | 35 | frame_touch_get_property_float_; | ||
1674 | 36 | frame_touch_get_property_int_; | ||
1675 | 21 | frame_touch_get_value; | 37 | frame_touch_get_value; |
1676 | 22 | 38 | ||
1677 | 23 | frame_event_get_type; | 39 | frame_event_get_type; |
1678 | @@ -48,27 +64,3 @@ | |||
1679 | 48 | local: | 64 | local: |
1680 | 49 | *; | 65 | *; |
1681 | 50 | }; | 66 | }; |
1682 | 51 | |||
1683 | 52 | UTOUCH_FRAME_2.1 { | ||
1684 | 53 | global: | ||
1685 | 54 | frame_device_get_property_string_; | ||
1686 | 55 | frame_device_get_property_int_; | ||
1687 | 56 | frame_device_get_property_unsigned_int_; | ||
1688 | 57 | frame_event_get_property_type_; | ||
1689 | 58 | frame_event_get_property_device_; | ||
1690 | 59 | frame_event_get_property_frame_; | ||
1691 | 60 | frame_event_get_property_uint64_; | ||
1692 | 61 | frame_frame_get_property_device_; | ||
1693 | 62 | frame_frame_get_property_uint64_; | ||
1694 | 63 | frame_frame_get_property_unsigned_int_; | ||
1695 | 64 | frame_touch_get_property_uint64_; | ||
1696 | 65 | frame_touch_get_property_state_; | ||
1697 | 66 | frame_touch_get_property_float_; | ||
1698 | 67 | frame_touch_get_property_int_; | ||
1699 | 68 | } UTOUCH_FRAME_2.0; | ||
1700 | 69 | |||
1701 | 70 | UTOUCH_FRAME_2.2 { | ||
1702 | 71 | global: | ||
1703 | 72 | frame_device_get_window_resolution_x; | ||
1704 | 73 | frame_device_get_window_resolution_y; | ||
1705 | 74 | } UTOUCH_FRAME_2.1; | ||
1706 | 75 | 67 | ||
1707 | === modified file 'src/property.h' | |||
1708 | --- src/property.h 2012-06-18 18:28:21 +0000 | |||
1709 | +++ src/property.h 2012-07-24 22:45:29 +0000 | |||
1710 | @@ -1,6 +1,6 @@ | |||
1711 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1712 | 2 | * | 2 | * |
1714 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1715 | 4 | * | 4 | * |
1716 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1717 | 6 | * | 6 | * |
1718 | @@ -18,14 +18,14 @@ | |||
1719 | 18 | * | 18 | * |
1720 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1721 | 20 | 20 | ||
1724 | 21 | #ifndef UTOUCH_FRAME_PROPERTY_H_ | 21 | #ifndef FRAME_PROPERTY_H_ |
1725 | 22 | #define UTOUCH_FRAME_PROPERTY_H_ | 22 | #define FRAME_PROPERTY_H_ |
1726 | 23 | 23 | ||
1727 | 24 | #include <map> | 24 | #include <map> |
1728 | 25 | 25 | ||
1729 | 26 | #include "value.h" | 26 | #include "value.h" |
1730 | 27 | 27 | ||
1732 | 28 | namespace utouch { | 28 | namespace oif { |
1733 | 29 | namespace frame { | 29 | namespace frame { |
1734 | 30 | 30 | ||
1735 | 31 | template<typename T> | 31 | template<typename T> |
1736 | @@ -67,6 +67,6 @@ | |||
1737 | 67 | }; | 67 | }; |
1738 | 68 | 68 | ||
1739 | 69 | } // namespace frame | 69 | } // namespace frame |
1741 | 70 | } // namespace utouch | 70 | } // namespace oif |
1742 | 71 | 71 | ||
1744 | 72 | #endif // UTOUCH_FRAME_PROPERTY_H_ | 72 | #endif // FRAME_PROPERTY_H_ |
1745 | 73 | 73 | ||
1746 | === modified file 'src/touch.cpp' | |||
1747 | --- src/touch.cpp 2012-06-18 18:28:21 +0000 | |||
1748 | +++ src/touch.cpp 2012-07-24 22:45:29 +0000 | |||
1749 | @@ -1,6 +1,6 @@ | |||
1750 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1751 | 2 | * | 2 | * |
1753 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1754 | 4 | * | 4 | * |
1755 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1756 | 6 | * | 6 | * |
1757 | @@ -24,7 +24,7 @@ | |||
1758 | 24 | 24 | ||
1759 | 25 | #include "frame.h" | 25 | #include "frame.h" |
1760 | 26 | 26 | ||
1762 | 27 | namespace utouch { | 27 | namespace oif { |
1763 | 28 | namespace frame { | 28 | namespace frame { |
1764 | 29 | 29 | ||
1765 | 30 | UFTouch::UFTouch(UFTouchState state, UFTouchId id, float x, float y, | 30 | UFTouch::UFTouch(UFTouchState state, UFTouchId id, float x, float y, |
1766 | @@ -79,7 +79,7 @@ | |||
1767 | 79 | } | 79 | } |
1768 | 80 | 80 | ||
1769 | 81 | } // namespace frame | 81 | } // namespace frame |
1771 | 82 | } // namespace utouch | 82 | } // namespace oif |
1772 | 83 | 83 | ||
1773 | 84 | extern "C" { | 84 | extern "C" { |
1774 | 85 | 85 | ||
1775 | @@ -87,8 +87,8 @@ | |||
1776 | 87 | UFStatus frame_touch_get_property_uint64_(UFTouch touch, | 87 | UFStatus frame_touch_get_property_uint64_(UFTouch touch, |
1777 | 88 | UFTouchProperty property, | 88 | UFTouchProperty property, |
1778 | 89 | uint64_t *value) { | 89 | uint64_t *value) { |
1781 | 90 | const utouch::frame::UFTouch* uftouch = | 90 | const oif::frame::UFTouch* uftouch = |
1782 | 91 | static_cast<const utouch::frame::UFTouch*>(touch); | 91 | static_cast<const oif::frame::UFTouch*>(touch); |
1783 | 92 | return uftouch->GetProperty(property, value); | 92 | return uftouch->GetProperty(property, value); |
1784 | 93 | } | 93 | } |
1785 | 94 | 94 | ||
1786 | @@ -96,8 +96,8 @@ | |||
1787 | 96 | UFStatus frame_touch_get_property_state_(UFTouch touch, | 96 | UFStatus frame_touch_get_property_state_(UFTouch touch, |
1788 | 97 | UFTouchProperty property, | 97 | UFTouchProperty property, |
1789 | 98 | UFTouchState *value) { | 98 | UFTouchState *value) { |
1792 | 99 | const utouch::frame::UFTouch* uftouch = | 99 | const oif::frame::UFTouch* uftouch = |
1793 | 100 | static_cast<const utouch::frame::UFTouch*>(touch); | 100 | static_cast<const oif::frame::UFTouch*>(touch); |
1794 | 101 | return uftouch->GetProperty(property, value); | 101 | return uftouch->GetProperty(property, value); |
1795 | 102 | } | 102 | } |
1796 | 103 | 103 | ||
1797 | @@ -105,16 +105,16 @@ | |||
1798 | 105 | UFStatus frame_touch_get_property_float_(UFTouch touch, | 105 | UFStatus frame_touch_get_property_float_(UFTouch touch, |
1799 | 106 | UFTouchProperty property, | 106 | UFTouchProperty property, |
1800 | 107 | float *value) { | 107 | float *value) { |
1803 | 108 | const utouch::frame::UFTouch* uftouch = | 108 | const oif::frame::UFTouch* uftouch = |
1804 | 109 | static_cast<const utouch::frame::UFTouch*>(touch); | 109 | static_cast<const oif::frame::UFTouch*>(touch); |
1805 | 110 | return uftouch->GetProperty(property, value); | 110 | return uftouch->GetProperty(property, value); |
1806 | 111 | } | 111 | } |
1807 | 112 | 112 | ||
1808 | 113 | FRAME_PUBLIC | 113 | FRAME_PUBLIC |
1809 | 114 | UFStatus frame_touch_get_property_int_(UFTouch touch, UFTouchProperty property, | 114 | UFStatus frame_touch_get_property_int_(UFTouch touch, UFTouchProperty property, |
1810 | 115 | int *value) { | 115 | int *value) { |
1813 | 116 | const utouch::frame::UFTouch* uftouch = | 116 | const oif::frame::UFTouch* uftouch = |
1814 | 117 | static_cast<const utouch::frame::UFTouch*>(touch); | 117 | static_cast<const oif::frame::UFTouch*>(touch); |
1815 | 118 | return uftouch->GetProperty(property, value); | 118 | return uftouch->GetProperty(property, value); |
1816 | 119 | } | 119 | } |
1817 | 120 | 120 | ||
1818 | @@ -122,21 +122,21 @@ | |||
1819 | 122 | FRAME_PUBLIC | 122 | FRAME_PUBLIC |
1820 | 123 | UFStatus frame_touch_get_property(UFTouch touch, UFTouchProperty property, | 123 | UFStatus frame_touch_get_property(UFTouch touch, UFTouchProperty property, |
1821 | 124 | void* value) { | 124 | void* value) { |
1824 | 125 | const utouch::frame::UFTouch* uftouch = | 125 | const oif::frame::UFTouch* uftouch = |
1825 | 126 | static_cast<const utouch::frame::UFTouch*>(touch); | 126 | static_cast<const oif::frame::UFTouch*>(touch); |
1826 | 127 | return uftouch->GetProperty(property, value); | 127 | return uftouch->GetProperty(property, value); |
1827 | 128 | } | 128 | } |
1828 | 129 | 129 | ||
1829 | 130 | UFStatus frame_touch_get_value(UFTouch touch, UFAxisType type, float* value) { | 130 | UFStatus frame_touch_get_value(UFTouch touch, UFAxisType type, float* value) { |
1832 | 131 | const utouch::frame::UFTouch* uftouch = | 131 | const oif::frame::UFTouch* uftouch = |
1833 | 132 | static_cast<const utouch::frame::UFTouch*>(touch); | 132 | static_cast<const oif::frame::UFTouch*>(touch); |
1834 | 133 | return uftouch->GetValue(type, value); | 133 | return uftouch->GetValue(type, value); |
1835 | 134 | } | 134 | } |
1836 | 135 | 135 | ||
1837 | 136 | UFTouchId frame_touch_get_id(UFTouch touch) { | 136 | UFTouchId frame_touch_get_id(UFTouch touch) { |
1838 | 137 | UFTouchId touch_id; | 137 | UFTouchId touch_id; |
1841 | 138 | const utouch::frame::UFTouch* uftouch = | 138 | const oif::frame::UFTouch* uftouch = |
1842 | 139 | static_cast<const utouch::frame::UFTouch*>(touch); | 139 | static_cast<const oif::frame::UFTouch*>(touch); |
1843 | 140 | UFStatus status = uftouch->GetProperty(UFTouchPropertyId, &touch_id); | 140 | UFStatus status = uftouch->GetProperty(UFTouchPropertyId, &touch_id); |
1844 | 141 | assert(status == UFStatusSuccess); | 141 | assert(status == UFStatusSuccess); |
1845 | 142 | return touch_id; | 142 | return touch_id; |
1846 | @@ -144,8 +144,8 @@ | |||
1847 | 144 | 144 | ||
1848 | 145 | UFTouchState frame_touch_get_state(UFTouch touch) { | 145 | UFTouchState frame_touch_get_state(UFTouch touch) { |
1849 | 146 | UFTouchState state; | 146 | UFTouchState state; |
1852 | 147 | const utouch::frame::UFTouch* uftouch = | 147 | const oif::frame::UFTouch* uftouch = |
1853 | 148 | static_cast<const utouch::frame::UFTouch*>(touch); | 148 | static_cast<const oif::frame::UFTouch*>(touch); |
1854 | 149 | UFStatus status = uftouch->GetProperty(UFTouchPropertyState, &state); | 149 | UFStatus status = uftouch->GetProperty(UFTouchPropertyState, &state); |
1855 | 150 | assert(status == UFStatusSuccess); | 150 | assert(status == UFStatusSuccess); |
1856 | 151 | return state; | 151 | return state; |
1857 | @@ -153,8 +153,8 @@ | |||
1858 | 153 | 153 | ||
1859 | 154 | float frame_touch_get_window_x(UFTouch touch) { | 154 | float frame_touch_get_window_x(UFTouch touch) { |
1860 | 155 | float x; | 155 | float x; |
1863 | 156 | const utouch::frame::UFTouch* uftouch = | 156 | const oif::frame::UFTouch* uftouch = |
1864 | 157 | static_cast<const utouch::frame::UFTouch*>(touch); | 157 | static_cast<const oif::frame::UFTouch*>(touch); |
1865 | 158 | UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowX, &x); | 158 | UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowX, &x); |
1866 | 159 | assert(status == UFStatusSuccess); | 159 | assert(status == UFStatusSuccess); |
1867 | 160 | return x; | 160 | return x; |
1868 | @@ -162,8 +162,8 @@ | |||
1869 | 162 | 162 | ||
1870 | 163 | float frame_touch_get_window_y(UFTouch touch) { | 163 | float frame_touch_get_window_y(UFTouch touch) { |
1871 | 164 | float y; | 164 | float y; |
1874 | 165 | const utouch::frame::UFTouch* uftouch = | 165 | const oif::frame::UFTouch* uftouch = |
1875 | 166 | static_cast<const utouch::frame::UFTouch*>(touch); | 166 | static_cast<const oif::frame::UFTouch*>(touch); |
1876 | 167 | UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowY, &y); | 167 | UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowY, &y); |
1877 | 168 | assert(status == UFStatusSuccess); | 168 | assert(status == UFStatusSuccess); |
1878 | 169 | return y; | 169 | return y; |
1879 | @@ -171,8 +171,8 @@ | |||
1880 | 171 | 171 | ||
1881 | 172 | float frame_touch_get_device_x(UFTouch touch) { | 172 | float frame_touch_get_device_x(UFTouch touch) { |
1882 | 173 | float x; | 173 | float x; |
1885 | 174 | const utouch::frame::UFTouch* uftouch = | 174 | const oif::frame::UFTouch* uftouch = |
1886 | 175 | static_cast<const utouch::frame::UFTouch*>(touch); | 175 | static_cast<const oif::frame::UFTouch*>(touch); |
1887 | 176 | UFStatus status = uftouch->GetValue(UFAxisTypeX, &x); | 176 | UFStatus status = uftouch->GetValue(UFAxisTypeX, &x); |
1888 | 177 | assert(status == UFStatusSuccess); | 177 | assert(status == UFStatusSuccess); |
1889 | 178 | return x; | 178 | return x; |
1890 | @@ -180,8 +180,8 @@ | |||
1891 | 180 | 180 | ||
1892 | 181 | float frame_touch_get_device_y(UFTouch touch) { | 181 | float frame_touch_get_device_y(UFTouch touch) { |
1893 | 182 | float y; | 182 | float y; |
1896 | 183 | const utouch::frame::UFTouch* uftouch = | 183 | const oif::frame::UFTouch* uftouch = |
1897 | 184 | static_cast<const utouch::frame::UFTouch*>(touch); | 184 | static_cast<const oif::frame::UFTouch*>(touch); |
1898 | 185 | UFStatus status = uftouch->GetValue(UFAxisTypeY, &y); | 185 | UFStatus status = uftouch->GetValue(UFAxisTypeY, &y); |
1899 | 186 | assert(status == UFStatusSuccess); | 186 | assert(status == UFStatusSuccess); |
1900 | 187 | return y; | 187 | return y; |
1901 | @@ -189,8 +189,8 @@ | |||
1902 | 189 | 189 | ||
1903 | 190 | uint64_t frame_touch_get_time(UFTouch touch) { | 190 | uint64_t frame_touch_get_time(UFTouch touch) { |
1904 | 191 | uint64_t time; | 191 | uint64_t time; |
1907 | 192 | const utouch::frame::UFTouch* uftouch = | 192 | const oif::frame::UFTouch* uftouch = |
1908 | 193 | static_cast<const utouch::frame::UFTouch*>(touch); | 193 | static_cast<const oif::frame::UFTouch*>(touch); |
1909 | 194 | UFStatus status = uftouch->GetProperty(UFTouchPropertyTime, &time); | 194 | UFStatus status = uftouch->GetProperty(UFTouchPropertyTime, &time); |
1910 | 195 | assert(status == UFStatusSuccess); | 195 | assert(status == UFStatusSuccess); |
1911 | 196 | return time; | 196 | return time; |
1912 | @@ -198,8 +198,8 @@ | |||
1913 | 198 | 198 | ||
1914 | 199 | uint64_t frame_touch_get_start_time(UFTouch touch) { | 199 | uint64_t frame_touch_get_start_time(UFTouch touch) { |
1915 | 200 | uint64_t start_time; | 200 | uint64_t start_time; |
1918 | 201 | const utouch::frame::UFTouch* uftouch = | 201 | const oif::frame::UFTouch* uftouch = |
1919 | 202 | static_cast<const utouch::frame::UFTouch*>(touch); | 202 | static_cast<const oif::frame::UFTouch*>(touch); |
1920 | 203 | UFStatus status = uftouch->GetProperty(UFTouchPropertyStartTime, &start_time); | 203 | UFStatus status = uftouch->GetProperty(UFTouchPropertyStartTime, &start_time); |
1921 | 204 | assert(status == UFStatusSuccess); | 204 | assert(status == UFStatusSuccess); |
1922 | 205 | return start_time; | 205 | return start_time; |
1923 | 206 | 206 | ||
1924 | === modified file 'src/touch.h' | |||
1925 | --- src/touch.h 2012-06-18 18:28:21 +0000 | |||
1926 | +++ src/touch.h 2012-07-24 22:45:29 +0000 | |||
1927 | @@ -1,6 +1,6 @@ | |||
1928 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1929 | 2 | * | 2 | * |
1931 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1932 | 4 | * | 4 | * |
1933 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1934 | 6 | * | 6 | * |
1935 | @@ -18,15 +18,15 @@ | |||
1936 | 18 | * | 18 | * |
1937 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1938 | 20 | 20 | ||
1941 | 21 | #ifndef UTOUCH_FRAME_TOUCH_H_ | 21 | #ifndef FRAME_TOUCH_H_ |
1942 | 22 | #define UTOUCH_FRAME_TOUCH_H_ | 22 | #define FRAME_TOUCH_H_ |
1943 | 23 | 23 | ||
1944 | 24 | #include <stdint.h> | 24 | #include <stdint.h> |
1945 | 25 | 25 | ||
1946 | 26 | #include <map> | 26 | #include <map> |
1947 | 27 | #include <memory> | 27 | #include <memory> |
1948 | 28 | 28 | ||
1950 | 29 | #include "utouch/frame.h" | 29 | #include "oif/frame.h" |
1951 | 30 | #include "property.h" | 30 | #include "property.h" |
1952 | 31 | #include "typedefs.h" | 31 | #include "typedefs.h" |
1953 | 32 | 32 | ||
1954 | @@ -34,7 +34,7 @@ | |||
1955 | 34 | virtual ~UFTouch_() {} | 34 | virtual ~UFTouch_() {} |
1956 | 35 | }; | 35 | }; |
1957 | 36 | 36 | ||
1959 | 37 | namespace utouch { | 37 | namespace oif { |
1960 | 38 | namespace frame { | 38 | namespace frame { |
1961 | 39 | 39 | ||
1962 | 40 | class UFTouch : public UFTouch_, public Property<UFTouchProperty> { | 40 | class UFTouch : public UFTouch_, public Property<UFTouchProperty> { |
1963 | @@ -59,6 +59,6 @@ | |||
1964 | 59 | }; | 59 | }; |
1965 | 60 | 60 | ||
1966 | 61 | } // namespace frame | 61 | } // namespace frame |
1968 | 62 | } // namespace utouch | 62 | } // namespace oif |
1969 | 63 | 63 | ||
1971 | 64 | #endif // UTOUCH_FRAME_TOUCH_H_ | 64 | #endif // FRAME_TOUCH_H_ |
1972 | 65 | 65 | ||
1973 | === modified file 'src/typedefs.h' | |||
1974 | --- src/typedefs.h 2012-06-18 18:28:21 +0000 | |||
1975 | +++ src/typedefs.h 2012-07-24 22:45:29 +0000 | |||
1976 | @@ -1,6 +1,6 @@ | |||
1977 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
1978 | 2 | * | 2 | * |
1980 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
1981 | 4 | * | 4 | * |
1982 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
1983 | 6 | * | 6 | * |
1984 | @@ -18,10 +18,10 @@ | |||
1985 | 18 | * | 18 | * |
1986 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
1987 | 20 | 20 | ||
1990 | 21 | #ifndef UTOUCH_FRAME_TYPEDEFS_H_ | 21 | #ifndef FRAME_TYPEDEFS_H_ |
1991 | 22 | #define UTOUCH_FRAME_TYPEDEFS_H_ | 22 | #define FRAME_TYPEDEFS_H_ |
1992 | 23 | 23 | ||
1994 | 24 | namespace utouch { | 24 | namespace oif { |
1995 | 25 | namespace frame { | 25 | namespace frame { |
1996 | 26 | 26 | ||
1997 | 27 | class UFDevice; | 27 | class UFDevice; |
1998 | @@ -35,6 +35,6 @@ | |||
1999 | 35 | typedef std::shared_ptr<Window> SharedWindow; | 35 | typedef std::shared_ptr<Window> SharedWindow; |
2000 | 36 | 36 | ||
2001 | 37 | } // namespace frame | 37 | } // namespace frame |
2003 | 38 | } // namespace utouch | 38 | } // namespace oif |
2004 | 39 | 39 | ||
2006 | 40 | #endif // UTOUCH_FRAME_TYPEDEFS_H_ | 40 | #endif // FRAME_TYPEDEFS_H_ |
2007 | 41 | 41 | ||
2008 | === modified file 'src/value.cpp' | |||
2009 | --- src/value.cpp 2012-06-18 18:28:21 +0000 | |||
2010 | +++ src/value.cpp 2012-07-24 22:45:29 +0000 | |||
2011 | @@ -1,6 +1,6 @@ | |||
2012 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2013 | 2 | * | 2 | * |
2015 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2016 | 4 | * | 4 | * |
2017 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2018 | 6 | * | 6 | * |
2019 | @@ -28,7 +28,7 @@ | |||
2020 | 28 | #include "device.h" | 28 | #include "device.h" |
2021 | 29 | #include "frame.h" | 29 | #include "frame.h" |
2022 | 30 | 30 | ||
2024 | 31 | namespace utouch { | 31 | namespace oif { |
2025 | 32 | namespace frame { | 32 | namespace frame { |
2026 | 33 | 33 | ||
2027 | 34 | Value::Value(bool value) : type_(kBool), bool_(value) { | 34 | Value::Value(bool value) : type_(kBool), bool_(value) { |
2028 | @@ -228,4 +228,4 @@ | |||
2029 | 228 | } | 228 | } |
2030 | 229 | 229 | ||
2031 | 230 | } // namespace frame | 230 | } // namespace frame |
2033 | 231 | } // namespace utouch | 231 | } // namespace oif |
2034 | 232 | 232 | ||
2035 | === modified file 'src/value.h' | |||
2036 | --- src/value.h 2012-06-18 18:28:21 +0000 | |||
2037 | +++ src/value.h 2012-07-24 22:45:29 +0000 | |||
2038 | @@ -1,6 +1,6 @@ | |||
2039 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2040 | 2 | * | 2 | * |
2042 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2043 | 4 | * | 4 | * |
2044 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2045 | 6 | * | 6 | * |
2046 | @@ -18,8 +18,8 @@ | |||
2047 | 18 | * | 18 | * |
2048 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
2049 | 20 | 20 | ||
2052 | 21 | #ifndef UTOUCH_FRAME_VALUE_H_ | 21 | #ifndef FRAME_VALUE_H_ |
2053 | 22 | #define UTOUCH_FRAME_VALUE_H_ | 22 | #define FRAME_VALUE_H_ |
2054 | 23 | 23 | ||
2055 | 24 | #include <stdint.h> | 24 | #include <stdint.h> |
2056 | 25 | 25 | ||
2057 | @@ -27,14 +27,14 @@ | |||
2058 | 27 | 27 | ||
2059 | 28 | #include <X11/X.h> | 28 | #include <X11/X.h> |
2060 | 29 | 29 | ||
2062 | 30 | #include "utouch/frame.h" | 30 | #include "oif/frame.h" |
2063 | 31 | #include "typedefs.h" | 31 | #include "typedefs.h" |
2064 | 32 | 32 | ||
2065 | 33 | #if __SIZEOF_LONG__ != __SIZEOF_LONG_LONG__ | 33 | #if __SIZEOF_LONG__ != __SIZEOF_LONG_LONG__ |
2066 | 34 | #define HAVE_LONG_UNSIGNED_VALUE | 34 | #define HAVE_LONG_UNSIGNED_VALUE |
2067 | 35 | #endif | 35 | #endif |
2068 | 36 | 36 | ||
2070 | 37 | namespace utouch { | 37 | namespace oif { |
2071 | 38 | namespace frame { | 38 | namespace frame { |
2072 | 39 | 39 | ||
2073 | 40 | class Value { | 40 | class Value { |
2074 | @@ -104,6 +104,6 @@ | |||
2075 | 104 | }; | 104 | }; |
2076 | 105 | 105 | ||
2077 | 106 | } // namespace frame | 106 | } // namespace frame |
2079 | 107 | } // namespace utouch | 107 | } // namespace oif |
2080 | 108 | 108 | ||
2082 | 109 | #endif // UTOUCH_FRAME_VALUE_H_ | 109 | #endif // FRAME_VALUE_H_ |
2083 | 110 | 110 | ||
2084 | === modified file 'src/window.cpp' | |||
2085 | --- src/window.cpp 2012-06-18 18:28:21 +0000 | |||
2086 | +++ src/window.cpp 2012-07-24 22:45:29 +0000 | |||
2087 | @@ -1,6 +1,6 @@ | |||
2088 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2089 | 2 | * | 2 | * |
2091 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2092 | 4 | * | 4 | * |
2093 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2094 | 6 | * | 6 | * |
2095 | @@ -24,7 +24,7 @@ | |||
2096 | 24 | 24 | ||
2097 | 25 | #include "frame.h" | 25 | #include "frame.h" |
2098 | 26 | 26 | ||
2100 | 27 | namespace utouch { | 27 | namespace oif { |
2101 | 28 | namespace frame { | 28 | namespace frame { |
2102 | 29 | 29 | ||
2103 | 30 | Window::Window() : current_frame_(new UFFrame) { | 30 | Window::Window() : current_frame_(new UFFrame) { |
2104 | @@ -43,4 +43,4 @@ | |||
2105 | 43 | } | 43 | } |
2106 | 44 | 44 | ||
2107 | 45 | } // namespace frame | 45 | } // namespace frame |
2109 | 46 | } // namespace utouch | 46 | } // namespace oif |
2110 | 47 | 47 | ||
2111 | === modified file 'src/window.h' | |||
2112 | --- src/window.h 2012-06-18 18:28:21 +0000 | |||
2113 | +++ src/window.h 2012-07-24 22:45:29 +0000 | |||
2114 | @@ -1,6 +1,6 @@ | |||
2115 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2116 | 2 | * | 2 | * |
2118 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2119 | 4 | * | 4 | * |
2120 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2121 | 6 | * | 6 | * |
2122 | @@ -18,17 +18,17 @@ | |||
2123 | 18 | * | 18 | * |
2124 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
2125 | 20 | 20 | ||
2128 | 21 | #ifndef UTOUCH_FRAME_WINDOW_H_ | 21 | #ifndef FRAME_WINDOW_H_ |
2129 | 22 | #define UTOUCH_FRAME_WINDOW_H_ | 22 | #define FRAME_WINDOW_H_ |
2130 | 23 | 23 | ||
2131 | 24 | #include <map> | 24 | #include <map> |
2132 | 25 | #include <memory> | 25 | #include <memory> |
2133 | 26 | 26 | ||
2135 | 27 | #include "utouch/frame.h" | 27 | #include "oif/frame.h" |
2136 | 28 | #include "property.h" | 28 | #include "property.h" |
2137 | 29 | #include "typedefs.h" | 29 | #include "typedefs.h" |
2138 | 30 | 30 | ||
2140 | 31 | namespace utouch { | 31 | namespace oif{ |
2141 | 32 | namespace frame { | 32 | namespace frame { |
2142 | 33 | 33 | ||
2143 | 34 | class Window : public std::enable_shared_from_this<Window> { | 34 | class Window : public std::enable_shared_from_this<Window> { |
2144 | @@ -48,6 +48,6 @@ | |||
2145 | 48 | }; | 48 | }; |
2146 | 49 | 49 | ||
2147 | 50 | } // namespace frame | 50 | } // namespace frame |
2149 | 51 | } // namespace utouch | 51 | } // namespace oif |
2150 | 52 | 52 | ||
2152 | 53 | #endif // UTOUCH_FRAME_WINDOW_H_ | 53 | #endif // FRAME_WINDOW_H_ |
2153 | 54 | 54 | ||
2154 | === modified file 'src/x11/device_x11.cpp' | |||
2155 | --- src/x11/device_x11.cpp 2012-06-18 18:28:21 +0000 | |||
2156 | +++ src/x11/device_x11.cpp 2012-07-24 22:45:29 +0000 | |||
2157 | @@ -1,6 +1,6 @@ | |||
2158 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2159 | 2 | * | 2 | * |
2161 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2162 | 4 | * | 4 | * |
2163 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2164 | 6 | * | 6 | * |
2165 | @@ -27,12 +27,12 @@ | |||
2166 | 27 | 27 | ||
2167 | 28 | #include <xorg/xserver-properties.h> | 28 | #include <xorg/xserver-properties.h> |
2168 | 29 | 29 | ||
2170 | 30 | #include "utouch/frame_x11.h" | 30 | #include "oif/frame_x11.h" |
2171 | 31 | #include "axis.h" | 31 | #include "axis.h" |
2172 | 32 | #include "value.h" | 32 | #include "value.h" |
2173 | 33 | #include "x11/window_x11.h" | 33 | #include "x11/window_x11.h" |
2174 | 34 | 34 | ||
2176 | 35 | namespace utouch { | 35 | namespace oif { |
2177 | 36 | namespace frame { | 36 | namespace frame { |
2178 | 37 | 37 | ||
2179 | 38 | namespace { | 38 | namespace { |
2180 | @@ -123,7 +123,7 @@ | |||
2181 | 123 | valuator_info->resolution); | 123 | valuator_info->resolution); |
2182 | 124 | 124 | ||
2183 | 125 | axes_[type] = | 125 | axes_[type] = |
2185 | 126 | std::move(UniqueUFAxis(static_cast<utouch::frame::UFAxis*>(axis))); | 126 | std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); |
2186 | 127 | 127 | ||
2187 | 128 | axis_map_[valuator_info->number] = type; | 128 | axis_map_[valuator_info->number] = type; |
2188 | 129 | 129 | ||
2189 | @@ -171,8 +171,8 @@ | |||
2190 | 171 | SharedUFFrame* frame) { | 171 | SharedUFFrame* frame) { |
2191 | 172 | /* We don't really know if the ownership event is for a particular window | 172 | /* We don't really know if the ownership event is for a particular window |
2192 | 173 | * when using the Ubuntu prototype multitouch X server. We just take the first | 173 | * when using the Ubuntu prototype multitouch X server. We just take the first |
2195 | 174 | * one for algorithmic completeness, and assume the utouch-frame client will | 174 | * one for algorithmic completeness, and assume the frame client will work |
2196 | 175 | * work around this issue. */ | 175 | * around this issue. */ |
2197 | 176 | for (auto& pair : windows_) { | 176 | for (auto& pair : windows_) { |
2198 | 177 | WindowX11* window = static_cast<WindowX11*>(pair.second.get()); | 177 | WindowX11* window = static_cast<WindowX11*>(pair.second.get()); |
2199 | 178 | if (!window->IsTouchOwned(event->touchid)) | 178 | if (!window->IsTouchOwned(event->touchid)) |
2200 | @@ -211,21 +211,21 @@ | |||
2201 | 211 | } | 211 | } |
2202 | 212 | 212 | ||
2203 | 213 | } // namespace frame | 213 | } // namespace frame |
2205 | 214 | } // namespace utouch | 214 | } // namespace oif |
2206 | 215 | 215 | ||
2207 | 216 | extern "C" { | 216 | extern "C" { |
2208 | 217 | 217 | ||
2209 | 218 | UFStatus frame_x11_accept_touch(UFDevice device, UFWindowId window, | 218 | UFStatus frame_x11_accept_touch(UFDevice device, UFWindowId window, |
2210 | 219 | UFTouchId touch_id) { | 219 | UFTouchId touch_id) { |
2213 | 220 | utouch::frame::UFDeviceX11* device_x11 = | 220 | oif::frame::UFDeviceX11* device_x11 = |
2214 | 221 | static_cast<utouch::frame::UFDeviceX11*>(device); | 221 | static_cast<oif::frame::UFDeviceX11*>(device); |
2215 | 222 | return device_x11->AcceptTouch(frame_x11_get_window_id(window), touch_id); | 222 | return device_x11->AcceptTouch(frame_x11_get_window_id(window), touch_id); |
2216 | 223 | } | 223 | } |
2217 | 224 | 224 | ||
2218 | 225 | UFStatus frame_x11_reject_touch(UFDevice device, UFWindowId window, | 225 | UFStatus frame_x11_reject_touch(UFDevice device, UFWindowId window, |
2219 | 226 | UFTouchId touch_id) { | 226 | UFTouchId touch_id) { |
2222 | 227 | utouch::frame::UFDeviceX11* device_x11 = | 227 | oif::frame::UFDeviceX11* device_x11 = |
2223 | 228 | static_cast<utouch::frame::UFDeviceX11*>(device); | 228 | static_cast<oif::frame::UFDeviceX11*>(device); |
2224 | 229 | return device_x11->RejectTouch(frame_x11_get_window_id(window), touch_id); | 229 | return device_x11->RejectTouch(frame_x11_get_window_id(window), touch_id); |
2225 | 230 | } | 230 | } |
2226 | 231 | 231 | ||
2227 | 232 | 232 | ||
2228 | === modified file 'src/x11/device_x11.h' | |||
2229 | --- src/x11/device_x11.h 2012-06-18 18:28:21 +0000 | |||
2230 | +++ src/x11/device_x11.h 2012-07-24 22:45:29 +0000 | |||
2231 | @@ -1,6 +1,6 @@ | |||
2232 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2233 | 2 | * | 2 | * |
2235 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2236 | 4 | * | 4 | * |
2237 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2238 | 6 | * | 6 | * |
2239 | @@ -18,19 +18,19 @@ | |||
2240 | 18 | * | 18 | * |
2241 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
2242 | 20 | 20 | ||
2245 | 21 | #ifndef UTOUCH_FRAME_DEVICE_X11_H_ | 21 | #ifndef FRAME_DEVICE_X11_H_ |
2246 | 22 | #define UTOUCH_FRAME_DEVICE_X11_H_ | 22 | #define FRAME_DEVICE_X11_H_ |
2247 | 23 | 23 | ||
2248 | 24 | #include <map> | 24 | #include <map> |
2249 | 25 | 25 | ||
2250 | 26 | #include <X11/Xlib.h> | 26 | #include <X11/Xlib.h> |
2251 | 27 | #include <X11/extensions/XInput2.h> | 27 | #include <X11/extensions/XInput2.h> |
2252 | 28 | 28 | ||
2254 | 29 | #include "utouch/frame.h" | 29 | #include "oif/frame.h" |
2255 | 30 | #include "device.h" | 30 | #include "device.h" |
2256 | 31 | #include "typedefs.h" | 31 | #include "typedefs.h" |
2257 | 32 | 32 | ||
2259 | 33 | namespace utouch { | 33 | namespace oif { |
2260 | 34 | namespace frame { | 34 | namespace frame { |
2261 | 35 | 35 | ||
2262 | 36 | class UFDeviceX11 | 36 | class UFDeviceX11 |
2263 | @@ -60,6 +60,6 @@ | |||
2264 | 60 | }; | 60 | }; |
2265 | 61 | 61 | ||
2266 | 62 | } // namespace frame | 62 | } // namespace frame |
2268 | 63 | } // namespace utouch | 63 | } // namespace oif |
2269 | 64 | 64 | ||
2271 | 65 | #endif // UTOUCH_FRAME_DEVICE_X11_H_ | 65 | #endif // FRAME_DEVICE_X11_H_ |
2272 | 66 | 66 | ||
2273 | === modified file 'src/x11/frame_x11.cpp' | |||
2274 | --- src/x11/frame_x11.cpp 2012-06-18 18:28:21 +0000 | |||
2275 | +++ src/x11/frame_x11.cpp 2012-07-24 22:45:29 +0000 | |||
2276 | @@ -1,6 +1,6 @@ | |||
2277 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2278 | 2 | * | 2 | * |
2280 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2281 | 4 | * | 4 | * |
2282 | 5 | * Copyright (C) 2011-12 Canonical Ltd. | 5 | * Copyright (C) 2011-12 Canonical Ltd. |
2283 | 6 | * | 6 | * |
2284 | @@ -22,18 +22,18 @@ | |||
2285 | 22 | 22 | ||
2286 | 23 | #include <X11/Xlib.h> | 23 | #include <X11/Xlib.h> |
2287 | 24 | 24 | ||
2290 | 25 | #include "utouch/frame.h" | 25 | #include "oif/frame.h" |
2291 | 26 | #include "utouch/frame_x11.h" | 26 | #include "oif/frame_x11.h" |
2292 | 27 | #include "x11/handle_x11.h" | 27 | #include "x11/handle_x11.h" |
2293 | 28 | 28 | ||
2294 | 29 | extern "C" { | 29 | extern "C" { |
2295 | 30 | 30 | ||
2296 | 31 | UFStatus frame_x11_new(Display* display, ::UFHandle* handle) { | 31 | UFStatus frame_x11_new(Display* display, ::UFHandle* handle) { |
2299 | 32 | utouch::frame::UFHandleX11** handle_x11 = | 32 | oif::frame::UFHandleX11** handle_x11 = |
2300 | 33 | reinterpret_cast<utouch::frame::UFHandleX11**>(handle); | 33 | reinterpret_cast<oif::frame::UFHandleX11**>(handle); |
2301 | 34 | 34 | ||
2302 | 35 | try { | 35 | try { |
2304 | 36 | *handle_x11 = new utouch::frame::UFHandleX11(display); | 36 | *handle_x11 = new oif::frame::UFHandleX11(display); |
2305 | 37 | return UFStatusSuccess; | 37 | return UFStatusSuccess; |
2306 | 38 | } catch (const std::exception& exception) { | 38 | } catch (const std::exception& exception) { |
2307 | 39 | *handle_x11 = NULL; | 39 | *handle_x11 = NULL; |
2308 | @@ -43,14 +43,14 @@ | |||
2309 | 43 | 43 | ||
2310 | 44 | UFStatus frame_x11_process_event(UFHandle handle, | 44 | UFStatus frame_x11_process_event(UFHandle handle, |
2311 | 45 | XGenericEventCookie* xcookie) { | 45 | XGenericEventCookie* xcookie) { |
2314 | 46 | utouch::frame::UFHandleX11* handle_x11 = | 46 | oif::frame::UFHandleX11* handle_x11 = |
2315 | 47 | static_cast<utouch::frame::UFHandleX11*>(handle); | 47 | static_cast<oif::frame::UFHandleX11*>(handle); |
2316 | 48 | return handle_x11->ProcessEvent(xcookie); | 48 | return handle_x11->ProcessEvent(xcookie); |
2317 | 49 | } | 49 | } |
2318 | 50 | 50 | ||
2319 | 51 | void frame_x11_delete(UFHandle handle) { | 51 | void frame_x11_delete(UFHandle handle) { |
2322 | 52 | utouch::frame::UFHandleX11* handle_x11 = | 52 | oif::frame::UFHandleX11* handle_x11 = |
2323 | 53 | static_cast<utouch::frame::UFHandleX11*>(handle); | 53 | static_cast<oif::frame::UFHandleX11*>(handle); |
2324 | 54 | delete handle_x11; | 54 | delete handle_x11; |
2325 | 55 | } | 55 | } |
2326 | 56 | 56 | ||
2327 | 57 | 57 | ||
2328 | === modified file 'src/x11/handle_x11.cpp' | |||
2329 | --- src/x11/handle_x11.cpp 2012-06-18 18:28:21 +0000 | |||
2330 | +++ src/x11/handle_x11.cpp 2012-07-24 22:45:29 +0000 | |||
2331 | @@ -1,6 +1,6 @@ | |||
2332 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2333 | 2 | * | 2 | * |
2335 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2336 | 4 | * | 4 | * |
2337 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2338 | 6 | * | 6 | * |
2339 | @@ -25,12 +25,12 @@ | |||
2340 | 25 | 25 | ||
2341 | 26 | #include <stdexcept> | 26 | #include <stdexcept> |
2342 | 27 | 27 | ||
2344 | 28 | #include "utouch/frame.h" | 28 | #include "oif/frame.h" |
2345 | 29 | #include "event.h" | 29 | #include "event.h" |
2346 | 30 | #include "value.h" | 30 | #include "value.h" |
2347 | 31 | #include "x11/device_x11.h" | 31 | #include "x11/device_x11.h" |
2348 | 32 | 32 | ||
2350 | 33 | namespace utouch { | 33 | namespace oif { |
2351 | 34 | namespace frame { | 34 | namespace frame { |
2352 | 35 | 35 | ||
2353 | 36 | UFHandleX11::UFHandleX11(Display *display) | 36 | UFHandleX11::UFHandleX11(Display *display) |
2354 | @@ -186,4 +186,4 @@ | |||
2355 | 186 | } | 186 | } |
2356 | 187 | 187 | ||
2357 | 188 | } // namespace frame | 188 | } // namespace frame |
2359 | 189 | } // namespace utouch | 189 | } // namespace oif |
2360 | 190 | 190 | ||
2361 | === modified file 'src/x11/handle_x11.h' | |||
2362 | --- src/x11/handle_x11.h 2012-06-18 18:28:21 +0000 | |||
2363 | +++ src/x11/handle_x11.h 2012-07-24 22:45:29 +0000 | |||
2364 | @@ -1,6 +1,6 @@ | |||
2365 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2366 | 2 | * | 2 | * |
2368 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2369 | 4 | * | 4 | * |
2370 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2371 | 6 | * | 6 | * |
2372 | @@ -18,8 +18,8 @@ | |||
2373 | 18 | * | 18 | * |
2374 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
2375 | 20 | 20 | ||
2378 | 21 | #ifndef UTOUCH_FRAME_HANDLE_X11_H_ | 21 | #ifndef FRAME_HANDLE_X11_H_ |
2379 | 22 | #define UTOUCH_FRAME_HANDLE_X11_H_ | 22 | #define FRAME_HANDLE_X11_H_ |
2380 | 23 | 23 | ||
2381 | 24 | #include <stdint.h> | 24 | #include <stdint.h> |
2382 | 25 | 25 | ||
2383 | @@ -32,7 +32,7 @@ | |||
2384 | 32 | #include "handle.h" | 32 | #include "handle.h" |
2385 | 33 | #include "typedefs.h" | 33 | #include "typedefs.h" |
2386 | 34 | 34 | ||
2388 | 35 | namespace utouch { | 35 | namespace oif { |
2389 | 36 | namespace frame { | 36 | namespace frame { |
2390 | 37 | 37 | ||
2391 | 38 | class UFHandleX11 : public UFHandle { | 38 | class UFHandleX11 : public UFHandle { |
2392 | @@ -57,6 +57,6 @@ | |||
2393 | 57 | }; | 57 | }; |
2394 | 58 | 58 | ||
2395 | 59 | } // namespace frame | 59 | } // namespace frame |
2397 | 60 | } // namespace utouch | 60 | } // namespace oif |
2398 | 61 | 61 | ||
2400 | 62 | #endif // UTOUCH_FRAME_HANDLE_X11_H_ | 62 | #endif // FRAME_HANDLE_X11_H_ |
2401 | 63 | 63 | ||
2402 | === modified file 'src/x11/window_x11.cpp' | |||
2403 | --- src/x11/window_x11.cpp 2012-07-17 14:27:52 +0000 | |||
2404 | +++ src/x11/window_x11.cpp 2012-07-24 22:45:29 +0000 | |||
2405 | @@ -1,6 +1,6 @@ | |||
2406 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2407 | 2 | * | 2 | * |
2409 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2410 | 4 | * | 4 | * |
2411 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2412 | 6 | * | 6 | * |
2413 | @@ -22,13 +22,13 @@ | |||
2414 | 22 | 22 | ||
2415 | 23 | #include <stdio.h> | 23 | #include <stdio.h> |
2416 | 24 | 24 | ||
2418 | 25 | #include "utouch/frame_x11.h" | 25 | #include "oif/frame_x11.h" |
2419 | 26 | #include "frame.h" | 26 | #include "frame.h" |
2420 | 27 | #include "touch.h" | 27 | #include "touch.h" |
2421 | 28 | #include "value.h" | 28 | #include "value.h" |
2422 | 29 | #include "x11/device_x11.h" | 29 | #include "x11/device_x11.h" |
2423 | 30 | 30 | ||
2425 | 31 | namespace utouch { | 31 | namespace oif { |
2426 | 32 | namespace frame { | 32 | namespace frame { |
2427 | 33 | 33 | ||
2428 | 34 | WindowX11::WindowX11(::Window window, const SharedUFDevice& device, | 34 | WindowX11::WindowX11(::Window window, const SharedUFDevice& device, |
2429 | @@ -101,7 +101,7 @@ | |||
2430 | 101 | 101 | ||
2431 | 102 | int i = 0; /* Current XI axis number */ | 102 | int i = 0; /* Current XI axis number */ |
2432 | 103 | int j = 0; /* Current XI valuator value offset in event */ | 103 | int j = 0; /* Current XI valuator value offset in event */ |
2434 | 104 | int k = 0; /* Number of handled utouch-frame axes */ | 104 | int k = 0; /* Number of handled frame axes */ |
2435 | 105 | for (; | 105 | for (; |
2436 | 106 | i < event->valuators.mask_len * 8 && | 106 | i < event->valuators.mask_len * 8 && |
2437 | 107 | k < static_cast<int>(device_->axis_map().size()); | 107 | k < static_cast<int>(device_->axis_map().size()); |
2438 | @@ -206,4 +206,4 @@ | |||
2439 | 206 | } | 206 | } |
2440 | 207 | 207 | ||
2441 | 208 | } // namespace frame | 208 | } // namespace frame |
2443 | 209 | } // namespace utouch | 209 | } // namespace oif |
2444 | 210 | 210 | ||
2445 | === modified file 'src/x11/window_x11.h' | |||
2446 | --- src/x11/window_x11.h 2012-07-17 14:27:52 +0000 | |||
2447 | +++ src/x11/window_x11.h 2012-07-24 22:45:29 +0000 | |||
2448 | @@ -1,6 +1,6 @@ | |||
2449 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2450 | 2 | * | 2 | * |
2452 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2453 | 4 | * | 4 | * |
2454 | 5 | * Copyright (C) 2011-2012 Canonical Ltd. | 5 | * Copyright (C) 2011-2012 Canonical Ltd. |
2455 | 6 | * | 6 | * |
2456 | @@ -18,8 +18,8 @@ | |||
2457 | 18 | * | 18 | * |
2458 | 19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
2459 | 20 | 20 | ||
2462 | 21 | #ifndef UTOUCH_FRAME_WINDOW_X11_H_ | 21 | #ifndef FRAME_WINDOW_X11_H_ |
2463 | 22 | #define UTOUCH_FRAME_WINDOW_X11_H_ | 22 | #define FRAME_WINDOW_X11_H_ |
2464 | 23 | 23 | ||
2465 | 24 | #include <map> | 24 | #include <map> |
2466 | 25 | #include <memory> | 25 | #include <memory> |
2467 | @@ -28,11 +28,11 @@ | |||
2468 | 28 | #include <X11/Xlib.h> | 28 | #include <X11/Xlib.h> |
2469 | 29 | #include <X11/extensions/XInput2.h> | 29 | #include <X11/extensions/XInput2.h> |
2470 | 30 | 30 | ||
2472 | 31 | #include "utouch/frame.h" | 31 | #include "oif/frame.h" |
2473 | 32 | #include "typedefs.h" | 32 | #include "typedefs.h" |
2474 | 33 | #include "window.h" | 33 | #include "window.h" |
2475 | 34 | 34 | ||
2477 | 35 | namespace utouch { | 35 | namespace oif { |
2478 | 36 | namespace frame { | 36 | namespace frame { |
2479 | 37 | 37 | ||
2480 | 38 | class UFDeviceX11; | 38 | class UFDeviceX11; |
2481 | @@ -61,6 +61,6 @@ | |||
2482 | 61 | }; | 61 | }; |
2483 | 62 | 62 | ||
2484 | 63 | } // namespace frame | 63 | } // namespace frame |
2486 | 64 | } // namespace utouch | 64 | } // namespace oif |
2487 | 65 | 65 | ||
2489 | 66 | #endif // UTOUCH_FRAME_WINDOW_X11_H_ | 66 | #endif // FRAME_WINDOW_X11_H_ |
2490 | 67 | 67 | ||
2491 | === modified file 'test/integration/Makefile.am' | |||
2492 | --- test/integration/Makefile.am 2012-07-18 12:59:17 +0000 | |||
2493 | +++ test/integration/Makefile.am 2012-07-24 22:45:29 +0000 | |||
2494 | @@ -43,7 +43,7 @@ | |||
2495 | 43 | # internal symbols. | 43 | # internal symbols. |
2496 | 44 | # | 44 | # |
2497 | 45 | check_integration_LDADD = \ | 45 | check_integration_LDADD = \ |
2499 | 46 | $(top_builddir)/src/.libs/libutouch-frame.a \ | 46 | $(top_builddir)/src/.libs/libframe.a \ |
2500 | 47 | $(top_builddir)/test/gtest/libgtest.a \ | 47 | $(top_builddir)/test/gtest/libgtest.a \ |
2501 | 48 | $(top_builddir)/test/gtest/libxorg-gtest.a \ | 48 | $(top_builddir)/test/gtest/libxorg-gtest.a \ |
2502 | 49 | $(top_builddir)/test/gtest/libxorg-gtest_main.a \ | 49 | $(top_builddir)/test/gtest/libxorg-gtest_main.a \ |
2503 | 50 | 50 | ||
2504 | === modified file 'test/integration/events.cpp' | |||
2505 | --- test/integration/events.cpp 2012-07-17 13:55:33 +0000 | |||
2506 | +++ test/integration/events.cpp 2012-07-24 22:45:29 +0000 | |||
2507 | @@ -1,6 +1,6 @@ | |||
2508 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2509 | 2 | * | 2 | * |
2511 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2512 | 4 | * | 4 | * |
2513 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2514 | 6 | * | 6 | * |
2515 | @@ -23,7 +23,7 @@ | |||
2516 | 23 | 23 | ||
2517 | 24 | #include <stdexcept> | 24 | #include <stdexcept> |
2518 | 25 | 25 | ||
2520 | 26 | namespace utouch { | 26 | namespace oif { |
2521 | 27 | namespace frame { | 27 | namespace frame { |
2522 | 28 | namespace testing { | 28 | namespace testing { |
2523 | 29 | 29 | ||
2524 | @@ -45,8 +45,8 @@ | |||
2525 | 45 | return value; | 45 | return value; |
2526 | 46 | } | 46 | } |
2527 | 47 | 47 | ||
2530 | 48 | bool IsEqual(const utouch::frame::testing::Touch& a, | 48 | bool IsEqual(const oif::frame::testing::Touch& a, |
2531 | 49 | const utouch::frame::testing::Touch& b) { | 49 | const oif::frame::testing::Touch& b) { |
2532 | 50 | /* We rely on the fact that values are stored in maps, so if the values are | 50 | /* We rely on the fact that values are stored in maps, so if the values are |
2533 | 51 | * equal they will also be stored in the same order. */ | 51 | * equal they will also be stored in the same order. */ |
2534 | 52 | for (auto property_a = a.first.cbegin(), property_b = b.first.cbegin(); | 52 | for (auto property_a = a.first.cbegin(), property_b = b.first.cbegin(); |
2535 | @@ -87,4 +87,4 @@ | |||
2536 | 87 | 87 | ||
2537 | 88 | } // namespace testing | 88 | } // namespace testing |
2538 | 89 | } // namespace frame | 89 | } // namespace frame |
2540 | 90 | } // namespace utouch | 90 | } // namespace oif |
2541 | 91 | 91 | ||
2542 | === modified file 'test/integration/events.h' | |||
2543 | --- test/integration/events.h 2012-07-17 13:55:33 +0000 | |||
2544 | +++ test/integration/events.h 2012-07-24 22:45:29 +0000 | |||
2545 | @@ -1,6 +1,6 @@ | |||
2546 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2547 | 2 | * | 2 | * |
2549 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2550 | 4 | * | 4 | * |
2551 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2552 | 6 | * | 6 | * |
2553 | @@ -19,15 +19,15 @@ | |||
2554 | 19 | * | 19 | * |
2555 | 20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
2556 | 21 | 21 | ||
2559 | 22 | #ifndef UTOUCH_FRAME_TEST_EVENTS_H_ | 22 | #ifndef FRAME_TEST_EVENTS_H_ |
2560 | 23 | #define UTOUCH_FRAME_TEST_EVENTS_H_ | 23 | #define FRAME_TEST_EVENTS_H_ |
2561 | 24 | 24 | ||
2562 | 25 | #include <map> | 25 | #include <map> |
2563 | 26 | #include <vector> | 26 | #include <vector> |
2564 | 27 | 27 | ||
2566 | 28 | #include "utouch/frame.h" | 28 | #include "oif/frame.h" |
2567 | 29 | 29 | ||
2569 | 30 | namespace utouch { | 30 | namespace oif { |
2570 | 31 | namespace frame { | 31 | namespace frame { |
2571 | 32 | namespace testing { | 32 | namespace testing { |
2572 | 33 | 33 | ||
2573 | @@ -53,6 +53,6 @@ | |||
2574 | 53 | 53 | ||
2575 | 54 | } // namespace testing | 54 | } // namespace testing |
2576 | 55 | } // namespace frame | 55 | } // namespace frame |
2578 | 56 | } // namespace utouch | 56 | } // namespace oif |
2579 | 57 | 57 | ||
2581 | 58 | #endif // UTOUCH_FRAME_TEST_EVENTS_H_ | 58 | #endif // FRAME_TEST_EVENTS_H_ |
2582 | 59 | 59 | ||
2583 | === modified file 'test/integration/x11/device.cpp' | |||
2584 | --- test/integration/x11/device.cpp 2012-03-22 15:45:48 +0000 | |||
2585 | +++ test/integration/x11/device.cpp 2012-07-24 22:45:29 +0000 | |||
2586 | @@ -1,6 +1,6 @@ | |||
2587 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2588 | 2 | * | 2 | * |
2590 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2591 | 4 | * | 4 | * |
2592 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2593 | 6 | * | 6 | * |
2594 | @@ -23,9 +23,9 @@ | |||
2595 | 23 | #include <stdexcept> | 23 | #include <stdexcept> |
2596 | 24 | 24 | ||
2597 | 25 | #include "x11/fixture.h" | 25 | #include "x11/fixture.h" |
2599 | 26 | #include "utouch/frame_x11.h" | 26 | #include "oif/frame_x11.h" |
2600 | 27 | 27 | ||
2602 | 28 | using namespace utouch::frame::x11::testing; | 28 | using namespace oif::frame::x11::testing; |
2603 | 29 | 29 | ||
2604 | 30 | class FrameDeviceTest : public Test { | 30 | class FrameDeviceTest : public Test { |
2605 | 31 | public: | 31 | public: |
2606 | 32 | 32 | ||
2607 | === modified file 'test/integration/x11/dynamic_type_checking.cpp' | |||
2608 | --- test/integration/x11/dynamic_type_checking.cpp 2012-03-21 16:00:02 +0000 | |||
2609 | +++ test/integration/x11/dynamic_type_checking.cpp 2012-07-24 22:45:29 +0000 | |||
2610 | @@ -1,6 +1,6 @@ | |||
2611 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2612 | 2 | * | 2 | * |
2614 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2615 | 4 | * | 4 | * |
2616 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2617 | 6 | * | 6 | * |
2618 | @@ -30,7 +30,7 @@ | |||
2619 | 30 | 30 | ||
2620 | 31 | #include "x11/fixture.h" | 31 | #include "x11/fixture.h" |
2621 | 32 | 32 | ||
2623 | 33 | using namespace utouch::frame::x11::testing; | 33 | using namespace oif::frame::x11::testing; |
2624 | 34 | 34 | ||
2625 | 35 | class DynamicTypeTest : public Test { | 35 | class DynamicTypeTest : public Test { |
2626 | 36 | public: | 36 | public: |
2627 | 37 | 37 | ||
2628 | === modified file 'test/integration/x11/fixture.cpp' | |||
2629 | --- test/integration/x11/fixture.cpp 2012-02-11 00:24:29 +0000 | |||
2630 | +++ test/integration/x11/fixture.cpp 2012-07-24 22:45:29 +0000 | |||
2631 | @@ -1,6 +1,6 @@ | |||
2632 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2633 | 2 | * | 2 | * |
2635 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2636 | 4 | * | 4 | * |
2637 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2638 | 6 | * | 6 | * |
2639 | @@ -24,10 +24,10 @@ | |||
2640 | 24 | #include <X11/Xlib.h> | 24 | #include <X11/Xlib.h> |
2641 | 25 | #include <X11/extensions/XInput2.h> | 25 | #include <X11/extensions/XInput2.h> |
2642 | 26 | 26 | ||
2645 | 27 | #include "utouch/frame.h" | 27 | #include "oif/frame.h" |
2646 | 28 | #include "utouch/frame_x11.h" | 28 | #include "oif/frame_x11.h" |
2647 | 29 | 29 | ||
2649 | 30 | void utouch::frame::x11::testing::Test::SetUp() { | 30 | void oif::frame::x11::testing::Test::SetUp() { |
2650 | 31 | ASSERT_NO_FATAL_FAILURE(xorg::testing::Test::SetUp()); | 31 | ASSERT_NO_FATAL_FAILURE(xorg::testing::Test::SetUp()); |
2651 | 32 | 32 | ||
2652 | 33 | int xi_major = 2; | 33 | int xi_major = 2; |
2653 | @@ -67,7 +67,7 @@ | |||
2654 | 67 | ASSERT_TRUE(handle_ != NULL); | 67 | ASSERT_TRUE(handle_ != NULL); |
2655 | 68 | } | 68 | } |
2656 | 69 | 69 | ||
2658 | 70 | void utouch::frame::x11::testing::Test::PumpEvents(uint64_t timeout) { | 70 | void oif::frame::x11::testing::Test::PumpEvents(uint64_t timeout) { |
2659 | 71 | fd_set set; | 71 | fd_set set; |
2660 | 72 | FD_ZERO(&set); | 72 | FD_ZERO(&set); |
2661 | 73 | 73 | ||
2662 | @@ -126,7 +126,7 @@ | |||
2663 | 126 | } | 126 | } |
2664 | 127 | } | 127 | } |
2665 | 128 | 128 | ||
2667 | 129 | void utouch::frame::x11::testing::Test::TearDown() { | 129 | void oif::frame::x11::testing::Test::TearDown() { |
2668 | 130 | frame_x11_delete(handle_); | 130 | frame_x11_delete(handle_); |
2669 | 131 | xorg::testing::Test::TearDown(); | 131 | xorg::testing::Test::TearDown(); |
2670 | 132 | } | 132 | } |
2671 | 133 | 133 | ||
2672 | === modified file 'test/integration/x11/fixture.h' | |||
2673 | --- test/integration/x11/fixture.h 2012-03-22 15:45:48 +0000 | |||
2674 | +++ test/integration/x11/fixture.h 2012-07-24 22:45:29 +0000 | |||
2675 | @@ -1,6 +1,6 @@ | |||
2676 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2677 | 2 | * | 2 | * |
2679 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2680 | 4 | * | 4 | * |
2681 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2682 | 6 | * | 6 | * |
2683 | @@ -19,14 +19,14 @@ | |||
2684 | 19 | * | 19 | * |
2685 | 20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
2686 | 21 | 21 | ||
2689 | 22 | #ifndef UTOUCH_FRAME_TEST_FIXTURE_H_ | 22 | #ifndef FRAME_TEST_FIXTURE_H_ |
2690 | 23 | #define UTOUCH_FRAME_TEST_FIXTURE_H_ | 23 | #define FRAME_TEST_FIXTURE_H_ |
2691 | 24 | 24 | ||
2692 | 25 | #include <xorg/gtest/xorg-gtest.h> | 25 | #include <xorg/gtest/xorg-gtest.h> |
2693 | 26 | 26 | ||
2695 | 27 | #include "utouch/frame.h" | 27 | #include "oif/frame.h" |
2696 | 28 | 28 | ||
2698 | 29 | namespace utouch { | 29 | namespace oif { |
2699 | 30 | namespace frame { | 30 | namespace frame { |
2700 | 31 | namespace x11 { | 31 | namespace x11 { |
2701 | 32 | namespace testing { | 32 | namespace testing { |
2702 | @@ -54,6 +54,6 @@ | |||
2703 | 54 | } // namespace testing | 54 | } // namespace testing |
2704 | 55 | } // namespace x11 | 55 | } // namespace x11 |
2705 | 56 | } // namespace frame | 56 | } // namespace frame |
2707 | 57 | } // namespace utouch | 57 | } // namespace oif |
2708 | 58 | 58 | ||
2710 | 59 | #endif // UTOUCH_FRAME_TEST_FIXTURE_H_ | 59 | #endif // FRAME_TEST_FIXTURE_H_ |
2711 | 60 | 60 | ||
2712 | === modified file 'test/integration/x11/ids.cpp' | |||
2713 | --- test/integration/x11/ids.cpp 2011-12-07 02:28:31 +0000 | |||
2714 | +++ test/integration/x11/ids.cpp 2012-07-24 22:45:29 +0000 | |||
2715 | @@ -1,6 +1,6 @@ | |||
2716 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2717 | 2 | * | 2 | * |
2719 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2720 | 4 | * | 4 | * |
2721 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2722 | 6 | * | 6 | * |
2723 | @@ -21,7 +21,7 @@ | |||
2724 | 21 | 21 | ||
2725 | 22 | #include <gtest/gtest.h> | 22 | #include <gtest/gtest.h> |
2726 | 23 | 23 | ||
2728 | 24 | #include "utouch/frame_x11.h" | 24 | #include "oif/frame_x11.h" |
2729 | 25 | 25 | ||
2730 | 26 | TEST(FrameTest, IDs) { | 26 | TEST(FrameTest, IDs) { |
2731 | 27 | Window x11_window_id = 0x892347; | 27 | Window x11_window_id = 0x892347; |
2732 | 28 | 28 | ||
2733 | === modified file 'test/integration/x11/recording.cpp' | |||
2734 | --- test/integration/x11/recording.cpp 2012-03-22 15:45:48 +0000 | |||
2735 | +++ test/integration/x11/recording.cpp 2012-07-24 22:45:29 +0000 | |||
2736 | @@ -1,6 +1,6 @@ | |||
2737 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
2738 | 2 | * | 2 | * |
2740 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
2741 | 4 | * | 4 | * |
2742 | 5 | * Copyright (C) 2011 Canonical Ltd. | 5 | * Copyright (C) 2011 Canonical Ltd. |
2743 | 6 | * | 6 | * |
2744 | @@ -23,9 +23,9 @@ | |||
2745 | 23 | 23 | ||
2746 | 24 | #include "events.h" | 24 | #include "events.h" |
2747 | 25 | #include "x11/fixture.h" | 25 | #include "x11/fixture.h" |
2749 | 26 | #include "utouch/frame_x11.h" | 26 | #include "oif/frame_x11.h" |
2750 | 27 | 27 | ||
2752 | 28 | using namespace utouch::frame::x11::testing; | 28 | using namespace oif::frame::x11::testing; |
2753 | 29 | 29 | ||
2754 | 30 | class FrameRecordingTest : public Test { | 30 | class FrameRecordingTest : public Test { |
2755 | 31 | public: | 31 | public: |
2756 | @@ -41,15 +41,15 @@ | |||
2757 | 41 | FrameRecordingTest& operator=(const FrameRecordingTest&) = delete; | 41 | FrameRecordingTest& operator=(const FrameRecordingTest&) = delete; |
2758 | 42 | 42 | ||
2759 | 43 | protected: | 43 | protected: |
2761 | 44 | static const utouch::frame::testing::Events events_; | 44 | static const oif::frame::testing::Events events_; |
2762 | 45 | 45 | ||
2763 | 46 | virtual void ProcessFrameEvents(); | 46 | virtual void ProcessFrameEvents(); |
2764 | 47 | void CheckFrame(UFFrame frame, uint64_t event_time); | 47 | void CheckFrame(UFFrame frame, uint64_t event_time); |
2765 | 48 | void CheckTouch(UFFrame frame, unsigned int touch_index, uint64_t event_time); | 48 | void CheckTouch(UFFrame frame, unsigned int touch_index, uint64_t event_time); |
2767 | 49 | void CheckProperty(const utouch::frame::testing::Property& property, | 49 | void CheckProperty(const oif::frame::testing::Property& property, |
2768 | 50 | UFTouch touch, UFFrame frame, int touch_index, | 50 | UFTouch touch, UFFrame frame, int touch_index, |
2769 | 51 | bool check_prev); | 51 | bool check_prev); |
2771 | 52 | void CheckAxisValue(const utouch::frame::testing::AxisValue& axis_value, | 52 | void CheckAxisValue(const oif::frame::testing::AxisValue& axis_value, |
2772 | 53 | UFTouch touch, UFFrame frame, int touch_index, | 53 | UFTouch touch, UFFrame frame, int touch_index, |
2773 | 54 | bool check_prev); | 54 | bool check_prev); |
2774 | 55 | 55 | ||
2775 | @@ -140,8 +140,8 @@ | |||
2776 | 140 | * us to properly check the previous property and axis values. */ | 140 | * us to properly check the previous property and axis values. */ |
2777 | 141 | if (step_ > 0) { | 141 | if (step_ > 0) { |
2778 | 142 | for (const auto& pair : touch_map_) { | 142 | for (const auto& pair : touch_map_) { |
2781 | 143 | const utouch::frame::testing::Touch* touch; | 143 | const oif::frame::testing::Touch* touch; |
2782 | 144 | const utouch::frame::testing::Properties* properties; | 144 | const oif::frame::testing::Properties* properties; |
2783 | 145 | UFTouchState state; | 145 | UFTouchState state; |
2784 | 146 | 146 | ||
2785 | 147 | /* Check if the size of the touch map is at most the expected size for | 147 | /* Check if the size of the touch map is at most the expected size for |
2786 | @@ -212,7 +212,7 @@ | |||
2787 | 212 | frame_frame_get_touch_by_index(frame, touch_index, &touch)); | 212 | frame_frame_get_touch_by_index(frame, touch_index, &touch)); |
2788 | 213 | 213 | ||
2789 | 214 | UFTouchId id = frame_touch_get_id(touch); | 214 | UFTouchId id = frame_touch_get_id(touch); |
2791 | 215 | const utouch::frame::testing::Touch& expected = events_[step_][touch_index]; | 215 | const oif::frame::testing::Touch& expected = events_[step_][touch_index]; |
2792 | 216 | 216 | ||
2793 | 217 | /* Check each property */ | 217 | /* Check each property */ |
2794 | 218 | for (const auto& property : expected.first) | 218 | for (const auto& property : expected.first) |
2795 | @@ -240,10 +240,10 @@ | |||
2796 | 240 | << "Step " << step_ << ", Touch " << id; | 240 | << "Step " << step_ << ", Touch " << id; |
2797 | 241 | 241 | ||
2798 | 242 | int slot = touch_map_[id]; | 242 | int slot = touch_map_[id]; |
2800 | 243 | const utouch::frame::testing::Touch& prev_expected = | 243 | const oif::frame::testing::Touch& prev_expected = |
2801 | 244 | events_[step_ - 1][slot]; | 244 | events_[step_ - 1][slot]; |
2802 | 245 | 245 | ||
2804 | 246 | if (utouch::frame::testing::IsEqual(expected, prev_expected)) { | 246 | if (oif::frame::testing::IsEqual(expected, prev_expected)) { |
2805 | 247 | EXPECT_EQ(touch_times_[id], frame_touch_get_time(touch)) | 247 | EXPECT_EQ(touch_times_[id], frame_touch_get_time(touch)) |
2806 | 248 | << "Step " << step_ << ", Touch " << id; | 248 | << "Step " << step_ << ", Touch " << id; |
2807 | 249 | } else { | 249 | } else { |
2808 | @@ -268,7 +268,7 @@ | |||
2809 | 268 | } | 268 | } |
2810 | 269 | 269 | ||
2811 | 270 | void FrameRecordingTest::CheckProperty( | 270 | void FrameRecordingTest::CheckProperty( |
2813 | 271 | const utouch::frame::testing::Property& property, | 271 | const oif::frame::testing::Property& property, |
2814 | 272 | UFTouch touch, | 272 | UFTouch touch, |
2815 | 273 | UFFrame frame, | 273 | UFFrame frame, |
2816 | 274 | int touch_index, | 274 | int touch_index, |
2817 | @@ -344,7 +344,7 @@ | |||
2818 | 344 | } | 344 | } |
2819 | 345 | 345 | ||
2820 | 346 | void FrameRecordingTest::CheckAxisValue( | 346 | void FrameRecordingTest::CheckAxisValue( |
2822 | 347 | const utouch::frame::testing::AxisValue& axis_value, | 347 | const oif::frame::testing::AxisValue& axis_value, |
2823 | 348 | UFTouch touch, | 348 | UFTouch touch, |
2824 | 349 | UFFrame frame, | 349 | UFFrame frame, |
2825 | 350 | int touch_index, | 350 | int touch_index, |
2826 | @@ -410,7 +410,7 @@ | |||
2827 | 410 | /* Construct the expected events */ | 410 | /* Construct the expected events */ |
2828 | 411 | namespace { | 411 | namespace { |
2829 | 412 | 412 | ||
2831 | 413 | using namespace utouch::frame::testing; | 413 | using namespace oif::frame::testing; |
2832 | 414 | 414 | ||
2833 | 415 | const Touch ConstructTouch(UFTouchState state, float window_x, float window_y, | 415 | const Touch ConstructTouch(UFTouchState state, float window_x, float window_y, |
2834 | 416 | bool owned, bool pending_end, float x, float y, | 416 | bool owned, bool pending_end, float x, float y, |
2835 | @@ -645,5 +645,5 @@ | |||
2836 | 645 | } // namespace | 645 | } // namespace |
2837 | 646 | 646 | ||
2838 | 647 | /* Now initialize the static test fixture member */ | 647 | /* Now initialize the static test fixture member */ |
2840 | 648 | const utouch::frame::testing::Events | 648 | const oif::frame::testing::Events |
2841 | 649 | FrameRecordingTest::events_(ConstructEvents()); | 649 | FrameRecordingTest::events_(ConstructEvents()); |
2842 | 650 | 650 | ||
2843 | === modified file 'test/regular/Makefile.am' | |||
2844 | --- test/regular/Makefile.am 2012-07-18 12:59:17 +0000 | |||
2845 | +++ test/regular/Makefile.am 2012-07-24 22:45:29 +0000 | |||
2846 | @@ -9,12 +9,12 @@ | |||
2847 | 9 | 9 | ||
2848 | 10 | check_c_compile_SOURCES = check-c-compile.c | 10 | check_c_compile_SOURCES = check-c-compile.c |
2849 | 11 | check_c_compile_LDADD = \ | 11 | check_c_compile_LDADD = \ |
2851 | 12 | $(top_builddir)/src/libutouch-frame.la \ | 12 | $(top_builddir)/src/libframe.la \ |
2852 | 13 | $(COVERAGE_LIBS) | 13 | $(COVERAGE_LIBS) |
2853 | 14 | 14 | ||
2854 | 15 | check_cxx_compile_SOURCES = check-cxx-compile.cpp | 15 | check_cxx_compile_SOURCES = check-cxx-compile.cpp |
2855 | 16 | check_cxx_compile_LDADD = \ | 16 | check_cxx_compile_LDADD = \ |
2857 | 17 | $(top_builddir)/src/libutouch-frame.la \ | 17 | $(top_builddir)/src/libframe.la \ |
2858 | 18 | $(COVERAGE_LIBS) | 18 | $(COVERAGE_LIBS) |
2859 | 19 | 19 | ||
2860 | 20 | check-static-type-checking$(EXEEXT): | 20 | check-static-type-checking$(EXEEXT): |
2861 | @@ -38,7 +38,7 @@ | |||
2862 | 38 | # internal symbols. | 38 | # internal symbols. |
2863 | 39 | # | 39 | # |
2864 | 40 | check_regular_LDADD = \ | 40 | check_regular_LDADD = \ |
2866 | 41 | $(top_builddir)/src/.libs/libutouch-frame.a \ | 41 | $(top_builddir)/src/.libs/libframe.a \ |
2867 | 42 | $(top_builddir)/test/gtest/libgtest.a \ | 42 | $(top_builddir)/test/gtest/libgtest.a \ |
2868 | 43 | $(top_builddir)/test/gtest/libgtest_main.a \ | 43 | $(top_builddir)/test/gtest/libgtest_main.a \ |
2869 | 44 | $(top_builddir)/test/x11_mocks/libx11_mocks.a \ | 44 | $(top_builddir)/test/x11_mocks/libx11_mocks.a \ |
2870 | 45 | 45 | ||
2871 | === modified file 'test/regular/check-c-compile.c' | |||
2872 | --- test/regular/check-c-compile.c 2012-07-17 13:55:33 +0000 | |||
2873 | +++ test/regular/check-c-compile.c 2012-07-24 22:45:29 +0000 | |||
2874 | @@ -2,7 +2,7 @@ | |||
2875 | 2 | * Test compiling and linking with a plain C compiler. | 2 | * Test compiling and linking with a plain C compiler. |
2876 | 3 | */ | 3 | */ |
2877 | 4 | 4 | ||
2879 | 5 | #include <utouch/frame_x11.h> | 5 | #include "include/oif/frame_x11.h" |
2880 | 6 | 6 | ||
2881 | 7 | int main(int argc, char **argv) { | 7 | int main(int argc, char **argv) { |
2882 | 8 | UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0); | 8 | UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0); |
2883 | 9 | 9 | ||
2884 | === modified file 'test/regular/check-cxx-compile.cpp' | |||
2885 | --- test/regular/check-cxx-compile.cpp 2012-07-17 13:55:33 +0000 | |||
2886 | +++ test/regular/check-cxx-compile.cpp 2012-07-24 22:45:29 +0000 | |||
2887 | @@ -2,7 +2,7 @@ | |||
2888 | 2 | * Test compiling and linking with a C++ compiler. | 2 | * Test compiling and linking with a C++ compiler. |
2889 | 3 | */ | 3 | */ |
2890 | 4 | 4 | ||
2892 | 5 | #include<utouch/frame_x11.h> | 5 | #include "include/oif/frame_x11.h" |
2893 | 6 | 6 | ||
2894 | 7 | int main(int argc, char **argv) { | 7 | int main(int argc, char **argv) { |
2895 | 8 | UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0); | 8 | UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0); |
2896 | 9 | 9 | ||
2897 | === modified file 'test/regular/check-static-type-checking.c' | |||
2898 | --- test/regular/check-static-type-checking.c 2012-07-17 13:55:33 +0000 | |||
2899 | +++ test/regular/check-static-type-checking.c 2012-07-24 22:45:29 +0000 | |||
2900 | @@ -4,7 +4,7 @@ | |||
2901 | 4 | * test is merely to check that the improper type mechanism is working at all. | 4 | * test is merely to check that the improper type mechanism is working at all. |
2902 | 5 | */ | 5 | */ |
2903 | 6 | 6 | ||
2905 | 7 | #include <utouch/frame.h> | 7 | #include <oif/frame.h> |
2906 | 8 | 8 | ||
2907 | 9 | #ifdef __has_extension | 9 | #ifdef __has_extension |
2908 | 10 | #if __has_extension(c_generic_selections) | 10 | #if __has_extension(c_generic_selections) |
2909 | 11 | 11 | ||
2910 | === modified file 'test/regular/frame-fixture.h' | |||
2911 | --- test/regular/frame-fixture.h 2012-07-17 14:27:23 +0000 | |||
2912 | +++ test/regular/frame-fixture.h 2012-07-24 22:45:29 +0000 | |||
2913 | @@ -2,8 +2,8 @@ | |||
2914 | 2 | #define GTEST_FRAME_FIXTURE_H | 2 | #define GTEST_FRAME_FIXTURE_H |
2915 | 3 | 3 | ||
2916 | 4 | #include <gtest/gtest.h> | 4 | #include <gtest/gtest.h> |
2919 | 5 | #include "utouch/frame.h" | 5 | #include "oif/frame.h" |
2920 | 6 | #include "utouch/frame_x11.h" | 6 | #include "oif/frame_x11.h" |
2921 | 7 | 7 | ||
2922 | 8 | class FrameFixture : public ::testing::Test | 8 | class FrameFixture : public ::testing::Test |
2923 | 9 | { | 9 | { |
2924 | 10 | 10 | ||
2925 | === modified file 'tools/Makefile.am' | |||
2926 | --- tools/Makefile.am 2012-06-18 18:28:21 +0000 | |||
2927 | +++ tools/Makefile.am 2012-07-24 22:45:29 +0000 | |||
2928 | @@ -6,24 +6,24 @@ | |||
2929 | 6 | 6 | ||
2930 | 7 | commondir = common | 7 | commondir = common |
2931 | 8 | 8 | ||
2933 | 9 | bin_PROGRAMS = utouch-frame-test-x11 | 9 | bin_PROGRAMS = frame-test-x11 |
2934 | 10 | 10 | ||
2936 | 11 | utouch_frame_test_x11_SOURCES = utouch-frame-test-x11.c \ | 11 | frame_test_x11_SOURCES = frame-test-x11.c \ |
2937 | 12 | common/device.c \ | 12 | common/device.c \ |
2938 | 13 | common/device.h \ | 13 | common/device.h \ |
2939 | 14 | common/frame.c \ | 14 | common/frame.c \ |
2940 | 15 | common/frame.h \ | 15 | common/frame.h \ |
2941 | 16 | common/touch.c \ | 16 | common/touch.c \ |
2942 | 17 | common/touch.h \ | 17 | common/touch.h \ |
2944 | 18 | utouch-frame-test-x11.txt | 18 | frame-test-x11.txt |
2945 | 19 | 19 | ||
2947 | 20 | utouch_frame_test_x11_LDADD = \ | 20 | frame_test_x11_LDADD = \ |
2948 | 21 | $(XINPUT_LIBS) \ | 21 | $(XINPUT_LIBS) \ |
2950 | 22 | $(top_builddir)/src/libutouch-frame.la \ | 22 | $(top_builddir)/src/libframe.la \ |
2951 | 23 | $(COVERAGE_LIBS) \ | 23 | $(COVERAGE_LIBS) \ |
2952 | 24 | $(CXX_LIBS) | 24 | $(CXX_LIBS) |
2953 | 25 | 25 | ||
2955 | 26 | local_manpages = utouch-frame-test-x11.1 | 26 | local_manpages = frame-test-x11.1 |
2956 | 27 | 27 | ||
2957 | 28 | if HAVE_DOCTOOLS | 28 | if HAVE_DOCTOOLS |
2958 | 29 | dist_man_MANS = $(local_manpages) | 29 | dist_man_MANS = $(local_manpages) |
2959 | 30 | 30 | ||
2960 | === removed file 'tools/common-defs.h' | |||
2961 | --- tools/common-defs.h 2011-09-10 15:58:14 +0000 | |||
2962 | +++ tools/common-defs.h 1970-01-01 00:00:00 +0000 | |||
2963 | @@ -1,85 +0,0 @@ | |||
2964 | 1 | /***************************************************************************** | ||
2965 | 2 | * | ||
2966 | 3 | * utouch-frame - Touch Frame Library | ||
2967 | 4 | * | ||
2968 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | ||
2969 | 6 | * | ||
2970 | 7 | * This program is free software: you can redistribute it and/or modify it | ||
2971 | 8 | * under the terms of the GNU General Public License as published by the | ||
2972 | 9 | * Free Software Foundation, either version 3 of the License, or (at your | ||
2973 | 10 | * option) any later version. | ||
2974 | 11 | * | ||
2975 | 12 | * This program is distributed in the hope that it will be useful, but | ||
2976 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2977 | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
2978 | 15 | * General Public License for more details. | ||
2979 | 16 | * | ||
2980 | 17 | * You should have received a copy of the GNU General Public License along | ||
2981 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2982 | 19 | * | ||
2983 | 20 | * Authors: | ||
2984 | 21 | * Henrik Rydberg <rydberg@bitmath.org> | ||
2985 | 22 | * | ||
2986 | 23 | ****************************************************************************/ | ||
2987 | 24 | |||
2988 | 25 | static void report_device_caps(utouch_frame_handle fh) | ||
2989 | 26 | { | ||
2990 | 27 | const struct utouch_surface *s = utouch_frame_get_surface(fh); | ||
2991 | 28 | |||
2992 | 29 | fprintf(stderr, "device props:\n"); | ||
2993 | 30 | if (s->needs_pointer) | ||
2994 | 31 | fprintf(stderr, "\tpointer\n"); | ||
2995 | 32 | if (s->is_direct) | ||
2996 | 33 | fprintf(stderr, "\tdirect\n"); | ||
2997 | 34 | if (s->is_buttonpad) | ||
2998 | 35 | fprintf(stderr, "\tbuttonpad\n"); | ||
2999 | 36 | if (s->is_semi_mt) | ||
3000 | 37 | fprintf(stderr, "\tsemi_mt\n"); | ||
3001 | 38 | fprintf(stderr, "device mt events:\n"); | ||
3002 | 39 | if (s->use_touch_major) | ||
3003 | 40 | fprintf(stderr, "\ttouch_major\n"); | ||
3004 | 41 | if (s->use_touch_minor) | ||
3005 | 42 | fprintf(stderr, "\ttouch_minor\n"); | ||
3006 | 43 | if (s->use_width_major) | ||
3007 | 44 | fprintf(stderr, "\twidth_major\n"); | ||
3008 | 45 | if (s->use_width_minor) | ||
3009 | 46 | fprintf(stderr, "\twidth_minor\n"); | ||
3010 | 47 | if (s->use_orientation) | ||
3011 | 48 | fprintf(stderr, "\torientation\n"); | ||
3012 | 49 | if (s->use_pressure) | ||
3013 | 50 | fprintf(stderr, "\tpressure\n"); | ||
3014 | 51 | if (s->use_distance) | ||
3015 | 52 | fprintf(stderr, "\tdistance\n"); | ||
3016 | 53 | } | ||
3017 | 54 | |||
3018 | 55 | static void report_frame(const struct utouch_frame *frame) | ||
3019 | 56 | { | ||
3020 | 57 | int i; | ||
3021 | 58 | |||
3022 | 59 | for (i = 0; i < frame->num_active; i++) { | ||
3023 | 60 | const struct utouch_contact *t = frame->active[i]; | ||
3024 | 61 | |||
3025 | 62 | fprintf(stderr, "touch %d\n", i); | ||
3026 | 63 | fprintf(stderr, " slot: %d\n", t->slot); | ||
3027 | 64 | fprintf(stderr, " id: %d\n", t->id); | ||
3028 | 65 | fprintf(stderr, " tool_type: %d\n", t->tool_type); | ||
3029 | 66 | fprintf(stderr, " x: %f\n", t->x); | ||
3030 | 67 | fprintf(stderr, " y: %f\n", t->y); | ||
3031 | 68 | fprintf(stderr, " touch_major: %f\n", t->touch_major); | ||
3032 | 69 | fprintf(stderr, " touch_minor: %f\n", t->touch_minor); | ||
3033 | 70 | fprintf(stderr, " width_major: %f\n", t->width_major); | ||
3034 | 71 | fprintf(stderr, " width_minor: %f\n", t->width_minor); | ||
3035 | 72 | fprintf(stderr, " angle: %f\n", t->orientation); | ||
3036 | 73 | fprintf(stderr, " pressure: %f\n", t->pressure); | ||
3037 | 74 | fprintf(stderr, " distance: %f\n", t->distance); | ||
3038 | 75 | fprintf(stderr, " vx: %f\n", t->vx); | ||
3039 | 76 | fprintf(stderr, " vy: %f\n", t->vy); | ||
3040 | 77 | } | ||
3041 | 78 | |||
3042 | 79 | fprintf(stderr, "sync %d %jd %d %d %d\n", | ||
3043 | 80 | frame->num_active, | ||
3044 | 81 | frame->time, | ||
3045 | 82 | frame->sequence_id, | ||
3046 | 83 | frame->revision, | ||
3047 | 84 | frame->slot_revision); | ||
3048 | 85 | } | ||
3049 | 86 | 0 | ||
3050 | === modified file 'tools/common/device.c' | |||
3051 | --- tools/common/device.c 2011-09-29 21:20:29 +0000 | |||
3052 | +++ tools/common/device.c 2012-07-24 22:45:29 +0000 | |||
3053 | @@ -1,6 +1,6 @@ | |||
3054 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
3055 | 2 | * | 2 | * |
3057 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
3058 | 4 | * | 4 | * |
3059 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | 5 | * Copyright (C) 2010-2011 Canonical Ltd. |
3060 | 6 | * | 6 | * |
3061 | 7 | 7 | ||
3062 | === modified file 'tools/common/device.h' | |||
3063 | --- tools/common/device.h 2011-09-29 21:20:29 +0000 | |||
3064 | +++ tools/common/device.h 2012-07-24 22:45:29 +0000 | |||
3065 | @@ -1,6 +1,6 @@ | |||
3066 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
3067 | 2 | * | 2 | * |
3069 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
3070 | 4 | * | 4 | * |
3071 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | 5 | * Copyright (C) 2010-2011 Canonical Ltd. |
3072 | 6 | * | 6 | * |
3073 | @@ -19,7 +19,7 @@ | |||
3074 | 19 | * | 19 | * |
3075 | 20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
3076 | 21 | 21 | ||
3078 | 22 | #include <utouch/frame.h> | 22 | #include <oif/frame.h> |
3079 | 23 | 23 | ||
3080 | 24 | void get_axis_info(UFAxis axis, UFAxisType *type, const char **name, float *min, | 24 | void get_axis_info(UFAxis axis, UFAxisType *type, const char **name, float *min, |
3081 | 25 | float *max, float *res); | 25 | float *max, float *res); |
3082 | 26 | 26 | ||
3083 | === modified file 'tools/common/frame.c' | |||
3084 | --- tools/common/frame.c 2011-12-25 21:29:09 +0000 | |||
3085 | +++ tools/common/frame.c 2012-07-24 22:45:29 +0000 | |||
3086 | @@ -1,6 +1,6 @@ | |||
3087 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
3088 | 2 | * | 2 | * |
3090 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
3091 | 4 | * | 4 | * |
3092 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | 5 | * Copyright (C) 2010-2011 Canonical Ltd. |
3093 | 6 | * | 6 | * |
3094 | @@ -25,7 +25,7 @@ | |||
3095 | 25 | 25 | ||
3096 | 26 | #include <X11/X.h> | 26 | #include <X11/X.h> |
3097 | 27 | 27 | ||
3099 | 28 | #include <utouch/frame_x11.h> | 28 | #include <oif/frame_x11.h> |
3100 | 29 | 29 | ||
3101 | 30 | #include "common/touch.h" | 30 | #include "common/touch.h" |
3102 | 31 | 31 | ||
3103 | 32 | 32 | ||
3104 | === modified file 'tools/common/frame.h' | |||
3105 | --- tools/common/frame.h 2011-09-29 21:20:29 +0000 | |||
3106 | +++ tools/common/frame.h 2012-07-24 22:45:29 +0000 | |||
3107 | @@ -1,6 +1,6 @@ | |||
3108 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
3109 | 2 | * | 2 | * |
3111 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
3112 | 4 | * | 4 | * |
3113 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | 5 | * Copyright (C) 2010-2011 Canonical Ltd. |
3114 | 6 | * | 6 | * |
3115 | @@ -19,6 +19,6 @@ | |||
3116 | 19 | * | 19 | * |
3117 | 20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
3118 | 21 | 21 | ||
3120 | 22 | #include <utouch/frame.h> | 22 | #include <oif/frame.h> |
3121 | 23 | 23 | ||
3122 | 24 | void print_frame(UFHandle handle, UFEvent event); | 24 | void print_frame(UFHandle handle, UFEvent event); |
3123 | 25 | 25 | ||
3124 | === modified file 'tools/common/touch.c' | |||
3125 | --- tools/common/touch.c 2011-11-09 18:14:17 +0000 | |||
3126 | +++ tools/common/touch.c 2012-07-24 22:45:29 +0000 | |||
3127 | @@ -1,6 +1,6 @@ | |||
3128 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
3129 | 2 | * | 2 | * |
3131 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
3132 | 4 | * | 4 | * |
3133 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | 5 | * Copyright (C) 2010-2011 Canonical Ltd. |
3134 | 6 | * | 6 | * |
3135 | @@ -23,7 +23,7 @@ | |||
3136 | 23 | 23 | ||
3137 | 24 | #include <stdio.h> | 24 | #include <stdio.h> |
3138 | 25 | 25 | ||
3140 | 26 | #include <utouch/frame_x11.h> | 26 | #include <oif/frame_x11.h> |
3141 | 27 | 27 | ||
3142 | 28 | #include "common/device.h" | 28 | #include "common/device.h" |
3143 | 29 | 29 | ||
3144 | 30 | 30 | ||
3145 | === modified file 'tools/common/touch.h' | |||
3146 | --- tools/common/touch.h 2011-09-29 21:20:29 +0000 | |||
3147 | +++ tools/common/touch.h 2012-07-24 22:45:29 +0000 | |||
3148 | @@ -1,6 +1,6 @@ | |||
3149 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
3150 | 2 | * | 2 | * |
3152 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
3153 | 4 | * | 4 | * |
3154 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | 5 | * Copyright (C) 2010-2011 Canonical Ltd. |
3155 | 6 | * | 6 | * |
3156 | @@ -20,6 +20,6 @@ | |||
3157 | 20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
3158 | 21 | 21 | ||
3159 | 22 | #include <X11/X.h> | 22 | #include <X11/X.h> |
3161 | 23 | #include <utouch/frame.h> | 23 | #include <oif/frame.h> |
3162 | 24 | 24 | ||
3163 | 25 | void print_touch(UFTouch touch, UFFrame frame, UFDevice device, Window window); | 25 | void print_touch(UFTouch touch, UFFrame frame, UFDevice device, Window window); |
3164 | 26 | 26 | ||
3165 | === renamed file 'tools/utouch-frame-test-x11.c' => 'tools/frame-test-x11.c' | |||
3166 | --- tools/utouch-frame-test-x11.c 2012-02-11 00:24:29 +0000 | |||
3167 | +++ tools/frame-test-x11.c 2012-07-24 22:45:29 +0000 | |||
3168 | @@ -1,6 +1,6 @@ | |||
3169 | 1 | /***************************************************************************** | 1 | /***************************************************************************** |
3170 | 2 | * | 2 | * |
3172 | 3 | * utouch-frame - Touch Frame Library | 3 | * frame - Touch Frame Library |
3173 | 4 | * | 4 | * |
3174 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | 5 | * Copyright (C) 2010-2011 Canonical Ltd. |
3175 | 6 | * | 6 | * |
3176 | @@ -26,8 +26,8 @@ | |||
3177 | 26 | #include <sys/select.h> | 26 | #include <sys/select.h> |
3178 | 27 | 27 | ||
3179 | 28 | #include <X11/extensions/XInput2.h> | 28 | #include <X11/extensions/XInput2.h> |
3182 | 29 | #include <utouch/frame.h> | 29 | #include <oif/frame.h> |
3183 | 30 | #include <utouch/frame_x11.h> | 30 | #include <oif/frame_x11.h> |
3184 | 31 | 31 | ||
3185 | 32 | #include "common/device.h" | 32 | #include "common/device.h" |
3186 | 33 | #include "common/frame.h" | 33 | #include "common/frame.h" |
3187 | @@ -168,7 +168,7 @@ | |||
3188 | 168 | 168 | ||
3189 | 169 | status = frame_x11_new(display, &frame_handle); | 169 | status = frame_x11_new(display, &frame_handle); |
3190 | 170 | if (status != UFStatusSuccess) { | 170 | if (status != UFStatusSuccess) { |
3192 | 171 | fprintf(stderr, "Error: failed to create utouch frame instance\n"); | 171 | fprintf(stderr, "Error: failed to create frame instance\n"); |
3193 | 172 | return -1; | 172 | return -1; |
3194 | 173 | } | 173 | } |
3195 | 174 | 174 | ||
3196 | 175 | 175 | ||
3197 | === renamed file 'tools/utouch-frame-test-x11.txt' => 'tools/frame-test-x11.txt' | |||
3198 | --- tools/utouch-frame-test-x11.txt 2011-08-27 01:29:53 +0000 | |||
3199 | +++ tools/frame-test-x11.txt 2012-07-24 22:45:29 +0000 | |||
3200 | @@ -1,18 +1,18 @@ | |||
3203 | 1 | UTOUCH-FRAME-TEST-X11(1) | 1 | FRAME-TEST-X11(1) |
3204 | 2 | ========================== | 2 | ================= |
3205 | 3 | 3 | ||
3206 | 4 | NAME | 4 | NAME |
3207 | 5 | ---- | 5 | ---- |
3208 | 6 | 6 | ||
3210 | 7 | utouch-frame-test-x11 - Report touch frame events from X.org input devices | 7 | frame-test-x11 - Report touch frame events from X.org input devices |
3211 | 8 | 8 | ||
3212 | 9 | SYNOPSIS | 9 | SYNOPSIS |
3213 | 10 | -------- | 10 | -------- |
3214 | 11 | 11 | ||
3216 | 12 | utouch-frame-test-x11 | 12 | frame-test-x11 |
3217 | 13 | 13 | ||
3218 | 14 | DESCRIPTION | 14 | DESCRIPTION |
3219 | 15 | ----------- | 15 | ----------- |
3220 | 16 | 16 | ||
3221 | 17 | A test tool used to analyse the capabilities and act as a test driver for the | 17 | A test tool used to analyse the capabilities and act as a test driver for the |
3223 | 18 | uTouch-Frame library. | 18 | frame library. |
3224 | 19 | 19 | ||
3225 | === removed file 'tools/utouch-frame-test-mtdev.c' | |||
3226 | --- tools/utouch-frame-test-mtdev.c 2011-12-25 21:27:31 +0000 | |||
3227 | +++ tools/utouch-frame-test-mtdev.c 1970-01-01 00:00:00 +0000 | |||
3228 | @@ -1,169 +0,0 @@ | |||
3229 | 1 | /***************************************************************************** | ||
3230 | 2 | * | ||
3231 | 3 | * utouch-frame - Touch Frame Library | ||
3232 | 4 | * | ||
3233 | 5 | * Copyright (C) 2010-2011 Canonical Ltd. | ||
3234 | 6 | * | ||
3235 | 7 | * This program is free software: you can redistribute it and/or modify it | ||
3236 | 8 | * under the terms of the GNU General Public License as published by the | ||
3237 | 9 | * Free Software Foundation, either version 3 of the License, or (at your | ||
3238 | 10 | * option) any later version. | ||
3239 | 11 | * | ||
3240 | 12 | * This program is distributed in the hope that it will be useful, but | ||
3241 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
3242 | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
3243 | 15 | * General Public License for more details. | ||
3244 | 16 | * | ||
3245 | 17 | * You should have received a copy of the GNU General Public License along | ||
3246 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
3247 | 19 | * | ||
3248 | 20 | * Authors: | ||
3249 | 21 | * Henrik Rydberg <rydberg@bitmath.org> | ||
3250 | 22 | * | ||
3251 | 23 | ****************************************************************************/ | ||
3252 | 24 | |||
3253 | 25 | #define MTDEV_NO_LEGACY_API | ||
3254 | 26 | |||
3255 | 27 | #define _POSIX_SOURCE | ||
3256 | 28 | |||
3257 | 29 | #include <utouch/frame-mtdev.h> | ||
3258 | 30 | #include <mtdev.h> | ||
3259 | 31 | #include <string.h> | ||
3260 | 32 | #include <stdio.h> | ||
3261 | 33 | #include <unistd.h> | ||
3262 | 34 | #include <sys/stat.h> | ||
3263 | 35 | #include <fcntl.h> | ||
3264 | 36 | #include "common-defs.h" | ||
3265 | 37 | |||
3266 | 38 | struct frame_test { | ||
3267 | 39 | struct evemu_device *evemu; | ||
3268 | 40 | struct mtdev *mtdev; | ||
3269 | 41 | utouch_frame_handle fh; | ||
3270 | 42 | struct stat fs; | ||
3271 | 43 | FILE *fptest; | ||
3272 | 44 | int fd; | ||
3273 | 45 | }; | ||
3274 | 46 | |||
3275 | 47 | static int init_evemu(struct frame_test *test) | ||
3276 | 48 | { | ||
3277 | 49 | test->evemu = evemu_new(NULL); | ||
3278 | 50 | if (!test->evemu) | ||
3279 | 51 | return -1; | ||
3280 | 52 | if (test->fptest) | ||
3281 | 53 | return evemu_read(test->evemu, test->fptest) <= 0; | ||
3282 | 54 | return evemu_extract(test->evemu, test->fd); | ||
3283 | 55 | } | ||
3284 | 56 | |||
3285 | 57 | static int init_mtdev(struct frame_test *test) | ||
3286 | 58 | { | ||
3287 | 59 | if (test->fptest) | ||
3288 | 60 | return 0; | ||
3289 | 61 | test->mtdev = mtdev_new_open(test->fd); | ||
3290 | 62 | if (!test->mtdev) | ||
3291 | 63 | return -1; | ||
3292 | 64 | return 0; | ||
3293 | 65 | } | ||
3294 | 66 | |||
3295 | 67 | static int init_frame(struct frame_test *test) | ||
3296 | 68 | { | ||
3297 | 69 | test->fh = utouch_frame_new_engine(100, 32, 100); | ||
3298 | 70 | if (!test->fh) | ||
3299 | 71 | return -1; | ||
3300 | 72 | return utouch_frame_init_mtdev(test->fh, test->evemu); | ||
3301 | 73 | } | ||
3302 | 74 | |||
3303 | 75 | static void destroy_all(struct frame_test *test) | ||
3304 | 76 | { | ||
3305 | 77 | utouch_frame_delete_engine(test->fh); | ||
3306 | 78 | if (test->mtdev) | ||
3307 | 79 | mtdev_close_delete(test->mtdev); | ||
3308 | 80 | evemu_delete(test->evemu); | ||
3309 | 81 | if (test->fptest) | ||
3310 | 82 | fclose(test->fptest); | ||
3311 | 83 | else | ||
3312 | 84 | ioctl(test->fd, EVIOCGRAB, 0); | ||
3313 | 85 | close(test->fd); | ||
3314 | 86 | memset(test, 0, sizeof(*test)); | ||
3315 | 87 | } | ||
3316 | 88 | |||
3317 | 89 | static void loop_device(struct frame_test *test) | ||
3318 | 90 | { | ||
3319 | 91 | FILE * fp = test->fptest; | ||
3320 | 92 | const struct utouch_frame *frame; | ||
3321 | 93 | struct input_event ev; | ||
3322 | 94 | |||
3323 | 95 | if (fp) { | ||
3324 | 96 | struct timeval evtime; | ||
3325 | 97 | memset(&evtime, 0, sizeof(evtime)); | ||
3326 | 98 | while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) { | ||
3327 | 99 | frame = utouch_frame_pump_mtdev(test->fh, &ev); | ||
3328 | 100 | if (frame) | ||
3329 | 101 | report_frame(frame); | ||
3330 | 102 | } | ||
3331 | 103 | } else { | ||
3332 | 104 | while (!mtdev_idle(test->mtdev, test->fd, 5000)) { | ||
3333 | 105 | while (mtdev_get(test->mtdev, test->fd, &ev, 1) > 0) { | ||
3334 | 106 | frame = utouch_frame_pump_mtdev(test->fh, &ev); | ||
3335 | 107 | if (frame) | ||
3336 | 108 | report_frame(frame); | ||
3337 | 109 | } | ||
3338 | 110 | } | ||
3339 | 111 | } | ||
3340 | 112 | } | ||
3341 | 113 | |||
3342 | 114 | int main(int argc, char *argv[]) | ||
3343 | 115 | { | ||
3344 | 116 | struct frame_test test; | ||
3345 | 117 | |||
3346 | 118 | if (argc < 2) { | ||
3347 | 119 | fprintf(stderr, "Usage: %s <device>\n", argv[0]); | ||
3348 | 120 | return -1; | ||
3349 | 121 | } | ||
3350 | 122 | |||
3351 | 123 | memset(&test, 0, sizeof(test)); | ||
3352 | 124 | |||
3353 | 125 | test.fd = open(argv[1], O_RDONLY | O_NONBLOCK); | ||
3354 | 126 | if (test.fd < 0) { | ||
3355 | 127 | fprintf(stderr, "error: could not open device\n"); | ||
3356 | 128 | return -1; | ||
3357 | 129 | } | ||
3358 | 130 | if (fstat(test.fd, &test.fs)) { | ||
3359 | 131 | fprintf(stderr, "error: could not stat the device\n"); | ||
3360 | 132 | return -1; | ||
3361 | 133 | } | ||
3362 | 134 | if (!test.fs.st_rdev) | ||
3363 | 135 | test.fptest = fdopen(test.fd, "r"); | ||
3364 | 136 | |||
3365 | 137 | if (!test.fptest && ioctl(test.fd, EVIOCGRAB, 1)) { | ||
3366 | 138 | fprintf(stderr, "error: could not grab the device\n"); | ||
3367 | 139 | return -1; | ||
3368 | 140 | } | ||
3369 | 141 | |||
3370 | 142 | if (init_evemu(&test)) { | ||
3371 | 143 | fprintf(stderr, "error: could not describe device\n"); | ||
3372 | 144 | return -1; | ||
3373 | 145 | } | ||
3374 | 146 | if (!utouch_frame_is_supported_mtdev(test.evemu)) { | ||
3375 | 147 | fprintf(stderr, "error: unsupported device\n"); | ||
3376 | 148 | return -1; | ||
3377 | 149 | } | ||
3378 | 150 | |||
3379 | 151 | fprintf(stderr, "device: %s\n", evemu_get_name(test.evemu)); | ||
3380 | 152 | |||
3381 | 153 | if (init_mtdev(&test)) { | ||
3382 | 154 | fprintf(stderr, "error: could not init mtdev\n"); | ||
3383 | 155 | return -1; | ||
3384 | 156 | } | ||
3385 | 157 | if (init_frame(&test)) { | ||
3386 | 158 | fprintf(stderr, "error: could not init frame\n"); | ||
3387 | 159 | return -1; | ||
3388 | 160 | } | ||
3389 | 161 | |||
3390 | 162 | report_device_caps(test.fh); | ||
3391 | 163 | |||
3392 | 164 | loop_device(&test); | ||
3393 | 165 | |||
3394 | 166 | destroy_all(&test); | ||
3395 | 167 | |||
3396 | 168 | return 0; | ||
3397 | 169 | } | ||
3398 | 170 | 0 | ||
3399 | === removed file 'tools/utouch-frame-test-mtdev.txt' | |||
3400 | --- tools/utouch-frame-test-mtdev.txt 2011-02-03 16:07:34 +0000 | |||
3401 | +++ tools/utouch-frame-test-mtdev.txt 1970-01-01 00:00:00 +0000 | |||
3402 | @@ -1,22 +0,0 @@ | |||
3403 | 1 | UTOUCH-FRAME-TEST-MTDEV(1) | ||
3404 | 2 | ========================== | ||
3405 | 3 | |||
3406 | 4 | NAME | ||
3407 | 5 | ---- | ||
3408 | 6 | |||
3409 | 7 | utouch-frame-test-mtdev - describe a device and report frame events | ||
3410 | 8 | |||
3411 | 9 | SYNOPSIS | ||
3412 | 10 | -------- | ||
3413 | 11 | |||
3414 | 12 | utouch-frame-test-mtdev device | ||
3415 | 13 | |||
3416 | 14 | DESCRIPTION | ||
3417 | 15 | ----------- | ||
3418 | 16 | |||
3419 | 17 | A test tool used to analyse the capabilities and act as a test driver for the | ||
3420 | 18 | uTouch touch frame library. | ||
3421 | 19 | |||
3422 | 20 | AUTHOR | ||
3423 | 21 | ------ | ||
3424 | 22 | utouch-frame-test-mtdev was written by Henrik Rydberg <rydberg@euromail.se> |
LGTM :).