X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=1a537dcd7dfc1c387a9f18bb8d815e192bf4c97f;hb=14cf42ff0780bf58a6b54c9443c87c7402b61faa;hp=2c26aaa17e02044a6a7859751529c4a797729e7c;hpb=b12b1cb7848d590be57281fa6ee68b9f05a57c30;p=chaz%2Fopenbox diff --git a/src/openbox.hh b/src/openbox.hh index 2c26aaa1..1a537dcd 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 @@ -6,10 +6,6 @@ @brief The main class for the Openbox window manager */ -/* - cuz girls look soooo goood.. on the end of my DICK -*/ - extern "C" { #include } @@ -18,7 +14,6 @@ extern "C" { #include #include -#include "python.hh" #include "otk/screeninfo.hh" #include "otk/timerqueuemanager.hh" #include "otk/property.hh" @@ -31,6 +26,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 +66,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 ClientMap; @@ -87,6 +84,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 +96,6 @@ private: //! A list of all managed clients ClientMap _clients; - PyDictObject *_pyclients; //! A list of all the managed screens ScreenList _screens; @@ -117,6 +118,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 +133,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 +157,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 +166,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 +181,29 @@ public: //! Returns the otk::OBProperty instance for the window manager inline const otk::OBProperty *property() const { return _property; } + //! Returns the OBActions instance for the window manager + inline OBActions *actions() const { return _actions; } + + //! Returns the OBBindings 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 PyObject *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 +211,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,6 +222,18 @@ 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