← Back to branch summary

~peter-pearse/ubuntu/oneiric/xorg-server/prop001

« back to all changes in this revision

Viewing changes to dix/getevents.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-04-11 09:51:56 UTC
  • mfrom: (1.1.41 upstream) (0.1.26 experimental)
  • Revision ID: james.westby@ubuntu.com-20110411095156-ymlp7gnfsoplroug
Tags: 2:1.10.0.902-1ubuntu1
* Merge from Debian experimental.
  - dropped patches, included upstream:
    213_xichangehierarchy-check-oom.patch
    216_fix_sdksyms_build.diff, included upstream.
    218_getValuatorEvents_cleanup.patch
    219_xi1_handle_noncontinuous_valuator_data.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
dix/getevents.c
205
205
{
206
206
    int i;
207
207
 
 
208
    /* Set the data to the previous value for unset absolute axes. The values
 
209
     * may be used when sent as part of an XI 1.x valuator event. */
208
210
    for (i = 0; i < valuator_mask_size(mask); i++)
209
211
    {
210
212
        if (valuator_mask_isset(mask, i))
216
218
            event->valuators.data_frac[i] =
217
219
                dev->last.remainder[i] * (1 << 16) * (1 << 16);
218
220
        }
 
221
        else if (valuator_get_mode(dev, i) == Absolute)
 
222
            event->valuators.data[i] = dev->valuator->axisVal[i];
219
223
    }
220
224
}
221
225