Page MenuHomePhabricator (Chris)
Files F126558

No OneTemporary
Actions

Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/events.cpp b/util/events.cpp
index ee10cedc..ba0dd844 100644
--- a/util/events.cpp
+++ b/util/events.cpp
@@ -1,147 +1,159 @@
#ifdef USE_SDL
#include <SDL.h>
#endif
#include "bitmap.h"
#include "events.h"
#include "exceptions/shutdown_exception.h"
#include "configuration.h"
#include "globals.h"
#include "funcs.h"
#include "thread.h"
#include "input/keyboard.h"
#include "input/input-manager.h"
namespace Util{
EventManager::EventManager():
bufferKeys(false){
}
#ifdef USE_SDL
static void handleKeyDown(Keyboard & keyboard, const SDL_Event & event){
keyboard.press(event.key.keysym.sym, event.key.keysym.unicode);
}
static void handleKeyUp(Keyboard & keyboard, const SDL_Event & event){
keyboard.release(event.key.keysym.sym);
}
-void EventManager::runSDL(Keyboard & keyboard){
+void EventManager::runSDL(Keyboard & keyboard, Joystick * joystick){
keyboard.poll();
SDL_Event event;
while (SDL_PollEvent(&event) == 1){
switch (event.type){
case SDL_QUIT : {
dispatch(CloseWindow);
break;
}
case SDL_KEYDOWN : {
handleKeyDown(keyboard, event);
// dispatch(Key, event.key.keysym.sym);
break;
}
case SDL_KEYUP : {
handleKeyUp(keyboard, event);
break;
}
+ case SDL_JOYBUTTONDOWN: {
+ /* TODO */
+ break;
+ }
+ case SDL_JOYBUTTONUP: {
+ /* TODO */
+ break;
+ }
+ case SDL_JOYAXISMOTION: {
+ /* TODO */
+ break;
+ }
case SDL_VIDEORESIZE : {
int width = event.resize.w;
int height = event.resize.h;
/* to keep the perspective correct
* 640/480 = 1.33333
*/
if (width > height){
height = (int)((double) width / 1.3333333333);
} else {
width = (int)((double) height * 1.3333333333);
}
dispatch(ResizeScreen, width, height);
break;
}
default : {
break;
}
}
}
}
#endif
#ifdef USE_ALLEGRO
-void EventManager::runAllegro(Keyboard & keyboard){
+void EventManager::runAllegro(Keyboard & keyboard, Joystick * joystick){
keyboard.poll();
}
#endif
-void EventManager::run(Keyboard & keyboard){
+void EventManager::run(Keyboard & keyboard, Joystick * joystick){
#ifdef USE_SDL
- runSDL(keyboard);
+ runSDL(keyboard, joystick);
#elif USE_ALLEGRO
- runAllegro(keyboard);
+ runAllegro(keyboard, joystick);
#endif
}
/* kill the program if the user requests */
void EventManager::waitForThread(WaitThread & thread){
// Keyboard dummy;
while (!thread.isRunning()){
try{
/* input manager will run the event manager */
InputManager::poll();
// run(dummy);
} catch (const ShutdownException & death){
thread.kill();
throw death;
}
Util::rest(10);
}
}
EventManager::~EventManager(){
}
void EventManager::enableKeyBuffer(){
bufferKeys = true;
}
void EventManager::disableKeyBuffer(){
bufferKeys = false;
}
void EventManager::dispatch(Event type, int arg1){
switch (type){
case Key : {
if (bufferKeys){
keys.push_back(KeyType(arg1));
}
break;
}
default : {
break;
}
}
}
void EventManager::dispatch(Event type, int arg1, int arg2){
switch (type){
case ResizeScreen : {
Global::debug(1) << "Resizing screen to " << arg1 << ", " << arg2 << std::endl;
if (Bitmap::setGraphicsMode(0, arg1, arg2) == 0){
Configuration::setScreenWidth(arg1);
Configuration::setScreenHeight(arg2);
}
break;
}
default : break;
}
}
void EventManager::dispatch(Event type){
switch (type){
case CloseWindow : {
throw ShutdownException();
}
default : break;
}
}
}
diff --git a/util/events.h b/util/events.h
index 1c266c2e..41cf2d64 100644
--- a/util/events.h
+++ b/util/events.h
@@ -1,65 +1,66 @@
#ifndef _paintown_events_h
#define _paintown_events_h
/* handles global events from the system such as
* window manager events (press X button)
* keyboard/mouse/joystick input (for some backends like SDL)
*/
#include <vector>
#ifdef USE_SDL
#include <SDL.h>
#endif
class Keyboard;
+class Joystick;
namespace Util{
class WaitThread;
class EventManager{
public:
EventManager();
- virtual void run(Keyboard & keyboard);
+ virtual void run(Keyboard & keyboard, Joystick * joystick);
virtual void waitForThread(WaitThread & thread);
virtual ~EventManager();
#ifdef USE_SDL
typedef SDLKey KeyType;
#else
typedef int KeyType;
#endif
inline const std::vector<KeyType> & getBufferedKeys() const {
return keys;
}
void enableKeyBuffer();
void disableKeyBuffer();
private:
enum Event{
CloseWindow,
ResizeScreen,
Key
};
virtual void dispatch(Event type, int arg1, int arg2);
virtual void dispatch(Event type, int arg1);
virtual void dispatch(Event type);
#ifdef USE_SDL
- virtual void runSDL(Keyboard &);
+ virtual void runSDL(Keyboard &, Joystick *);
#endif
#ifdef USE_ALLEGRO
- virtual void runAllegro(Keyboard & keyboard);
+ virtual void runAllegro(Keyboard & keyboard, Joystick *);
#endif
std::vector<KeyType> keys;
bool bufferKeys;
};
}
#endif

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 11:58 AM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
68925
Default Alt Text
(5 KB)

Event Timeline