X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fopenbox.cc;h=600c9d8d90bcfdf372080c4b32d1ecd376e4c3e1;hb=8f8acc24933830d4f5784616b9b0c5896bde0b93;hp=a15f369b2dfe03242c1b1620030d3756e01371e5;hpb=368d981208c7f7d7865faac129160f277eb8d4e7;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index a15f369b..600c9d8d 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -4,7 +4,6 @@
 # include "../config.h"
 #endif
 
-#include "../version.h"
 #include "openbox.hh"
 #include "client.hh"
 #include "screen.hh"
@@ -14,7 +13,7 @@
 #include "otk/property.hh"
 #include "otk/display.hh"
 #include "otk/assassin.hh"
-#include "otk/util.hh" // TEMPORARY
+#include "otk/util.hh"
 
 extern "C" {
 #include <X11/cursorfont.h>
@@ -139,8 +138,9 @@ Openbox::Openbox(int argc, char **argv)
   python_exec(SCRIPTDIR"/config.py"); // load openbox config values
   // run all of the python scripts
   python_exec(SCRIPTDIR"/builtins.py"); // builtin callbacks
-  // run the user's script
-  python_exec(_scriptfilepath.c_str());
+  // run the user's script or the system defaults if that fails
+  if (!python_exec(_scriptfilepath.c_str()))
+    python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
 
   // initialize all the screens
   OBScreen *screen;
@@ -202,7 +202,7 @@ Openbox::~Openbox()
     if (!_restart_prog.empty()) {
       const std::string &dstr =
         otk::OBDisplay::screenInfo(first_screen)->displayString();
-      putenv(const_cast<char *>(dstr.c_str()));
+      otk::putenv(const_cast<char *>(dstr.c_str()));
       execlp(_restart_prog.c_str(), _restart_prog.c_str(), NULL);
       perror(_restart_prog.c_str());
     }
@@ -264,7 +264,7 @@ void Openbox::parseCommandLine(int argc, char **argv)
 
 void Openbox::showVersion()
 {
-  printf(_("Openbox - version %s\n"), OPENBOX_VERSION);
+  printf(_("Openbox - version %s\n"), VERSION);
   printf("    (c) 2002 - 2002 Ben Jansens\n\n");
 }
 
@@ -288,7 +288,8 @@ void Openbox::showHelp()
   printf(_("Compile time options:\n\
   Debugging: %s\n\
   Shape:     %s\n\
-  Xinerama:  %s\n"),
+  Xinerama:  %s\n\
+  Xkb:       %s\n"),
 #ifdef    DEBUG
          _("yes"),
 #else // !DEBUG
@@ -302,10 +303,16 @@ void Openbox::showHelp()
 #endif // SHAPE
 
 #ifdef    XINERAMA
-         _("yes")
+         _("yes"),
 #else // !XINERAMA
-         _("no")
+         _("no"),
 #endif // XINERAMA
+
+#ifdef    XKB
+         _("yes")
+#else // !XKB
+         _("no")
+#endif // XKB
     );
 }
 
@@ -368,32 +375,15 @@ void Openbox::setFocusedClient(OBClient *c)
   }
 
   // call the python Focus callbacks
-  EventData *data = new_event_data(_focused_screen->number(),
-                                   c ? c->window() : 0,
-                                   EventFocus, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_XDECREF((PyObject*)data);
+  EventData data(_focused_screen->number(), c, EventFocus, 0);
+  Openbox::instance->bindings()->fireEvent(&data);
 }
 
 void Openbox::execute(int screen, const std::string &bin)
 {
-#ifdef    __EMX__
-  // XXX: whats this for? windows?
-  spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", bin.c_str(), NULL);
-#else //  __EMX__
   if (screen >= ScreenCount(otk::OBDisplay::display))
     screen = 0;
-  const std::string &dstr =
-    otk::OBDisplay::screenInfo(screen)->displayString();
-  
-  if (! fork()) {
-      setsid();
-      int ret = putenv(const_cast<char *>(dstr.c_str()));
-      assert(ret != -1);
-      ret = execl("/bin/sh", "/bin/sh", "-c", bin.c_str(), NULL);
-      exit(ret);
-    }
-#endif // __EMX__
+  otk::bexec(bin, otk::OBDisplay::screenInfo(screen)->displayString());
 }
 
 }