[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53832] trunk/blender: minor changes to ghost

[Campbell Barton]

Revision: 53832
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53832
Author:   campbellbarton
Date:     2013-01-16 01:10:06 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
minor changes to ghost
- use WITH_ASSERT_ABORT define, so GHOST_ASSERT will abort.
- rename XTablet -> GHOST_TabletX11, was confusing since it was named like an xlib struct.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_Debug.h
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.h
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/intern/ghost/intern/GHOST_Debug.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_Debug.h	2013-01-15 23:45:41 UTC (rev 53831)
+++ trunk/blender/intern/ghost/intern/GHOST_Debug.h	2013-01-16 01:10:06 UTC (rev 53832)
@@ -58,12 +58,23 @@
 #  define GHOST_PRINTF(x, ...)
 #endif // GHOST_DEBUG
 
-
-#ifdef GHOST_DEBUG
+#ifdef WITH_ASSERT_ABORT
+#  include <stdio.h>  //for fprintf()
+#  include <stdlib.h> //for abort()
 #  define GHOST_ASSERT(x, info)                                               \
 	{                                                                         \
+		if (!(x)) {                                                           \
+			fprintf(stderr, "GHOST_ASSERT failed: ");                         \
+			fprintf(stderr, info);                                            \
+			fprintf(stderr, "\n");                                            \
+			abort();                                                          \
+		}                                                                     \
+	} (void)0
+#elif defined(GHOST_DEBUG)
+#  define GHOST_ASSERT(x, info)                                               \
+	{                                                                         \
 	    if (!(x)) {                                                           \
-	        GHOST_PRINT("assertion failed: ");                                \
+	        GHOST_PRINT("GHOST_ASSERT failed: ");                             \
 	        GHOST_PRINT(info);                                                \
 	        GHOST_PRINT("\n");                                                \
 	    }                                                                     \

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.h	2013-01-15 23:45:41 UTC (rev 53831)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.h	2013-01-16 01:10:06 UTC (rev 53832)
@@ -196,9 +196,8 @@
 	getXWindow(
 	    );
 #ifdef WITH_X11_XINPUT
-	class XTablet
+	typedef struct GHOST_TabletX11
 	{
-public:
 		GHOST_TabletData CommonData;
 
 		XDevice *StylusDevice;
@@ -212,9 +211,9 @@
 
 		int PressureLevels;
 		int XtiltLevels, YtiltLevels;
-	};
+	} GHOST_TabletX11;
 
-	XTablet& GetXTablet()
+	GHOST_TabletX11 &GetXTablet()
 	{
 		return m_xtablet;
 	}
@@ -388,7 +387,7 @@
 
 #ifdef WITH_X11_XINPUT
 	/* Tablet devices */
-	XTablet m_xtablet;
+	GHOST_TabletX11 m_xtablet;
 #endif
 
 #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-01-15 23:45:41 UTC (rev 53831)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-01-16 01:10:06 UTC (rev 53832)
@@ -2756,7 +2756,7 @@
 
 	/* initialize and copy state (only mouse x y and modifiers) */
 	event = *evt;
-	
+
 	switch (type) {
 		/* mouse move, also to inactive window (X11 does this) */
 		case GHOST_kEventCursorMove:
@@ -3100,4 +3100,7 @@
 
 	}
 
+#if 0
+	WM_event_print(&event);
+#endif
 }