X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=89948118f7ff37cc4721a4fb7048ad2a504463bd;hb=d8aff44a6a639de83ba8f0957f9f9f17f2a05532;hp=b44a1861f03acb1d64f1f32863db400916b6126a;hpb=345d957e1ea577480f807b892b73c3f52fe913d2;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index b44a1861..89948118 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"
@@ -12,9 +11,9 @@
 #include "bindings.hh"
 #include "python.hh"
 #include "otk/property.hh"
-#include "otk/display.hh"
 #include "otk/assassin.hh"
-#include "otk/util.hh" // TEMPORARY
+#include "otk/property.hh"
+#include "otk/util.hh"
 
 extern "C" {
 #include <X11/cursorfont.h>
@@ -52,7 +51,7 @@ extern "C" {
 
 namespace ob {
 
-Openbox *Openbox::instance  = (Openbox *) 0;
+Openbox *openbox = (Openbox *) 0;
 
 
 void Openbox::signalHandler(int signal)
@@ -60,7 +59,7 @@ void Openbox::signalHandler(int signal)
   switch (signal) {
   case SIGUSR1:
     printf("Caught SIGUSR1 signal. Restarting.\n");
-    instance->restart();
+    openbox->restart();
     break;
 
   case SIGHUP:
@@ -68,7 +67,7 @@ void Openbox::signalHandler(int signal)
   case SIGTERM:
   case SIGPIPE:
     printf("Caught signal %d. Exiting.\n", signal);
-    instance->shutdown();
+    openbox->shutdown();
     break;
 
   case SIGFPE:
@@ -80,14 +79,15 @@ void Openbox::signalHandler(int signal)
 
 
 Openbox::Openbox(int argc, char **argv)
-  : otk::OtkEventDispatcher(),
-    otk::OtkEventHandler()
+  : otk::EventDispatcher(),
+    otk::EventHandler(),
+    _display()
 {
   struct sigaction action;
 
   _state = State_Starting; // initializing everything
 
-  Openbox::instance = this;
+  openbox = this;
 
   _displayreq = (char*) 0;
   _argv = argv;
@@ -100,11 +100,7 @@ Openbox::Openbox(int argc, char **argv)
 
   parseCommandLine(argc, argv);
 
-  // open the X display (and gets some info about it, and its screens)
-  otk::OBDisplay::initialize(_displayreq);
-  assert(otk::OBDisplay::display);
-
-  XSynchronize(otk::OBDisplay::display, _sync);
+  XSynchronize(**otk::display, _sync);
   
   // set up the signal handler
   action.sa_handler = Openbox::signalHandler;
@@ -118,19 +114,20 @@ Openbox::Openbox(int argc, char **argv)
   sigaction(SIGINT, &action, (struct sigaction *) 0);
   sigaction(SIGHUP, &action, (struct sigaction *) 0);
 
-  _property = new otk::OBProperty();
-  _actions = new OBActions();
-  _bindings = new OBBindings();
+  otk::Timer::initialize();
+  otk::Property::initialize();
+  _actions = new Actions();
+  _bindings = new Bindings();
 
   setMasterHandler(_actions); // set as the master event handler
 
   // create the mouse cursors we'll use
-  _cursors.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr);
-  _cursors.move = XCreateFontCursor(otk::OBDisplay::display, XC_fleur);
-  _cursors.ll_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ll_angle);
-  _cursors.lr_angle = XCreateFontCursor(otk::OBDisplay::display, XC_lr_angle);
-  _cursors.ul_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ul_angle);
-  _cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
+  _cursors.session = XCreateFontCursor(**otk::display, XC_left_ptr);
+  _cursors.move = XCreateFontCursor(**otk::display, XC_fleur);
+  _cursors.ll_angle = XCreateFontCursor(**otk::display, XC_ll_angle);
+  _cursors.lr_angle = XCreateFontCursor(**otk::display, XC_lr_angle);
+  _cursors.ul_angle = XCreateFontCursor(**otk::display, XC_ul_angle);
+  _cursors.ur_angle = XCreateFontCursor(**otk::display, XC_ur_angle);
 
   // initialize scripting
   python_init(argv[0]);
@@ -139,15 +136,16 @@ 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;
-  int i = _single ? DefaultScreen(otk::OBDisplay::display) : 0;
-  int max = _single ? i + 1 : ScreenCount(otk::OBDisplay::display);
+  Screen *screen;
+  int i = _single ? DefaultScreen(**otk::display) : 0;
+  int max = _single ? i + 1 : ScreenCount(**otk::display);
   for (; i < max; ++i) {
-    screen = new OBScreen(i);
+    screen = new Screen(i);
     if (screen->managed())
       _screens.push_back(screen);
     else
@@ -185,24 +183,25 @@ Openbox::~Openbox()
 
   delete _bindings;
   delete _actions;
-  delete _property;
 
   python_destroy();
 
-  XSetInputFocus(otk::OBDisplay::display, PointerRoot, RevertToNone,
+  XSetInputFocus(**otk::display, PointerRoot, RevertToNone,
                  CurrentTime);
-  XSync(otk::OBDisplay::display, false);
+  XSync(**otk::display, false);
 
   // this tends to block.. i honestly am not sure why. causing an x error in
   // the shutdown process unblocks it. blackbox simply did a ::exit(0), so
   // all im gunna do is the same.
-  //otk::OBDisplay::destroy();
+  //otk::display->destroy();
+
+  otk::Timer::destroy();
 
   if (_restart) {
     if (!_restart_prog.empty()) {
       const std::string &dstr =
-        otk::OBDisplay::screenInfo(first_screen)->displayString();
-      putenv(const_cast<char *>(dstr.c_str()));
+        otk::display->screenInfo(first_screen)->displayString();
+      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 +263,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");
 }
 
@@ -319,15 +318,17 @@ void Openbox::showHelp()
 
 void Openbox::eventLoop()
 {
-  while (!_shutdown) {
-    _timermanager.fire(!_sync); // wait if not in sync mode
-    dispatchEvents(); // from OtkEventDispatcher
-    XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
+  while (true) {
+    dispatchEvents(); // from otk::EventDispatcher
+    XFlush(**otk::display); // flush here before we go wait for timers
+    // don't wait if we're to shutdown
+    if (_shutdown) break;
+    otk::Timer::dispatchTimers(!_sync); // wait if not in sync mode
   }
 }
 
 
-void Openbox::addClient(Window window, OBClient *client)
+void Openbox::addClient(Window window, Client *client)
 {
   _clients[window] = client;
 }
@@ -339,7 +340,7 @@ void Openbox::removeClient(Window window)
 }
 
 
-OBClient *Openbox::findClient(Window window)
+Client *Openbox::findClient(Window window)
 {
   /*
     NOTE: we dont use _clients[] to find the value because that will insert
@@ -350,54 +351,40 @@ OBClient *Openbox::findClient(Window window)
   if (it != _clients.end())
     return it->second;
   else
-    return (OBClient*) 0;
+    return (Client*) 0;
 }
 
 
-void Openbox::setFocusedClient(OBClient *c)
+void Openbox::setFocusedClient(Client *c)
 {
   _focused_client = c;
   if (c) {
     _focused_screen = _screens[c->screen()];
   } else {
     assert(_focused_screen);
-    XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(),
+    XSetInputFocus(**otk::display, _focused_screen->focuswindow(),
                    RevertToNone, CurrentTime);
   }
   // set the NET_ACTIVE_WINDOW hint for all screens
   ScreenList::iterator it, end = _screens.end();
   for (it = _screens.begin(); it != end; ++it) {
     int num = (*it)->number();
-    Window root = otk::OBDisplay::screenInfo(num)->rootWindow();
-    _property->set(root, otk::OBProperty::net_active_window,
-                   otk::OBProperty::Atom_Window,
-                   (c && _focused_screen == *it) ? c->window() : None);
+    Window root = otk::display->screenInfo(num)->rootWindow();
+    otk::Property::set(root, otk::Property::atoms.net_active_window,
+                       otk::Property::atoms.window,
+                       (c && _focused_screen == *it) ? c->window() : None);
   }
 
   // call the python Focus callbacks
   EventData data(_focused_screen->number(), c, EventFocus, 0);
-  Openbox::instance->bindings()->fireEvent(&data);
+  _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))
+  if (screen >= ScreenCount(**otk::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::display->screenInfo(screen)->displayString());
 }
 
 }