[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34344] branches/merwin-tablet-2: removed some older tablet cruft

[Mike Erwin]

Revision: 34344
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34344
Author:   merwin
Date:     2011-01-16 04:36:18 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
removed some older tablet cruft

Modified Paths:
--------------
    branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.h
    branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_cursors.c
    branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_event_system.c

Modified: branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.cpp	2011-01-16 04:27:32 UTC (rev 34343)
+++ branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.cpp	2011-01-16 04:36:18 UTC (rev 34344)
@@ -430,9 +430,6 @@
 
 	setTitle(title);
 
-	// initXInputDevices();
-	// [mce] register for tablet events here
-
 	// now set up the rendering context.
 	if (installDrawingContext(type) == GHOST_kSuccess) {
 		m_valid_setup = true;

Modified: branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.h
===================================================================
--- branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.h	2011-01-16 04:27:32 UTC (rev 34343)
+++ branches/merwin-tablet-2/intern/ghost/intern/GHOST_WindowX11.h	2011-01-16 04:36:18 UTC (rev 34344)
@@ -188,32 +188,7 @@
 		Window 
 	getXWindow(
 	);	
-/*
-	class XTablet
-	{
-	public:
-		GHOST_TabletData CommonData;
 
-		XDevice* StylusDevice;
-		XDevice* EraserDevice;
-
-		XID StylusID, EraserID;
-
-		int MotionEvent;
-		int ProxInEvent;
-		int ProxOutEvent;
-
-		int PressureLevels;
-		int XtiltLevels, YtiltLevels;
-	};
-
-	XTablet& GetXTablet()
-	{ return m_xtablet; }
-
-	const GHOST_TabletData* GetTabletData()
-	{ return &m_xtablet.CommonData; }
-*/
-
 	/*
 	 * Need this in case that we want start the window
 	 * in FullScree or Maximized state.
@@ -319,8 +294,6 @@
 		Cursor 
 	getEmptyCursor(
 	);
-
-//	void initXInputDevices();
 	
 	GLXContext 	m_context;
 	Window 	m_window;
@@ -349,9 +322,6 @@
 	/** Cache of XC_* ID's to XCursor structures */
 	std::map<unsigned int, Cursor> m_standard_cursors;
 
-	/* Tablet devices */
-//	XTablet m_xtablet;
-
 	void icccmSetState(int state);
 	int icccmGetState() const;
 

Modified: branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
--- branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_cursors.c	2011-01-16 04:27:32 UTC (rev 34343)
+++ branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_cursors.c	2011-01-16 04:36:18 UTC (rev 34344)
@@ -179,7 +179,7 @@
 	else if(wrap)	mode = GHOST_kGrabWrap;
 	if ((G.f & G_DEBUG) == 0) {
 		if (win && win->ghostwin) {
-			/* [mce] replace with TabletManager calls?
+			/* TODO: replace with TabletManager calls? [mce]
 			const GHOST_TabletData *tabletdata= GHOST_GetTabletData(win->ghostwin);
 			// Note: There is no tabletdata on Windows if no tablet device is connected.
 			if (!tabletdata)

Modified: branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_event_system.c	2011-01-16 04:27:32 UTC (rev 34343)
+++ branches/merwin-tablet-2/source/blender/windowmanager/intern/wm_event_system.c	2011-01-16 04:36:18 UTC (rev 34344)
@@ -2210,26 +2210,6 @@
 		}
 }
 
-/* adds customdata to event */
-//static void update_tablet_data(wmWindow *win, wmEvent *event)
-//{
-//	const GHOST_TabletData *td= GHOST_GetTabletData(win->ghostwin);
-//	
-//	/* if there's tablet data from an active tablet device then add it */
-//	if ((td != NULL) && td->Active != GHOST_kTabletModeNone) {
-//		struct wmTabletData *wmtab= MEM_mallocN(sizeof(wmTabletData), "customdata tablet");
-//		
-//		wmtab->Active = (int)td->Active;
-//		wmtab->Pressure = td->Pressure;
-//		wmtab->Xtilt = td->Xtilt;
-//		wmtab->Ytilt = td->Ytilt;
-//		
-//		event->custom= EVT_DATA_TABLET;
-//		event->customdata= wmtab;
-//		event->customdatafree= 1;
-//	} 
-//}
-
 /* imperfect but probably usable... draw/enable drags to other windows */
 static wmWindow *wm_event_cursor_other_windows(wmWindowManager *wm, wmWindow *win, wmEvent *evt)
 {
@@ -2310,7 +2290,6 @@
 				if(lastevent && lastevent->type == MOUSEMOVE)
 					lastevent->type = INBETWEEN_MOUSEMOVE;
 
-				// update_tablet_data(win, &event);
 				attach_tablet_data(&event, &(cd->tablet));
 				wm_event_add(win, &event);
 				
@@ -2324,7 +2303,6 @@
 					oevent.y=owin->eventstate->y= event.y;
 					oevent.type= MOUSEMOVE;
 					
-					// update_tablet_data(owin, &oevent);
 					wm_event_add(owin, &oevent);
 				}
 				
@@ -2361,8 +2339,6 @@
 			event.prevx= event.x - pd->deltaX;
 			event.prevy= event.y - pd->deltaY;
 			
-			// [mce] tablet never sends trackpad events.
-			// update_tablet_data(win, &event);
 			wm_event_add(win, &event);
 			break;
 		}
@@ -2393,12 +2369,10 @@
 				oevent.type= event.type;
 				oevent.val= event.val;
 				
-				// update_tablet_data(owin, &oevent);
 				attach_tablet_data(&oevent, &(bd->tablet));
 				wm_event_add(owin, &oevent);
 			}
 			else {
-				// update_tablet_data(win, &event);
 				attach_tablet_data(&event, &(bd->tablet));
 				wm_event_add(win, &event);
 			}