e291c56182
Rather than always returning BadValue, associate an error status like BadWindow with a resource type like RT_WINDOW, and return the appropriate one for the requested type. This patch only touches the core protocol resource types. Others still return BadValue and need to be mapped appropriately. dixLookupResourceByType can now return BadImplementation, if the caller asked for a resource type that has not been allocated in the server. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Adam Jackson <ajax@redhat.com>
114 lines
3.2 KiB
C
114 lines
3.2 KiB
C
/*
|
|
* Copyright 2007-2008 Peter Hutterer
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Author: Peter Hutterer, University of South Australia, NICTA
|
|
*/
|
|
|
|
/***********************************************************************
|
|
*
|
|
* Request to change a given device pointer's cursor.
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <X11/X.h> /* for inputstr.h */
|
|
#include <X11/Xproto.h> /* Request macro */
|
|
#include "inputstr.h" /* DeviceIntPtr */
|
|
#include "windowstr.h" /* window structure */
|
|
#include "scrnintstr.h" /* screen structure */
|
|
#include <X11/extensions/XI.h>
|
|
#include <X11/extensions/XI2proto.h>
|
|
#include "extnsionst.h"
|
|
#include "exevents.h"
|
|
#include "exglobals.h"
|
|
#include "input.h"
|
|
|
|
#include "xichangecursor.h"
|
|
|
|
/***********************************************************************
|
|
*
|
|
* This procedure allows a client to set one pointer's cursor.
|
|
*
|
|
*/
|
|
|
|
int
|
|
SProcXIChangeCursor(ClientPtr client)
|
|
{
|
|
char n;
|
|
|
|
REQUEST(xXIChangeCursorReq);
|
|
swaps(&stuff->length, n);
|
|
swapl(&stuff->win, n);
|
|
swapl(&stuff->cursor, n);
|
|
swaps(&stuff->deviceid, n);
|
|
REQUEST_SIZE_MATCH(xXIChangeCursorReq);
|
|
return (ProcXIChangeCursor(client));
|
|
}
|
|
|
|
int ProcXIChangeCursor(ClientPtr client)
|
|
{
|
|
int rc;
|
|
WindowPtr pWin = NULL;
|
|
DeviceIntPtr pDev = NULL;
|
|
CursorPtr pCursor = NULL;
|
|
|
|
REQUEST(xXIChangeCursorReq);
|
|
REQUEST_SIZE_MATCH(xXIChangeCursorReq);
|
|
|
|
rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixSetAttrAccess);
|
|
if (rc != Success)
|
|
return rc;
|
|
|
|
if (!IsMaster(pDev) || !IsPointerDevice(pDev))
|
|
return BadDevice;
|
|
|
|
if (stuff->win != None)
|
|
{
|
|
rc = dixLookupWindow(&pWin, stuff->win, client, DixSetAttrAccess);
|
|
if (rc != Success)
|
|
return rc;
|
|
}
|
|
|
|
if (stuff->cursor == None)
|
|
{
|
|
if (pWin == WindowTable[pWin->drawable.pScreen->myNum])
|
|
pCursor = rootCursor;
|
|
else
|
|
pCursor = (CursorPtr)None;
|
|
}
|
|
else
|
|
{
|
|
rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor,
|
|
RT_CURSOR, client, DixUseAccess);
|
|
if (rc != Success)
|
|
return rc;
|
|
}
|
|
|
|
ChangeWindowDeviceCursor(pWin, pDev, pCursor);
|
|
|
|
return Success;
|
|
}
|
|
|