diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-07-01 02:49:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-01 02:49:33 +0400 |
commit | 8b865c01cd659006a721f4db3d6796d618c35d3c (patch) | |
tree | 96c49858e2b2fd36b5fa7c045d2fca966f1689a5 /intern | |
parent | 273f56ace03e1556df17b8a6e7e4343bf73726e5 (diff) |
style cleanup: comments
Diffstat (limited to 'intern')
25 files changed, 136 insertions, 155 deletions
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 7f33f2bdcde..764df79230d 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -128,8 +128,8 @@ extern GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle, GHOST_TimerTaskHandle timertaskhandle); /*************************************************************************************** -** Display/window management functionality -***************************************************************************************/ + * Display/window management functionality + ***************************************************************************************/ /** * Returns the number of displays on this system. @@ -235,8 +235,8 @@ extern GHOST_TSuccess GHOST_EndFullScreen(GHOST_SystemHandle systemhandle); extern int GHOST_GetFullScreen(GHOST_SystemHandle systemhandle); /*************************************************************************************** -** Event management functionality -***************************************************************************************/ + * Event management functionality + ***************************************************************************************/ /** * Retrieves events from the system and stores them in the queue. @@ -273,8 +273,8 @@ extern GHOST_TSuccess GHOST_RemoveEventConsumer(GHOST_SystemHandle systemhandle, GHOST_EventConsumerHandle consumerhandle); /*************************************************************************************** -** Progress bar functionality -***************************************************************************************/ + * Progress bar functionality + ***************************************************************************************/ /** * Sets the progress bar value displayed in the window/application icon @@ -290,8 +290,8 @@ extern GHOST_TSuccess GHOST_SetProgressBar(GHOST_WindowHandle windowhandle, floa extern GHOST_TSuccess GHOST_EndProgressBar(GHOST_WindowHandle windowhandle); /*************************************************************************************** -** Cursor management functionality -***************************************************************************************/ + * Cursor management functionality + ***************************************************************************************/ /** * Returns the current cursor shape. @@ -394,8 +394,8 @@ extern GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle, int *bounds); /*************************************************************************************** -** Access to mouse button and keyboard states. -***************************************************************************************/ + * Access to mouse button and keyboard states. + ***************************************************************************************/ /** * Returns the state of a modifier key (ouside the message queue). @@ -421,8 +421,8 @@ extern GHOST_TSuccess GHOST_GetButtonState(GHOST_SystemHandle systemhandle, /*************************************************************************************** -** Drag'n'drop operations -***************************************************************************************/ + * Drag'n'drop operations + ***************************************************************************************/ /** * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 0bc09077f39..474e3e97c45 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -177,8 +177,8 @@ protected: public: /*************************************************************************************** - ** Time(r) functionality - ***************************************************************************************/ + * Time(r) functionality + ***************************************************************************************/ /** * Returns the system time. @@ -211,8 +211,8 @@ public: virtual GHOST_TSuccess removeTimer(GHOST_ITimerTask *timerTask) = 0; /*************************************************************************************** - ** Display/window management functionality - ***************************************************************************************/ + * Display/window management functionality + ***************************************************************************************/ /** * Returns the number of displays on this system. @@ -296,8 +296,8 @@ public: virtual bool getFullScreen(void) = 0; /*************************************************************************************** - ** Event management functionality - ***************************************************************************************/ + * Event management functionality + ***************************************************************************************/ /** * Retrieves events from the system and stores them in the queue. @@ -327,8 +327,8 @@ public: virtual GHOST_TSuccess removeEventConsumer(GHOST_IEventConsumer *consumer) = 0; /*************************************************************************************** - ** Cursor management functionality - ***************************************************************************************/ + * Cursor management functionality + ***************************************************************************************/ /** * Returns the current location of the cursor (location in screen coordinates) @@ -348,8 +348,8 @@ public: virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) = 0; /*************************************************************************************** - ** Access to mouse button and keyboard states. - ***************************************************************************************/ + * Access to mouse button and keyboard states. + ***************************************************************************************/ /** * Returns the state of a modifier key (ouside the message queue). @@ -379,8 +379,8 @@ public: virtual int toggleConsole(int action) = 0; /*************************************************************************************** - ** Access to clipboard. - ***************************************************************************************/ + * Access to clipboard. + ***************************************************************************************/ /** * Returns the selection buffer diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 69aaeeb4b2e..5005718e4a5 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -235,8 +235,8 @@ public: virtual const GHOST_TabletData *GetTabletData() = 0; /*************************************************************************************** - ** Progress bar functionality - ***************************************************************************************/ + * Progress bar functionality + ***************************************************************************************/ /** * Sets the progress bar value displayed in the window/application icon @@ -250,8 +250,8 @@ public: virtual GHOST_TSuccess endProgressBar() = 0; /*************************************************************************************** - ** Cursor management functionality - ***************************************************************************************/ + * Cursor management functionality + ***************************************************************************************/ /** * Returns the current cursor shape. diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index ad43798bc60..4cdd9384eee 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -27,15 +27,8 @@ /** \file ghost/intern/GHOST_C-api.cpp * \ingroup GHOST - */ - - -/* - - * GHOST_C-Api.cpp * * C Api for GHOST - * */ #include <stdlib.h> diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp index 2e602f33b43..47121562604 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date October 25, 2001 diff --git a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp index 7752ae8cbc0..21798ed2d0a 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date September 21, 2001 diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp index fbfbce264a5..86f0380c8d6 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp @@ -177,7 +177,7 @@ GHOST_DisplayManagerSDL:: setCurrentDisplaySetting(GHOST_TUns8 display, } else { /* this is a problem for the BGE player :S, perhaps SDL2 will resolve at some point. - * we really need SDL_SetDisplayModeForDisplay() to become an API func! - campbell */ + * we really need SDL_SetDisplayModeForDisplay() to become an API func! - campbell */ printf("no windows available, cant fullscreen"); /* do not fail, we will try again later when the window is created - wander */ diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cpp index 0f07435d417..4142b19f21d 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp +++ b/intern/ghost/intern/GHOST_DropTargetWin32.cpp @@ -136,7 +136,7 @@ HRESULT __stdcall GHOST_DropTargetWin32::DragOver(DWORD grfKeyState, POINTL pt, } else { *pdwEffect = DROPEFFECT_NONE; - //*pdwEffect = DROPEFFECT_COPY; // XXX Uncomment to test drop. Drop will not be called if pdwEffect == DROPEFFECT_NONE. + // *pdwEffect = DROPEFFECT_COPY; // XXX Uncomment to test drop. Drop will not be called if pdwEffect == DROPEFFECT_NONE. } m_system->pushDragDropEvent(GHOST_kEventDraggingUpdated, m_draggedObjectType, m_window, pt.x, pt.y, NULL); return S_OK; diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index 4c03dad2e73..33e0afb797a 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 14, 2001 diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp index e983bd8214a..fe1132e7996 100644 --- a/intern/ghost/intern/GHOST_ISystem.cpp +++ b/intern/ghost/intern/GHOST_ISystem.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 7, 2001 diff --git a/intern/ghost/intern/GHOST_ISystemPaths.cpp b/intern/ghost/intern/GHOST_ISystemPaths.cpp index 0ad9dd48d2b..f84c50770f0 100644 --- a/intern/ghost/intern/GHOST_ISystemPaths.cpp +++ b/intern/ghost/intern/GHOST_ISystemPaths.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 7, 2001 diff --git a/intern/ghost/intern/GHOST_ModifierKeys.cpp b/intern/ghost/intern/GHOST_ModifierKeys.cpp index a02e6218891..ffc7a09e4dd 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.cpp +++ b/intern/ghost/intern/GHOST_ModifierKeys.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 31, 2001 diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index b25f24e653c..de475c79f43 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -76,8 +76,8 @@ protected: public: /*************************************************************************************** - ** Time(r) functionality - ***************************************************************************************/ + * Time(r) functionality + ***************************************************************************************/ /** * Returns the system time. @@ -110,8 +110,8 @@ public: virtual GHOST_TSuccess removeTimer(GHOST_ITimerTask *timerTask); /*************************************************************************************** - ** Display/window management functionality - ***************************************************************************************/ + * Display/window management functionality + ***************************************************************************************/ /** * Inherited from GHOST_ISystem but left pure virtual @@ -169,8 +169,8 @@ public: /*************************************************************************************** - ** Event management functionality - ***************************************************************************************/ + * Event management functionality + ***************************************************************************************/ /** * Inherited from GHOST_ISystem but left pure virtual @@ -202,8 +202,8 @@ public: virtual GHOST_TSuccess removeEventConsumer(GHOST_IEventConsumer *consumer); /*************************************************************************************** - ** Cursor management functionality - ***************************************************************************************/ + * Cursor management functionality + ***************************************************************************************/ /** Inherited from GHOST_ISystem but left pure virtual * GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const = 0; @@ -211,8 +211,8 @@ public: */ /*************************************************************************************** - ** Access to mouse button and keyboard states. - ***************************************************************************************/ + * Access to mouse button and keyboard states. + ***************************************************************************************/ /** * Returns the state of a modifier key (ouside the message queue). @@ -231,8 +231,8 @@ public: virtual GHOST_TSuccess getButtonState(GHOST_TButtonMask mask, bool& isDown) const; /*************************************************************************************** - ** Other (internal) functionality. - ***************************************************************************************/ + * Other (internal) functionality. + ***************************************************************************************/ /** * Pushes an event on the stack. diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp index 1e53e7f4291..ffb8388543b 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.cpp +++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 7, 2001 @@ -70,10 +69,10 @@ enum { const EventTypeSpec kEvents[] = { { kEventClassAppleEvent, kEventAppleEvent }, -/* - { kEventClassApplication, kEventAppActivated }, - { kEventClassApplication, kEventAppDeactivated }, - */ +#if 0 + { kEventClassApplication, kEventAppActivated }, + { kEventClassApplication, kEventAppDeactivated }, + #endif { kEventClassKeyboard, kEventRawKeyDown }, { kEventClassKeyboard, kEventRawKeyRepeat }, { kEventClassKeyboard, kEventRawKeyUp }, @@ -994,7 +993,7 @@ bool GHOST_SystemCarbon::handleMouseDown(EventRef event) * @see GHOST_SystemCarbon::handleWindowEvent(EventRef event) */ /* even worse: scale window also generates a load of events, and nothing - is handled (read: client's event proc called) until you release mouse (ton) */ + * is handled (read: client's event proc called) until you release mouse (ton) */ GHOST_ASSERT(validWindow(ghostWindow), "GHOST_SystemCarbon::handleMouseDown: invalid window"); m_ignoreWindowSizedMessages = true; diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index 47a7a6a9a73..cb4e9fe3c99 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -62,8 +62,8 @@ public: ~GHOST_SystemCocoa(); /*************************************************************************************** - ** Time(r) functionality - ***************************************************************************************/ + * Time(r) functionality + ***************************************************************************************/ /** * Returns the system time. @@ -74,8 +74,8 @@ public: virtual GHOST_TUns64 getMilliSeconds() const; /*************************************************************************************** - ** Display/window management functionality - ***************************************************************************************/ + * Display/window management functionality + ***************************************************************************************/ /** * Returns the number of displays on this system. @@ -119,8 +119,8 @@ public: ); /*************************************************************************************** - ** Event management functionality - ***************************************************************************************/ + * Event management functionality + ***************************************************************************************/ /** * Gets events from the system and stores them in the queue. @@ -154,8 +154,8 @@ public: GHOST_WindowCocoa *window, int mouseX, int mouseY, void *data); /*************************************************************************************** - ** Cursor management functionality - ***************************************************************************************/ + * Cursor management functionality + ***************************************************************************************/ /** * Returns the current location of the cursor (location in screen coordinates) @@ -174,8 +174,8 @@ public: virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y); /*************************************************************************************** - ** Access to mouse button and keyboard states. - ***************************************************************************************/ + * Access to mouse button and keyboard states. + ***************************************************************************************/ /** * Returns the state of all modifier keys. diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.h index f53d4f4a7b7..fe0fae71955 100644 --- a/intern/ghost/intern/GHOST_SystemPaths.h +++ b/intern/ghost/intern/GHOST_SystemPaths.h @@ -58,10 +58,10 @@ public: virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const = 0; /** - * Determine the base dir in which user configuration is stored, including versioning. - * If needed, it will create the base directory. - * @return Unsigned char string pointing to user dir (eg ~/.blender/). - */ + * Determine the base dir in which user configuration is stored, including versioning. + * If needed, it will create the base directory. + * @return Unsigned char string pointing to user dir (eg ~/.blender/). + */ virtual const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const = 0; /** diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index c2456fed800..6c201c24c3d 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -1093,7 +1093,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, system->storeModifierKeys(modifiers); event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window); /* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL - will not be dispatched to OUR active window if we minimize one of OUR windows. */ + * will not be dispatched to OUR active window if we minimize one of OUR windows. */ lResult = ::DefWindowProc(hwnd, msg, wParam, lParam); break; } @@ -1230,11 +1230,11 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, // Event found for a window before the pointer to the class has been set. GHOST_PRINT("GHOST_SystemWin32::wndProc: GHOST window event before creation\n"); /* These are events we typically miss at this point: - WM_GETMINMAXINFO 0x24 - WM_NCCREATE 0x81 - WM_NCCALCSIZE 0x83 - WM_CREATE 0x01 - We let DefWindowProc do the work. + * WM_GETMINMAXINFO 0x24 + * WM_NCCREATE 0x81 + * WM_NCCALCSIZE 0x83 + * WM_CREATE 0x01 + * We let DefWindowProc do the work. */ } } @@ -1274,7 +1274,7 @@ GHOST_TUns8 *GHOST_SystemWin32::getClipboard(bool selection) const temp_buff = alloc_utf_8_from_16(buffer, 0); /* Buffer mustn't be accessed after CloseClipboard - it would like accessing free-d memory */ + * it would like accessing free-d memory */ GlobalUnlock(hData); CloseClipboard(); @@ -1300,7 +1300,7 @@ GHOST_TUns8 *GHOST_SystemWin32::getClipboard(bool selection) const temp_buff[len] = '\0'; /* Buffer mustn't be accessed after CloseClipboard - it would like accessing free-d memory */ + * it would like accessing free-d memory */ GlobalUnlock(hData); CloseClipboard(); diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index c58ed93425d..2d8f5e7890c 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -566,7 +566,7 @@ GHOST_SystemX11::processEvent(XEvent *xe) } else if (status == XLookupKeySym) { /* this key doesn't have a text representation, it is a command - key of some sort */; + * key of some sort */; } else { printf("Bad keycode lookup. Keysym 0x%x Status: %s\n", @@ -745,11 +745,11 @@ GHOST_SystemX11::processEvent(XEvent *xe) case LeaveNotify: { /* XCrossingEvents pointer leave enter window. - also do cursor move here, MotionNotify only - happens when motion starts & ends inside window. - we only do moves when the crossing mode is 'normal' - (really crossing between windows) since some windowmanagers - also send grab/ungrab crossings for mousewheel events. + * also do cursor move here, MotionNotify only + * happens when motion starts & ends inside window. + * we only do moves when the crossing mode is 'normal' + * (really crossing between windows) since some windowmanagers + * also send grab/ungrab crossings for mousewheel events. */ XCrossingEvent &xce = xe->xcrossing; if (xce.mode == NotifyNormal) { @@ -1077,15 +1077,15 @@ convertXKey(KeySym key) type = GHOST_TKey(key - XK_F1 + int(GHOST_kKeyF1)); #if defined(__sun) || defined(__sun__) /* This is a bit of a hack, but it looks like sun - Used F11 and friends for its special keys Stop,again etc.. - So this little patch enables F11 and F12 to work as expected - following link has documentation on it: - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4734408 - also from /usr/include/X11/Sunkeysym.h - #define SunXK_F36 0x1005FF10 // Labeled F11 - #define SunXK_F37 0x1005FF11 // Labeled F12 - - mein@cs.umn.edu + * Used F11 and friends for its special keys Stop,again etc.. + * So this little patch enables F11 and F12 to work as expected + * following link has documentation on it: + * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4734408 + * also from /usr/include/X11/Sunkeysym.h + * #define SunXK_F36 0x1005FF10 // Labeled F11 + * #define SunXK_F37 0x1005FF11 // Labeled F12 + * + * mein@cs.umn.edu */ } diff --git a/intern/ghost/intern/GHOST_TimerManager.cpp b/intern/ghost/intern/GHOST_TimerManager.cpp index 4780a4a0d44..4ad28d6633d 100644 --- a/intern/ghost/intern/GHOST_TimerManager.cpp +++ b/intern/ghost/intern/GHOST_TimerManager.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 31, 2001 diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index d67b02fce6b..ca3366004d3 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 10, 2001 diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp index a6211b42fe6..2b7fb6686f2 100644 --- a/intern/ghost/intern/GHOST_WindowManager.cpp +++ b/intern/ghost/intern/GHOST_WindowManager.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 11, 2001 diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 81eefdfdc9c..e3fe28e2e64 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -31,7 +31,6 @@ /** - * Copyright (C) 2001 NaN Technologies B.V. * @author Maarten Gribnau * @date May 10, 2001 @@ -106,10 +105,10 @@ static PIXELFORMATDESCRIPTOR sPreferredFormat = { }; /* Intel videocards don't work fine with multiple contexts and - have to share the same context for all windows. - But if we just share context for all windows it could work incorrect - with multiple videocards configuration. Suppose, that Intel videocards - can't be in multiple-devices configuration. */ + * have to share the same context for all windows. + * But if we just share context for all windows it could work incorrect + * with multiple videocards configuration. Suppose, that Intel videocards + * can't be in multiple-devices configuration. */ static int is_crappy_intel_card(void) { int crappy = 0; @@ -1279,8 +1278,8 @@ GHOST_TSuccess GHOST_WindowWin32::endProgressBar() return GHOST_kFailure; } -/* Ron Fosner's code for weighting pixel formats and forcing software. - See http://www.opengl.org/resources/faq/technical/weight.cpp */ +/* Ron Fosner's code for weighting pixel formats and forcing software. + * See http://www.opengl.org/resources/faq/technical/weight.cpp */ static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) { @@ -1335,7 +1334,7 @@ static int EnumPixelFormats(HDC hdc) sizeof(PIXELFORMATDESCRIPTOR), &pfd); /* choose a pixel format using the useless Windows function in case - we come up empty handed */ + * we come up empty handed */ iPixelFormat = ::ChoosePixelFormat(hdc, &sPreferredFormat); if (!iPixelFormat) return 0; /* couldn't find one to use */ diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 1f4111c8cf3..cdb274b0e61 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -228,7 +228,7 @@ GHOST_WindowX11( m_visual = glXChooseVisual(m_display, DefaultScreen(m_display), attributes); /* Any sample level or even zero, which means oversampling disabled, is good - but we need a valid visual to continue */ + * but we need a valid visual to continue */ if (m_visual == NULL) { if (samples == 0) { /* All options exhausted, cannot continue */ @@ -1155,8 +1155,8 @@ setOrder( Atom atom; /* We use both XRaiseWindow and _NET_ACTIVE_WINDOW, since some - window managers ignore the former (e.g. kwin from kde) and others - don't implement the latter (e.g. fluxbox pre 0.9.9) */ + * window managers ignore the former (e.g. kwin from kde) and others + * don't implement the latter (e.g. fluxbox pre 0.9.9) */ XRaiseWindow(m_display, m_window); diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index c32d78f0358..98e2b9c2497 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -26,7 +26,6 @@ */ /** - * Copyright (C) 2001 NaN Technologies B.V. * * Simple test file for the GHOST library. @@ -294,14 +293,14 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) switch (GHOST_GetEventType(hEvent)) { - /* - case GHOST_kEventUnknown: - break; - case GHOST_kEventCursorButton: - break; - case GHOST_kEventCursorMove: - break; - */ +#if 0 + case GHOST_kEventUnknown: + break; + case GHOST_kEventCursorButton: + break; + case GHOST_kEventCursorMove: + break; +#endif case GHOST_kEventWheel: { wheelData = (GHOST_TEventWheelData *)GHOST_GetEventData(hEvent); @@ -345,10 +344,10 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) setting.yPixels = 480; /* - setting.bpp = 16; - setting.frequency = 75; - setting.xPixels = 640; - setting.yPixels = 480; + * setting.bpp = 16; + * setting.frequency = 75; + * setting.xPixels = 640; + * setting.yPixels = 480; */ sFullScreenWindow = GHOST_BeginFullScreen(shSystem, &setting, diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index d338f11ddde..c02272094f4 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -1,4 +1,4 @@ -/** +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -26,7 +26,6 @@ */ /** - * Copyright (C) 2001 NaN Technologies B.V. * Simple test file for the GHOST library. * The OpenGL gear code is taken from the Qt sample code which, @@ -344,27 +343,27 @@ void StereoProjection(float left, float right, float bottom, float top, float ne float zero_plane, float dist, float eye) /* Perform the perspective projection for one eye's subfield. - The projection is in the direction of the negative z axis. - - -6.0, 6.0, -4.8, 4.8, - left, right, bottom, top = the coordinate range, in the plane of zero - parallax setting, which will be displayed on the screen. The - ratio between (right-left) and (top-bottom) should equal the aspect - ratio of the display. - - 6.0, -6.0, - near, far = the z-coordinate values of the clipping planes. - - 0.0, - zero_plane = the z-coordinate of the plane of zero parallax setting. - - 14.5, - dist = the distance from the center of projection to the plane - of zero parallax. - - -0.31 - eye = half the eye separation; positive for the right eye subfield, - negative for the left eye subfield. + * The projection is in the direction of the negative z axis. + * + * -6.0, 6.0, -4.8, 4.8, + * left, right, bottom, top = the coordinate range, in the plane of zero + * parallax setting, which will be displayed on the screen. The + * ratio between (right-left) and (top-bottom) should equal the aspect + * ratio of the display. + * + * 6.0, -6.0, + * near, far = the z-coordinate values of the clipping planes. + * + * 0.0, + * zero_plane = the z-coordinate of the plane of zero parallax setting. + * + * 14.5, + * dist = the distance from the center of projection to the plane + * of zero parallax. + * + * -0.31 + * eye = half the eye separation; positive for the right eye subfield, + * negative for the left eye subfield. */ { float xmid, ymid, clip_near, clip_far, topw, bottomw, leftw, rightw, @@ -462,13 +461,14 @@ bool Application::processEvent(GHOST_IEvent *event) bool handled = true; switch (event->getType()) { -/* case GHOST_kEventUnknown: - break; - case GHOST_kEventCursorButton: - std::cout << "GHOST_kEventCursorButton"; break; - case GHOST_kEventCursorMove: - std::cout << "GHOST_kEventCursorMove"; break; - */ +#if 0 + case GHOST_kEventUnknown: + break; + case GHOST_kEventCursorButton: + std::cout << "GHOST_kEventCursorButton"; break; + case GHOST_kEventCursorMove: + std::cout << "GHOST_kEventCursorMove"; break; + #endif case GHOST_kEventWheel: { GHOST_TEventWheelData *wheelData = (GHOST_TEventWheelData *) event->getData(); |