Changeset 4039 in orxonox.OLD

Timestamp:

May 4, 2005, 1:22:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: minor change

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• lib/gui/gui/Makefile.am (modified) (1 diff)
• lib/gui/gui/Makefile.in (modified) (4 diffs)
• lib/gui/gui/orxonox_gui.cc (modified) (1 diff)
• lib/gui/gui/orxonox_gui_exec.cc (modified) (5 diffs)
• lib/gui/gui/orxonox_gui_flags.cc (modified) (1 diff)
• lib/gui/gui/orxonox_gui_gtk.cc (modified) (2 diffs)
• lib/gui/gui/orxonox_gui_gtk.h (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)

orxonox/trunk/src/Makefile.am

@@ -85 +85 @@
                  lib/xmlparser/tinystr.cc \
                  lib/xmlparser/tinyxmlerror.cc \
-                 lib/xmlparser/tinyxmlparser.cc
-                 
+                 lib/xmlparser/tinyxmlparser.cc 
+
 noinst_HEADERS = orxonox.h \
                  game_loader.h \
@@ -161 +161 @@
 orxonoxGui_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
-orxonoxGui_SOURCES = lib/gui/gui/orxonox_gui.cc \
+orxonoxGui_SOURCES = lib/gui/gui/orxonox_gui_main.cc \
+                     lib/gui/gui/orxonox_gui.cc \
                      lib/gui/gui/orxonox_gui_gtk.cc \
                      lib/gui/gui/orxonox_gui_element.cc \

orxonox/trunk/src/Makefile.in

@@ -77 +77 @@
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
-am_orxonoxGui_OBJECTS = orxonoxGui-orxonox_gui.$(OBJEXT) \
+am_orxonoxGui_OBJECTS = orxonoxGui-orxonox_gui_main.$(OBJEXT) \
+        orxonoxGui-orxonox_gui.$(OBJEXT) \
         orxonoxGui-orxonox_gui_gtk.$(OBJEXT) \
         orxonoxGui-orxonox_gui_element.$(OBJEXT) \
@@ -120 +121 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonoxGui-orxonox_gui_gtk.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonoxGui-orxonox_gui_keys.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonoxGui-orxonox_gui_main.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonoxGui-orxonox_gui_update.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonoxGui-orxonox_gui_video.Po \
@@ -327 +329 @@
                  lib/xmlparser/tinystr.cc \
                  lib/xmlparser/tinyxmlerror.cc \
-                 lib/xmlparser/tinyxmlparser.cc
+                 lib/xmlparser/tinyxmlparser.cc 
 
 noinst_HEADERS = orxonox.h \
@@ -402 +404 @@
 orxonoxGui_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 orxonoxGui_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
-orxonoxGui_SOURCES = lib/gui/gui/orxonox_gui.cc \
+orxonoxGui_SOURCES = lib/gui/gui/orxonox_gui_main.cc \
+                     lib/gui/gui/orxonox_gui.cc \
                      lib/gui/gui/orxonox_gui_gtk.cc \
                      lib/gui/gui/orxonox_gui_element.cc \
