andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

KDrive: Warning fixes

Browse Source 
xEvent vs. InternalEvent confusion still reigns though.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2009-04-25 16:53:18 +10:00
parent 754be1e2ec
commit 3ea747c0db
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/kdrive/src/kdrive.c
View File

@ -99,7 +99,6 @@ KdSetRootClip (ScreenPtr pScreen, BOOL enable)
WindowPtr pChild;
Bool WasViewable;
Bool anyMarked = FALSE;
RegionPtr pOldClip = 0;
WindowPtr pLayerWin;
BoxRec box;
@ -340,7 +339,7 @@ AbortDDX(void)
}
void
ddxGiveUp ()
ddxGiveUp (void)
{
AbortDDX ();
}
@ -1316,10 +1315,10 @@ OsVendorFatalError(void)
{
}
#ifdef DPMSExtension
int
DPMSSet(ClientPtr client, int level)
{
return Success;
}
Bool
@ -1327,5 +1326,3 @@ DPMSSupported (void)
{
return FALSE;
}
#endif

24
hw/kdrive/src/kinput.c
View File

@ -319,7 +319,7 @@ KdDisableInput (void)
void
KdEnableInput (void)
{
xEvent xE;
InternalEvent ev;
KdKeyboardInfo *ki;
KdPointerInfo *pi;
@ -336,8 +336,8 @@ KdEnableInput (void)
}
/* reset screen saver */
xE.u.keyButtonPointer.time = GetTimeInMillis ();
NoticeEventTime (&xE);
ev.any.time = GetTimeInMillis ();
NoticeEventTime (&ev);
KdUnblockSigio ();
}
@ -1655,7 +1655,7 @@ char *kdActionNames[] = {
#endif /* DEBUG */
static void
KdQueueEvent (DeviceIntPtr pDev, xEvent *ev)
KdQueueEvent (DeviceIntPtr pDev, InternalEvent *ev)
{
KdAssertSigioBlocked ("KdQueueEvent");
mieqEnqueue (pDev, ev);
@ -1833,7 +1833,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo *ki,
nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);
for (i = 0; i < nEvents; i++)
KdQueueEvent(ki->dixdev, (kdEvents + i)->event);
KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event));
}
else {
ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",
@ -1943,7 +1943,7 @@ _KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel,
0, 3, valuators);
for (i = 0; i < nEvents; i++)
KdQueueEvent(pi->dixdev, (kdEvents + i)->event);
KdQueueEvent(pi->dixdev, (InternalEvent *)((kdEvents + i)->event));
}
void
@ -2134,7 +2134,7 @@ miPointerScreenFuncRec kdPointerScreenFuncs =
};
void
ProcessInputEvents ()
ProcessInputEvents (void)
{
mieqProcessInputEvents();
miPointerUpdateSprite(inputInfo.pointer);
@ -2271,16 +2271,16 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
if (pi) {
if (KdAddPointer(pi) != Success ||
ActivateDevice(pi->dixdev) != Success ||
EnableDevice(pi->dixdev) != TRUE) {
ActivateDevice(pi->dixdev, TRUE) != Success ||
EnableDevice(pi->dixdev, TRUE) != TRUE) {
ErrorF("couldn't add or enable pointer\n");
return BadImplementation;
}
}
else if (ki) {
if (KdAddKeyboard(ki) != Success ||
ActivateDevice(ki->dixdev) != Success ||
EnableDevice(ki->dixdev) != TRUE) {
ActivateDevice(ki->dixdev, TRUE) != Success ||
EnableDevice(ki->dixdev, TRUE) != TRUE) {
ErrorF("couldn't add or enable keyboard\n");
return BadImplementation;
}
@ -2298,5 +2298,5 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
void
DeleteInputDeviceRequest(DeviceIntPtr pDev)
{
RemoveDevice(pDev);
RemoveDevice(pDev, TRUE);
}