diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-12-04 17:08:56 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-12-04 17:08:56 +1030 |
| commit | 0931f40bf1bd6e00b8d95968d761a495b2c9a46c (patch) | |
| tree | 928432b8ab1e290fc436f7d7d1ae3db88a41c1bd | |
| parent | 09c0c1a3cc4807813774a3c0e28a7ba9a87bb5c7 (diff) | |
dix: comments, whitespaces, copyright fixes.
Removing my copyright message for now, should eventually be in line with the
rest of the messages.
| -rw-r--r-- | dix/events.c | 12 | ||||
| -rw-r--r-- | dix/getevents.c | 14 |
2 files changed, 10 insertions, 16 deletions
diff --git a/dix/events.c b/dix/events.c index 5242f4308..21b0eeea3 100644 --- a/dix/events.c +++ b/dix/events.c @@ -107,12 +107,6 @@ of the copyright holder. ******************************************************************/ -/* - * MPX additions - * Copyright 2006 by Peter Hutterer - * Author: Peter Hutterer <peter@cs.unisa.edu.au> - */ - /** @file * This file handles event delivery and a big part of the server-side protocol * handling (the parts for input devices). @@ -5022,6 +5016,12 @@ ProcGrabPointer(ClientPtr client) } grab = device->deviceGrab.grab; + /* check for + 1. other client has a grab on the device already. + 2. window is viewable + 3. other client has this device as frozen "other" device + 4. times are screwed. + */ if ((grab) && !SameClient(grab, client)) rep.status = AlreadyGrabbed; else if ((!pWin->realized) || diff --git a/dix/getevents.c b/dix/getevents.c index 6791bd820..9f955cf7b 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -23,12 +23,6 @@ * * Author: Daniel Stone <daniel@fooishbar.org> */ - /* - * MPX additions: - * Copyright © 2006 Peter Hutterer - * Author: Peter Hutterer <peter@cs.unisa.edu.au> - * - */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -112,18 +106,18 @@ key_autorepeats(DeviceIntPtr pDev, int key_code) } void -CreateClassesChangedEvent(EventList* event, - DeviceIntPtr master, +CreateClassesChangedEvent(EventList* event, + DeviceIntPtr master, DeviceIntPtr slave) { - deviceClassesChangedEvent *dcce; + deviceClassesChangedEvent *dcce; int len = sizeof(xEvent); CARD32 ms = GetTimeInMillis(); /* XXX: ok, this is a bit weird. We need to alloc enough size for the * event so it can be filled in in POE lateron. Reason being that if * we realloc the event in POE we can get SIGABRT when we try to free - * or realloc the original pointer. + * or realloc the original pointer. * We can only do it here as we don't have the EventList in the event * processing any more. * |