From 31b28f523a9e95031dcfbef342bcffcf66120eab Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 18 Mar 2005 00:03:22 +0000 Subject: Extensive code policing (indentation levels, tab characters). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6199 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/x11/button-x11.c | 125 ++++++++++++----------- uisimulator/x11/lcd-x11.c | 28 ++--- uisimulator/x11/screenhack.c | 236 +++++++++++++++++++++--------------------- uisimulator/x11/uibasic.c | 237 +++++++++++++++++++++---------------------- 4 files changed, 309 insertions(+), 317 deletions(-) diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index 594d489a56..28ede95df6 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c @@ -60,109 +60,109 @@ static int get_raw_button (void) int ev=screenhack_handle_events(&release, &repeat); switch(ev) { - case XK_KP_Left: - case XK_Left: - case XK_KP_4: - k = BUTTON_LEFT; + case XK_KP_Left: + case XK_Left: + case XK_KP_4: + k = BUTTON_LEFT; break; - case XK_KP_Right: - case XK_Right: - case XK_KP_6: - k = BUTTON_RIGHT; + case XK_KP_Right: + case XK_Right: + case XK_KP_6: + k = BUTTON_RIGHT; break; - case XK_KP_Up: - case XK_Up: - case XK_KP_8: + case XK_KP_Up: + case XK_Up: + case XK_KP_8: #ifdef BUTTON_UP - k = BUTTON_UP; + k = BUTTON_UP; #elif defined BUTTON_PLAY - k = BUTTON_PLAY; + k = BUTTON_PLAY; #endif break; - case XK_KP_Down: - case XK_Down: - case XK_KP_2: + case XK_KP_Down: + case XK_Down: + case XK_KP_2: #ifdef BUTTON_DOWN - k = BUTTON_DOWN; + k = BUTTON_DOWN; #elif defined BUTTON_STOP - k = BUTTON_STOP; + k = BUTTON_STOP; #endif break; #ifdef BUTTON_ON - case XK_KP_Add: - case XK_Q: - case XK_q: - k = BUTTON_ON; + case XK_KP_Add: + case XK_Q: + case XK_q: + k = BUTTON_ON; break; #endif #ifdef BUTTON_OFF - case XK_KP_Enter: - case XK_A: - case XK_a: - k = BUTTON_OFF; + case XK_KP_Enter: + case XK_A: + case XK_a: + k = BUTTON_OFF; break; #endif #ifdef BUTTON_F1 - case XK_KP_Divide: - case XK_1: - k = BUTTON_F1; + case XK_KP_Divide: + case XK_1: + k = BUTTON_F1; break; - case XK_KP_Multiply: - case XK_2: - k = BUTTON_F2; + case XK_KP_Multiply: + case XK_2: + k = BUTTON_F2; break; - case XK_KP_Subtract: - case XK_3: - k = BUTTON_F3; + case XK_KP_Subtract: + case XK_3: + k = BUTTON_F3; break; #elif defined(BUTTON_REC) - case XK_KP_Divide: - case XK_1: - k = BUTTON_REC; - break; + case XK_KP_Divide: + case XK_1: + k = BUTTON_REC; + break; #endif - case XK_KP_Space: - case XK_KP_5: - case XK_KP_Begin: - case XK_space: + case XK_KP_Space: + case XK_KP_5: + case XK_KP_Begin: + case XK_space: #ifdef BUTTON_PLAY - k = BUTTON_PLAY; + k = BUTTON_PLAY; #elif defined(BUTTON_SELECT) - k = BUTTON_SELECT; + k = BUTTON_SELECT; #endif break; #ifdef HAVE_LCD_BITMAP - case XK_5: - if(!release) - { - screen_dump(); - return 0; - } - break; + case XK_5: + if(!release) + { + screen_dump(); + return 0; + } + break; #endif - case XK_KP_Separator: - case XK_KP_Insert: - case XK_Insert: + case XK_KP_Separator: + case XK_KP_Insert: + case XK_Insert: #ifdef BUTTON_MENU - k = BUTTON_MENU; + k = BUTTON_MENU; #elif defined(BUTTON_MODE) - k = BUTTON_MODE; + k = BUTTON_MODE; #endif break; - default: - k = 0; + default: + k = 0; if(ev) DEBUGF("received ev %d\n", ev); break; @@ -172,7 +172,8 @@ static int get_raw_button (void) /* return a release event */ button_state &= ~k; k |= BUTTON_REL; - } else { + } + else { if(k) { button_state |= k; k = button_state; @@ -222,8 +223,8 @@ long button_get(bool block) } while(1); if(!block) - /* delay a bit */ - sim_sleep(1); + /* delay a bit */ + sim_sleep(1); return bits; } diff --git a/uisimulator/x11/lcd-x11.c b/uisimulator/x11/lcd-x11.c index bc03d7f822..be687d1181 100644 --- a/uisimulator/x11/lcd-x11.c +++ b/uisimulator/x11/lcd-x11.c @@ -173,21 +173,21 @@ static unsigned char lcd_buffer_copy[11][2]; void lcd_update (void) { - bool changed=false; - int x, y; - for (y=0; y<2; y++) { - for (x=0; x<11; x++) { - if (lcd_display_redraw || - lcd_buffer_copy[x][y] != hardware_buffer_lcd[x][y]) { - lcd_buffer_copy[x][y] = hardware_buffer_lcd[x][y]; - lcd_print_char(x, y); - changed=true; - } + bool changed=false; + int x, y; + for (y=0; y<2; y++) { + for (x=0; x<11; x++) { + if (lcd_display_redraw || + lcd_buffer_copy[x][y] != hardware_buffer_lcd[x][y]) { + lcd_buffer_copy[x][y] = hardware_buffer_lcd[x][y]; + lcd_print_char(x, y); + changed=true; + } + } } - } - if (changed) - XSync(dpy,False); - lcd_display_redraw=false; + if (changed) + XSync(dpy,False); + lcd_display_redraw=false; } #endif diff --git a/uisimulator/x11/screenhack.c b/uisimulator/x11/screenhack.c index 75a7ed4d93..d7f21a60ce 100644 --- a/uisimulator/x11/screenhack.c +++ b/uisimulator/x11/screenhack.c @@ -41,7 +41,7 @@ #include #ifdef __sgi -# include /* for SgiUseSchemes() */ +# include /* for SgiUseSchemes() */ #endif /* __sgi */ #ifdef HAVE_XMU @@ -128,31 +128,31 @@ XtAppContext app; Bool mono_p; static XrmOptionDescRec default_options [] = { - { "-root", ".root", XrmoptionNoArg, "True" }, - { "-window", ".root", XrmoptionNoArg, "False" }, - { "-mono", ".mono", XrmoptionNoArg, "True" }, - { "-install", ".installColormap", XrmoptionNoArg, "True" }, - { "-noinstall",".installColormap", XrmoptionNoArg, "False" }, - { "-visual", ".visualID", XrmoptionSepArg, 0 }, - { "-window-id", ".windowID", XrmoptionSepArg, 0 }, - { 0, 0, 0, 0 } + { "-root", ".root", XrmoptionNoArg, "True" }, + { "-window", ".root", XrmoptionNoArg, "False" }, + { "-mono", ".mono", XrmoptionNoArg, "True" }, + { "-install", ".installColormap", XrmoptionNoArg, "True" }, + { "-noinstall", ".installColormap", XrmoptionNoArg, "False" }, + { "-visual", ".visualID", XrmoptionSepArg, 0 }, + { "-window-id", ".windowID", XrmoptionSepArg, 0 }, + { 0, 0, 0, 0 } }; static char *default_defaults[] = { - ".root: false", + ".root: false", #define GEOMETRY_POSITION 1 - "*geometry: " + "*geometry: " #ifdef HAVE_LCD_BITMAP - "120x68" + "120x68" #else - "280x132" /* A bit larger that necessary */ + "280x132" /* A bit larger that necessary */ #endif - , /* this should be .geometry, but nooooo... */ - "*mono: false", - "*installColormap: false", - "*visualID: default", - "*windowID: ", - 0 + , /* this should be .geometry, but nooooo... */ + "*mono: false", + "*installColormap: false", + "*visualID: default", + "*windowID: ", + 0 }; extern Display* dpy; @@ -261,71 +261,70 @@ int screenhack_handle_event(Display *dpy, XEvent *event, *repeat = false; switch (event->xany.type) { - case KeyPress: - { - KeySym keysym; - unsigned char c = 0; - XLookupString (&event->xkey, &c, 1, &keysym, 0); - key = keysym; + case KeyPress: + { + KeySym keysym; + unsigned char c = 0; + XLookupString (&event->xkey, &c, 1, &keysym, 0); + key = keysym; #if 0 - DEBUGF("Got keypress: %02x %x, time %lx\n", c, - event->xkey.keycode, - event->xkey.time); + DEBUGF("Got keypress: %02x %x, time %lx\n", c, + event->xkey.keycode, + event->xkey.time); #endif - if(lastkeycode == event->xkey.keycode) - *repeat = checkrepeat(lasttime, event->xkey.time); - lasttime = event->xkey.time; - lastkeycode = event->xkey.keycode; - } - break; - case KeyRelease: - { - KeySym keysym; - unsigned char c = 0; - XLookupString (&event->xkey, &c, 1, &keysym, 0); - key = keysym; + if(lastkeycode == event->xkey.keycode) + *repeat = checkrepeat(lasttime, event->xkey.time); + lasttime = event->xkey.time; + lastkeycode = event->xkey.keycode; + } + break; + case KeyRelease: + { + KeySym keysym; + unsigned char c = 0; + XLookupString (&event->xkey, &c, 1, &keysym, 0); + key = keysym; #if 0 - DEBUGF("Got keyrelease: %c (%02x) %x\n", c, c, - event->xkey.keycode); + DEBUGF("Got keyrelease: %c (%02x) %x\n", c, c, + event->xkey.keycode); #endif - if(lastkeycode == event->xkey.keycode) - *repeat = checkrepeat(lasttime, event->xkey.time); - lasttime = event->xkey.time; - lastkeycode = event->xkey.keycode; - if(*repeat) - return 0; /* on repeats, return nothing on release */ + if(lastkeycode == event->xkey.keycode) + *repeat = checkrepeat(lasttime, event->xkey.time); + lasttime = event->xkey.time; + lastkeycode = event->xkey.keycode; + if(*repeat) + return 0; /* on repeats, return nothing on release */ - *release = TRUE; - } - break; - case Expose: - { - screen_redraw(); - } - break; - default: - break; - case ClientMessage: - { - if (event->xclient.message_type != XA_WM_PROTOCOLS) { - char *s = XGetAtomName(dpy, event->xclient.message_type); - if (!s) s = "(null)"; - fprintf (stderr, "%s: unknown ClientMessage %s received!\n", - progname, s); - } - else if (event->xclient.data.l[0] != (int)XA_WM_DELETE_WINDOW) { - char *s1 = XGetAtomName(dpy, event->xclient.message_type); - char *s2 = XGetAtomName(dpy, event->xclient.data.l[0]); - if (!s1) s1 = "(null)"; - if (!s2) s2 = "(null)"; - fprintf (stderr, "%s: unknown ClientMessage %s[%s] received!\n", - progname, s1, s2); - } - else { - exit (0); - } - } - break; + *release = TRUE; + } + break; + case Expose: + screen_redraw(); + break; + case ClientMessage: + if (event->xclient.message_type != XA_WM_PROTOCOLS) { + char *s = XGetAtomName(dpy, event->xclient.message_type); + if (!s) + s = "(null)"; + fprintf (stderr, "%s: unknown ClientMessage %s received!\n", + progname, s); + } + else if (event->xclient.data.l[0] != (int)XA_WM_DELETE_WINDOW) { + char *s1 = XGetAtomName(dpy, event->xclient.message_type); + char *s2 = XGetAtomName(dpy, event->xclient.data.l[0]); + if (!s1) + s1 = "(null)"; + if (!s2) + s2 = "(null)"; + fprintf (stderr, "%s: unknown ClientMessage %s[%s] received!\n", + progname, s1, s2); + } + else { + exit (0); + } + break; + default: + break; } return key; } @@ -344,8 +343,7 @@ int screenhack_handle_events(bool *release, bool *repeat) } -static Visual * -pick_visual (Screen *screen) +static Visual *pick_visual (Screen *screen) { #ifdef USE_GL /* If we're linking against GL (that is, this is the version of @@ -367,7 +365,7 @@ pick_visual (Screen *screen) !strcmp (string, "best") || !strcmp (string, "color") || !strcmp (string, "default")) - v = get_gl_visual (screen); /* from ../utils/visual-gl.c */ + v = get_gl_visual (screen); /* from ../utils/visual-gl.c */ if (string) free (string); @@ -393,64 +391,64 @@ int main (int argc, char **argv) #ifdef HAVE_LCD_BITMAP display_zoom=2; { - char *env=getenv("RECORDER_ZOOM"); - if (env) { - display_zoom=atoi(env); - } + char *env=getenv("RECORDER_ZOOM"); + if (env) { + display_zoom=atoi(env); + } } #else display_zoom=1; { - char *env=getenv("PLAYER_ZOOM"); - if (env) { - display_zoom=atoi(env); - } + char *env=getenv("PLAYER_ZOOM"); + if (env) { + display_zoom=atoi(env); + } } #endif if (argc > 1) { - int x; - for (x=1; x