gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 05:18:06 +01:00
Code Issues Projects Releases Wiki Activity

Clean up case switching in handleKeyPress()

Browse Source 
GCC has an extension to deal with ranges within case statements.
Let's use it to make the code more readable and ~5% smaller,

[mafra@Pilar:wmaker.git]$ size src/event.o.*
   text    data     bss     dec     hex filename
  13087       0    1056   14143    373f src/event.o.new
  13711       0    1056   14767    39af src/event.o.old
This commit is contained in:
Carlos R. Mafra
2009-08-19 22:03:43 +02:00
parent e2d8cbe238
commit 066af13b5c
1 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/event.c
View File

@@ -1430,9 +1430,9 @@ handleKeyPress(XEvent *event)
{ {
WScreen *scr = wScreenForRootWindow(event->xkey.root); WScreen *scr = wScreenForRootWindow(event->xkey.root);
WWindow *wwin = scr->focused_window; WWindow *wwin = scr->focused_window;
int i; short i, widx;
int modifiers; int modifiers;
int command=-1, widx; int command = -1;
#ifdef KEEP_XKB_LOCK_STATUS #ifdef KEEP_XKB_LOCK_STATUS
XkbStateRec staterec; XkbStateRec staterec;
#endif /*KEEP_XKB_LOCK_STATUS*/ #endif /*KEEP_XKB_LOCK_STATUS*/
@@ -1634,30 +1634,13 @@ handleKeyPress(XEvent *event)
StartWindozeCycle(wwin, event, False); StartWindozeCycle(wwin, event, False);
break; break;
#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) case WKBD_WORKSPACE1 ... WKBD_WORKSPACE10:
#define GOTOWORKS(wk) case WKBD_WORKSPACE##wk:\ widx = command - WKBD_WORKSPACE1;
i = (scr->current_workspace/10)*10 + wk - 1;\ i = (scr->current_workspace / 10) * 10 + widx;
if (wPreferences.ws_advance || i<scr->workspace_count)\ if (wPreferences.ws_advance || i < scr->workspace_count)
wWorkspaceChange(scr, i);\ wWorkspaceChange(scr, i);
break break;
#else
#define GOTOWORKS(wk) case WKBD_WORKSPACE/**/wk:\
i = (scr->current_workspace/10)*10 + wk - 1;\
if (wPreferences.ws_advance || i<scr->workspace_count)\
wWorkspaceChange(scr, i);\
break
#endif
GOTOWORKS(1);
GOTOWORKS(2);
GOTOWORKS(3);
GOTOWORKS(4);
GOTOWORKS(5);
GOTOWORKS(6);
GOTOWORKS(7);
GOTOWORKS(8);
GOTOWORKS(9);
GOTOWORKS(10);
#undef GOTOWORKS
case WKBD_NEXTWORKSPACE: case WKBD_NEXTWORKSPACE:
wWorkspaceRelativeChange(scr, 1); wWorkspaceRelativeChange(scr, 1);
break; break;