X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui_funcs.cxx;h=a4a30ee62e8ecb8619907c07976b4a347c98eec4;hb=db2ef57049102506238db6c98199af6314da8c9c;hp=0e54ff1cbf12aa57b76c95c462eccecf64a1cc51;hpb=b6e4238dfa220306c456b4555c5496cf20a02d18;p=flightgear.git

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 0e54ff1cb..a4a30ee62 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -40,7 +40,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>
@@ -69,20 +69,16 @@
 #include <Aircraft/aircraft.hxx>
 #include <Airports/simple.hxx>
 #include <Autopilot/auto_gui.hxx>
-#include <Autopilot/newauto.hxx>
 #include <Cockpit/panel.hxx>
 #include <Controls/controls.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/viewmgr.hxx>
 
-#ifdef FG_NETWORK_OLK
-#include <NetworkOLK/network.h>
-#endif
-   
 #if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
 #  include <simgear/screen/win32-printer.h>
 #  include <simgear/screen/GlBitmaps.h>
@@ -90,7 +86,6 @@
 
 #include "gui.h"
 #include "gui_local.hxx"
-#include "net_dlg.hxx"
 #include "preset_dlg.hxx"
 #include "prop_picker.hxx"
 #include "sgVec3Slider.hxx"
@@ -98,20 +93,11 @@
 SG_USING_STD(string);
 SG_USING_STD(cout);
 
-// main.cxx hack, should come from an include someplace
-extern void fgInitVisuals( void );
-extern void fgReshape( int width, int height );
-extern void fgRenderFrame( void );
-
 extern void fgHUDalphaAdjust( puObject * );
 
 // from cockpit.cxx
 extern void fgLatLonFormatToggle( puObject *);
 
-#ifdef FG_NETWORK_OLK
-extern void net_fgd_scan(puObject *cb);
-#endif // #ifdef FG_NETWORK_OLK
-
 #if defined( TR_HIRES_SNAP)
 #include <simgear/screen/tr.h>
 extern void trRenderFrame( void );
@@ -119,10 +105,6 @@ extern void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
                          GLfloat x_end, GLfloat y_end );
 #endif
 
-#if defined(FG_OLD_MENUBAR)
-extern puMenuBar    *mainMenuBar;
-#endif
-
 puDialogBox  *dialogBox = 0;
 puFrame      *dialogFrame = 0;
 puText       *dialogBoxMessage = 0;
@@ -178,22 +160,12 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
         {"fgPresetAirspeed", fgPresetAirspeed},
         {"fgPresetCommit", fgPresetCommit},
 
-        // Network
-#ifdef FG_NETWORK_OLK
-        {"net_display_toggle", net_display_toggle},
-        {"NewCallSign", NewCallSign},
-        {"net_fgd_scan", net_fgd_scan},
-        {"net_register", net_register},
-        {"net_unregister", net_unregister},
-#endif
-
         // Autopilot
         {"NewAltitude", NewAltitude},
 	{"NewHeading", NewHeading},
         {"AddWayPoint", AddWayPoint},
         {"PopWayPoint", PopWayPoint},
         {"ClearRoute", ClearRoute},
-        {"fgAPAdjust", fgAPAdjust},
         {"fgLatLonFormatToggle", fgLatLonFormatToggle},
 
         // Help
@@ -247,28 +219,6 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
       mkDialog(msg.c_str());
 }
 
