dix: remove trailing/wrong whitespaces from devices.c and events.c
This commit is contained in:
Peter Hutterer
parent
c703849e79
commit
5031238aad
|
|
@ -2023,7 +2023,7 @@ ProcBell(ClientPtr client)
|
|||
if (stuff->percent < 0)
|
||||
newpercent = base + newpercent;
|
||||
else
|
||||
newpercent = base - newpercent + stuff->percent;
|
||||
newpercent = base - newpercent + stuff->percent;
|
||||
|
||||
for (keybd = inputInfo.devices; keybd; keybd = keybd->next) {
|
||||
if ((keybd->coreEvents || keybd == inputInfo.keyboard) &&
|
||||
|
|
|
|||
60
dix/events.c
60
dix/events.c
|
|
@ -777,7 +777,7 @@ XineramaChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
|
|||
if ((pSprite->current->bits->xhot != cursor->bits->xhot) ||
|
||||
(pSprite->current->bits->yhot != cursor->bits->yhot))
|
||||
XineramaCheckPhysLimits(pDev, cursor, FALSE);
|
||||
(*pSprite->screen->DisplayCursor)(pDev, pSprite->screen, cursor);
|
||||
(*pSprite->screen->DisplayCursor)(pDev, pSprite->screen, cursor);
|
||||
FreeCursor(pSprite->current, (Cursor)0);
|
||||
pSprite->current = cursor;
|
||||
pSprite->current->refcnt++;
|
||||
|
|
@ -1180,9 +1180,9 @@ NoticeEventTime(xEvent *xE)
|
|||
void
|
||||
EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
|
||||
{
|
||||
QdEventPtr tail = *syncEvents.pendtail;
|
||||
QdEventPtr qe;
|
||||
SpritePtr pSprite = device->spriteInfo->sprite;
|
||||
QdEventPtr tail = *syncEvents.pendtail;
|
||||
QdEventPtr qe;
|
||||
SpritePtr pSprite = device->spriteInfo->sprite;
|
||||
int eventlen;
|
||||
|
||||
|
||||
|
|
@ -1796,7 +1796,7 @@ AllowSome(ClientPtr client,
|
|||
return;
|
||||
switch (newState)
|
||||
{
|
||||
case THAWED: /* Async */
|
||||
case THAWED: /* Async */
|
||||
if (thisGrabbed)
|
||||
grabinfo->sync.state = THAWED;
|
||||
if (thisSynced)
|
||||
|
|
@ -1965,21 +1965,21 @@ ReleaseActiveGrabs(ClientPtr client)
|
|||
* releasing active grabs.
|
||||
*/
|
||||
do {
|
||||
done = TRUE;
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next)
|
||||
{
|
||||
done = TRUE;
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next)
|
||||
{
|
||||
if (dev->deviceGrab.grab && SameClient(dev->deviceGrab.grab, client))
|
||||
{
|
||||
(*dev->deviceGrab.DeactivateGrab)(dev);
|
||||
done = FALSE;
|
||||
(*dev->deviceGrab.DeactivateGrab)(dev);
|
||||
done = FALSE;
|
||||
}
|
||||
|
||||
if (dev->deviceGrab.grab && SameClient(dev->deviceGrab.grab, client))
|
||||
{
|
||||
(*dev->deviceGrab.DeactivateGrab)(dev);
|
||||
done = FALSE;
|
||||
(*dev->deviceGrab.DeactivateGrab)(dev);
|
||||
done = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
} while (!done);
|
||||
}
|
||||
|
||||
|
|
@ -2382,7 +2382,7 @@ FixUpEventFromWindow(
|
|||
{
|
||||
WindowPtr w= pSprite->spriteTrace[pSprite->spriteTraceGood-1];
|
||||
/* If the search ends up past the root should the child field be
|
||||
set to none or should the value in the argument be passed
|
||||
set to none or should the value in the argument be passed
|
||||
through. It probably doesn't matter since everyone calls
|
||||
this function with child == None anyway. */
|
||||
|
||||
|
|
@ -2391,10 +2391,10 @@ FixUpEventFromWindow(
|
|||
/* If the source window is same as event window, child should be
|
||||
none. Don't bother going all all the way back to the root. */
|
||||
|
||||
if (w == pWin)
|
||||
if (w == pWin)
|
||||
{
|
||||
child = None;
|
||||
break;
|
||||
child = None;
|
||||
break;
|
||||
}
|
||||
|
||||
if (w->parent == pWin)
|
||||
|
|
@ -2402,7 +2402,7 @@ FixUpEventFromWindow(
|
|||
child = w->drawable.id;
|
||||
break;
|
||||
}
|
||||
w = w->parent;
|
||||
w = w->parent;
|
||||
}
|
||||
}
|
||||
XE_KBPTR.root = RootWindow(pDev)->drawable.id;
|
||||
|
|
@ -2941,7 +2941,7 @@ InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
|
|||
{
|
||||
pSprite->current = wCursor(pWin);
|
||||
pSprite->current->refcnt++;
|
||||
pSprite->spriteTrace = (WindowPtr *)xcalloc(1, 32*sizeof(WindowPtr));
|
||||
pSprite->spriteTrace = (WindowPtr *)xcalloc(1, 32*sizeof(WindowPtr));
|
||||
if (!pSprite->spriteTrace)
|
||||
FatalError("Failed to allocate spriteTrace");
|
||||
pSprite->spriteTraceSize = 32;
|
||||
|
|
@ -3175,7 +3175,7 @@ XineramaWarpPointer(ClientPtr client)
|
|||
if (stuff->srcWid != None)
|
||||
{
|
||||
int winX, winY;
|
||||
XID winID = stuff->srcWid;
|
||||
XID winID = stuff->srcWid;
|
||||
WindowPtr source;
|
||||
|
||||
rc = dixLookupWindow(&source, winID, client, DixReadAccess);
|
||||
|
|
@ -3260,7 +3260,7 @@ ProcWarpPointer(ClientPtr client)
|
|||
if (stuff->srcWid != None)
|
||||
{
|
||||
int winX, winY;
|
||||
XID winID = stuff->srcWid;
|
||||
XID winID = stuff->srcWid;
|
||||
WindowPtr source;
|
||||
|
||||
rc = dixLookupWindow(&source, winID, client, DixReadAccess);
|
||||
|
|
@ -3497,7 +3497,7 @@ CheckPassiveGrabsOnWindow(
|
|||
grabinfo->sync.evcount = count;
|
||||
for (dxE = grabinfo->sync.event; --count >= 0; dxE++, xE++)
|
||||
*dxE = *xE;
|
||||
grabinfo->sync.state = FROZEN_WITH_EVENT;
|
||||
grabinfo->sync.state = FROZEN_WITH_EVENT;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -4677,13 +4677,13 @@ DoFocusEvents(DeviceIntPtr dev, WindowPtr fromWin, WindowPtr toWin, int mode)
|
|||
if ((toWin == NullWindow) || (toWin == PointerRootWin))
|
||||
{
|
||||
if ((fromWin == NullWindow) || (fromWin == PointerRootWin))
|
||||
{
|
||||
{
|
||||
if (fromWin == PointerRootWin)
|
||||
FocusOutEvents(dev, pSprite->win, RootWindow(dev), mode,
|
||||
NotifyPointer, TRUE);
|
||||
/* Notify all the roots */
|
||||
#ifdef PANORAMIX
|
||||
if ( !noPanoramiXExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
|
||||
else
|
||||
#endif
|
||||
|
|
@ -4720,7 +4720,7 @@ DoFocusEvents(DeviceIntPtr dev, WindowPtr fromWin, WindowPtr toWin, int mode)
|
|||
FocusOutEvents(dev, pSprite->win, RootWindow(dev), mode,
|
||||
NotifyPointer, TRUE);
|
||||
#ifdef PANORAMIX
|
||||
if ( !noPanoramiXExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
|
||||
else
|
||||
#endif
|
||||
|
|
@ -4731,7 +4731,7 @@ DoFocusEvents(DeviceIntPtr dev, WindowPtr fromWin, WindowPtr toWin, int mode)
|
|||
NotifyNonlinearVirtual, TRUE);
|
||||
FocusEvent(dev, FocusIn, mode, NotifyNonlinear, toWin);
|
||||
if (IsParent(toWin, pSprite->win))
|
||||
(void)FocusInEvents(dev, toWin, pSprite->win, NullWindow, mode,
|
||||
(void)FocusInEvents(dev, toWin, pSprite->win, NullWindow, mode,
|
||||
NotifyPointer, FALSE);
|
||||
}
|
||||
else
|
||||
|
|
@ -4846,7 +4846,7 @@ SetInputFocus(
|
|||
rc = dixLookupWindow(&focusWin, focusID, client, DixReadAccess);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
/* It is a match error to try to set the input focus to an
|
||||
/* It is a match error to try to set the input focus to an
|
||||
unviewable window. */
|
||||
if(!focusWin->realized)
|
||||
return(BadMatch);
|
||||
|
|
@ -5053,7 +5053,7 @@ ProcGrabPointer(ClientPtr client)
|
|||
|
||||
oldCursor = NullCursor;
|
||||
if (grab)
|
||||
{
|
||||
{
|
||||
if (grab->confineTo && !confineTo)
|
||||
ConfineCursorToWindow(device, RootWindow(device), FALSE, FALSE);
|
||||
oldCursor = grab->cursor;
|
||||
|
|
@ -5627,7 +5627,7 @@ ProcSendEvent(ClientPtr client)
|
|||
|
||||
/* If the input focus is PointerRootWin, send the event to where
|
||||
the pointer is if possible, then perhaps propogate up to root. */
|
||||
if (inputFocus == PointerRootWin)
|
||||
if (inputFocus == PointerRootWin)
|
||||
inputFocus = pSprite->spriteTrace[0]; /* Root window! */
|
||||
|
||||
if (IsParent(inputFocus, pSprite->win))
|
||||
|
|
@ -6077,7 +6077,7 @@ ProcRecolorCursor(ClientPtr client)
|
|||
CursorPtr pCursor;
|
||||
int nscr;
|
||||
ScreenPtr pscr;
|
||||
Bool displayed;
|
||||
Bool displayed;
|
||||
SpritePtr pSprite = PickPointer(client)->spriteInfo->sprite;
|
||||
REQUEST(xRecolorCursorReq);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue