← Back to branch summary

~darkxst/ubuntu/raring/xorg-server/lp1073724

« back to all changes in this revision

Viewing changes to dix/devices.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2011-12-20 11:39:51 UTC
  • mto: (0.10.23) (1.1.48)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: package-import@ubuntu.com-20111220113951-cx9svdcnqpcta5wk
Tags: upstream-1.11.99.2
Import upstream version 1.11.99.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
dix/devices.c
73
73
#include "dixevents.h"
74
74
#include "mipointer.h"
75
75
#include "eventstr.h"
 
76
#include "dixgrabs.h"
76
77
 
77
78
#include <X11/extensions/XI.h>
78
79
#include <X11/extensions/XI2.h>
273
274
    dev->deviceGrab.grabTime = currentTime;
274
275
    dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
275
276
    dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
 
277
    dev->deviceGrab.activeGrab = AllocGrab();
 
278
    dev->deviceGrab.sync.event = calloc(1, sizeof(DeviceEvent));
276
279
 
277
280
    XkbSetExtension(dev, ProcessKeyboardEvent);
278
281
 
941
944
        }
942
945
    }
943
946
 
 
947
    FreeGrab(dev->deviceGrab.activeGrab);
944
948
    free(dev->deviceGrab.sync.event);
945
949
    free(dev->config_info);     /* Allocated in xf86ActivateDevice. */
946
950
    free(dev->last.scroll);
2554
2558
 * the value for master.
2555
2559
 */
2556
2560
int
2557
 
AllocDevicePair (ClientPtr client, char* name,
 
2561
AllocDevicePair (ClientPtr client, const char* name,
2558
2562
                 DeviceIntPtr* ptr,
2559
2563
                 DeviceIntPtr* keybd,
2560
2564
                 DeviceProc ptr_proc,