[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46787] trunk/blender/intern/ghost/intern: style cleanup: ghost/x11
Campbell Barton
ideasman42 at gmail.com
Fri May 18 22:13:42 CEST 2012
Revision: 46787
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46787
Author: campbellbarton
Date: 2012-05-18 20:13:40 +0000 (Fri, 18 May 2012)
Log Message:
-----------
style cleanup: ghost/x11
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.h
trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h
trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemPathsX11.h
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowX11.h
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp 2012-05-18 20:04:43 UTC (rev 46786)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp 2012-05-18 20:13:40 UTC (rev 46787)
@@ -43,30 +43,29 @@
GHOST_DisplayManagerX11::
GHOST_DisplayManagerX11(
- GHOST_SystemX11 *system
-) :
+ GHOST_SystemX11 *system
+ ) :
GHOST_DisplayManager(),
m_system(system)
{
//nothing to do.
}
- GHOST_TSuccess
+GHOST_TSuccess
GHOST_DisplayManagerX11::
-getNumDisplays(
- GHOST_TUns8& numDisplays
-) const{
+getNumDisplays(GHOST_TUns8& numDisplays) const
+{
numDisplays = m_system->getNumDisplays();
return GHOST_kSuccess;
}
- GHOST_TSuccess
+GHOST_TSuccess
GHOST_DisplayManagerX11::
getNumDisplaySettings(
- GHOST_TUns8 display,
- GHOST_TInt32& numSettings
-) const{
+ GHOST_TUns8 display,
+ GHOST_TInt32& numSettings) const
+{
#ifdef WITH_X11_XF86VMODE
int majorVersion, minorVersion;
XF86VidModeModeInfo **vidmodes;
@@ -96,13 +95,13 @@
return GHOST_kSuccess;
}
- GHOST_TSuccess
+GHOST_TSuccess
GHOST_DisplayManagerX11::
getDisplaySetting(
- GHOST_TUns8 display,
- GHOST_TInt32 index,
- GHOST_DisplaySetting& setting
-) const {
+ GHOST_TUns8 display,
+ GHOST_TInt32 index,
+ GHOST_DisplaySetting& setting) const
+{
#ifdef WITH_X11_XF86VMODE
int majorVersion, minorVersion;
@@ -128,13 +127,13 @@
setting.xPixels = vidmodes[index]->hdisplay;
setting.yPixels = vidmodes[index]->vdisplay;
- setting.bpp = DefaultDepth(dpy,DefaultScreen(dpy));
+ setting.bpp = DefaultDepth(dpy, DefaultScreen(dpy));
#else
GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n");
GHOST_ASSERT(index < 1, "Requested setting outside of valid range.\n");
- Display * x_display = m_system->getXDisplay();
+ Display *x_display = m_system->getXDisplay();
if (x_display == NULL) {
return GHOST_kFailure;
@@ -142,7 +141,7 @@
setting.xPixels = DisplayWidth(x_display, DefaultScreen(x_display));
setting.yPixels = DisplayHeight(x_display, DefaultScreen(x_display));
- setting.bpp = DefaultDepth(x_display,DefaultScreen(x_display));
+ setting.bpp = DefaultDepth(x_display, DefaultScreen(x_display));
#endif
// Don't think it's possible to get this value from X!
@@ -152,25 +151,25 @@
return GHOST_kSuccess;
}
- GHOST_TSuccess
+GHOST_TSuccess
GHOST_DisplayManagerX11::
getCurrentDisplaySetting(
- GHOST_TUns8 display,
- GHOST_DisplaySetting& setting
-) const {
+ GHOST_TUns8 display,
+ GHOST_DisplaySetting& setting) const
+{
/* According to the xf86vidmodegetallmodelines man page,
* "The first element of the array corresponds to the current video mode."
*/
- return getDisplaySetting(display,GHOST_TInt32(0),setting);
+ return getDisplaySetting(display, GHOST_TInt32(0), setting);
}
- GHOST_TSuccess
+GHOST_TSuccess
GHOST_DisplayManagerX11::
setCurrentDisplaySetting(
- GHOST_TUns8 display,
- const GHOST_DisplaySetting& setting
-){
+ GHOST_TUns8 display,
+ const GHOST_DisplaySetting& setting)
+{
#ifdef WITH_X11_XF86VMODE
//
// Mode switching code ported from Quake 2:
@@ -196,7 +195,7 @@
}
# ifdef _DEBUG
printf("Using XFree86-VidModeExtension Version %d.%d\n",
- majorVersion, minorVersion);
+ majorVersion, minorVersion);
# endif
/* The X11 man page says vidmodes needs to be freed, but doing so causes a
@@ -208,7 +207,7 @@
for (int i = 0; i < num_vidmodes; i++) {
if (setting.xPixels > vidmodes[i]->hdisplay ||
- setting.yPixels > vidmodes[i]->vdisplay)
+ setting.yPixels > vidmodes[i]->vdisplay)
continue;
x = setting.xPixels - vidmodes[i]->hdisplay;
@@ -226,7 +225,7 @@
actualWidth = vidmodes[best_fit]->hdisplay;
actualHeight = vidmodes[best_fit]->vdisplay;
printf("Switching to video mode %dx%d\n",
- actualWidth, actualHeight);
+ actualWidth, actualHeight);
# endif
// change to the mode
@@ -234,7 +233,8 @@
// Move the viewport to top left
XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
- } else
+ }
+ else
return GHOST_kFailure;
XFlush(dpy);
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.h 2012-05-18 20:04:43 UTC (rev 46786)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.h 2012-05-18 20:13:40 UTC (rev 46787)
@@ -50,18 +50,18 @@
* Constructor.
*/
GHOST_DisplayManagerX11(
- GHOST_SystemX11 *system
- );
+ GHOST_SystemX11 *system
+ );
/**
* Returns the number of display devices on this system.
* @param numDisplays The number of displays on this system.
* @return Indication of success.
*/
- GHOST_TSuccess
+ GHOST_TSuccess
getNumDisplays(
- GHOST_TUns8& numDisplays
- ) const;
+ GHOST_TUns8& numDisplays
+ ) const;
/**
* Returns the number of display settings for this display device.
@@ -69,11 +69,11 @@
* @param setting The number of settings of the display device with this index.
* @return Indication of success.
*/
- GHOST_TSuccess
+ GHOST_TSuccess
getNumDisplaySettings(
- GHOST_TUns8 display,
- GHOST_TInt32& numSettings
- ) const;
+ GHOST_TUns8 display,
+ GHOST_TInt32& numSettings
+ ) const;
/**
* Returns the current setting for this display device.
@@ -82,12 +82,12 @@
* @param setting The setting of the display device with this index.
* @return Indication of success.
*/
- GHOST_TSuccess
+ GHOST_TSuccess
getDisplaySetting(
- GHOST_TUns8 display,
- GHOST_TInt32 index,
- GHOST_DisplaySetting& setting
- ) const;
+ GHOST_TUns8 display,
+ GHOST_TInt32 index,
+ GHOST_DisplaySetting& setting
+ ) const;
/**
* Returns the current setting for this display device.
@@ -95,11 +95,11 @@
* @param setting The current setting of the display device with this index.
* @return Indication of success.
*/
- GHOST_TSuccess
+ GHOST_TSuccess
getCurrentDisplaySetting(
- GHOST_TUns8 display,
- GHOST_DisplaySetting& setting
- ) const;
+ GHOST_TUns8 display,
+ GHOST_DisplaySetting& setting
+ ) const;
/**
* Changes the current setting for this display device.
@@ -107,15 +107,15 @@
* @param setting The current setting of the display device with this index.
* @return Indication of success.
*/
- GHOST_TSuccess
+ GHOST_TSuccess
setCurrentDisplaySetting(
- GHOST_TUns8 display,
- const GHOST_DisplaySetting& setting
- );
+ GHOST_TUns8 display,
+ const GHOST_DisplaySetting& setting
+ );
-private :
+private:
- GHOST_SystemX11 * m_system;
+ GHOST_SystemX11 *m_system;
};
Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp 2012-05-18 20:04:43 UTC (rev 46786)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp 2012-05-18 20:13:40 UTC (rev 46787)
@@ -37,8 +37,8 @@
bool GHOST_DropTargetX11::m_xdndInitialized = false;
DndClass GHOST_DropTargetX11::m_dndClass;
-Atom * GHOST_DropTargetX11::m_dndTypes = NULL;
-Atom * GHOST_DropTargetX11::m_dndActions = NULL;
+Atom *GHOST_DropTargetX11::m_dndTypes = NULL;
+Atom *GHOST_DropTargetX11::m_dndActions = NULL;
const char *GHOST_DropTargetX11::m_dndMimeTypes[] = {"url/url", "text/uri-list", "text/plain", "application/octet-stream"};
int GHOST_DropTargetX11::m_refCounter = 0;
@@ -55,13 +55,13 @@
void GHOST_DropTargetX11::Initialize(void)
{
Display *display = m_system->getXDisplay();
- int dndTypesCount = sizeof(m_dndMimeTypes) / sizeof(char*);
+ int dndTypesCount = sizeof(m_dndMimeTypes) / sizeof(char *);
int counter;
xdnd_init(&m_dndClass, display);
m_dndTypes = new Atom[dndTypesCount + 1];
- XInternAtoms(display, (char**)m_dndMimeTypes, dndTypesCount, 0, m_dndTypes);
+ XInternAtoms(display, (char **)m_dndMimeTypes, dndTypesCount, 0, m_dndTypes);
m_dndTypes[dndTypesCount] = 0;
m_dndActions = new Atom[8];
@@ -86,10 +86,10 @@
xdnd_shut(&m_dndClass);
}
-GHOST_DropTargetX11::GHOST_DropTargetX11(GHOST_WindowX11 * window, GHOST_SystemX11 * system)
-:
-m_window(window),
-m_system(system)
+GHOST_DropTargetX11::GHOST_DropTargetX11(GHOST_WindowX11 *window, GHOST_SystemX11 *system)
+ :
+ m_window(window),
+ m_system(system)
{
if (!m_xdndInitialized) {
Initialize();
@@ -177,7 +177,7 @@
assert(strlen(decodedOut) < bufferSize);
// Concatenate this character onto the output
- strncat(decodedOut, (char*)&asciiCharacter, 1);
+ strncat(decodedOut, (char *)&asciiCharacter, 1);
// Skip the next character
i++;
@@ -188,7 +188,7 @@
char *GHOST_DropTargetX11::FileUrlDecode(char *fileUrl)
{
- if(!strncpy(fileUrl, "file://", 7) == 0) {
+ if (!strncpy(fileUrl, "file://", 7) == 0) {
/* assume one character of encoded URL can be expanded to 4 chars max */
int decodedSize = 4 * strlen(fileUrl) + 1;
char *decodedPath = (char *)malloc(decodedSize);
@@ -217,9 +217,9 @@
else curLength++;
}
- strArray = (GHOST_TStringArray*)malloc(sizeof(GHOST_TStringArray));
+ strArray = (GHOST_TStringArray *)malloc(sizeof(GHOST_TStringArray));
strArray->count = 0;
- strArray->strings = (GHOST_TUns8**)malloc(totPaths*sizeof(GHOST_TUns8*));
+ strArray->strings = (GHOST_TUns8 **)malloc(totPaths * sizeof(GHOST_TUns8 *));
curLength = 0;
for (int i = 0; i <= dropBufferSize; i++) {
@@ -228,12 +228,12 @@
char *curPath = (char *)malloc(curLength + 1);
char *decodedPath;
- strncpy(curPath, (char*)dropBuffer + i - curLength, curLength);
+ strncpy(curPath, (char *)dropBuffer + i - curLength, curLength);
curPath[curLength] = 0;
decodedPath = FileUrlDecode(curPath);
- if(decodedPath) {
- strArray->strings[strArray->count] = (GHOST_TUns8*)decodedPath;
+ if (decodedPath) {
+ strArray->strings[strArray->count] = (GHOST_TUns8 *)decodedPath;
strArray->count++;
}
Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h 2012-05-18 20:04:43 UTC (rev 46786)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h 2012-05-18 20:13:40 UTC (rev 46787)
@@ -47,7 +47,7 @@
* @param window The window to register as drop target.
* @param system The associated system.
*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list