diff options
Diffstat (limited to 'intern')
21 files changed, 123 insertions, 59 deletions
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 8d06bdbba65..db66a68799e 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -81,7 +81,8 @@ extern GHOST_TSuccess GHOST_DisposeSystem(GHOST_SystemHandle systemhandle); * @param eventCallback The event callback routine. * @param userdata Pointer to user data returned to the callback routine. */ -extern GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userdata); +extern GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback, + GHOST_TUserDataPtr userdata); /** * Disposes an event consumer object diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 04dc8717637..d451cb16df6 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -181,7 +181,10 @@ public: * @param userData Placeholder for user data. * @return A timer task (0 if timer task installation failed). */ - virtual GHOST_ITimerTask* installTimer(GHOST_TUns64 delay, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, GHOST_TUserDataPtr userData = 0) = 0; + virtual GHOST_ITimerTask* installTimer(GHOST_TUns64 delay, + GHOST_TUns64 interval, + GHOST_TimerProcPtr timerProc, + GHOST_TUserDataPtr userData = 0) = 0; /** * Removes a timer. diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 12a11d838dc..6438059287d 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -303,7 +303,7 @@ public: * @param grab The new grab state of the cursor. * @return Indication of success. */ - virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; }; + virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; } #ifdef WITH_CXX_GUARDEDALLOC public: diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index 35a97b6d416..6edfc4287ae 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -65,7 +65,8 @@ GHOST_TSuccess GHOST_DisposeSystem(GHOST_SystemHandle systemhandle) } -GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userdata) +GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback, + GHOST_TUserDataPtr userdata) { return (GHOST_EventConsumerHandle) new GHOST_CallbackEventConsumer (eventCallback, userdata); } diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp index 50000421bfd..49590c77eaa 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp @@ -42,7 +42,7 @@ #include "GHOST_CallbackEventConsumer.h" GHOST_CallbackEventConsumer::GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback, - GHOST_TUserDataPtr userData) + GHOST_TUserDataPtr userData) { m_eventCallback = eventCallback; m_userData = userData; diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h index f2e16259c57..38512f6ce2b 100644 --- a/intern/ghost/intern/GHOST_Debug.h +++ b/intern/ghost/intern/GHOST_Debug.h @@ -34,35 +34,42 @@ #define _GHOST_DEBUG_H_ #if defined(WIN32) && !defined(FREE_WINDOWS) - #ifdef DEBUG - #pragma warning (disable:4786) // suppress stl-MSVC debug info warning - // #define GHOST_DEBUG - #endif // DEBUG +# ifdef DEBUG +# pragma warning (disable:4786) // suppress stl-MSVC debug info warning + // #define GHOST_DEBUG +# endif // DEBUG #endif // WIN32 #ifdef WITH_GHOST_DEBUG - #define GHOST_DEBUG // spit ghost events to stdout +# define GHOST_DEBUG // spit ghost events to stdout #endif // WITH_GHOST_DEBUG #ifdef GHOST_DEBUG - #include <iostream> - #include <stdio.h> //for printf() +# include <iostream> +# include <stdio.h> //for printf() #endif // GHOST_DEBUG #ifdef GHOST_DEBUG - #define GHOST_PRINT(x) { std::cout << x; } - #define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); } +# define GHOST_PRINT(x) { std::cout << x; } +# define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); } #else // GHOST_DEBUG - #define GHOST_PRINT(x) - #define GHOST_PRINTF(x, ...) +# define GHOST_PRINT(x) +# define GHOST_PRINTF(x, ...) #endif // GHOST_DEBUG #ifdef GHOST_DEBUG - #define GHOST_ASSERT(x, info) { if (!(x)) {GHOST_PRINT("assertion failed: "); GHOST_PRINT(info); GHOST_PRINT("\n"); } } +# define GHOST_ASSERT(x, info) \ + { \ + if (!(x)) { \ + GHOST_PRINT("assertion failed: "); \ + GHOST_PRINT(info); \ + GHOST_PRINT("\n"); \ + } \ + } #else // GHOST_DEBUG - #define GHOST_ASSERT(x, info) +# define GHOST_ASSERT(x, info) #endif // GHOST_DEBUG #endif // _GHOST_DEBUG_H_ diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h index d7a9b151d14..b89f303c734 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.h +++ b/intern/ghost/intern/GHOST_DisplayManager.h @@ -75,7 +75,8 @@ public: * @param numSettings The number of settings of the display device with this index. * @return Indication of success. */ - virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const; + virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, + GHOST_TInt32& numSettings) const; /** * Returns the current setting for this display device. @@ -84,7 +85,9 @@ public: * @param setting The setting of the display device with this index. * @return Indication of success. */ - virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const; + virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, + GHOST_TInt32 index, + GHOST_DisplaySetting& setting) const; /** * Returns the current setting for this display device. @@ -92,7 +95,8 @@ public: * @param setting The current setting of the display device with this index. * @return Indication of success. */ - virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const; + virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, + GHOST_DisplaySetting& setting) const; /** * Changes the current setting for this display device. @@ -102,7 +106,8 @@ public: * @param setting The setting of the display device to be matched and activated. * @return Indication of success. */ - virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting& setting); + virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, + const GHOST_DisplaySetting& setting); protected: typedef std::vector<GHOST_DisplaySetting> GHOST_DisplaySettings; @@ -114,7 +119,9 @@ protected: * @param match The optimal display setting. * @return Indication of success. */ - GHOST_TSuccess findMatch(GHOST_TUns8 display, const GHOST_DisplaySetting& setting, GHOST_DisplaySetting& match) const; + GHOST_TSuccess findMatch(GHOST_TUns8 display, + const GHOST_DisplaySetting& setting, + GHOST_DisplaySetting& match) const; /** * Retrieves settings for each display device and stores them. diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h b/intern/ghost/intern/GHOST_EventDragnDrop.h index 650a109a668..330635de50a 100644 --- a/intern/ghost/intern/GHOST_EventDragnDrop.h +++ b/intern/ghost/intern/GHOST_EventDragnDrop.h @@ -44,19 +44,21 @@ extern "C" { * * The dragging sequence is performed in four phases: * - * <li> Start sequence (GHOST_kEventDraggingEntered) that tells a drag'n'drop operation has started. Already gives the object data type, - * and the entering mouse location + * <li> Start sequence (GHOST_kEventDraggingEntered) that tells a drag'n'drop operation has started. + * Already gives the object data type, and the entering mouse location * - * <li> Update mouse position (GHOST_kEventDraggingUpdated) sent upon each mouse move until the drag'n'drop operation stops, to give the updated mouse position. - * Useful to highlight a potential destination, and update the status (through GHOST_setAcceptDragOperation) telling if the object can be dropped at + * <li> Update mouse position (GHOST_kEventDraggingUpdated) sent upon each mouse move until the drag'n'drop operation + * stops, to give the updated mouse position. Useful to highlight a potential destination, and update the status + * (through GHOST_setAcceptDragOperation) telling if the object can be dropped at * the current cursor position. * * <li> Abort drag'n'drop sequence (GHOST_kEventDraggingExited) sent when the user moved the mouse outside the window. * * <li> Send the dropped data (GHOST_kEventDraggingDropDone) * - * <li> Outside of the normal sequence, dropped data can be sent (GHOST_kEventDraggingDropOnIcon). This can happen when the user drops an object - * on the application icon. (Also used in OSX to pass the filename of the document the user doubled-clicked in the finder) + * <li> Outside of the normal sequence, dropped data can be sent (GHOST_kEventDraggingDropOnIcon). + * This can happen when the user drops an object on the application icon. + * (Also used in OSX to pass the filename of the document the user doubled-clicked in the finder) * * <br><br>Note that the mouse positions are given in Blender coordinates (y=0 at bottom) * @@ -78,7 +80,10 @@ public: * @param y The y-coordinate of the location the cursor was at at the time of the event. * @param data The "content" dropped in the window */ - GHOST_EventDragnDrop(GHOST_TUns64 time, GHOST_TEventType type, GHOST_TDragnDropTypes dataType, GHOST_IWindow* window, + GHOST_EventDragnDrop(GHOST_TUns64 time, + GHOST_TEventType type, + GHOST_TDragnDropTypes dataType, + GHOST_IWindow* window, int x, int y, GHOST_TEventDataPtr data) : GHOST_Event(time, type, window) { diff --git a/intern/ghost/intern/GHOST_EventKey.h b/intern/ghost/intern/GHOST_EventKey.h index 5410b1eda16..a602bd65e5a 100644 --- a/intern/ghost/intern/GHOST_EventKey.h +++ b/intern/ghost/intern/GHOST_EventKey.h @@ -49,7 +49,10 @@ public: * @param type The type of key event. * @param key The key code of the key. */ - GHOST_EventKey(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow* window, GHOST_TKey key) + GHOST_EventKey(GHOST_TUns64 msec, + GHOST_TEventType type, + GHOST_IWindow* window, + GHOST_TKey key) : GHOST_Event(msec, type, window) { m_keyEventData.key = key; @@ -65,7 +68,12 @@ public: * @param key The key code of the key. * @param ascii The ascii code for the key event. */ - GHOST_EventKey(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow* window, GHOST_TKey key, char ascii, const char utf8_buf[6]) + GHOST_EventKey(GHOST_TUns64 msec, + GHOST_TEventType type, + GHOST_IWindow* window, + GHOST_TKey key, + char ascii, + const char utf8_buf[6]) : GHOST_Event(msec, type, window) { m_keyEventData.key = key; diff --git a/intern/ghost/intern/GHOST_EventNDOF.h b/intern/ghost/intern/GHOST_EventNDOF.h index 394aff0493f..fceacce0805 100644 --- a/intern/ghost/intern/GHOST_EventNDOF.h +++ b/intern/ghost/intern/GHOST_EventNDOF.h @@ -19,7 +19,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ - + +/** \file ghost/intern/GHOST_EventNDOF.h + * \ingroup GHOST + * Declaration of GHOST_EventManager class. + */ #ifndef _GHOST_EVENT_NDOF_H_ #define _GHOST_EVENT_NDOF_H_ diff --git a/intern/ghost/intern/GHOST_EventTrackpad.h b/intern/ghost/intern/GHOST_EventTrackpad.h index 06706ea5ff3..55517f0a76c 100644 --- a/intern/ghost/intern/GHOST_EventTrackpad.h +++ b/intern/ghost/intern/GHOST_EventTrackpad.h @@ -50,7 +50,11 @@ public: * @param x The x-delta of the pan event. * @param y The y-delta of the pan event. */ - GHOST_EventTrackpad(GHOST_TUns64 msec, GHOST_IWindow* window, GHOST_TTrackpadEventSubTypes subtype, GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 deltaX, GHOST_TInt32 deltaY) + GHOST_EventTrackpad(GHOST_TUns64 msec, + GHOST_IWindow* window, + GHOST_TTrackpadEventSubTypes subtype, + GHOST_TInt32 x, GHOST_TInt32 y, + GHOST_TInt32 deltaX, GHOST_TInt32 deltaY) : GHOST_Event(msec, GHOST_kEventTrackpad, window) { m_trackpadEventData.subtype = subtype; diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 839e014aff6..b0b693e2f8f 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -73,7 +73,10 @@ GHOST_TUns64 GHOST_System::getMilliSeconds() const } -GHOST_ITimerTask* GHOST_System::installTimer(GHOST_TUns64 delay, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, GHOST_TUserDataPtr userData) +GHOST_ITimerTask* GHOST_System::installTimer(GHOST_TUns64 delay, + GHOST_TUns64 interval, + GHOST_TimerProcPtr timerProc, + GHOST_TUserDataPtr userData) { GHOST_TUns64 millis = getMilliSeconds(); GHOST_TimerTask* timer = new GHOST_TimerTask(millis+delay, interval, timerProc, userData); @@ -136,7 +139,7 @@ bool GHOST_System::validWindow(GHOST_IWindow* window) GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, - const bool stereoVisual, const GHOST_TUns16 numOfAASamples) + const bool stereoVisual) { GHOST_TSuccess success = GHOST_kFailure; GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager") @@ -148,7 +151,7 @@ GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, setting); if (success == GHOST_kSuccess) { //GHOST_PRINT("GHOST_System::beginFullScreen(): creating full-screen window\n"); - success = createFullScreenWindow((GHOST_Window**)window, stereoVisual, numOfAASamples); + success = createFullScreenWindow((GHOST_Window**)window, stereoVisual); if (success == GHOST_kSuccess) { m_windowManager->beginFullScreen(*window, stereoVisual); } @@ -330,7 +333,7 @@ GHOST_TSuccess GHOST_System::exit() } -GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples) +GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual) { GHOST_TSuccess success; GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager") @@ -344,8 +347,7 @@ GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const 0, 0, settings.xPixels, settings.yPixels, GHOST_kWindowStateFullScreen, GHOST_kDrawingContextTypeOpenGL, - stereoVisual, - numOfAASamples); + stereoVisual); success = *window == 0 ? GHOST_kFailure : GHOST_kSuccess; } return success; diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index afd2a8cbae3..30082643118 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -97,7 +97,10 @@ public: * @param userData Placeholder for user data. * @return A timer task (0 if timer task installation failed). */ - virtual GHOST_ITimerTask* installTimer(GHOST_TUns64 delay, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, GHOST_TUserDataPtr userData = 0); + virtual GHOST_ITimerTask* installTimer(GHOST_TUns64 delay, + GHOST_TUns64 interval, + GHOST_TimerProcPtr timerProc, + GHOST_TUserDataPtr userData = 0); /** * Removes a timer. diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index 470fea7969c..581535e82b8 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -241,7 +241,9 @@ protected: /** * Handles a tablet event. * @param eventPtr An NSEvent pointer (casted to void* to enable compilation in standard C++) - * @param eventType The type of the event. It needs to be passed separately as it can be either directly in the event type, or as a subtype if combined with a mouse button event + * @param eventType The type of the event. + * It needs to be passed separately as it can be either directly in the event type, + * or as a subtype if combined with a mouse button event. * @return Indication whether the event was handled. */ GHOST_TSuccess handleTabletEvent(void *eventPtr, short eventType); diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 2547006ef28..61c65384d2d 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -790,9 +790,11 @@ GHOST_SystemX11::processEvent(XEvent *xe) /*Check to see if the requestor is asking for String*/ if(xse->target == string || xse->target == compound_text || xse->target == c_string) { if (xse->selection == XInternAtom(m_display, "PRIMARY", False)) { - XChangeProperty(m_display, xse->requestor, xse->property, xse->target, 8, PropModeReplace, (unsigned char*)txt_select_buffer, strlen(txt_select_buffer)); + XChangeProperty(m_display, xse->requestor, xse->property, xse->target, 8, PropModeReplace, + (unsigned char*)txt_select_buffer, strlen(txt_select_buffer)); } else if (xse->selection == XInternAtom(m_display, "CLIPBOARD", False)) { - XChangeProperty(m_display, xse->requestor, xse->property, xse->target, 8, PropModeReplace, (unsigned char*)txt_cut_buffer, strlen(txt_cut_buffer)); + XChangeProperty(m_display, xse->requestor, xse->property, xse->target, 8, PropModeReplace, + (unsigned char*)txt_cut_buffer, strlen(txt_cut_buffer)); } } else if (xse->target == target) { Atom alist[4]; @@ -800,7 +802,8 @@ GHOST_SystemX11::processEvent(XEvent *xe) alist[1] = string; alist[2] = compound_text; alist[3] = c_string; - XChangeProperty(m_display, xse->requestor, xse->property, xse->target, 32, PropModeReplace, (unsigned char*)alist, 4); + XChangeProperty(m_display, xse->requestor, xse->property, xse->target, 32, PropModeReplace, + (unsigned char*)alist, 4); XFlush(m_display); } else { //Change property to None because we do not support anything but STRING diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.h index 01bf0053343..ac86d6c1ce6 100644 --- a/intern/ghost/intern/GHOST_TimerTask.h +++ b/intern/ghost/intern/GHOST_TimerTask.h @@ -51,8 +51,16 @@ public: * @param timerProc The callbak invoked when the interval expires. * @param data The timer user data. */ - GHOST_TimerTask(GHOST_TUns64 start, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, GHOST_TUserDataPtr userData = 0) - : m_start(start), m_interval(interval), m_next(start), m_timerProc(timerProc), m_userData(userData), m_auxData(0) + GHOST_TimerTask(GHOST_TUns64 start, + GHOST_TUns64 interval, + GHOST_TimerProcPtr timerProc, + GHOST_TUserDataPtr userData = 0) + : m_start(start), + m_interval(interval), + m_next(start), + m_timerProc(timerProc), + m_userData(userData), + m_auxData(0) { } diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cpp index 0545b309f4b..b560b04b5df 100644 --- a/intern/ghost/intern/GHOST_Window.cpp +++ b/intern/ghost/intern/GHOST_Window.cpp @@ -145,15 +145,15 @@ GHOST_TSuccess GHOST_Window::setCursorShape(GHOST_TStandardCursor cursorShape) } GHOST_TSuccess GHOST_Window::setCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], - int hotX, int hotY) + int hotX, int hotY) { - return setCustomCursorShape( (GHOST_TUns8 *)bitmap, (GHOST_TUns8 *)mask, - 16, 16, hotX, hotY, 0, 1 ); + return setCustomCursorShape((GHOST_TUns8 *)bitmap, (GHOST_TUns8 *)mask, + 16, 16, hotX, hotY, 0, 1 ); } GHOST_TSuccess GHOST_Window::setCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, - int sizex, int sizey, int hotX, int hotY, - int fg_color, int bg_color ) + int sizex, int sizey, int hotX, int hotY, + int fg_color, int bg_color) { if (setWindowCustomCursorShape(bitmap, mask, sizex, sizey,hotX, hotY, fg_color, bg_color)) { m_cursorShape = GHOST_kStandardCursorCustom; diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index a9f070b8951..646097d42c4 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -289,8 +289,9 @@ protected: * Sets the cursor shape on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], - int hotX, int hotY) = 0; + virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], + GHOST_TUns8 mask[16][2], + int hotX, int hotY) = 0; virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int szx, int szy, int hotX, int hotY, int fg, int bg) = 0; diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index a363130c897..cb4d3f87e83 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -1196,10 +1196,11 @@ static GHOST_TUns16 uns16ReverseBits(GHOST_TUns16 shrt) return shrt; } GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], - GHOST_TUns8 mask[16][2], int hotX, int hotY) + GHOST_TUns8 mask[16][2], + int hotX, int hotY) { return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*)mask, - 16, 16, hotX, hotY, 0, 1); + 16, 16, hotX, hotY, 0, 1); } GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 *bitmap, diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index b24f37aa264..190966ee485 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -309,7 +309,9 @@ protected: * Sets the cursor shape on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY); + virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], + GHOST_TUns8 mask[16][2], + int hotX, int hotY); virtual GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index c379e4c7e48..d882ae41c9c 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -239,7 +239,8 @@ GHOST_WindowX11( } } else { if (m_numOfAASamples && (m_numOfAASamples > samples)) { - printf("%s:%d: oversampling requested %i but using %i samples\n", __FILE__, __LINE__, m_numOfAASamples, samples); + printf("%s:%d: oversampling requested %i but using %i samples\n", + __FILE__, __LINE__, m_numOfAASamples, samples); } break; } @@ -1491,7 +1492,8 @@ setWindowCursorGrab( } #ifdef GHOST_X11_GRAB - XGrabPointer(m_display, m_window, False, ButtonPressMask| ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); + XGrabPointer(m_display, m_window, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime); #endif } else { |