FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for --show-cursor and --hide-cursor command line options, and P3D_SHOW_CURSOR env var that can be set to YES or NO.

Browse Source
This commit is contained in:
Robert Osfield 2013-01-07 12:41:16 +00:00
parent e76e3a7b1b
commit 04ae78ac9b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/present3D/present3D.cpp
View File

@ -539,6 +539,12 @@ int main( int argc, char **argv )
std::string cursorFileName( p3dCursor ? p3dCursor : ""); std::string cursorFileName( p3dCursor ? p3dCursor : "");
while (arguments.read("--cursor",cursorFileName)) {} while (arguments.read("--cursor",cursorFileName)) {}
const char* p3dShowCursor = getenv("P3D_SHOW_CURSOR");
std::string showCursor( p3dShowCursor ? p3dShowCursor : "YES");
while (arguments.read("--show-cursor")) { showCursor="YES"; }
while (arguments.read("--hide-cursor")) { showCursor="NO"; }
bool hideCursor = (showCursor=="No" || showCursor=="NO" || showCursor=="no");
while (arguments.read("--set-viewer")) { doSetViewer = true; } while (arguments.read("--set-viewer")) { doSetViewer = true; }
@ -836,7 +842,7 @@ int main( int argc, char **argv )
} }
if (!cursorFileName.empty()) if (!cursorFileName.empty() || hideCursor)
{ {
// have to add a frame in here to avoid problems with X11 threading issue on switching off the cursor // have to add a frame in here to avoid problems with X11 threading issue on switching off the cursor
// not yet sure why it makes a difference, but it at least fixes the crash that would otherwise occur // not yet sure why it makes a difference, but it at least fixes the crash that would otherwise occur