#include <simgear/compiler.h>
-#ifdef HAVE_WINDOWS_H
-# include <windows.h>
-#endif
-
-#include SG_GL_H
-
-#if defined(FX) && defined(XMESA)
-# include <GL/xmesa.h>
-#endif
-
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
+#include <cstring>
+#include <sstream>
#include <stdlib.h>
-#include <string.h>
-// for help call back
-#ifdef WIN32
-# include <shellapi.h>
-# ifdef __CYGWIN__
-# include <sys/cygwin.h>
-# endif
-#endif
-
-#include <sstream>
-
-#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/screen/screen-dump.hxx>
-#include <Include/general.hxx>
-#include <Aircraft/aircraft.hxx>
-#include <Aircraft/controls.hxx>
-#include <Airports/simple.hxx>
#include <Cockpit/panel.hxx>
-#include <FDM/flight.hxx>
-#include <Main/main.hxx>
-#include <Main/fg_init.hxx>
-#include <Main/fg_io.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
+#include <Main/fg_os.hxx>
#include <Main/renderer.hxx>
#include <Main/viewmgr.hxx>
#include <GUI/new_gui.hxx>
-#if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
-# include <simgear/screen/win32-printer.h>
-# include <simgear/screen/GlBitmaps.h>
+#ifdef _WIN32
+# include <shellapi.h>
#endif
#include "gui.h"
-SG_USING_STD(string);
-SG_USING_STD(cout);
+using std::string;
#if defined( TR_HIRES_SNAP)
{"dumpHiResSnapShot", fgHiResDumpWrapper},
#endif
{"dumpSnapShot", fgDumpSnapShotWrapper},
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
- {"printScreen", printScreen},
-#endif
// Help
{"helpCb", helpCb},
string msg = txt;
msg += '\n';
msg += throwable.getFormattedMessage();
- if (!throwable.getOrigin().empty()) {
+ if (!std::strlen(throwable.getOrigin()) != 0) {
msg += "\n (reported by ";
msg += throwable.getOrigin();
msg += ')';
{
string command;
-#if defined(FX) && !defined(WIN32)
-# if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
- if ( globals->get_fullscreen() ) {
- globals->set_fullscreen(false);
- XMesaSetFXmode( XMESA_FX_WINDOW );
- }
-# endif
-#endif
-
SGPath path( globals->get_fg_root() );
path.append( "Docs/index.html" );
-#if !defined(WIN32)
+#ifndef _WIN32
command = globals->get_browser();
string::size_type pos;
command += " &";
system( command.c_str() );
-#else // WIN32
+#else // _WIN32
// Look for favorite browser
char Dummy[1024], ExecName[1024], browserParameter[1024];
{
FILE *f;
string message;
- bool show_pu_cursor = false;
bool menu_status = fgGetBool("/sim/menubar/visibility");
char *filename = new char [24];
static int count = 1;
}
fgSetBool("/sim/menubar/visibility", false);
- TurnCursorOff();
- if ( !puCursorIsHidden() ) {
- show_pu_cursor = true;
- puHideCursor();
- }
+ int mouse = fgGetMouseCursor();
+ fgSetMouseCursor(MOUSE_CURSOR_NONE);
FGRenderer *renderer = globals->get_renderer();
// renderer->init();
/* allocate buffer large enough to store one tile */
GLubyte *tile = (GLubyte *)malloc(width * height * 3 * sizeof(GLubyte));
if (!tile) {
+ delete [] filename;
printf("Malloc of tile buffer failed!\n");
return;
}
GLubyte *buffer
= (GLubyte *)malloc(imageWidth * height * 3 * sizeof(GLubyte));
if (!buffer) {
+ delete [] filename;
free(tile);
printf("Malloc of tile row buffer failed!\n");
return;
f = fopen(filename, "wb");
if (!f) {
printf("Couldn't open image file: %s\n", filename);
+ delete [] filename;
free(buffer);
free(tile);
return;
/* just to be safe... */
glPixelStorei(GL_PACK_ALIGNMENT, 1);
+ // OSGFIXME
+#if 0
/* Because the HUD and Panel change the ViewPort we will
* need to handle some lowlevel stuff ourselves */
int ncols = trGet(tr, TR_COLUMNS);
bool do_panel = fgPanelVisible();
GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
-
+#endif
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
while (more) {
trBeginTile(tr);
int curColumn = trGet(tr, TR_CURRENT_COLUMN);
- int curRow = trGet(tr, TR_CURRENT_ROW);
+ // int curRow = trGet(tr, TR_CURRENT_ROW);
renderer->update( false );
// OSGFIXME
delete [] filename;
- if ( show_pu_cursor ) {
- puShowCursor();
- }
-
- TurnCursorOn();
+ fgSetMouseCursor(mouse);
fgSetBool("/sim/menubar/visibility", menu_status);
if ( !freeze ) {
}
#endif // #if defined( TR_HIRES_SNAP)
-
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-
-void rotateView( double roll, double pitch, double yaw )
-{
- // rotate view
-}
-
-GlBitmap *b1 = NULL;
-GLubyte *hiResScreenCapture( int multiplier )
-{
- float oldfov = fgGetDouble("/sim/current-view/field-of-view");
- float fov = oldfov / multiplier;
- FGViewer *v = globals->get_current_view();
- fgSetDouble("/sim/current-view/field-of-view", fov);
-// globals->get_renderer()->init();
- int cur_width = fgGetInt("/sim/startup/xsize");
- int cur_height = fgGetInt("/sim/startup/ysize");
- delete( b1 );
- // New empty (mostly) bitmap
- b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" );
- int x,y;
- for ( y = 0; y < multiplier; y++ ) {
- for ( x = 0; x < multiplier; x++ ) {
- globals->get_renderer()->resize( cur_width, cur_height );
- // pan to tile
- rotateView( 0, (y*fov)-((multiplier-1)*fov/2), (x*fov)-((multiplier-1)*fov/2) );
- globals->get_renderer()->update( false );
- // restore view
- GlBitmap b2;
- b1->copyBitmap( &b2, cur_width*x, cur_height*y );
- }
- }
- fgSetDouble("/sim/current-view/field-of-view", oldfov);
- return b1->getBitmap();
-}
-#endif
-
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-// win32 print screen function
-void printScreen () {
- bool show_pu_cursor = false;
- TurnCursorOff();
- if ( !puCursorIsHidden() ) {
- show_pu_cursor = true;
- puHideCursor();
- }
-
- CGlPrinter p( CGlPrinter::PRINT_BITMAP );
- int cur_width = fgGetInt("/sim/startup/xsize");
- int cur_height = fgGetInt("/sim/startup/ysize");
- p.Begin( "FlightGear", cur_width*3, cur_height*3 );
- p.End( hiResScreenCapture(3) );
-
- if ( show_pu_cursor ) {
- puShowCursor();
- }
- TurnCursorOn();
-}
-#endif // #ifdef WIN32
-
-
void fgDumpSnapShotWrapper () {
fgDumpSnapShot();
}
// do a screen snap shot
bool fgDumpSnapShot () {
- bool show_pu_cursor = false;
static SGConstPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master");
bool freeze = master_freeze->getBoolValue();
fgSetBool("/sim/freeze/master", true);
}
- TurnCursorOff();
- if ( !puCursorIsHidden() ) {
- show_pu_cursor = true;
- puHideCursor();
- }
+ int mouse = fgGetMouseCursor();
+ fgSetMouseCursor(MOUSE_CURSOR_NONE);
+
fgSetBool("/sim/signals/screenshot", true);
FGRenderer *renderer = globals->get_renderer();
renderer->update( true );
renderer->update( true );
- string dir = fgGetString("/sim/paths/screenshot-dir", fgGetString("/sim/fg-current"));
+ string dir = fgGetString("/sim/paths/screenshot-dir");
+ if (dir.empty())
+ dir = fgGetString("/sim/fg-current");
+
SGPath path(dir + '/');
if (path.create_dir( 0755 )) {
SG_LOG(SG_GENERAL, SG_ALERT, "Cannot create screenshot directory '"
char filename[24];
static int count = 1;
while (count < 1000) {
- snprintf(filename, 24, "fgfs-screen-%03d.ppm", count++);
+ snprintf(filename, 24, "fgfs-screen-%03d.png", count++);
SGPath p(dir);
p.append(filename);
fgSetString("/sim/paths/screenshot-last", path.c_str());
fgSetBool("/sim/signals/screenshot", false);
- if ( show_pu_cursor ) {
- puShowCursor();
- }
-
- TurnCursorOn();
+ fgSetMouseCursor(mouse);
if ( !freeze ) {
fgSetBool("/sim/freeze/master", false);
string message;
static int count = 1;
- FGRenderer *renderer = globals->get_renderer();
-
static const SGPropertyNode *master_freeze
= fgGetNode("/sim/freeze/master");
string message;
static int count = 1;
- FGRenderer *renderer = globals->get_renderer();
-
static const SGPropertyNode *master_freeze
= fgGetNode("/sim/freeze/master");
projects / flightgear.git / blobdiff