diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
| commit | f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (patch) | |
| tree | c76e9cb708483e65b114c08ed008880f478cae15 /xorg-server/xfixes/cursor.c | |
| parent | b16c0295c9f95426980d567e93ae00c52545b3fa (diff) | |
| parent | 3319741e6f9fc3232eb40462a261271b9af2dcb2 (diff) | |
| download | vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.gz vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.bz2 vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/xfixes/cursor.c')
| -rw-r--r-- | xorg-server/xfixes/cursor.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c index 0d7213a48..5f0fe9c88 100644 --- a/xorg-server/xfixes/cursor.c +++ b/xorg-server/xfixes/cursor.c @@ -72,10 +72,7 @@ static void deleteCursorHideCountsForScreen (ScreenPtr pScreen); int err; \
err = dixLookupResourceByType((pointer *) &pCursor, cursor, \
RT_CURSOR, client, access); \
- if (err == BadValue) { \
- client->errorValue = cursor; \
- return BadCursor; \
- } else if (err != Success) { \
+ if (err != Success) { \
client->errorValue = cursor; \
return err; \
} \
@@ -166,13 +163,11 @@ CursorDisplayCursor (DeviceIntPtr pDev, CursorCurrent[pDev->id] = pCursor;
for (e = cursorEvents; e; e = e->next)
{
- if ((e->eventMask & XFixesDisplayCursorNotifyMask) &&
- !e->pClient->clientGone)
+ if ((e->eventMask & XFixesDisplayCursorNotifyMask))
{
xXFixesCursorNotifyEvent ev;
ev.type = XFixesEventBase + XFixesCursorNotify;
ev.subtype = XFixesDisplayCursorNotify;
- ev.sequenceNumber = e->pClient->sequence;
ev.window = e->pWindow->drawable.id;
ev.cursorSerial = pCursor->serialNumber;
ev.timestamp = currentTime.milliseconds;
@@ -886,7 +881,7 @@ ProcXFixesHideCursor (ClientPtr client) client, DixGetAttrAccess);
if (ret != Success) {
client->errorValue = stuff->window;
- return (ret == BadValue) ? BadWindow : ret;
+ return ret;
}
/*
@@ -949,7 +944,7 @@ ProcXFixesShowCursor (ClientPtr client) client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->window;
- return (rc == BadValue) ? BadWindow : rc;
+ return rc;
}
/*
|