Merge lp:~boulabiar/ginn/lp-769959 into lp:ginn

Proposed by Mohamed IKBEL Boulabiar
Status: Merged
Merged at revision: 86
Proposed branch: lp:~boulabiar/ginn/lp-769959
Merge into: lp:ginn
Diff against target: 191 lines (+90/-79)
1 file modified
src/ginn.pod (+90/-79)
To merge this branch: bzr merge lp:~boulabiar/ginn/lp-769959
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Chase Douglas (community) Approve
Review via email: mp+59246@code.launchpad.net

Description of the change

This branch fixes the bug #769959 and document the accumulate option in the wishes file.
It also fixes man file styling issues in the "Example" part.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

I don't see anything wrong with the changes, so they're fine by me :).

review: Approve
Revision history for this message
Stephen M. Webb (bregma) wrote :

Mmmm, documentation. Never enough.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/ginn.pod'
--- src/ginn.pod 2011-01-26 15:46:43 +0000
+++ src/ginn.pod 2011-04-27 15:46:00 +0000
@@ -20,98 +20,109 @@
20I<button>, you can add also up to 4 modifiers keys like I<Control_L>.20I<button>, you can add also up to 4 modifiers keys like I<Control_L>.
2121
2222
23=head1 EXAMPLES23=head2 EXAMPLES
2424
25Sample wishes file25Sample wishes file:
2626
27= <ginn>27 <ginn>
28= <global>28 <global>
29= <wish gesture="Drag" fingers="2">29 <wish gesture="Drag" fingers="2">
30= <action name="action5" when="update">30 <action name="action5" when="update">
31= <trigger prop="delta y" min="20" max="80"/>31 <trigger prop="delta y" min="20" max="80"/>
32= <key>Down</key>32 <key>Down</key>
33= </action>33 </action>
34= </wish>34 </wish>
35= </global>35 </global>
36= <applications>36 <applications>
37= <application name="inkscape">37 <application name="inkscape">
38= <wish gesture="Pinch" fingers="2">38 <wish gesture="Pinch" fingers="2">
39= <action name="action1" when="update">39 <action name="action1" when="update">
40= <trigger prop="radius delta" min="-200" max="-40"/>40 <trigger prop="radius delta" min="-200" max="-40"/>
41= <key>KP_Subtract</key>41 <key>KP_Subtract</key>
42= </action>42 </action>
43= </wish>43 </wish>
44= </application>44 </application>
45= </applications>45 </applications>
46= </ginn>46 </ginn>
4747
4848
49Gesture type can be : Drag, Pinch, Rotate or Tap49Gesture type can be: Drag, Pinch, Rotate or Tap
50The time of injection can be selected by using I<update> to inject when the50The time of injection can be selected by using I<update> to inject when the
51gesture is received or I<finish> to inject when the gesture is finished.51gesture is received or I<finish> to inject when the gesture is finished.
52The choice should be written inside the I<when> in the action line.
53 <action name="action1" when="update">
54
55The uTouch gesture stack provide gesture updates which can be very small to
56reach the desired interval specified in the trigger.
57To provide more flexibility a gesture accumulation is performed by default to
58the successive property values' updates for a desired gesture until it reaches
59the min-max intervall or the gesture finish, then, the accumlation buffer is
60reinitialized.
61If you want to disable this feature you can specify it explicitly:
62 <trigger prop="delta x" min="-80" max="-40" accumulate="false"/>
5263
53The attributes used in trigger can be obtained by running geistest, you can 64The attributes used in trigger can be obtained by running geistest, you can
54also refer to the list below.65also refer to the list below.
55You can use more than one trigger, but you need to use them in the same order66You can use more than one trigger, but you need to use them in the same order
56as they appear in the list below.67as they appear in the list below.
5768
58Sub-list of general attributes69 Sub-list of general attributes
59"device id" = 1370 "device id" = 13
60"timestamp" = 18059819871 "timestamp" = 180598198
61"root window id" = 25472 "root window id" = 254
62"event window id" = 15982592173 "event window id" = 159825921
63"child window id" = 15982592174 "child window id" = 159825921
64"focus x" = 0.00000075 "focus x" = 0.000000
65"focus y" = 0.00000076 "focus y" = 0.000000
66"gesture name" = "Drag"77 "gesture name" = "Drag"
67"touches" = 178 "touches" = 1
6879
69Sub-list of attributes used with Drag gesture80 Sub-list of attributes used with Drag gesture
70"delta x" = -8.933333 81 "delta x" = -8.933333
71"delta y" = 22.00000082 "delta y" = 22.000000
72"velocity x" = -0.63809583 "velocity x" = -0.638095
73"velocity y" = 1.57142984 "velocity y" = 1.571429
74"position x" = 634.53338685 "position x" = 634.533386
75"position y" = 482.77777186 "position y" = 482.777771
7687
77Sub-list of attributes used with Rotate gesture88 Sub-list of attributes used with Rotate gesture
78"angle delta" = -0.358113 89 "angle delta" = -0.358113
79"angular velocity" = -0.02984390 "angular velocity" = -0.029843
80"angle" = -1.15999991 "angle" = -1.159999
8192
82Sub-list of attributes used with Pinch gesture93 Sub-list of attributes used with Pinch gesture
83"radius delta" = -44.93568894 "radius delta" = -44.935688
84"radial velocity" = -3.20969295 "radial velocity" = -3.209692
85"radius" = 180.46669096 "radius" = 180.466690
8697
87Sub-list of attributes used with Tap gesture98 Sub-list of attributes used with Tap gesture
88"tap time" = 74.000000 99 "tap time" = 74.000000
89"position x" = 740.933350100 "position x" = 740.933350
90"position y" = 469.333344101 "position y" = 469.333344
91102
92Last attribues in the general list103 Last attribues in the general list
93"boundingbox x1" = 634.533386104 "boundingbox x1" = 634.533386
94"boundingbox y1" = 482.777771105 "boundingbox y1" = 482.777771
95"boundingbox x2" = 634.533386106 "boundingbox x2" = 634.533386
96"boundingbox y2" = 482.777771107 "boundingbox y2" = 482.777771
97"touch 0 id" = 1079.000000108 "touch 0 id" = 1079.000000
98"touch 0 x" = 634.533386109 "touch 0 x" = 634.533386
99"touch 0 y" = 482.777771110 "touch 0 y" = 482.777771
100111
101112
102The names of keys list can be obtained after removing the XK_ prefix from113The names of keys list can be obtained after removing the XK_ prefix from
103/usr/include/X11/keysymdef.h file114/usr/include/X11/keysymdef.h file
104115
105The mouse buttons are written with their corresponding number116 The mouse buttons are written with their corresponding number:
1061 Left Button117 1 Left Button
1072 Middle Button118 2 Middle Button
1083 Right Button119 3 Right Button
1094 Wheel Up120 4 Wheel Up
1105 Wheel Down121 5 Wheel Down
1116 Horizontal Wheel Left122 6 Horizontal Wheel Left
1127 Horizontal Wheel Right123 7 Horizontal Wheel Right
1138 "Back" in browsers124 8 "Back" in browsers
114125
115126
116=head1 FILES127=head1 FILES
117128