[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47810] branches/soc-2012-swiss_cheese/ intern/ghost/intern: * adds kEventTouch to GHOST_EventPrinter' s switch statement

[Nicholas Rishel]

Revision: 47810
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47810
Author:   nicholas_rishel
Date:     2012-06-12 23:00:19 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
* adds kEventTouch to GHOST_EventPrinter's switch statement
* mild cleanup

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventTouch.h
    branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemWin32.cpp

Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventPrinter.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventPrinter.cpp	2012-06-12 22:14:55 UTC (rev 47809)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventPrinter.cpp	2012-06-12 23:00:19 UTC (rev 47810)
@@ -95,6 +95,36 @@
 			std::cout << "GHOST_kEventKeyDown, key: " << str;
 		}
 		break;
+
+#ifdef WITH_INPUT_TOUCH
+		case GHOST_kEventTouch:
+		{
+			GHOST_TEventTouchData *touchData = (GHOST_TEventTouchData *)((GHOST_IEvent *)event)->getData();
+			char index[32] = {'\0'};
+			char state[32] = {'\0'};
+			float x = (float)touchData->x / 100;
+			float y = (float)touchData->y / 100;
+
+			sprintf(index, "%u", touchData->index);
+			switch (touchData->state) {
+				case GHOST_kDown:
+					sprintf(state, "%s", "down");
+					break;
+				case GHOST_kMove:
+					sprintf(state, "%s", "move");
+					break;
+				case GHOST_kUp:
+					sprintf(state, "%s", "up");
+					break;
+				default:
+					break;
+			}
+
+			std::cout << "GHOST_kEventTouch, index: " << index << " state: " << state
+			          << " (x,y): (" << x << "," << y << ")";
+		}
+		break;
+#endif // WITH_INPUT_TOUCH
 			
 		case GHOST_kEventDraggingEntered:
 		{

Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventTouch.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventTouch.h	2012-06-12 22:14:55 UTC (rev 47809)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_EventTouch.h	2012-06-12 23:00:19 UTC (rev 47810)
@@ -33,7 +33,7 @@
 
 public:
 	GHOST_EventTouch(GHOST_TUns64 time, GHOST_IWindow *window)
-		: GHOST_Event(time, GHOST_kEventNDOFMotion, window)
+		: GHOST_Event(time, GHOST_kEventTouch, window)
 	{
 		m_data = &m_touchData;
 	}

Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemWin32.cpp	2012-06-12 22:14:55 UTC (rev 47809)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemWin32.cpp	2012-06-12 23:00:19 UTC (rev 47810)
@@ -133,14 +133,10 @@
 
 // Corrects MinGW defines
 #ifdef FREE_WINDOWS
-#	ifdef TOUCHEVENTF_DOWN
-#		undef TOUCHEVENTF_DOWN
-#		define TOUCHEVENTF_DOWN 0x0002
-#	endif // TOUCHEVENTF_DOWN
-#	ifdef TOUCHEVENTF_MOVE
-#		undef TOUCHEVENTF_MOVE
-#		define TOUCHEVENTF_MOVE 0x0001
-#	endif // TOUCHEVENTF_UP
+#	undef TOUCHEVENTF_DOWN
+#	define TOUCHEVENTF_DOWN 0x0002
+#	undef TOUCHEVENTF_MOVE
+#	define TOUCHEVENTF_MOVE 0x0001
 #endif // FREE_WINDOWS
 
 static void initRawInput()