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

apply recent lua changes of snes9x: 

* accept a table for color value.
* add gui.parsecolor, joypad.getup, joypad.getdown, emu.emulating.
* gui.line, gui.box, joypad.get becomes like Gens.
* win32: add a menu to Lua window, add "Font..." and "Clear" items.
Note: gui.box will work much differently from before, it's easy to write a wrapper function, though.
This commit is contained in:
gocha 2009-11-08 12:15:25 +00:00
parent 112d03d87f
commit 4c36140c0d
5 changed files with 190 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/drivers/win/luaconsole.cpp
View File

@ -8,6 +8,8 @@
extern HWND hAppWnd;
HWND LuaConsoleHWnd = NULL;
HFONT hFont = NULL;
LOGFONT LuaConsoleLogFont;
struct ControlLayoutInfo
{
@ -150,6 +152,8 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
DragAcceptFiles(hDlg, true);
SetDlgItemText(hDlg, IDC_EDIT_LUAPATH, FCEU_GetLuaScriptName());
SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &LuaConsoleLogFont, 0); // reset with an acceptable font
return true;
} break;
@ -283,12 +287,41 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
if(file)
fclose(file);
} break;
case IDC_LUACONSOLE_CHOOSEFONT:
{
CHOOSEFONT cf;
ZeroMemory(&cf, sizeof(cf));
cf.lStructSize = sizeof(CHOOSEFONT);
cf.hwndOwner = hDlg;
cf.lpLogFont = &LuaConsoleLogFont;
cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT;
if (ChooseFont(&cf)) {
if (hFont) {
DeleteObject(hFont);
hFont = NULL;
}
hFont = CreateFontIndirect(&LuaConsoleLogFont);
if (hFont)
SendDlgItemMessage(hDlg, IDC_LUACONSOLE, WM_SETFONT, (WPARAM)hFont, 0);
}
} break;
case IDC_LUACONSOLE_CLEAR:
{
SetWindowText(GetDlgItem(hDlg, IDC_LUACONSOLE), "");
} break;
}
break;
case WM_CLOSE: {
FCEU_LuaStop();
DragAcceptFiles(hDlg, FALSE);
if (hFont) {
DeleteObject(hFont);
hFont = NULL;
}
LuaConsoleHWnd = NULL;
} break;

10
src/drivers/win/res.rc
View File

@ -417,6 +417,15 @@ BEGIN
END
END
LUAWINDOW_MENU MENU
BEGIN
POPUP "Console"
BEGIN
MENUITEM "&Font...", IDC_LUACONSOLE_CHOOSEFONT
MENUITEM "Clear", IDC_LUACONSOLE_CLEAR
END
END
/////////////////////////////////////////////////////////////////////////////
//
@ -1451,6 +1460,7 @@ END
IDD_LUA DIALOGEX 0, 0, 270, 150
STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "Lua Script"
MENU LUAWINDOW_MENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "Browse...",IDC_BUTTON_LUABROWSE,7,31,48,16

4
src/drivers/win/resource.h
View File

@ -464,6 +464,8 @@
#define IDC_EDIT_LUAPATH 1251
#define IDC_LUACONSOLE 1252
#define IDC_BUTTON_LUAEDIT 1253
#define IDC_LUACONSOLE_CLEAR 1254
#define IDC_LUACONSOLE_CHOOSEFONT 1255
#define MENU_NETWORK 40040
#define MENU_PALETTE 40041
#define MENU_SOUND 40042
@ -774,7 +776,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 160
#define _APS_NEXT_COMMAND_VALUE 40401
#define _APS_NEXT_CONTROL_VALUE 1254
#define _APS_NEXT_CONTROL_VALUE 1256
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

161
src/lua-engine.cpp
View File