@@ -532 +535 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonoxGui-orxonox_gui_gtk.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonoxGui-orxonox_gui_keys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonoxGui-orxonox_gui_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonoxGui-orxonox_gui_update.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonoxGui-orxonox_gui_video.Po@am__quote@
@@ -1345 +1349 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`
+
+orxonoxGui-orxonox_gui_main.o: lib/gui/gui/orxonox_gui_main.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonoxGui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonoxGui-orxonox_gui_main.o -MD -MP -MF "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Tpo" -c -o orxonoxGui-orxonox_gui_main.o `test -f 'lib/gui/gui/orxonox_gui_main.cc' || echo '$(srcdir)/'`lib/gui/gui/orxonox_gui_main.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Tpo" "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Po"; else rm -f "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/orxonox_gui_main.cc' object='orxonoxGui-orxonox_gui_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonoxGui-orxonox_gui_main.Po' tmpdepfile='$(DEPDIR)/orxonoxGui-orxonox_gui_main.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonoxGui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonoxGui-orxonox_gui_main.o `test -f 'lib/gui/gui/orxonox_gui_main.cc' || echo '$(srcdir)/'`lib/gui/gui/orxonox_gui_main.cc
+
+orxonoxGui-orxonox_gui_main.obj: lib/gui/gui/orxonox_gui_main.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonoxGui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonoxGui-orxonox_gui_main.obj -MD -MP -MF "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Tpo" -c -o orxonoxGui-orxonox_gui_main.obj `if test -f 'lib/gui/gui/orxonox_gui_main.cc'; then $(CYGPATH_W) 'lib/gui/gui/orxonox_gui_main.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/orxonox_gui_main.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Tpo" "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Po"; else rm -f "$(DEPDIR)/orxonoxGui-orxonox_gui_main.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/orxonox_gui_main.cc' object='orxonoxGui-orxonox_gui_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonoxGui-orxonox_gui_main.Po' tmpdepfile='$(DEPDIR)/orxonoxGui-orxonox_gui_main.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonoxGui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonoxGui-orxonox_gui_main.obj `if test -f 'lib/gui/gui/orxonox_gui_main.cc'; then $(CYGPATH_W) 'lib/gui/gui/orxonox_gui_main.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/orxonox_gui_main.cc'; fi`
 
 orxonoxGui-orxonox_gui.o: lib/gui/gui/orxonox_gui.cc

orxonox/trunk/src/lib/gui/gui/Makefile.am

@@ -24 +24 @@
 
 bin_PROGRAMS=gui
-gui_SOURCES=orxonox_gui.cc \
+gui_SOURCES=orxonox_gui_main.cc \
+            orxonox_gui.cc \
             orxonox_gui_gtk.cc \
             orxonox_gui_element.cc \

orxonox/trunk/src/lib/gui/gui/Makefile.in

@@ -53 +53 @@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_gtk.$(OBJEXT) \
-        orxonox_gui_element.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
-        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
-        orxonox_gui_flags.$(OBJEXT) orxonox_gui_banner.$(OBJEXT) \
-        orxonox_gui_keys.$(OBJEXT) orxonox_gui_update.$(OBJEXT)
+am_gui_OBJECTS = orxonox_gui_main.$(OBJEXT) orxonox_gui.$(OBJEXT) \
+        orxonox_gui_gtk.$(OBJEXT) orxonox_gui_element.$(OBJEXT) \
+        orxonox_gui_video.$(OBJEXT) orxonox_gui_audio.$(OBJEXT) \
+        orxonox_gui_exec.$(OBJEXT) orxonox_gui_flags.$(OBJEXT) \
+        orxonox_gui_banner.$(OBJEXT) orxonox_gui_keys.$(OBJEXT) \
+        orxonox_gui_update.$(OBJEXT)
 gui_OBJECTS = $(am_gui_OBJECTS)
 gui_LDADD = $(LDADD)
@@ -71 +72 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_gtk.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_keys.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_main.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_update.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
@@ -198 +200 @@
 #AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
 AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
-gui_SOURCES = orxonox_gui.cc \
+gui_SOURCES = orxonox_gui_main.cc \
+            orxonox_gui.cc \
             orxonox_gui_gtk.cc \
             orxonox_gui_element.cc \
@@ -304 +307 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_gtk.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_update.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@

orxonox/trunk/src/lib/gui/gui/orxonox_gui.cc

@@ -44 +44 @@
   OrxonoxGuiUpdate* update = NULL;
 int verbose = 4;
-
-int main(int argc, char *argv[])
-{
-  OrxonoxGui* orxonoxgui = new OrxonoxGui(argc, argv);
-  return 0;
-}
 
 /* ORXONOXGUI */

orxonox/trunk/src/lib/gui/gui/orxonox_gui_exec.cc

@@ -346 +346 @@
 }
 