-#if defined(FG_OLD_MENUBAR)
-// Toggle the Menu and Mouse display state
-void guiToggleMenu(void)
-{
-    if( gui_menu_on ) {
-        // printf("Hiding Menu\n");
-        mainMenuBar->hide  ();
-#if defined(WIN32_CURSOR_TWEAKS_OFF)
-        if( mouse_mode == MOUSE_POINTER )
-            TurnCursorOff();
-#endif // WIN32_CURSOR_TWEAKS_OFF
-    } else {
-        // printf("Showing Menu\n");
-        mainMenuBar->reveal();
-#ifdef WIN32
-        TurnCursorOn();
-#endif // WIN32
-    }
-    gui_menu_on = ~gui_menu_on;
-}
-#endif // FG_OLD_MENUBAR
-
 // Intercept the Escape Key
 void ConfirmExitDialog(void)
 {
@@ -313,7 +263,7 @@ void SaveDialogOk(puObject*) {
     SaveDialogInput->getValue(&s);
 
     ofstream output(s);
-    cout << saveFile << endl;
+    // cout << saveFile << endl;
     if (output.good() && fgSaveFlight(output)) {
 	output.close();
 	mkDialog("Saved flight");
@@ -428,26 +378,12 @@ void guiTogglePanel(puObject *cb)
 	    fgGetInt("/sim/startup/ysize"));
 }
 
-#if defined(FG_OLD_MENUBAR)    
-//void MenuHideMenuCb(puObject *cb)
-void hideMenuCb (puObject *cb)
-{
-    guiToggleMenu();
-}
-#endif
-
 void goodBye(puObject *)
 {
     // SG_LOG( SG_INPUT, SG_ALERT,
     //      "Program exiting normally at user request." );
     cout << "Program exiting normally at user request." << endl;
 
-#ifdef FG_NETWORK_OLK    
-    if ( fgGetBool("/sim/networking/network-olk") ) {
-	if ( net_is_registered == 0 ) fgd_send_com( "8", FGFS_host);
-    }
-#endif
-
     // close all external I/O connections
     globals->get_io()->shutdown_all();
 
@@ -591,13 +527,6 @@ void fgHiResDump()
         fgSetBool("/sim/freeze/master", true);
     }
 
-#if defined(FG_OLD_MENUBAR)
-    if(gui_menu_on) {
-        show_menu = true;
-        guiToggleMenu();
-    }
-#endif
-	
     if ( !puCursorIsHidden() ) {
         show_pu_cursor = true;
         puHideCursor();
@@ -693,8 +622,8 @@ void fgHiResDump()
     GLfloat hud_row_step = 480.0 / nrows;
 	
     bool do_panel = fgPanelVisible();
-    GLfloat panel_col_step = current_panel->getWidth() / ncols;
-    GLfloat panel_row_step = current_panel->getHeight() / nrows;
+    GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
+    GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
 	
     /* Draw tiles */
     int more = 1;
@@ -707,7 +636,8 @@ void fgHiResDump()
             fgUpdateHUD( curColumn*hud_col_step,      curRow*hud_row_step,
                          (curColumn+1)*hud_col_step, (curRow+1)*hud_row_step );
         if (do_panel)
-            current_panel->update( curColumn*panel_col_step, panel_col_step,
+            globals->get_current_panel()->update(
+                                   curColumn*panel_col_step, panel_col_step,
                                    curRow*panel_row_step,    panel_row_step );
         more = trEndTile(tr);
 
@@ -757,11 +687,6 @@ void fgHiResDump()
 
     delete [] filename;
 
-#if defined(FG_OLD_MENUBAR)
-    if( show_menu )
-        guiToggleMenu();
-#endif
-
     if ( show_pu_cursor ) {
         puShowCursor();
     }
@@ -820,9 +745,6 @@ void printScreen ( puObject *obj ) {
 	puHideCursor();
     }
     // BusyCursor( 0 );
-#if defined(FG_OLD_MENUBAR)
-    mainMenuBar->hide();
-#endif
 
     CGlPrinter p( CGlPrinter::PRINT_BITMAP );
     int cur_width = fgGetInt("/sim/startup/xsize");
@@ -830,11 +752,6 @@ void printScreen ( puObject *obj ) {
     p.Begin( "FlightGear", cur_width*3, cur_height*3 );
 	p.End( hiResScreenCapture(3) );
 
-#if defined(FG_OLD_MENUBAR)
-    if( gui_menu_on ) {
-	mainMenuBar->reveal();
-    }
-#endif
     // BusyCursor(1);
     if ( show_pu_cursor ) {
 	puShowCursor();
@@ -869,9 +786,6 @@ void fgDumpSnapShot () {
         fgSetBool("/sim/freeze/master", true);
     }
 
-#if defined(FG_OLD_MENUBAR)
-    mainMenuBar->hide();
-#endif
     TurnCursorOff();
     if ( !puCursorIsHidden() ) {
 	show_pu_cursor = true;
@@ -915,36 +829,9 @@ void fgDumpSnapShot () {
     }
 
     TurnCursorOn();
-#if defined(FG_OLD_MENUBAR)
-    if( gui_menu_on ) {
-	mainMenuBar->reveal();
-    }
-#endif
 
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);
     }
 }
 
-#ifdef FG_NETWORK_OLK
-void net_display_toggle( puObject *cb)
-{
-	net_hud_display = (net_hud_display) ? 0 : 1;
-	printf("Toggle net_hud_display : %d\n", net_hud_display);
-}
-
-void net_register( puObject *cb)
-{
-	fgd_send_com( "1", FGFS_host );
-	net_is_registered = 0;
-	printf("Registering to deamon\n");
-}
-
-void net_unregister( puObject *cb)
-{
-	fgd_send_com( "8", FGFS_host );
-	net_is_registered = -1;
-	printf("Unregistering from deamon\n");
-}
-
-#endif // #ifdef FG_NETWORK_OLK