@ -2088,9 +2088,8 @@ static int zapper_read(lua_State *L){
// table joypad.read(int which = 1)
//
// Reads the joypads as inputted by the user.
// This is really the only way to get input to the system.
// TODO: Don't read in *everything*...
static int joypad_read(lua_State *L) {
static int joy_get_internal(lua_State *L, bool reportUp, bool reportDown) {
// Reads the joypads as inputted by the user
int which = luaL_checkinteger(L,1);
@ -2109,14 +2108,36 @@ static int joypad_read(lua_State *L) {
int i;
for (i = 0; i < 8; i++) {
if (buttons & (1<<i)) {
lua_pushinteger(L,1);
bool pressed = (buttons & (1<<i))!=0;
if ((pressed && reportDown) || (!pressed && reportUp)) {
lua_pushboolean(L, pressed);
lua_setfield(L, -2, button_mappings[i]);
}
}
return 1;
}
// joypad.get(which)
// returns a table of every game button,
// true meaning currently-held and false meaning not-currently-held
// (as of last frame boundary)
// this WILL read input from a currently-playing movie
static int joypad_get(lua_State *L)
{
return joy_get_internal(L, true, true);
}
// joypad.getdown(which)
// returns a table of every game button that is currently held
static int joypad_getdown(lua_State *L)
{
return joy_get_internal(L, false, true);
}
// joypad.getup(which)
// returns a table of every game button that is not currently held
static int joypad_getup(lua_State *L)
{
return joy_get_internal(L, true, false);
}
// joypad.set(int which, table buttons)
@ -2393,6 +2414,12 @@ int emu_lagged (lua_State *L) {
return 1;
}
// boolean emu.emulating()
int emu_emulating(lua_State *L) {
lua_pushboolean(L, GameInfo != NULL);
return 1;
}
// string movie.mode()
//
// "record", "playback" or nil
@ -2535,6 +2562,10 @@ static void gui_prepare() {
#define DECOMPOSE_PIXEL_ARGB8888(PIX,A,R,G,B) { (A) = ((PIX) >> 24) & 0xff; (R) = ((PIX) >> 16) & 0xff; (G) = ((PIX) >> 8) & 0xff; (B) = (PIX) & 0xff; }
#define LUA_BUILD_PIXEL BUILD_PIXEL_ARGB8888
#define LUA_DECOMPOSE_PIXEL DECOMPOSE_PIXEL_ARGB8888
#define LUA_PIXEL_A(PIX) (((PIX) >> 24) & 0xff)
#define LUA_PIXEL_R(PIX) (((PIX) >> 16) & 0xff)
#define LUA_PIXEL_G(PIX) (((PIX) >> 8) & 0xff)
#define LUA_PIXEL_B(PIX) ((PIX) & 0xff)
template <class T> static void swap(T &one, T &two) {
T temp = one;
@ -2684,6 +2715,33 @@ static void gui_drawbox_internal(int x1, int y1, int x2, int y2, uint32 colour)
gui_drawline_internal(x2, y1, x2, y2, true, colour);
}
// draw fill rect on gui_data
static void gui_fillbox_internal(int x1, int y1, int x2, int y2, uint32 colour)
{
if (x1 > x2)
std::swap<int> (x1, x2);
if (y1 > y2)
std::swap<int> (y1, y2);
if (x1 < 0)
x1 = 0;
if (y1 < 0)
y1 = 0;
if (x2 >= LUA_SCREEN_WIDTH)
x2 = LUA_SCREEN_WIDTH - 1;
if (y2 >= LUA_SCREEN_HEIGHT)
y2 = LUA_SCREEN_HEIGHT - 1;
//gui_prepare();
int ix, iy;
for (iy = y1; iy <= y2; iy++)
{
for (ix = x1; ix <= x2; ix++)
{
gui_drawpixel_fast(ix, iy, colour);
}
}
}
enum
{
GUI_COLOUR_CLEAR
@ -2819,6 +2877,35 @@ static inline uint32 gui_getcolour_wrapped(lua_State *L, int offset, bool hasDef
uint32 colour = (uint32) lua_tointeger(L,offset);
return colour;
}
case LUA_TTABLE:
{
int color = 0xFF;
lua_pushnil(L); // first key
int keyIndex = lua_gettop(L);
int valueIndex = keyIndex + 1;
bool first = true;
while(lua_next(L, offset))
{
bool keyIsString = (lua_type(L, keyIndex) == LUA_TSTRING);
bool keyIsNumber = (lua_type(L, keyIndex) == LUA_TNUMBER);
int key = keyIsString ? tolower(*lua_tostring(L, keyIndex)) : (keyIsNumber ? lua_tointeger(L, keyIndex) : 0);
int value = lua_tointeger(L, valueIndex);
if(value < 0) value = 0;
if(value > 255) value = 255;
switch(key)
{
case 1: case 'r': color |= value << 24; break;
case 2: case 'g': color |= value << 16; break;
case 3: case 'b': color |= value << 8; break;
case 4: case 'a': color = (color & ~0xFF) | value; break;
}
lua_pop(L, 1);
}
return color;
} break;
case LUA_TFUNCTION:
luaL_error(L, "invalid colour"); // NYI
return 0;
default:
if (hasDefaultValue)
return defaultColour;
@ -2873,33 +2960,56 @@ static int gui_pixel(lua_State *L) {
return 0;
}
// gui.line(x1,y1,x2,y2,type colour)
// gui.line(x1,y1,x2,y2,color,skipFirst)
static int gui_line(lua_State *L) {
int x1,y1,x2,y2;
uint32 colour;
uint32 color;
x1 = luaL_checkinteger(L,1);
y1 = luaL_checkinteger(L,2);
x2 = luaL_checkinteger(L,3);
y2 = luaL_checkinteger(L,4);
colour = gui_getcolour(L,5);
// if (!gui_check_boundary(x1, y1))
// luaL_error(L,"bad coordinates");
//
// if (!gui_check_boundary(x2, y2))
// luaL_error(L,"bad coordinates");
color = gui_optcolour(L,5,LUA_BUILD_PIXEL(255, 255, 255, 255));
int skipFirst = lua_toboolean(L,6);
gui_prepare();
gui_drawline_internal(x1, y1, x2, y2, true, colour);
gui_drawline_internal(x2, y2, x1, y1, !skipFirst, color);
return 0;
}
// gui.box(x1, y1, x2, y2, colour)
// gui.box(x1, y1, x2, y2, fillcolor, outlinecolor)
static int gui_box(lua_State *L) {
int x1,y1,x2,y2;
uint32 fillcolor;
uint32 outlinecolor;
x1 = luaL_checkinteger(L,1);
y1 = luaL_checkinteger(L,2);
x2 = luaL_checkinteger(L,3);
y2 = luaL_checkinteger(L,4);
fillcolor = gui_optcolour(L,5,LUA_BUILD_PIXEL(63, 255, 255, 255));
outlinecolor = gui_optcolour(L,6,LUA_BUILD_PIXEL(255, LUA_PIXEL_R(fillcolor), LUA_PIXEL_G(fillcolor), LUA_PIXEL_B(fillcolor)));
if (x1 > x2)
std::swap<int>(x1, x2);
if (y1 > y2)
std::swap<int>(y1, y2);
gui_prepare();
gui_drawbox_internal(x1, y1, x2, y2, outlinecolor);
if ((x2 - x1) >= 2 && (y2 - y1) >= 2)
gui_fillbox_internal(x1+1, y1+1, x2-1, y2-1, fillcolor);
return 0;
}
// (old) gui.box(x1, y1, x2, y2, color)
static int gui_box_old(lua_State *L) {
int x1,y1,x2,y2;
uint32 colour;
@ -2922,6 +3032,18 @@ static int gui_box(lua_State *L) {
return 0;
}
static int gui_parsecolor(lua_State *L)
{
int r, g, b, a;
uint32 color = gui_getcolour(L,1);
LUA_DECOMPOSE_PIXEL(color, a, r, g, b);
lua_pushinteger(L, r);
lua_pushinteger(L, g);
lua_pushinteger(L, b);
lua_pushinteger(L, a);
return 4;
}
// gui.gdscreenshot()
//
@ -4182,6 +4304,7 @@ static const struct luaL_reg emulib [] = {
{"framecount", emu_framecount},
{"lagcount", emu_lagcount},
{"lagged", emu_lagged},
{"emulating", emu_emulating},
{"registerbefore", emu_registerbefore},
{"registerafter", emu_registerafter},
{"registerexit", emu_registerexit},
@ -4224,11 +4347,15 @@ static const struct luaL_reg memorylib [] = {
};
static const struct luaL_reg joypadlib[] = {
{"get", joypad_read},
{"get", joypad_get},
{"getdown", joypad_getdown},
{"getup", joypad_getup},
{"set", joypad_set},
// alternative names
{"read", joypad_read},
{"read", joypad_get},
{"write", joypad_set},
{"readdown", joypad_getdown},
{"readup", joypad_getup},
{NULL,NULL}
};

BIN
vc/Help/fceux.hnd
View File

Binary file not shown.