[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36985] trunk/blender/intern/ghost/intern: Disabling xinput wasn't done completely.

[Campbell Barton]

Revision: 36985
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36985
Author:   campbellbarton
Date:     2011-05-28 15:34:02 +0000 (Sat, 28 May 2011)
Log Message:
-----------
Disabling xinput wasn't done completely.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.h

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2011-05-28 14:52:28 UTC (rev 36984)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2011-05-28 15:34:02 UTC (rev 36985)
@@ -795,6 +795,7 @@
 		}
 		
 		default: {
+#ifdef WITH_X11_XINPUT
 			if(xe->type == window->GetXTablet().MotionEvent) 
 			{
 				XDeviceMotionEvent* data = (XDeviceMotionEvent*)xe;
@@ -818,7 +819,7 @@
 			}
 			else if(xe->type == window->GetXTablet().ProxOutEvent)
 				window->GetXTablet().CommonData.Active= GHOST_kTabletModeNone;
-
+#endif // WITH_X11_XINPUT
 			break;
 		}
 	}

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2011-05-28 14:52:28 UTC (rev 36984)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2011-05-28 15:34:02 UTC (rev 36985)
@@ -182,9 +182,12 @@
 	Atom atoms[2];
 	int natom;
 	int glxVersionMajor, glxVersionMinor; // As in GLX major.minor
-	
+
+#ifdef WITH_X11_XINPUT
 	/* initialize incase X11 fails to load */
 	memset(&m_xtablet, 0, sizeof(m_xtablet));
+#endif
+
 	m_visual= NULL;
 
 	if (!glXQueryVersion(m_display, &glxVersionMajor, &glxVersionMinor)) {

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.h	2011-05-28 14:52:28 UTC (rev 36984)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.h	2011-05-28 15:34:02 UTC (rev 36985)
@@ -38,7 +38,9 @@
 #include <X11/Xlib.h>
 #include <GL/glx.h>
 // For tablets
-#include <X11/extensions/XInput.h>
+#ifdef WITH_X11_XINPUT
+#  include <X11/extensions/XInput.h>
+#endif
 
 #include <map>
 
@@ -190,7 +192,7 @@
 		Window 
 	getXWindow(
 	);	
-
+#ifdef WITH_X11_XINPUT
 	class XTablet
 	{
 	public:
@@ -214,6 +216,10 @@
 
 	const GHOST_TabletData* GetTabletData()
 	{ return &m_xtablet.CommonData; }
+#else // WITH_X11_XINPUT
+	const GHOST_TabletData* GetTabletData()
+	{ return NULL; }
+#endif // WITH_X11_XINPUT
 
 	/*
 	 * Need this in case that we want start the window
@@ -321,7 +327,9 @@
 	getEmptyCursor(
 	);
 
+#ifdef WITH_X11_XINPUT
 	void initXInputDevices();
+#endif
 	
 	GLXContext 	m_context;
 	Window 	m_window;
@@ -350,8 +358,10 @@
 	/** Cache of XC_* ID's to XCursor structures */
 	std::map<unsigned int, Cursor> m_standard_cursors;
 
+#ifdef WITH_X11_XINPUT
 	/* Tablet devices */
 	XTablet m_xtablet;
+#endif
 
 	void icccmSetState(int state);
 	int icccmGetState() const;