X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=c47300b42981289557ed0fa6c52f7006142f7426;hb=d4e4e25e2841d3aefc5dc13bab551d77b63590ea;hp=1a537dcd7dfc1c387a9f18bb8d815e192bf4c97f;hpb=66a26917a0631463df7f72c34cbeb39df466918a;p=chaz%2Fopenbox diff --git a/src/openbox.hh b/src/openbox.hh index 1a537dcd..c47300b4 100644 --- a/src/openbox.hh +++ b/src/openbox.hh @@ -14,19 +14,18 @@ extern "C" { #include #include +#include "otk/display.hh" #include "otk/screeninfo.hh" -#include "otk/timerqueuemanager.hh" -#include "otk/property.hh" #include "otk/configuration.hh" #include "otk/eventdispatcher.hh" #include "otk/eventhandler.hh" namespace ob { -class OBScreen; -class OBClient; -class OBActions; -class OBBindings; +class Screen; +class Client; +class Actions; +class Bindings; //! Mouse cursors used throughout Openbox struct Cursors { @@ -38,6 +37,14 @@ struct Cursors { Cursor ur_angle; //!< For resizing the right corner of a window }; +class Openbox; + +//! The single instance of the Openbox class for the application +/*! + Since this variable is globally available in the application, the Openbox + class does not need to be passed around to any of the other classes. +*/ +extern Openbox *openbox; //! The main class for the Openbox window manager /*! @@ -49,16 +56,9 @@ struct Cursors { not exit until the window manager is ready to be destroyed. Destruction of the Openbox class instance will shutdown the window manager. */ -class Openbox : public otk::OtkEventDispatcher, public otk::OtkEventHandler +class Openbox : public otk::EventDispatcher, public otk::EventHandler { public: - //! The single instance of the Openbox class for the application - /*! - Since this variable is globally available in the application, the Openbox - class does not need to be passed around to any of the other classes. - */ - static Openbox *instance; - //! The posible running states of the window manager enum RunState { State_Starting, //!< The window manager is starting up (being created) @@ -67,12 +67,15 @@ public: }; //! A map for looking up a specific client class from the window id - typedef std::map ClientMap; + typedef std::map ClientMap; - //! A list of OBScreen classes - typedef std::vector ScreenList; + //! A list of Screen classes + typedef std::vector ScreenList; private: + //! The display on which Openbox is running + otk::Display _display; + // stuff that can be passed on the command line //! Path to the config file to use/in use /*! @@ -91,8 +94,12 @@ private: 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 - char *_argv0; + //! The value of argv, i.e. how this application was executed + char **_argv; + //! Run the application in synchronous mode? (for debugging) + bool _sync; + //! Should Openbox run on a single screen or on all available screens? + bool _single; //! A list of all managed clients ClientMap _clients; @@ -100,29 +107,11 @@ private: //! A list of all the managed screens ScreenList _screens; - //! Manages all timers for the application - /*! - Use of the otk::OBTimerQueueManager::fire funtion in this object ensures - that all timers fire when their times elapse. - */ - otk::OBTimerQueueManager _timermanager; - - //! Cached atoms on the display - /*! - This is a pointer because the OBProperty class uses otk::OBDisplay::display - in its constructor, so, it needs to be initialized after the display - is initialized in this class' constructor. - */ - otk::OBProperty *_property; - //! The action interface through which all user-available actions occur - OBActions *_actions; + Actions *_actions; //! The interface through which keys/buttons are grabbed and handled - OBBindings *_bindings; - - //! Run the application in synchronous mode? (for debugging) - bool _sync; + Bindings *_bindings; //! The running state of the window manager RunState _state; @@ -131,20 +120,28 @@ private: Cursors _cursors; //! When set to true, the Openbox::eventLoop function will stop and return - bool _doshutdown; + bool _shutdown; + + //! When set to true, and Openbox is about to exit, it will spawn a new + //! process + bool _restart; + + //! If this contains anything, a restart will try to execute the program in + //! this variable, and will fallback to reexec'ing itself if that fails + std::string _restart_prog; //! The client with input focus /*! Updated by the clients themselves. */ - OBClient *_focused_client; + Client *_focused_client; //! The screen with input focus /*! Updated by the clients when they update the Openbox::focused_client property. */ - OBScreen *_focused_screen; + Screen *_focused_screen; //! Parses the command line used when executing this application void parseCommandLine(int argv, char **argv); @@ -171,24 +168,14 @@ public: //! Returns the state of the window manager (starting, exiting, etc) inline RunState state() const { return _state; } - //! Returns the otk::OBTimerQueueManager for the application - /*! - All otk::OBTimer objects used in the application should be made to use this - otk::OBTimerQueueManager. - */ - inline otk::OBTimerQueueManager *timerManager() { return &_timermanager; } - - //! 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 Actions instance for the window manager + inline Actions *actions() const { return _actions; } - //! Returns the OBBindings instance for the window manager - inline OBBindings *bindings() const { return _bindings; } + //! Returns the Bindings instance for the window manager + inline Bindings *bindings() const { return _bindings; } //! Returns a managed screen - inline OBScreen *screen(int num) { + inline Screen *screen(int num) { assert(num >= 0); assert(num < (signed)_screens.size()); if (num >= screenCount()) return NULL; @@ -213,33 +200,40 @@ public: void eventLoop(); #endif - //! Adds an OBClient to the client list for lookups - void addClient(Window window, OBClient *client); + //! Adds an Client to the client list for lookups + void addClient(Window window, Client *client); - //! Removes an OBClient from the client list for lookups + //! Removes an Client from the client list for lookups void removeClient(Window window); - //! Finds an OBClient based on its window id - OBClient *findClient(Window window); + //! Finds an Client based on its window id + Client *findClient(Window window); //! The client with input focus - inline OBClient *focusedClient() { return _focused_client; } + inline Client *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); + void setFocusedClient(Client *c); //! The screen with input focus - inline OBScreen *focusedScreen() { return _focused_screen; } + inline Screen *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; } + inline void shutdown() { _shutdown = true; } + + inline void restart(const std::string &bin = "") { + _shutdown = true; _restart = true; _restart_prog = bin; + } + + //! Executes a command on a screen + void execute(int screen, const std::string &bin); }; }