-#ifdef HAVE_GTK2
 /**
    \brief Starts ORXONOX.(not really implemented yet, but the function is there.\n
@@ -354 +353 @@
    This is a Signal and can be executed through Widget::signal_connect
 */
+#ifdef HAVE_GTK2
 int OrxonoxGuiExec::startOrxonox(GtkWidget* widget, void* data)
+#else /* HAVE_GTK2 */
+int OrxonoxGuiExec::startOrxonox(void* widget, void* data)
+#endif /* HAVE_GTK2 */
 {
   OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;
@@ -360 +363 @@
     exec->writeToFile(Window::mainWindow);
   PRINT(3)("Starting Orxonox\n");
-  system("./orxonox"); //!< \todo fix this. should execute orxonox for real(coded not over the shell)
+  system(progExecutable); //!< \todo fix this. should execute orxonox for real(coded not over the shell)
+  gtk_main_quit();
 }
 
@@ -370 +374 @@
    This is a Signal and can be executed through Widget::signal_connect
 */
+#ifdef HAVE_GTK2
 int OrxonoxGuiExec::quitOrxonox(GtkWidget* widget, void* data)
+#else /* HAVE_GTK2 */
+int OrxonoxGuiExec::quitOrxonox(void* widget, void* data)
+#endif /* HAVE_GTK2 */
 {
   OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;
@@ -378 +386 @@
   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;
-  PRINT(3)("Starting Orxonox\n");
-  if(exec->shouldsave())
-    exec->writeToFile(Window::mainWindow);
-  system("./orxonox"); //!< \todo fix this. should execute orxonox for real(coded not over the shell)
-}
-/**
-   \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;
-  PRINT(3)("Quiting Orxonox");
-  if(exec->shouldsave())
-    exec->writeToFile(Window::mainWindow);
-}
-
-#endif /* HAVE_GTK2 */

orxonox/trunk/src/lib/gui/gui/orxonox_gui_flags.cc

@@ -63 +63 @@
 
   this->flagsLabel->ereaseText();
-  this->flagsLabel->appendText("orxonox");
+  this->flagsLabel->appendText(progExecutable);
   widget->walkThrough(OrxonoxGuiFlags::flagsText, &flagInfo, 0);
   //  flagsLabel->setTitle(flagText);

orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.cc

@@ -36 +36 @@
 extern Window* orxonoxGUI;
 extern OrxonoxGuiFlags* flags;
+char* guiExecutable;
+char* progExecutable;
 
 /**
@@ -44 +46 @@
 bool initGUI(int argc, char *argv[])
 {
+  guiExecutable = new char[strlen(argv[0])+1];
+  strcpy(guiExecutable, argv[0]);
+  progExecutable = new char[strlen(guiExecutable)-2];
+  strncpy(progExecutable, guiExecutable, strlen(guiExecutable)-3);
+  progExecutable[strlen(progExecutable)]= '\0';
+
 #ifdef HAVE_GTK2
 #ifdef HAVE_GTHREAD

orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h

@@ -30 +30 @@
 #endif /* HAVE_GTK2 */
 
+extern char* guiExecutable;
+extern char* progExecutable;
+
 bool initGUI(int argc, char* argv[]);
 bool mainloopGUI(void);

orxonox/trunk/src/orxonox.cc

@@ -169 +169 @@
   PRINT(3)("initializing ResourceManager\n");
   resourceManager = ResourceManager::getInstance();
-  !resourceManager->setDataDir("../data/");
+  if (!resourceManager->setDataDir("../data/"))
+    exit( -1);
 
   PRINT(3)("initializing TextEngine\n");
@@ -333 +334 @@
       if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
         ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-      if (system("./orxonoxGui --gui") == -1)
-        system ("orxonoxGui --gui");
+      char* guiExec = new char[strlen(argv[0])+20];
+      sprintf(guiExec,"%sGui --gui", argv[0]);
+      system(guiExec);
+      delete guiExec;
       return 0;
     }