Commit ad89c705 authored by Ulrich Sibiller's avatar Ulrich Sibiller

Events.c: reformat switch blocks

save some lines
parent 36f679fb
...@@ -300,26 +300,10 @@ char * nxagentGetNotifyMode(int mode) ...@@ -300,26 +300,10 @@ char * nxagentGetNotifyMode(int mode)
{ {
switch (mode) switch (mode)
{ {
case NotifyNormal: case NotifyNormal: return "NotifyNormal";
{ case NotifyGrab: return "NotifyGrab";
return "NotifyNormal"; case NotifyUngrab: return "NotifyUngrab";
break; case NotifyWhileGrabbed: return "NotifyWhileGrabbed";
}
case NotifyGrab:
{
return "NotifyGrab";
break;
}
case NotifyUngrab:
{
return "NotifyUngrab";
break;
}
case NotifyWhileGrabbed:
{
return "NotifyWhileGrabbed";
break;
}
} }
return "Unknown"; return "Unknown";
} }
...@@ -1013,67 +997,56 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) ...@@ -1013,67 +997,56 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
case doMinimize: case doMinimize:
{ {
minimize = TRUE; minimize = TRUE;
break; break;
} }
case doSwitchFullscreen: case doSwitchFullscreen:
{ {
switchFullscreen = TRUE; switchFullscreen = TRUE;
break; break;
} }
case doSwitchAllScreens: case doSwitchAllScreens:
{ {
switchAllScreens = TRUE; switchAllScreens = TRUE;
break; break;
} }
case doViewportMoveUp: case doViewportMoveUp:
{ {
nxagentMoveViewport(pScreen, 0, -nxagentOption(Height)); nxagentMoveViewport(pScreen, 0, -nxagentOption(Height));
break; break;
} }
case doViewportMoveDown: case doViewportMoveDown:
{ {
nxagentMoveViewport(pScreen, 0, nxagentOption(Height)); nxagentMoveViewport(pScreen, 0, nxagentOption(Height));
break; break;
} }
case doViewportMoveLeft: case doViewportMoveLeft:
{ {
nxagentMoveViewport(pScreen, -nxagentOption(Width), 0); nxagentMoveViewport(pScreen, -nxagentOption(Width), 0);
break; break;
} }
case doViewportMoveRight: case doViewportMoveRight:
{ {
nxagentMoveViewport(pScreen, nxagentOption(Width), 0); nxagentMoveViewport(pScreen, nxagentOption(Width), 0);
break; break;
} }
case doViewportUp: case doViewportUp:
{ {
nxagentMoveViewport(pScreen, 0, -nextinc(viewportInc)); nxagentMoveViewport(pScreen, 0, -nextinc(viewportInc));
break; break;
} }
case doViewportDown: case doViewportDown:
{ {
nxagentMoveViewport(pScreen, 0, +nextinc(viewportInc)); nxagentMoveViewport(pScreen, 0, +nextinc(viewportInc));
break; break;
} }
case doViewportLeft: case doViewportLeft:
{ {
nxagentMoveViewport(pScreen, -nextinc(viewportInc), 0); nxagentMoveViewport(pScreen, -nextinc(viewportInc), 0);
break; break;
} }
case doViewportRight: case doViewportRight:
{ {
nxagentMoveViewport(pScreen, +nextinc(viewportInc), 0); nxagentMoveViewport(pScreen, +nextinc(viewportInc), 0);
break; break;
} }
case doSwitchResizeMode: case doSwitchResizeMode:
...@@ -1098,19 +1071,16 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) ...@@ -1098,19 +1071,16 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
{ {
nxagentSwitchDeferMode(); nxagentSwitchDeferMode();
} }
break; break;
} }
case doAutoGrab: case doAutoGrab:
{ {
nxagentToggleAutoGrab(); nxagentToggleAutoGrab();
break; break;
} }
default: default:
{ {
FatalError("nxagentDispatchEvent: handleKeyPress returned unknown value\n"); FatalError("nxagentDispatchEvent: handleKeyPress returned unknown value\n");
break; break;
} }
} }
...@@ -2942,18 +2912,10 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X) ...@@ -2942,18 +2912,10 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X)
switch (xfixesEvent -> xfixesselection.subtype) switch (xfixesEvent -> xfixesselection.subtype)
{ {
case SelectionSetOwner: case SelectionSetOwner: fprintf(stderr, "SelectionSetOwner.\n"); break;
fprintf(stderr, "SelectionSetOwner.\n"); case SelectionWindowDestroy: fprintf(stderr, "SelectionWindowDestroy.\n"); break;
break; case SelectionClientClose: fprintf(stderr, "SelectionClientClose.\n"); break;
case SelectionWindowDestroy: default: fprintf(stderr, ".\n"); break;
fprintf(stderr, "SelectionWindowDestroy.\n");
break;
case SelectionClientClose:
fprintf(stderr, "SelectionClientClose.\n");
break;
default:
fprintf(stderr, ".\n");
break;
} }
#endif #endif
...@@ -4586,24 +4548,15 @@ static const char *nxagentGrabStateToString(int state) ...@@ -4586,24 +4548,15 @@ static const char *nxagentGrabStateToString(int state)
{ {
switch (state) switch (state)
{ {
case 0: case 0: return "NOT_GRABBED";
return "NOT_GRABBED"; case 1: return "THAWED";
case 1: case 2: return "THAWED_BOTH";
return "THAWED"; case 3: return "FREEZE_NEXT_EVENT";
case 2: case 4: return "FREEZE_BOTH_NEXT_EVENT";
return "THAWED_BOTH"; case 5: return "FROZEN_NO_EVENT";
case 3: case 6: return "FROZEN_WITH_EVENT";
return "FREEZE_NEXT_EVENT"; case 7: return "THAW_OTHERS";
case 4: default: return "unknown state";
return "FREEZE_BOTH_NEXT_EVENT";
case 5:
return "FROZEN_NO_EVENT";
case 6:
return "FROZEN_WITH_EVENT";
case 7:
return "THAW_OTHERS";
default:
return "unknown state";
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment