Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-dix-hook-up-the-unaccelerated-valuator-masks.patch

    Diff of /trunk/xorg-server/patches/xorg-server-1.17.1-dix-hook-up-the-unaccelerated-valuator-masks.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2575 by niro, Mon Jun 15 12:22:48 2015 UTC revision 2576 by niro, Mon Jun 15 13:02:17 2015 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001
    2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  From: Peter Hutterer <peter.hutterer@who-t.net>
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
     <head>  
     <title>svntogit/packages.git - Git clone of the 'packages' repository  
     </title>  
     <meta name='generator' content='cgit v0.10.2'/>  
     <meta name='robots' content='index, nofollow'/>  
     <link rel='stylesheet' type='text/css' href='/cgit.css'/>  
     <link rel='shortcut icon' href='/favicon.ico'/>  
     <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'/>  
     <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     </head>  
     <body>  
      <div id="archnavbar"><!-- Arch Linux global navigation bar -->  
      <div id="archnavbarlogo">  
      <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>  
      </div>  
      <div id="archnavbarmenu">  
      <ul id="archnavbarlist">  
      <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>  
      <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>  
      <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>  
      <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>  
      <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>  
      <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>  
      <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>  
      </ul>  
      </div>  
      </div><!-- #archnavbar -->  
     <div id='cgit'><table id='header'>  
     <tr>  
     <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>  
     <tr><td class='sub'>Git clone of the 'packages' repository  
     </td><td class='sub right'></td></tr></table>  
     <table class='tabs'><tr><td>  
     <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'>  
     <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>  
     <option value='grep'>log msg</option>  
     <option value='author'>author</option>  
     <option value='committer'>committer</option>  
     <option value='range'>range</option>  
     </select>  
     <input class='txt' type='text' size='10' name='q' value=''/>  
     <input type='submit' value='search'/>  
     </form>  
     </td></tr></table>  
     <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>)  
     <table summary='blob content' class='blob'>  
     <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
     <a id='n2' href='#n2'>2</a>  
     <a id='n3' href='#n3'>3</a>  
     <a id='n4' href='#n4'>4</a>  
     <a id='n5' href='#n5'>5</a>  
     <a id='n6' href='#n6'>6</a>  
     <a id='n7' href='#n7'>7</a>  
     <a id='n8' href='#n8'>8</a>  
     <a id='n9' href='#n9'>9</a>  
     <a id='n10' href='#n10'>10</a>  
     <a id='n11' href='#n11'>11</a>  
     <a id='n12' href='#n12'>12</a>  
     <a id='n13' href='#n13'>13</a>  
     <a id='n14' href='#n14'>14</a>  
     <a id='n15' href='#n15'>15</a>  
     <a id='n16' href='#n16'>16</a>  
     <a id='n17' href='#n17'>17</a>  
     <a id='n18' href='#n18'>18</a>  
     <a id='n19' href='#n19'>19</a>  
     <a id='n20' href='#n20'>20</a>  
     <a id='n21' href='#n21'>21</a>  
     <a id='n22' href='#n22'>22</a>  
     <a id='n23' href='#n23'>23</a>  
     <a id='n24' href='#n24'>24</a>  
     <a id='n25' href='#n25'>25</a>  
     <a id='n26' href='#n26'>26</a>  
     <a id='n27' href='#n27'>27</a>  
     <a id='n28' href='#n28'>28</a>  
     <a id='n29' href='#n29'>29</a>  
     <a id='n30' href='#n30'>30</a>  
     <a id='n31' href='#n31'>31</a>  
     <a id='n32' href='#n32'>32</a>  
     <a id='n33' href='#n33'>33</a>  
     <a id='n34' href='#n34'>34</a>  
     <a id='n35' href='#n35'>35</a>  
     <a id='n36' href='#n36'>36</a>  
     <a id='n37' href='#n37'>37</a>  
     <a id='n38' href='#n38'>38</a>  
     <a id='n39' href='#n39'>39</a>  
     <a id='n40' href='#n40'>40</a>  
     <a id='n41' href='#n41'>41</a>  
     <a id='n42' href='#n42'>42</a>  
     <a id='n43' href='#n43'>43</a>  
     <a id='n44' href='#n44'>44</a>  
     <a id='n45' href='#n45'>45</a>  
     <a id='n46' href='#n46'>46</a>  
     <a id='n47' href='#n47'>47</a>  
     <a id='n48' href='#n48'>48</a>  
     <a id='n49' href='#n49'>49</a>  
     <a id='n50' href='#n50'>50</a>  
     <a id='n51' href='#n51'>51</a>  
     <a id='n52' href='#n52'>52</a>  
     <a id='n53' href='#n53'>53</a>  
     <a id='n54' href='#n54'>54</a>  
     <a id='n55' href='#n55'>55</a>  
     <a id='n56' href='#n56'>56</a>  
     <a id='n57' href='#n57'>57</a>  
     <a id='n58' href='#n58'>58</a>  
     <a id='n59' href='#n59'>59</a>  
     <a id='n60' href='#n60'>60</a>  
     <a id='n61' href='#n61'>61</a>  
     <a id='n62' href='#n62'>62</a>  
     <a id='n63' href='#n63'>63</a>  
     <a id='n64' href='#n64'>64</a>  
     <a id='n65' href='#n65'>65</a>  
     <a id='n66' href='#n66'>66</a>  
     <a id='n67' href='#n67'>67</a>  
     <a id='n68' href='#n68'>68</a>  
     <a id='n69' href='#n69'>69</a>  
     <a id='n70' href='#n70'>70</a>  
     <a id='n71' href='#n71'>71</a>  
     <a id='n72' href='#n72'>72</a>  
     <a id='n73' href='#n73'>73</a>  
     <a id='n74' href='#n74'>74</a>  
     <a id='n75' href='#n75'>75</a>  
     <a id='n76' href='#n76'>76</a>  
     <a id='n77' href='#n77'>77</a>  
     <a id='n78' href='#n78'>78</a>  
     <a id='n79' href='#n79'>79</a>  
     <a id='n80' href='#n80'>80</a>  
     <a id='n81' href='#n81'>81</a>  
     <a id='n82' href='#n82'>82</a>  
     <a id='n83' href='#n83'>83</a>  
     <a id='n84' href='#n84'>84</a>  
     <a id='n85' href='#n85'>85</a>  
     <a id='n86' href='#n86'>86</a>  
     <a id='n87' href='#n87'>87</a>  
     <a id='n88' href='#n88'>88</a>  
     <a id='n89' href='#n89'>89</a>  
     <a id='n90' href='#n90'>90</a>  
     <a id='n91' href='#n91'>91</a>  
     <a id='n92' href='#n92'>92</a>  
     <a id='n93' href='#n93'>93</a>  
     <a id='n94' href='#n94'>94</a>  
     <a id='n95' href='#n95'>95</a>  
     <a id='n96' href='#n96'>96</a>  
     <a id='n97' href='#n97'>97</a>  
     <a id='n98' href='#n98'>98</a>  
     <a id='n99' href='#n99'>99</a>  
     <a id='n100' href='#n100'>100</a>  
     <a id='n101' href='#n101'>101</a>  
     <a id='n102' href='#n102'>102</a>  
     <a id='n103' href='#n103'>103</a>  
     <a id='n104' href='#n104'>104</a>  
     <a id='n105' href='#n105'>105</a>  
     <a id='n106' href='#n106'>106</a>  
     <a id='n107' href='#n107'>107</a>  
     <a id='n108' href='#n108'>108</a>  
     <a id='n109' href='#n109'>109</a>  
     <a id='n110' href='#n110'>110</a>  
     <a id='n111' href='#n111'>111</a>  
     <a id='n112' href='#n112'>112</a>  
     <a id='n113' href='#n113'>113</a>  
     <a id='n114' href='#n114'>114</a>  
     <a id='n115' href='#n115'>115</a>  
     <a id='n116' href='#n116'>116</a>  
     <a id='n117' href='#n117'>117</a>  
     <a id='n118' href='#n118'>118</a>  
     <a id='n119' href='#n119'>119</a>  
     <a id='n120' href='#n120'>120</a>  
     <a id='n121' href='#n121'>121</a>  
     <a id='n122' href='#n122'>122</a>  
     <a id='n123' href='#n123'>123</a>  
     <a id='n124' href='#n124'>124</a>  
     <a id='n125' href='#n125'>125</a>  
     <a id='n126' href='#n126'>126</a>  
     <a id='n127' href='#n127'>127</a>  
     <a id='n128' href='#n128'>128</a>  
     <a id='n129' href='#n129'>129</a>  
     <a id='n130' href='#n130'>130</a>  
     <a id='n131' href='#n131'>131</a>  
     <a id='n132' href='#n132'>132</a>  
     <a id='n133' href='#n133'>133</a>  
     <a id='n134' href='#n134'>134</a>  
     </pre></td>  
     <td class='lines'><pre><code>From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001  
     From: Peter Hutterer &lt;peter.hutterer&#64;who-t.net&gt;  
    3  Date: Tue, 5 May 2015 14:48:41 +1000  Date: Tue, 5 May 2015 14:48:41 +1000
    4  Subject: [PATCH] dix: hook up the unaccelerated valuator masks  Subject: [PATCH] dix: hook up the unaccelerated valuator masks
    5    
    6  If present, access the unaccelerated valuator mask values for DGA and XI2 raw  If present, access the unaccelerated valuator mask values for DGA and XI2 raw
    7  events.  events.
    8    
    9  Signed-off-by: Peter Hutterer &lt;peter.hutterer&#64;who-t.net&gt;  Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    10  Reviewed-by: Hans de Goede &lt;hdegoede&#64;redhat.com&gt;  Reviewed-by: Hans de Goede <hdegoede@redhat.com>
    11  <span class="hl kwb">---</span>  ---
    12   dix/getevents.c                | 31 ++++++++++++++++++++++---------   dix/getevents.c                | 31 ++++++++++++++++++++++---------
    13   hw/xfree86/common/xf86Xinput.c |  4 ++++   hw/xfree86/common/xf86Xinput.c |  4 ++++
    14   2 files changed, 26 insertions(+), 9 deletions(-)   2 files changed, 26 insertions(+), 9 deletions(-)
    15    
    16  diff --git a/dix/getevents.c b/dix/getevents.c  diff --git a/dix/getevents.c b/dix/getevents.c
    17  index 6fb12c5..64bf76e 100644  index 6fb12c5..64bf76e 100644
    18  <span class="hl kwb">--- a/dix/getevents.c</span>  --- a/dix/getevents.c
    19  <span class="hl kwa">+++ b/dix/getevents.c</span>  +++ b/dix/getevents.c
    20  &#64;&#64; -213,14 +213,25 &#64;&#64; init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)  @@ -213,14 +213,25 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
    21   }   }
    22    
    23   static void   static void
    24  <span class="hl kwb">-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data)</span>  -set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data)
    25  <span class="hl kwa">+set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask,</span>  +set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask,
    26  <span class="hl kwa">+                  BOOL use_unaccel, double *data)</span>  +                  BOOL use_unaccel, double *data)
    27   {   {
    28       int i;       int i;
    29    
    30  <span class="hl kwa">+    use_unaccel = use_unaccel &amp;&amp; valuator_mask_has_unaccelerated(mask);</span>  +    use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask);
    31  <span class="hl kwa">+</span>  +
    32       for (i = 0; i &lt; valuator_mask_size(mask); i++) {       for (i = 0; i < valuator_mask_size(mask); i++) {
    33           if (valuator_mask_isset(mask, i)) {           if (valuator_mask_isset(mask, i)) {
    34  <span class="hl kwa">+            double v;</span>  +            double v;
    35  <span class="hl kwa">+</span>  +
    36               SetBit(event-&gt;valuators.mask, i);               SetBit(event->valuators.mask, i);
    37  <span class="hl kwb">-            data[i] = valuator_mask_get_double(mask, i);</span>  -            data[i] = valuator_mask_get_double(mask, i);
    38  <span class="hl kwa">+</span>  +
    39  <span class="hl kwa">+            if (use_unaccel)</span>  +            if (use_unaccel)
    40  <span class="hl kwa">+                v = valuator_mask_get_unaccelerated(mask, i);</span>  +                v = valuator_mask_get_unaccelerated(mask, i);
    41  <span class="hl kwa">+            else</span>  +            else
    42  <span class="hl kwa">+                v = valuator_mask_get_double(mask, i);</span>  +                v = valuator_mask_get_double(mask, i);
    43  <span class="hl kwa">+</span>  +
    44  <span class="hl kwa">+            data[i] = v;</span>  +            data[i] = v;
    45           }           }
    46       }       }
    47   }   }
    48  &#64;&#64; -1138,11 +1149,11 &#64;&#64; GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,  @@ -1138,11 +1149,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
    49       valuator_mask_copy(&amp;mask, mask_in);       valuator_mask_copy(&mask, mask_in);
    50    
    51       init_raw(pDev, raw, ms, type, key_code);       init_raw(pDev, raw, ms, type, key_code);
    52  <span class="hl kwb">-    set_raw_valuators(raw, &amp;mask, raw-&gt;valuators.data_raw);</span>  -    set_raw_valuators(raw, &mask, raw->valuators.data_raw);
    53  <span class="hl kwa">+    set_raw_valuators(raw, &amp;mask, TRUE, raw-&gt;valuators.data_raw);</span>  +    set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
    54    
    55       clipValuators(pDev, &amp;mask);       clipValuators(pDev, &mask);
    56    
    57  <span class="hl kwb">-    set_raw_valuators(raw, &amp;mask, raw-&gt;valuators.data);</span>  -    set_raw_valuators(raw, &mask, raw->valuators.data);
    58  <span class="hl kwa">+    set_raw_valuators(raw, &amp;mask, FALSE, raw-&gt;valuators.data);</span>  +    set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
    59    
    60       event = &amp;events-&gt;device_event;       event = &events->device_event;
    61       init_device_event(event, pDev, ms);       init_device_event(event, pDev, ms);
    62  &#64;&#64; -1423,9 +1434,11 &#64;&#64; fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,  @@ -1423,9 +1434,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
    63           num_events++;           num_events++;
    64    
    65           init_raw(pDev, raw, ms, type, buttons);           init_raw(pDev, raw, ms, type, buttons);
    66  <span class="hl kwb">-        set_raw_valuators(raw, &amp;mask, raw-&gt;valuators.data_raw);</span>  -        set_raw_valuators(raw, &mask, raw->valuators.data_raw);
    67  <span class="hl kwa">+        set_raw_valuators(raw, &amp;mask, TRUE, raw-&gt;valuators.data_raw);</span>  +        set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
    68       }       }
    69    
    70  <span class="hl kwa">+    valuator_mask_drop_unaccelerated(&amp;mask);</span>  +    valuator_mask_drop_unaccelerated(&mask);
    71  <span class="hl kwa">+</span>  +
    72       /* valuators are in driver-native format (rel or abs) */       /* valuators are in driver-native format (rel or abs) */
    73    
    74       if (flags &amp; POINTER_ABSOLUTE) {       if (flags & POINTER_ABSOLUTE) {
    75  &#64;&#64; -1438,7 +1451,7 &#64;&#64; fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,  @@ -1438,7 +1451,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
    76           transformAbsolute(pDev, &amp;mask);           transformAbsolute(pDev, &mask);
    77           clipAbsolute(pDev, &amp;mask);           clipAbsolute(pDev, &mask);
    78           if ((flags &amp; POINTER_NORAW) == 0 &amp;&amp; raw)           if ((flags & POINTER_NORAW) == 0 && raw)
    79  <span class="hl kwb">-            set_raw_valuators(raw, &amp;mask, raw-&gt;valuators.data);</span>  -            set_raw_valuators(raw, &mask, raw->valuators.data);
    80  <span class="hl kwa">+            set_raw_valuators(raw, &amp;mask, FALSE, raw-&gt;valuators.data);</span>  +            set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
    81       }       }
    82       else {       else {
    83           transformRelative(pDev, &amp;mask);           transformRelative(pDev, &mask);
    84  &#64;&#64; -1446,7 +1459,7 &#64;&#64; fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,  @@ -1446,7 +1459,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
    85           if (flags &amp; POINTER_ACCELERATE)           if (flags & POINTER_ACCELERATE)
    86               accelPointer(pDev, &amp;mask, ms);               accelPointer(pDev, &mask, ms);
    87           if ((flags &amp; POINTER_NORAW) == 0 &amp;&amp; raw)           if ((flags & POINTER_NORAW) == 0 && raw)
    88  <span class="hl kwb">-            set_raw_valuators(raw, &amp;mask, raw-&gt;valuators.data);</span>  -            set_raw_valuators(raw, &mask, raw->valuators.data);
    89  <span class="hl kwa">+            set_raw_valuators(raw, &amp;mask, FALSE, raw-&gt;valuators.data);</span>  +            set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
    90    
    91           moveRelative(pDev, flags, &amp;mask);           moveRelative(pDev, flags, &mask);
    92       }       }
    93  &#64;&#64; -1951,7 +1964,7 &#64;&#64; GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,  @@ -1951,7 +1964,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
    94           events++;           events++;
    95           num_events++;           num_events++;
    96           init_raw(dev, raw, ms, type, client_id);           init_raw(dev, raw, ms, type, client_id);
    97  <span class="hl kwb">-        set_raw_valuators(raw, &amp;mask, raw-&gt;valuators.data_raw);</span>  -        set_raw_valuators(raw, &mask, raw->valuators.data_raw);
    98  <span class="hl kwa">+        set_raw_valuators(raw, &amp;mask, TRUE, raw-&gt;valuators.data_raw);</span>  +        set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
    99       }       }
    100    
    101       event = &amp;events-&gt;device_event;       event = &events->device_event;
    102  &#64;&#64; -2013,7 +2026,7 &#64;&#64; GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,  @@ -2013,7 +2026,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
    103           screeny = dev-&gt;spriteInfo-&gt;sprite-&gt;hotPhys.y;           screeny = dev->spriteInfo->sprite->hotPhys.y;
    104       }       }
    105       if (need_rawevent)       if (need_rawevent)
    106  <span class="hl kwb">-        set_raw_valuators(raw, &amp;mask, raw-&gt;valuators.data);</span>  -        set_raw_valuators(raw, &mask, raw->valuators.data);
    107  <span class="hl kwa">+        set_raw_valuators(raw, &amp;mask, FALSE, raw-&gt;valuators.data);</span>  +        set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
    108    
    109       /* Indirect device touch coordinates are not used for cursor positioning.       /* Indirect device touch coordinates are not used for cursor positioning.
    110        * They are merely informational, and are provided in device coordinates.        * They are merely informational, and are provided in device coordinates.
    111  diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c  diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
    112  index 1fb5b16..5ce4c71 100644  index 1fb5b16..5ce4c71 100644
    113  <span class="hl kwb">--- a/hw/xfree86/common/xf86Xinput.c</span>  --- a/hw/xfree86/common/xf86Xinput.c
    114  <span class="hl kwa">+++ b/hw/xfree86/common/xf86Xinput.c</span>  +++ b/hw/xfree86/common/xf86Xinput.c
    115  &#64;&#64; -1137,12 +1137,16 &#64;&#64; xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,  @@ -1137,12 +1137,16 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
    116                   dx = valuator_mask_get(mask, 0);                   dx = valuator_mask_get(mask, 0);
    117                   if (is_absolute)                   if (is_absolute)
    118                       dx -= device-&gt;last.valuators[0];                       dx -= device->last.valuators[0];
    119  <span class="hl kwa">+                else if (valuator_mask_has_unaccelerated(mask))</span>  +                else if (valuator_mask_has_unaccelerated(mask))
    120  <span class="hl kwa">+                    dx = valuator_mask_get_unaccelerated(mask, 0);</span>  +                    dx = valuator_mask_get_unaccelerated(mask, 0);
    121               }               }
    122    
    123               if (valuator_mask_isset(mask, 1)) {               if (valuator_mask_isset(mask, 1)) {
    124                   dy = valuator_mask_get(mask, 1);                   dy = valuator_mask_get(mask, 1);
    125                   if (is_absolute)                   if (is_absolute)
    126                       dy -= device-&gt;last.valuators[1];                       dy -= device->last.valuators[1];
    127  <span class="hl kwa">+                else if (valuator_mask_has_unaccelerated(mask))</span>  +                else if (valuator_mask_has_unaccelerated(mask))
    128  <span class="hl kwa">+                    dy = valuator_mask_get_unaccelerated(mask, 1);</span>  +                    dy = valuator_mask_get_unaccelerated(mask, 1);
    129               }               }
    130    
    131               if (DGAStealMotionEvent(device, idx, dx, dy))               if (DGAStealMotionEvent(device, idx, dx, dy))
    132  <span class="hl kwb">-- </span>  --
    133  2.4.1  2.4.1
    134    
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 2002-2014 <a href="mailto:jvinet@zeroflux.org"  
     title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"  
     title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo  
     are recognized trademarks. Some rights reserved. The registered trademark  
     Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee  
     of Linus Torvalds, owner of the mark on a world-wide basis.</p>  
     </div>  
     </div> <!-- id=cgit -->  
     </body>  
     </html>  
    Legend:
    Removed from v.2575  
    changed lines
      Added in v.2576