Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again

svn-id: r26180

7 files changed, 40 insertions, 39 deletions

diff --git a/backends/platform/PalmOS/Src/base_event.cpp b/backends/platform/PalmOS/Src/base_event.cpp
index b46a3c83ec..7da7cd5861 100644
--- a/backends/platform/PalmOS/Src/base_event.cpp
+++ b/backends/platform/PalmOS/Src/base_event.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "be_base.h"
+#include "common/events.h"
 
 #ifdef STDLIB_TRACE_MEMORY
 #	include <stdlib.h>
@@ -119,7 +120,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 						event.kbd.keycode = 275;
 
 					if (event.kbd.keycode) {
-						event.type = EVENT_KEYDOWN;
+						event.type = Common::EVENT_KEYDOWN;
 						event.kbd.ascii = event.kbd.keycode;
 						event.kbd.flags = 0;
 						return true;
@@ -141,7 +142,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 
 					if (sx || sy) {
 						simulate_mouse(event, sx, sy, &x, &y);
-						event.type = EVENT_MOUSEMOVE;
+						event.type = Common::EVENT_MOUSEMOVE;
 						event.mouse.x = x;
 						event.mouse.y = y;
 						warpMouse(x, y);
@@ -156,7 +157,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 			switch (ev.data.keyDown.chr) {
 			// ESC key
 			case vchrLaunch:
-				event.type = EVENT_KEYDOWN;
+				event.type = Common::EVENT_KEYDOWN;
 				event.kbd.keycode = 27;
 				event.kbd.ascii = 27;
 				event.kbd.flags = 0;
@@ -164,7 +165,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 
 			// F5 = menu
 			case vchrMenu:
-				event.type = EVENT_KEYDOWN;
+				event.type = Common::EVENT_KEYDOWN;
 				event.kbd.keycode = 319;
 				event.kbd.ascii = 319;
 				event.kbd.flags = 0;
@@ -206,7 +207,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 			if (abs(y - event.mouse.y) <= 2 || abs(x - event.mouse.x) <= 2)
 				return false;
 
-			event.type = EVENT_MOUSEMOVE;
+			event.type = Common::EVENT_MOUSEMOVE;
 			event.mouse.x = x;
 			event.mouse.y = y;
 			warpMouse(x, y);
@@ -222,7 +223,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 						(3 - (3 * x / _screenWidth )) -
 						(3 * (3 * y / _screenHeight));
 			
-				event.type = EVENT_KEYDOWN;
+				event.type = Common::EVENT_KEYDOWN;
 				event.kbd.keycode = num;
 				event.kbd.ascii = num;
 				event.kbd.flags = 0;
@@ -234,7 +235,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
 				return false;
 
-			event.type = ((gVars->stylusClick || _overlayVisible) ? EVENT_LBUTTONDOWN : EVENT_MOUSEMOVE);
+			event.type = ((gVars->stylusClick || _overlayVisible) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_MOUSEMOVE);
 			event.mouse.x = x;
 			event.mouse.y = y;
 			warpMouse(x, y);
@@ -243,7 +244,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 		case penUpEvent:
 			get_coordinates(&ev, x, y);
 
-			event.type = ((gVars->stylusClick || _overlayVisible) ? EVENT_LBUTTONUP : EVENT_MOUSEMOVE);
+			event.type = ((gVars->stylusClick || _overlayVisible) ? Common::EVENT_LBUTTONUP : Common::EVENT_MOUSEMOVE);
 			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
 				return false;
 
@@ -272,15 +273,15 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 
 			if (_lastKeyModifier == kModifierNone) {
 				// for keyboard mode
-				if (ev.data.keyDown.modifiers & shiftKeyMask)	mask |= KBD_SHIFT;
-				if (ev.data.keyDown.modifiers & controlKeyMask)	mask |= KBD_CTRL;
-				if (ev.data.keyDown.modifiers & optionKeyMask)	mask |= KBD_ALT;
-				if (ev.data.keyDown.modifiers & commandKeyMask) mask |= KBD_CTRL|KBD_ALT;
+				if (ev.data.keyDown.modifiers & shiftKeyMask)	mask |= Common::KBD_SHIFT;
+				if (ev.data.keyDown.modifiers & controlKeyMask)	mask |= Common::KBD_CTRL;
+				if (ev.data.keyDown.modifiers & optionKeyMask)	mask |= Common::KBD_ALT;
+				if (ev.data.keyDown.modifiers & commandKeyMask) mask |= Common::KBD_CTRL|Common::KBD_ALT;
 			} else {
 				// for grafiti mode
-				if (_lastKeyModifier == kModifierCommand)	mask = KBD_CTRL|KBD_ALT;
-				if (_lastKeyModifier == kModifierAlt)		mask = KBD_ALT;
-				if (_lastKeyModifier == kModifierCtrl)		mask = KBD_CTRL;
+				if (_lastKeyModifier == kModifierCommand)	mask = Common::KBD_CTRL|Common::KBD_ALT;
+				if (_lastKeyModifier == kModifierAlt)		mask = Common::KBD_ALT;
+				if (_lastKeyModifier == kModifierCtrl)		mask = Common::KBD_CTRL;
 			}
 
 			if (_lastKeyModifier)
@@ -288,22 +289,22 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 			_lastKeyModifier = kModifierNone;
 
 			// F1 -> F10 key
-			if  (key >= '0' && key <= '9' && mask == (KBD_CTRL|KBD_ALT)) {
+			if  (key >= '0' && key <= '9' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
 				key = (key == '0') ? 324 : (315 + key - '1');
 				mask = 0;
 
 #ifdef STDLIB_TRACE_MEMORY
 			// print memory
-			} else if  (key == 'm' && mask == (KBD_CTRL|KBD_ALT)) {
+			} else if  (key == 'm' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
 				printf("Used memory: %d\n", __stdlib_trace_memory);
 #endif
 			// exit
-			} else if  ((key == 'z' && mask == KBD_CTRL) || (mask == KBD_ALT && key == 'x')) {
-				event.type = EVENT_QUIT;
+			} else if  ((key == 'z' && mask == Common::KBD_CTRL) || (mask == Common::KBD_ALT && key == 'x')) {
+				event.type = Common::EVENT_QUIT;
 				return true;
 			
 			// num pad (indy fight mode)
-			} else if (key == 'n' && mask == (KBD_CTRL|KBD_ALT) && !_overlayVisible) {
+			} else if (key == 'n' && mask == (Common::KBD_CTRL|Common::KBD_ALT) && !_overlayVisible) {
 				_useNumPad = !_useNumPad;
 				draw_osd(kDrawFight, _screenDest.w - 34, _screenDest.h + 2, _useNumPad, 1);
 				displayMessageOnOSD(_useNumPad ? "Fight mode on." : "Fight mode off.");
@@ -312,7 +313,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 			
 			// other keys
 			_wasKey = true;
-			event.type = EVENT_KEYDOWN;
+			event.type = Common::EVENT_KEYDOWN;
 			event.kbd.keycode = key;
 			event.kbd.ascii = key;
 			event.kbd.flags = mask;
@@ -320,7 +321,7 @@ bool OSystem_PalmBase::pollEvent(Event &event) {
 
 		default:
 			if (_wasKey) {
-				event.type = EVENT_KEYUP;
+				event.type = Common::EVENT_KEYUP;
 				_wasKey = false;
 				return true;
 			}
diff --git a/backends/platform/PalmOS/Src/base_mouse.cpp b/backends/platform/PalmOS/Src/base_mouse.cpp
index 8e6d2724cb..2f3d3f5476 100644
--- a/backends/platform/PalmOS/Src/base_mouse.cpp
+++ b/backends/platform/PalmOS/Src/base_mouse.cpp
@@ -42,7 +42,7 @@ bool OSystem_PalmBase::showMouse(bool visible) {
 	return last;
 }
 
-void OSystem_PalmBase::simulate_mouse(Event &event, Int8 iHoriz, Int8 iVert, Coord *xr, Coord *yr) {
+void OSystem_PalmBase::simulate_mouse(Common::Event &event, Int8 iHoriz, Int8 iVert, Coord *xr, Coord *yr) {
 	Int16 x = _mouseCurState.x;
 	Int16 y = _mouseCurState.y;
 	Int16 slow, fact;
diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h
index 1418d69b6c..cd4c38980e 100644
--- a/backends/platform/PalmOS/Src/be_base.h
+++ b/backends/platform/PalmOS/Src/be_base.h
@@ -95,12 +95,12 @@ private:
 	virtual void undraw_mouse() = 0;
 	
 //	virtual bool check_hard_keys() = 0;
-	virtual bool check_event(Event &event, EventPtr ev) = 0;
+	virtual bool check_event(Common::Event &event, EventPtr ev) = 0;
 	
 	virtual void timer_handler();
 	void battery_handler();
 	virtual void get_coordinates(EventPtr ev, Coord &x, Coord &y) = 0;
-	void simulate_mouse(Event &event, Int8 iHoriz, Int8 iVert, Coord *xr, Coord *yr);
+	void simulate_mouse(Common::Event &event, Int8 iHoriz, Int8 iVert, Coord *xr, Coord *yr);
 
 	virtual void sound_handler() = 0;
 	virtual bool setSoundCallback(SoundProc proc, void *param) = 0;
@@ -229,7 +229,7 @@ public:
 	virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b) = 0;
 	virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) = 0;
 	
-	bool pollEvent(Event &event);
+	bool pollEvent(Common::Event &event);
 	
 	virtual uint32 getMillis();
 	virtual void delayMillis(uint msecs);
diff --git a/backends/platform/PalmOS/Src/be_os5.h b/backends/platform/PalmOS/Src/be_os5.h
index fdcd70f254..e6c4227e71 100644
--- a/backends/platform/PalmOS/Src/be_os5.h
+++ b/backends/platform/PalmOS/Src/be_os5.h
@@ -123,7 +123,7 @@ private:
 
 	void draw_mouse();
 	void undraw_mouse();
-	virtual bool check_event(Event &event, EventPtr ev);
+	virtual bool check_event(Common::Event &event, EventPtr ev);
 	virtual void extras_palette(uint8 index, uint8 r, uint8 g, uint8 b);
 	void calc_scale();
 
diff --git a/backends/platform/PalmOS/Src/be_zodiac.h b/backends/platform/PalmOS/Src/be_zodiac.h
index d641a51ef1..1d28afa493 100644
--- a/backends/platform/PalmOS/Src/be_zodiac.h
+++ b/backends/platform/PalmOS/Src/be_zodiac.h
@@ -55,7 +55,7 @@ private:
 
 	void extras_palette(uint8 index, uint8 r, uint8 g, uint8 b);
 	void calc_rect(Boolean fullscreen);
-	bool check_event(Event &event, EventPtr ev);
+	bool check_event(Common::Event &event, EventPtr ev);
 	void draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color = 0);
 
 public:
diff --git a/backends/platform/PalmOS/Src/os5_event.cpp b/backends/platform/PalmOS/Src/os5_event.cpp
index 1e1c8c393e..8af2a717a7 100644
--- a/backends/platform/PalmOS/Src/os5_event.cpp
+++ b/backends/platform/PalmOS/Src/os5_event.cpp
@@ -41,13 +41,13 @@ bool OSystem_PalmOS5::check_event(Event &event, EventPtr ev) {
 	if (ev->eType == keyUpEvent) {
 		switch (ev->data.keyDown.chr) {
 		case vchrHard3:
-			event.type = EVENT_LBUTTONUP;
+			event.type = Common::EVENT_LBUTTONUP;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
 
 		case vchrHard4:
-			event.type = EVENT_RBUTTONUP;
+			event.type = Common::EVENT_RBUTTONUP;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
@@ -70,13 +70,13 @@ bool OSystem_PalmOS5::check_event(Event &event, EventPtr ev) {
 		return false; // not a key
 
 		case vchrHard3:
-			event.type = EVENT_RBUTTONDOWN;
+			event.type = Common::EVENT_RBUTTONDOWN;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
 
 		case vchrHard4:
-			event.type = EVENT_RBUTTONDOWN;
+			event.type = Common::EVENT_RBUTTONDOWN;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
diff --git a/backends/platform/PalmOS/Src/zodiac_event.cpp b/backends/platform/PalmOS/Src/zodiac_event.cpp
index fd664ae940..a0e62bda43 100644
--- a/backends/platform/PalmOS/Src/zodiac_event.cpp
+++ b/backends/platform/PalmOS/Src/zodiac_event.cpp
@@ -24,17 +24,17 @@
 
 #include "be_zodiac.h"
 
-bool OSystem_PalmZodiac::check_event(Event &event, EventPtr ev) {
+bool OSystem_PalmZodiac::check_event(Common::Event &event, EventPtr ev) {
 	if (ev->eType == keyUpEvent) {
 		switch (ev->data.keyDown.chr) {
 		case vchrActionLeft:
-			event.type = EVENT_LBUTTONUP;
+			event.type = Common::EVENT_LBUTTONUP;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
 
 		case vchrActionRight:
-			event.type = EVENT_RBUTTONUP;
+			event.type = Common::EVENT_RBUTTONUP;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
@@ -44,7 +44,7 @@ bool OSystem_PalmZodiac::check_event(Event &event, EventPtr ev) {
 		switch (ev->data.keyDown.chr) {
 		// F5 = menu
 		case vchrThumbWheelBack:
-			event.type = EVENT_KEYDOWN;
+			event.type = Common::EVENT_KEYDOWN;
 			event.kbd.keycode = 319;
 			event.kbd.ascii = 319;
 			event.kbd.flags = 0;
@@ -59,20 +59,20 @@ bool OSystem_PalmZodiac::check_event(Event &event, EventPtr ev) {
 			return false; // not a key
 
 		case vchrActionLeft:
-			event.type = EVENT_LBUTTONDOWN;
+			event.type = Common::EVENT_LBUTTONDOWN;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
 
 		case vchrActionRight:
-			event.type = EVENT_RBUTTONDOWN;
+			event.type = Common::EVENT_RBUTTONDOWN;
 			event.mouse.x = _mouseCurState.x;
 			event.mouse.y = _mouseCurState.y;
 			return true;
 
 		// skip text
 		case vchrActionDown:
-			event.type = EVENT_KEYDOWN;
+			event.type = Common::EVENT_KEYDOWN;
 			event.kbd.keycode = '.';
 			event.kbd.ascii = '.';
 			event.kbd.flags = 0;