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
2013-08-25 16:51:42 -03:00
parent 035130533b
commit 113ed1cfe7
67 changed files with 4691 additions and 1665 deletions
+6 -4
View File
@@ -24,10 +24,6 @@ namespace love
{
namespace thread
{
const char *ThreadModule::getName() const
{
return "love.thread.sdl";
}
LuaThread *ThreadModule::newThread(const std::string &name, love::Data *data)
{
@@ -44,5 +40,11 @@ Channel *ThreadModule::getChannel(const std::string &name)
{
return Channel::getChannel(name);
}
const char *ThreadModule::getName() const
{
return "love.thread.sdl";
}
} // thread
} // love
+17 -11
View File
@@ -25,12 +25,14 @@
#include <string>
// LOVE
#include <common/Data.h>
#include <common/Module.h>
#include <thread/Thread.h>
#include <thread/Channel.h>
#include <thread/LuaThread.h>
#include <thread/threads.h>
#include "common/Data.h"
#include "common/Module.h"
#include "common/StringMap.h"
#include "Thread.h"
#include "Channel.h"
#include "LuaThread.h"
#include "threads.h"
namespace love
{
@@ -39,13 +41,17 @@ namespace thread
class ThreadModule : public love::Module
{
public:
virtual ~ThreadModule() {}
LuaThread *newThread(const std::string &name, love::Data *data);
Channel *newChannel();
Channel *getChannel(const std::string &name);
const char *getName() const;
virtual ~ThreadModule() {}
virtual LuaThread *newThread(const std::string &name, love::Data *data);
virtual Channel *newChannel();
virtual Channel *getChannel(const std::string &name);
// Implements Module.
virtual const char *getName() const;
}; // ThreadModule
} // thread
} // love
+1 -1
View File
@@ -51,7 +51,7 @@ bool Thread::start()
return false;
if (thread) // Clean old handle up
SDL_WaitThread(thread, 0);
thread = SDL_CreateThread(thread_runner, this);
thread = SDL_CreateThread(thread_runner, NULL, this);
running = (thread != 0);
return running;
}
+2 -2
View File
@@ -39,12 +39,12 @@ Mutex::~Mutex()
void Mutex::lock()
{
SDL_mutexP(mutex);
SDL_LockMutex(mutex);
}
void Mutex::unlock()
{
SDL_mutexV(mutex);
SDL_UnlockMutex(mutex);
}
Conditional::Conditional()
+10 -5
View File
@@ -18,16 +18,20 @@
* 3. This notice may not be removed or altered from any source distribution.
**/
// LOVE
#include "wrap_ThreadModule.h"
#include "wrap_LuaThread.h"
#include "wrap_Channel.h"
#include <filesystem/File.h>
#include <filesystem/FileData.h>
#include "ThreadModule.h"
#include "filesystem/File.h"
#include "filesystem/FileData.h"
namespace love
{
namespace thread
{
static ThreadModule *instance = 0;
int w_newThread(lua_State *L)
@@ -89,7 +93,7 @@ extern "C" int luaopen_love_thread(lua_State *L)
{
try
{
instance = new ThreadModule();
instance = new love::thread::ThreadModule();
}
catch (Exception & e)
{
@@ -108,5 +112,6 @@ extern "C" int luaopen_love_thread(lua_State *L)
return luax_register_module(L, w);
}
}
}
} // thread
} // love
+2 -1
View File
@@ -22,7 +22,8 @@
#define LOVE_THREAD_WRAP_THREADMODULE_H
// LOVE
#include "ThreadModule.h"
#include "common/config.h"
#include "common/runtime.h"
namespace love
{