[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31289] branches/soc-2010-merwin/intern/ ghost/intern: Minor cleanup of Windows tablet code.

[Mike Erwin]

Revision: 31289
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31289
Author:   merwin
Date:     2010-08-12 16:02:38 +0200 (Thu, 12 Aug 2010)

Log Message:
-----------
Minor cleanup of Windows tablet code.

Modified Paths:
--------------
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.cpp
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.h

Modified: branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-08-12 13:58:10 UTC (rev 31288)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-08-12 14:02:38 UTC (rev 31289)
@@ -932,22 +932,17 @@
 		// Tablet events, processed
 		////////////////////////////////////////////////////////////////////////
 		case WT_PACKET:
-			// puts("WT_PACKET");
-			// window->processWin32TabletEvent(wParam, lParam);
 			m_tabletManager->processPackets((HCTX)lParam);
 			break;
 		case WT_CSRCHANGE:
 			m_tabletManager->changeTool((HCTX)lParam, wParam);
 			break;
 		case WT_PROXIMITY:
-			// description was weird.. give me numbers!
-			// printf("prox: %d %d\n", LOWORD(lParam), HIWORD(lParam));
 			if (LOWORD(lParam) == 0)
 				{
 				puts("-- dropping tool --");
 				m_tabletManager->dropTool();
 				}
-			// window->processWin32TabletInitEvent();
 			break;
 
 		////////////////////////////////////////////////////////////////////////

Modified: branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.cpp
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.cpp	2010-08-12 13:58:10 UTC (rev 31288)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.cpp	2010-08-12 14:02:38 UTC (rev 31289)
@@ -1,3 +1,6 @@
+// safe & friendly WinTab wrapper
+// by Mike Erwin, July 2010
+
 #include "GHOST_TabletManagerWin32.h"
 #include "GHOST_WindowWin32.h"
 #include <stdio.h>
@@ -73,8 +76,6 @@
 			// cheat by using available data from Intuos4. test on other tablets!!!
 			azimuthScale = 1.f / HIWORD(tiltRange[1].axResolution);
 			altitudeScale = 1.f / tiltRange[1].axMax;
-			printf("azi scale %f\n", azimuthScale);
-			printf("alt scale %f\n", altitudeScale);
 
 			// leave this code in place to help support tablets I haven't tested
 			const char* axisName[] = {"azimuth","altitude","twist"};
@@ -101,8 +102,8 @@
 		UINT tag = 0;
 		UINT extensionCount;
 		func_Info(WTI_INTERFACE, IFC_NEXTENSIONS, &extensionCount);
+		for (UINT i = 0; i < extensionCount; ++i)
 //		for (UINT i = 0; func_Info(WTI_EXTENSIONS + i, EXT_TAG, &tag); ++i)
-		for (UINT i = 0; i < extensionCount; ++i)
 			{
 			printf("trying extension %d\n", i);
 			func_Info(WTI_EXTENSIONS + i, EXT_TAG, &tag);
@@ -299,6 +300,8 @@
 			}
 
 		putchar('\n');
+
+		// at this point, construct a GHOST event and push it into the queue!
 		}
 	}
 
@@ -312,7 +315,7 @@
 	func_Packet(context, serialNumber, &packet);
 	UINT cursor = (packet.pkCursor - cursorBase) % cursorCount;
 
-	printf("%d mod %d = %d\n", packet.pkCursor - cursorBase, cursorCount, cursor);
+	// printf("%d mod %d = %d\n", packet.pkCursor - cursorBase, cursorCount, cursor);
 
 	switch (cursor)
 		{

Modified: branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.h
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.h	2010-08-12 13:58:10 UTC (rev 31288)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_TabletManagerWin32.h	2010-08-12 14:02:38 UTC (rev 31289)
@@ -1,4 +1,4 @@
-// safe & friendly Wintab wrapper
+// safe & friendly WinTab wrapper
 // by Mike Erwin, July 2010
 
 #ifndef GHOST_TABLET_MANAGER_WIN32_H
@@ -96,4 +96,22 @@
 	void dropTool();
 	};
 
+/*
+The tablet manager is driven by the following Windows event processing code:
+
+case WT_PACKET:
+	m_tabletManager->processPackets((HCTX)lParam);
+	break;
+case WT_CSRCHANGE:
+	m_tabletManager->changeTool((HCTX)lParam, wParam);
+	break;
+case WT_PROXIMITY:
+	if (LOWORD(lParam) == 0)
+		{
+		puts("-- dropping tool --");
+		m_tabletManager->dropTool();
+		}
+	break;
+*/
+
 #endif