summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-11 16:26:23 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-12 12:37:16 +1000
commit5e0ca6fabd12401de6bd6039484be2079e28851e (patch)
treeaadbcabdec81f4551b807be38452294983a7e0c1
parente6a18762ef113296c6a09833be70cb4b45aa3940 (diff)
input: remove un-used "setter" argument from SetClientPointer.
It's obsolete, not likely to come back, let's drop it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Xi/setcptr.c2
-rw-r--r--dix/events.c5
-rw-r--r--include/dix.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/Xi/setcptr.c b/Xi/setcptr.c
index 05893815e..d23b2d860 100644
--- a/Xi/setcptr.c
+++ b/Xi/setcptr.c
@@ -103,7 +103,7 @@ ProcXISetClientPointer(ClientPtr client)
} else
targetClient = client;
- if (!SetClientPointer(targetClient, client, pDev))
+ if (!SetClientPointer(targetClient, pDev))
{
client->errorValue = stuff->deviceid;
return BadDevice;
diff --git a/dix/events.c b/dix/events.c
index ffeb449b8..43e1bd27c 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5691,8 +5691,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
}
/*
- * Set the client pointer for the given client. Second parameter setter could
- * be used in the future to determine access rights. Unused for now.
+ * Set the client pointer for the given client.
*
* A client can have exactly one ClientPointer. Each time a
* request/reply/event is processed and the choice of devices is ambiguous
@@ -5701,7 +5700,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
* If a keyboard is needed, the first keyboard paired with the CP is used.
*/
Bool
-SetClientPointer(ClientPtr client, ClientPtr setter, DeviceIntPtr device)
+SetClientPointer(ClientPtr client, DeviceIntPtr device)
{
if (!IsMaster(device))
{
diff --git a/include/dix.h b/include/dix.h
index df73519c8..c4a639467 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -486,8 +486,7 @@ extern _X_EXPORT int TryClientEvents(
extern _X_EXPORT void WindowsRestructured(void);
extern Bool SetClientPointer(
- ClientPtr /* client */,
- ClientPtr /* setter */,
+ ClientPtr /* client */,
DeviceIntPtr /* device */);
extern _X_EXPORT DeviceIntPtr PickPointer(