ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lua script loading can now be done on the fly in the SDL build. F3 is the default hotkey. The file chooser however requires the zenity application to work.

This commit is contained in:
punkrockguy318 2008-08-10 08:24:42 +00:00
parent 19100f0259
commit 16617596df
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/sdl/config.cpp
View File

@ -265,6 +265,7 @@ InitConfig()
// Hotkeys
prefix = "SDL.Hotkeys.";
config->addOption(prefix + "CheatMenu", SDLK_F2);
config->addOption(prefix + "LoadLua", SDLK_F3);
config->addOption(prefix + "RenderBG", SDLK_F4);
config->addOption(prefix + "SaveState", SDLK_F5);
config->addOption(prefix + "LoadState", SDLK_F7);

37
src/drivers/sdl/input.cpp
View File

@ -32,6 +32,7 @@
#include "../../movie.h"
#include "../../fceu.h"
#include "../../driver.h"
#include "../../fceulua.h"
/** GLOBALS **/
@ -142,6 +143,31 @@ _keyonly(int a)
static int g_fkbEnabled = 0;
/***
* This function opens a file chooser dialog and returns the filename the
* user selected.
* */
std::string GetFilename()
{
std::string fname = "";
#ifdef WIN32
// TODO: WIN32 file chooser code goes here
#else
FILE *fpipe;
if ( !(fpipe = (FILE*)popen("zenity --file-selection","r")) )
{ // If fpipe is NULL
FCEUD_PrintError("Pipe error on opening zenity");
}
int c;
while((c = fgetc (fpipe ))!= '\n')
fname += c;
pclose(fpipe);
#endif
return fname;
}
/**
* Parse keyboard commands and execute accordingly.
@ -221,7 +247,7 @@ KeyboardCommands()
if(_keyonly(key)) {
if(is_shift) {
FCEUI_printf("Recording movie to %s\n", movie_fname);
FCEUI_SaveMovie(movie_fname, MOVIE_FLAG_NONE);
FCEUI_SaveMovie(movie_fname, MOVIE_FLAG_NONE, "");
} else {
FCEUI_SaveState(NULL);
}
@ -260,7 +286,7 @@ KeyboardCommands()
g_config->getOption("SDL.Hotkeys.FrameAdvance", &key);
if(_keyonly(key)) {
// this currently crashes fceu for me, is this broken?
//FCEUI_FrameAdvance();
FCEUI_FrameAdvance();
}
@ -276,6 +302,12 @@ KeyboardCommands()
if(_keyonly(key)) {
FCEUI_CloseGame();
}
g_config->getOption("SDL.Hotkeys.LoadLua", &key);
if(_keyonly(key)) {
std::string fname;
fname = GetFilename();
FCEU_LoadLuaCode(fname.c_str());
}
// VS Unisystem games
if(gametype == GIT_VSUNI) {
@ -356,7 +388,6 @@ do { \
}
}
/**
* Return the state of the mouse buttons. Input 'd' is an array of 3
* integers that store <x, y, button state>.