[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38351] trunk/blender: - don't build ghost 's event printer unless ghost debug is enabled.
Campbell Barton
ideasman42 at gmail.com
Wed Jul 13 08:04:57 CEST 2011
Revision: 38351
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38351
Author: campbellbarton
Date: 2011-07-13 06:04:54 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
- don't build ghost's event printer unless ghost debug is enabled.
- use char rather then STR_String for the event printer.
- added option to build WITH_GHOST_DEBUG for cmake
- renamed WITH_SDL_GHOST --> WITH_GHOST_SDL
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/ghost/SConscript
trunk/blender/intern/ghost/intern/GHOST_Debug.h
trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
trunk/blender/intern/ghost/intern/GHOST_EventPrinter.h
trunk/blender/intern/ghost/intern/GHOST_ISystem.cpp
trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-07-13 05:22:21 UTC (rev 38350)
+++ trunk/blender/CMakeLists.txt 2011-07-13 06:04:54 UTC (rev 38351)
@@ -106,15 +106,21 @@
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
-option(WITH_AUDASPACE "Build with blenders audio library" ON)
-mark_as_advanced(WITH_AUDASPACE)
+# GHOST Windowing Library Options
+option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
+mark_as_advanced(WITH_GHOST_DEBUG)
-option(WITH_SDL_GHOST "Enable building blender against SDL for windowing rather then the native APIs" OFF)
-mark_as_advanced(WITH_SDL_GHOST)
+option(WITH_GHOST_SDL "Enable building blender against SDL for windowing rather then the native APIs" OFF)
+mark_as_advanced(WITH_GHOST_SDL)
+# Misc...
option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF)
mark_as_advanced(WITH_HEADLESS)
+option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON)
+mark_as_advanced(WITH_AUDASPACE)
+
+
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -212,8 +218,8 @@
message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
endif()
-if(NOT WITH_SDL AND WITH_SDL_GHOST)
- message(FATAL_ERROR "WITH_SDL_GHOST requires WITH_SDL to be ON")
+if(NOT WITH_SDL AND WITH_GHOST_SDL)
+ message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
endif()
if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
@@ -440,7 +446,7 @@
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if((NOT WITH_HEADLESS) AND (NOT WITH_SDL_GHOST))
+ if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2011-07-13 05:22:21 UTC (rev 38350)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2011-07-13 06:04:54 UTC (rev 38351)
@@ -42,7 +42,6 @@
intern/GHOST_Path-api.cpp
intern/GHOST_DisplayManager.cpp
intern/GHOST_EventManager.cpp
- intern/GHOST_EventPrinter.cpp
intern/GHOST_ISystem.cpp
intern/GHOST_ISystemPaths.cpp
intern/GHOST_ModifierKeys.cpp
@@ -89,7 +88,17 @@
intern/GHOST_WindowManager.h
)
-if(WITH_HEADLESS OR WITH_SDL_GHOST)
+if(WITH_GHOST_DEBUG)
+ list(APPEND SRC
+ intern/GHOST_EventPrinter.cpp
+
+ intern/GHOST_EventPrinter.h
+ )
+ add_definitions(-DWITH_GHOST_DEBUG)
+endif()
+
+
+if(WITH_HEADLESS OR WITH_GHOST_SDL)
if(WITH_HEADLESS)
list(APPEND SRC
intern/GHOST_DisplayManagerNULL.h
@@ -107,7 +116,7 @@
intern/GHOST_SystemSDL.h
intern/GHOST_WindowSDL.h
)
- add_definitions(-DWITH_SDL_GHOST)
+ add_definitions(-DWITH_GHOST_SDL)
endif()
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2011-07-13 05:22:21 UTC (rev 38350)
+++ trunk/blender/intern/ghost/SConscript 2011-07-13 06:04:54 UTC (rev 38351)
@@ -25,6 +25,7 @@
except ValueError:
pass
incs += ' ' + env['BF_SDL_INC']
+ defs += ['WITH_GHOST_SDL']
elif window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'):
for f in pf:
try:
@@ -73,7 +74,9 @@
Exit()
if env['BF_GHOST_DEBUG']:
- defs.append('BF_GHOST_DEBUG')
+ defs.append('WITH_GHOST_DEBUG')
+else:
+ sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp')
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
Modified: trunk/blender/intern/ghost/intern/GHOST_Debug.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_Debug.h 2011-07-13 05:22:21 UTC (rev 38350)
+++ trunk/blender/intern/ghost/intern/GHOST_Debug.h 2011-07-13 06:04:54 UTC (rev 38351)
@@ -41,9 +41,9 @@
#endif // DEBUG
#endif // WIN32
-#ifdef BF_GHOST_DEBUG
+#ifdef WITH_GHOST_DEBUG
#define GHOST_DEBUG // spit ghost events to stdout
-#endif // BF_GHOST_DEBUG
+#endif // WITH_GHOST_DEBUG
#ifdef GHOST_DEBUG
#include <iostream>
Modified: trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp 2011-07-13 05:22:21 UTC (rev 38350)
+++ trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp 2011-07-13 06:04:54 UTC (rev 38351)
@@ -37,6 +37,7 @@
#include "GHOST_EventDragnDrop.h"
#include "GHOST_Debug.h"
+#include <stdio.h>
bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event)
{
@@ -82,17 +83,17 @@
case GHOST_kEventKeyUp:
{
GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData();
- STR_String str;
+ char str[32]= {'\0'};
getKeyString(keyData->key, str);
- std::cout << "GHOST_kEventKeyUp, key: " << str.Ptr();
+ std::cout << "GHOST_kEventKeyUp, key: " << str;
}
break;
case GHOST_kEventKeyDown:
{
GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData();
- STR_String str;
+ char str[32]= {'\0'};
getKeyString(keyData->key, str);
- std::cout << "GHOST_kEventKeyDown, key: " << str.Ptr();
+ std::cout << "GHOST_kEventKeyDown, key: " << str;
}
break;
@@ -183,165 +184,161 @@
}
-void GHOST_EventPrinter::getKeyString(GHOST_TKey key, STR_String& str) const
+void GHOST_EventPrinter::getKeyString(GHOST_TKey key, char str[32]) const
{
if ((key >= GHOST_kKeyComma) && (key <= GHOST_kKeyRightBracket)) {
- str = ((char)key);
+ sprintf(str, "%c", (char)key);
} else if ((key >= GHOST_kKeyNumpad0) && (key <= GHOST_kKeyNumpad9)) {
- int number = key - GHOST_kKeyNumpad0;
- STR_String numberStr (number);
- str = "Numpad";
- str += numberStr;
+ sprintf(str, "Numpad %d", (key - GHOST_kKeyNumpad0));
#if defined(__sun__) || defined(__sun)
} else if (key == 268828432) { /* solaris keyboards are messed up */
/* This should really test XK_F11 but that doesn't work */
- str = "F11";
+ strcpy(str, "F11");
} else if (key == 268828433) { /* solaris keyboards are messed up */
/* This should really test XK_F12 but that doesn't work */
- str = "F12";
+ strcpy(str, "F12");
#endif
} else if ((key >= GHOST_kKeyF1) && (key <= GHOST_kKeyF24)) {
- int number = key - GHOST_kKeyF1 + 1;
- STR_String numberStr (number);
- str = "F";
- str += numberStr;
+ sprintf(str, "F%d", key - GHOST_kKeyF1 + 1);
} else {
- switch (key)
- {
+ const char *tstr= NULL;
+ switch (key) {
case GHOST_kKeyBackSpace:
- str = "BackSpace";
+ tstr = "BackSpace";
break;
case GHOST_kKeyTab:
- str = "Tab";
+ tstr = "Tab";
break;
case GHOST_kKeyLinefeed:
- str = "Linefeed";
+ tstr = "Linefeed";
break;
case GHOST_kKeyClear:
- str = "Clear";
+ tstr = "Clear";
break;
case GHOST_kKeyEnter:
- str = "Enter";
+ tstr = "Enter";
break;
case GHOST_kKeyEsc:
- str = "Esc";
+ tstr = "Esc";
break;
case GHOST_kKeySpace:
- str = "Space";
+ tstr = "Space";
break;
case GHOST_kKeyQuote:
- str = "Quote";
+ tstr = "Quote";
break;
case GHOST_kKeyBackslash:
- str = "\\";
+ tstr = "\\";
break;
case GHOST_kKeyAccentGrave:
- str = "`";
+ tstr = "`";
break;
case GHOST_kKeyLeftShift:
- str = "LeftShift";
+ tstr = "LeftShift";
break;
case GHOST_kKeyRightShift:
- str = "RightShift";
+ tstr = "RightShift";
break;
case GHOST_kKeyLeftControl:
- str = "LeftControl";
+ tstr = "LeftControl";
break;
case GHOST_kKeyRightControl:
- str = "RightControl";
+ tstr = "RightControl";
break;
case GHOST_kKeyLeftAlt:
- str = "LeftAlt";
+ tstr = "LeftAlt";
break;
case GHOST_kKeyRightAlt:
- str = "RightAlt";
+ tstr = "RightAlt";
break;
case GHOST_kKeyOS:
- str = "OS";
+ tstr = "OS";
break;
case GHOST_kKeyGrLess:
// PC german!
- str = "GrLess";
+ tstr = "GrLess";
break;
case GHOST_kKeyCapsLock:
- str = "CapsLock";
+ tstr = "CapsLock";
break;
case GHOST_kKeyNumLock:
- str = "NumLock";
+ tstr = "NumLock";
break;
case GHOST_kKeyScrollLock:
- str = "ScrollLock";
+ tstr = "ScrollLock";
break;
case GHOST_kKeyLeftArrow:
- str = "LeftArrow";
+ tstr = "LeftArrow";
break;
case GHOST_kKeyRightArrow:
- str = "RightArrow";
+ tstr = "RightArrow";
break;
case GHOST_kKeyUpArrow:
- str = "UpArrow";
+ tstr = "UpArrow";
break;
case GHOST_kKeyDownArrow:
- str = "DownArrow";
+ tstr = "DownArrow";
break;
case GHOST_kKeyPrintScreen:
- str = "PrintScreen";
+ tstr = "PrintScreen";
break;
case GHOST_kKeyPause:
- str = "Pause";
+ tstr = "Pause";
break;
case GHOST_kKeyInsert:
- str = "Insert";
+ tstr = "Insert";
break;
case GHOST_kKeyDelete:
- str = "Delete";
+ tstr = "Delete";
break;
case GHOST_kKeyHome:
- str = "Home";
+ tstr = "Home";
break;
case GHOST_kKeyEnd:
- str = "End";
+ tstr = "End";
break;
case GHOST_kKeyUpPage:
- str = "UpPage";
+ tstr = "UpPage";
break;
case GHOST_kKeyDownPage:
- str = "DownPage";
+ tstr = "DownPage";
break;
case GHOST_kKeyNumpadPeriod:
- str = "NumpadPeriod";
+ tstr = "NumpadPeriod";
break;
case GHOST_kKeyNumpadEnter:
- str = "NumpadEnter";
+ tstr = "NumpadEnter";
break;
case GHOST_kKeyNumpadPlus:
- str = "NumpadPlus";
+ tstr = "NumpadPlus";
break;
case GHOST_kKeyNumpadMinus:
- str = "NumpadMinus";
+ tstr = "NumpadMinus";
break;
case GHOST_kKeyNumpadAsterisk:
- str = "NumpadAsterisk";
+ tstr = "NumpadAsterisk";
break;
case GHOST_kKeyNumpadSlash:
- str = "NumpadSlash";
+ tstr = "NumpadSlash";
break;
case GHOST_kKeyMediaPlay:
- str = "MediaPlayPause";
+ tstr = "MediaPlayPause";
break;
case GHOST_kKeyMediaStop:
- str = "MediaStop";
+ tstr = "MediaStop";
break;
case GHOST_kKeyMediaFirst:
- str = "MediaFirst";
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list