diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
| commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
| tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/hw/kdrive/linux | |
| parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
| parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
| download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive/linux')
| -rw-r--r-- | xorg-server/hw/kdrive/linux/evdev.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/linux/evdev.c b/xorg-server/hw/kdrive/linux/evdev.c index f6017ba51..096a2ddc3 100644 --- a/xorg-server/hw/kdrive/linux/evdev.c +++ b/xorg-server/hw/kdrive/linux/evdev.c @@ -243,7 +243,9 @@ EvdevPtrEnable (KdPointerInfo *pi) if (fd < 0) return BadMatch; - + if (ioctl (fd, EVIOCGRAB, 1) < 0) + perror ("Grabbing evdev mouse device failed"); + if (ioctl (fd, EVIOCGBIT(0 /*EV*/, sizeof (ev)), ev) < 0) { perror ("EVIOCGBIT 0"); @@ -335,6 +337,10 @@ EvdevPtrDisable (KdPointerInfo *pi) return; KdUnregisterFd (pi, ke->fd, TRUE); + + if (ioctl (ke->fd, EVIOCGRAB, 0) < 0) + perror ("Ungrabbing evdev mouse device failed"); + xfree (ke); pi->driverPrivate = 0; } @@ -425,6 +431,9 @@ EvdevKbdEnable (KdKeyboardInfo *ki) if (fd < 0) return BadMatch; + if (ioctl (fd, EVIOCGRAB, 1) < 0) + perror ("Grabbing evdev keyboard device failed"); + if (ioctl (fd, EVIOCGBIT(0 /*EV*/, sizeof (ev)), ev) < 0) { perror ("EVIOCGBIT 0"); close (fd); @@ -496,6 +505,10 @@ EvdevKbdDisable (KdKeyboardInfo *ki) return; KdUnregisterFd (ki, ke->fd, TRUE); + + if (ioctl (ke->fd, EVIOCGRAB, 0) < 0) + perror ("Ungrabbing evdev keyboard device failed"); + xfree (ke); ki->driverPrivate = 0; } |