Merge lp:~fginther/frame/frame-rename into lp:frame

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
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.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

LGTM :).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2012-07-17 14:27:23 +0000
+++ .bzrignore 2012-07-24 22:45:29 +0000
@@ -26,14 +26,14 @@
26m4/lt~obsolete.m426m4/lt~obsolete.m4
27m4/pkg.m427m4/pkg.m4
28stamp-*28stamp-*
29test/regular/check-c-compile29test/check-c-compile
30test/regular/check-cxx-compile30test/check-cxx-compile
31test/regular/check-regular31test/check-frame
32test/integration/check-integration32test/integration/check-integration
33tools/utouch-frame-test-mtdev33tools/frame-test-mtdev
34tools/utouch-frame-test-mtdev.134tools/frame-test-mtdev.1
35tools/utouch-frame-test-xi235tools/frame-test-xi2
36tools/utouch-frame-test-xi2.136tools/frame-test-xi2.1
37tools/utouch-frame-test-x1137tools/frame-test-x11
38tools/utouch-frame-test-x11.138tools/frame-test-x11.1
39utouch-frame.pc39frame.pc
4040
=== modified file '.gitignore'
--- .gitignore 2011-02-15 14:01:51 +0000
+++ .gitignore 2012-07-24 22:45:29 +0000
@@ -78,5 +78,5 @@
78.bzrignore78.bzrignore
79.bzr79.bzr
80patches80patches
81tools/utouch-frame-test-mtdev81tools/frame-test-mtdev
82tools/utouch-frame-test-xi282tools/frame-test-xi2
8383
=== modified file 'ChangeLog'
--- ChangeLog 2012-03-31 02:31:54 +0000
+++ ChangeLog 2012-07-24 22:45:29 +0000
@@ -2,7 +2,7 @@
2revno: 78 [merge]2revno: 78 [merge]
3fixes bug: https://launchpad.net/bugs/9662903fixes bug: https://launchpad.net/bugs/966290
4committer: Chase Douglas <chase.douglas@ubuntu.com>4committer: Chase Douglas <chase.douglas@ubuntu.com>
5branch nick: utouch-frame5branch nick: frame
6timestamp: Tue 2012-03-27 17:45:08 -07006timestamp: Tue 2012-03-27 17:45:08 -0700
7message:7message:
8 Merge fix for daily build FTBFS8 Merge fix for daily build FTBFS
@@ -10,14 +10,14 @@
10revno: 77 [merge]10revno: 77 [merge]
11fixes bug: https://launchpad.net/bugs/96307211fixes bug: https://launchpad.net/bugs/963072
12committer: Stephen M. Webb <stephen.webb@canonical.com>12committer: Stephen M. Webb <stephen.webb@canonical.com>
13branch nick: utouch-frame13branch nick: frame
14timestamp: Mon 2012-03-26 08:59:49 -040014timestamp: Mon 2012-03-26 08:59:49 -0400
15message:15message:
16 Change licensing from GPL-3+ to LGPL-3 (lp: #963072)16 Change licensing from GPL-3+ to LGPL-3 (lp: #963072)
17------------------------------------------------------------17------------------------------------------------------------
18revno: 76 [merge]18revno: 76 [merge]
19committer: Chase Douglas <chase.douglas@ubuntu.com>19committer: Chase Douglas <chase.douglas@ubuntu.com>
20branch nick: utouch-frame20branch nick: frame
21timestamp: Thu 2012-03-22 09:22:54 -070021timestamp: Thu 2012-03-22 09:22:54 -0700
22message:22message:
23 Merge fixes for issues found by compiling with -Weffc++23 Merge fixes for issues found by compiling with -Weffc++
@@ -25,7 +25,7 @@
25revno: 75 [merge]25revno: 75 [merge]
26fixes bug: https://launchpad.net/bugs/93014326fixes bug: https://launchpad.net/bugs/930143
27committer: Chase Douglas <chase.douglas@ubuntu.com>27committer: Chase Douglas <chase.douglas@ubuntu.com>
28branch nick: utouch-frame28branch nick: frame
29timestamp: Thu 2012-03-22 07:55:56 -070029timestamp: Thu 2012-03-22 07:55:56 -0700
30message:30message:
31 Merge fix for missing virtual destructors in Window class31 Merge fix for missing virtual destructors in Window class
@@ -33,7 +33,7 @@
33revno: 7433revno: 74
34tags: v2.2.234tags: v2.2.2
35committer: Chase Douglas <chase.douglas@ubuntu.com>35committer: Chase Douglas <chase.douglas@ubuntu.com>
36branch nick: utouch-frame36branch nick: frame
37timestamp: Wed 2012-03-21 16:36:37 -070037timestamp: Wed 2012-03-21 16:36:37 -0700
38message:38message:
39 Release version 2.2.239 Release version 2.2.2
@@ -41,7 +41,7 @@
41revno: 73 [merge]41revno: 73 [merge]
42fixes bug: https://launchpad.net/bugs/96159642fixes bug: https://launchpad.net/bugs/961596
43committer: Chase Douglas <chase.douglas@ubuntu.com>43committer: Chase Douglas <chase.douglas@ubuntu.com>
44branch nick: utouch-frame44branch nick: frame
45timestamp: Wed 2012-03-21 16:20:10 -070045timestamp: Wed 2012-03-21 16:20:10 -0700
46message:46message:
47 Merge fix for symbol visibility for C11 _Generic property getters47 Merge fix for symbol visibility for C11 _Generic property getters
@@ -49,35 +49,35 @@
49revno: 72 [merge]49revno: 72 [merge]
50fixes bug: https://launchpad.net/bugs/96148950fixes bug: https://launchpad.net/bugs/961489
51committer: Chase Douglas <chase.douglas@ubuntu.com>51committer: Chase Douglas <chase.douglas@ubuntu.com>
52branch nick: utouch-frame52branch nick: frame
53timestamp: Wed 2012-03-21 11:40:48 -070053timestamp: Wed 2012-03-21 11:40:48 -0700
54message:54message:
55 Merge fixes for xorg-gtest usage, symbol visibility, and automake flags55 Merge fixes for xorg-gtest usage, symbol visibility, and automake flags
56------------------------------------------------------------56------------------------------------------------------------
57revno: 7157revno: 71
58committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>58committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>
59branch nick: utouch-frame59branch nick: frame
60timestamp: Tue 2012-03-06 10:16:11 +020060timestamp: Tue 2012-03-06 10:16:11 +0200
61message:61message:
62 Changed underscores to hyphens for great justice.62 Changed underscores to hyphens for great justice.
63------------------------------------------------------------63------------------------------------------------------------
64revno: 70 [merge]64revno: 70 [merge]
65committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>65committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>
66branch nick: utouch-frame66branch nick: frame
67timestamp: Mon 2012-03-05 17:28:34 +020067timestamp: Mon 2012-03-05 17:28:34 +0200
68message:68message:
69 Merged build tests.69 Merged build tests.
70------------------------------------------------------------70------------------------------------------------------------
71revno: 69 [merge]71revno: 69 [merge]
72committer: Chase Douglas <chase.douglas@ubuntu.com>72committer: Chase Douglas <chase.douglas@ubuntu.com>
73branch nick: utouch-frame73branch nick: frame
74timestamp: Thu 2012-03-01 09:58:21 -080074timestamp: Thu 2012-03-01 09:58:21 -0800
75message:75message:
76 Merge miscellaneous automake cleanups76 Merge miscellaneous automake cleanups
77------------------------------------------------------------77------------------------------------------------------------
78revno: 68 [merge]78revno: 68 [merge]
79committer: Chase Douglas <chase.douglas@ubuntu.com>79committer: Chase Douglas <chase.douglas@ubuntu.com>
80branch nick: utouch-frame80branch nick: frame
81timestamp: Wed 2012-02-29 21:10:54 -080081timestamp: Wed 2012-02-29 21:10:54 -0800
82message:82message:
83 Merge XInput autotools cleanup83 Merge XInput autotools cleanup
@@ -85,35 +85,35 @@
85revno: 6785revno: 67
86tags: v2.2.186tags: v2.2.1
87committer: Stephen M. Webb <stephen.webb@canonical.com>87committer: Stephen M. Webb <stephen.webb@canonical.com>
88branch nick: utouch-frame88branch nick: frame
89timestamp: Wed 2012-02-15 09:32:01 -050089timestamp: Wed 2012-02-15 09:32:01 -0500
90message:90message:
91 Release version 2.2.191 Release version 2.2.1
92------------------------------------------------------------92------------------------------------------------------------
93revno: 6693revno: 66
94committer: Stephen M. Webb <stephen.webb@canonical.com>94committer: Stephen M. Webb <stephen.webb@canonical.com>
95branch nick: utouch-frame95branch nick: frame
96timestamp: Wed 2012-02-15 09:21:07 -050096timestamp: Wed 2012-02-15 09:21:07 -0500
97message:97message:
98 Fixed 'make distcheck' failure.98 Fixed 'make distcheck' failure.
99------------------------------------------------------------99------------------------------------------------------------
100revno: 65 [merge]100revno: 65 [merge]
101committer: Chase Douglas <chase.douglas@ubuntu.com>101committer: Chase Douglas <chase.douglas@ubuntu.com>
102branch nick: utouch-frame102branch nick: frame
103timestamp: Mon 2012-02-13 13:52:32 -0800103timestamp: Mon 2012-02-13 13:52:32 -0800
104message:104message:
105 Merge ownership event time value type fix105 Merge ownership event time value type fix
106------------------------------------------------------------106------------------------------------------------------------
107revno: 64 [merge]107revno: 64 [merge]
108committer: Chase Douglas <chase.douglas@canonical.com>108committer: Chase Douglas <chase.douglas@canonical.com>
109branch nick: utouch-frame109branch nick: frame
110timestamp: Mon 2012-02-13 09:46:53 -0800110timestamp: Mon 2012-02-13 09:46:53 -0800
111message:111message:
112 Merge XI version query fix112 Merge XI version query fix
113------------------------------------------------------------113------------------------------------------------------------
114revno: 63 [merge]114revno: 63 [merge]
115committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>115committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>
116branch nick: utouch-frame116branch nick: frame
117timestamp: Wed 2012-02-01 16:28:17 +0200117timestamp: Wed 2012-02-01 16:28:17 +0200
118message:118message:
119 Merged pkg-config fix.119 Merged pkg-config fix.
@@ -121,28 +121,28 @@
121revno: 62121revno: 62
122tags: v2.2.0122tags: v2.2.0
123committer: Chase Douglas <chase.douglas@ubuntu.com>123committer: Chase Douglas <chase.douglas@ubuntu.com>
124branch nick: utouch-frame124branch nick: frame
125timestamp: Mon 2012-01-30 14:32:14 -0800125timestamp: Mon 2012-01-30 14:32:14 -0800
126message:126message:
127 Release version 2.2.0127 Release version 2.2.0
128------------------------------------------------------------128------------------------------------------------------------
129revno: 61 [merge]129revno: 61 [merge]
130committer: Chase Douglas <chase.douglas@ubuntu.com>130committer: Chase Douglas <chase.douglas@ubuntu.com>
131branch nick: utouch-frame131branch nick: frame
132timestamp: Mon 2012-01-30 14:31:33 -0800132timestamp: Mon 2012-01-30 14:31:33 -0800
133message:133message:
134 Merge window resolution properties134 Merge window resolution properties
135------------------------------------------------------------135------------------------------------------------------------
136revno: 60 [merge]136revno: 60 [merge]
137committer: Chase Douglas <chase.douglas@ubuntu.com>137committer: Chase Douglas <chase.douglas@ubuntu.com>
138branch nick: utouch-frame138branch nick: frame
139timestamp: Mon 2012-01-30 11:13:30 -0800139timestamp: Mon 2012-01-30 11:13:30 -0800
140message:140message:
141 Merge recording fix branch141 Merge recording fix branch
142------------------------------------------------------------142------------------------------------------------------------
143revno: 59 [merge]143revno: 59 [merge]
144committer: Chase Douglas <chase.douglas@ubuntu.com>144committer: Chase Douglas <chase.douglas@ubuntu.com>
145branch nick: utouch-frame145branch nick: frame
146timestamp: Thu 2012-01-19 13:07:46 -0800146timestamp: Thu 2012-01-19 13:07:46 -0800
147message:147message:
148 Merge fix for indirect touch device axis mapping148 Merge fix for indirect touch device axis mapping
@@ -150,35 +150,35 @@
150revno: 58150revno: 58
151tags: v2.1.0151tags: v2.1.0
152committer: Chase Douglas <chase.douglas@ubuntu.com>152committer: Chase Douglas <chase.douglas@ubuntu.com>
153branch nick: utouch-frame153branch nick: frame
154timestamp: Tue 2012-01-17 21:35:01 +0100154timestamp: Tue 2012-01-17 21:35:01 +0100
155message:155message:
156 Release version 2.1.0156 Release version 2.1.0
157------------------------------------------------------------157------------------------------------------------------------
158revno: 57158revno: 57
159committer: Chase Douglas <chase.douglas@ubuntu.com>159committer: Chase Douglas <chase.douglas@ubuntu.com>
160branch nick: utouch-frame160branch nick: frame
161timestamp: Tue 2012-01-17 21:34:08 +0100161timestamp: Tue 2012-01-17 21:34:08 +0100
162message:162message:
163 Bump libtool version for additional C11 _Generic ABI163 Bump libtool version for additional C11 _Generic ABI
164------------------------------------------------------------164------------------------------------------------------------
165revno: 56165revno: 56
166committer: Chase Douglas <chase.douglas@ubuntu.com>166committer: Chase Douglas <chase.douglas@ubuntu.com>
167branch nick: utouch-frame167branch nick: frame
168timestamp: Tue 2012-01-17 21:22:16 +0100168timestamp: Tue 2012-01-17 21:22:16 +0100
169message:169message:
170 Bump XInput dependencies170 Bump XInput dependencies
171------------------------------------------------------------171------------------------------------------------------------
172revno: 55 [merge]172revno: 55 [merge]
173committer: Chase Douglas <chase.douglas@ubuntu.com>173committer: Chase Douglas <chase.douglas@ubuntu.com>
174branch nick: utouch-frame174branch nick: frame
175timestamp: Tue 2012-01-17 21:20:41 +0100175timestamp: Tue 2012-01-17 21:20:41 +0100
176message:176message:
177 Merge upstream XInput multitouch support177 Merge upstream XInput multitouch support
178------------------------------------------------------------178------------------------------------------------------------
179revno: 54 [merge]179revno: 54 [merge]
180committer: Chase Douglas <chase.douglas@ubuntu.com>180committer: Chase Douglas <chase.douglas@ubuntu.com>
181branch nick: utouch-frame181branch nick: frame
182timestamp: Thu 2012-01-12 03:22:47 -0800182timestamp: Thu 2012-01-12 03:22:47 -0800
183message:183message:
184 Merge C11 _Generic support184 Merge C11 _Generic support
@@ -186,56 +186,56 @@
186revno: 53186revno: 53
187tags: v2.0.0187tags: v2.0.0
188committer: Chase Douglas <chase.douglas@ubuntu.com>188committer: Chase Douglas <chase.douglas@ubuntu.com>
189branch nick: utouch-frame189branch nick: frame
190timestamp: Thu 2011-12-08 16:49:57 -0800190timestamp: Thu 2011-12-08 16:49:57 -0800
191message:191message:
192 Release version 2.0.0192 Release version 2.0.0
193------------------------------------------------------------193------------------------------------------------------------
194revno: 52194revno: 52
195committer: Chase Douglas <chase.douglas@ubuntu.com>195committer: Chase Douglas <chase.douglas@ubuntu.com>
196branch nick: utouch-frame196branch nick: frame
197timestamp: Thu 2011-12-08 16:49:45 -0800197timestamp: Thu 2011-12-08 16:49:45 -0800
198message:198message:
199 Silently generate manpages199 Silently generate manpages
200------------------------------------------------------------200------------------------------------------------------------
201revno: 51201revno: 51
202committer: Chase Douglas <chase.douglas@ubuntu.com>202committer: Chase Douglas <chase.douglas@ubuntu.com>
203branch nick: utouch-frame203branch nick: frame
204timestamp: Thu 2011-12-08 16:45:55 -0800204timestamp: Thu 2011-12-08 16:45:55 -0800
205message:205message:
206 Ship Doxyfile206 Ship Doxyfile
207------------------------------------------------------------207------------------------------------------------------------
208revno: 50208revno: 50
209committer: Chase Douglas <chase.douglas@ubuntu.com>209committer: Chase Douglas <chase.douglas@ubuntu.com>
210branch nick: utouch-frame210branch nick: frame
211timestamp: Thu 2011-12-08 16:36:21 -0800211timestamp: Thu 2011-12-08 16:36:21 -0800
212message:212message:
213 Ship test recordings213 Ship test recordings
214------------------------------------------------------------214------------------------------------------------------------
215revno: 49215revno: 49
216committer: Chase Douglas <chase.douglas@ubuntu.com>216committer: Chase Douglas <chase.douglas@ubuntu.com>
217branch nick: utouch-frame217branch nick: frame
218timestamp: Thu 2011-12-08 16:35:40 -0800218timestamp: Thu 2011-12-08 16:35:40 -0800
219message:219message:
220 Actually throw the instantiated exceptions on testing::Device errors220 Actually throw the instantiated exceptions on testing::Device errors
221------------------------------------------------------------221------------------------------------------------------------
222revno: 48222revno: 48
223committer: Chase Douglas <chase.douglas@ubuntu.com>223committer: Chase Douglas <chase.douglas@ubuntu.com>
224branch nick: utouch-frame224branch nick: frame
225timestamp: Thu 2011-12-08 16:35:06 -0800225timestamp: Thu 2011-12-08 16:35:06 -0800
226message:226message:
227 Ship v2/property.h and v2/typedefs.h227 Ship v2/property.h and v2/typedefs.h
228------------------------------------------------------------228------------------------------------------------------------
229revno: 47229revno: 47
230committer: Chase Douglas <chase.douglas@ubuntu.com>230committer: Chase Douglas <chase.douglas@ubuntu.com>
231branch nick: utouch-frame231branch nick: frame
232timestamp: Thu 2011-12-08 16:34:36 -0800232timestamp: Thu 2011-12-08 16:34:36 -0800
233message:233message:
234 Only check for sudo if gcov support is enabled234 Only check for sudo if gcov support is enabled
235------------------------------------------------------------235------------------------------------------------------------
236revno: 46236revno: 46
237committer: Chase Douglas <chase.douglas@ubuntu.com>237committer: Chase Douglas <chase.douglas@ubuntu.com>
238branch nick: utouch-frame238branch nick: frame
239timestamp: Thu 2011-12-08 13:04:51 -0800239timestamp: Thu 2011-12-08 13:04:51 -0800
240message:240message:
241 Remove erroneously left mem pool header files from src/Makefile.am241 Remove erroneously left mem pool header files from src/Makefile.am
@@ -244,24 +244,24 @@
244------------------------------------------------------------244------------------------------------------------------------
245revno: 45 [merge]245revno: 45 [merge]
246committer: Chase Douglas <chase.douglas@ubuntu.com>246committer: Chase Douglas <chase.douglas@ubuntu.com>
247branch nick: utouch-frame247branch nick: frame
248timestamp: Thu 2011-12-08 12:53:48 -0800248timestamp: Thu 2011-12-08 12:53:48 -0800
249message:249message:
250 Merge utouch-frame version 2250 Merge frame version 2
251 251
252 Version 1 will be removed once its dependencies have been moved to252 Version 1 will be removed once its dependencies have been moved to
253 version 2.253 version 2.
254------------------------------------------------------------254------------------------------------------------------------
255revno: 44255revno: 44
256committer: Chase Douglas <chase.douglas@ubuntu.com>256committer: Chase Douglas <chase.douglas@ubuntu.com>
257branch nick: utouch-frame257branch nick: frame
258timestamp: Wed 2011-08-31 09:24:35 -0700258timestamp: Wed 2011-08-31 09:24:35 -0700
259message:259message:
260 Really fix the library version script260 Really fix the library version script
261------------------------------------------------------------261------------------------------------------------------------
262revno: 43262revno: 43
263committer: Chase Douglas <chase.douglas@ubuntu.com>263committer: Chase Douglas <chase.douglas@ubuntu.com>
264branch nick: utouch-frame264branch nick: frame
265timestamp: Wed 2011-08-31 09:19:52 -0700265timestamp: Wed 2011-08-31 09:19:52 -0700
266message:266message:
267 Fix library version script bug in last merge267 Fix library version script bug in last merge
@@ -269,7 +269,7 @@
269revno: 42 [merge]269revno: 42 [merge]
270author: Timo Kluck270author: Timo Kluck
271committer: Chase Douglas <chase.douglas@ubuntu.com>271committer: Chase Douglas <chase.douglas@ubuntu.com>
272branch nick: utouch-frame272branch nick: frame
273timestamp: Wed 2011-08-31 09:10:43 -0700273timestamp: Wed 2011-08-31 09:10:43 -0700
274message:274message:
275 Merge coordinate transformation api extension275 Merge coordinate transformation api extension
@@ -279,14 +279,14 @@
279revno: 41279revno: 41
280tags: v1.1.4280tags: v1.1.4
281committer: Chase Douglas <chase.douglas@ubuntu.com>281committer: Chase Douglas <chase.douglas@ubuntu.com>
282branch nick: utouch-frame282branch nick: frame
283timestamp: Tue 2011-08-09 14:29:54 -0700283timestamp: Tue 2011-08-09 14:29:54 -0700
284message:284message:
285 Release version 1.1.4285 Release version 1.1.4
286------------------------------------------------------------286------------------------------------------------------------
287revno: 40 [merge]287revno: 40 [merge]
288committer: Chase Douglas <chase.douglas@ubuntu.com>288committer: Chase Douglas <chase.douglas@ubuntu.com>
289branch nick: utouch-frame289branch nick: frame
290timestamp: Tue 2011-08-09 13:13:14 -0700290timestamp: Tue 2011-08-09 13:13:14 -0700
291message:291message:
292 Merge resolution fix and unused variable removal292 Merge resolution fix and unused variable removal
@@ -294,21 +294,21 @@
294revno: 39294revno: 39
295tags: v1.1.3295tags: v1.1.3
296committer: Chase Douglas <chase.douglas@ubuntu.com>296committer: Chase Douglas <chase.douglas@ubuntu.com>
297branch nick: utouch-frame297branch nick: frame
298timestamp: Thu 2011-07-07 17:14:01 -0700298timestamp: Thu 2011-07-07 17:14:01 -0700
299message:299message:
300 Release version 1.1.3300 Release version 1.1.3
301------------------------------------------------------------301------------------------------------------------------------
302revno: 38302revno: 38
303committer: Stephen M. Webb <stephen.webb@canonical.com>303committer: Stephen M. Webb <stephen.webb@canonical.com>
304branch nick: utouch-frame304branch nick: frame
305timestamp: Tue 2011-06-14 09:27:45 -0400305timestamp: Tue 2011-06-14 09:27:45 -0400
306message:306message:
307 Added missing symbols for unit testing with XI2.307 Added missing symbols for unit testing with XI2.
308------------------------------------------------------------308------------------------------------------------------------
309revno: 37 [merge]309revno: 37 [merge]
310committer: Stephen M. Webb <stephen.webb@canonical.com>310committer: Stephen M. Webb <stephen.webb@canonical.com>
311branch nick: utouch-frame311branch nick: frame
312timestamp: Tue 2011-06-14 08:54:06 -0400312timestamp: Tue 2011-06-14 08:54:06 -0400
313message:313message:
314 Added ELF symbol versioning.314 Added ELF symbol versioning.
@@ -316,52 +316,52 @@
316revno: 36 [merge]316revno: 36 [merge]
317author: Henrik Rydberg <rydberg@euromail.se>317author: Henrik Rydberg <rydberg@euromail.se>
318committer: Stephen M. Webb <stephen.webb@canonical.com>318committer: Stephen M. Webb <stephen.webb@canonical.com>
319branch nick: utouch-frame319branch nick: frame
320timestamp: Tue 2011-06-14 08:53:08 -0400320timestamp: Tue 2011-06-14 08:53:08 -0400
321message:321message:
322 Another swap problem fixed.322 Another swap problem fixed.
323------------------------------------------------------------323------------------------------------------------------------
324revno: 35 [merge]324revno: 35 [merge]
325committer: Chase Douglas <chase.douglas@ubuntu.com>325committer: Chase Douglas <chase.douglas@ubuntu.com>
326branch nick: utouch-frame326branch nick: frame
327timestamp: Wed 2011-05-18 14:16:05 -0400327timestamp: Wed 2011-05-18 14:16:05 -0400
328message:328message:
329 Merge fix for XI 2.1 touch state processing329 Merge fix for XI 2.1 touch state processing
330------------------------------------------------------------330------------------------------------------------------------
331revno: 34 [merge]331revno: 34 [merge]
332committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>332committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>
333branch nick: utouch-frame333branch nick: frame
334timestamp: Wed 2011-05-18 09:12:48 +0300334timestamp: Wed 2011-05-18 09:12:48 +0300
335message:335message:
336 Merged underscore removal.336 Merged underscore removal.
337------------------------------------------------------------337------------------------------------------------------------
338revno: 33 [merge]338revno: 33 [merge]
339committer: Chase Douglas <chase.douglas@ubuntu.com>339committer: Chase Douglas <chase.douglas@ubuntu.com>
340branch nick: utouch-frame340branch nick: frame
341timestamp: Fri 2011-04-29 09:19:10 -0400341timestamp: Fri 2011-04-29 09:19:10 -0400
342message:342message:
343 Merge pbuilder fix343 Merge pbuilder fix
344------------------------------------------------------------344------------------------------------------------------------
345revno: 32 [merge]345revno: 32 [merge]
346committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>346committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>
347branch nick: utouch-frame347branch nick: frame
348timestamp: Fri 2011-04-29 14:43:57 +0300348timestamp: Fri 2011-04-29 14:43:57 +0300
349message:349message:
350 Merged clang cleanup.350 Merged clang cleanup.
351------------------------------------------------------------351------------------------------------------------------------
352revno: 31 [merge]352revno: 31 [merge]
353committer: Chase Douglas <chase.douglas@ubuntu.com>353committer: Chase Douglas <chase.douglas@ubuntu.com>
354branch nick: utouch-frame354branch nick: frame
355timestamp: Wed 2011-04-27 09:00:42 -0400355timestamp: Wed 2011-04-27 09:00:42 -0400
356message:356message:
357 Merge semi-mt support into utouch-frame357 Merge semi-mt support into frame
358 358
359 This enables 3+ touch support on semi-multitouch trackpads like Synaptics359 This enables 3+ touch support on semi-multitouch trackpads like Synaptics
360 clickpads.360 clickpads.
361------------------------------------------------------------361------------------------------------------------------------
362revno: 30 [merge]362revno: 30 [merge]
363committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>363committer: Jussi Pakkanen <jussi.pakkanen@canonical.com>
364branch nick: utouch-frame364branch nick: frame
365timestamp: Wed 2011-04-27 15:17:40 +0300365timestamp: Wed 2011-04-27 15:17:40 +0300
366message:366message:
367 Merge pkg-config flag fix.367 Merge pkg-config flag fix.
@@ -381,7 +381,7 @@
381branch nick: trunk381branch nick: trunk
382timestamp: Tue 2011-03-15 20:15:17 +0100382timestamp: Tue 2011-03-15 20:15:17 +0100
383message:383message:
384 Allow replay of device data through utouch-frame384 Allow replay of device data through frame
385 385
386 This patch adds replay capabilities to test-mtdev.386 This patch adds replay capabilities to test-mtdev.
387 If the specified device points to a valid evemu file,387 If the specified device points to a valid evemu file,
@@ -394,7 +394,7 @@
394------------------------------------------------------------394------------------------------------------------------------
395revno: 27 [merge]395revno: 27 [merge]
396committer: Stephen M. Webb <stephen.webb@canonical.com>396committer: Stephen M. Webb <stephen.webb@canonical.com>
397branch nick: utouch-frame397branch nick: frame
398timestamp: Tue 2011-03-15 15:04:33 -0400398timestamp: Tue 2011-03-15 15:04:33 -0400
399message:399message:
400 Added a dependency check on xorg-server-dev when building with xi2 support.400 Added a dependency check on xorg-server-dev when building with xi2 support.
@@ -558,13 +558,13 @@
558message:558message:
559 Optional XI2.1 support559 Optional XI2.1 support
560 560
561 This patchs adds optional XI2.1 support to utouch-frame. The561 This patchs adds optional XI2.1 support to frame. The
562 utouch/frame-xi2.h header contains helper functions equivalent562 oif/frame-xi2.h header contains helper functions equivalent
563 to utouch/frame-mtdev.h. In addition, the device-to-screen mapping563 to oif/frame-mtdev.h In addition, the device-to-screen mapping
564 is handled via XEvents and optionally XIPropertyEvent. The latter564 is handled via XEvents and optionally XIPropertyEvent. The latter
565 allows free device placement via xinput set-prop, useful in multi-565 allows free device placement via xinput set-prop, useful in multi-
566 head setups, thanks to Chase Douglas. Touch frame events can be tested566 head setups, thanks to Chase Douglas. Touch frame events can be tested
567 using the utouch-frame-test-xi2 tool. Use --with-xi to enable.567 using the frame-test-xi2 tool. Use --with-xi to enable.
568------------------------------------------------------------568------------------------------------------------------------
569revno: 8569revno: 8
570committer: Henrik Rydberg <rydberg@bitmath.org>570committer: Henrik Rydberg <rydberg@bitmath.org>
@@ -592,7 +592,7 @@
592 onto an area on the screen, needed in particular for multihead setups.592 onto an area on the screen, needed in particular for multihead setups.
593 Moreover, the XI2.1 backend works with screen coordinates, creating593 Moreover, the XI2.1 backend works with screen coordinates, creating
594 an unnecessary discrepancy between backends. This patch adds the basic594 an unnecessary discrepancy between backends. This patch adds the basic
595 transformation layer to the utouch surface, thus serving as the master595 transformation layer to the oif surface, thus serving as the master
596 point of device-to-surface mapping.596 point of device-to-surface mapping.
597------------------------------------------------------------597------------------------------------------------------------
598revno: 5598revno: 5
@@ -607,10 +607,10 @@
607branch nick: trunk607branch nick: trunk
608timestamp: Tue 2011-02-08 19:28:09 +0100608timestamp: Tue 2011-02-08 19:28:09 +0100
609message:609message:
610 Display device properties based on utouch surface instead610 Display device properties based on oif surface instead
611 611
612 The current code erroneously extracts the device properties from612 The current code erroneously extracts the device properties from
613 the evemu device, when there is a utouch surface structure to read613 the evemu device, when there is a oif surface structure to read
614 from. Remedied.614 from. Remedied.
615------------------------------------------------------------615------------------------------------------------------------
616revno: 3616revno: 3
@@ -622,7 +622,7 @@
622------------------------------------------------------------622------------------------------------------------------------
623revno: 2 [merge]623revno: 2 [merge]
624committer: Stephen M. Webb <stephen.webb@canonical.com>624committer: Stephen M. Webb <stephen.webb@canonical.com>
625branch nick: utouch-frame625branch nick: frame
626timestamp: Thu 2011-02-03 13:39:08 -0500626timestamp: Thu 2011-02-03 13:39:08 -0500
627message:627message:
628 Changes required for uploading into Ubuntu.628 Changes required for uploading into Ubuntu.
@@ -633,7 +633,7 @@
633branch nick: trunk633branch nick: trunk
634timestamp: Thu 2010-12-30 20:23:24 +0100634timestamp: Thu 2010-12-30 20:23:24 +0100
635message:635message:
636 Initial load of utouch-frame636 Initial load of frame
637 637
638 Compiles and runs on mtdev. ABI proof.638 Compiles and runs on mtdev. ABI proof.
639------------------------------------------------------------639------------------------------------------------------------
640640
=== modified file 'INSTALL'
--- INSTALL 2010-12-30 19:23:24 +0000
+++ INSTALL 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1utouch-frame - Touch Frame Library1frame - Touch Frame Library
22
3To build, you need to have the autoconf, libtool, libutouch-evemu-dev3To build, you need to have the autoconf, libtool, libevemu-dev
4and mtdev-dev packages installed. Then, do4and mtdev-dev packages installed. Then, do
55
6 ./autogen.sh6 ./autogen.sh
@@ -9,16 +9,16 @@
99
10To test the touch properties of an MT device at /dev/input/eventX, do10To test the touch properties of an MT device at /dev/input/eventX, do
1111
12 sudo ./test/utouch-frame-test /dev/input/eventX12 sudo ./test/frame-test /dev/input/eventX
1313
14You should be able to see touch events in the terminal. After five14You should be able to see touch events in the terminal. After five
15seconds of inactivity, the program exits.15seconds of inactivity, the program exits.
1616
17To install utouch-frame, do17To install frame, do
1818
19 sudo make install19 sudo make install
2020
21By default, utouch-frame installs to /usr/local. To change, use the --prefix21By default, frame installs to /usr/local. To change, use the --prefix
22configure option.22configure option.
2323
24Enjoy,24Enjoy,
2525
=== modified file 'Makefile.am'
--- Makefile.am 2012-07-17 13:55:33 +0000
+++ Makefile.am 2012-07-24 22:45:29 +0000
@@ -7,7 +7,7 @@
77
88
9pkgconfigdir = $(libdir)/pkgconfig9pkgconfigdir = $(libdir)/pkgconfig
10pkgconfig_DATA = utouch-frame.pc10pkgconfig_DATA = frame.pc
1111
12if HAVE_GCOV12if HAVE_GCOV
13 .PHONY: clean-gcda13 .PHONY: clean-gcda
1414
=== modified file 'README'
--- README 2010-12-30 19:23:24 +0000
+++ README 2012-07-24 22:45:29 +0000
@@ -1,4 +1,4 @@
1utouch-frame - Touch Frame Library1frame - Touch Frame Library
22
3This tree handles the buildup and synchronization of a set of3This tree handles the buildup and synchronization of a set of
4simultaneous touches. The library is input agnostic.4simultaneous touches. The library is input agnostic.
55
=== modified file 'configure.ac'
--- configure.ac 2012-07-17 13:57:32 +0000
+++ configure.ac 2012-07-24 22:45:29 +0000
@@ -3,7 +3,7 @@
3AC_INIT([Touch Frame Library],3AC_INIT([Touch Frame Library],
4 [2.2.3],4 [2.2.3],
5 [],5 [],
6 [utouch-frame])6 [frame])
7AC_CONFIG_SRCDIR([Makefile.am])7AC_CONFIG_SRCDIR([Makefile.am])
8AC_CONFIG_HEADERS([config.h])8AC_CONFIG_HEADERS([config.h])
9AC_CONFIG_AUX_DIR([config-aux])9AC_CONFIG_AUX_DIR([config-aux])
@@ -25,7 +25,7 @@
25AC_PROG_CXX25AC_PROG_CXX
26AC_PROG_INSTALL26AC_PROG_INSTALL
2727
28PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5], [have_evemu=yes])28PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.5], [have_evemu=yes])
29AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = xyes])29AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = xyes])
3030
31PKG_CHECK_MODULES(XINPUT, x11 xext xorg-server [xi >= 1.5.99.1] [inputproto >= 2.1.99.6])31PKG_CHECK_MODULES(XINPUT, x11 xext xorg-server [xi >= 1.5.99.1] [inputproto >= 2.1.99.6])
@@ -75,7 +75,7 @@
75 test/regular/Makefile75 test/regular/Makefile
76 test/x11_mocks/Makefile76 test/x11_mocks/Makefile
77 tools/Makefile77 tools/Makefile
78 utouch-frame.pc])78 frame.pc])
7979
80AC_LANG_PUSH(C++)80AC_LANG_PUSH(C++)
81AC_CHECK_DECL(__clang__, CXX_LIBS="-lstdc++")81AC_CHECK_DECL(__clang__, CXX_LIBS="-lstdc++")
8282
=== modified file 'doc/Doxyfile'
--- doc/Doxyfile 2011-08-27 01:29:53 +0000
+++ doc/Doxyfile 2012-07-24 22:45:29 +0000
@@ -25,7 +25,7 @@
25# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 25# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
26# by quotes) that should identify the project.26# by quotes) that should identify the project.
2727
28PROJECT_NAME = uTouch-Frame28PROJECT_NAME = Frame
2929
30# The PROJECT_NUMBER tag can be used to enter a project or revision number. 30# The PROJECT_NUMBER tag can be used to enter a project or revision number.
31# This could be handy for archiving the generated documentation or 31# This could be handy for archiving the generated documentation or
@@ -619,7 +619,7 @@
619# directories like "/usr/src/myproject". Separate the files or directories 619# directories like "/usr/src/myproject". Separate the files or directories
620# with spaces.620# with spaces.
621621
622INPUT = ../include/utouch622INPUT = ../include/oif
623623
624# This tag can be used to specify the character encoding of the source files 624# This tag can be used to specify the character encoding of the source files
625# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 625# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
626626
=== renamed file 'utouch-frame.pc.in' => 'frame.pc.in'
--- utouch-frame.pc.in 2011-04-27 09:14:30 +0000
+++ frame.pc.in 2012-07-24 22:45:29 +0000
@@ -3,8 +3,8 @@
3libdir=@libdir@3libdir=@libdir@
4includedir=@includedir@4includedir=@includedir@
55
6Name: utouch-frame6Name: frame
7Description: Touch Frame Library7Description: Touch Frame Library
8Version: @PACKAGE_VERSION@8Version: @PACKAGE_VERSION@
9Cflags: -I${includedir}9Cflags: -I${includedir}
10Libs: -L${libdir} -lutouch-frame10Libs: -L${libdir} -lframe
1111
=== renamed directory 'include/utouch' => 'include/oif'
=== modified file 'include/oif/frame.h'
--- include/utouch/frame.h 2012-06-18 18:28:21 +0000
+++ include/oif/frame.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2012 Canonical Ltd.5 * Copyright (C) 2010-2012 Canonical Ltd.
6 *6 *
@@ -19,12 +19,12 @@
19 ****************************************************************************/19 ****************************************************************************/
2020
21/**21/**
22 * @file utouch/frame.h22 * @file oif/frame.h
23 * Definitions of the main and platform-generic API23 * Definitions of the main and platform-generic API
24 */24 */
2525
26#ifndef UTOUCH_FRAME_UTOUCH_FRAME_H_26#ifndef FRAME_OIF_FRAME_H_
27#define UTOUCH_FRAME_UTOUCH_FRAME_H_27#define FRAME_OIF_FRAME_H_
2828
29/* Macros that set symbol visibilities in shared libraries properly.29/* Macros that set symbol visibilities in shared libraries properly.
30 * Adapted from http://gcc.gnu.org/wiki/Visibility30 * Adapted from http://gcc.gnu.org/wiki/Visibility
@@ -58,7 +58,7 @@
5858
59#include <stdint.h>59#include <stdint.h>
6060
61/** An object for the context of the uTouch Frame instance */61/** An object for the context of the frame instance */
62typedef struct UFHandle_* UFHandle;62typedef struct UFHandle_* UFHandle;
63/** An object for an event */63/** An object for an event */
64typedef struct UFEvent_* UFEvent;64typedef struct UFEvent_* UFEvent;
@@ -98,8 +98,8 @@
98 *98 *
99 * Value type: const char *99 * Value type: const char *
100 *100 *
101 * The uTouch frame library owns the string. The string is valid until an101 * The frame library owns the string. The string is valid until an event
102 * event notifying removal of the device is released.102 * notifying removal of the device is released.
103 */103 */
104 UFDevicePropertyName = 0,104 UFDevicePropertyName = 0,
105 /**105 /**
@@ -216,8 +216,8 @@
216 *216 *
217 * This property holds the time the event occurred in display server217 * This property holds the time the event occurred in display server
218 * timespace. The time is provided in milliseconds (ms). If the event, such as218 * timespace. The time is provided in milliseconds (ms). If the event, such as
219 * device addition, occurred before the uTouch Frame context was created, the219 * device addition, occurred before the frame context was created, the value
220 * value will be 0.220 * will be 0.
221 */221 */
222 UFEventPropertyTime,222 UFEventPropertyTime,
223} UFEventProperty;223} UFEventProperty;
@@ -343,9 +343,9 @@
343} UFTouchProperty;343} UFTouchProperty;
344344
345/**345/**
346 * Get the event file descriptor for the uTouch Frame context346 * Get the event file descriptor for the frame context
347 *347 *
348 * @param [in] handle The uTouch Frame context object348 * @param [in] handle The frame context object
349 * @return A file descriptor for the context349 * @return A file descriptor for the context
350 *350 *
351 * When events are available for processing, the file descriptor will be351 * When events are available for processing, the file descriptor will be
@@ -356,7 +356,7 @@
356int frame_get_fd(UFHandle handle);356int frame_get_fd(UFHandle handle);
357357
358/**358/**
359 * Get an event from the uTouch Frame context359 * Get an event from the frame context
360 *360 *
361 * @param [in] handle The context object361 * @param [in] handle The context object
362 * @param [out] event The retrieved event362 * @param [out] event The retrieved event
@@ -738,7 +738,7 @@
738738
739/** @} */739/** @} */
740740
741#include <utouch/frame_internal.h>741#include "frame_internal.h"
742742
743#ifdef __cplusplus743#ifdef __cplusplus
744}744}
@@ -746,4 +746,4 @@
746746
747#undef HAS_C_GENERIC_SELECTIONS747#undef HAS_C_GENERIC_SELECTIONS
748748
749#endif // UTOUCH_FRAME_UTOUCH_FRAME_H_749#endif // FRAME_OIF_FRAME_H_
750750
=== modified file 'include/oif/frame_internal.h'
--- include/utouch/frame_internal.h 2012-03-25 22:07:41 +0000
+++ include/oif/frame_internal.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2012 Canonical Ltd.5 * Copyright (C) 2010-2012 Canonical Ltd.
6 *6 *
@@ -18,8 +18,8 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_21#ifndef FRAME_OIF_FRAME_INTERNAL_H_
22#define UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_22#define FRAME_OIF_FRAME_INTERNAL_H_
2323
24#ifdef HAS_C_GENERIC_SELECTIONS24#ifdef HAS_C_GENERIC_SELECTIONS
2525
@@ -117,4 +117,4 @@
117117
118#endif // HAS_C_GENERIC_SELECTIONS118#endif // HAS_C_GENERIC_SELECTIONS
119119
120#endif // UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_120#endif // FRAME_OIF_FRAME_INTERNAL_H_
121121
=== modified file 'include/oif/frame_x11.h'
--- include/utouch/frame_x11.h 2012-06-18 18:28:21 +0000
+++ include/oif/frame_x11.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2012 Canonical Ltd.5 * Copyright (C) 2010-2012 Canonical Ltd.
6 *6 *
@@ -18,10 +18,10 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_XI2_H21#ifndef FRAME_OIF_FRAME_X11_H_
22#define UTOUCH_FRAME_XI2_H22#define FRAME_OIF_FRAME_X11_H_
2323
24#include <utouch/frame.h>24#include "frame.h"
25#include <X11/Xlib.h>25#include <X11/Xlib.h>
2626
27#ifdef __cplusplus27#ifdef __cplusplus
@@ -34,31 +34,31 @@
34 */34 */
3535
36/**36/**
37 * Create a new uTouch Frame context for an X11 window server37 * Create a new frame context for an X11 window server
38 *38 *
39 * @param [in] display The X11 server connection39 * @param [in] display The X11 server connection
40 * @param [out] handle The object for the new uTouch Frame instance40 * @param [out] handle The object for the new frame instance
41 * @return UFStatusSuccess, UFStatusErrorResources, or UFStatusErrorGeneric41 * @return UFStatusSuccess, UFStatusErrorResources, or UFStatusErrorGeneric
42 */42 */
43FRAME_PUBLIC43FRAME_PUBLIC
44UFStatus frame_x11_new(Display *display, UFHandle *handle);44UFStatus frame_x11_new(Display *display, UFHandle *handle);
4545
46/**46/**
47 * Delete an X11 uTouch Frame instance47 * Delete an X11 frame instance
48 *48 *
49 * @param [in] handle The object for the uTouch Frame instance49 * @param [in] handle The object for the frame instance
50 */50 */
51FRAME_PUBLIC51FRAME_PUBLIC
52void frame_x11_delete(UFHandle handle);52void frame_x11_delete(UFHandle handle);
5353
54/**54/**
55 * Process an X11 input event into the uTouch Frame instance55 * Process an X11 input event into the frame instance
56 *56 *
57 * @param [in] handle The uTouch Frame context57 * @param [in] handle The frame context
58 * @param [in] event The X11 generic input event cookie58 * @param [in] event The X11 generic input event cookie
59 * @return UFStatusSuccess or UFStatusErrorGeneric59 * @return UFStatusSuccess or UFStatusErrorGeneric
60 *60 *
61 * The uTouch-Frame library can process XIDeviceEvent and61 * The frame library can process XIDeviceEvent and
62 * XIHierarchyEvent events. Processing these events requires additional event62 * XIHierarchyEvent events. Processing these events requires additional event
63 * data. This data is obtained by calling XGetEventData on the XEvent. See the63 * data. This data is obtained by calling XGetEventData on the XEvent. See the
64 * XGetEventData and XFreeEventData man pages for more details.64 * XGetEventData and XFreeEventData man pages for more details.
@@ -93,37 +93,37 @@
93 UFTouchId touch_id);93 UFTouchId touch_id);
9494
95/**95/**
96 * Get the X11 Window ID of a uTouch Frame window96 * Get the X11 Window ID of a frame window
97 *97 *
98 * @param [in] window_id The uTouch Frame window ID object (const)98 * @param [in] window_id The frame window ID object (const)
99 * @return The X11 window ID99 * @return The X11 window ID
100 */100 */
101FRAME_PUBLIC101FRAME_PUBLIC
102Window frame_x11_get_window_id(UFWindowId window_id);102Window frame_x11_get_window_id(UFWindowId window_id);
103103
104/**104/**
105 * Create a new uTouch Frame window ID object for an X11 window ID105 * Create a new frame window ID object for an X11 window ID
106 *106 *
107 * @param [in] id The X11 ID of the window107 * @param [in] id The X11 ID of the window
108 * @return The new uTouch Frame window ID object108 * @return The new frame window ID object
109 */109 */
110FRAME_PUBLIC110FRAME_PUBLIC
111UFWindowId frame_x11_create_window_id(Window id);111UFWindowId frame_x11_create_window_id(Window id);
112112
113/**113/**
114 * Get the X11 touch ID of a uTouch Frame touch114 * Get the X11 touch ID of a frame touch
115 *115 *
116 * @param [in] touch_id The uTouch Frame touch ID object (const)116 * @param [in] touch_id The frame touch ID object (const)
117 * @return The X11 touch ID117 * @return The X11 touch ID
118 */118 */
119FRAME_PUBLIC119FRAME_PUBLIC
120unsigned int frame_x11_get_touch_id(UFTouchId touch_id);120unsigned int frame_x11_get_touch_id(UFTouchId touch_id);
121121
122/**122/**
123 * Create a new uTouch Frame touch ID object for an X11 touch ID123 * Create a new frame touch ID object for an X11 touch ID
124 *124 *
125 * @param [in] id The X11 ID of the touch125 * @param [in] id The X11 ID of the touch
126 * @return The new uTouch Frame touch ID object126 * @return The new frame touch ID object
127 */127 */
128FRAME_PUBLIC128FRAME_PUBLIC
129UFTouchId frame_x11_create_touch_id(unsigned int id);129UFTouchId frame_x11_create_touch_id(unsigned int id);
@@ -136,4 +136,4 @@
136}136}
137#endif137#endif
138138
139#endif139#endif // FRAME_OIF_FRAME_X11_H_
140140
=== modified file 'm4/xorg-gtest.m4'
--- m4/xorg-gtest.m4 2012-06-18 18:28:21 +0000
+++ m4/xorg-gtest.m4 2012-07-24 22:45:29 +0000
@@ -74,7 +74,7 @@
7474
75 PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no])75 PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no])
7676
77 # Check if we should include support for utouch-evemu77 # Check if we should include support for evemu
78 AC_ARG_WITH([evemu],78 AC_ARG_WITH([evemu],
79 [AS_HELP_STRING([--with-evemu],79 [AS_HELP_STRING([--with-evemu],
80 [support Linux input device recording playback80 [support Linux input device recording playback
@@ -83,10 +83,10 @@
83 [with_evemu=check])83 [with_evemu=check])
8484
85 AS_IF([test "x$with_evemu" = xyes],85 AS_IF([test "x$with_evemu" = xyes],
86 [PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])],86 [PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])],
87 [test "x$with_evemu" = xcheck],87 [test "x$with_evemu" = xcheck],
88 [PKG_CHECK_MODULES(EVEMU,88 [PKG_CHECK_MODULES(EVEMU,
89 [utouch-evemu],89 [evemu],
90 [have_xorg_gtest_evemu=yes],90 [have_xorg_gtest_evemu=yes],
91 [have_xorg_gtest_evemu=no])])91 [have_xorg_gtest_evemu=no])])
92 AS_IF([test "x$have_xorg_gtest_evemu" = xyes],92 AS_IF([test "x$have_xorg_gtest_evemu" = xyes],
9393
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-06-18 18:28:21 +0000
+++ src/Makefile.am 2012-07-24 22:45:29 +0000
@@ -1,13 +1,13 @@
1version_script = $(srcdir)/libutouch-frame.ver1version_script = $(srcdir)/libframe.ver
22
3lib_LTLIBRARIES = libutouch-frame.la3lib_LTLIBRARIES = libframe.la
44
5libutouch_frame_la_LDFLAGS = \5libframe_la_LDFLAGS = \
6 -version-info @LIB_VERSION@ \6 -version-info @LIB_VERSION@ \
7 -Wl,-z,defs -Wl,--as-needed \7 -Wl,-z,defs -Wl,--as-needed \
8 -Wl,--version-script=$(version_script)8 -Wl,--version-script=$(version_script)
99
10libutouch_frame_la_LIBADD = \10libframe_la_LIBADD = \
11 -lm \11 -lm \
12 $(EVEMU_LIBS) \12 $(EVEMU_LIBS) \
13 $(MTDEV_LIBS) \13 $(MTDEV_LIBS) \
@@ -29,13 +29,13 @@
29 $(COVERAGE_CXXFLAGS) \29 $(COVERAGE_CXXFLAGS) \
30 $(XINPUT_CFLAGS)30 $(XINPUT_CFLAGS)
3131
32libutouch_frameincludedir = $(includedir)/utouch32libframeincludedir = $(includedir)/oif
33libutouch_frameinclude_HEADERS = \33libframeinclude_HEADERS = \
34 $(top_srcdir)/include/utouch/frame.h \34 $(top_srcdir)/include/oif/frame.h \
35 $(top_srcdir)/include/utouch/frame_internal.h \35 $(top_srcdir)/include/oif/frame_internal.h \
36 $(top_srcdir)/include/utouch/frame_x11.h36 $(top_srcdir)/include/oif/frame_x11.h
3737
38libutouch_frame_la_SOURCES = \38libframe_la_SOURCES = \
39 axis.h \39 axis.h \
40 axis.cpp \40 axis.cpp \
41 device.h \41 device.h \
4242
=== modified file 'src/axis.cpp'
--- src/axis.cpp 2012-06-18 18:28:21 +0000
+++ src/axis.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -22,7 +22,7 @@
2222
23#include "value.h"23#include "value.h"
2424
25namespace utouch {25namespace oif {
26namespace frame {26namespace frame {
2727
28UFAxis::UFAxis(UFAxisType type, float min, float max, float resolution)28UFAxis::UFAxis(UFAxisType type, float min, float max, float resolution)
@@ -30,24 +30,24 @@
30}30}
3131
32} // namespace frame32} // namespace frame
33} // namespace utouch33} // namespace oif
3434
35extern "C" {35extern "C" {
3636
37UFAxisType frame_axis_get_type(UFAxis axis) {37UFAxisType frame_axis_get_type(UFAxis axis) {
38 return static_cast<const utouch::frame::UFAxis*>(axis)->type();38 return static_cast<const oif::frame::UFAxis*>(axis)->type();
39}39}
4040
41float frame_axis_get_minimum(UFAxis axis) {41float frame_axis_get_minimum(UFAxis axis) {
42 return static_cast<const utouch::frame::UFAxis*>(axis)->min();42 return static_cast<const oif::frame::UFAxis*>(axis)->min();
43}43}
4444
45float frame_axis_get_maximum(UFAxis axis) {45float frame_axis_get_maximum(UFAxis axis) {
46 return static_cast<const utouch::frame::UFAxis*>(axis)->max();46 return static_cast<const oif::frame::UFAxis*>(axis)->max();
47}47}
4848
49float frame_axis_get_resolution(UFAxis axis) {49float frame_axis_get_resolution(UFAxis axis) {
50 return static_cast<const utouch::frame::UFAxis*>(axis)->resolution();50 return static_cast<const oif::frame::UFAxis*>(axis)->resolution();
51}51}
5252
53} // extern "C"53} // extern "C"
5454
=== modified file 'src/axis.h'
--- src/axis.h 2012-06-18 18:28:21 +0000
+++ src/axis.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,17 +18,17 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_AXIS_H_21#ifndef FRAME_AXIS_H_
22#define UTOUCH_FRAME_AXIS_H_22#define FRAME_AXIS_H_
2323
24#include "utouch/frame.h"24#include "oif/frame.h"
25#include "property.h"25#include "property.h"
2626
27struct UFAxis_ {27struct UFAxis_ {
28 virtual ~UFAxis_() {}28 virtual ~UFAxis_() {}
29};29};
3030
31namespace utouch {31namespace oif {
32namespace frame {32namespace frame {
3333
34class UFAxis : public UFAxis_ {34class UFAxis : public UFAxis_ {
@@ -51,6 +51,6 @@
51};51};
5252
53} // namespace frame53} // namespace frame
54} // namespace utouch54} // namespace oif
5555
56#endif // UTOUCH_FRAME_AXIS_H_56#endif // FRAME_AXIS_H_
5757
=== modified file 'src/device.cpp'
--- src/device.cpp 2012-06-18 18:28:21 +0000
+++ src/device.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -24,7 +24,7 @@
2424
25#include "axis.h"25#include "axis.h"
2626
27namespace utouch {27namespace oif {
28namespace frame {28namespace frame {
2929
30UFStatus UFDevice::GetAxisByIndex(unsigned int index, ::UFAxis* axis) const {30UFStatus UFDevice::GetAxisByIndex(unsigned int index, ::UFAxis* axis) const {
@@ -50,7 +50,7 @@
50}50}
5151
52} // namespace frame52} // namespace frame
53} // namespace utouch53} // namespace oif
5454
55extern "C" {55extern "C" {
5656
@@ -58,7 +58,7 @@
58UFStatus frame_device_get_property_string_(UFDevice device,58UFStatus frame_device_get_property_string_(UFDevice device,
59 UFDeviceProperty property,59 UFDeviceProperty property,
60 char **value) {60 char **value) {
61 return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(61 return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
62 property,62 property,
63 value);63 value);
64}64}
@@ -66,7 +66,7 @@
66FRAME_PUBLIC66FRAME_PUBLIC
67UFStatus frame_device_get_property_int_(UFDevice device,67UFStatus frame_device_get_property_int_(UFDevice device,
68 UFDeviceProperty property, int *value) {68 UFDeviceProperty property, int *value) {
69 return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(69 return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
70 property,70 property,
71 value);71 value);
72}72}
@@ -75,7 +75,7 @@
75UFStatus frame_device_get_property_unsigned_int_(UFDevice device,75UFStatus frame_device_get_property_unsigned_int_(UFDevice device,
76 UFDeviceProperty property,76 UFDeviceProperty property,
77 unsigned int *value) {77 unsigned int *value) {
78 return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(78 return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
79 property,79 property,
80 value);80 value);
81}81}
@@ -84,21 +84,21 @@
84FRAME_PUBLIC84FRAME_PUBLIC
85UFStatus frame_device_get_property(UFDevice device, UFDeviceProperty property,85UFStatus frame_device_get_property(UFDevice device, UFDeviceProperty property,
86 void *value) {86 void *value) {
87 return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(87 return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
88 property,88 property,
89 value);89 value);
90}90}
9191
92UFStatus frame_device_get_axis_by_index(UFDevice device, unsigned int index,92UFStatus frame_device_get_axis_by_index(UFDevice device, unsigned int index,
93 UFAxis* axis) {93 UFAxis* axis) {
94 return static_cast<const utouch::frame::UFDevice*>(device)->GetAxisByIndex(94 return static_cast<const oif::frame::UFDevice*>(device)->GetAxisByIndex(
95 index,95 index,
96 axis);96 axis);
97}97}
9898
99UFStatus frame_device_get_axis_by_type(UFDevice device, UFAxisType type,99UFStatus frame_device_get_axis_by_type(UFDevice device, UFAxisType type,
100 UFAxis* axis) {100 UFAxis* axis) {
101 return static_cast<const utouch::frame::UFDevice*>(device)->GetAxisByType(101 return static_cast<const oif::frame::UFDevice*>(device)->GetAxisByType(
102 type,102 type,
103 axis);103 axis);
104}104}
105105
=== modified file 'src/device.h'
--- src/device.h 2012-06-18 18:28:21 +0000
+++ src/device.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,13 +18,13 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_DEVICE_H_21#ifndef FRAME_DEVICE_H_
22#define UTOUCH_FRAME_DEVICE_H_22#define FRAME_DEVICE_H_
2323
24#include <map>24#include <map>
25#include <memory>25#include <memory>
2626
27#include "utouch/frame.h"27#include "oif/frame.h"
28#include "axis.h"28#include "axis.h"
29#include "typedefs.h"29#include "typedefs.h"
3030
@@ -32,7 +32,7 @@
32 virtual ~UFDevice_() {};32 virtual ~UFDevice_() {};
33};33};
3434
35namespace utouch {35namespace oif {
36namespace frame {36namespace frame {
3737
38class UFDevice : public UFDevice_, public Property<UFDeviceProperty> {38class UFDevice : public UFDevice_, public Property<UFDeviceProperty> {
@@ -52,6 +52,6 @@
52};52};
5353
54} // namespace frame54} // namespace frame
55} // namespace utouch55} // namespace oif
5656
57#endif // UTOUCH_FRAME_DEVICE_H_57#endif // FRAME_DEVICE_H_
5858
=== modified file 'src/event.cpp'
--- src/event.cpp 2012-06-18 18:28:21 +0000
+++ src/event.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -23,7 +23,7 @@
23#include "event.h"23#include "event.h"
24#include "frame.h"24#include "frame.h"
2525
26namespace utouch {26namespace oif {
27namespace frame {27namespace frame {
2828
29UFEvent::UFEvent(UFEventType type, const Value* data, uint64_t time)29UFEvent::UFEvent(UFEventType type, const Value* data, uint64_t time)
@@ -62,26 +62,26 @@
62 ::UFFrame frame;62 ::UFFrame frame;
6363
64 if (GetProperty(UFEventPropertyFrame, &frame) == UFStatusSuccess)64 if (GetProperty(UFEventPropertyFrame, &frame) == UFStatusSuccess)
65 static_cast<utouch::frame::UFFrame*>(frame)->ReleasePreviousFrame();65 static_cast<oif::frame::UFFrame*>(frame)->ReleasePreviousFrame();
66}66}
6767
68} // namespace frame68} // namespace frame
69} // namespace utouch69} // namespace oif
7070
71extern "C" {71extern "C" {
7272
73void frame_event_ref(UFEvent event) {73void frame_event_ref(UFEvent event) {
74 static_cast<utouch::frame::UFEvent*>(event)->Ref();74 static_cast<oif::frame::UFEvent*>(event)->Ref();
75}75}
7676
77void frame_event_unref(UFEvent event) {77void frame_event_unref(UFEvent event) {
78 static_cast<utouch::frame::UFEvent*>(event)->Unref();78 static_cast<oif::frame::UFEvent*>(event)->Unref();
79}79}
8080
81FRAME_PUBLIC81FRAME_PUBLIC
82UFStatus frame_event_get_property_type_(UFEvent event, UFEventProperty property,82UFStatus frame_event_get_property_type_(UFEvent event, UFEventProperty property,
83 UFEventType *value) {83 UFEventType *value) {
84 return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(84 return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
85 property,85 property,
86 value);86 value);
87}87}
@@ -90,7 +90,7 @@
90UFStatus frame_event_get_property_device_(UFEvent event,90UFStatus frame_event_get_property_device_(UFEvent event,
91 UFEventProperty property,91 UFEventProperty property,
92 UFDevice *value) {92 UFDevice *value) {
93 return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(93 return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
94 property,94 property,
95 value);95 value);
96}96}
@@ -99,7 +99,7 @@
99UFStatus frame_event_get_property_frame_(UFEvent event,99UFStatus frame_event_get_property_frame_(UFEvent event,
100 UFEventProperty property,100 UFEventProperty property,
101 UFFrame *value) {101 UFFrame *value) {
102 return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(102 return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
103 property,103 property,
104 value);104 value);
105}105}
@@ -108,7 +108,7 @@
108UFStatus frame_event_get_property_uint64_(UFEvent event,108UFStatus frame_event_get_property_uint64_(UFEvent event,
109 UFEventProperty property,109 UFEventProperty property,
110 uint64_t *value) {110 uint64_t *value) {
111 return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(111 return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
112 property,112 property,
113 value);113 value);
114}114}
@@ -117,15 +117,15 @@
117FRAME_PUBLIC117FRAME_PUBLIC
118UFStatus frame_event_get_property(UFEvent event, UFEventProperty property,118UFStatus frame_event_get_property(UFEvent event, UFEventProperty property,
119 void *value) {119 void *value) {
120 return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(120 return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
121 property,121 property,
122 value);122 value);
123}123}
124124
125UFEventType frame_event_get_type(UFEvent event) {125UFEventType frame_event_get_type(UFEvent event) {
126 UFEventType type;126 UFEventType type;
127 const utouch::frame::UFEvent* ufevent =127 const oif::frame::UFEvent* ufevent =
128 static_cast<const utouch::frame::UFEvent*>(event);128 static_cast<const oif::frame::UFEvent*>(event);
129 UFStatus status = ufevent->GetProperty(UFEventPropertyType, &type);129 UFStatus status = ufevent->GetProperty(UFEventPropertyType, &type);
130 assert(status == UFStatusSuccess);130 assert(status == UFStatusSuccess);
131 return type;131 return type;
@@ -133,8 +133,8 @@
133133
134uint64_t frame_event_get_time(UFEvent event) {134uint64_t frame_event_get_time(UFEvent event) {
135 uint64_t time;135 uint64_t time;
136 const utouch::frame::UFEvent* ufevent =136 const oif::frame::UFEvent* ufevent =
137 static_cast<const utouch::frame::UFEvent*>(event);137 static_cast<const oif::frame::UFEvent*>(event);
138 UFStatus status = ufevent->GetProperty(UFEventPropertyTime, &time);138 UFStatus status = ufevent->GetProperty(UFEventPropertyTime, &time);
139 assert(status == UFStatusSuccess);139 assert(status == UFStatusSuccess);
140 return time;140 return time;
141141
=== modified file 'src/event.h'
--- src/event.h 2012-06-18 18:28:21 +0000
+++ src/event.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,19 +18,19 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_EVENT_H_21#ifndef FRAME_EVENT_H_
22#define UTOUCH_FRAME_EVENT_H_22#define FRAME_EVENT_H_
2323
24#include <stdint.h>24#include <stdint.h>
2525
26#include "utouch/frame.h"26#include "oif/frame.h"
27#include "property.h"27#include "property.h"
2828
29struct UFEvent_ {29struct UFEvent_ {
30 virtual ~UFEvent_() {}30 virtual ~UFEvent_() {}
31};31};
3232
33namespace utouch {33namespace oif {
34namespace frame {34namespace frame {
3535
36class Value;36class Value;
@@ -51,6 +51,6 @@
51};51};
5252
53} // namespace frame53} // namespace frame
54} // namespace utouch54} // namespace oif
5555
56#endif // UTOUCH_FRAME_EVENT_H56#endif // FRAME_EVENT_H
5757
=== modified file 'src/frame.cpp'
--- src/frame.cpp 2012-06-18 18:28:21 +0000
+++ src/frame.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -26,7 +26,7 @@
26#include "touch.h"26#include "touch.h"
27#include "window.h"27#include "window.h"
2828
29namespace utouch {29namespace oif {
30namespace frame {30namespace frame {
3131
32UFFrame::UFFrame(const SharedWindow& window, const SharedUFFrame& prev)32UFFrame::UFFrame(const SharedWindow& window, const SharedUFFrame& prev)
@@ -184,7 +184,7 @@
184}184}
185185
186} // namespace frame186} // namespace frame
187} // namespace utouch187} // namespace oif
188188
189extern "C" {189extern "C" {
190190
@@ -192,8 +192,8 @@
192UFStatus frame_frame_get_property_device_(UFFrame frame,192UFStatus frame_frame_get_property_device_(UFFrame frame,
193 UFFrameProperty property,193 UFFrameProperty property,
194 UFDevice *value) {194 UFDevice *value) {
195 const utouch::frame::UFFrame* ufframe =195 const oif::frame::UFFrame* ufframe =
196 static_cast<const utouch::frame::UFFrame*>(frame);196 static_cast<const oif::frame::UFFrame*>(frame);
197 return ufframe->GetProperty(property, value);197 return ufframe->GetProperty(property, value);
198}198}
199199
@@ -201,8 +201,8 @@
201UFStatus frame_frame_get_property_uint64_(UFFrame frame,201UFStatus frame_frame_get_property_uint64_(UFFrame frame,
202 UFFrameProperty property,202 UFFrameProperty property,
203 uint64_t *value) {203 uint64_t *value) {
204 const utouch::frame::UFFrame* ufframe =204 const oif::frame::UFFrame* ufframe =
205 static_cast<const utouch::frame::UFFrame*>(frame);205 static_cast<const oif::frame::UFFrame*>(frame);
206 return ufframe->GetProperty(property, value);206 return ufframe->GetProperty(property, value);
207}207}
208208
@@ -210,8 +210,8 @@
210UFStatus frame_frame_get_property_unsigned_int_(UFFrame frame,210UFStatus frame_frame_get_property_unsigned_int_(UFFrame frame,
211 UFFrameProperty property,211 UFFrameProperty property,
212 unsigned int *value) {212 unsigned int *value) {
213 const utouch::frame::UFFrame* ufframe =213 const oif::frame::UFFrame* ufframe =
214 static_cast<const utouch::frame::UFFrame*>(frame);214 static_cast<const oif::frame::UFFrame*>(frame);
215 return ufframe->GetProperty(property, value);215 return ufframe->GetProperty(property, value);
216}216}
217217
@@ -219,50 +219,50 @@
219FRAME_PUBLIC219FRAME_PUBLIC
220UFStatus frame_frame_get_property(UFFrame frame, UFFrameProperty property,220UFStatus frame_frame_get_property(UFFrame frame, UFFrameProperty property,
221 void *value) {221 void *value) {
222 const utouch::frame::UFFrame* ufframe =222 const oif::frame::UFFrame* ufframe =
223 static_cast<const utouch::frame::UFFrame*>(frame);223 static_cast<const oif::frame::UFFrame*>(frame);
224 return ufframe->GetProperty(property, value);224 return ufframe->GetProperty(property, value);
225}225}
226226
227UFStatus frame_frame_get_touch_by_index(UFFrame frame, unsigned int index,227UFStatus frame_frame_get_touch_by_index(UFFrame frame, unsigned int index,
228 UFTouch *touch) {228 UFTouch *touch) {
229 const utouch::frame::UFFrame* ufframe =229 const oif::frame::UFFrame* ufframe =
230 static_cast<const utouch::frame::UFFrame*>(frame);230 static_cast<const oif::frame::UFFrame*>(frame);
231 return ufframe->GetTouchByIndex(index, touch);231 return ufframe->GetTouchByIndex(index, touch);
232}232}
233233
234UFStatus frame_frame_get_touch_by_id(UFFrame frame, UFTouchId touch_id,234UFStatus frame_frame_get_touch_by_id(UFFrame frame, UFTouchId touch_id,
235 UFTouch *touch) {235 UFTouch *touch) {
236 const utouch::frame::UFFrame* ufframe =236 const oif::frame::UFFrame* ufframe =
237 static_cast<const utouch::frame::UFFrame*>(frame);237 static_cast<const oif::frame::UFFrame*>(frame);
238 return ufframe->GetTouchById(touch_id, touch);238 return ufframe->GetTouchById(touch_id, touch);
239}239}
240240
241UFStatus frame_frame_get_previous_touch_property(UFFrame frame, UFTouch touch,241UFStatus frame_frame_get_previous_touch_property(UFFrame frame, UFTouch touch,
242 UFTouchProperty property,242 UFTouchProperty property,
243 void *value) {243 void *value) {
244 const utouch::frame::UFFrame* ufframe =244 const oif::frame::UFFrame* ufframe =
245 static_cast<const utouch::frame::UFFrame*>(frame);245 static_cast<const oif::frame::UFFrame*>(frame);
246 return ufframe->GetPreviousTouchProperty(246 return ufframe->GetPreviousTouchProperty(
247 static_cast<const utouch::frame::UFTouch*>(touch),247 static_cast<const oif::frame::UFTouch*>(touch),
248 property,248 property,
249 value);249 value);
250}250}
251251
252UFStatus frame_frame_get_previous_touch_value(UFFrame frame, UFTouch touch,252UFStatus frame_frame_get_previous_touch_value(UFFrame frame, UFTouch touch,
253 UFAxisType type, float *value) {253 UFAxisType type, float *value) {
254 const utouch::frame::UFFrame* ufframe =254 const oif::frame::UFFrame* ufframe =
255 static_cast<const utouch::frame::UFFrame*>(frame);255 static_cast<const oif::frame::UFFrame*>(frame);
256 return ufframe->GetPreviousTouchValue(256 return ufframe->GetPreviousTouchValue(
257 static_cast<const utouch::frame::UFTouch*>(touch),257 static_cast<const oif::frame::UFTouch*>(touch),
258 type,258 type,
259 value);259 value);
260}260}
261261
262UFWindowId frame_frame_get_window_id(UFFrame frame) {262UFWindowId frame_frame_get_window_id(UFFrame frame) {
263 UFWindowId window_id;263 UFWindowId window_id;
264 const utouch::frame::UFFrame* ufframe =264 const oif::frame::UFFrame* ufframe =
265 static_cast<const utouch::frame::UFFrame*>(frame);265 static_cast<const oif::frame::UFFrame*>(frame);
266 UFStatus status = ufframe->GetProperty(UFFramePropertyWindowId, &window_id);266 UFStatus status = ufframe->GetProperty(UFFramePropertyWindowId, &window_id);
267 assert(status == UFStatusSuccess);267 assert(status == UFStatusSuccess);
268 return window_id;268 return window_id;
@@ -270,8 +270,8 @@
270270
271uint32_t frame_frame_get_num_touches(UFFrame frame) {271uint32_t frame_frame_get_num_touches(UFFrame frame) {
272 unsigned int num_touches;272 unsigned int num_touches;
273 const utouch::frame::UFFrame* ufframe =273 const oif::frame::UFFrame* ufframe =
274 static_cast<const utouch::frame::UFFrame*>(frame);274 static_cast<const oif::frame::UFFrame*>(frame);
275 UFStatus status = ufframe->GetProperty(UFFramePropertyNumTouches,275 UFStatus status = ufframe->GetProperty(UFFramePropertyNumTouches,
276 &num_touches);276 &num_touches);
277 assert(status == UFStatusSuccess);277 assert(status == UFStatusSuccess);
@@ -280,8 +280,8 @@
280280
281UFDevice frame_frame_get_device(UFFrame frame) {281UFDevice frame_frame_get_device(UFFrame frame) {
282 UFDevice device;282 UFDevice device;
283 const utouch::frame::UFFrame* ufframe =283 const oif::frame::UFFrame* ufframe =
284 static_cast<const utouch::frame::UFFrame*>(frame);284 static_cast<const oif::frame::UFFrame*>(frame);
285 UFStatus status = ufframe->GetProperty(UFFramePropertyDevice, &device);285 UFStatus status = ufframe->GetProperty(UFFramePropertyDevice, &device);
286 assert(status == UFStatusSuccess);286 assert(status == UFStatusSuccess);
287 return device;287 return device;
288288
=== modified file 'src/frame.h'
--- src/frame.h 2012-06-18 18:28:21 +0000
+++ src/frame.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,14 +18,14 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_FRAME_H_21#ifndef FRAME_FRAME_H_
22#define UTOUCH_FRAME_FRAME_H_22#define FRAME_FRAME_H_
2323
24#include <map>24#include <map>
25#include <memory>25#include <memory>
26#include <vector>26#include <vector>
2727
28#include "utouch/frame.h"28#include "oif/frame.h"
29#include "property.h"29#include "property.h"
30#include "typedefs.h"30#include "typedefs.h"
3131
@@ -33,7 +33,7 @@
33 virtual ~UFFrame_() {}33 virtual ~UFFrame_() {}
34};34};
3535
36namespace utouch {36namespace oif {
37namespace frame {37namespace frame {
3838
39class UFFrame : public UFFrame_, public Property<UFFrameProperty> {39class UFFrame : public UFFrame_, public Property<UFFrameProperty> {
@@ -64,6 +64,6 @@
64};64};
6565
66} // namespace frame66} // namespace frame
67} // namespace utouch67} // namespace oif
6868
69#endif // UTOUCH_FRAME_FRAME_H_69#endif // FRAME_FRAME_H_
7070
=== modified file 'src/handle.cpp'
--- src/handle.cpp 2012-06-18 18:28:21 +0000
+++ src/handle.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -29,7 +29,7 @@
2929
30#include "event.h"30#include "event.h"
3131
32namespace utouch {32namespace oif {
33namespace frame {33namespace frame {
3434
35UFHandle::UFHandle() : event_fd_(-1), event_queue_() {35UFHandle::UFHandle() : event_fd_(-1), event_queue_() {
@@ -71,16 +71,16 @@
71}71}
7272
73} // namespace frame73} // namespace frame
74} // namespace utouch74} // namespace oif
7575
76extern "C" {76extern "C" {
7777
78int frame_get_fd(UFHandle handle) {78int frame_get_fd(UFHandle handle) {
79 return static_cast<const utouch::frame::UFHandle*>(handle)->event_fd();79 return static_cast<const oif::frame::UFHandle*>(handle)->event_fd();
80}80}
8181
82UFStatus frame_get_event(UFHandle handle, UFEvent *event) {82UFStatus frame_get_event(UFHandle handle, UFEvent *event) {
83 return static_cast<utouch::frame::UFHandle*>(handle)->GetEvent(event);83 return static_cast<oif::frame::UFHandle*>(handle)->GetEvent(event);
84}84}
8585
86} // extern "C"86} // extern "C"
8787
=== modified file 'src/handle.h'
--- src/handle.h 2012-06-18 18:28:21 +0000
+++ src/handle.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,18 +18,18 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_HANDLE_H_21#ifndef FRAME_HANDLE_H_
22#define UTOUCH_FRAME_HANDLE_H_22#define FRAME_HANDLE_H_
2323
24#include <queue>24#include <queue>
2525
26#include "utouch/frame.h"26#include "oif/frame.h"
2727
28struct UFHandle_ {28struct UFHandle_ {
29 virtual ~UFHandle_() {}29 virtual ~UFHandle_() {}
30};30};
3131
32namespace utouch {32namespace oif {
33namespace frame {33namespace frame {
3434
35class UFEvent;35class UFEvent;
@@ -55,6 +55,6 @@
55};55};
5656
57} // namespace frame57} // namespace frame
58} // namespace utouch58} // namespace oif
5959
60#endif // UTOUCH_FRAME_HANDLE_H_60#endif // FRAME_HANDLE_H_
6161
=== renamed file 'src/libutouch-frame.ver' => 'src/libframe.ver'
--- src/libutouch-frame.ver 2012-06-18 18:28:21 +0000
+++ src/libframe.ver 2012-07-24 22:45:29 +0000
@@ -1,10 +1,15 @@
1UTOUCH_FRAME_2.0 {1FRAME_2.2 {
2 global:2 global:
3 frame_get_fd;3 frame_get_fd;
4 frame_get_event;4 frame_get_event;
5 frame_device_get_property;5 frame_device_get_property;
6 frame_device_get_property_string_;
7 frame_device_get_property_int_;
8 frame_device_get_property_unsigned_int_;
6 frame_device_get_axis_by_index;9 frame_device_get_axis_by_index;
7 frame_device_get_axis_by_type;10 frame_device_get_axis_by_type;
11 frame_device_get_window_resolution_x;
12 frame_device_get_window_resolution_y;
8 frame_axis_get_type;13 frame_axis_get_type;
9 frame_axis_get_minimum;14 frame_axis_get_minimum;
10 frame_axis_get_maximum;15 frame_axis_get_maximum;
@@ -12,12 +17,23 @@
12 frame_event_ref;17 frame_event_ref;
13 frame_event_unref;18 frame_event_unref;
14 frame_event_get_property;19 frame_event_get_property;
20 frame_event_get_property_type_;
21 frame_event_get_property_device_;
22 frame_event_get_property_frame_;
23 frame_event_get_property_uint64_;
15 frame_frame_get_property;24 frame_frame_get_property;
25 frame_frame_get_property_device_;
26 frame_frame_get_property_uint64_;
27 frame_frame_get_property_unsigned_int_;
16 frame_frame_get_touch_by_index;28 frame_frame_get_touch_by_index;
17 frame_frame_get_touch_by_id;29 frame_frame_get_touch_by_id;
18 frame_frame_get_previous_touch_property;30 frame_frame_get_previous_touch_property;
19 frame_frame_get_previous_touch_value;31 frame_frame_get_previous_touch_value;
20 frame_touch_get_property;32 frame_touch_get_property;
33 frame_touch_get_property_uint64_;
34 frame_touch_get_property_state_;
35 frame_touch_get_property_float_;
36 frame_touch_get_property_int_;
21 frame_touch_get_value;37 frame_touch_get_value;
2238
23 frame_event_get_type;39 frame_event_get_type;
@@ -48,27 +64,3 @@
48 local:64 local:
49 *;65 *;
50};66};
51
52UTOUCH_FRAME_2.1 {
53 global:
54 frame_device_get_property_string_;
55 frame_device_get_property_int_;
56 frame_device_get_property_unsigned_int_;
57 frame_event_get_property_type_;
58 frame_event_get_property_device_;
59 frame_event_get_property_frame_;
60 frame_event_get_property_uint64_;
61 frame_frame_get_property_device_;
62 frame_frame_get_property_uint64_;
63 frame_frame_get_property_unsigned_int_;
64 frame_touch_get_property_uint64_;
65 frame_touch_get_property_state_;
66 frame_touch_get_property_float_;
67 frame_touch_get_property_int_;
68} UTOUCH_FRAME_2.0;
69
70UTOUCH_FRAME_2.2 {
71 global:
72 frame_device_get_window_resolution_x;
73 frame_device_get_window_resolution_y;
74} UTOUCH_FRAME_2.1;
7567
=== modified file 'src/property.h'
--- src/property.h 2012-06-18 18:28:21 +0000
+++ src/property.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,14 +18,14 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_PROPERTY_H_21#ifndef FRAME_PROPERTY_H_
22#define UTOUCH_FRAME_PROPERTY_H_22#define FRAME_PROPERTY_H_
2323
24#include <map>24#include <map>
2525
26#include "value.h"26#include "value.h"
2727
28namespace utouch {28namespace oif {
29namespace frame {29namespace frame {
3030
31template<typename T>31template<typename T>
@@ -67,6 +67,6 @@
67};67};
6868
69} // namespace frame69} // namespace frame
70} // namespace utouch70} // namespace oif
7171
72#endif // UTOUCH_FRAME_PROPERTY_H_72#endif // FRAME_PROPERTY_H_
7373
=== modified file 'src/touch.cpp'
--- src/touch.cpp 2012-06-18 18:28:21 +0000
+++ src/touch.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -24,7 +24,7 @@
2424
25#include "frame.h"25#include "frame.h"
2626
27namespace utouch {27namespace oif {
28namespace frame {28namespace frame {
2929
30UFTouch::UFTouch(UFTouchState state, UFTouchId id, float x, float y,30UFTouch::UFTouch(UFTouchState state, UFTouchId id, float x, float y,
@@ -79,7 +79,7 @@
79}79}
8080
81} // namespace frame81} // namespace frame
82} // namespace utouch82} // namespace oif
8383
84extern "C" {84extern "C" {
8585
@@ -87,8 +87,8 @@
87UFStatus frame_touch_get_property_uint64_(UFTouch touch,87UFStatus frame_touch_get_property_uint64_(UFTouch touch,
88 UFTouchProperty property,88 UFTouchProperty property,
89 uint64_t *value) {89 uint64_t *value) {
90 const utouch::frame::UFTouch* uftouch =90 const oif::frame::UFTouch* uftouch =
91 static_cast<const utouch::frame::UFTouch*>(touch);91 static_cast<const oif::frame::UFTouch*>(touch);
92 return uftouch->GetProperty(property, value);92 return uftouch->GetProperty(property, value);
93}93}
9494
@@ -96,8 +96,8 @@
96UFStatus frame_touch_get_property_state_(UFTouch touch,96UFStatus frame_touch_get_property_state_(UFTouch touch,
97 UFTouchProperty property,97 UFTouchProperty property,
98 UFTouchState *value) {98 UFTouchState *value) {
99 const utouch::frame::UFTouch* uftouch =99 const oif::frame::UFTouch* uftouch =
100 static_cast<const utouch::frame::UFTouch*>(touch);100 static_cast<const oif::frame::UFTouch*>(touch);
101 return uftouch->GetProperty(property, value);101 return uftouch->GetProperty(property, value);
102}102}
103103
@@ -105,16 +105,16 @@
105UFStatus frame_touch_get_property_float_(UFTouch touch,105UFStatus frame_touch_get_property_float_(UFTouch touch,
106 UFTouchProperty property,106 UFTouchProperty property,
107 float *value) {107 float *value) {
108 const utouch::frame::UFTouch* uftouch =108 const oif::frame::UFTouch* uftouch =
109 static_cast<const utouch::frame::UFTouch*>(touch);109 static_cast<const oif::frame::UFTouch*>(touch);
110 return uftouch->GetProperty(property, value);110 return uftouch->GetProperty(property, value);
111}111}
112112
113FRAME_PUBLIC113FRAME_PUBLIC
114UFStatus frame_touch_get_property_int_(UFTouch touch, UFTouchProperty property,114UFStatus frame_touch_get_property_int_(UFTouch touch, UFTouchProperty property,
115 int *value) {115 int *value) {
116 const utouch::frame::UFTouch* uftouch =116 const oif::frame::UFTouch* uftouch =
117 static_cast<const utouch::frame::UFTouch*>(touch);117 static_cast<const oif::frame::UFTouch*>(touch);
118 return uftouch->GetProperty(property, value);118 return uftouch->GetProperty(property, value);
119}119}
120120
@@ -122,21 +122,21 @@
122FRAME_PUBLIC122FRAME_PUBLIC
123UFStatus frame_touch_get_property(UFTouch touch, UFTouchProperty property,123UFStatus frame_touch_get_property(UFTouch touch, UFTouchProperty property,
124 void* value) {124 void* value) {
125 const utouch::frame::UFTouch* uftouch =125 const oif::frame::UFTouch* uftouch =
126 static_cast<const utouch::frame::UFTouch*>(touch);126 static_cast<const oif::frame::UFTouch*>(touch);
127 return uftouch->GetProperty(property, value);127 return uftouch->GetProperty(property, value);
128}128}
129129
130UFStatus frame_touch_get_value(UFTouch touch, UFAxisType type, float* value) {130UFStatus frame_touch_get_value(UFTouch touch, UFAxisType type, float* value) {
131 const utouch::frame::UFTouch* uftouch =131 const oif::frame::UFTouch* uftouch =
132 static_cast<const utouch::frame::UFTouch*>(touch);132 static_cast<const oif::frame::UFTouch*>(touch);
133 return uftouch->GetValue(type, value);133 return uftouch->GetValue(type, value);
134}134}
135135
136UFTouchId frame_touch_get_id(UFTouch touch) {136UFTouchId frame_touch_get_id(UFTouch touch) {
137 UFTouchId touch_id;137 UFTouchId touch_id;
138 const utouch::frame::UFTouch* uftouch =138 const oif::frame::UFTouch* uftouch =
139 static_cast<const utouch::frame::UFTouch*>(touch);139 static_cast<const oif::frame::UFTouch*>(touch);
140 UFStatus status = uftouch->GetProperty(UFTouchPropertyId, &touch_id);140 UFStatus status = uftouch->GetProperty(UFTouchPropertyId, &touch_id);
141 assert(status == UFStatusSuccess);141 assert(status == UFStatusSuccess);
142 return touch_id;142 return touch_id;
@@ -144,8 +144,8 @@
144144
145UFTouchState frame_touch_get_state(UFTouch touch) {145UFTouchState frame_touch_get_state(UFTouch touch) {
146 UFTouchState state;146 UFTouchState state;
147 const utouch::frame::UFTouch* uftouch =147 const oif::frame::UFTouch* uftouch =
148 static_cast<const utouch::frame::UFTouch*>(touch);148 static_cast<const oif::frame::UFTouch*>(touch);
149 UFStatus status = uftouch->GetProperty(UFTouchPropertyState, &state);149 UFStatus status = uftouch->GetProperty(UFTouchPropertyState, &state);
150 assert(status == UFStatusSuccess);150 assert(status == UFStatusSuccess);
151 return state;151 return state;
@@ -153,8 +153,8 @@
153153
154float frame_touch_get_window_x(UFTouch touch) {154float frame_touch_get_window_x(UFTouch touch) {
155 float x;155 float x;
156 const utouch::frame::UFTouch* uftouch =156 const oif::frame::UFTouch* uftouch =
157 static_cast<const utouch::frame::UFTouch*>(touch);157 static_cast<const oif::frame::UFTouch*>(touch);
158 UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowX, &x);158 UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowX, &x);
159 assert(status == UFStatusSuccess);159 assert(status == UFStatusSuccess);
160 return x;160 return x;
@@ -162,8 +162,8 @@
162162
163float frame_touch_get_window_y(UFTouch touch) {163float frame_touch_get_window_y(UFTouch touch) {
164 float y;164 float y;
165 const utouch::frame::UFTouch* uftouch =165 const oif::frame::UFTouch* uftouch =
166 static_cast<const utouch::frame::UFTouch*>(touch);166 static_cast<const oif::frame::UFTouch*>(touch);
167 UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowY, &y);167 UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowY, &y);
168 assert(status == UFStatusSuccess);168 assert(status == UFStatusSuccess);
169 return y;169 return y;
@@ -171,8 +171,8 @@
171171
172float frame_touch_get_device_x(UFTouch touch) {172float frame_touch_get_device_x(UFTouch touch) {
173 float x;173 float x;
174 const utouch::frame::UFTouch* uftouch =174 const oif::frame::UFTouch* uftouch =
175 static_cast<const utouch::frame::UFTouch*>(touch);175 static_cast<const oif::frame::UFTouch*>(touch);
176 UFStatus status = uftouch->GetValue(UFAxisTypeX, &x);176 UFStatus status = uftouch->GetValue(UFAxisTypeX, &x);
177 assert(status == UFStatusSuccess);177 assert(status == UFStatusSuccess);
178 return x;178 return x;
@@ -180,8 +180,8 @@
180180
181float frame_touch_get_device_y(UFTouch touch) {181float frame_touch_get_device_y(UFTouch touch) {
182 float y;182 float y;
183 const utouch::frame::UFTouch* uftouch =183 const oif::frame::UFTouch* uftouch =
184 static_cast<const utouch::frame::UFTouch*>(touch);184 static_cast<const oif::frame::UFTouch*>(touch);
185 UFStatus status = uftouch->GetValue(UFAxisTypeY, &y);185 UFStatus status = uftouch->GetValue(UFAxisTypeY, &y);
186 assert(status == UFStatusSuccess);186 assert(status == UFStatusSuccess);
187 return y;187 return y;
@@ -189,8 +189,8 @@
189189
190uint64_t frame_touch_get_time(UFTouch touch) {190uint64_t frame_touch_get_time(UFTouch touch) {
191 uint64_t time;191 uint64_t time;
192 const utouch::frame::UFTouch* uftouch =192 const oif::frame::UFTouch* uftouch =
193 static_cast<const utouch::frame::UFTouch*>(touch);193 static_cast<const oif::frame::UFTouch*>(touch);
194 UFStatus status = uftouch->GetProperty(UFTouchPropertyTime, &time);194 UFStatus status = uftouch->GetProperty(UFTouchPropertyTime, &time);
195 assert(status == UFStatusSuccess);195 assert(status == UFStatusSuccess);
196 return time;196 return time;
@@ -198,8 +198,8 @@
198198
199uint64_t frame_touch_get_start_time(UFTouch touch) {199uint64_t frame_touch_get_start_time(UFTouch touch) {
200 uint64_t start_time;200 uint64_t start_time;
201 const utouch::frame::UFTouch* uftouch =201 const oif::frame::UFTouch* uftouch =
202 static_cast<const utouch::frame::UFTouch*>(touch);202 static_cast<const oif::frame::UFTouch*>(touch);
203 UFStatus status = uftouch->GetProperty(UFTouchPropertyStartTime, &start_time);203 UFStatus status = uftouch->GetProperty(UFTouchPropertyStartTime, &start_time);
204 assert(status == UFStatusSuccess);204 assert(status == UFStatusSuccess);
205 return start_time;205 return start_time;
206206
=== modified file 'src/touch.h'
--- src/touch.h 2012-06-18 18:28:21 +0000
+++ src/touch.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,15 +18,15 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_TOUCH_H_21#ifndef FRAME_TOUCH_H_
22#define UTOUCH_FRAME_TOUCH_H_22#define FRAME_TOUCH_H_
2323
24#include <stdint.h>24#include <stdint.h>
2525
26#include <map>26#include <map>
27#include <memory>27#include <memory>
2828
29#include "utouch/frame.h"29#include "oif/frame.h"
30#include "property.h"30#include "property.h"
31#include "typedefs.h"31#include "typedefs.h"
3232
@@ -34,7 +34,7 @@
34 virtual ~UFTouch_() {}34 virtual ~UFTouch_() {}
35};35};
3636
37namespace utouch {37namespace oif {
38namespace frame {38namespace frame {
3939
40class UFTouch : public UFTouch_, public Property<UFTouchProperty> {40class UFTouch : public UFTouch_, public Property<UFTouchProperty> {
@@ -59,6 +59,6 @@
59};59};
6060
61} // namespace frame61} // namespace frame
62} // namespace utouch62} // namespace oif
6363
64#endif // UTOUCH_FRAME_TOUCH_H_64#endif // FRAME_TOUCH_H_
6565
=== modified file 'src/typedefs.h'
--- src/typedefs.h 2012-06-18 18:28:21 +0000
+++ src/typedefs.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,10 +18,10 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_TYPEDEFS_H_21#ifndef FRAME_TYPEDEFS_H_
22#define UTOUCH_FRAME_TYPEDEFS_H_22#define FRAME_TYPEDEFS_H_
2323
24namespace utouch {24namespace oif {
25namespace frame {25namespace frame {
2626
27class UFDevice;27class UFDevice;
@@ -35,6 +35,6 @@
35typedef std::shared_ptr<Window> SharedWindow;35typedef std::shared_ptr<Window> SharedWindow;
3636
37} // namespace frame37} // namespace frame
38} // namespace utouch38} // namespace oif
3939
40#endif // UTOUCH_FRAME_TYPEDEFS_H_40#endif // FRAME_TYPEDEFS_H_
4141
=== modified file 'src/value.cpp'
--- src/value.cpp 2012-06-18 18:28:21 +0000
+++ src/value.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -28,7 +28,7 @@
28#include "device.h"28#include "device.h"
29#include "frame.h"29#include "frame.h"
3030
31namespace utouch {31namespace oif {
32namespace frame {32namespace frame {
3333
34Value::Value(bool value) : type_(kBool), bool_(value) {34Value::Value(bool value) : type_(kBool), bool_(value) {
@@ -228,4 +228,4 @@
228}228}
229229
230} // namespace frame230} // namespace frame
231} // namespace utouch231} // namespace oif
232232
=== modified file 'src/value.h'
--- src/value.h 2012-06-18 18:28:21 +0000
+++ src/value.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,8 +18,8 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_VALUE_H_21#ifndef FRAME_VALUE_H_
22#define UTOUCH_FRAME_VALUE_H_22#define FRAME_VALUE_H_
2323
24#include <stdint.h>24#include <stdint.h>
2525
@@ -27,14 +27,14 @@
2727
28#include <X11/X.h>28#include <X11/X.h>
2929
30#include "utouch/frame.h"30#include "oif/frame.h"
31#include "typedefs.h"31#include "typedefs.h"
3232
33#if __SIZEOF_LONG__ != __SIZEOF_LONG_LONG__33#if __SIZEOF_LONG__ != __SIZEOF_LONG_LONG__
34#define HAVE_LONG_UNSIGNED_VALUE34#define HAVE_LONG_UNSIGNED_VALUE
35#endif35#endif
3636
37namespace utouch {37namespace oif {
38namespace frame {38namespace frame {
3939
40class Value {40class Value {
@@ -104,6 +104,6 @@
104};104};
105105
106} // namespace frame106} // namespace frame
107} // namespace utouch107} // namespace oif
108108
109#endif // UTOUCH_FRAME_VALUE_H_109#endif // FRAME_VALUE_H_
110110
=== modified file 'src/window.cpp'
--- src/window.cpp 2012-06-18 18:28:21 +0000
+++ src/window.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -24,7 +24,7 @@
2424
25#include "frame.h"25#include "frame.h"
2626
27namespace utouch {27namespace oif {
28namespace frame {28namespace frame {
2929
30Window::Window() : current_frame_(new UFFrame) {30Window::Window() : current_frame_(new UFFrame) {
@@ -43,4 +43,4 @@
43}43}
4444
45} // namespace frame45} // namespace frame
46} // namespace utouch46} // namespace oif
4747
=== modified file 'src/window.h'
--- src/window.h 2012-06-18 18:28:21 +0000
+++ src/window.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,17 +18,17 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_WINDOW_H_21#ifndef FRAME_WINDOW_H_
22#define UTOUCH_FRAME_WINDOW_H_22#define FRAME_WINDOW_H_
2323
24#include <map>24#include <map>
25#include <memory>25#include <memory>
2626
27#include "utouch/frame.h"27#include "oif/frame.h"
28#include "property.h"28#include "property.h"
29#include "typedefs.h"29#include "typedefs.h"
3030
31namespace utouch {31namespace oif{
32namespace frame {32namespace frame {
3333
34class Window : public std::enable_shared_from_this<Window> {34class Window : public std::enable_shared_from_this<Window> {
@@ -48,6 +48,6 @@
48};48};
4949
50} // namespace frame50} // namespace frame
51} // namespace utouch51} // namespace oif
5252
53#endif // UTOUCH_FRAME_WINDOW_H_53#endif // FRAME_WINDOW_H_
5454
=== modified file 'src/x11/device_x11.cpp'
--- src/x11/device_x11.cpp 2012-06-18 18:28:21 +0000
+++ src/x11/device_x11.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -27,12 +27,12 @@
2727
28#include <xorg/xserver-properties.h>28#include <xorg/xserver-properties.h>
2929
30#include "utouch/frame_x11.h"30#include "oif/frame_x11.h"
31#include "axis.h"31#include "axis.h"
32#include "value.h"32#include "value.h"
33#include "x11/window_x11.h"33#include "x11/window_x11.h"
3434
35namespace utouch {35namespace oif {
36namespace frame {36namespace frame {
3737
38namespace {38namespace {
@@ -123,7 +123,7 @@
123 valuator_info->resolution);123 valuator_info->resolution);
124124
125 axes_[type] =125 axes_[type] =
126 std::move(UniqueUFAxis(static_cast<utouch::frame::UFAxis*>(axis)));126 std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)));
127127
128 axis_map_[valuator_info->number] = type;128 axis_map_[valuator_info->number] = type;
129129
@@ -171,8 +171,8 @@
171 SharedUFFrame* frame) {171 SharedUFFrame* frame) {
172 /* We don't really know if the ownership event is for a particular window172 /* We don't really know if the ownership event is for a particular window
173 * when using the Ubuntu prototype multitouch X server. We just take the first173 * when using the Ubuntu prototype multitouch X server. We just take the first
174 * one for algorithmic completeness, and assume the utouch-frame client will174 * one for algorithmic completeness, and assume the frame client will work
175 * work around this issue. */175 * around this issue. */
176 for (auto& pair : windows_) {176 for (auto& pair : windows_) {
177 WindowX11* window = static_cast<WindowX11*>(pair.second.get());177 WindowX11* window = static_cast<WindowX11*>(pair.second.get());
178 if (!window->IsTouchOwned(event->touchid))178 if (!window->IsTouchOwned(event->touchid))
@@ -211,21 +211,21 @@
211}211}
212212
213} // namespace frame213} // namespace frame
214} // namespace utouch214} // namespace oif
215215
216extern "C" {216extern "C" {
217217
218UFStatus frame_x11_accept_touch(UFDevice device, UFWindowId window,218UFStatus frame_x11_accept_touch(UFDevice device, UFWindowId window,
219 UFTouchId touch_id) {219 UFTouchId touch_id) {
220 utouch::frame::UFDeviceX11* device_x11 =220 oif::frame::UFDeviceX11* device_x11 =
221 static_cast<utouch::frame::UFDeviceX11*>(device);221 static_cast<oif::frame::UFDeviceX11*>(device);
222 return device_x11->AcceptTouch(frame_x11_get_window_id(window), touch_id);222 return device_x11->AcceptTouch(frame_x11_get_window_id(window), touch_id);
223}223}
224224
225UFStatus frame_x11_reject_touch(UFDevice device, UFWindowId window,225UFStatus frame_x11_reject_touch(UFDevice device, UFWindowId window,
226 UFTouchId touch_id) {226 UFTouchId touch_id) {
227 utouch::frame::UFDeviceX11* device_x11 =227 oif::frame::UFDeviceX11* device_x11 =
228 static_cast<utouch::frame::UFDeviceX11*>(device);228 static_cast<oif::frame::UFDeviceX11*>(device);
229 return device_x11->RejectTouch(frame_x11_get_window_id(window), touch_id);229 return device_x11->RejectTouch(frame_x11_get_window_id(window), touch_id);
230}230}
231231
232232
=== modified file 'src/x11/device_x11.h'
--- src/x11/device_x11.h 2012-06-18 18:28:21 +0000
+++ src/x11/device_x11.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,19 +18,19 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_DEVICE_X11_H_21#ifndef FRAME_DEVICE_X11_H_
22#define UTOUCH_FRAME_DEVICE_X11_H_22#define FRAME_DEVICE_X11_H_
2323
24#include <map>24#include <map>
2525
26#include <X11/Xlib.h>26#include <X11/Xlib.h>
27#include <X11/extensions/XInput2.h>27#include <X11/extensions/XInput2.h>
2828
29#include "utouch/frame.h"29#include "oif/frame.h"
30#include "device.h"30#include "device.h"
31#include "typedefs.h"31#include "typedefs.h"
3232
33namespace utouch {33namespace oif {
34namespace frame {34namespace frame {
3535
36class UFDeviceX1136class UFDeviceX11
@@ -60,6 +60,6 @@
60};60};
6161
62} // namespace frame62} // namespace frame
63} // namespace utouch63} // namespace oif
6464
65#endif // UTOUCH_FRAME_DEVICE_X11_H_65#endif // FRAME_DEVICE_X11_H_
6666
=== modified file 'src/x11/frame_x11.cpp'
--- src/x11/frame_x11.cpp 2012-06-18 18:28:21 +0000
+++ src/x11/frame_x11.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-12 Canonical Ltd.5 * Copyright (C) 2011-12 Canonical Ltd.
6 *6 *
@@ -22,18 +22,18 @@
2222
23#include <X11/Xlib.h>23#include <X11/Xlib.h>
2424
25#include "utouch/frame.h"25#include "oif/frame.h"
26#include "utouch/frame_x11.h"26#include "oif/frame_x11.h"
27#include "x11/handle_x11.h"27#include "x11/handle_x11.h"
2828
29extern "C" {29extern "C" {
3030
31UFStatus frame_x11_new(Display* display, ::UFHandle* handle) {31UFStatus frame_x11_new(Display* display, ::UFHandle* handle) {
32 utouch::frame::UFHandleX11** handle_x11 =32 oif::frame::UFHandleX11** handle_x11 =
33 reinterpret_cast<utouch::frame::UFHandleX11**>(handle);33 reinterpret_cast<oif::frame::UFHandleX11**>(handle);
3434
35 try {35 try {
36 *handle_x11 = new utouch::frame::UFHandleX11(display);36 *handle_x11 = new oif::frame::UFHandleX11(display);
37 return UFStatusSuccess;37 return UFStatusSuccess;
38 } catch (const std::exception& exception) {38 } catch (const std::exception& exception) {
39 *handle_x11 = NULL;39 *handle_x11 = NULL;
@@ -43,14 +43,14 @@
4343
44UFStatus frame_x11_process_event(UFHandle handle,44UFStatus frame_x11_process_event(UFHandle handle,
45 XGenericEventCookie* xcookie) {45 XGenericEventCookie* xcookie) {
46 utouch::frame::UFHandleX11* handle_x11 =46 oif::frame::UFHandleX11* handle_x11 =
47 static_cast<utouch::frame::UFHandleX11*>(handle);47 static_cast<oif::frame::UFHandleX11*>(handle);
48 return handle_x11->ProcessEvent(xcookie);48 return handle_x11->ProcessEvent(xcookie);
49}49}
5050
51void frame_x11_delete(UFHandle handle) {51void frame_x11_delete(UFHandle handle) {
52 utouch::frame::UFHandleX11* handle_x11 =52 oif::frame::UFHandleX11* handle_x11 =
53 static_cast<utouch::frame::UFHandleX11*>(handle);53 static_cast<oif::frame::UFHandleX11*>(handle);
54 delete handle_x11;54 delete handle_x11;
55}55}
5656
5757
=== modified file 'src/x11/handle_x11.cpp'
--- src/x11/handle_x11.cpp 2012-06-18 18:28:21 +0000
+++ src/x11/handle_x11.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -25,12 +25,12 @@
2525
26#include <stdexcept>26#include <stdexcept>
2727
28#include "utouch/frame.h"28#include "oif/frame.h"
29#include "event.h"29#include "event.h"
30#include "value.h"30#include "value.h"
31#include "x11/device_x11.h"31#include "x11/device_x11.h"
3232
33namespace utouch {33namespace oif {
34namespace frame {34namespace frame {
3535
36UFHandleX11::UFHandleX11(Display *display)36UFHandleX11::UFHandleX11(Display *display)
@@ -186,4 +186,4 @@
186}186}
187187
188} // namespace frame188} // namespace frame
189} // namespace utouch189} // namespace oif
190190
=== modified file 'src/x11/handle_x11.h'
--- src/x11/handle_x11.h 2012-06-18 18:28:21 +0000
+++ src/x11/handle_x11.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,8 +18,8 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_HANDLE_X11_H_21#ifndef FRAME_HANDLE_X11_H_
22#define UTOUCH_FRAME_HANDLE_X11_H_22#define FRAME_HANDLE_X11_H_
2323
24#include <stdint.h>24#include <stdint.h>
2525
@@ -32,7 +32,7 @@
32#include "handle.h"32#include "handle.h"
33#include "typedefs.h"33#include "typedefs.h"
3434
35namespace utouch {35namespace oif {
36namespace frame {36namespace frame {
3737
38class UFHandleX11 : public UFHandle {38class UFHandleX11 : public UFHandle {
@@ -57,6 +57,6 @@
57};57};
5858
59} // namespace frame59} // namespace frame
60} // namespace utouch60} // namespace oif
6161
62#endif // UTOUCH_FRAME_HANDLE_X11_H_62#endif // FRAME_HANDLE_X11_H_
6363
=== modified file 'src/x11/window_x11.cpp'
--- src/x11/window_x11.cpp 2012-07-17 14:27:52 +0000
+++ src/x11/window_x11.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -22,13 +22,13 @@
2222
23#include <stdio.h>23#include <stdio.h>
2424
25#include "utouch/frame_x11.h"25#include "oif/frame_x11.h"
26#include "frame.h"26#include "frame.h"
27#include "touch.h"27#include "touch.h"
28#include "value.h"28#include "value.h"
29#include "x11/device_x11.h"29#include "x11/device_x11.h"
3030
31namespace utouch {31namespace oif {
32namespace frame {32namespace frame {
3333
34WindowX11::WindowX11(::Window window, const SharedUFDevice& device,34WindowX11::WindowX11(::Window window, const SharedUFDevice& device,
@@ -101,7 +101,7 @@
101101
102 int i = 0; /* Current XI axis number */102 int i = 0; /* Current XI axis number */
103 int j = 0; /* Current XI valuator value offset in event */103 int j = 0; /* Current XI valuator value offset in event */
104 int k = 0; /* Number of handled utouch-frame axes */104 int k = 0; /* Number of handled frame axes */
105 for (;105 for (;
106 i < event->valuators.mask_len * 8 &&106 i < event->valuators.mask_len * 8 &&
107 k < static_cast<int>(device_->axis_map().size());107 k < static_cast<int>(device_->axis_map().size());
@@ -206,4 +206,4 @@
206}206}
207207
208} // namespace frame208} // namespace frame
209} // namespace utouch209} // namespace oif
210210
=== modified file 'src/x11/window_x11.h'
--- src/x11/window_x11.h 2012-07-17 14:27:52 +0000
+++ src/x11/window_x11.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011-2012 Canonical Ltd.5 * Copyright (C) 2011-2012 Canonical Ltd.
6 *6 *
@@ -18,8 +18,8 @@
18 *18 *
19 ****************************************************************************/19 ****************************************************************************/
2020
21#ifndef UTOUCH_FRAME_WINDOW_X11_H_21#ifndef FRAME_WINDOW_X11_H_
22#define UTOUCH_FRAME_WINDOW_X11_H_22#define FRAME_WINDOW_X11_H_
2323
24#include <map>24#include <map>
25#include <memory>25#include <memory>
@@ -28,11 +28,11 @@
28#include <X11/Xlib.h>28#include <X11/Xlib.h>
29#include <X11/extensions/XInput2.h>29#include <X11/extensions/XInput2.h>
3030
31#include "utouch/frame.h"31#include "oif/frame.h"
32#include "typedefs.h"32#include "typedefs.h"
33#include "window.h"33#include "window.h"
3434
35namespace utouch {35namespace oif {
36namespace frame {36namespace frame {
3737
38class UFDeviceX11;38class UFDeviceX11;
@@ -61,6 +61,6 @@
61};61};
6262
63} // namespace frame63} // namespace frame
64} // namespace utouch64} // namespace oif
6565
66#endif // UTOUCH_FRAME_WINDOW_X11_H_66#endif // FRAME_WINDOW_X11_H_
6767
=== modified file 'test/integration/Makefile.am'
--- test/integration/Makefile.am 2012-07-18 12:59:17 +0000
+++ test/integration/Makefile.am 2012-07-24 22:45:29 +0000
@@ -43,7 +43,7 @@
43# internal symbols.43# internal symbols.
44#44#
45check_integration_LDADD = \45check_integration_LDADD = \
46 $(top_builddir)/src/.libs/libutouch-frame.a \46 $(top_builddir)/src/.libs/libframe.a \
47 $(top_builddir)/test/gtest/libgtest.a \47 $(top_builddir)/test/gtest/libgtest.a \
48 $(top_builddir)/test/gtest/libxorg-gtest.a \48 $(top_builddir)/test/gtest/libxorg-gtest.a \
49 $(top_builddir)/test/gtest/libxorg-gtest_main.a \49 $(top_builddir)/test/gtest/libxorg-gtest_main.a \
5050
=== modified file 'test/integration/events.cpp'
--- test/integration/events.cpp 2012-07-17 13:55:33 +0000
+++ test/integration/events.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -23,7 +23,7 @@
2323
24#include <stdexcept>24#include <stdexcept>
2525
26namespace utouch {26namespace oif {
27namespace frame {27namespace frame {
28namespace testing {28namespace testing {
2929
@@ -45,8 +45,8 @@
45 return value;45 return value;
46}46}
4747
48bool IsEqual(const utouch::frame::testing::Touch& a,48bool IsEqual(const oif::frame::testing::Touch& a,
49 const utouch::frame::testing::Touch& b) {49 const oif::frame::testing::Touch& b) {
50 /* We rely on the fact that values are stored in maps, so if the values are50 /* We rely on the fact that values are stored in maps, so if the values are
51 * equal they will also be stored in the same order. */51 * equal they will also be stored in the same order. */
52 for (auto property_a = a.first.cbegin(), property_b = b.first.cbegin();52 for (auto property_a = a.first.cbegin(), property_b = b.first.cbegin();
@@ -87,4 +87,4 @@
8787
88} // namespace testing88} // namespace testing
89} // namespace frame89} // namespace frame
90} // namespace utouch90} // namespace oif
9191
=== modified file 'test/integration/events.h'
--- test/integration/events.h 2012-07-17 13:55:33 +0000
+++ test/integration/events.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -19,15 +19,15 @@
19 *19 *
20 ****************************************************************************/20 ****************************************************************************/
2121
22#ifndef UTOUCH_FRAME_TEST_EVENTS_H_22#ifndef FRAME_TEST_EVENTS_H_
23#define UTOUCH_FRAME_TEST_EVENTS_H_23#define FRAME_TEST_EVENTS_H_
2424
25#include <map>25#include <map>
26#include <vector>26#include <vector>
2727
28#include "utouch/frame.h"28#include "oif/frame.h"
2929
30namespace utouch {30namespace oif {
31namespace frame {31namespace frame {
32namespace testing {32namespace testing {
3333
@@ -53,6 +53,6 @@
5353
54} // namespace testing54} // namespace testing
55} // namespace frame55} // namespace frame
56} // namespace utouch56} // namespace oif
5757
58#endif // UTOUCH_FRAME_TEST_EVENTS_H_58#endif // FRAME_TEST_EVENTS_H_
5959
=== modified file 'test/integration/x11/device.cpp'
--- test/integration/x11/device.cpp 2012-03-22 15:45:48 +0000
+++ test/integration/x11/device.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -23,9 +23,9 @@
23#include <stdexcept>23#include <stdexcept>
2424
25#include "x11/fixture.h"25#include "x11/fixture.h"
26#include "utouch/frame_x11.h"26#include "oif/frame_x11.h"
2727
28using namespace utouch::frame::x11::testing;28using namespace oif::frame::x11::testing;
2929
30class FrameDeviceTest : public Test {30class FrameDeviceTest : public Test {
31 public:31 public:
3232
=== modified file 'test/integration/x11/dynamic_type_checking.cpp'
--- test/integration/x11/dynamic_type_checking.cpp 2012-03-21 16:00:02 +0000
+++ test/integration/x11/dynamic_type_checking.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -30,7 +30,7 @@
3030
31#include "x11/fixture.h"31#include "x11/fixture.h"
3232
33using namespace utouch::frame::x11::testing;33using namespace oif::frame::x11::testing;
3434
35class DynamicTypeTest : public Test {35class DynamicTypeTest : public Test {
36 public:36 public:
3737
=== modified file 'test/integration/x11/fixture.cpp'
--- test/integration/x11/fixture.cpp 2012-02-11 00:24:29 +0000
+++ test/integration/x11/fixture.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -24,10 +24,10 @@
24#include <X11/Xlib.h>24#include <X11/Xlib.h>
25#include <X11/extensions/XInput2.h>25#include <X11/extensions/XInput2.h>
2626
27#include "utouch/frame.h"27#include "oif/frame.h"
28#include "utouch/frame_x11.h"28#include "oif/frame_x11.h"
2929
30void utouch::frame::x11::testing::Test::SetUp() {30void oif::frame::x11::testing::Test::SetUp() {
31 ASSERT_NO_FATAL_FAILURE(xorg::testing::Test::SetUp());31 ASSERT_NO_FATAL_FAILURE(xorg::testing::Test::SetUp());
3232
33 int xi_major = 2;33 int xi_major = 2;
@@ -67,7 +67,7 @@
67 ASSERT_TRUE(handle_ != NULL);67 ASSERT_TRUE(handle_ != NULL);
68}68}
6969
70void utouch::frame::x11::testing::Test::PumpEvents(uint64_t timeout) {70void oif::frame::x11::testing::Test::PumpEvents(uint64_t timeout) {
71 fd_set set;71 fd_set set;
72 FD_ZERO(&set);72 FD_ZERO(&set);
7373
@@ -126,7 +126,7 @@
126 }126 }
127}127}
128128
129void utouch::frame::x11::testing::Test::TearDown() {129void oif::frame::x11::testing::Test::TearDown() {
130 frame_x11_delete(handle_);130 frame_x11_delete(handle_);
131 xorg::testing::Test::TearDown();131 xorg::testing::Test::TearDown();
132}132}
133133
=== modified file 'test/integration/x11/fixture.h'
--- test/integration/x11/fixture.h 2012-03-22 15:45:48 +0000
+++ test/integration/x11/fixture.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -19,14 +19,14 @@
19 *19 *
20 ****************************************************************************/20 ****************************************************************************/
2121
22#ifndef UTOUCH_FRAME_TEST_FIXTURE_H_22#ifndef FRAME_TEST_FIXTURE_H_
23#define UTOUCH_FRAME_TEST_FIXTURE_H_23#define FRAME_TEST_FIXTURE_H_
2424
25#include <xorg/gtest/xorg-gtest.h>25#include <xorg/gtest/xorg-gtest.h>
2626
27#include "utouch/frame.h"27#include "oif/frame.h"
2828
29namespace utouch {29namespace oif {
30namespace frame {30namespace frame {
31namespace x11 {31namespace x11 {
32namespace testing {32namespace testing {
@@ -54,6 +54,6 @@
54} // namespace testing54} // namespace testing
55} // namespace x1155} // namespace x11
56} // namespace frame56} // namespace frame
57} // namespace utouch57} // namespace oif
5858
59#endif // UTOUCH_FRAME_TEST_FIXTURE_H_59#endif // FRAME_TEST_FIXTURE_H_
6060
=== modified file 'test/integration/x11/ids.cpp'
--- test/integration/x11/ids.cpp 2011-12-07 02:28:31 +0000
+++ test/integration/x11/ids.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -21,7 +21,7 @@
2121
22#include <gtest/gtest.h>22#include <gtest/gtest.h>
2323
24#include "utouch/frame_x11.h"24#include "oif/frame_x11.h"
2525
26TEST(FrameTest, IDs) {26TEST(FrameTest, IDs) {
27 Window x11_window_id = 0x892347;27 Window x11_window_id = 0x892347;
2828
=== modified file 'test/integration/x11/recording.cpp'
--- test/integration/x11/recording.cpp 2012-03-22 15:45:48 +0000
+++ test/integration/x11/recording.cpp 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
@@ -23,9 +23,9 @@
2323
24#include "events.h"24#include "events.h"
25#include "x11/fixture.h"25#include "x11/fixture.h"
26#include "utouch/frame_x11.h"26#include "oif/frame_x11.h"
2727
28using namespace utouch::frame::x11::testing;28using namespace oif::frame::x11::testing;
2929
30class FrameRecordingTest : public Test {30class FrameRecordingTest : public Test {
31 public:31 public:
@@ -41,15 +41,15 @@
41 FrameRecordingTest& operator=(const FrameRecordingTest&) = delete;41 FrameRecordingTest& operator=(const FrameRecordingTest&) = delete;
4242
43 protected:43 protected:
44 static const utouch::frame::testing::Events events_;44 static const oif::frame::testing::Events events_;
4545
46 virtual void ProcessFrameEvents();46 virtual void ProcessFrameEvents();
47 void CheckFrame(UFFrame frame, uint64_t event_time);47 void CheckFrame(UFFrame frame, uint64_t event_time);
48 void CheckTouch(UFFrame frame, unsigned int touch_index, uint64_t event_time);48 void CheckTouch(UFFrame frame, unsigned int touch_index, uint64_t event_time);
49 void CheckProperty(const utouch::frame::testing::Property& property,49 void CheckProperty(const oif::frame::testing::Property& property,
50 UFTouch touch, UFFrame frame, int touch_index,50 UFTouch touch, UFFrame frame, int touch_index,
51 bool check_prev);51 bool check_prev);
52 void CheckAxisValue(const utouch::frame::testing::AxisValue& axis_value,52 void CheckAxisValue(const oif::frame::testing::AxisValue& axis_value,
53 UFTouch touch, UFFrame frame, int touch_index,53 UFTouch touch, UFFrame frame, int touch_index,
54 bool check_prev);54 bool check_prev);
5555
@@ -140,8 +140,8 @@
140 * us to properly check the previous property and axis values. */140 * us to properly check the previous property and axis values. */
141 if (step_ > 0) {141 if (step_ > 0) {
142 for (const auto& pair : touch_map_) {142 for (const auto& pair : touch_map_) {
143 const utouch::frame::testing::Touch* touch;143 const oif::frame::testing::Touch* touch;
144 const utouch::frame::testing::Properties* properties;144 const oif::frame::testing::Properties* properties;
145 UFTouchState state;145 UFTouchState state;
146146
147 /* Check if the size of the touch map is at most the expected size for147 /* Check if the size of the touch map is at most the expected size for
@@ -212,7 +212,7 @@
212 frame_frame_get_touch_by_index(frame, touch_index, &touch));212 frame_frame_get_touch_by_index(frame, touch_index, &touch));
213213
214 UFTouchId id = frame_touch_get_id(touch);214 UFTouchId id = frame_touch_get_id(touch);
215 const utouch::frame::testing::Touch& expected = events_[step_][touch_index];215 const oif::frame::testing::Touch& expected = events_[step_][touch_index];
216216
217 /* Check each property */217 /* Check each property */
218 for (const auto& property : expected.first)218 for (const auto& property : expected.first)
@@ -240,10 +240,10 @@
240 << "Step " << step_ << ", Touch " << id;240 << "Step " << step_ << ", Touch " << id;
241241
242 int slot = touch_map_[id];242 int slot = touch_map_[id];
243 const utouch::frame::testing::Touch& prev_expected =243 const oif::frame::testing::Touch& prev_expected =
244 events_[step_ - 1][slot];244 events_[step_ - 1][slot];
245245
246 if (utouch::frame::testing::IsEqual(expected, prev_expected)) {246 if (oif::frame::testing::IsEqual(expected, prev_expected)) {
247 EXPECT_EQ(touch_times_[id], frame_touch_get_time(touch))247 EXPECT_EQ(touch_times_[id], frame_touch_get_time(touch))
248 << "Step " << step_ << ", Touch " << id;248 << "Step " << step_ << ", Touch " << id;
249 } else {249 } else {
@@ -268,7 +268,7 @@
268}268}
269269
270void FrameRecordingTest::CheckProperty(270void FrameRecordingTest::CheckProperty(
271 const utouch::frame::testing::Property& property,271 const oif::frame::testing::Property& property,
272 UFTouch touch,272 UFTouch touch,
273 UFFrame frame,273 UFFrame frame,
274 int touch_index,274 int touch_index,
@@ -344,7 +344,7 @@
344}344}
345345
346void FrameRecordingTest::CheckAxisValue(346void FrameRecordingTest::CheckAxisValue(
347 const utouch::frame::testing::AxisValue& axis_value,347 const oif::frame::testing::AxisValue& axis_value,
348 UFTouch touch,348 UFTouch touch,
349 UFFrame frame,349 UFFrame frame,
350 int touch_index,350 int touch_index,
@@ -410,7 +410,7 @@
410/* Construct the expected events */410/* Construct the expected events */
411namespace {411namespace {
412412
413using namespace utouch::frame::testing;413using namespace oif::frame::testing;
414414
415const Touch ConstructTouch(UFTouchState state, float window_x, float window_y,415const Touch ConstructTouch(UFTouchState state, float window_x, float window_y,
416 bool owned, bool pending_end, float x, float y,416 bool owned, bool pending_end, float x, float y,
@@ -645,5 +645,5 @@
645} // namespace645} // namespace
646646
647/* Now initialize the static test fixture member */647/* Now initialize the static test fixture member */
648const utouch::frame::testing::Events648const oif::frame::testing::Events
649 FrameRecordingTest::events_(ConstructEvents());649 FrameRecordingTest::events_(ConstructEvents());
650650
=== modified file 'test/regular/Makefile.am'
--- test/regular/Makefile.am 2012-07-18 12:59:17 +0000
+++ test/regular/Makefile.am 2012-07-24 22:45:29 +0000
@@ -9,12 +9,12 @@
99
10check_c_compile_SOURCES = check-c-compile.c10check_c_compile_SOURCES = check-c-compile.c
11check_c_compile_LDADD = \11check_c_compile_LDADD = \
12 $(top_builddir)/src/libutouch-frame.la \12 $(top_builddir)/src/libframe.la \
13 $(COVERAGE_LIBS)13 $(COVERAGE_LIBS)
1414
15check_cxx_compile_SOURCES = check-cxx-compile.cpp15check_cxx_compile_SOURCES = check-cxx-compile.cpp
16check_cxx_compile_LDADD = \16check_cxx_compile_LDADD = \
17 $(top_builddir)/src/libutouch-frame.la \17 $(top_builddir)/src/libframe.la \
18 $(COVERAGE_LIBS)18 $(COVERAGE_LIBS)
1919
20check-static-type-checking$(EXEEXT):20check-static-type-checking$(EXEEXT):
@@ -38,7 +38,7 @@
38# internal symbols.38# internal symbols.
39#39#
40check_regular_LDADD = \40check_regular_LDADD = \
41 $(top_builddir)/src/.libs/libutouch-frame.a \41 $(top_builddir)/src/.libs/libframe.a \
42 $(top_builddir)/test/gtest/libgtest.a \42 $(top_builddir)/test/gtest/libgtest.a \
43 $(top_builddir)/test/gtest/libgtest_main.a \43 $(top_builddir)/test/gtest/libgtest_main.a \
44 $(top_builddir)/test/x11_mocks/libx11_mocks.a \44 $(top_builddir)/test/x11_mocks/libx11_mocks.a \
4545
=== modified file 'test/regular/check-c-compile.c'
--- test/regular/check-c-compile.c 2012-07-17 13:55:33 +0000
+++ test/regular/check-c-compile.c 2012-07-24 22:45:29 +0000
@@ -2,7 +2,7 @@
2 * Test compiling and linking with a plain C compiler.2 * Test compiling and linking with a plain C compiler.
3 */3 */
44
5#include <utouch/frame_x11.h>5#include "include/oif/frame_x11.h"
66
7int main(int argc, char **argv) {7int main(int argc, char **argv) {
8 UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0);8 UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0);
99
=== modified file 'test/regular/check-cxx-compile.cpp'
--- test/regular/check-cxx-compile.cpp 2012-07-17 13:55:33 +0000
+++ test/regular/check-cxx-compile.cpp 2012-07-24 22:45:29 +0000
@@ -2,7 +2,7 @@
2 * Test compiling and linking with a C++ compiler.2 * Test compiling and linking with a C++ compiler.
3 */3 */
44
5#include<utouch/frame_x11.h>5#include "include/oif/frame_x11.h"
66
7int main(int argc, char **argv) {7int main(int argc, char **argv) {
8 UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0);8 UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0);
99
=== modified file 'test/regular/check-static-type-checking.c'
--- test/regular/check-static-type-checking.c 2012-07-17 13:55:33 +0000
+++ test/regular/check-static-type-checking.c 2012-07-24 22:45:29 +0000
@@ -4,7 +4,7 @@
4 * test is merely to check that the improper type mechanism is working at all.4 * test is merely to check that the improper type mechanism is working at all.
5 */5 */
66
7#include <utouch/frame.h>7#include <oif/frame.h>
88
9#ifdef __has_extension9#ifdef __has_extension
10#if __has_extension(c_generic_selections)10#if __has_extension(c_generic_selections)
1111
=== modified file 'test/regular/frame-fixture.h'
--- test/regular/frame-fixture.h 2012-07-17 14:27:23 +0000
+++ test/regular/frame-fixture.h 2012-07-24 22:45:29 +0000
@@ -2,8 +2,8 @@
2#define GTEST_FRAME_FIXTURE_H2#define GTEST_FRAME_FIXTURE_H
33
4#include <gtest/gtest.h>4#include <gtest/gtest.h>
5#include "utouch/frame.h"5#include "oif/frame.h"
6#include "utouch/frame_x11.h"6#include "oif/frame_x11.h"
77
8class FrameFixture : public ::testing::Test8class FrameFixture : public ::testing::Test
9{9{
1010
=== modified file 'tools/Makefile.am'
--- tools/Makefile.am 2012-06-18 18:28:21 +0000
+++ tools/Makefile.am 2012-07-24 22:45:29 +0000
@@ -6,24 +6,24 @@
66
7commondir = common7commondir = common
88
9bin_PROGRAMS = utouch-frame-test-x119bin_PROGRAMS = frame-test-x11
1010
11utouch_frame_test_x11_SOURCES = utouch-frame-test-x11.c \11frame_test_x11_SOURCES = frame-test-x11.c \
12 common/device.c \12 common/device.c \
13 common/device.h \13 common/device.h \
14 common/frame.c \14 common/frame.c \
15 common/frame.h \15 common/frame.h \
16 common/touch.c \16 common/touch.c \
17 common/touch.h \17 common/touch.h \
18 utouch-frame-test-x11.txt18 frame-test-x11.txt
1919
20utouch_frame_test_x11_LDADD = \20frame_test_x11_LDADD = \
21 $(XINPUT_LIBS) \21 $(XINPUT_LIBS) \
22 $(top_builddir)/src/libutouch-frame.la \22 $(top_builddir)/src/libframe.la \
23 $(COVERAGE_LIBS) \23 $(COVERAGE_LIBS) \
24 $(CXX_LIBS)24 $(CXX_LIBS)
2525
26local_manpages = utouch-frame-test-x11.126local_manpages = frame-test-x11.1
2727
28if HAVE_DOCTOOLS28if HAVE_DOCTOOLS
29dist_man_MANS = $(local_manpages)29dist_man_MANS = $(local_manpages)
3030
=== removed file 'tools/common-defs.h'
--- tools/common-defs.h 2011-09-10 15:58:14 +0000
+++ tools/common-defs.h 1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
1/*****************************************************************************
2 *
3 * utouch-frame - Touch Frame Library
4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *
7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License along
18 * with this program. If not, see <http://www.gnu.org/licenses/>.
19 *
20 * Authors:
21 * Henrik Rydberg <rydberg@bitmath.org>
22 *
23 ****************************************************************************/
24
25static void report_device_caps(utouch_frame_handle fh)
26{
27 const struct utouch_surface *s = utouch_frame_get_surface(fh);
28
29 fprintf(stderr, "device props:\n");
30 if (s->needs_pointer)
31 fprintf(stderr, "\tpointer\n");
32 if (s->is_direct)
33 fprintf(stderr, "\tdirect\n");
34 if (s->is_buttonpad)
35 fprintf(stderr, "\tbuttonpad\n");
36 if (s->is_semi_mt)
37 fprintf(stderr, "\tsemi_mt\n");
38 fprintf(stderr, "device mt events:\n");
39 if (s->use_touch_major)
40 fprintf(stderr, "\ttouch_major\n");
41 if (s->use_touch_minor)
42 fprintf(stderr, "\ttouch_minor\n");
43 if (s->use_width_major)
44 fprintf(stderr, "\twidth_major\n");
45 if (s->use_width_minor)
46 fprintf(stderr, "\twidth_minor\n");
47 if (s->use_orientation)
48 fprintf(stderr, "\torientation\n");
49 if (s->use_pressure)
50 fprintf(stderr, "\tpressure\n");
51 if (s->use_distance)
52 fprintf(stderr, "\tdistance\n");
53}
54
55static void report_frame(const struct utouch_frame *frame)
56{
57 int i;
58
59 for (i = 0; i < frame->num_active; i++) {
60 const struct utouch_contact *t = frame->active[i];
61
62 fprintf(stderr, "touch %d\n", i);
63 fprintf(stderr, " slot: %d\n", t->slot);
64 fprintf(stderr, " id: %d\n", t->id);
65 fprintf(stderr, " tool_type: %d\n", t->tool_type);
66 fprintf(stderr, " x: %f\n", t->x);
67 fprintf(stderr, " y: %f\n", t->y);
68 fprintf(stderr, " touch_major: %f\n", t->touch_major);
69 fprintf(stderr, " touch_minor: %f\n", t->touch_minor);
70 fprintf(stderr, " width_major: %f\n", t->width_major);
71 fprintf(stderr, " width_minor: %f\n", t->width_minor);
72 fprintf(stderr, " angle: %f\n", t->orientation);
73 fprintf(stderr, " pressure: %f\n", t->pressure);
74 fprintf(stderr, " distance: %f\n", t->distance);
75 fprintf(stderr, " vx: %f\n", t->vx);
76 fprintf(stderr, " vy: %f\n", t->vy);
77 }
78
79 fprintf(stderr, "sync %d %jd %d %d %d\n",
80 frame->num_active,
81 frame->time,
82 frame->sequence_id,
83 frame->revision,
84 frame->slot_revision);
85}
860
=== modified file 'tools/common/device.c'
--- tools/common/device.c 2011-09-29 21:20:29 +0000
+++ tools/common/device.c 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
77
=== modified file 'tools/common/device.h'
--- tools/common/device.h 2011-09-29 21:20:29 +0000
+++ tools/common/device.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
@@ -19,7 +19,7 @@
19 *19 *
20 ****************************************************************************/20 ****************************************************************************/
2121
22#include <utouch/frame.h>22#include <oif/frame.h>
2323
24void get_axis_info(UFAxis axis, UFAxisType *type, const char **name, float *min,24void get_axis_info(UFAxis axis, UFAxisType *type, const char **name, float *min,
25 float *max, float *res);25 float *max, float *res);
2626
=== modified file 'tools/common/frame.c'
--- tools/common/frame.c 2011-12-25 21:29:09 +0000
+++ tools/common/frame.c 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
@@ -25,7 +25,7 @@
2525
26#include <X11/X.h>26#include <X11/X.h>
2727
28#include <utouch/frame_x11.h>28#include <oif/frame_x11.h>
2929
30#include "common/touch.h"30#include "common/touch.h"
3131
3232
=== modified file 'tools/common/frame.h'
--- tools/common/frame.h 2011-09-29 21:20:29 +0000
+++ tools/common/frame.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
@@ -19,6 +19,6 @@
19 *19 *
20 ****************************************************************************/20 ****************************************************************************/
2121
22#include <utouch/frame.h>22#include <oif/frame.h>
2323
24void print_frame(UFHandle handle, UFEvent event);24void print_frame(UFHandle handle, UFEvent event);
2525
=== modified file 'tools/common/touch.c'
--- tools/common/touch.c 2011-11-09 18:14:17 +0000
+++ tools/common/touch.c 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
@@ -23,7 +23,7 @@
2323
24#include <stdio.h>24#include <stdio.h>
2525
26#include <utouch/frame_x11.h>26#include <oif/frame_x11.h>
2727
28#include "common/device.h"28#include "common/device.h"
2929
3030
=== modified file 'tools/common/touch.h'
--- tools/common/touch.h 2011-09-29 21:20:29 +0000
+++ tools/common/touch.h 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
@@ -20,6 +20,6 @@
20 ****************************************************************************/20 ****************************************************************************/
2121
22#include <X11/X.h>22#include <X11/X.h>
23#include <utouch/frame.h>23#include <oif/frame.h>
2424
25void print_touch(UFTouch touch, UFFrame frame, UFDevice device, Window window);25void print_touch(UFTouch touch, UFFrame frame, UFDevice device, Window window);
2626
=== renamed file 'tools/utouch-frame-test-x11.c' => 'tools/frame-test-x11.c'
--- tools/utouch-frame-test-x11.c 2012-02-11 00:24:29 +0000
+++ tools/frame-test-x11.c 2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
2 *2 *
3 * utouch-frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
@@ -26,8 +26,8 @@
26#include <sys/select.h>26#include <sys/select.h>
2727
28#include <X11/extensions/XInput2.h>28#include <X11/extensions/XInput2.h>
29#include <utouch/frame.h>29#include <oif/frame.h>
30#include <utouch/frame_x11.h>30#include <oif/frame_x11.h>
3131
32#include "common/device.h"32#include "common/device.h"
33#include "common/frame.h"33#include "common/frame.h"
@@ -168,7 +168,7 @@
168168
169 status = frame_x11_new(display, &frame_handle);169 status = frame_x11_new(display, &frame_handle);
170 if (status != UFStatusSuccess) {170 if (status != UFStatusSuccess) {
171 fprintf(stderr, "Error: failed to create utouch frame instance\n");171 fprintf(stderr, "Error: failed to create frame instance\n");
172 return -1;172 return -1;
173 }173 }
174174
175175
=== renamed file 'tools/utouch-frame-test-x11.txt' => 'tools/frame-test-x11.txt'
--- tools/utouch-frame-test-x11.txt 2011-08-27 01:29:53 +0000
+++ tools/frame-test-x11.txt 2012-07-24 22:45:29 +0000
@@ -1,18 +1,18 @@
1UTOUCH-FRAME-TEST-X11(1)1FRAME-TEST-X11(1)
2==========================2=================
33
4NAME4NAME
5----5----
66
7 utouch-frame-test-x11 - Report touch frame events from X.org input devices7 frame-test-x11 - Report touch frame events from X.org input devices
88
9SYNOPSIS9SYNOPSIS
10--------10--------
1111
12 utouch-frame-test-x1112 frame-test-x11
1313
14DESCRIPTION14DESCRIPTION
15-----------15-----------
1616
17A test tool used to analyse the capabilities and act as a test driver for the17A test tool used to analyse the capabilities and act as a test driver for the
18uTouch-Frame library.18frame library.
1919
=== removed file 'tools/utouch-frame-test-mtdev.c'
--- tools/utouch-frame-test-mtdev.c 2011-12-25 21:27:31 +0000
+++ tools/utouch-frame-test-mtdev.c 1970-01-01 00:00:00 +0000
@@ -1,169 +0,0 @@
1/*****************************************************************************
2 *
3 * utouch-frame - Touch Frame Library
4 *
5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *
7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License along
18 * with this program. If not, see <http://www.gnu.org/licenses/>.
19 *
20 * Authors:
21 * Henrik Rydberg <rydberg@bitmath.org>
22 *
23 ****************************************************************************/
24
25#define MTDEV_NO_LEGACY_API
26
27#define _POSIX_SOURCE
28
29#include <utouch/frame-mtdev.h>
30#include <mtdev.h>
31#include <string.h>
32#include <stdio.h>
33#include <unistd.h>
34#include <sys/stat.h>
35#include <fcntl.h>
36#include "common-defs.h"
37
38struct frame_test {
39 struct evemu_device *evemu;
40 struct mtdev *mtdev;
41 utouch_frame_handle fh;
42 struct stat fs;
43 FILE *fptest;
44 int fd;
45};
46
47static int init_evemu(struct frame_test *test)
48{
49 test->evemu = evemu_new(NULL);
50 if (!test->evemu)
51 return -1;
52 if (test->fptest)
53 return evemu_read(test->evemu, test->fptest) <= 0;
54 return evemu_extract(test->evemu, test->fd);
55}
56
57static int init_mtdev(struct frame_test *test)
58{
59 if (test->fptest)
60 return 0;
61 test->mtdev = mtdev_new_open(test->fd);
62 if (!test->mtdev)
63 return -1;
64 return 0;
65}
66
67static int init_frame(struct frame_test *test)
68{
69 test->fh = utouch_frame_new_engine(100, 32, 100);
70 if (!test->fh)
71 return -1;
72 return utouch_frame_init_mtdev(test->fh, test->evemu);
73}
74
75static void destroy_all(struct frame_test *test)
76{
77 utouch_frame_delete_engine(test->fh);
78 if (test->mtdev)
79 mtdev_close_delete(test->mtdev);
80 evemu_delete(test->evemu);
81 if (test->fptest)
82 fclose(test->fptest);
83 else
84 ioctl(test->fd, EVIOCGRAB, 0);
85 close(test->fd);
86 memset(test, 0, sizeof(*test));
87}
88
89static void loop_device(struct frame_test *test)
90{
91 FILE * fp = test->fptest;
92 const struct utouch_frame *frame;
93 struct input_event ev;
94
95 if (fp) {
96 struct timeval evtime;
97 memset(&evtime, 0, sizeof(evtime));
98 while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) {
99 frame = utouch_frame_pump_mtdev(test->fh, &ev);
100 if (frame)
101 report_frame(frame);
102 }
103 } else {
104 while (!mtdev_idle(test->mtdev, test->fd, 5000)) {
105 while (mtdev_get(test->mtdev, test->fd, &ev, 1) > 0) {
106 frame = utouch_frame_pump_mtdev(test->fh, &ev);
107 if (frame)
108 report_frame(frame);
109 }
110 }
111 }
112}
113
114int main(int argc, char *argv[])
115{
116 struct frame_test test;
117
118 if (argc < 2) {
119 fprintf(stderr, "Usage: %s <device>\n", argv[0]);
120 return -1;
121 }
122
123 memset(&test, 0, sizeof(test));
124
125 test.fd = open(argv[1], O_RDONLY | O_NONBLOCK);
126 if (test.fd < 0) {
127 fprintf(stderr, "error: could not open device\n");
128 return -1;
129 }
130 if (fstat(test.fd, &test.fs)) {
131 fprintf(stderr, "error: could not stat the device\n");
132 return -1;
133 }
134 if (!test.fs.st_rdev)
135 test.fptest = fdopen(test.fd, "r");
136
137 if (!test.fptest && ioctl(test.fd, EVIOCGRAB, 1)) {
138 fprintf(stderr, "error: could not grab the device\n");
139 return -1;
140 }
141
142 if (init_evemu(&test)) {
143 fprintf(stderr, "error: could not describe device\n");
144 return -1;
145 }
146 if (!utouch_frame_is_supported_mtdev(test.evemu)) {
147 fprintf(stderr, "error: unsupported device\n");
148 return -1;
149 }
150
151 fprintf(stderr, "device: %s\n", evemu_get_name(test.evemu));
152
153 if (init_mtdev(&test)) {
154 fprintf(stderr, "error: could not init mtdev\n");
155 return -1;
156 }
157 if (init_frame(&test)) {
158 fprintf(stderr, "error: could not init frame\n");
159 return -1;
160 }
161
162 report_device_caps(test.fh);
163
164 loop_device(&test);
165
166 destroy_all(&test);
167
168 return 0;
169}
1700
=== removed file 'tools/utouch-frame-test-mtdev.txt'
--- tools/utouch-frame-test-mtdev.txt 2011-02-03 16:07:34 +0000
+++ tools/utouch-frame-test-mtdev.txt 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
1UTOUCH-FRAME-TEST-MTDEV(1)
2==========================
3
4NAME
5----
6
7 utouch-frame-test-mtdev - describe a device and report frame events
8
9SYNOPSIS
10--------
11
12 utouch-frame-test-mtdev device
13
14DESCRIPTION
15-----------
16
17A test tool used to analyse the capabilities and act as a test driver for the
18uTouch touch frame library.
19
20AUTHOR
21------
22utouch-frame-test-mtdev was written by Henrik Rydberg <rydberg@euromail.se>

Subscribers

People subscribed via source and target branches