summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Byer <bbyer@bushing.apple.com>2008-04-29 23:00:09 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-29 23:59:31 -0700
commit519581b0bab5cc6dac397877da485745f18c2120 (patch)
tree38651729564f0c756afffab1841cbabc59122eba
parentd70487a4c09cfeb90d996ab40a23a74b2c15be6f (diff)
xquartz: remove unused params from DarwinEQInit
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
-rw-r--r--hw/xquartz/darwin.c3
-rw-r--r--hw/xquartz/darwinEvents.c2
-rw-r--r--hw/xquartz/darwinEvents.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index c18b57539..6f4719453 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -499,12 +499,13 @@ int DarwinParseModifierList(
void InitInput( int argc, char **argv )
{
darwinPointer = AddInputDevice(DarwinMouseProc, TRUE);
+ darwinPointer->name = strdup("tablet");
RegisterPointerDevice( darwinPointer );
darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE);
RegisterKeyboardDevice( darwinKeyboard );
- DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer );
+ DarwinEQInit();
QuartzInitInput(argc, argv);
}
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index cd2b49af9..e25ae84eb 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -307,7 +307,7 @@ static void DarwinEventHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, in
}
}
-Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr) {
+Bool DarwinEQInit(void) {
if (!darwinEvents)
darwinEvents = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
if (!darwinEvents)
diff --git a/hw/xquartz/darwinEvents.h b/hw/xquartz/darwinEvents.h
index 4a619c9ac..ef8bf392c 100644
--- a/hw/xquartz/darwinEvents.h
+++ b/hw/xquartz/darwinEvents.h
@@ -28,7 +28,7 @@
#ifndef _DARWIN_EVENTS_H
#define _DARWIN_EVENTS_H
-Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr);
+Bool DarwinEQInit(void);
void DarwinEQEnqueue(const xEventPtr e);
void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);