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