sdl: trivial code cleanup

This commit is contained in:
punkrockguy318 2013-03-16 01:13:37 +00:00
parent d8723cca95
commit 3d1484c7e7
1 changed files with 463 additions and 495 deletions

View File

@ -589,8 +589,7 @@ static void KeyboardCommands ()
if (is_shift) if (is_shift)
{ {
movie_fname = movie_fname =
const_cast < const_cast <char *>(FCEU_MakeFName (FCEUMKF_MOVIE, 0, 0).c_str ());
char *>(FCEU_MakeFName (FCEUMKF_MOVIE, 0, 0).c_str ());
FCEUI_printf ("Recording movie to %s\n", movie_fname); FCEUI_printf ("Recording movie to %s\n", movie_fname);
FCEUI_SaveMovie (movie_fname, MOVIE_FLAG_NONE, L""); FCEUI_SaveMovie (movie_fname, MOVIE_FLAG_NONE, L"");
} }
@ -723,7 +722,6 @@ static void KeyboardCommands ()
} }
} }
else else
#ifdef _S9XLUA_H #ifdef _S9XLUA_H
if (_keyonly (Hotkeys[HK_LOAD_LUA])) if (_keyonly (Hotkeys[HK_LOAD_LUA]))
{ {
@ -797,22 +795,11 @@ static void KeyboardCommands ()
goto DIPSless; goto DIPSless;
// toggle the various dipswitches // toggle the various dipswitches
if (keyonly (1)) for(int i=1; i<=8;i++)
FCEUI_VSUniToggleDIP (0); {
if (keyonly (2)) if(keyonly(i))
FCEUI_VSUniToggleDIP (1); FCEUI_VSUniToggleDIP(i-1);
if (keyonly (3)) }
FCEUI_VSUniToggleDIP (2);
if (keyonly (4))
FCEUI_VSUniToggleDIP (3);
if (keyonly (5))
FCEUI_VSUniToggleDIP (4);
if (keyonly (6))
FCEUI_VSUniToggleDIP (5);
if (keyonly (7))
FCEUI_VSUniToggleDIP (6);
if (keyonly (8))
FCEUI_VSUniToggleDIP (7);
} }
else else
{ {
@ -872,26 +859,11 @@ do { \
} while(0) } while(0)
DIPSless: DIPSless:
if (keyonly (0)) for(int i=0; i<10;i++)
SSM (0); {
if (keyonly (1)) if (keyonly (i))
SSM (1); SSM (i);
if (keyonly (2)) }
SSM (2);
if (keyonly (3))
SSM (3);
if (keyonly (4))
SSM (4);
if (keyonly (5))
SSM (5);
if (keyonly (6))
SSM (6);
if (keyonly (7))
SSM (7);
if (keyonly (8))
SSM (8);
if (keyonly (9))
SSM (9);
#undef SSM #undef SSM
} }
} }
@ -975,7 +947,6 @@ UpdatePhysicalInput ()
event.user.code); event.user.code);
} }
default: default:
// do nothing
break; break;
} }
} }
@ -1033,8 +1004,7 @@ ButtonConfigBegin ()
char SDL_windowhack[128]; char SDL_windowhack[128];
if (gtk_widget_get_window (evbox)) if (gtk_widget_get_window (evbox))
sprintf (SDL_windowhack, "SDL_WINDOWID=%u", sprintf (SDL_windowhack, "SDL_WINDOWID=%u",
(unsigned int) (unsigned int) GDK_WINDOW_XID (gtk_widget_get_window (evbox)));
GDK_WINDOW_XID (gtk_widget_get_window (evbox)));
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
// TODO - SDL2 // TODO - SDL2
#else #else
@ -1045,7 +1015,7 @@ ButtonConfigBegin ()
if (SDL_InitSubSystem (SDL_INIT_VIDEO) == -1) if (SDL_InitSubSystem (SDL_INIT_VIDEO) == -1)
{ {
FCEUD_Message (SDL_GetError ()); FCEUD_Message (SDL_GetError ());
return (0); return 0;
} }
// set the screen and notify the user of button configuration // set the screen and notify the user of button configuration
@ -1062,7 +1032,7 @@ ButtonConfigBegin ()
// initialize the joystick subsystem // initialize the joystick subsystem
InitJoysticks (); InitJoysticks ();
return (1); return 1;
} }
/** /**
@ -1108,23 +1078,21 @@ DTestButton (ButtConfig * bc)
if (g_keyState[bc->ButtonNum[x]]) if (g_keyState[bc->ButtonNum[x]])
{ {
#endif #endif
return (1); return 1;
} }
} }
else if (bc->ButtType[x] == BUTTC_JOYSTICK) else if (bc->ButtType[x] == BUTTC_JOYSTICK)
{ {
if (DTestButtonJoy (bc)) if (DTestButtonJoy (bc))
{ {
return (1); return 1;
} }
} }
} }
return (0); return 0;
} }
#define MK(x) {{BUTTC_KEYBOARD},{0},{MKK(x)},1} #define MK(x) {{BUTTC_KEYBOARD},{0},{MKK(x)},1}
#define MK2(x1,x2) {{BUTTC_KEYBOARD},{0},{MKK(x1),MKK(x2)},2} #define MK2(x1,x2) {{BUTTC_KEYBOARD},{0},{MKK(x1),MKK(x2)},2}
#define MKZ() {{0},{0},{0},0} #define MKZ() {{0},{0},{0},0}