X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=6f42bc206157f102c1df8b0654edea7452b75fc5;hb=cf0823dcf3d1ee8e61be0dfc842b1be3a34b3aee;hp=1af59c25fbce1ea575adb84a06050a55a5a32f22;hpb=373de009f7e98b0c6f3a78f31c1e5c120cd722ed;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 1af59c25..6f42bc20 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -6,9 +6,12 @@
 
 #include "../version.h"
 #include "openbox.hh"
+#include "otk/property.hh"
 #include "otk/display.hh"
 
 extern "C" {
+#include <X11/cursorfont.h>
+
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
@@ -40,26 +43,9 @@ extern "C" {
 
 namespace ob {
 
-
 Openbox *Openbox::instance = (Openbox *) 0;
 
 
-int Openbox::xerrorHandler(Display *d, XErrorEvent *e)
-{
-#ifdef DEBUG
-  char errtxt[128];
-
-  XGetErrorText(d, e->error_code, errtxt, 128);
-  printf("X Error: %s\n", errtxt);
-#else
-  (void)d;
-  (void)e;
-#endif
-
-  return false;
-}
-
-
 void Openbox::signalHandler(int signal)
 {
   switch (signal) {
@@ -70,12 +56,13 @@ void Openbox::signalHandler(int signal)
   case SIGINT:
   case SIGTERM:
   case SIGPIPE:
-    printf("Caught signal %d. Exiting.", signal);
-    // XXX: Make Openbox exit
+    printf("Caught signal %d. Exiting.\n", signal);
+    instance->shutdown();
+
     break;
   case SIGFPE:
   case SIGSEGV:
-    printf("Caught signal %d. Aborting and dumping core.", signal);
+    printf("Caught signal %d. Aborting and dumping core.\n", signal);
     abort();
   }
 }
@@ -85,12 +72,13 @@ Openbox::Openbox(int argc, char **argv)
 {
   struct sigaction action;
 
-  _state = State_Starting;
+  _state = State_Starting; // initializing everything
 
   Openbox::instance = this;
 
   _displayreq = (char*) 0;
   _argv0 = argv[0];
+  _doshutdown = false;
 
   parseCommandLine(argc, argv);
 
@@ -109,7 +97,15 @@ Openbox::Openbox(int argc, char **argv)
   sigaction(SIGINT, &action, (struct sigaction *) 0);
   sigaction(SIGHUP, &action, (struct sigaction *) 0);
 
+  _property = new otk::OBProperty();
 
+  // 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);
   
   _state = State_Normal; // done starting
 }
@@ -117,6 +113,12 @@ Openbox::Openbox(int argc, char **argv)
 
 Openbox::~Openbox()
 {
+  _state = State_Exiting; // time to kill everything
+
+  // unmanage all windows
+  while (!_clients.empty())
+    _xeventhandler.unmanageWindow(_clients.begin()->second);
+  
   // close the X display
   otk::OBDisplay::destroy();
 }
@@ -208,11 +210,12 @@ void Openbox::showHelp()
 
 void Openbox::eventLoop()
 {
-  while (_state == State_Normal) {
+  while (!_doshutdown) {
     if (XPending(otk::OBDisplay::display)) {
       XEvent e;
       XNextEvent(otk::OBDisplay::display, &e);
-      process_event(&e);
+      //process_event(&e);
+      _xeventhandler.handle(e);
     } else {
       _timermanager.fire();
     }
@@ -220,5 +223,33 @@ void Openbox::eventLoop()
 }
 
 
+void Openbox::addClient(Window window, OBClient *client)
+{
+  _clients[window] = client;
+}
+
+
+void Openbox::removeClient(Window window)
+{
+  ClientMap::iterator it = _clients.find(window);
+  if (it != _clients.end())
+    _clients.erase(it);
+}
+
+
+OBClient *Openbox::findClient(Window window)
+{
+  /*
+    NOTE: we dont use _clients[] to find the value because that will insert
+    a new null into the hash, which really sucks when we want to clean up the
+    hash at shutdown!
+  */
+  ClientMap::iterator it = _clients.find(window);
+  if (it != _clients.end())
+    return it->second;
+  else
+    return (OBClient*) 0;
+}
+
 }