diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
| commit | 2cb91952f6e94907b3614535edbfc3f979085694 (patch) | |
| tree | 6d11e620b1c10564f344d469a5d730e1df7fbb90 /xorg-server/dix/events.c | |
| parent | 7ec34a94883810e9f4a8e417f00300c2c31808b0 (diff) | |
| parent | e1a407256a5c1571d8f4871fd981a51cfbd46e37 (diff) | |
| download | vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.gz vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.bz2 vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/.gitignore
Diffstat (limited to 'xorg-server/dix/events.c')
| -rw-r--r-- | xorg-server/dix/events.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 009e21b5d..3361e8316 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -4331,7 +4331,6 @@ OtherClientGone(pointer value, XID id) prev = other; } FatalError("client not on event list"); - /*NOTREACHED*/ return -1; /* make compiler happy */ } int @@ -4354,12 +4353,10 @@ EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask) return rc; } check = (mask & AtMostOneClient); - if (check & (pWin->eventMask | wOtherEventMasks(pWin))) { /* It is illegal for two different - clients to select on any of the - events for AtMostOneClient. However, - it is OK, for some client to - continue selecting on one of those - events. */ + if (check & (pWin->eventMask | wOtherEventMasks(pWin))) { + /* It is illegal for two different clients to select on any of the + events for AtMostOneClient. However, it is OK, for some client to + continue selecting on one of those events. */ if ((wClient(pWin) != client) && (check & pWin->eventMask)) return BadAccess; for (others = wOtherClients(pWin); others; others = others->next) { @@ -5640,8 +5637,8 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources) if (IsKeyboardDevice(keybd)) { focus = keybd->focus; - /* If the focus window is a root window (ie. has no parent) then don't - delete the focus from it. */ + /* If the focus window is a root window (ie. has no parent) + then don't delete the focus from it. */ if ((pWin == focus->win) && (pWin->parent != NullWindow)) { int focusEventMode = NotifyNormal; @@ -5663,12 +5660,12 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources) parent = parent->parent; focus->traceGood--; } while (!parent->realized - /* This would be a good protocol change -- windows being reparented - during SaveSet processing would cause the focus to revert to the - nearest enclosing window which will survive the death of the exiting - client, instead of ending up reverting to a dying window and thence - to None - */ + /* This would be a good protocol change -- windows being + reparented during SaveSet processing would cause the + focus to revert to the nearest enclosing window which + will survive the death of the exiting client, instead + of ending up reverting to a dying window and thence + to None */ #ifdef NOTDEF || wClient(parent)->clientGone #endif |