mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-22 01:20:26 +00:00
Merge branch 'master' into mpx
Conflicts: dix/devices.c dix/events.c mi/misprite.c
This commit is contained in:
Peter Hutterer
commit
015d728bcd
100 changed files with 3059 additions and 1720 deletions
181
dix/events.c
181
dix/events.c
|
|
@ -805,9 +805,9 @@ CheckPhysLimits(
|
|||
|
||||
static void
|
||||
CheckVirtualMotion(
|
||||
register DeviceIntPtr pDev,
|
||||
register QdEventPtr qe,
|
||||
register WindowPtr pWin)
|
||||
DeviceIntPtr pDev,
|
||||
QdEventPtr qe,
|
||||
WindowPtr pWin)
|
||||
{
|
||||
SpritePtr pSprite = pDev->pSprite;
|
||||
|
||||
|
|
@ -926,7 +926,7 @@ ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
|
|||
|
||||
/* returns true if b is a descendent of a */
|
||||
Bool
|
||||
IsParent(register WindowPtr a, register WindowPtr b)
|
||||
IsParent(WindowPtr a, WindowPtr b)
|
||||
{
|
||||
for (b = b->parent; b; b = b->parent)
|
||||
if (b == a) return TRUE;
|
||||
|
|
@ -936,8 +936,8 @@ IsParent(register WindowPtr a, register WindowPtr b)
|
|||
static void
|
||||
PostNewCursor(DeviceIntPtr pDev)
|
||||
{
|
||||
register WindowPtr win;
|
||||
register GrabPtr grab = pDev->coreGrab.grab;
|
||||
WindowPtr win;
|
||||
GrabPtr grab = pDev->coreGrab.grab;
|
||||
SpritePtr pSprite = pDev->pSprite;
|
||||
CursorPtr pCursor;
|
||||
|
||||
|
|
@ -1014,7 +1014,7 @@ XineramaGetCursorScreen(DeviceIntPtr pDev)
|
|||
#define TIMESLOP (5 * 60 * 1000) /* 5 minutes */
|
||||
|
||||
static void
|
||||
MonthChangedOrBadTime(register xEvent *xE)
|
||||
MonthChangedOrBadTime(xEvent *xE)
|
||||
{
|
||||
/* If the ddx/OS is careless about not processing timestamped events from
|
||||
* different sources in sorted order, then it's possible for time to go
|
||||
|
|
@ -1033,7 +1033,7 @@ MonthChangedOrBadTime(register xEvent *xE)
|
|||
lastDeviceEventTime = currentTime; }
|
||||
|
||||
void
|
||||
NoticeEventTime(register xEvent *xE)
|
||||
NoticeEventTime(xEvent *xE)
|
||||
{
|
||||
if (!syncEvents.playingEvents)
|
||||
NoticeTime(xE);
|
||||
|
|
@ -1046,8 +1046,8 @@ NoticeEventTime(register xEvent *xE)
|
|||
void
|
||||
EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
|
||||
{
|
||||
register QdEventPtr tail = *syncEvents.pendtail;
|
||||
register QdEventPtr qe;
|
||||
QdEventPtr tail = *syncEvents.pendtail;
|
||||
QdEventPtr qe;
|
||||
xEvent *qxE;
|
||||
SpritePtr pSprite = device->pSprite;
|
||||
|
||||
|
|
@ -1122,8 +1122,8 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
|
|||
static void
|
||||
PlayReleasedEvents(void)
|
||||
{
|
||||
register QdEventPtr *prev, qe;
|
||||
register DeviceIntPtr dev;
|
||||
QdEventPtr *prev, qe;
|
||||
DeviceIntPtr dev;
|
||||
DeviceIntPtr pDev;
|
||||
|
||||
prev = &syncEvents.pending;
|
||||
|
|
@ -1169,7 +1169,7 @@ PlayReleasedEvents(void)
|
|||
}
|
||||
|
||||
static void
|
||||
FreezeThaw(register DeviceIntPtr dev, Bool frozen)
|
||||
FreezeThaw(DeviceIntPtr dev, Bool frozen)
|
||||
{
|
||||
dev->coreGrab.sync.frozen = frozen;
|
||||
if (frozen)
|
||||
|
|
@ -1181,13 +1181,13 @@ FreezeThaw(register DeviceIntPtr dev, Bool frozen)
|
|||
void
|
||||
ComputeFreezes()
|
||||
{
|
||||
register DeviceIntPtr replayDev = syncEvents.replayDev;
|
||||
register int i;
|
||||
DeviceIntPtr replayDev = syncEvents.replayDev;
|
||||
int i;
|
||||
WindowPtr w;
|
||||
register xEvent *xE;
|
||||
xEvent *xE;
|
||||
int count;
|
||||
GrabPtr grab;
|
||||
register DeviceIntPtr dev;
|
||||
DeviceIntPtr dev;
|
||||
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next)
|
||||
FreezeThaw(dev, dev->coreGrab.sync.other ||
|
||||
|
|
@ -1283,10 +1283,10 @@ ScreenRestructured (ScreenPtr pScreen)
|
|||
#endif
|
||||
|
||||
void
|
||||
CheckGrabForSyncs(register DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
|
||||
CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
|
||||
{
|
||||
register GrabPtr grab = thisDev->coreGrab.grab;
|
||||
register DeviceIntPtr dev;
|
||||
GrabPtr grab = thisDev->coreGrab.grab;
|
||||
DeviceIntPtr dev;
|
||||
|
||||
if (thisMode == GrabModeSync)
|
||||
thisDev->coreGrab.sync.state = FROZEN_NO_EVENT;
|
||||
|
|
@ -1317,7 +1317,7 @@ CheckGrabForSyncs(register DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
|
|||
}
|
||||
|
||||
void
|
||||
ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab,
|
||||
ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
|
||||
TimeStamp time, Bool autoGrab)
|
||||
{
|
||||
WindowPtr oldWin = (mouse->coreGrab.grab) ?
|
||||
|
|
@ -1347,10 +1347,10 @@ ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab,
|
|||
}
|
||||
|
||||
void
|
||||
DeactivatePointerGrab(register DeviceIntPtr mouse)
|
||||
DeactivatePointerGrab(DeviceIntPtr mouse)
|
||||
{
|
||||
register GrabPtr grab = mouse->coreGrab.grab;
|
||||
register DeviceIntPtr dev;
|
||||
GrabPtr grab = mouse->coreGrab.grab;
|
||||
DeviceIntPtr dev;
|
||||
|
||||
mouse->valuator->motionHintWindow = NullWindow;
|
||||
mouse->coreGrab.grab = NullGrab;
|
||||
|
|
@ -1372,7 +1372,7 @@ DeactivatePointerGrab(register DeviceIntPtr mouse)
|
|||
}
|
||||
|
||||
void
|
||||
ActivateKeyboardGrab(register DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive)
|
||||
ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive)
|
||||
{
|
||||
WindowPtr oldWin;
|
||||
|
||||
|
|
@ -1398,11 +1398,11 @@ ActivateKeyboardGrab(register DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
|
|||
}
|
||||
|
||||
void
|
||||
DeactivateKeyboardGrab(register DeviceIntPtr keybd)
|
||||
DeactivateKeyboardGrab(DeviceIntPtr keybd)
|
||||
{
|
||||
register GrabPtr grab = keybd->coreGrab.grab;
|
||||
register DeviceIntPtr dev;
|
||||
register WindowPtr focusWin = keybd->focus ? keybd->focus->win
|
||||
GrabPtr grab = keybd->coreGrab.grab;
|
||||
DeviceIntPtr dev;
|
||||
WindowPtr focusWin = keybd->focus ? keybd->focus->win
|
||||
: keybd->pSprite->win;
|
||||
|
||||
if (focusWin == FollowKeyboardWin)
|
||||
|
|
@ -1434,7 +1434,7 @@ AllowSome(ClientPtr client,
|
|||
{
|
||||
Bool thisGrabbed, otherGrabbed, othersFrozen, thisSynced;
|
||||
TimeStamp grabTime;
|
||||
register DeviceIntPtr dev;
|
||||
DeviceIntPtr dev;
|
||||
GrabInfoPtr devgrabinfo,
|
||||
grabinfo = (core) ? &thisDev->coreGrab : &thisDev->deviceGrab;
|
||||
|
||||
|
|
@ -1551,7 +1551,7 @@ AllowSome(ClientPtr client,
|
|||
}
|
||||
|
||||
int
|
||||
ProcAllowEvents(register ClientPtr client)
|
||||
ProcAllowEvents(ClientPtr client)
|
||||
{
|
||||
TimeStamp time;
|
||||
DeviceIntPtr mouse = PickPointer(client);
|
||||
|
|
@ -1596,7 +1596,7 @@ ProcAllowEvents(register ClientPtr client)
|
|||
void
|
||||
ReleaseActiveGrabs(ClientPtr client)
|
||||
{
|
||||
register DeviceIntPtr dev;
|
||||
DeviceIntPtr dev;
|
||||
Bool done;
|
||||
|
||||
/* XXX CloseDownClient should remove passive grabs before
|
||||
|
|
@ -1704,12 +1704,12 @@ TryClientEvents (ClientPtr client, xEvent *pEvents, int count, Mask mask,
|
|||
}
|
||||
|
||||
int
|
||||
DeliverEventsToWindow(DeviceIntPtr pDev, register WindowPtr pWin, xEvent
|
||||
DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
|
||||
*pEvents, int count, Mask filter, GrabPtr grab, int mskidx)
|
||||
{
|
||||
int deliveries = 0, nondeliveries = 0;
|
||||
int attempt;
|
||||
register InputClients *other;
|
||||
InputClients *other;
|
||||
ClientPtr client = NullClient;
|
||||
Mask deliveryMask = 0; /* If a grab occurs due to a button press, then
|
||||
this mask is the mask of the grab. */
|
||||
|
|
@ -1839,10 +1839,10 @@ XineramaTryClientEventsResult(
|
|||
#endif
|
||||
|
||||
int
|
||||
MaybeDeliverEventsToClient(register WindowPtr pWin, xEvent *pEvents,
|
||||
MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
|
||||
int count, Mask filter, ClientPtr dontClient)
|
||||
{
|
||||
register OtherClients *other;
|
||||
OtherClients *other;
|
||||
|
||||
|
||||
if (pWin->eventMask & filter)
|
||||
|
|
@ -1997,8 +1997,8 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
|
|||
|
||||
/* not useful for events that propagate up the tree or extension events */
|
||||
_X_EXPORT int
|
||||
DeliverEvents(register WindowPtr pWin, register xEvent *xE, int count,
|
||||
register WindowPtr otherParent)
|
||||
DeliverEvents(WindowPtr pWin, xEvent *xE, int count,
|
||||
WindowPtr otherParent)
|
||||
{
|
||||
Mask filter;
|
||||
int deliveries;
|
||||
|
|
@ -2065,7 +2065,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
|
|||
static WindowPtr
|
||||
XYToWindow(int x, int y)
|
||||
{
|
||||
register WindowPtr pWin;
|
||||
WindowPtr pWin;
|
||||
BoxRec box;
|
||||
|
||||
spriteTraceGood = 1; /* root window still there */
|
||||
|
|
@ -2255,7 +2255,7 @@ void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
|
|||
#endif
|
||||
|
||||
void
|
||||
DefineInitialRootWindow(register WindowPtr win)
|
||||
DefineInitialRootWindow(WindowPtr win)
|
||||
{
|
||||
DeviceIntPtr pDev = inputInfo.devices;
|
||||
|
||||
|
|
@ -2632,14 +2632,14 @@ BorderSizeNotEmpty(DeviceIntPtr pDev, WindowPtr pWin)
|
|||
static Bool
|
||||
CheckPassiveGrabsOnWindow(
|
||||
WindowPtr pWin,
|
||||
register DeviceIntPtr device,
|
||||
register xEvent *xE,
|
||||
DeviceIntPtr device,
|
||||
xEvent *xE,
|
||||
int count)
|
||||
{
|
||||
register GrabPtr grab = wPassiveGrabs(pWin);
|
||||
GrabPtr grab = wPassiveGrabs(pWin);
|
||||
GrabRec tempGrab;
|
||||
GrabInfoPtr grabinfo;
|
||||
register xEvent *dxE;
|
||||
xEvent *dxE;
|
||||
|
||||
if (!grab)
|
||||
return FALSE;
|
||||
|
|
@ -2737,12 +2737,12 @@ tried. PRH
|
|||
*/
|
||||
|
||||
Bool
|
||||
CheckDeviceGrabs(register DeviceIntPtr device, register xEvent *xE,
|
||||
CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE,
|
||||
int checkFirst, int count)
|
||||
{
|
||||
register int i;
|
||||
register WindowPtr pWin = NULL;
|
||||
register FocusClassPtr focus = device->focus;
|
||||
int i;
|
||||
WindowPtr pWin = NULL;
|
||||
FocusClassPtr focus = device->focus;
|
||||
|
||||
if (((xE->u.u.type == ButtonPress)
|
||||
#if defined(XINPUT) && defined(XKB)
|
||||
|
|
@ -2809,14 +2809,14 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
|
|||
}
|
||||
|
||||
void
|
||||
DeliverGrabbedEvent(register xEvent *xE, register DeviceIntPtr thisDev,
|
||||
DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
|
||||
Bool deactivateGrab, int count)
|
||||
{
|
||||
register GrabPtr grab;
|
||||
GrabPtr grab;
|
||||
GrabInfoPtr grabinfo;
|
||||
int deliveries = 0;
|
||||
register DeviceIntPtr dev;
|
||||
register xEvent *dxE;
|
||||
DeviceIntPtr dev;
|
||||
xEvent *dxE;
|
||||
SpritePtr pSprite = thisDev->pSprite;
|
||||
|
||||
if (xE->u.u.type & EXTENSION_EVENT_BASE)
|
||||
|
|
@ -2906,21 +2906,20 @@ DeliverGrabbedEvent(register xEvent *xE, register DeviceIntPtr thisDev,
|
|||
|
||||
void
|
||||
#ifdef XKB
|
||||
CoreProcessKeyboardEvent (register xEvent *xE, register DeviceIntPtr keybd, int count)
|
||||
CoreProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
|
||||
#else
|
||||
ProcessKeyboardEvent (register xEvent *xE, register DeviceIntPtr keybd, int count)
|
||||
ProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
|
||||
#endif
|
||||
{
|
||||
int key, bit;
|
||||
register BYTE *kptr;
|
||||
register int i;
|
||||
register CARD8 modifiers;
|
||||
register CARD16 mask;
|
||||
register GrabPtr grab;
|
||||
BYTE *kptr;
|
||||
int i;
|
||||
CARD8 modifiers;
|
||||
CARD16 mask;
|
||||
GrabPtr grab;
|
||||
GrabInfoPtr grabinfo;
|
||||
Bool deactivateGrab = FALSE;
|
||||
register KeyClassPtr keyc = keybd->key;
|
||||
|
||||
KeyClassPtr keyc = keybd->key;
|
||||
#ifdef XEVIE
|
||||
static Window rootWin = 0;
|
||||
|
||||
|
|
@ -3079,11 +3078,11 @@ drawable.id:0;
|
|||
CoreProcessKeyEvent to be called, as in for example Mouse Keys.
|
||||
*/
|
||||
void
|
||||
FixKeyState (register xEvent *xE, register DeviceIntPtr keybd)
|
||||
FixKeyState (xEvent *xE, DeviceIntPtr keybd)
|
||||
{
|
||||
int key, bit;
|
||||
register BYTE *kptr;
|
||||
register KeyClassPtr keyc = keybd->key;
|
||||
BYTE *kptr;
|
||||
KeyClassPtr keyc = keybd->key;
|
||||
|
||||
key = xE->u.u.detail;
|
||||
kptr = &keyc->down[key >> 3];
|
||||
|
|
@ -3110,14 +3109,14 @@ FixKeyState (register xEvent *xE, register DeviceIntPtr keybd)
|
|||
|
||||
void
|
||||
#ifdef XKB
|
||||
CoreProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count)
|
||||
CoreProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
|
||||
#else
|
||||
ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count)
|
||||
ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
|
||||
#endif
|
||||
{
|
||||
GrabPtr grab = mouse->coreGrab.grab;
|
||||
Bool deactivateGrab = FALSE;
|
||||
register ButtonClassPtr butc = mouse->button;
|
||||
ButtonClassPtr butc = mouse->button;
|
||||
SpritePtr pSprite = mouse->pSprite;
|
||||
|
||||
#ifdef XKB
|
||||
|
|
@ -3163,8 +3162,8 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
|
|||
}
|
||||
if (xE->u.u.type != MotionNotify)
|
||||
{
|
||||
register int key;
|
||||
register BYTE *kptr;
|
||||
int key;
|
||||
BYTE *kptr;
|
||||
int bit;
|
||||
|
||||
XE_KBPTR.rootX = pSprite->hot.x;
|
||||
|
|
@ -3225,10 +3224,10 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
|
|||
|
||||
void
|
||||
RecalculateDeliverableEvents(pWin)
|
||||
register WindowPtr pWin;
|
||||
WindowPtr pWin;
|
||||
{
|
||||
register OtherClients *others;
|
||||
register WindowPtr pChild;
|
||||
OtherClients *others;
|
||||
WindowPtr pChild;
|
||||
|
||||
pChild = pWin;
|
||||
while (1)
|
||||
|
|
@ -3267,8 +3266,8 @@ RecalculateDeliverableEvents(pWin)
|
|||
int
|
||||
OtherClientGone(pointer value, XID id)
|
||||
{
|
||||
register OtherClientsPtr other, prev;
|
||||
register WindowPtr pWin = (WindowPtr)value;
|
||||
OtherClientsPtr other, prev;
|
||||
WindowPtr pWin = (WindowPtr)value;
|
||||
|
||||
prev = 0;
|
||||
for (other = wOtherClients(pWin); other; other = other->next)
|
||||
|
|
@ -3294,7 +3293,7 @@ OtherClientGone(pointer value, XID id)
|
|||
}
|
||||
|
||||
int
|
||||
EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask mask)
|
||||
EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
|
||||
{
|
||||
Mask check;
|
||||
OtherClients * others;
|
||||
|
|
@ -3366,10 +3365,10 @@ maskSet:
|
|||
}
|
||||
|
||||
int
|
||||
EventSuppressForWindow(register WindowPtr pWin, register ClientPtr client,
|
||||
EventSuppressForWindow(WindowPtr pWin, ClientPtr client,
|
||||
Mask mask, Bool *checkOptional)
|
||||
{
|
||||
register int i, free;
|
||||
int i, free;
|
||||
|
||||
if (mask & ~PropagateMask)
|
||||
{
|
||||
|
|
@ -3423,8 +3422,8 @@ EventSuppressForWindow(register WindowPtr pWin, register ClientPtr client,
|
|||
|
||||
static WindowPtr
|
||||
CommonAncestor(
|
||||
register WindowPtr a,
|
||||
register WindowPtr b)
|
||||
WindowPtr a,
|
||||
WindowPtr b)
|
||||
{
|
||||
for (b = b->parent; b; b = b->parent)
|
||||
if (IsParent(b, a)) return b;
|
||||
|
|
@ -3437,13 +3436,13 @@ EnterLeaveEvent(
|
|||
int type,
|
||||
int mode,
|
||||
int detail,
|
||||
register WindowPtr pWin,
|
||||
WindowPtr pWin,
|
||||
Window child)
|
||||
{
|
||||
xEvent event;
|
||||
register DeviceIntPtr keybd = inputInfo.keyboard;
|
||||
DeviceIntPtr keybd = inputInfo.keyboard;
|
||||
WindowPtr focus;
|
||||
register DeviceIntPtr mouse = pDev;
|
||||
DeviceIntPtr mouse = pDev;
|
||||
GrabPtr grab = mouse->coreGrab.grab;
|
||||
GrabPtr devgrab = mouse->deviceGrab.grab;
|
||||
Mask mask;
|
||||
|
|
@ -3564,7 +3563,7 @@ LeaveNotifies(DeviceIntPtr pDev,
|
|||
int mode,
|
||||
int detail)
|
||||
{
|
||||
register WindowPtr pWin;
|
||||
WindowPtr pWin;
|
||||
|
||||
if (ancestor == child)
|
||||
return;
|
||||
|
|
@ -3613,7 +3612,7 @@ DoEnterLeaveEvents(DeviceIntPtr pDev,
|
|||
}
|
||||
|
||||
static void
|
||||
FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, register WindowPtr pWin)
|
||||
FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
|
||||
{
|
||||
xEvent event;
|
||||
|
||||
|
|
@ -3683,7 +3682,7 @@ FocusOutEvents(
|
|||
int mode, int detail,
|
||||
Bool doAncestor)
|
||||
{
|
||||
register WindowPtr pWin;
|
||||
WindowPtr pWin;
|
||||
|
||||
for (pWin = child; pWin != ancestor; pWin = pWin->parent)
|
||||
FocusEvent(dev, FocusOut, mode, detail, pWin);
|
||||
|
|
@ -3827,7 +3826,7 @@ SetInputFocus(
|
|||
Time ctime,
|
||||
Bool followOK)
|
||||
{
|
||||
register FocusClassPtr focus;
|
||||
FocusClassPtr focus;
|
||||
WindowPtr focusWin;
|
||||
int mode, rc;
|
||||
TimeStamp time;
|
||||
|
|
@ -3875,7 +3874,7 @@ SetInputFocus(
|
|||
else
|
||||
{
|
||||
int depth = 0;
|
||||
register WindowPtr pWin;
|
||||
WindowPtr pWin;
|
||||
|
||||
for (pWin = focusWin; pWin; pWin = pWin->parent) depth++;
|
||||
if (depth > focus->traceSize)
|
||||
|
|
@ -4045,7 +4044,7 @@ int
|
|||
ProcChangeActivePointerGrab(ClientPtr client)
|
||||
{
|
||||
DeviceIntPtr device = PickPointer(client);
|
||||
register GrabPtr grab = device->coreGrab.grab;
|
||||
GrabPtr grab = device->coreGrab.grab;
|
||||
CursorPtr newCursor, oldCursor;
|
||||
REQUEST(xChangeActivePointerGrabReq);
|
||||
TimeStamp time;
|
||||
|
|
@ -4107,12 +4106,12 @@ ProcUngrabPointer(ClientPtr client)
|
|||
}
|
||||
|
||||
int
|
||||
GrabDevice(register ClientPtr client, register DeviceIntPtr dev,
|
||||
GrabDevice(ClientPtr client, DeviceIntPtr dev,
|
||||
unsigned this_mode, unsigned other_mode, Window grabWindow,
|
||||
unsigned ownerEvents, Time ctime, Mask mask, CARD8 *status)
|
||||
{
|
||||
WindowPtr pWin;
|
||||
register GrabPtr grab;
|
||||
GrabPtr grab;
|
||||
TimeStamp time;
|
||||
int rc;
|
||||
|
||||
|
|
@ -4746,7 +4745,7 @@ CheckCursorConfinement(WindowPtr pWin)
|
|||
Mask
|
||||
EventMaskForClient(WindowPtr pWin, ClientPtr client)
|
||||
{
|
||||
register OtherClientsPtr other;
|
||||
OtherClientsPtr other;
|
||||
|
||||
if (wClient (pWin) == client)
|
||||
return pWin->eventMask;
|
||||
|
|
|
|||
Loading…
Reference in a new issue