#include "otk/rect.hh"
#include "otk/eventhandler.hh"
#include "widget.hh"
-#include "python.hh"
namespace ob {
class OBFrame;
-extern PyTypeObject OBClient_Type;
-
//! Maintains the state of a client window.
/*!
OBClient maintains the state of a client window. The state consists of the
change (such as causing a redraw of the titlebar after the title is changed).
*/
class OBClient : public otk::OtkEventHandler, public OBWidget {
- PyObject_HEAD
public:
//! The frame window which decorates around the client window
#include "client.hh"
#include "screen.hh"
#include "actions.hh"
+#include "python.hh"
#include "otk/property.hh"
#include "otk/display.hh"
#include "otk/assassin.hh"
# include <sys/select.h>
#endif // HAVE_SYS_SELECT_H
+#include <python2.2/Python.h>
+
#include "gettext.h"
#define _(str) gettext(str)
}
_doshutdown = false;
_rcfilepath = otk::expandTilde("~/.openbox/rc3");
- _clients = (PyDictObject*) PyDict_New();
- assert(_clients);
-
parseCommandLine(argc, argv);
// TEMPORARY: using the xrdb rc3
void Openbox::addClient(Window window, OBClient *client)
{
- // maintain the python list here too
- PyDict_SetItem((PyObject*)_clients, PyLong_FromLong(window),
- (PyObject*)client);
+ _clients[window] = client;
}
void Openbox::removeClient(Window window)
{
- PyDict_DelItem((PyObject*)_clients, PyLong_FromLong(window));
+ _clients.erase(window);
}
OBClient *Openbox::findClient(Window window)
{
- PyClientObject *client = PyDist_GetItem((PyObject*)_clients,
- PyLong_FromLong(window));
- if (client)
- return client->client;
- return 0;
+ /*
+ 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;
}
}
#include <string>
#include <vector>
+#include <map>
-#include "python.hh"
#include "otk/screeninfo.hh"
#include "otk/timerqueuemanager.hh"
#include "otk/property.hh"
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;
+
//! A list of OBScreen classes
typedef std::vector<OBScreen *> ScreenList;
char *_argv0;
//! A list of all managed clients
- PyDictObject *_clients;
+ ClientMap _clients;
//! A list of all the managed screens
ScreenList _screens;
//! Returns the mouse cursors used throughout Openbox
inline const Cursors &cursors() const { return _cursors; }
- inline PyDictObject *clients() const { return _clients; }
-
//! The main function of the Openbox class
/*!
This function should be called after instantiating the Openbox class.