Xi: add XIQueryVersion request handling.
This commit is contained in:
parent
77d51b94bd
commit
903449615b
|
@ -60,6 +60,8 @@ libXi_la_SOURCES = \
|
|||
listdev.h \
|
||||
opendev.c \
|
||||
opendev.h \
|
||||
queryversion.h \
|
||||
queryversion.c \
|
||||
querydp.c \
|
||||
querydp.h \
|
||||
queryst.c \
|
||||
|
|
|
@ -103,6 +103,7 @@ SOFTWARE.
|
|||
#include "opendev.h"
|
||||
#include "querydp.h"
|
||||
#include "queryst.h"
|
||||
#include "queryversion.h"
|
||||
#include "selectev.h"
|
||||
#include "sendexev.h"
|
||||
#include "chgkmap.h"
|
||||
|
@ -234,7 +235,8 @@ static int (*ProcIVector[])(ClientPtr) = {
|
|||
ProcXChangeDeviceHierarchy, /* 43 */
|
||||
ProcXSetClientPointer, /* 44 */
|
||||
ProcXGetClientPointer, /* 45 */
|
||||
ProcXiSelectEvent /* 46 */
|
||||
ProcXiSelectEvent, /* 46 */
|
||||
ProcXIQueryVersion /* 47 */
|
||||
};
|
||||
|
||||
/* For swapped clients */
|
||||
|
@ -285,7 +287,8 @@ static int (*SProcIVector[])(ClientPtr) = {
|
|||
SProcXChangeDeviceHierarchy, /* 43 */
|
||||
SProcXSetClientPointer, /* 44 */
|
||||
SProcXGetClientPointer, /* 45 */
|
||||
SProcXiSelectEvent /* 46 */
|
||||
SProcXiSelectEvent, /* 46 */
|
||||
SProcXIQueryVersion /* 47 */
|
||||
};
|
||||
|
||||
/*****************************************************************
|
||||
|
|
105
Xi/queryversion.c
Normal file
105
Xi/queryversion.c
Normal file
|
@ -0,0 +1,105 @@
|
|||
/*
|
||||
* Copyright © 2009 Red Hat, Inc.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Authors: Peter Hutterer
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file queryversion.c
|
||||
* Protocol handling for the XIQueryVersion request/reply.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
|
||||
#include "inputstr.h"
|
||||
|
||||
#include <X11/Xmd.h>
|
||||
#include <X11/X.h>
|
||||
#include <X11/extensions/XI2proto.h>
|
||||
|
||||
#include "exglobals.h"
|
||||
#include "exevents.h"
|
||||
#include "queryversion.h"
|
||||
|
||||
extern XExtensionVersion XIVersion; /* defined in getvers.c */
|
||||
/**
|
||||
* Return the supported XI version.
|
||||
*
|
||||
* Saves the version the client claims to support as well, for future
|
||||
* reference.
|
||||
*/
|
||||
int
|
||||
ProcXIQueryVersion(ClientPtr client)
|
||||
{
|
||||
xXIQueryVersionReply rep;
|
||||
XIClientPtr pXIClient;
|
||||
|
||||
REQUEST(xXIQueryVersionReq);
|
||||
REQUEST_SIZE_MATCH(xXIQueryVersionReq);
|
||||
|
||||
pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);
|
||||
|
||||
pXIClient->major_version = stuff->major_version;
|
||||
pXIClient->minor_version = stuff->minor_version;
|
||||
|
||||
memset(&rep, 0, sizeof(xXIQueryVersionReply));
|
||||
rep.repType = X_Reply;
|
||||
rep.RepType = X_XIQueryVersion;
|
||||
rep.length = 0;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
rep.major_version = XIVersion.major_version;
|
||||
rep.minor_version = XIVersion.minor_version;
|
||||
|
||||
WriteReplyToClient(client, sizeof(xXIQueryVersionReply), &rep);
|
||||
|
||||
return Success;
|
||||
}
|
||||
|
||||
/* Swapping routines */
|
||||
|
||||
int
|
||||
SProcXIQueryVersion(ClientPtr client)
|
||||
{
|
||||
char n;
|
||||
|
||||
REQUEST(xXIQueryVersionReq);
|
||||
swaps(&stuff->length, n);
|
||||
REQUEST_AT_LEAST_SIZE(xXIQueryVersionReq);
|
||||
swaps(&stuff->major_version, n);
|
||||
swaps(&stuff->major_version, n);
|
||||
return (ProcXIQueryVersion(client));
|
||||
}
|
||||
|
||||
void
|
||||
SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply *rep)
|
||||
{
|
||||
char n;
|
||||
swaps(&rep->sequenceNumber, n);
|
||||
swapl(&rep->length, n);
|
||||
swaps(&rep->major_version, n);
|
||||
swaps(&rep->minor_version, n);
|
||||
WriteToClient(client, size, (char *)rep);
|
||||
}
|
40
Xi/queryversion.h
Normal file
40
Xi/queryversion.h
Normal file
|
@ -0,0 +1,40 @@
|
|||
/*
|
||||
* Copyright © 2009 Red Hat, Inc.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Authors: Peter Hutterer
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <X11/extensions/XI2proto.h>
|
||||
|
||||
#ifndef QUERYVERSION_H
|
||||
#define QUERYVERSION_H 1
|
||||
|
||||
int SProcXIQueryVersion(ClientPtr client);
|
||||
int ProcXIQueryVersion(ClientPtr client);
|
||||
void SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply* rep);
|
||||
|
||||
#endif /* QUERYVERSION_H */
|
Loading…
Reference in New Issue
Block a user