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; WindowPtr pChild;
Bool WasViewable; Bool WasViewable;
Bool anyMarked = FALSE; Bool anyMarked = FALSE;
RegionPtr pOldClip = 0;
WindowPtr pLayerWin; WindowPtr pLayerWin;
BoxRec box; BoxRec box;
@ -340,7 +339,7 @@ AbortDDX(void)
} }
void void
ddxGiveUp () ddxGiveUp (void)
{ {
AbortDDX (); AbortDDX ();
} }
@ -1316,10 +1315,10 @@ OsVendorFatalError(void)
{ {
} }
#ifdef DPMSExtension
int int
DPMSSet(ClientPtr client, int level) DPMSSet(ClientPtr client, int level)
{ {
return Success;
} }
Bool Bool
@ -1327,5 +1326,3 @@ DPMSSupported (void)
{ {
return FALSE; return FALSE;
} }
#endif

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

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