| /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-dix-hook-up-the-unaccelerated-valuator-masks.patch |
Contents of /trunk/xorg-server/patches/xorg-server-1.17.1-dix-hook-up-the-unaccelerated-valuator-masks.patch
Parent Directory
| 
Revision Log
Revision 2575 -
(show annotations)
(download)
Mon Jun 15 12:22:48 2015 UTC (8 years, 10 months ago) by niro
File size: 16215 byte(s)
Mon Jun 15 12:22:48 2015 UTC (8 years, 10 months ago) by niro
File size: 16215 byte(s)
-serveral upstream patches
| 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| 2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 3 | <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> |
| 4 | <head> |
| 5 | <title>svntogit/packages.git - Git clone of the 'packages' repository |
| 6 | </title> |
| 7 | <meta name='generator' content='cgit v0.10.2'/> |
| 8 | <meta name='robots' content='index, nofollow'/> |
| 9 | <link rel='stylesheet' type='text/css' href='/cgit.css'/> |
| 10 | <link rel='shortcut icon' href='/favicon.ico'/> |
| 11 | <link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server' type='application/atom+xml'/> |
| 12 | <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
| 13 | <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
| 14 | <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
| 15 | <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
| 16 | </head> |
| 17 | <body> |
| 18 | <div id="archnavbar"><!-- Arch Linux global navigation bar --> |
| 19 | <div id="archnavbarlogo"> |
| 20 | <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> |
| 21 | </div> |
| 22 | <div id="archnavbarmenu"> |
| 23 | <ul id="archnavbarlist"> |
| 24 | <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> |
| 25 | <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> |
| 26 | <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> |
| 27 | <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> |
| 28 | <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> |
| 29 | <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> |
| 30 | <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> |
| 31 | </ul> |
| 32 | </div> |
| 33 | </div><!-- #archnavbar --> |
| 34 | <div id='cgit'><table id='header'> |
| 35 | <tr> |
| 36 | <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> |
| 37 | <tr><td class='sub'>Git clone of the 'packages' repository |
| 38 | </td><td class='sub right'></td></tr></table> |
| 39 | <table class='tabs'><tr><td> |
| 40 | <a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch'> |
| 41 | <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'> |
| 42 | <option value='grep'>log msg</option> |
| 43 | <option value='author'>author</option> |
| 44 | <option value='committer'>committer</option> |
| 45 | <option value='range'>range</option> |
| 46 | </select> |
| 47 | <input class='txt' type='text' size='10' name='q' value=''/> |
| 48 | <input type='submit' value='search'/> |
| 49 | </form> |
| 50 | </td></tr></table> |
| 51 | <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server'>0002-dix-hook-up-the-unaccelerated-valuator-masks.patch</a></div><div class='content'>blob: 6b8b1e5b5d736e78117563a1a2b5dafe151fd454 (<a href='/svntogit/packages.git/plain/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch?h=packages/xorg-server'>plain</a>) |
| 52 | <table summary='blob content' class='blob'> |
| 53 | <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> |
| 54 | <a id='n2' href='#n2'>2</a> |
| 55 | <a id='n3' href='#n3'>3</a> |
| 56 | <a id='n4' href='#n4'>4</a> |
| 57 | <a id='n5' href='#n5'>5</a> |
| 58 | <a id='n6' href='#n6'>6</a> |
| 59 | <a id='n7' href='#n7'>7</a> |
| 60 | <a id='n8' href='#n8'>8</a> |
| 61 | <a id='n9' href='#n9'>9</a> |
| 62 | <a id='n10' href='#n10'>10</a> |
| 63 | <a id='n11' href='#n11'>11</a> |
| 64 | <a id='n12' href='#n12'>12</a> |
| 65 | <a id='n13' href='#n13'>13</a> |
| 66 | <a id='n14' href='#n14'>14</a> |
| 67 | <a id='n15' href='#n15'>15</a> |
| 68 | <a id='n16' href='#n16'>16</a> |
| 69 | <a id='n17' href='#n17'>17</a> |
| 70 | <a id='n18' href='#n18'>18</a> |
| 71 | <a id='n19' href='#n19'>19</a> |
| 72 | <a id='n20' href='#n20'>20</a> |
| 73 | <a id='n21' href='#n21'>21</a> |
| 74 | <a id='n22' href='#n22'>22</a> |
| 75 | <a id='n23' href='#n23'>23</a> |
| 76 | <a id='n24' href='#n24'>24</a> |
| 77 | <a id='n25' href='#n25'>25</a> |
| 78 | <a id='n26' href='#n26'>26</a> |
| 79 | <a id='n27' href='#n27'>27</a> |
| 80 | <a id='n28' href='#n28'>28</a> |
| 81 | <a id='n29' href='#n29'>29</a> |
| 82 | <a id='n30' href='#n30'>30</a> |
| 83 | <a id='n31' href='#n31'>31</a> |
| 84 | <a id='n32' href='#n32'>32</a> |
| 85 | <a id='n33' href='#n33'>33</a> |
| 86 | <a id='n34' href='#n34'>34</a> |
| 87 | <a id='n35' href='#n35'>35</a> |
| 88 | <a id='n36' href='#n36'>36</a> |
| 89 | <a id='n37' href='#n37'>37</a> |
| 90 | <a id='n38' href='#n38'>38</a> |
| 91 | <a id='n39' href='#n39'>39</a> |
| 92 | <a id='n40' href='#n40'>40</a> |
| 93 | <a id='n41' href='#n41'>41</a> |
| 94 | <a id='n42' href='#n42'>42</a> |
| 95 | <a id='n43' href='#n43'>43</a> |
| 96 | <a id='n44' href='#n44'>44</a> |
| 97 | <a id='n45' href='#n45'>45</a> |
| 98 | <a id='n46' href='#n46'>46</a> |
| 99 | <a id='n47' href='#n47'>47</a> |
| 100 | <a id='n48' href='#n48'>48</a> |
| 101 | <a id='n49' href='#n49'>49</a> |
| 102 | <a id='n50' href='#n50'>50</a> |
| 103 | <a id='n51' href='#n51'>51</a> |
| 104 | <a id='n52' href='#n52'>52</a> |
| 105 | <a id='n53' href='#n53'>53</a> |
| 106 | <a id='n54' href='#n54'>54</a> |
| 107 | <a id='n55' href='#n55'>55</a> |
| 108 | <a id='n56' href='#n56'>56</a> |
| 109 | <a id='n57' href='#n57'>57</a> |
| 110 | <a id='n58' href='#n58'>58</a> |
| 111 | <a id='n59' href='#n59'>59</a> |
| 112 | <a id='n60' href='#n60'>60</a> |
| 113 | <a id='n61' href='#n61'>61</a> |
| 114 | <a id='n62' href='#n62'>62</a> |
| 115 | <a id='n63' href='#n63'>63</a> |
| 116 | <a id='n64' href='#n64'>64</a> |
| 117 | <a id='n65' href='#n65'>65</a> |
| 118 | <a id='n66' href='#n66'>66</a> |
| 119 | <a id='n67' href='#n67'>67</a> |
| 120 | <a id='n68' href='#n68'>68</a> |
| 121 | <a id='n69' href='#n69'>69</a> |
| 122 | <a id='n70' href='#n70'>70</a> |
| 123 | <a id='n71' href='#n71'>71</a> |
| 124 | <a id='n72' href='#n72'>72</a> |
| 125 | <a id='n73' href='#n73'>73</a> |
| 126 | <a id='n74' href='#n74'>74</a> |
| 127 | <a id='n75' href='#n75'>75</a> |
| 128 | <a id='n76' href='#n76'>76</a> |
| 129 | <a id='n77' href='#n77'>77</a> |
| 130 | <a id='n78' href='#n78'>78</a> |
| 131 | <a id='n79' href='#n79'>79</a> |
| 132 | <a id='n80' href='#n80'>80</a> |
| 133 | <a id='n81' href='#n81'>81</a> |
| 134 | <a id='n82' href='#n82'>82</a> |
| 135 | <a id='n83' href='#n83'>83</a> |
| 136 | <a id='n84' href='#n84'>84</a> |
| 137 | <a id='n85' href='#n85'>85</a> |
| 138 | <a id='n86' href='#n86'>86</a> |
| 139 | <a id='n87' href='#n87'>87</a> |
| 140 | <a id='n88' href='#n88'>88</a> |
| 141 | <a id='n89' href='#n89'>89</a> |
| 142 | <a id='n90' href='#n90'>90</a> |
| 143 | <a id='n91' href='#n91'>91</a> |
| 144 | <a id='n92' href='#n92'>92</a> |
| 145 | <a id='n93' href='#n93'>93</a> |
| 146 | <a id='n94' href='#n94'>94</a> |
| 147 | <a id='n95' href='#n95'>95</a> |
| 148 | <a id='n96' href='#n96'>96</a> |
| 149 | <a id='n97' href='#n97'>97</a> |
| 150 | <a id='n98' href='#n98'>98</a> |
| 151 | <a id='n99' href='#n99'>99</a> |
| 152 | <a id='n100' href='#n100'>100</a> |
| 153 | <a id='n101' href='#n101'>101</a> |
| 154 | <a id='n102' href='#n102'>102</a> |
| 155 | <a id='n103' href='#n103'>103</a> |
| 156 | <a id='n104' href='#n104'>104</a> |
| 157 | <a id='n105' href='#n105'>105</a> |
| 158 | <a id='n106' href='#n106'>106</a> |
| 159 | <a id='n107' href='#n107'>107</a> |
| 160 | <a id='n108' href='#n108'>108</a> |
| 161 | <a id='n109' href='#n109'>109</a> |
| 162 | <a id='n110' href='#n110'>110</a> |
| 163 | <a id='n111' href='#n111'>111</a> |
| 164 | <a id='n112' href='#n112'>112</a> |
| 165 | <a id='n113' href='#n113'>113</a> |
| 166 | <a id='n114' href='#n114'>114</a> |
| 167 | <a id='n115' href='#n115'>115</a> |
| 168 | <a id='n116' href='#n116'>116</a> |
| 169 | <a id='n117' href='#n117'>117</a> |
| 170 | <a id='n118' href='#n118'>118</a> |
| 171 | <a id='n119' href='#n119'>119</a> |
| 172 | <a id='n120' href='#n120'>120</a> |
| 173 | <a id='n121' href='#n121'>121</a> |
| 174 | <a id='n122' href='#n122'>122</a> |
| 175 | <a id='n123' href='#n123'>123</a> |
| 176 | <a id='n124' href='#n124'>124</a> |
| 177 | <a id='n125' href='#n125'>125</a> |
| 178 | <a id='n126' href='#n126'>126</a> |
| 179 | <a id='n127' href='#n127'>127</a> |
| 180 | <a id='n128' href='#n128'>128</a> |
| 181 | <a id='n129' href='#n129'>129</a> |
| 182 | <a id='n130' href='#n130'>130</a> |
| 183 | <a id='n131' href='#n131'>131</a> |
| 184 | <a id='n132' href='#n132'>132</a> |
| 185 | <a id='n133' href='#n133'>133</a> |
| 186 | <a id='n134' href='#n134'>134</a> |
| 187 | </pre></td> |
| 188 | <td class='lines'><pre><code>From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001 |
| 189 | From: Peter Hutterer <peter.hutterer@who-t.net> |
| 190 | Date: Tue, 5 May 2015 14:48:41 +1000 |
| 191 | Subject: [PATCH] dix: hook up the unaccelerated valuator masks |
| 192 | |
| 193 | If present, access the unaccelerated valuator mask values for DGA and XI2 raw |
| 194 | events. |
| 195 | |
| 196 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
| 197 | Reviewed-by: Hans de Goede <hdegoede@redhat.com> |
| 198 | <span class="hl kwb">---</span> |
| 199 | dix/getevents.c | 31 ++++++++++++++++++++++--------- |
| 200 | hw/xfree86/common/xf86Xinput.c | 4 ++++ |
| 201 | 2 files changed, 26 insertions(+), 9 deletions(-) |
| 202 | |
| 203 | diff --git a/dix/getevents.c b/dix/getevents.c |
| 204 | index 6fb12c5..64bf76e 100644 |
| 205 | <span class="hl kwb">--- a/dix/getevents.c</span> |
| 206 | <span class="hl kwa">+++ b/dix/getevents.c</span> |
| 207 | @@ -213,14 +213,25 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail) |
| 208 | } |
| 209 | |
| 210 | static void |
| 211 | <span class="hl kwb">-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data)</span> |
| 212 | <span class="hl kwa">+set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask,</span> |
| 213 | <span class="hl kwa">+ BOOL use_unaccel, double *data)</span> |
| 214 | { |
| 215 | int i; |
| 216 | |
| 217 | <span class="hl kwa">+ use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask);</span> |
| 218 | <span class="hl kwa">+</span> |
| 219 | for (i = 0; i < valuator_mask_size(mask); i++) { |
| 220 | if (valuator_mask_isset(mask, i)) { |
| 221 | <span class="hl kwa">+ double v;</span> |
| 222 | <span class="hl kwa">+</span> |
| 223 | SetBit(event->valuators.mask, i); |
| 224 | <span class="hl kwb">- data[i] = valuator_mask_get_double(mask, i);</span> |
| 225 | <span class="hl kwa">+</span> |
| 226 | <span class="hl kwa">+ if (use_unaccel)</span> |
| 227 | <span class="hl kwa">+ v = valuator_mask_get_unaccelerated(mask, i);</span> |
| 228 | <span class="hl kwa">+ else</span> |
| 229 | <span class="hl kwa">+ v = valuator_mask_get_double(mask, i);</span> |
| 230 | <span class="hl kwa">+</span> |
| 231 | <span class="hl kwa">+ data[i] = v;</span> |
| 232 | } |
| 233 | } |
| 234 | } |
| 235 | @@ -1138,11 +1149,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type, |
| 236 | valuator_mask_copy(&mask, mask_in); |
| 237 | |
| 238 | init_raw(pDev, raw, ms, type, key_code); |
| 239 | <span class="hl kwb">- set_raw_valuators(raw, &mask, raw->valuators.data_raw);</span> |
| 240 | <span class="hl kwa">+ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);</span> |
| 241 | |
| 242 | clipValuators(pDev, &mask); |
| 243 | |
| 244 | <span class="hl kwb">- set_raw_valuators(raw, &mask, raw->valuators.data);</span> |
| 245 | <span class="hl kwa">+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);</span> |
| 246 | |
| 247 | event = &events->device_event; |
| 248 | init_device_event(event, pDev, ms); |
| 249 | @@ -1423,9 +1434,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, |
| 250 | num_events++; |
| 251 | |
| 252 | init_raw(pDev, raw, ms, type, buttons); |
| 253 | <span class="hl kwb">- set_raw_valuators(raw, &mask, raw->valuators.data_raw);</span> |
| 254 | <span class="hl kwa">+ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);</span> |
| 255 | } |
| 256 | |
| 257 | <span class="hl kwa">+ valuator_mask_drop_unaccelerated(&mask);</span> |
| 258 | <span class="hl kwa">+</span> |
| 259 | /* valuators are in driver-native format (rel or abs) */ |
| 260 | |
| 261 | if (flags & POINTER_ABSOLUTE) { |
| 262 | @@ -1438,7 +1451,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, |
| 263 | transformAbsolute(pDev, &mask); |
| 264 | clipAbsolute(pDev, &mask); |
| 265 | if ((flags & POINTER_NORAW) == 0 && raw) |
| 266 | <span class="hl kwb">- set_raw_valuators(raw, &mask, raw->valuators.data);</span> |
| 267 | <span class="hl kwa">+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);</span> |
| 268 | } |
| 269 | else { |
| 270 | transformRelative(pDev, &mask); |
| 271 | @@ -1446,7 +1459,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, |
| 272 | if (flags & POINTER_ACCELERATE) |
| 273 | accelPointer(pDev, &mask, ms); |
| 274 | if ((flags & POINTER_NORAW) == 0 && raw) |
| 275 | <span class="hl kwb">- set_raw_valuators(raw, &mask, raw->valuators.data);</span> |
| 276 | <span class="hl kwa">+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);</span> |
| 277 | |
| 278 | moveRelative(pDev, flags, &mask); |
| 279 | } |
| 280 | @@ -1951,7 +1964,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, |
| 281 | events++; |
| 282 | num_events++; |
| 283 | init_raw(dev, raw, ms, type, client_id); |
| 284 | <span class="hl kwb">- set_raw_valuators(raw, &mask, raw->valuators.data_raw);</span> |
| 285 | <span class="hl kwa">+ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);</span> |
| 286 | } |
| 287 | |
| 288 | event = &events->device_event; |
| 289 | @@ -2013,7 +2026,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, |
| 290 | screeny = dev->spriteInfo->sprite->hotPhys.y; |
| 291 | } |
| 292 | if (need_rawevent) |
| 293 | <span class="hl kwb">- set_raw_valuators(raw, &mask, raw->valuators.data);</span> |
| 294 | <span class="hl kwa">+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);</span> |
| 295 | |
| 296 | /* Indirect device touch coordinates are not used for cursor positioning. |
| 297 | * They are merely informational, and are provided in device coordinates. |
| 298 | diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c |
| 299 | index 1fb5b16..5ce4c71 100644 |
| 300 | <span class="hl kwb">--- a/hw/xfree86/common/xf86Xinput.c</span> |
| 301 | <span class="hl kwa">+++ b/hw/xfree86/common/xf86Xinput.c</span> |
| 302 | @@ -1137,12 +1137,16 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute, |
| 303 | dx = valuator_mask_get(mask, 0); |
| 304 | if (is_absolute) |
| 305 | dx -= device->last.valuators[0]; |
| 306 | <span class="hl kwa">+ else if (valuator_mask_has_unaccelerated(mask))</span> |
| 307 | <span class="hl kwa">+ dx = valuator_mask_get_unaccelerated(mask, 0);</span> |
| 308 | } |
| 309 | |
| 310 | if (valuator_mask_isset(mask, 1)) { |
| 311 | dy = valuator_mask_get(mask, 1); |
| 312 | if (is_absolute) |
| 313 | dy -= device->last.valuators[1]; |
| 314 | <span class="hl kwa">+ else if (valuator_mask_has_unaccelerated(mask))</span> |
| 315 | <span class="hl kwa">+ dy = valuator_mask_get_unaccelerated(mask, 1);</span> |
| 316 | } |
| 317 | |
| 318 | if (DGAStealMotionEvent(device, idx, dx, dy)) |
| 319 | <span class="hl kwb">-- </span> |
| 320 | 2.4.1 |
| 321 | |
| 322 | </code></pre></td></tr></table> |
| 323 | </div> <!-- class=content --> |
| 324 | <div class="foot" style="padding-left:1em;padding-right:1em;"> |
| 325 | <p>Copyright © 2002-2014 <a href="mailto:jvinet@zeroflux.org" |
| 326 | title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" |
| 327 | title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo |
| 328 | are recognized trademarks. Some rights reserved. The registered trademark |
| 329 | Linux® is used pursuant to a sublicense from LMI, the exclusive licensee |
| 330 | of Linus Torvalds, owner of the mark on a world-wide basis.</p> |
| 331 | </div> |
| 332 | </div> <!-- id=cgit --> |
| 333 | </body> |
| 334 | </html> |