mirror of
https://github.com/love2d/love.git
synced 2026-08-16 08:11:02 +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:
@@ -0,0 +1,91 @@
|
||||
/**
|
||||
* Copyright (c) 2006-2013 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.
|
||||
**/
|
||||
|
||||
// LOVE
|
||||
#include "System.h"
|
||||
|
||||
// SDL
|
||||
#include <SDL_clipboard.h>
|
||||
#include <SDL_cpuinfo.h>
|
||||
|
||||
namespace love
|
||||
{
|
||||
namespace system
|
||||
{
|
||||
namespace sdl
|
||||
{
|
||||
|
||||
System::System()
|
||||
{
|
||||
}
|
||||
|
||||
const char *System::getName() const
|
||||
{
|
||||
return "love.system.sdl";
|
||||
}
|
||||
|
||||
int System::getProcessorCount() const
|
||||
{
|
||||
return SDL_GetCPUCount();
|
||||
}
|
||||
|
||||
void System::setClipboardText(const std::string &text) const
|
||||
{
|
||||
SDL_SetClipboardText(text.c_str());
|
||||
}
|
||||
|
||||
std::string System::getClipboardText() const
|
||||
{
|
||||
std::string text("");
|
||||
|
||||
char *ctext = SDL_GetClipboardText();
|
||||
if (ctext)
|
||||
{
|
||||
text = std::string(ctext);
|
||||
SDL_free(ctext);
|
||||
}
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
love::system::System::PowerState System::getPowerInfo(int &seconds, int &percent) const
|
||||
{
|
||||
SDL_PowerState sdlstate = SDL_GetPowerInfo(&seconds, &percent);
|
||||
|
||||
PowerState state = POWER_UNKNOWN;
|
||||
powerStates.find(sdlstate, state);
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
EnumMap<System::PowerState, SDL_PowerState, System::POWER_MAX_ENUM>::Entry System::powerEntries[] =
|
||||
{
|
||||
{System::POWER_UNKNOWN, SDL_POWERSTATE_UNKNOWN},
|
||||
{System::POWER_BATTERY, SDL_POWERSTATE_ON_BATTERY},
|
||||
{System::POWER_NO_BATTERY, SDL_POWERSTATE_NO_BATTERY},
|
||||
{System::POWER_CHARGING, SDL_POWERSTATE_CHARGING},
|
||||
{System::POWER_CHARGED, SDL_POWERSTATE_CHARGED},
|
||||
};
|
||||
|
||||
EnumMap<System::PowerState, SDL_PowerState, System::POWER_MAX_ENUM> System::powerStates(System::powerEntries, sizeof(System::powerEntries));
|
||||
|
||||
} // sdl
|
||||
} // system
|
||||
} // love
|
||||
@@ -0,0 +1,66 @@
|
||||
/**
|
||||
* Copyright (c) 2006-2013 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_SYSTEM_SDL_SYSTEM_H
|
||||
#define LOVE_SYSTEM_SDL_SYSTEM_H
|
||||
|
||||
// LOVE
|
||||
#include "system/System.h"
|
||||
#include "common/EnumMap.h"
|
||||
|
||||
// SDL
|
||||
#include <SDL_power.h>
|
||||
|
||||
namespace love
|
||||
{
|
||||
namespace system
|
||||
{
|
||||
namespace sdl
|
||||
{
|
||||
|
||||
class System : public love::system::System
|
||||
{
|
||||
public:
|
||||
|
||||
System();
|
||||
virtual ~System() {}
|
||||
|
||||
// Implements Module.
|
||||
const char *getName() const;
|
||||
|
||||
int getProcessorCount() const;
|
||||
|
||||
void setClipboardText(const std::string &text) const;
|
||||
std::string getClipboardText() const;
|
||||
|
||||
PowerState getPowerInfo(int &seconds, int &percent) const;
|
||||
|
||||
private:
|
||||
|
||||
static EnumMap<PowerState, SDL_PowerState, POWER_MAX_ENUM>::Entry powerEntries[];
|
||||
static EnumMap<PowerState, SDL_PowerState, POWER_MAX_ENUM> powerStates;
|
||||
|
||||
}; // System
|
||||
|
||||
} // sdl
|
||||
} // system
|
||||
} // love
|
||||
|
||||
#endif // LOVE_SYSTEM_SDL_SYSTEM_H
|
||||
Reference in New Issue
Block a user