dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shortcuts work

This commit is contained in:
BADIM-PC\Vadim 2018-02-01 19:11:59 +03:00
parent 9d23c9134d
commit b18b8b0b51
1 changed files with 168 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
src/studio.c
View File

@ -1778,149 +1778,206 @@ static void takeScreenshot()
} }
} }
static bool processShortcuts(SDL_KeyboardEvent* event) static inline bool wasKeyPressed(s32 key)
{ {
if(event->repeat) return false; tic_mem* tic = studioImpl.studio.tic;
SDL_Keymod mod = event->keysym.mod; return tic->api.keyp(tic, key, -1, -1);
}
if(studioImpl.mode == TIC_START_MODE) return true; static void processShortcuts()
if(studioImpl.mode == TIC_CONSOLE_MODE && !studioImpl.console->active) return true; {
// if(event->repeat) return false;
tic_mem* tic = studioImpl.studio.tic;
// SDL_Keymod mod = event->keysym.mod;
if(studioImpl.mode == TIC_START_MODE) return;
if(studioImpl.mode == TIC_CONSOLE_MODE && !studioImpl.console->active) return;
if(isGameMenu()) if(isGameMenu())
{ {
switch(event->keysym.sym) // switch(event->keysym.sym)
{ // {
case SDLK_ESCAPE: // case SDLK_ESCAPE:
case SDLK_AC_BACK: // case SDLK_AC_BACK:
studioImpl.mode == TIC_MENU_MODE ? hideGameMenu() : showGameMenu(); // studioImpl.mode == TIC_MENU_MODE ? hideGameMenu() : showGameMenu();
// studioImpl.gamepad.backProcessed = true; // // studioImpl.gamepad.backProcessed = true;
return true; // return true;
case SDLK_F11: // case SDLK_F11:
goFullscreen(); // goFullscreen();
return true; // return true;
case SDLK_RETURN: // case SDLK_RETURN:
if(mod & KMOD_RALT) // if(mod & KMOD_RALT)
{ // {
goFullscreen(); // goFullscreen();
return true; // return true;
} // }
break; // break;
case SDLK_F7: // case SDLK_F7:
setCoverImage(); // setCoverImage();
return true; // return true;
case SDLK_F8: // case SDLK_F8:
takeScreenshot(); // takeScreenshot();
return true; // return true;
#if !defined(__EMSCRIPTEN__) // #if !defined(__EMSCRIPTEN__)
case SDLK_F9: // case SDLK_F9:
startVideoRecord(); // startVideoRecord();
return true; // return true;
#endif // #endif
default: // default:
return false; // return false;
} // }
} }
if(mod & KMOD_LALT) bool alt = tic->api.key(tic, tic_key_alt);
bool ctrl = tic->api.key(tic, tic_key_ctrl);
if(alt)
{ {
switch(event->keysym.sym) if(wasKeyPressed(tic_key_grave)) setStudioMode(TIC_CONSOLE_MODE);
{ else if(wasKeyPressed(tic_key_1)) setStudioMode(TIC_CODE_MODE);
case SDLK_BACKQUOTE: setStudioMode(TIC_CONSOLE_MODE); return true; else if(wasKeyPressed(tic_key_2)) setStudioMode(TIC_SPRITE_MODE);
case SDLK_1: setStudioMode(TIC_CODE_MODE); return true; else if(wasKeyPressed(tic_key_3)) setStudioMode(TIC_MAP_MODE);
case SDLK_2: setStudioMode(TIC_SPRITE_MODE); return true; else if(wasKeyPressed(tic_key_4)) setStudioMode(TIC_SFX_MODE);
case SDLK_3: setStudioMode(TIC_MAP_MODE); return true; else if(wasKeyPressed(tic_key_5)) setStudioMode(TIC_MUSIC_MODE);
case SDLK_4: setStudioMode(TIC_SFX_MODE); return true; else if(wasKeyPressed(tic_key_return)) goFullscreen();
case SDLK_5: setStudioMode(TIC_MUSIC_MODE); return true;
default: break; // switch(event->keysym.sym)
// {
// case SDLK_BACKQUOTE: setStudioMode(TIC_CONSOLE_MODE); return true;
// case SDLK_1: setStudioMode(TIC_CODE_MODE); return true;
// case SDLK_2: setStudioMode(TIC_SPRITE_MODE); return true;
// case SDLK_3: setStudioMode(TIC_MAP_MODE); return true;
// case SDLK_4: setStudioMode(TIC_SFX_MODE); return true;
// case SDLK_5: setStudioMode(TIC_MUSIC_MODE); return true;
// default: break;
// }
} }
} else if(ctrl)
else if(mod & KMOD_LCTRL)
{ {
switch(event->keysym.sym) if(wasKeyPressed(tic_key_pageup)) changeStudioMode(-1);
{ else if(wasKeyPressed(tic_key_pagedown)) changeStudioMode(1);
case SDLK_PAGEUP: changeStudioMode(-1); return true; else if(wasKeyPressed(tic_key_q)) exitStudio();
case SDLK_PAGEDOWN: changeStudioMode(1); return true; else if(wasKeyPressed(tic_key_r)) runProject();
} else if(wasKeyPressed(tic_key_return)) runProject();
else if(wasKeyPressed(tic_key_s)) saveProject();
// switch(event->keysym.sym)
// {
// case SDLK_PAGEUP: changeStudioMode(-1); return true;
// case SDLK_PAGEDOWN: changeStudioMode(1); return true;
// }
} }
else else
{ {
switch(event->keysym.sym) if(wasKeyPressed(tic_key_f1)) setStudioMode(TIC_CODE_MODE);
{ else if(wasKeyPressed(tic_key_f2)) setStudioMode(TIC_SPRITE_MODE);
case SDLK_F1: setStudioMode(TIC_CODE_MODE); return true; else if(wasKeyPressed(tic_key_f3)) setStudioMode(TIC_MAP_MODE);
case SDLK_F2: setStudioMode(TIC_SPRITE_MODE); return true; else if(wasKeyPressed(tic_key_f4)) setStudioMode(TIC_SFX_MODE);
case SDLK_F3: setStudioMode(TIC_MAP_MODE); return true; else if(wasKeyPressed(tic_key_f5)) setStudioMode(TIC_MUSIC_MODE);
case SDLK_F4: setStudioMode(TIC_SFX_MODE); return true; else if(wasKeyPressed(tic_key_f7)) setCoverImage();
case SDLK_F5: setStudioMode(TIC_MUSIC_MODE); return true; else if(wasKeyPressed(tic_key_f8)) takeScreenshot();
case SDLK_F7: setCoverImage(); return true;
case SDLK_F8: takeScreenshot(); return true;
#if !defined(__EMSCRIPTEN__) #if !defined(__EMSCRIPTEN__)
case SDLK_F9: startVideoRecord(); return true; else if(wasKeyPressed(tic_key_f9)) startVideoRecord();
#endif #endif
default: break; else if(wasKeyPressed(tic_key_f11)) goFullscreen();
} else if(wasKeyPressed(tic_key_escape))
}
switch(event->keysym.sym)
{
case SDLK_q:
if(mod & TIC_MOD_CTRL)
{
exitStudio();
return true;
}
break;
case SDLK_r:
if(mod & TIC_MOD_CTRL)
{
runProject();
return true;
}
break;
case SDLK_s:
if(mod & TIC_MOD_CTRL)
{
saveProject();
return true;
}
break;
case SDLK_F11: goFullscreen(); return true;
case SDLK_RETURN:
if(mod & KMOD_RALT)
{
goFullscreen();
return true;
}
else if(mod & TIC_MOD_CTRL)
{
runProject();
return true;
}
break;
case SDLK_ESCAPE:
case SDLK_AC_BACK:
{ {
Code* code = studioImpl.editor[studioImpl.bank.index.code].code; Code* code = studioImpl.editor[studioImpl.bank.index.code].code;
if(studioImpl.mode == TIC_CODE_MODE && code->mode != TEXT_EDIT_MODE) if(studioImpl.mode == TIC_CODE_MODE && code->mode != TEXT_EDIT_MODE)
{ {
code->escape(code); code->escape(code);
return true; return;
} }
if(studioImpl.mode == TIC_DIALOG_MODE) if(studioImpl.mode == TIC_DIALOG_MODE)
{ {
studioImpl.dialog->escape(studioImpl.dialog); studioImpl.dialog->escape(studioImpl.dialog);
return true; return;
} }
setStudioMode(studioImpl.mode == TIC_CONSOLE_MODE ? studioImpl.prevMode : TIC_CONSOLE_MODE); setStudioMode(studioImpl.mode == TIC_CONSOLE_MODE ? studioImpl.prevMode : TIC_CONSOLE_MODE);
} }
return true;
default: break; // switch(event->keysym.sym)
// {
// case SDLK_F1: setStudioMode(TIC_CODE_MODE); return true;
// case SDLK_F2: setStudioMode(TIC_SPRITE_MODE); return true;
// case SDLK_F3: setStudioMode(TIC_MAP_MODE); return true;
// case SDLK_F4: setStudioMode(TIC_SFX_MODE); return true;
// case SDLK_F5: setStudioMode(TIC_MUSIC_MODE); return true;
// case SDLK_F7: setCoverImage(); return true;
// case SDLK_F8: takeScreenshot(); return true;
// #if !defined(__EMSCRIPTEN__)
// case SDLK_F9: startVideoRecord(); return true;
// #endif
// default: break;
// }
} }
return false; // switch(event->keysym.sym)
// {
// case SDLK_q:
// if(mod & TIC_MOD_CTRL)
// {
// exitStudio();
// return true;
// }
// break;
// case SDLK_r:
// if(mod & TIC_MOD_CTRL)
// {
// runProject();
// return true;
// }
// break;
// case SDLK_s:
// if(mod & TIC_MOD_CTRL)
// {
// saveProject();
// return true;
// }
// break;
// case SDLK_F11: goFullscreen(); return true;
// case SDLK_RETURN:
// if(mod & KMOD_RALT)
// {
// goFullscreen();
// return true;
// }
// else if(mod & TIC_MOD_CTRL)
// {
// runProject();
// return true;
// }
// break;
// case SDLK_ESCAPE:
// case SDLK_AC_BACK:
// {
// Code* code = studioImpl.editor[studioImpl.bank.index.code].code;
// if(studioImpl.mode == TIC_CODE_MODE && code->mode != TEXT_EDIT_MODE)
// {
// code->escape(code);
// return true;
// }
// if(studioImpl.mode == TIC_DIALOG_MODE)
// {
// studioImpl.dialog->escape(studioImpl.dialog);
// return true;
// }
// setStudioMode(studioImpl.mode == TIC_CONSOLE_MODE ? studioImpl.prevMode : TIC_CONSOLE_MODE);
// }
// return true;
// default: break;
// }
} }
// static void processGamepad() // static void processGamepad()
@ -2918,6 +2975,7 @@ static void processMouseStates()
void studioTick(void* pixels) void studioTick(void* pixels)
{ {
processShortcuts();
processMouseStates(); processMouseStates();
processGamepadMapping(); processGamepadMapping();