← Back to branch summary

~ubuntu-multiseat/ubuntu/saucy/xorg-server/bug1209008

« back to all changes in this revision

Viewing changes to dix/devices.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-07-16 09:36:06 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20130716093606-w822ywwf4bcwpylw
Tags: 2:1.14.2-0ubuntu1
https://launchpad.net/bugs/1156498
* New upstream release. (LP: #1156498)
* Remove upstreamed patch.
  - xf86setdesired-hybrid.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
dix/devices.c
112
112
     *  Transform is the user supplied (affine) transform
113
113
     *  InvScale scales coordinates back up into their native range
114
114
     */
115
 
    sx = dev->valuator->axes[0].max_value - dev->valuator->axes[0].min_value;
116
 
    sy = dev->valuator->axes[1].max_value - dev->valuator->axes[1].min_value;
 
115
    sx = dev->valuator->axes[0].max_value - dev->valuator->axes[0].min_value + 1;
 
116
    sy = dev->valuator->axes[1].max_value - dev->valuator->axes[1].min_value + 1;
117
117
 
118
118
    /* invscale */
119
119
    pixman_f_transform_init_scale(&scale, sx, sy);
795
795
            free((*t)->touches[i].valuators);
796
796
        }
797
797
 
 
798
        free((*t)->touches);
798
799
        free((*t));
799
800
        break;
800
801
    }
1365
1366
    valc->numMotionEvents = numMotionEvents;
1366
1367
    valc->motionHintWindow = NullWindow;
1367
1368
 
1368
 
    if (mode & OutOfProximity)
 
1369
    if ((mode & OutOfProximity) && !dev->proximity)
1369
1370
        InitProximityClassDeviceStruct(dev);
1370
1371
 
1371
1372
    dev->valuator = valc;