mirror of
https://github.com/love2d/love.git
synced 2026-08-16 00:02:12 +02:00
Merged SDL2 changes from bartbes/love-experiments/SDL2 into default.
- Added love.system module, including clipboard functions. - Added custom hardware cursors (love.mouse.newCursor, love.mouse.setCursor.) - Revamped love.joystick: -- added Joystick objects and moved love.joystick functions which operated on individual joysticks to methods on the Joystick objects. -- Added love.joystick.getJoystick and love.joystick.getJoystickCount. -- Added events for when joysticks are connected and disconnected. -- Added 'Gamepad' methods to Joystick objects: Joystick:isGamepad, Joystick:getGamepadAxis, and Joystick:isGamepadDown. They're a common abstraction for xbox controller-like joystick across operating systems. - Added monitor choosing support and "fullscreen desktop" mode to love.window. - Moved unicode text input events to their own callback function (love.textinput), removed the key repeat functions from love.keyboard and made the second argument of love.keypressed a boolean saying whether the keypress was a repeat. - liblove now works with love.window and love.graphics in OS X
This commit is contained in:
Alex Szpakowski
@@ -39,12 +39,10 @@ bool Keyboard::getConstant(Keyboard::Key in, const char *&out)
|
||||
|
||||
StringMap<Keyboard::Key, Keyboard::KEY_MAX_ENUM>::Entry Keyboard::keyEntries[] =
|
||||
{
|
||||
{"return", Keyboard::KEY_RETURN},
|
||||
{"escape", Keyboard::KEY_ESCAPE},
|
||||
{"backspace", Keyboard::KEY_BACKSPACE},
|
||||
{"tab", Keyboard::KEY_TAB},
|
||||
{"clear", Keyboard::KEY_CLEAR},
|
||||
{"return", Keyboard::KEY_RETURN},
|
||||
{"pause", Keyboard::KEY_PAUSE},
|
||||
{"escape", Keyboard::KEY_ESCAPE},
|
||||
{" ", Keyboard::KEY_SPACE},
|
||||
{"!", Keyboard::KEY_EXCLAIM},
|
||||
{"\"", Keyboard::KEY_QUOTEDBL},
|
||||
@@ -110,35 +108,8 @@ StringMap<Keyboard::Key, Keyboard::KEY_MAX_ENUM>::Entry Keyboard::keyEntries[] =
|
||||
{"x", Keyboard::KEY_X},
|
||||
{"y", Keyboard::KEY_Y},
|
||||
{"z", Keyboard::KEY_Z},
|
||||
{"delete", Keyboard::KEY_DELETE},
|
||||
|
||||
{"kp0", Keyboard::KEY_KP0},
|
||||
{"kp1", Keyboard::KEY_KP1},
|
||||
{"kp2", Keyboard::KEY_KP2},
|
||||
{"kp3", Keyboard::KEY_KP3},
|
||||
{"kp4", Keyboard::KEY_KP4},
|
||||
{"kp5", Keyboard::KEY_KP5},
|
||||
{"kp6", Keyboard::KEY_KP6},
|
||||
{"kp7", Keyboard::KEY_KP7},
|
||||
{"kp8", Keyboard::KEY_KP8},
|
||||
{"kp9", Keyboard::KEY_KP9},
|
||||
{"kp.", Keyboard::KEY_KP_PERIOD},
|
||||
{"kp/", Keyboard::KEY_KP_DIVIDE},
|
||||
{"kp*", Keyboard::KEY_KP_MULTIPLY},
|
||||
{"kp-", Keyboard::KEY_KP_MINUS},
|
||||
{"kp+", Keyboard::KEY_KP_PLUS},
|
||||
{"kpenter", Keyboard::KEY_KP_ENTER},
|
||||
{"kp=", Keyboard::KEY_KP_EQUALS},
|
||||
|
||||
{"up", Keyboard::KEY_UP},
|
||||
{"down", Keyboard::KEY_DOWN},
|
||||
{"right", Keyboard::KEY_RIGHT},
|
||||
{"left", Keyboard::KEY_LEFT},
|
||||
{"insert", Keyboard::KEY_INSERT},
|
||||
{"home", Keyboard::KEY_HOME},
|
||||
{"end", Keyboard::KEY_END},
|
||||
{"pageup", Keyboard::KEY_PAGEUP},
|
||||
{"pagedown", Keyboard::KEY_PAGEDOWN},
|
||||
{"capslock", Keyboard::KEY_CAPSLOCK},
|
||||
|
||||
{"f1", Keyboard::KEY_F1},
|
||||
{"f2", Keyboard::KEY_F2},
|
||||
@@ -152,34 +123,112 @@ StringMap<Keyboard::Key, Keyboard::KEY_MAX_ENUM>::Entry Keyboard::keyEntries[] =
|
||||
{"f10", Keyboard::KEY_F10},
|
||||
{"f11", Keyboard::KEY_F11},
|
||||
{"f12", Keyboard::KEY_F12},
|
||||
|
||||
{"printscreen", Keyboard::KEY_PRINTSCREEN},
|
||||
{"scrolllock", Keyboard::KEY_SCROLLLOCK},
|
||||
{"pause", Keyboard::KEY_PAUSE},
|
||||
{"insert", Keyboard::KEY_INSERT},
|
||||
{"home", Keyboard::KEY_HOME},
|
||||
{"pageup", Keyboard::KEY_PAGEUP},
|
||||
{"delete", Keyboard::KEY_DELETE},
|
||||
{"end", Keyboard::KEY_END},
|
||||
{"pagedown", Keyboard::KEY_PAGEDOWN},
|
||||
{"right", Keyboard::KEY_RIGHT},
|
||||
{"left", Keyboard::KEY_LEFT},
|
||||
{"down", Keyboard::KEY_DOWN},
|
||||
{"up", Keyboard::KEY_UP},
|
||||
|
||||
{"numlock", Keyboard::KEY_NUMLOCKCLEAR},
|
||||
{"kp/", Keyboard::KEY_KP_DIVIDE},
|
||||
{"kp*", Keyboard::KEY_KP_MULTIPLY},
|
||||
{"kp-", Keyboard::KEY_KP_MINUS},
|
||||
{"kp+", Keyboard::KEY_KP_PLUS},
|
||||
{"kpenter", Keyboard::KEY_KP_ENTER},
|
||||
{"kp0", Keyboard::KEY_KP_0},
|
||||
{"kp1", Keyboard::KEY_KP_1},
|
||||
{"kp2", Keyboard::KEY_KP_2},
|
||||
{"kp3", Keyboard::KEY_KP_3},
|
||||
{"kp4", Keyboard::KEY_KP_4},
|
||||
{"kp5", Keyboard::KEY_KP_5},
|
||||
{"kp6", Keyboard::KEY_KP_6},
|
||||
{"kp7", Keyboard::KEY_KP_7},
|
||||
{"kp8", Keyboard::KEY_KP_8},
|
||||
{"kp9", Keyboard::KEY_KP_9},
|
||||
{"kp.", Keyboard::KEY_KP_PERIOD},
|
||||
{"kp,", Keyboard::KEY_KP_COMMA},
|
||||
{"kp=", Keyboard::KEY_KP_EQUALS},
|
||||
|
||||
{"application", Keyboard::KEY_APPLICATION},
|
||||
{"power", Keyboard::KEY_POWER},
|
||||
{"f13", Keyboard::KEY_F13},
|
||||
{"f14", Keyboard::KEY_F14},
|
||||
{"f15", Keyboard::KEY_F15},
|
||||
|
||||
{"numlock", Keyboard::KEY_NUMLOCK},
|
||||
{"capslock", Keyboard::KEY_CAPSLOCK},
|
||||
{"scrollock", Keyboard::KEY_SCROLLOCK},
|
||||
{"rshift", Keyboard::KEY_RSHIFT},
|
||||
{"lshift", Keyboard::KEY_LSHIFT},
|
||||
{"rctrl", Keyboard::KEY_RCTRL},
|
||||
{"lctrl", Keyboard::KEY_LCTRL},
|
||||
{"ralt", Keyboard::KEY_RALT},
|
||||
{"lalt", Keyboard::KEY_LALT},
|
||||
{"rmeta", Keyboard::KEY_RMETA},
|
||||
{"lmeta", Keyboard::KEY_LMETA},
|
||||
{"lsuper", Keyboard::KEY_LSUPER},
|
||||
{"rsuper", Keyboard::KEY_RSUPER},
|
||||
{"mode", Keyboard::KEY_MODE},
|
||||
{"compose", Keyboard::KEY_COMPOSE},
|
||||
|
||||
{"f16", Keyboard::KEY_F16},
|
||||
{"f17", Keyboard::KEY_F17},
|
||||
{"f18", Keyboard::KEY_F18},
|
||||
{"f19", Keyboard::KEY_F19},
|
||||
{"f20", Keyboard::KEY_F20},
|
||||
{"f21", Keyboard::KEY_F21},
|
||||
{"f22", Keyboard::KEY_F22},
|
||||
{"f23", Keyboard::KEY_F23},
|
||||
{"f24", Keyboard::KEY_F24},
|
||||
{"execute", Keyboard::KEY_EXECUTE},
|
||||
{"help", Keyboard::KEY_HELP},
|
||||
{"print", Keyboard::KEY_PRINT},
|
||||
{"sysreq", Keyboard::KEY_SYSREQ},
|
||||
{"break", Keyboard::KEY_BREAK},
|
||||
{"menu", Keyboard::KEY_MENU},
|
||||
{"power", Keyboard::KEY_POWER},
|
||||
{"euro", Keyboard::KEY_EURO},
|
||||
{"select", Keyboard::KEY_SELECT},
|
||||
{"stop", Keyboard::KEY_STOP},
|
||||
{"again", Keyboard::KEY_AGAIN},
|
||||
{"undo", Keyboard::KEY_UNDO},
|
||||
{"cut", Keyboard::KEY_CUT},
|
||||
{"copy", Keyboard::KEY_COPY},
|
||||
{"paste", Keyboard::KEY_PASTE},
|
||||
{"find", Keyboard::KEY_FIND},
|
||||
{"mute", Keyboard::KEY_MUTE},
|
||||
{"volumeup", Keyboard::KEY_VOLUMEUP},
|
||||
{"volumedown", Keyboard::KEY_VOLUMEDOWN},
|
||||
|
||||
{"alterase", Keyboard::KEY_ALTERASE},
|
||||
{"sysreq", Keyboard::KEY_SYSREQ},
|
||||
{"cancel", Keyboard::KEY_CANCEL},
|
||||
{"clear", Keyboard::KEY_CLEAR},
|
||||
{"prior", Keyboard::KEY_PRIOR},
|
||||
{"return2", Keyboard::KEY_RETURN2},
|
||||
{"separator", Keyboard::KEY_SEPARATOR},
|
||||
{"out", Keyboard::KEY_OUT},
|
||||
{"oper", Keyboard::KEY_OPER},
|
||||
{"clearagain", Keyboard::KEY_CLEARAGAIN},
|
||||
|
||||
{"thsousandsseparator", Keyboard::KEY_THOUSANDSSEPARATOR},
|
||||
{"decimalseparator", Keyboard::KEY_DECIMALSEPARATOR},
|
||||
{"currencyunit", Keyboard::KEY_CURRENCYUNIT},
|
||||
{"currencysubunit", Keyboard::KEY_CURRENCYSUBUNIT},
|
||||
|
||||
{"lctrl", Keyboard::KEY_LCTRL},
|
||||
{"lshift", Keyboard::KEY_LSHIFT},
|
||||
{"lalt", Keyboard::KEY_LALT},
|
||||
{"lgui", Keyboard::KEY_LGUI},
|
||||
{"rctrl", Keyboard::KEY_RCTRL},
|
||||
{"rshift", Keyboard::KEY_RSHIFT},
|
||||
{"ralt", Keyboard::KEY_RALT},
|
||||
{"rgui", Keyboard::KEY_RGUI},
|
||||
|
||||
{"mode", Keyboard::KEY_MODE},
|
||||
|
||||
{"audionext", Keyboard::KEY_AUDIONEXT},
|
||||
{"audioprev", Keyboard::KEY_AUDIOPREV},
|
||||
{"audiostop", Keyboard::KEY_AUDIOSTOP},
|
||||
{"audioplay", Keyboard::KEY_AUDIOPLAY},
|
||||
{"audiomute", Keyboard::KEY_AUDIOMUTE},
|
||||
{"mediaselect", Keyboard::KEY_MEDIASELECT},
|
||||
|
||||
{"brightnessdown", Keyboard::KEY_BRIGHTNESSDOWN},
|
||||
{"brightnessup", Keyboard::KEY_BRIGHTNESSUP},
|
||||
{"displayswitch", Keyboard::KEY_DISPLAYSWITCH},
|
||||
{"kbdillumtoggle", Keyboard::KEY_KBDILLUMTOGGLE},
|
||||
{"kbdillumdown", Keyboard::KEY_KBDILLUMDOWN},
|
||||
{"kbdillumup", Keyboard::KEY_KBDILLUMUP},
|
||||
{"eject", Keyboard::KEY_EJECT},
|
||||
{"sleep", Keyboard::KEY_SLEEP},
|
||||
};
|
||||
|
||||
StringMap<Keyboard::Key, Keyboard::KEY_MAX_ENUM> Keyboard::keys(Keyboard::keyEntries, sizeof(Keyboard::keyEntries));
|
||||
|
||||
+106
-75
@@ -37,16 +37,16 @@ public:
|
||||
enum Key
|
||||
{
|
||||
KEY_UNKNOWN,
|
||||
|
||||
KEY_RETURN,
|
||||
KEY_ESCAPE,
|
||||
KEY_BACKSPACE,
|
||||
KEY_TAB,
|
||||
KEY_CLEAR,
|
||||
KEY_RETURN,
|
||||
KEY_PAUSE,
|
||||
KEY_ESCAPE,
|
||||
KEY_SPACE,
|
||||
KEY_EXCLAIM,
|
||||
KEY_QUOTEDBL,
|
||||
KEY_HASH,
|
||||
KEY_PERCENT,
|
||||
KEY_DOLLAR,
|
||||
KEY_AMPERSAND,
|
||||
KEY_QUOTE,
|
||||
@@ -108,35 +108,8 @@ public:
|
||||
KEY_X,
|
||||
KEY_Y,
|
||||
KEY_Z,
|
||||
KEY_DELETE,
|
||||
|
||||
KEY_KP0,
|
||||
KEY_KP1,
|
||||
KEY_KP2,
|
||||
KEY_KP3,
|
||||
KEY_KP4,
|
||||
KEY_KP5,
|
||||
KEY_KP6,
|
||||
KEY_KP7,
|
||||
KEY_KP8,
|
||||
KEY_KP9,
|
||||
KEY_KP_PERIOD,
|
||||
KEY_KP_DIVIDE,
|
||||
KEY_KP_MULTIPLY,
|
||||
KEY_KP_MINUS,
|
||||
KEY_KP_PLUS,
|
||||
KEY_KP_ENTER,
|
||||
KEY_KP_EQUALS,
|
||||
|
||||
KEY_UP,
|
||||
KEY_DOWN,
|
||||
KEY_RIGHT,
|
||||
KEY_LEFT,
|
||||
KEY_INSERT,
|
||||
KEY_HOME,
|
||||
KEY_END,
|
||||
KEY_PAGEUP,
|
||||
KEY_PAGEDOWN,
|
||||
KEY_CAPSLOCK,
|
||||
|
||||
KEY_F1,
|
||||
KEY_F2,
|
||||
@@ -150,39 +123,116 @@ public:
|
||||
KEY_F10,
|
||||
KEY_F11,
|
||||
KEY_F12,
|
||||
|
||||
KEY_PRINTSCREEN,
|
||||
KEY_SCROLLLOCK,
|
||||
KEY_PAUSE,
|
||||
KEY_INSERT,
|
||||
KEY_HOME,
|
||||
KEY_PAGEUP,
|
||||
KEY_DELETE,
|
||||
KEY_END,
|
||||
KEY_PAGEDOWN,
|
||||
KEY_RIGHT,
|
||||
KEY_LEFT,
|
||||
KEY_DOWN,
|
||||
KEY_UP,
|
||||
|
||||
KEY_NUMLOCKCLEAR,
|
||||
KEY_KP_DIVIDE,
|
||||
KEY_KP_MULTIPLY,
|
||||
KEY_KP_MINUS,
|
||||
KEY_KP_PLUS,
|
||||
KEY_KP_ENTER,
|
||||
KEY_KP_1,
|
||||
KEY_KP_2,
|
||||
KEY_KP_3,
|
||||
KEY_KP_4,
|
||||
KEY_KP_5,
|
||||
KEY_KP_6,
|
||||
KEY_KP_7,
|
||||
KEY_KP_8,
|
||||
KEY_KP_9,
|
||||
KEY_KP_0,
|
||||
KEY_KP_PERIOD,
|
||||
KEY_KP_COMMA,
|
||||
KEY_KP_EQUALS,
|
||||
|
||||
KEY_APPLICATION,
|
||||
KEY_POWER,
|
||||
KEY_F13,
|
||||
KEY_F14,
|
||||
KEY_F15,
|
||||
|
||||
KEY_NUMLOCK,
|
||||
KEY_CAPSLOCK,
|
||||
KEY_SCROLLOCK,
|
||||
KEY_RSHIFT,
|
||||
KEY_LSHIFT,
|
||||
KEY_RCTRL,
|
||||
KEY_LCTRL,
|
||||
KEY_RALT,
|
||||
KEY_LALT,
|
||||
KEY_RMETA,
|
||||
KEY_LMETA,
|
||||
KEY_LSUPER,
|
||||
KEY_RSUPER,
|
||||
KEY_MODE,
|
||||
KEY_COMPOSE,
|
||||
|
||||
KEY_F16,
|
||||
KEY_F17,
|
||||
KEY_F18,
|
||||
KEY_F19,
|
||||
KEY_F20,
|
||||
KEY_F21,
|
||||
KEY_F22,
|
||||
KEY_F23,
|
||||
KEY_F24,
|
||||
KEY_EXECUTE,
|
||||
KEY_HELP,
|
||||
KEY_PRINT,
|
||||
KEY_SYSREQ,
|
||||
KEY_BREAK,
|
||||
KEY_MENU,
|
||||
KEY_POWER,
|
||||
KEY_EURO,
|
||||
KEY_SELECT,
|
||||
KEY_STOP,
|
||||
KEY_AGAIN,
|
||||
KEY_UNDO,
|
||||
KEY_CUT,
|
||||
KEY_COPY,
|
||||
KEY_PASTE,
|
||||
KEY_FIND,
|
||||
KEY_MUTE,
|
||||
KEY_VOLUMEUP,
|
||||
KEY_VOLUMEDOWN,
|
||||
|
||||
KEY_ALTERASE,
|
||||
KEY_SYSREQ,
|
||||
KEY_CANCEL,
|
||||
KEY_CLEAR,
|
||||
KEY_PRIOR,
|
||||
KEY_RETURN2,
|
||||
KEY_SEPARATOR,
|
||||
KEY_OUT,
|
||||
KEY_OPER,
|
||||
KEY_CLEARAGAIN,
|
||||
|
||||
KEY_THOUSANDSSEPARATOR,
|
||||
KEY_DECIMALSEPARATOR,
|
||||
KEY_CURRENCYUNIT,
|
||||
KEY_CURRENCYSUBUNIT,
|
||||
|
||||
KEY_LCTRL,
|
||||
KEY_LSHIFT,
|
||||
KEY_LALT,
|
||||
KEY_LGUI,
|
||||
KEY_RCTRL,
|
||||
KEY_RSHIFT,
|
||||
KEY_RALT,
|
||||
KEY_RGUI,
|
||||
|
||||
KEY_MODE,
|
||||
|
||||
KEY_AUDIONEXT,
|
||||
KEY_AUDIOPREV,
|
||||
KEY_AUDIOSTOP,
|
||||
KEY_AUDIOPLAY,
|
||||
KEY_AUDIOMUTE,
|
||||
KEY_MEDIASELECT,
|
||||
|
||||
KEY_BRIGHTNESSDOWN,
|
||||
KEY_BRIGHTNESSUP,
|
||||
KEY_DISPLAYSWITCH,
|
||||
KEY_KBDILLUMTOGGLE,
|
||||
KEY_KBDILLUMDOWN,
|
||||
KEY_KBDILLUMUP,
|
||||
KEY_EJECT,
|
||||
KEY_SLEEP,
|
||||
|
||||
KEY_MAX_ENUM = 512
|
||||
};
|
||||
|
||||
static const int DEFAULT = -1;
|
||||
|
||||
virtual ~Keyboard() {}
|
||||
|
||||
/**
|
||||
@@ -192,25 +242,6 @@ public:
|
||||
**/
|
||||
virtual bool isDown(Key *keylist) const = 0;
|
||||
|
||||
/**
|
||||
* Enables key repeating.
|
||||
* @param delay The amount of delay before repeating the key (in milliseconds)
|
||||
* @param interval Specifies the amount of time between repeats (in milliseconds)
|
||||
**/
|
||||
virtual void setKeyRepeat(int delay, int interval) const = 0;
|
||||
|
||||
/**
|
||||
* Gets the specified delay for the key repeat.
|
||||
* @return int
|
||||
**/
|
||||
virtual int getKeyRepeatDelay() const = 0;
|
||||
|
||||
/**
|
||||
* Gets the specified interval for the key repeat.
|
||||
* @return int
|
||||
**/
|
||||
virtual int getKeyRepeatInterval() const = 0;
|
||||
|
||||
static bool getConstant(const char *in, Key &out);
|
||||
static bool getConstant(Key in, const char *&out);
|
||||
|
||||
|
||||
@@ -36,187 +36,220 @@ const char *Keyboard::getName() const
|
||||
|
||||
bool Keyboard::isDown(Key *keylist) const
|
||||
{
|
||||
SDLKey k;
|
||||
Uint8 *keystate = SDL_GetKeyState(0);
|
||||
const Uint8 *keystate = SDL_GetKeyboardState(0);
|
||||
std::map<Key, SDL_Keycode>::const_iterator it;
|
||||
|
||||
for (Key key = *keylist; key != KEY_MAX_ENUM; key = *(++keylist))
|
||||
{
|
||||
if (keys.find(key, k) && keystate[(unsigned)k] == 1)
|
||||
it = keys.find(key);
|
||||
if (it != keys.end() && keystate[SDL_GetScancodeFromKey(it->second)])
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void Keyboard::setKeyRepeat(int delay, int interval) const
|
||||
std::map<Keyboard::Key, SDL_Keycode> Keyboard::createKeyMap()
|
||||
{
|
||||
delay = (delay == DEFAULT) ? SDL_DEFAULT_REPEAT_DELAY : delay;
|
||||
interval = (interval == DEFAULT) ? SDL_DEFAULT_REPEAT_INTERVAL : interval;
|
||||
std::map<Keyboard::Key, SDL_Keycode> k;
|
||||
|
||||
SDL_EnableKeyRepeat(delay, interval);
|
||||
k[Keyboard::KEY_UNKNOWN] = SDLK_UNKNOWN;
|
||||
|
||||
k[Keyboard::KEY_RETURN] = SDLK_RETURN;
|
||||
k[Keyboard::KEY_ESCAPE] = SDLK_ESCAPE;
|
||||
k[Keyboard::KEY_BACKSPACE] = SDLK_BACKSPACE;
|
||||
k[Keyboard::KEY_TAB] = SDLK_TAB;
|
||||
k[Keyboard::KEY_SPACE] = SDLK_SPACE;
|
||||
k[Keyboard::KEY_EXCLAIM] = SDLK_EXCLAIM;
|
||||
k[Keyboard::KEY_QUOTEDBL] = SDLK_QUOTEDBL;
|
||||
k[Keyboard::KEY_HASH] = SDLK_HASH;
|
||||
k[Keyboard::KEY_DOLLAR] = SDLK_DOLLAR;
|
||||
k[Keyboard::KEY_AMPERSAND] = SDLK_AMPERSAND;
|
||||
k[Keyboard::KEY_QUOTE] = SDLK_QUOTE;
|
||||
k[Keyboard::KEY_LEFTPAREN] = SDLK_LEFTPAREN;
|
||||
k[Keyboard::KEY_RIGHTPAREN] = SDLK_RIGHTPAREN;
|
||||
k[Keyboard::KEY_ASTERISK] = SDLK_ASTERISK;
|
||||
k[Keyboard::KEY_PLUS] = SDLK_PLUS;
|
||||
k[Keyboard::KEY_COMMA] = SDLK_COMMA;
|
||||
k[Keyboard::KEY_MINUS] = SDLK_MINUS;
|
||||
k[Keyboard::KEY_PERIOD] = SDLK_PERIOD;
|
||||
k[Keyboard::KEY_SLASH] = SDLK_SLASH;
|
||||
k[Keyboard::KEY_0] = SDLK_0;
|
||||
k[Keyboard::KEY_1] = SDLK_1;
|
||||
k[Keyboard::KEY_2] = SDLK_2;
|
||||
k[Keyboard::KEY_3] = SDLK_3;
|
||||
k[Keyboard::KEY_4] = SDLK_4;
|
||||
k[Keyboard::KEY_5] = SDLK_5;
|
||||
k[Keyboard::KEY_6] = SDLK_6;
|
||||
k[Keyboard::KEY_7] = SDLK_7;
|
||||
k[Keyboard::KEY_8] = SDLK_8;
|
||||
k[Keyboard::KEY_9] = SDLK_9;
|
||||
k[Keyboard::KEY_COLON] = SDLK_COLON;
|
||||
k[Keyboard::KEY_SEMICOLON] = SDLK_SEMICOLON;
|
||||
k[Keyboard::KEY_LESS] = SDLK_LESS;
|
||||
k[Keyboard::KEY_EQUALS] = SDLK_EQUALS;
|
||||
k[Keyboard::KEY_GREATER] = SDLK_GREATER;
|
||||
k[Keyboard::KEY_QUESTION] = SDLK_QUESTION;
|
||||
k[Keyboard::KEY_AT] = SDLK_AT;
|
||||
|
||||
k[Keyboard::KEY_LEFTBRACKET] = SDLK_LEFTBRACKET;
|
||||
k[Keyboard::KEY_BACKSLASH] = SDLK_BACKSLASH;
|
||||
k[Keyboard::KEY_RIGHTBRACKET] = SDLK_RIGHTBRACKET;
|
||||
k[Keyboard::KEY_CARET] = SDLK_CARET;
|
||||
k[Keyboard::KEY_UNDERSCORE] = SDLK_UNDERSCORE;
|
||||
k[Keyboard::KEY_BACKQUOTE] = SDLK_BACKQUOTE;
|
||||
k[Keyboard::KEY_A] = SDLK_a;
|
||||
k[Keyboard::KEY_B] = SDLK_b;
|
||||
k[Keyboard::KEY_C] = SDLK_c;
|
||||
k[Keyboard::KEY_D] = SDLK_d;
|
||||
k[Keyboard::KEY_E] = SDLK_e;
|
||||
k[Keyboard::KEY_F] = SDLK_f;
|
||||
k[Keyboard::KEY_G] = SDLK_g;
|
||||
k[Keyboard::KEY_H] = SDLK_h;
|
||||
k[Keyboard::KEY_I] = SDLK_i;
|
||||
k[Keyboard::KEY_J] = SDLK_j;
|
||||
k[Keyboard::KEY_K] = SDLK_k;
|
||||
k[Keyboard::KEY_L] = SDLK_l;
|
||||
k[Keyboard::KEY_M] = SDLK_m;
|
||||
k[Keyboard::KEY_N] = SDLK_n;
|
||||
k[Keyboard::KEY_O] = SDLK_o;
|
||||
k[Keyboard::KEY_P] = SDLK_p;
|
||||
k[Keyboard::KEY_Q] = SDLK_q;
|
||||
k[Keyboard::KEY_R] = SDLK_r;
|
||||
k[Keyboard::KEY_S] = SDLK_s;
|
||||
k[Keyboard::KEY_T] = SDLK_t;
|
||||
k[Keyboard::KEY_U] = SDLK_u;
|
||||
k[Keyboard::KEY_V] = SDLK_v;
|
||||
k[Keyboard::KEY_W] = SDLK_w;
|
||||
k[Keyboard::KEY_X] = SDLK_x;
|
||||
k[Keyboard::KEY_Y] = SDLK_y;
|
||||
k[Keyboard::KEY_Z] = SDLK_z;
|
||||
|
||||
k[Keyboard::KEY_CAPSLOCK] = SDLK_CAPSLOCK;
|
||||
|
||||
k[Keyboard::KEY_F1] = SDLK_F1;
|
||||
k[Keyboard::KEY_F2] = SDLK_F2;
|
||||
k[Keyboard::KEY_F3] = SDLK_F3;
|
||||
k[Keyboard::KEY_F4] = SDLK_F4;
|
||||
k[Keyboard::KEY_F5] = SDLK_F5;
|
||||
k[Keyboard::KEY_F6] = SDLK_F6;
|
||||
k[Keyboard::KEY_F7] = SDLK_F7;
|
||||
k[Keyboard::KEY_F8] = SDLK_F8;
|
||||
k[Keyboard::KEY_F9] = SDLK_F9;
|
||||
k[Keyboard::KEY_F10] = SDLK_F10;
|
||||
k[Keyboard::KEY_F11] = SDLK_F11;
|
||||
k[Keyboard::KEY_F12] = SDLK_F12;
|
||||
|
||||
k[Keyboard::KEY_PRINTSCREEN] = SDLK_PRINTSCREEN;
|
||||
k[Keyboard::KEY_SCROLLLOCK] = SDLK_SCROLLLOCK;
|
||||
k[Keyboard::KEY_PAUSE] = SDLK_PAUSE;
|
||||
k[Keyboard::KEY_INSERT] = SDLK_INSERT;
|
||||
k[Keyboard::KEY_HOME] = SDLK_HOME;
|
||||
k[Keyboard::KEY_PAGEUP] = SDLK_PAGEUP;
|
||||
k[Keyboard::KEY_DELETE] = SDLK_DELETE;
|
||||
k[Keyboard::KEY_END] = SDLK_END;
|
||||
k[Keyboard::KEY_PAGEDOWN] = SDLK_PAGEDOWN;
|
||||
k[Keyboard::KEY_RIGHT] = SDLK_RIGHT;
|
||||
k[Keyboard::KEY_LEFT] = SDLK_LEFT;
|
||||
k[Keyboard::KEY_DOWN] = SDLK_DOWN;
|
||||
k[Keyboard::KEY_UP] = SDLK_UP;
|
||||
|
||||
k[Keyboard::KEY_NUMLOCKCLEAR] = SDLK_NUMLOCKCLEAR;
|
||||
k[Keyboard::KEY_KP_DIVIDE] = SDLK_KP_DIVIDE;
|
||||
k[Keyboard::KEY_KP_MULTIPLY] = SDLK_KP_MULTIPLY;
|
||||
k[Keyboard::KEY_KP_MINUS] = SDLK_KP_MINUS;
|
||||
k[Keyboard::KEY_KP_PLUS] = SDLK_KP_PLUS;
|
||||
k[Keyboard::KEY_KP_ENTER] = SDLK_KP_ENTER;
|
||||
k[Keyboard::KEY_KP_0] = SDLK_KP_0;
|
||||
k[Keyboard::KEY_KP_1] = SDLK_KP_1;
|
||||
k[Keyboard::KEY_KP_2] = SDLK_KP_2;
|
||||
k[Keyboard::KEY_KP_3] = SDLK_KP_3;
|
||||
k[Keyboard::KEY_KP_4] = SDLK_KP_4;
|
||||
k[Keyboard::KEY_KP_5] = SDLK_KP_5;
|
||||
k[Keyboard::KEY_KP_6] = SDLK_KP_6;
|
||||
k[Keyboard::KEY_KP_7] = SDLK_KP_7;
|
||||
k[Keyboard::KEY_KP_8] = SDLK_KP_8;
|
||||
k[Keyboard::KEY_KP_9] = SDLK_KP_9;
|
||||
k[Keyboard::KEY_KP_PERIOD] = SDLK_KP_PERIOD;
|
||||
k[Keyboard::KEY_KP_COMMA] = SDLK_KP_COMMA;
|
||||
k[Keyboard::KEY_KP_EQUALS] = SDLK_KP_EQUALS;
|
||||
|
||||
k[Keyboard::KEY_APPLICATION] = SDLK_APPLICATION;
|
||||
k[Keyboard::KEY_POWER] = SDLK_POWER;
|
||||
k[Keyboard::KEY_F13] = SDLK_F13;
|
||||
k[Keyboard::KEY_F14] = SDLK_F14;
|
||||
k[Keyboard::KEY_F15] = SDLK_F15;
|
||||
k[Keyboard::KEY_F16] = SDLK_F16;
|
||||
k[Keyboard::KEY_F17] = SDLK_F17;
|
||||
k[Keyboard::KEY_F18] = SDLK_F18;
|
||||
k[Keyboard::KEY_F19] = SDLK_F19;
|
||||
k[Keyboard::KEY_F20] = SDLK_F20;
|
||||
k[Keyboard::KEY_F21] = SDLK_F21;
|
||||
k[Keyboard::KEY_F22] = SDLK_F22;
|
||||
k[Keyboard::KEY_F23] = SDLK_F23;
|
||||
k[Keyboard::KEY_F24] = SDLK_F24;
|
||||
k[Keyboard::KEY_EXECUTE] = SDLK_EXECUTE;
|
||||
k[Keyboard::KEY_HELP] = SDLK_HELP;
|
||||
k[Keyboard::KEY_MENU] = SDLK_MENU;
|
||||
k[Keyboard::KEY_SELECT] = SDLK_SELECT;
|
||||
k[Keyboard::KEY_STOP] = SDLK_STOP;
|
||||
k[Keyboard::KEY_AGAIN] = SDLK_AGAIN;
|
||||
k[Keyboard::KEY_UNDO] = SDLK_UNDO;
|
||||
k[Keyboard::KEY_CUT] = SDLK_CUT;
|
||||
k[Keyboard::KEY_COPY] = SDLK_COPY;
|
||||
k[Keyboard::KEY_PASTE] = SDLK_PASTE;
|
||||
k[Keyboard::KEY_FIND] = SDLK_FIND;
|
||||
k[Keyboard::KEY_MUTE] = SDLK_MUTE;
|
||||
k[Keyboard::KEY_VOLUMEUP] = SDLK_VOLUMEUP;
|
||||
k[Keyboard::KEY_VOLUMEDOWN] = SDLK_VOLUMEDOWN;
|
||||
|
||||
k[Keyboard::KEY_ALTERASE] = SDLK_ALTERASE;
|
||||
k[Keyboard::KEY_SYSREQ] = SDLK_SYSREQ;
|
||||
k[Keyboard::KEY_CANCEL] = SDLK_CANCEL;
|
||||
k[Keyboard::KEY_CLEAR] = SDLK_CLEAR;
|
||||
k[Keyboard::KEY_PRIOR] = SDLK_PRIOR;
|
||||
k[Keyboard::KEY_RETURN2] = SDLK_RETURN2;
|
||||
k[Keyboard::KEY_SEPARATOR] = SDLK_SEPARATOR;
|
||||
k[Keyboard::KEY_OUT] = SDLK_OUT;
|
||||
k[Keyboard::KEY_OPER] = SDLK_OPER;
|
||||
k[Keyboard::KEY_CLEARAGAIN] = SDLK_CLEARAGAIN;
|
||||
|
||||
k[Keyboard::KEY_THOUSANDSSEPARATOR] = SDLK_THOUSANDSSEPARATOR;
|
||||
k[Keyboard::KEY_DECIMALSEPARATOR] = SDLK_DECIMALSEPARATOR;
|
||||
k[Keyboard::KEY_CURRENCYUNIT] = SDLK_CURRENCYUNIT;
|
||||
k[Keyboard::KEY_CURRENCYSUBUNIT] = SDLK_CURRENCYSUBUNIT;
|
||||
|
||||
k[Keyboard::KEY_LCTRL] = SDLK_LCTRL;
|
||||
k[Keyboard::KEY_LSHIFT] = SDLK_LSHIFT;
|
||||
k[Keyboard::KEY_LALT] = SDLK_LALT;
|
||||
k[Keyboard::KEY_LGUI] = SDLK_LGUI;
|
||||
k[Keyboard::KEY_RCTRL] = SDLK_RCTRL;
|
||||
k[Keyboard::KEY_RSHIFT] = SDLK_RSHIFT;
|
||||
k[Keyboard::KEY_RALT] = SDLK_RALT;
|
||||
k[Keyboard::KEY_RGUI] = SDLK_RGUI;
|
||||
|
||||
k[Keyboard::KEY_MODE] = SDLK_MODE;
|
||||
|
||||
k[Keyboard::KEY_AUDIONEXT] = SDLK_AUDIONEXT;
|
||||
k[Keyboard::KEY_AUDIOPREV] = SDLK_AUDIOPREV;
|
||||
k[Keyboard::KEY_AUDIOSTOP] = SDLK_AUDIOSTOP;
|
||||
k[Keyboard::KEY_AUDIOPLAY] = SDLK_AUDIOPLAY;
|
||||
k[Keyboard::KEY_AUDIOMUTE] = SDLK_AUDIOMUTE;
|
||||
k[Keyboard::KEY_MEDIASELECT] = SDLK_MEDIASELECT;
|
||||
|
||||
k[Keyboard::KEY_BRIGHTNESSDOWN] = SDLK_BRIGHTNESSDOWN;
|
||||
k[Keyboard::KEY_BRIGHTNESSUP] = SDLK_BRIGHTNESSUP;
|
||||
k[Keyboard::KEY_DISPLAYSWITCH] = SDLK_DISPLAYSWITCH;
|
||||
k[Keyboard::KEY_KBDILLUMTOGGLE] = SDLK_KBDILLUMTOGGLE;
|
||||
k[Keyboard::KEY_KBDILLUMDOWN] = SDLK_KBDILLUMDOWN;
|
||||
k[Keyboard::KEY_KBDILLUMUP] = SDLK_KBDILLUMUP;
|
||||
k[Keyboard::KEY_EJECT] = SDLK_EJECT;
|
||||
k[Keyboard::KEY_SLEEP] = SDLK_SLEEP;
|
||||
|
||||
return k;
|
||||
}
|
||||
|
||||
int Keyboard::getKeyRepeatDelay() const
|
||||
{
|
||||
int delay, interval;
|
||||
SDL_GetKeyRepeat(&delay, &interval);
|
||||
return delay;
|
||||
}
|
||||
|
||||
int Keyboard::getKeyRepeatInterval() const
|
||||
{
|
||||
int delay, interval;
|
||||
SDL_GetKeyRepeat(&delay, &interval);
|
||||
return interval;
|
||||
}
|
||||
|
||||
EnumMap<Keyboard::Key, SDLKey, Keyboard::KEY_MAX_ENUM>::Entry Keyboard::keyEntries[] =
|
||||
{
|
||||
{ Keyboard::KEY_BACKSPACE, SDLK_BACKSPACE},
|
||||
{ Keyboard::KEY_TAB, SDLK_TAB},
|
||||
{ Keyboard::KEY_CLEAR, SDLK_CLEAR},
|
||||
{ Keyboard::KEY_RETURN, SDLK_RETURN},
|
||||
{ Keyboard::KEY_PAUSE, SDLK_PAUSE},
|
||||
{ Keyboard::KEY_ESCAPE, SDLK_ESCAPE },
|
||||
{ Keyboard::KEY_SPACE, SDLK_SPACE },
|
||||
{ Keyboard::KEY_EXCLAIM, SDLK_EXCLAIM },
|
||||
{ Keyboard::KEY_QUOTEDBL, SDLK_QUOTEDBL },
|
||||
{ Keyboard::KEY_HASH, SDLK_HASH },
|
||||
{ Keyboard::KEY_DOLLAR, SDLK_DOLLAR },
|
||||
{ Keyboard::KEY_AMPERSAND, SDLK_AMPERSAND },
|
||||
{ Keyboard::KEY_QUOTE, SDLK_QUOTE },
|
||||
{ Keyboard::KEY_LEFTPAREN, SDLK_LEFTPAREN },
|
||||
{ Keyboard::KEY_RIGHTPAREN, SDLK_RIGHTPAREN },
|
||||
{ Keyboard::KEY_ASTERISK, SDLK_ASTERISK },
|
||||
{ Keyboard::KEY_PLUS, SDLK_PLUS },
|
||||
{ Keyboard::KEY_COMMA, SDLK_COMMA },
|
||||
{ Keyboard::KEY_MINUS, SDLK_MINUS },
|
||||
{ Keyboard::KEY_PERIOD, SDLK_PERIOD },
|
||||
{ Keyboard::KEY_SLASH, SDLK_SLASH },
|
||||
{ Keyboard::KEY_0, SDLK_0 },
|
||||
{ Keyboard::KEY_1, SDLK_1 },
|
||||
{ Keyboard::KEY_2, SDLK_2 },
|
||||
{ Keyboard::KEY_3, SDLK_3 },
|
||||
{ Keyboard::KEY_4, SDLK_4 },
|
||||
{ Keyboard::KEY_5, SDLK_5 },
|
||||
{ Keyboard::KEY_6, SDLK_6 },
|
||||
{ Keyboard::KEY_7, SDLK_7 },
|
||||
{ Keyboard::KEY_8, SDLK_8 },
|
||||
{ Keyboard::KEY_9, SDLK_9 },
|
||||
{ Keyboard::KEY_COLON, SDLK_COLON },
|
||||
{ Keyboard::KEY_SEMICOLON, SDLK_SEMICOLON },
|
||||
{ Keyboard::KEY_LESS, SDLK_LESS },
|
||||
{ Keyboard::KEY_EQUALS, SDLK_EQUALS },
|
||||
{ Keyboard::KEY_GREATER, SDLK_GREATER },
|
||||
{ Keyboard::KEY_QUESTION, SDLK_QUESTION },
|
||||
{ Keyboard::KEY_AT, SDLK_AT },
|
||||
|
||||
{ Keyboard::KEY_LEFTBRACKET, SDLK_LEFTBRACKET },
|
||||
{ Keyboard::KEY_BACKSLASH, SDLK_BACKSLASH },
|
||||
{ Keyboard::KEY_RIGHTBRACKET, SDLK_RIGHTBRACKET },
|
||||
{ Keyboard::KEY_CARET, SDLK_CARET },
|
||||
{ Keyboard::KEY_UNDERSCORE, SDLK_UNDERSCORE },
|
||||
{ Keyboard::KEY_BACKQUOTE, SDLK_BACKQUOTE },
|
||||
{ Keyboard::KEY_A, SDLK_a },
|
||||
{ Keyboard::KEY_B, SDLK_b },
|
||||
{ Keyboard::KEY_C, SDLK_c },
|
||||
{ Keyboard::KEY_D, SDLK_d },
|
||||
{ Keyboard::KEY_E, SDLK_e },
|
||||
{ Keyboard::KEY_F, SDLK_f },
|
||||
{ Keyboard::KEY_G, SDLK_g },
|
||||
{ Keyboard::KEY_H, SDLK_h },
|
||||
{ Keyboard::KEY_I, SDLK_i },
|
||||
{ Keyboard::KEY_J, SDLK_j },
|
||||
{ Keyboard::KEY_K, SDLK_k },
|
||||
{ Keyboard::KEY_L, SDLK_l },
|
||||
{ Keyboard::KEY_M, SDLK_m },
|
||||
{ Keyboard::KEY_N, SDLK_n },
|
||||
{ Keyboard::KEY_O, SDLK_o },
|
||||
{ Keyboard::KEY_P, SDLK_p },
|
||||
{ Keyboard::KEY_Q, SDLK_q },
|
||||
{ Keyboard::KEY_R, SDLK_r },
|
||||
{ Keyboard::KEY_S, SDLK_s },
|
||||
{ Keyboard::KEY_T, SDLK_t },
|
||||
{ Keyboard::KEY_U, SDLK_u },
|
||||
{ Keyboard::KEY_V, SDLK_v },
|
||||
{ Keyboard::KEY_W, SDLK_w },
|
||||
{ Keyboard::KEY_X, SDLK_x },
|
||||
{ Keyboard::KEY_Y, SDLK_y },
|
||||
{ Keyboard::KEY_Z, SDLK_z },
|
||||
{ Keyboard::KEY_DELETE, SDLK_DELETE },
|
||||
|
||||
{ Keyboard::KEY_KP0, SDLK_KP0 },
|
||||
{ Keyboard::KEY_KP1, SDLK_KP1 },
|
||||
{ Keyboard::KEY_KP2, SDLK_KP2 },
|
||||
{ Keyboard::KEY_KP3, SDLK_KP3 },
|
||||
{ Keyboard::KEY_KP4, SDLK_KP4 },
|
||||
{ Keyboard::KEY_KP5, SDLK_KP5 },
|
||||
{ Keyboard::KEY_KP6, SDLK_KP6 },
|
||||
{ Keyboard::KEY_KP7, SDLK_KP7 },
|
||||
{ Keyboard::KEY_KP8, SDLK_KP8 },
|
||||
{ Keyboard::KEY_KP9, SDLK_KP9 },
|
||||
{ Keyboard::KEY_KP_PERIOD, SDLK_KP_PERIOD },
|
||||
{ Keyboard::KEY_KP_DIVIDE, SDLK_KP_DIVIDE },
|
||||
{ Keyboard::KEY_KP_MULTIPLY, SDLK_KP_MULTIPLY},
|
||||
{ Keyboard::KEY_KP_MINUS, SDLK_KP_MINUS },
|
||||
{ Keyboard::KEY_KP_PLUS, SDLK_KP_PLUS },
|
||||
{ Keyboard::KEY_KP_ENTER, SDLK_KP_ENTER },
|
||||
{ Keyboard::KEY_KP_EQUALS, SDLK_KP_EQUALS },
|
||||
|
||||
{ Keyboard::KEY_UP, SDLK_UP },
|
||||
{ Keyboard::KEY_DOWN, SDLK_DOWN },
|
||||
{ Keyboard::KEY_RIGHT, SDLK_RIGHT },
|
||||
{ Keyboard::KEY_LEFT, SDLK_LEFT },
|
||||
{ Keyboard::KEY_INSERT, SDLK_INSERT },
|
||||
{ Keyboard::KEY_HOME, SDLK_HOME },
|
||||
{ Keyboard::KEY_END, SDLK_END },
|
||||
{ Keyboard::KEY_PAGEUP, SDLK_PAGEUP },
|
||||
{ Keyboard::KEY_PAGEDOWN, SDLK_PAGEDOWN },
|
||||
|
||||
{ Keyboard::KEY_F1, SDLK_F1 },
|
||||
{ Keyboard::KEY_F2, SDLK_F2 },
|
||||
{ Keyboard::KEY_F3, SDLK_F3 },
|
||||
{ Keyboard::KEY_F4, SDLK_F4 },
|
||||
{ Keyboard::KEY_F5, SDLK_F5 },
|
||||
{ Keyboard::KEY_F6, SDLK_F6 },
|
||||
{ Keyboard::KEY_F7, SDLK_F7 },
|
||||
{ Keyboard::KEY_F8, SDLK_F8 },
|
||||
{ Keyboard::KEY_F9, SDLK_F9 },
|
||||
{ Keyboard::KEY_F10, SDLK_F10 },
|
||||
{ Keyboard::KEY_F11, SDLK_F11 },
|
||||
{ Keyboard::KEY_F12, SDLK_F12 },
|
||||
{ Keyboard::KEY_F13, SDLK_F13 },
|
||||
{ Keyboard::KEY_F14, SDLK_F14 },
|
||||
{ Keyboard::KEY_F15, SDLK_F15 },
|
||||
|
||||
{ Keyboard::KEY_NUMLOCK, SDLK_NUMLOCK },
|
||||
{ Keyboard::KEY_CAPSLOCK, SDLK_CAPSLOCK },
|
||||
{ Keyboard::KEY_SCROLLOCK, SDLK_SCROLLOCK },
|
||||
{ Keyboard::KEY_RSHIFT, SDLK_RSHIFT },
|
||||
{ Keyboard::KEY_LSHIFT, SDLK_LSHIFT },
|
||||
{ Keyboard::KEY_RCTRL, SDLK_RCTRL },
|
||||
{ Keyboard::KEY_LCTRL, SDLK_LCTRL },
|
||||
{ Keyboard::KEY_RALT, SDLK_RALT },
|
||||
{ Keyboard::KEY_LALT, SDLK_LALT },
|
||||
{ Keyboard::KEY_RMETA, SDLK_RMETA },
|
||||
{ Keyboard::KEY_LMETA, SDLK_LMETA },
|
||||
{ Keyboard::KEY_LSUPER, SDLK_LSUPER },
|
||||
{ Keyboard::KEY_RSUPER, SDLK_RSUPER },
|
||||
{ Keyboard::KEY_MODE, SDLK_MODE },
|
||||
{ Keyboard::KEY_COMPOSE, SDLK_COMPOSE },
|
||||
|
||||
{ Keyboard::KEY_HELP, SDLK_HELP },
|
||||
{ Keyboard::KEY_PRINT, SDLK_PRINT },
|
||||
{ Keyboard::KEY_SYSREQ, SDLK_SYSREQ },
|
||||
{ Keyboard::KEY_BREAK, SDLK_BREAK },
|
||||
{ Keyboard::KEY_MENU, SDLK_MENU },
|
||||
{ Keyboard::KEY_POWER, SDLK_POWER },
|
||||
{ Keyboard::KEY_EURO, SDLK_EURO },
|
||||
{ Keyboard::KEY_UNDO, SDLK_UNDO },
|
||||
};
|
||||
|
||||
EnumMap<Keyboard::Key, SDLKey, Keyboard::KEY_MAX_ENUM> Keyboard::keys(Keyboard::keyEntries, sizeof(Keyboard::keyEntries));
|
||||
|
||||
std::map<Keyboard::Key, SDL_Keycode> Keyboard::keys = Keyboard::createKeyMap();
|
||||
|
||||
} // sdl
|
||||
} // keyboard
|
||||
|
||||
@@ -28,6 +28,9 @@
|
||||
// SDL
|
||||
#include <SDL.h>
|
||||
|
||||
// STL
|
||||
#include <map>
|
||||
|
||||
namespace love
|
||||
{
|
||||
namespace keyboard
|
||||
@@ -42,14 +45,11 @@ public:
|
||||
// Implements Module.
|
||||
const char *getName() const;
|
||||
bool isDown(Key *keylist) const;
|
||||
void setKeyRepeat(int delay, int interval) const;
|
||||
int getKeyRepeatDelay() const;
|
||||
int getKeyRepeatInterval() const;
|
||||
|
||||
private:
|
||||
|
||||
static EnumMap<Key, SDLKey, Keyboard::KEY_MAX_ENUM>::Entry keyEntries[];
|
||||
static EnumMap<Key, SDLKey, Keyboard::KEY_MAX_ENUM> keys;
|
||||
static std::map<Key, SDL_Keycode> createKeyMap();
|
||||
static std::map<Key, SDL_Keycode> keys;
|
||||
|
||||
}; // Keyboard
|
||||
|
||||
|
||||
@@ -50,34 +50,10 @@ int w_isDown(lua_State *L)
|
||||
return 1;
|
||||
}
|
||||
|
||||
int w_setKeyRepeat(lua_State *L)
|
||||
{
|
||||
if (lua_gettop(L) == 0)
|
||||
{
|
||||
// Disables key repeat.
|
||||
instance->setKeyRepeat(0, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int delay = lua_isnumber(L, 1) ? (int)(lua_tonumber(L, 1) * 1000 + 0.5) : Keyboard::DEFAULT;
|
||||
int interval = lua_isnumber(L, 2) ? (int)(lua_tonumber(L, 2) * 1000 + 0.5) : Keyboard::DEFAULT;
|
||||
instance->setKeyRepeat(delay, interval);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int w_getKeyRepeat(lua_State *L)
|
||||
{
|
||||
lua_pushnumber(L, (lua_Number) instance->getKeyRepeatDelay() * 0.001);
|
||||
lua_pushnumber(L, (lua_Number) instance->getKeyRepeatInterval() * 0.001);
|
||||
return 2;
|
||||
}
|
||||
|
||||
// List of functions to wrap.
|
||||
static const luaL_Reg functions[] =
|
||||
{
|
||||
{ "isDown", w_isDown },
|
||||
{ "setKeyRepeat", w_setKeyRepeat },
|
||||
{ "getKeyRepeat", w_getKeyRepeat },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@@ -30,8 +30,6 @@ namespace keyboard
|
||||
{
|
||||
|
||||
int w_isDown(lua_State *L);
|
||||
int w_setKeyRepeat(lua_State *L);
|
||||
int w_getKeyRepeat(lua_State *L);
|
||||
extern "C" LOVE_EXPORT int luaopen_love_keyboard(lua_State *L);
|
||||
|
||||
} // keyboard
|
||||
|
||||
Reference in New Issue
Block a user