X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=b5956e46e86e0b3846114a3518f9ea9dd51b6cf9;hb=745e840547b5443ecfb9b6f0a4f14b0d035d59c2;hp=e929f1226c89d57aaa9ecdb1b6071a74b31eb4dc;hpb=711d4a342f9f459383ad59ceb624fcb853a41512;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index e929f122..b5956e46 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef   __openbox_hh
 #define   __openbox_hh
 
@@ -18,7 +18,6 @@ extern "C" {
 #include <vector>
 #include <map>
 
-#include "python.hh"
 #include "otk/screeninfo.hh"
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
@@ -31,6 +30,18 @@ namespace ob {
 class OBScreen;
 class OBClient;
 class OBActions;
+class OBBindings;
+
+//! Mouse cursors used throughout Openbox
+struct Cursors {
+  Cursor session;  //!< The default mouse cursor
+  Cursor move;     //!< For moving a window
+  Cursor ll_angle; //!< For resizing the bottom left corner of a window
+  Cursor lr_angle; //!< For resizing the bottom right corner of a window
+  Cursor ul_angle; //!< For resizing the top left corner of a window
+  Cursor ur_angle; //!< For resizing the right corner of a window
+};
+
 
 //! The main class for the Openbox window manager
 /*!
@@ -59,16 +70,6 @@ public:
     State_Exiting   //!< The window manager is exiting (being destroyed)
   };
 
-  //! Mouse cursors used throughout Openbox
-  struct Cursors {
-    Cursor session;  //!< The default mouse cursor
-    Cursor move;     //!< For moving a window
-    Cursor ll_angle; //!< For resizing the bottom left corner of a window
-    Cursor lr_angle; //!< For resizing the bottom right corner of a window
-    Cursor ul_angle; //!< For resizing the top left corner of a window
-    Cursor ur_angle; //!< For resizing the right corner of a window
-  };
-  
   //! A map for looking up a specific client class from the window id
   typedef std::map<Window, OBClient *> ClientMap;
 
@@ -87,6 +88,11 @@ private:
     Defaults to $(HOME)/.openbox/menu3
   */
   std::string _menufilepath;
+  //! Path to the script file to execute on startup
+  /*!
+    Defaults to $(HOME)/.openbox/user.py
+  */
+  std::string _scriptfilepath;
   //! The display requested by the user, or null to use the DISPLAY env var
   char *_displayreq;
   //! The value of argv[0], i.e. how this application was executed
@@ -94,7 +100,6 @@ private:
 
   //! A list of all managed clients
   ClientMap _clients;
-  PyDictObject *_pyclients;
 
   //! A list of all the managed screens
   ScreenList _screens;
@@ -117,6 +122,12 @@ private:
   //! The action interface through which all user-available actions occur
   OBActions *_actions;
 
+  //! The interface through which keys/buttons are grabbed and handled
+  OBBindings *_bindings;
+
+  //! Run the application in synchronous mode? (for debugging)
+  bool _sync;
+
   //! The running state of the window manager
   RunState _state;
 
@@ -126,9 +137,19 @@ private:
   //! When set to true, the Openbox::eventLoop function will stop and return
   bool _doshutdown;
 
-  //! The configuration of the application. TEMPORARY
-  otk::Configuration _config;
+  //! The client with input focus
+  /*!
+    Updated by the clients themselves.
+  */
+  OBClient *_focused_client;
 
+  //! The screen with input focus
+  /*!
+    Updated by the clients when they update the Openbox::focused_client
+    property.
+  */
+  OBScreen *_focused_screen;
+  
   //! Parses the command line used when executing this application
   void parseCommandLine(int argv, char **argv);
   //! Displays the version string to stdout
@@ -140,6 +161,7 @@ private:
   static void signalHandler(int signal);
 
 public:
+#ifndef SWIG
   //! Openbox constructor.
   /*!
     \param argc Number of command line arguments, as received in main()
@@ -148,6 +170,7 @@ public:
   Openbox(int argc, char **argv);
   //! Openbox destructor.
   virtual ~Openbox();
+#endif
 
   //! Returns the state of the window manager (starting, exiting, etc)
   inline RunState state() const { return _state; }
@@ -162,17 +185,26 @@ public:
   //! Returns the otk::OBProperty instance for the window manager
   inline const otk::OBProperty *property() const { return _property; }
 
+  //! Returns the OBBinding instance for the window manager
+  inline OBBindings *bindings() const { return _bindings; }
+
   //! Returns a managed screen
   inline OBScreen *screen(int num) {
     assert(num >= 0); assert(num < (signed)_screens.size());
+    if (num >= screenCount())
+      return NULL;
     return _screens[num];
   }
 
+  //! Returns the number of managed screens
+  inline int screenCount() const {
+    return (signed)_screens.size();
+  }
+
   //! Returns the mouse cursors used throughout Openbox
   inline const Cursors &cursors() const { return _cursors; }
 
-  inline PyDictObject *pyclients() const { return _pyclients; }
-
+#ifndef SWIG
   //! The main function of the Openbox class
   /*!
     This function should be called after instantiating the Openbox class.
@@ -180,6 +212,7 @@ public:
     The Openbox::shutdown method will cause this function to exit.
   */
   void eventLoop();
+#endif
 
   //! Adds an OBClient to the client list for lookups
   void addClient(Window window, OBClient *client);
@@ -190,12 +223,26 @@ public:
   //! Finds an OBClient based on its window id
   OBClient *findClient(Window window);
 
+  //! The client with input focus
+  inline OBClient *focusedClient() { return _focused_client; }
+
+  //! Change the client which has focus.
+  /*!
+    This is called by the clients themselves when their focus state changes.
+  */
+  void setFocusedClient(OBClient *c);
+
+  //! The screen with input focus
+  inline OBScreen *focusedScreen() { return _focused_screen; }
+  
   //! Requests that the window manager exit
   /*!
     Causes the Openbox::eventLoop function to stop looping, so that the window
     manager can be destroyed.
   */
   inline void shutdown() { _doshutdown = true; }
+
+  bool getConfigString(const char *name, std::string *value);
 };
 
 }