matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix modifiers from lua, fix right ctrl

Browse Source
This commit is contained in:
jacob1 2013-02-11 11:45:49 -05:00
parent 4e918ab76d
commit 5807602cc1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cat/LuaScriptInterface.cpp
View File

@ -43,6 +43,7 @@
#ifndef WIN
#include <unistd.h>
#endif
#include "SDL.h"
extern "C"
{
@ -1887,14 +1888,7 @@ bool LuaScriptInterface::OnMouseWheel(int x, int y, int d)
bool LuaScriptInterface::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
int modifiers = 0;
if(shift)
modifiers |= 0x001;
if(ctrl)
modifiers |= 0x040;
if(alt)
modifiers |= 0x100;
return luacon_keyevent(key, modifiers, LUACON_KDOWN);
return luacon_keyevent(key, SDL_GetModState(), LUACON_KDOWN);
}
bool LuaScriptInterface::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)

2
src/interface/Keys.h
View File

@ -32,7 +32,7 @@
#define KEY_MOD_MODE KMOD_MODE
#define KEY_MOD_RESERVED KMOD_RESERVED
#define KEY_MOD_CONTROL KEY_MOD_RCONTROL | KEY_MOD_LCONTROl
#define KEY_MOD_CONTROL KEY_MOD_RCONTROL | KEY_MOD_LCONTROL
#define KEY_MOD_ALT KEY_MOD_RALT | KEY_MOD_LALT
#define KEY_MOD_SHIFT KEY_MOD_RSHIFT | KEY_MOD_LSHIFT