xSDL/xApplication.h

@@ -64,8 +64,8 @@
 			void syncFps();
 
 			// fps management
-			uint32_t _lasttick { 0 };
+			uint32_t _lasttick;
-			uint32_t _fpstime { (int) 1000.0/60 };
+			uint32_t _fpstime;
 
 			// event management
 			xController _controller;
@@ -77,11 +77,11 @@
 			set<xOrchestrable*> _orchestrables;
 
 			// sdl objects
-			SDL_Window   *_window { NULL };
+			SDL_Window   *_window;
-			SDL_Rect      _winrect { 0, 0, 0, 0 };
+			SDL_Rect      _winrect;
 
-			SDL_Renderer *_renderer { NULL };
+			SDL_Renderer *_renderer;
-			SDL_Texture  *_texture { NULL };
+			SDL_Texture  *_texture;
 
 			// thread safety
 			mutex _mutex_draw;

xSDL/xController.cpp

@@ -12,24 +12,29 @@ xController::~xController(){
 void xController::handleEvent(SDL_Event* event){
 	_mutex.lock();
 
-	for( set<xEventHandler*>::iterator it = _handlers.begin() ; it != _handlers.end() ; it++ ){
+	map<SDL_EventType, EventHandler>::iterator found = _handlers.find( (SDL_EventType) event->type );
-		xEventHandler* handler = (*it);
+
-		handler->handle(event);
+	// ignore no handler found
+	if( found == _handlers.end() ){
+		_mutex.unlock();
+		return;
 	}
 
+	(*found->second)(event);
+
 	_mutex.unlock();
 }
 
 // bind a new handler
-void xController::attachEvent(xEventHandler* handler){
+void xController::attachEvent(SDL_EventType t, EventHandlerArg){
 	_mutex.lock();
-	_handlers.insert(handler);
+	_handlers[ t ] = handler;
 	_mutex.unlock();
 }
 
 // removes an existing handler
-void xController::detachEvent(xEventHandler* handler){
+void xController::detachEvent(SDL_EventType t){
 	_mutex.lock();
-	_handlers.erase(handler);
+	_handlers.erase(t);
 	_mutex.unlock();
 }

xSDL/xController.h

@@ -3,11 +3,12 @@
 
 	#include "SDL.h"
 	#include <mutex>
-	#include <set>
+	#include <map>
-	#include "xEventHandler.h"
-
 	using namespace std;
 
+	#define EventHandlerArg void(* handler)(SDL_Event*)
+	#define EventHandler void(*)(SDL_Event*)
+
 	class xController{
 
 		public:
@@ -18,12 +19,12 @@
 			void handleEvent(SDL_Event* event);
 
 			// manage handlers
-			void attachEvent(xEventHandler* handler);
+			void attachEvent(SDL_EventType t, EventHandlerArg);
-			void detachEvent(xEventHandler* handler);
+			void detachEvent(SDL_EventType t);
 
 		private:
 			// event handlers
-			set<xEventHandler*> _handlers;
+			map<SDL_EventType, EventHandler> _handlers;
 
 			// thread safety
 			mutex _mutex;

xSDL/xEventHandler.cpp

@@ -1 +0,0 @@
-#include "xEventHandler.h"

xSDL/xEventHandler.h

@@ -1,16 +0,0 @@
-#ifndef DEF_XEVENT_HANDLER_H
-	#define DEF_XEVENT_HANDLER_H
-
-	#include "SDL.h"
-	using namespace std;
-
-	class xEventHandler {
-
-		public:
-
-			// handles the event
-			virtual void handle(SDL_Event* event) = 0;
-
-	};
-
-#endif