← Back to branch summary

~ubuntu-branches/ubuntu/precise/xorg-server/precise-updates

« back to all changes in this revision

Viewing changes to hw/xquartz/darwinEvents.c

Tags: 2:1.10.1-2
* Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xquartz/darwinEvents.c
43
43
#include   "windowstr.h"
44
44
#include   "pixmapstr.h"
45
45
#include   "inputstr.h"
 
46
#include   "inpututils.h"
46
47
#include   "eventstr.h"
47
48
#include   "mi.h"
48
49
#include   "scrnintstr.h"
463
464
 
464
465
    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
465
466
    darwinEvents_lock(); {
 
467
        ValuatorMask mask;
 
468
        valuator_mask_set_range(&mask, 0, (pDev == darwinTabletCurrent) ? 5 : 2, valuators);
466
469
        num_events = GetPointerEvents(darwinEvents, pDev, ev_type, ev_button, 
467
 
                                      POINTER_ABSOLUTE, 0, pDev==darwinTabletCurrent?5:2, valuators);
 
470
                                      POINTER_ABSOLUTE, &mask);
468
471
        for(i=0; i<num_events; i++) mieqEnqueue (pDev, (InternalEvent*)darwinEvents[i].event);
469
472
        if(num_events > 0) DarwinPokeEQ();
470
473
    } darwinEvents_unlock();
506
509
 
507
510
    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, 0.0f, 0.0f, 0.0f);
508
511
    darwinEvents_lock(); {
509
 
        num_events = GetProximityEvents(darwinEvents, pDev, ev_type,
510
 
                                        0, 5, valuators);
 
512
        ValuatorMask mask;
 
513
        valuator_mask_set_range(&mask, 0, 5, valuators);
 
514
        num_events = GetProximityEvents(darwinEvents, pDev, ev_type, &mask);
511
515
        for(i=0; i<num_events; i++) mieqEnqueue (pDev, (InternalEvent*)darwinEvents[i].event);
512
516
        if(num_events > 0) DarwinPokeEQ();
513
517
    } darwinEvents_unlock();