LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Abstractify some modules completely: timer, keyboard and mouse.

Browse Source 
If this commit breaks some project file(s), well ...
I AM RUDE AND I WILL BREAK EVERYTHING, AHAHAHAHAHAHAHHAHAHAHAHA!
This commit is contained in:
rude
2011-10-28 10:47:16 +02:00
parent cd66b01da3
commit 2753c62985
18 changed files with 239 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/keyboard/sdl/Keyboard.cpp
+2
View File
@@ -18,6 +18,8 @@
* 3. This notice may not be removed or altered from any source distribution.
**/
#include <common/config.h>
#include "Keyboard.h"
namespace love
src/modules/keyboard/sdl/Keyboard.h
-22
View File
@@ -40,31 +40,9 @@ namespace sdl
// Implements Module.
const char * getName() const;
/**
* Checks whether a certain key is down or not.
* @param key A key identifier.
* @return boolean
**/
bool isDown(Key * keylist) const;
/**
* 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)
**/
void setKeyRepeat(int delay, int interval) const;
/**
* Gets the specified delay for the key repeat.
* @return int
**/
int getKeyRepeatDelay() const;
/**
* Gets the specified interval for the key repeat.
* @return int
**/
int getKeyRepeatInterval() const;
private:
src/modules/keyboard/sdl/wrap_Keyboard.cpp
-106
View File
@@ -1,106 +0,0 @@
/**
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#include "wrap_Keyboard.h"
namespace love
{
namespace keyboard
{
namespace sdl
{
static Keyboard * instance;
int w_isDown(lua_State * L)
{
Keyboard::Key k;
unsigned int num = lua_gettop(L);
Keyboard::Key * keylist = new Keyboard::Key[num+1];
unsigned int counter = 0;
for (unsigned int i = 0; i < num; i++)
{
if(Keyboard::getConstant(luaL_checkstring(L, i+1), k))
keylist[counter++] = k;
}
keylist[counter] = Keyboard::KEY_MAX_ENUM;
luax_pushboolean(L, instance->isDown(keylist));
delete[] keylist;
return 1;
}
int w_setKeyRepeat(lua_State * L)
{
if(lua_gettop(L) == 0)
{
// Disables key repeat.
instance->setKeyRepeat(0, 0);
return 0;
}
instance->setKeyRepeat(luaL_optint(L, 1, Keyboard::DEFAULT), luaL_optint(L, 2, Keyboard::DEFAULT));
return 0;
}
int w_getKeyRepeat(lua_State * L)
{
lua_pushnumber(L, instance->getKeyRepeatDelay());
lua_pushnumber(L, instance->getKeyRepeatInterval());
return 2;
}
// List of functions to wrap.
static const luaL_Reg functions[] = {
{ "isDown", w_isDown },
{ "setKeyRepeat", w_setKeyRepeat },
{ "getKeyRepeat", w_getKeyRepeat },
{ 0, 0 }
};
int luaopen_love_keyboard(lua_State * L)
{
if(instance == 0)
{
try
{
instance = new Keyboard();
}
catch(Exception & e)
{
return luaL_error(L, e.what());
}
}
else
instance->retain();
WrappedModule w;
w.module = instance;
w.name = "keyboard";
w.flags = MODULE_T;
w.functions = functions;
w.types = 0;
return luax_register_module(L, w);
}
} // sdl
} // keyboard
} // love
src/modules/keyboard/sdl/wrap_Keyboard.h
-46
View File
@@ -1,46 +0,0 @@
/**
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#ifndef LOVE_KEYBOARD_SDL_WRAP_KEYBOARD_H
#define LOVE_KEYBOARD_SDL_WRAP_KEYBOARD_H
// LOVE
#include <common/config.h>
#include "Keyboard.h"
// SDL
#include <SDL.h>
namespace love
{
namespace keyboard
{
namespace sdl
{
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);
} // sdl
} // keyboard
} // love
#endif // LOVE_KEYBOARD_SDL_WRAP_KEYBOARD_H