Changeset 3300 in orxonox.OLD

Timestamp:

Dec 27, 2004, 4:14:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: implemented a new SignalHandler, signals for starting and quiting the Gui are now located in OrxonoxGuiExec.
Now thinking about a way to pass options to Orxonox (so the GUI really makes sense)

Location:

orxonox/branches/updater/src/gui

Files:

• orxonox_gui.cc (modified) (2 diffs)
• orxonox_gui.h (modified) (1 diff)
• orxonox_gui_exec.cc (modified) (4 diffs)
• orxonox_gui_exec.h (modified) (1 diff)
• orxonox_gui_flags.cc (modified) (1 diff)
• orxonox_gui_gtk.cc (modified) (3 diffs)
• orxonox_gui_gtk.h (modified) (2 diffs)

orxonox/branches/updater/src/gui/orxonox_gui.cc

@@ -63 +63 @@
 
   orxonoxGUI = new Window( "Grafical OrxOnoX loader, "PACKAGE_VERSION);
-#ifdef HAVE_GTK2
-  orxonoxGUI->connectSignal ("destroy", orxonoxGUI->orxonox_gui_quit);
-  orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit);
-#endif /* HAVE_GTK2 */
   
   Box* windowBox = new Box ('h');
@@ -108 +104 @@
     orxonoxGUI->walkThrough(Widget::flagCheck, argv[optCount], 0);
 
+
   orxonoxGUI->showall ();
 

orxonox/branches/updater/src/gui/orxonox_gui.h

@@ -28 +28 @@
   ~OrxonoxGui ();
 
-  void copyOptionsToGameStruct();
 };
 
-
 #endif /* _ORXONOX_GUI_H */

orxonox/branches/updater/src/gui/orxonox_gui_exec.cc

@@ -27 +27 @@
 #include <iostream>
 #include <string>
+
+HashTable* orxonoxFlagHash;
 
 /** 
@@ -42 +44 @@
   start = new Button ("Start");
 #ifdef HAVE_GTK2
-  start->connectSignal ("clicked", startOrxonox);
+  start->connectSignal ("clicked", this, startOrxonox);
 #endif /* HAVE_GTK2 */
   execBox->fill (start);
@@ -59 +61 @@
   quit = new Button ("Quit");
 #ifdef HAVE_GTK2
-  quit->connectSignal ("clicked", orxonoxGUI->orxonox_gui_quit);
+  quit->connectSignal ("clicked", this, OrxonoxGuiExec::quitOrxonox);
+  orxonoxGUI->connectSignal ("destroy", this, OrxonoxGuiExec::quitOrxonox);
+  //! orxonoxGUI->connectSignal ("delete_event", this, OrxonoxGuiExec::quitOrxonox); \todo fix this to work.
 #endif /* HAVE_GTK2 */
   execBox->fill (quit);
@@ -294 +298 @@
 /**
    \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
-   This is a Signal and can be executed through Widget::signal_connect
    \param widget the widget that executed the start command
    \param data additional data
-*/
-int OrxonoxGuiExec::startOrxonox (GtkWidget* widget, Widget* data)
-{
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::startOrxonox (GtkWidget* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
   cout << "Starting Orxonox" <<endl;
-}
-#else /* HAVE_GTK2 */
+  gtk_main_quit();
+  system("cd ..;./orxonox"); //!< \todo fix this. should execute orxonox for real (coded not over the shell)
+}
+
 /**
    \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
-   This is a Signal and can be executed through Widget::signal_connect
    \param widget the widget that executed the start command
    \param data additional data
-*/
-int OrxonoxGuiExec::startOrxonox (void* widget, Widget* data)
-{
-  cout << "Starting Orxonox" <<endl;
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::quitOrxonox (GtkWidget* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  PRINT(3)( "Quitting Orxonox %p\n", exec);
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
+  gtk_main_quit();
+}
+#else /* HAVE_GTK2 */
+/**
+   \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
+   \param widget the widget that executed the start command
+   \param data additional data
+*/
+int OrxonoxGuiExec::startOrxonox (void* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  COUT(3) << "Starting Orxonox" <<endl;
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
+}
+/**
+   \brief Quits ORXONOX.
+   \param widget the widget that executed the Quit command
+   \param data additional data
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::quitOrxonox (void* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  COUT(3) << "Quiting Orxonox" <<endl;
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
 }
 

orxonox/branches/updater/src/gui/orxonox_gui_exec.h

@@ -48 +48 @@
 
 #ifdef HAVE_GTK2
-  static int startOrxonox (GtkWidget *widget, Widget* data);
+  static int startOrxonox (GtkWidget *widget, void* data);
+  static int quitOrxonox (GtkWidget *widget, void* data);
 #else /* HAVE_GTK2 */
-  static int startOrxonox (void* widget, Widget* data);
+  static int startOrxonox (void* widget, void* data);
+  static int quitOrxonox (void* widget, void* data);
 #endif /* HAVE_GTK2 */
 };
+
+
+struct HashTable
+{
+  char* name;
+  char* value;
+  HashTable* next;
+};
+
+
 #endif /* _ORXONOX_GUI_EXEC_H */

orxonox/branches/updater/src/gui/orxonox_gui_flags.cc

@@ -72 +72 @@
     \brief this actually sets the flagtext, and appends it to flagText
     \param widget like OrxonoxGuiFlags::setTextFromFlags(widget)
+    \param flagInfo Information aboout the Flag that should be updated.
 */
 void OrxonoxGuiFlags::flagsText(Widget* widget, void* flagInfo)

orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc

@@ -34 +34 @@
 // temporarily.
 #include "orxonox_gui_flags.h"
-#include "orxonox_gui_exec.h"
 extern Window* orxonoxGUI;
 extern OrxonoxGuiFlags* flags;
-extern OrxonoxGuiExec* exec;
 
 #ifdef HAVE_GTK2
@@ -306 +304 @@
    \brief Connect a signal with additionally passing a whole external Object
 */
+gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, void *))
+{
+  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
+}
+
+/**
+   \brief Connect a signal with additionally passing a whole external Object
+*/
 gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void *))
 {
@@ -615 +621 @@
 }
 
-/**
- * Quits the orxonox_GUI.
- * This can be called as a Signal and is therefor static
- \param widget The widget that called this function
- \param event the event that happened to execute this function
- \param data some data passed with the Signal
- */
-gint Window::orxonox_gui_quit (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-  if (exec->shouldsave())
-    exec->writeToFile (Window::mainWindow);
-
-  gtk_main_quit();
-  return FALSE;
-}
 #endif /* HAVE_GTK2 */
 

orxonox/branches/updater/src/gui/orxonox_gui_gtk.h

@@ -66 +66 @@
   gulong connectSignal (char* event, gint (*signal)(GtkWidget*, Widget* ));
   gulong connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void* ));
+  gulong connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, void* ));
   gulong connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void* ));
   void disconnectSignal (gulong signalID);
@@ -149 +150 @@
   static gint windowOpen(GtkWidget* widget, GdkEvent* event, void* window);
   static gint windowClose(GtkWidget* widget, GdkEvent* event, void* window);
-  static gint orxonox_gui_quit(GtkWidget* widget, GdkEvent* event, gpointer data);
 #endif /* HAVE_GTK2 */
 };