summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-06-12 22:38:46 -0700
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2012-08-01 17:15:21 -0700
commit94c7d0f8b979ccadd8e5c95f030b8b2cd7ef6f98 (patch)
treea1fabd48dba50d2cbf69f0e7ba5ede81edd3a32b
parent49bb2694f10149fbd27c04375939dcfe7cde1e4e (diff)
Fix some overly indented/poorly line wrapped comments in dix/events.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 687536b1044a3297f6b9a45f6a2d2987daa7be59)
-rw-r--r--dix/events.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/dix/events.c b/dix/events.c
index 64edf189a..822b6e931 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4336,12 +4336,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) {
@@ -5621,8 +5619,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;
@@ -5644,12 +5642,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