frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: comments, whitespaces, copyright fixes. 

Removing my copyright message for now, should eventually be in line with the
rest of the messages.
This commit is contained in:
Peter Hutterer 2007-12-04 17:08:56 +10:30
parent 09c0c1a3cc
commit 0931f40bf1
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dix/events.c
View File

@ -107,12 +107,6 @@ of the copyright holder.
******************************************************************/ ******************************************************************/
/*
* MPX additions
* Copyright 2006 by Peter Hutterer
* Author: Peter Hutterer <peter@cs.unisa.edu.au>
*/
/** @file /** @file
* This file handles event delivery and a big part of the server-side protocol * This file handles event delivery and a big part of the server-side protocol
* handling (the parts for input devices). * handling (the parts for input devices).
@ -5022,6 +5016,12 @@ ProcGrabPointer(ClientPtr client)
} }
grab = device->deviceGrab.grab; 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)) if ((grab) && !SameClient(grab, client))
rep.status = AlreadyGrabbed; rep.status = AlreadyGrabbed;
else if ((!pWin->realized) || else if ((!pWin->realized) ||

14
dix/getevents.c
View File

@ -23,12 +23,6 @@
* *
* Author: Daniel Stone <daniel@fooishbar.org> * 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 #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
@ -112,18 +106,18 @@ key_autorepeats(DeviceIntPtr pDev, int key_code)
} }
void void
CreateClassesChangedEvent(EventList* event, CreateClassesChangedEvent(EventList* event,
DeviceIntPtr master, DeviceIntPtr master,
DeviceIntPtr slave) DeviceIntPtr slave)
{ {
deviceClassesChangedEvent *dcce; deviceClassesChangedEvent *dcce;
int len = sizeof(xEvent); int len = sizeof(xEvent);
CARD32 ms = GetTimeInMillis(); CARD32 ms = GetTimeInMillis();
/* XXX: ok, this is a bit weird. We need to alloc enough size for the /* 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 * 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 * 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 * We can only do it here as we don't have the EventList in the event
* processing any more. * processing any more.
* *