removing all prefixes completed
Dana Jansens danakj@orodu.net
25 files changed,
2216 insertions(+),
2483 deletions(-)
jump to
M
src/actions.cc
→
src/actions.cc
@@ -17,9 +17,9 @@ #include <stdio.h>
namespace ob { -const int OBActions::BUTTONS; +const int Actions::BUTTONS; -OBActions::OBActions() +Actions::Actions() : _button(0) { for (int i=0; i<BUTTONS; ++i)@@ -27,14 +27,14 @@ _posqueue[i] = new ButtonPressAction();
} -OBActions::~OBActions() +Actions::~Actions() { for (int i=0; i<BUTTONS; ++i) delete _posqueue[i]; } -void OBActions::insertPress(const XButtonEvent &e) +void Actions::insertPress(const XButtonEvent &e) { ButtonPressAction *a = _posqueue[BUTTONS - 1]; // rm'd the last one, shift them all down one@@ -45,11 +45,11 @@ _posqueue[0] = a;
a->button = e.button; a->pos.setPoint(e.x_root, e.y_root); - OBClient *c = Openbox::instance->findClient(e.window); + Client *c = Openbox::instance->findClient(e.window); if (c) a->clientarea = c->area(); } -void OBActions::removePress(const XButtonEvent &e) +void Actions::removePress(const XButtonEvent &e) { int i; ButtonPressAction *a = 0;@@ -66,13 +66,13 @@ }
_posqueue[BUTTONS-1]->button = 0; } -void OBActions::buttonPressHandler(const XButtonEvent &e) +void Actions::buttonPressHandler(const XButtonEvent &e) { - OtkEventHandler::buttonPressHandler(e); + otk::EventHandler::buttonPressHandler(e); insertPress(e); // run the PRESS python hook - OBWidget *w = dynamic_cast<OBWidget*> + WidgetBase *w = dynamic_cast<WidgetBase*> (Openbox::instance->findHandler(e.window)); assert(w); // everything should be a widget@@ -80,11 +80,11 @@ // kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); int screen; - OBClient *c = Openbox::instance->findClient(e.window); + Client *c = Openbox::instance->findClient(e.window); if (c) screen = c->screen(); else - screen = otk::OBDisplay::findScreen(e.root)->screen(); + screen = otk::Display::findScreen(e.root)->screen(); MouseData data(screen, c, e.time, state, e.button, w->mcontext(), MousePress); Openbox::instance->bindings()->fireButton(&data);@@ -106,12 +106,12 @@ }
} -void OBActions::buttonReleaseHandler(const XButtonEvent &e) +void Actions::buttonReleaseHandler(const XButtonEvent &e) { - OtkEventHandler::buttonReleaseHandler(e); + otk::EventHandler::buttonReleaseHandler(e); removePress(e); - OBWidget *w = dynamic_cast<OBWidget*> + WidgetBase *w = dynamic_cast<WidgetBase*> (Openbox::instance->findHandler(e.window)); assert(w); // everything should be a widget@@ -122,7 +122,7 @@ _button = 0;
// find the area of the window XWindowAttributes attr; - if (!XGetWindowAttributes(otk::OBDisplay::display, e.window, &attr)) return; + if (!XGetWindowAttributes(otk::Display::display, e.window, &attr)) return; // if not on the window any more, it isnt a CLICK if (!(e.same_screen && e.x >= 0 && e.y >= 0 &&@@ -134,11 +134,11 @@ // kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); int screen; - OBClient *c = Openbox::instance->findClient(e.window); + Client *c = Openbox::instance->findClient(e.window); if (c) screen = c->screen(); else - screen = otk::OBDisplay::findScreen(e.root)->screen(); + screen = otk::Display::findScreen(e.root)->screen(); MouseData data(screen, c, e.time, state, e.button, w->mcontext(), MouseClick); Openbox::instance->bindings()->fireButton(&data);@@ -169,54 +169,54 @@ }
} -void OBActions::enterHandler(const XCrossingEvent &e) +void Actions::enterHandler(const XCrossingEvent &e) { - OtkEventHandler::enterHandler(e); + otk::EventHandler::enterHandler(e); // run the ENTER python hook int screen; - OBClient *c = Openbox::instance->findClient(e.window); + Client *c = Openbox::instance->findClient(e.window); if (c) screen = c->screen(); else - screen = otk::OBDisplay::findScreen(e.root)->screen(); + screen = otk::Display::findScreen(e.root)->screen(); EventData data(screen, c, EventEnterWindow, e.state); Openbox::instance->bindings()->fireEvent(&data); } -void OBActions::leaveHandler(const XCrossingEvent &e) +void Actions::leaveHandler(const XCrossingEvent &e) { - OtkEventHandler::leaveHandler(e); + otk::EventHandler::leaveHandler(e); // run the LEAVE python hook int screen; - OBClient *c = Openbox::instance->findClient(e.window); + Client *c = Openbox::instance->findClient(e.window); if (c) screen = c->screen(); else - screen = otk::OBDisplay::findScreen(e.root)->screen(); + screen = otk::Display::findScreen(e.root)->screen(); EventData data(screen, c, EventLeaveWindow, e.state); Openbox::instance->bindings()->fireEvent(&data); } -void OBActions::keyPressHandler(const XKeyEvent &e) +void Actions::keyPressHandler(const XKeyEvent &e) { - OtkEventHandler::keyPressHandler(e); + otk::EventHandler::keyPressHandler(e); // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); Openbox::instance->bindings()-> - fireKey(otk::OBDisplay::findScreen(e.root)->screen(), + fireKey(otk::Display::findScreen(e.root)->screen(), state, e.keycode, e.time); } -void OBActions::motionHandler(const XMotionEvent &e) +void Actions::motionHandler(const XMotionEvent &e) { - OtkEventHandler::motionHandler(e); + otk::EventHandler::motionHandler(e); if (!e.same_screen) return; // this just gets stupid@@ -224,9 +224,9 @@ int x_root = e.x_root, y_root = e.y_root;
// compress changes to a window into a single change XEvent ce; - while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) { + while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { if (ce.xmotion.window != e.window) { - XPutBackEvent(otk::OBDisplay::display, &ce); + XPutBackEvent(otk::Display::display, &ce); break; } else { x_root = e.x_root;@@ -234,7 +234,7 @@ y_root = e.y_root;
} } - OBWidget *w = dynamic_cast<OBWidget*> + WidgetBase *w = dynamic_cast<WidgetBase*> (Openbox::instance->findHandler(e.window)); assert(w); // everything should be a widget@@ -244,46 +244,46 @@ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); unsigned int button = _posqueue[0]->button; int screen; - OBClient *c = Openbox::instance->findClient(e.window); + Client *c = Openbox::instance->findClient(e.window); if (c) screen = c->screen(); else - screen = otk::OBDisplay::findScreen(e.root)->screen(); + screen = otk::Display::findScreen(e.root)->screen(); MouseData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion, x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea); Openbox::instance->bindings()->fireButton(&data); } -void OBActions::mapRequestHandler(const XMapRequestEvent &e) +void Actions::mapRequestHandler(const XMapRequestEvent &e) { - OtkEventHandler::mapRequestHandler(e); - // do this in OBScreen::manageWindow + otk::EventHandler::mapRequestHandler(e); + // do this in Screen::manageWindow } -void OBActions::unmapHandler(const XUnmapEvent &e) +void Actions::unmapHandler(const XUnmapEvent &e) { - OtkEventHandler::unmapHandler(e); - // do this in OBScreen::unmanageWindow + otk::EventHandler::unmapHandler(e); + // do this in Screen::unmanageWindow } -void OBActions::destroyHandler(const XDestroyWindowEvent &e) +void Actions::destroyHandler(const XDestroyWindowEvent &e) { - OtkEventHandler::destroyHandler(e); - // do this in OBScreen::unmanageWindow + otk::EventHandler::destroyHandler(e); + // do this in Screen::unmanageWindow } #ifdef XKB -void OBActions::xkbHandler(const XkbEvent &e) +void Actions::xkbHandler(const XkbEvent &e) { Window w; int screen; - OtkEventHandler::xkbHandler(e); + otk::EventHandler::xkbHandler(e); switch (((XkbAnyEvent*)&e)->xkb_type) { case XkbBellNotify: w = ((XkbBellNotifyEvent*)&e)->window; - OBClient *c = Openbox::instance->findClient(w); + Client *c = Openbox::instance->findClient(w); if (c) screen = c->screen(); else
M
src/actions.hh
→
src/actions.hh
@@ -25,7 +25,7 @@ /*!
When these actions are fired, hooks to the guile engine are fired so that guile code is run. */ -class OBActions : public otk::OtkEventHandler { +class Actions : public otk::EventHandler { public: #ifndef SWIG // get rid of a swig warning struct ButtonReleaseAction {@@ -61,10 +61,10 @@ void insertPress(const XButtonEvent &e);
void removePress(const XButtonEvent &e); public: - //! Constructs an OBActions object - OBActions(); - //! Destroys the OBActions object - virtual ~OBActions(); + //! Constructs an Actions object + Actions(); + //! Destroys the Actions object + virtual ~Actions(); virtual void buttonPressHandler(const XButtonEvent &e); virtual void buttonReleaseHandler(const XButtonEvent &e);
M
src/backgroundwidget.cc
→
src/backgroundwidget.cc
@@ -8,20 +8,20 @@ #include "backgroundwidget.hh"
namespace ob { -OBBackgroundWidget::OBBackgroundWidget(otk::OtkWidget *parent, - OBWidget::WidgetType type) - : otk::OtkWidget(parent), - OBWidget(type) +BackgroundWidget::BackgroundWidget(otk::Widget *parent, + WidgetBase::WidgetType type) + : otk::Widget(parent), + WidgetBase(type) { } -OBBackgroundWidget::~OBBackgroundWidget() +BackgroundWidget::~BackgroundWidget() { } -void OBBackgroundWidget::setTextures() +void BackgroundWidget::setTextures() { switch (type()) { case Type_Titlebar:@@ -48,9 +48,9 @@ }
} -void OBBackgroundWidget::setStyle(otk::Style *style) +void BackgroundWidget::setStyle(otk::Style *style) { - OtkWidget::setStyle(style); + Widget::setStyle(style); setTextures(); switch (type()) { case Type_Titlebar:@@ -65,23 +65,23 @@ }
} -void OBBackgroundWidget::focus() +void BackgroundWidget::focus() { - otk::OtkWidget::focus(); + otk::Widget::focus(); setTextures(); } -void OBBackgroundWidget::unfocus() +void BackgroundWidget::unfocus() { - otk::OtkWidget::unfocus(); + otk::Widget::unfocus(); setTextures(); } -void OBBackgroundWidget::adjust() +void BackgroundWidget::adjust() { - // nothing to adjust here. its done in OBFrame::adjustSize + // nothing to adjust here. its done in Frame::adjustSize } }
M
src/backgroundwidget.hh
→
src/backgroundwidget.hh
@@ -1,20 +1,20 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifndef __obbackgroundwidget_hh -#define __obbackgroundwidget_hh +#ifndef __backgroundwidget_hh +#define __backgroundwidget_hh #include "otk/widget.hh" #include "widgetbase.hh" namespace ob { -class OBBackgroundWidget : public otk::OtkWidget, public OBWidget +class BackgroundWidget : public otk::Widget, public WidgetBase { private: void setTextures(); public: - OBBackgroundWidget(otk::OtkWidget *parent, OBWidget::WidgetType type); - virtual ~OBBackgroundWidget(); + BackgroundWidget(otk::Widget *parent, WidgetBase::WidgetType type); + virtual ~BackgroundWidget(); virtual void setStyle(otk::Style *style);@@ -26,4 +26,4 @@ };
} -#endif // __obbackgroundwidget_hh +#endif // __backgroundwidget_hh
M
src/bindings.cc
→
src/bindings.cc
@@ -68,7 +68,7 @@ }
return true; } -bool OBBindings::translate(const std::string &str, Binding &b,bool askey) const +bool Bindings::translate(const std::string &str, Binding &b,bool askey) const { // parse out the base key name std::string::size_type keybegin = str.find_last_of('-');@@ -98,7 +98,7 @@ if (sym == NoSymbol) {
printf(_("Invalid Key name in key binding: %s\n"), key.c_str()); return false; } - if (!(b.key = XKeysymToKeycode(otk::OBDisplay::display, sym))) + if (!(b.key = XKeysymToKeycode(otk::Display::display, sym))) printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str()); return b.key != 0; } else {@@ -115,7 +115,7 @@ tree = c;
} } -KeyBindingTree *OBBindings::buildtree(const StringVect &keylist, +KeyBindingTree *Bindings::buildtree(const StringVect &keylist, PyObject *callback) const { if (keylist.empty()) return 0; // nothing in the list.. return 0@@ -142,11 +142,11 @@ return ret;
} -OBBindings::OBBindings() +Bindings::Bindings() : _curpos(&_keytree), _resetkey(0,0), _timer(Openbox::instance->timerManager(), - (otk::OBTimeoutHandler)resetChains, this) + (otk::TimeoutHandler)resetChains, this) { _timer.setTimeout(5000); // chains reset after 5 seconds@@ -154,7 +154,7 @@ // setResetKey("C-g"); // set the default reset key
} -OBBindings::~OBBindings() +Bindings::~Bindings() { grabKeys(false); removeAllKeys();@@ -163,7 +163,7 @@ removeAllEvents();
} -void OBBindings::assimilate(KeyBindingTree *node) +void Bindings::assimilate(KeyBindingTree *node) { KeyBindingTree *a, *b, *tmp, *last;@@ -195,7 +195,7 @@ }
} -KeyBindingTree *OBBindings::find(KeyBindingTree *search, +KeyBindingTree *Bindings::find(KeyBindingTree *search, bool *conflict) const { *conflict = false; KeyBindingTree *a, *b;@@ -222,7 +222,7 @@ return 0; // it just isn't in here
} -bool OBBindings::addKey(const StringVect &keylist, PyObject *callback) +bool Bindings::addKey(const StringVect &keylist, PyObject *callback) { KeyBindingTree *tree, *t; bool conflict;@@ -244,14 +244,14 @@ t->callbacks.push_back(callback);
destroytree(tree); } else { // grab the server here to make sure no key pressed go missed - otk::OBDisplay::grab(); + otk::Display::grab(); grabKeys(false); // assimilate this built tree into the main tree assimilate(tree); // assimilation destroys/uses the tree grabKeys(true); - otk::OBDisplay::ungrab(); + otk::Display::ungrab(); } Py_INCREF(callback);@@ -260,7 +260,7 @@ return true;
} -bool OBBindings::removeKey(const StringVect &keylist, PyObject *callback) +bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) { assert(false); // XXX: function not implemented yet@@ -277,7 +277,7 @@ t->callbacks.end(),
callback); if (it != t->callbacks.end()) { // grab the server here to make sure no key pressed go missed - otk::OBDisplay::grab(); + otk::Display::grab(); grabKeys(false); _curpos = &_keytree;@@ -286,7 +286,7 @@ // XXX do shit here ...
Py_XDECREF(*it); grabKeys(true); - otk::OBDisplay::ungrab(); + otk::Display::ungrab(); return true; }@@ -295,17 +295,17 @@ return false;
} -void OBBindings::setResetKey(const std::string &key) +void Bindings::setResetKey(const std::string &key) { Binding b(0, 0); if (translate(key, b)) { // grab the server here to make sure no key pressed go missed - otk::OBDisplay::grab(); + otk::Display::grab(); grabKeys(false); _resetkey.key = b.key; _resetkey.modifiers = b.modifiers; grabKeys(true); - otk::OBDisplay::ungrab(); + otk::Display::ungrab(); } }@@ -328,7 +328,7 @@ }
} -void OBBindings::removeAllKeys() +void Bindings::removeAllKeys() { grabKeys(false); if (_keytree.first_child) {@@ -339,37 +339,37 @@ grabKeys(true);
} -void OBBindings::grabKeys(bool grab) +void Bindings::grabKeys(bool grab) { for (int i = 0; i < Openbox::instance->screenCount(); ++i) { - Window root = otk::OBDisplay::screenInfo(i)->rootWindow(); + Window root = otk::Display::screenInfo(i)->rootWindow(); KeyBindingTree *p = _curpos->first_child; while (p) { if (grab) { - otk::OBDisplay::grabKey(p->binding.key, p->binding.modifiers, + otk::Display::grabKey(p->binding.key, p->binding.modifiers, root, false, GrabModeAsync, GrabModeAsync, false); } else - otk::OBDisplay::ungrabKey(p->binding.key, p->binding.modifiers, + otk::Display::ungrabKey(p->binding.key, p->binding.modifiers, root); p = p->next_sibling; } if (_resetkey.key) if (grab) - otk::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers, + otk::Display::grabKey(_resetkey.key, _resetkey.modifiers, root, false, GrabModeAsync, GrabModeAsync, false); else - otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers, + otk::Display::ungrabKey(_resetkey.key, _resetkey.modifiers, root); } } -void OBBindings::fireKey(int screen, unsigned int modifiers, unsigned int key, +void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key, Time time) { if (key == _resetkey.key && modifiers == _resetkey.modifiers) {@@ -381,13 +381,13 @@ if (p->binding.key == key && p->binding.modifiers == modifiers) {
if (p->chain) { _timer.start(); // start/restart the timer // grab the server here to make sure no key pressed go missed - otk::OBDisplay::grab(); + otk::Display::grab(); grabKeys(false); _curpos = p; grabKeys(true); - otk::OBDisplay::ungrab(); + otk::Display::ungrab(); } else { - OBClient *c = Openbox::instance->focusedClient(); + Client *c = Openbox::instance->focusedClient(); KeyData data(screen, c, time, modifiers, key); CallbackList::iterator it, end = p->callbacks.end(); for (it = p->callbacks.begin(); it != end; ++it)@@ -401,19 +401,19 @@ }
} } -void OBBindings::resetChains(OBBindings *self) +void Bindings::resetChains(Bindings *self) { self->_timer.stop(); // grab the server here to make sure no key pressed go missed - otk::OBDisplay::grab(); + otk::Display::grab(); self->grabKeys(false); self->_curpos = &self->_keytree; self->grabKeys(true); - otk::OBDisplay::ungrab(); + otk::Display::ungrab(); } -bool OBBindings::addButton(const std::string &but, MouseContext context, +bool Bindings::addButton(const std::string &but, MouseContext context, MouseAction action, PyObject *callback) { assert(context >= 0 && context < NUM_MOUSE_CONTEXT);@@ -441,8 +441,8 @@ bind->binding.modifiers = b.modifiers;
_buttons[context].push_back(bind); // grab the button on all clients for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) { - OBScreen *s = Openbox::instance->screen(sn); - OBClient::List::iterator c_it, c_end = s->clients.end(); + Screen *s = Openbox::instance->screen(sn); + Client::List::iterator c_it, c_end = s->clients.end(); for (c_it = s->clients.begin(); c_it != c_end; ++c_it) { grabButton(true, bind->binding, context, *c_it); }@@ -454,7 +454,7 @@ Py_INCREF(callback);
return true; } -void OBBindings::removeAllButtons() +void Bindings::removeAllButtons() { for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) { ButtonBindingList::iterator it, end = _buttons[i].end();@@ -467,8 +467,8 @@ }
} // ungrab the button on all clients for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) { - OBScreen *s = Openbox::instance->screen(sn); - OBClient::List::iterator c_it, c_end = s->clients.end(); + Screen *s = Openbox::instance->screen(sn); + Client::List::iterator c_it, c_end = s->clients.end(); for (c_it = s->clients.begin(); c_it != c_end; ++c_it) { grabButton(false, (*it)->binding, (MouseContext)i, *c_it); }@@ -477,8 +477,8 @@ }
} } -void OBBindings::grabButton(bool grab, const Binding &b, MouseContext context, - OBClient *client) +void Bindings::grabButton(bool grab, const Binding &b, MouseContext context, + Client *client) { Window win; int mode = GrabModeAsync;@@ -500,13 +500,13 @@ // any other elements already get button events, don't grab on them
return; } if (grab) - otk::OBDisplay::grabButton(b.key, b.modifiers, win, false, mask, mode, + otk::Display::grabButton(b.key, b.modifiers, win, false, mask, mode, GrabModeAsync, None, None, false); else - otk::OBDisplay::ungrabButton(b.key, b.modifiers, win); + otk::Display::ungrabButton(b.key, b.modifiers, win); } -void OBBindings::grabButtons(bool grab, OBClient *client) +void Bindings::grabButtons(bool grab, Client *client) { for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) { ButtonBindingList::iterator it, end = _buttons[i].end();@@ -515,11 +515,11 @@ grabButton(grab, (*it)->binding, (MouseContext)i, client);
} } -void OBBindings::fireButton(MouseData *data) +void Bindings::fireButton(MouseData *data) { if (data->context == MC_Window) { // Replay the event, so it goes to the client, and ungrab the device. - XAllowEvents(otk::OBDisplay::display, ReplayPointer, data->time); + XAllowEvents(otk::Display::display, ReplayPointer, data->time); } ButtonBindingList::iterator it, end = _buttons[data->context].end();@@ -534,14 +534,14 @@ }
} -bool OBBindings::addEvent(EventAction action, PyObject *callback) +bool Bindings::addEvent(EventAction action, PyObject *callback) { if (action < 0 || action >= NUM_EVENTS) { return false; } #ifdef XKB if (action == EventBell && _eventlist[action].empty()) - XkbSelectEvents(otk::OBDisplay::display, XkbUseCoreKbd, + XkbSelectEvents(otk::Display::display, XkbUseCoreKbd, XkbBellNotifyMask, XkbBellNotifyMask); #endif // XKB _eventlist[action].push_back(callback);@@ -549,7 +549,7 @@ Py_INCREF(callback);
return true; } -bool OBBindings::removeEvent(EventAction action, PyObject *callback) +bool Bindings::removeEvent(EventAction action, PyObject *callback) { if (action < 0 || action >= NUM_EVENTS) { return false;@@ -563,7 +563,7 @@ Py_XDECREF(*it);
_eventlist[action].erase(it); #ifdef XKB if (action == EventBell && _eventlist[action].empty()) - XkbSelectEvents(otk::OBDisplay::display, XkbUseCoreKbd, + XkbSelectEvents(otk::Display::display, XkbUseCoreKbd, XkbBellNotifyMask, 0); #endif // XKB return true;@@ -571,7 +571,7 @@ }
return false; } -void OBBindings::removeAllEvents() +void Bindings::removeAllEvents() { for (int i = 0; i < NUM_EVENTS; ++i) { while (!_eventlist[i].empty()) {@@ -581,7 +581,7 @@ }
} } -void OBBindings::fireEvent(EventData *data) +void Bindings::fireEvent(EventData *data) { CallbackList::iterator c_it, c_end = _eventlist[data->action].end(); for (c_it = _eventlist[data->action].begin(); c_it != c_end; ++c_it)
M
src/bindings.hh
→
src/bindings.hh
@@ -20,7 +20,7 @@ #include <vector>
namespace ob { -class OBClient; +class Client; typedef std::list<PyObject *> CallbackList;@@ -55,7 +55,7 @@ CallbackList callbacks[NUM_MOUSE_ACTION];
ButtonBinding() : binding(0, 0) {} }; -class OBBindings { +class Bindings { public: //! A list of strings typedef std::vector<std::string> StringVect;@@ -67,28 +67,28 @@ KeyBindingTree *_curpos; // position in the keytree
Binding _resetkey; // the key which resets the key chain status - otk::OBTimer _timer; + otk::Timer _timer; KeyBindingTree *find(KeyBindingTree *search, bool *conflict) const; KeyBindingTree *buildtree(const StringVect &keylist, PyObject *callback) const; void assimilate(KeyBindingTree *node); - static void resetChains(OBBindings *self); // the timer's timeout function + static void resetChains(Bindings *self); // the timer's timeout function typedef std::list <ButtonBinding*> ButtonBindingList; ButtonBindingList _buttons[NUM_MOUSE_CONTEXT]; void grabButton(bool grab, const Binding &b, MouseContext context, - OBClient *client); + Client *client); CallbackList _eventlist[NUM_EVENTS]; public: - //! Initializes an OBBindings object - OBBindings(); - //! Destroys the OBBindings object - virtual ~OBBindings(); + //! Initializes an Bindings object + Bindings(); + //! Destroys the Bindings object + virtual ~Bindings(); //! Translates a binding string into the actual Binding bool translate(const std::string &str, Binding &b, bool askey = true) const;@@ -120,7 +120,7 @@
bool addButton(const std::string &but, MouseContext context, MouseAction action, PyObject *callback); - void grabButtons(bool grab, OBClient *client); + void grabButtons(bool grab, Client *client); //! Removes all button bindings void removeAllButtons();
M
src/client.cc
→
src/client.cc
@@ -23,9 +23,9 @@ }
namespace ob { -OBClient::OBClient(int screen, Window window) - : otk::OtkEventHandler(), - OBWidget(OBWidget::Type_Client), +Client::Client(int screen, Window window) + : otk::EventHandler(), + WidgetBase(WidgetBase::Type_Client), frame(0), _screen(screen), _window(window) { assert(screen >= 0);@@ -70,9 +70,9 @@ changeState();
} -OBClient::~OBClient() +Client::~Client() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); // clean up parents reference to this if (_transient_for)@@ -80,70 +80,70 @@ _transient_for->_transients.remove(this); // remove from old parent
if (Openbox::instance->state() != Openbox::State_Exiting) { // these values should not be persisted across a window unmapping/mapping - property->erase(_window, otk::OBProperty::net_wm_desktop); - property->erase(_window, otk::OBProperty::net_wm_state); + property->erase(_window, otk::Property::net_wm_desktop); + property->erase(_window, otk::Property::net_wm_state); } } -void OBClient::getDesktop() +void Client::getDesktop() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); // defaults to the current desktop _desktop = Openbox::instance->screen(_screen)->desktop(); - if (!property->get(_window, otk::OBProperty::net_wm_desktop, - otk::OBProperty::Atom_Cardinal, + if (!property->get(_window, otk::Property::net_wm_desktop, + otk::Property::Atom_Cardinal, (long unsigned*)&_desktop)) { // make sure the hint exists Openbox::instance->property()->set(_window, - otk::OBProperty::net_wm_desktop, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_wm_desktop, + otk::Property::Atom_Cardinal, (unsigned)_desktop); } } -void OBClient::getType() +void Client::getType() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); _type = (WindowType) -1; unsigned long *val; unsigned long num = (unsigned) -1; - if (property->get(_window, otk::OBProperty::net_wm_window_type, - otk::OBProperty::Atom_Atom, + if (property->get(_window, otk::Property::net_wm_window_type, + otk::Property::Atom_Atom, &num, &val)) { // use the first value that we know about in the array for (unsigned long i = 0; i < num; ++i) { if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_desktop)) + property->atom(otk::Property::net_wm_window_type_desktop)) _type = Type_Desktop; else if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_dock)) + property->atom(otk::Property::net_wm_window_type_dock)) _type = Type_Dock; else if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_toolbar)) + property->atom(otk::Property::net_wm_window_type_toolbar)) _type = Type_Toolbar; else if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_menu)) + property->atom(otk::Property::net_wm_window_type_menu)) _type = Type_Menu; else if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_utility)) + property->atom(otk::Property::net_wm_window_type_utility)) _type = Type_Utility; else if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_splash)) + property->atom(otk::Property::net_wm_window_type_splash)) _type = Type_Splash; else if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_dialog)) + property->atom(otk::Property::net_wm_window_type_dialog)) _type = Type_Dialog; else if (val[i] == - property->atom(otk::OBProperty::net_wm_window_type_normal)) + property->atom(otk::Property::net_wm_window_type_normal)) _type = Type_Normal; // else if (val[i] == -// property->atom(otk::OBProperty::kde_net_wm_window_type_override)) +// property->atom(otk::Property::kde_net_wm_window_type_override)) // mwm_decorations = 0; // prevent this window from getting any decor // XXX: make this work again if (_type != (WindowType) -1)@@ -165,7 +165,7 @@ }
} -void OBClient::setupDecorAndFunctions() +void Client::setupDecorAndFunctions() { // start with everything _decorations = Decor_Titlebar | Decor_Handle | Decor_Border |@@ -237,17 +237,17 @@ // XXX: changeAllowedActions();
} -void OBClient::getMwmHints() +void Client::getMwmHints() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); unsigned long num = MwmHints::elements; unsigned long *hints; _mwmhints.flags = 0; // default to none - if (!property->get(_window, otk::OBProperty::motif_wm_hints, - otk::OBProperty::motif_wm_hints, &num, + if (!property->get(_window, otk::Property::motif_wm_hints, + otk::Property::motif_wm_hints, &num, (unsigned long **)&hints)) return;@@ -262,12 +262,12 @@ delete [] hints;
} -void OBClient::getArea() +void Client::getArea() { XWindowAttributes wattrib; Status ret; - ret = XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib); + ret = XGetWindowAttributes(otk::Display::display, _window, &wattrib); assert(ret != BadWindow); _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);@@ -275,9 +275,9 @@ _border_width = wattrib.border_width;
} -void OBClient::getState() +void Client::getState() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); _modal = _shaded = _max_horz = _max_vert = _fullscreen = _above = _below = _skip_taskbar = _skip_pager = false;@@ -285,35 +285,35 @@
unsigned long *state; unsigned long num = (unsigned) -1; - if (property->get(_window, otk::OBProperty::net_wm_state, - otk::OBProperty::Atom_Atom, &num, &state)) { + if (property->get(_window, otk::Property::net_wm_state, + otk::Property::Atom_Atom, &num, &state)) { for (unsigned long i = 0; i < num; ++i) { - if (state[i] == property->atom(otk::OBProperty::net_wm_state_modal)) + if (state[i] == property->atom(otk::Property::net_wm_state_modal)) _modal = true; else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_shaded)) { + property->atom(otk::Property::net_wm_state_shaded)) { _shaded = true; _wmstate = IconicState; } else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) + property->atom(otk::Property::net_wm_state_skip_taskbar)) _skip_taskbar = true; else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_skip_pager)) + property->atom(otk::Property::net_wm_state_skip_pager)) _skip_pager = true; else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_fullscreen)) + property->atom(otk::Property::net_wm_state_fullscreen)) _fullscreen = true; else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_maximized_vert)) + property->atom(otk::Property::net_wm_state_maximized_vert)) _max_vert = true; else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_maximized_horz)) + property->atom(otk::Property::net_wm_state_maximized_horz)) _max_horz = true; else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_above)) + property->atom(otk::Property::net_wm_state_above)) _above = true; else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_below)) + property->atom(otk::Property::net_wm_state_below)) _below = true; }@@ -322,18 +322,18 @@ }
} -void OBClient::getShaped() +void Client::getShaped() { _shaped = false; #ifdef SHAPE - if (otk::OBDisplay::shape()) { + if (otk::Display::shape()) { int foo; unsigned int ufoo; int s; - XShapeSelectInput(otk::OBDisplay::display, _window, ShapeNotifyMask); + XShapeSelectInput(otk::Display::display, _window, ShapeNotifyMask); - XShapeQueryExtents(otk::OBDisplay::display, _window, &s, &foo, + XShapeQueryExtents(otk::Display::display, _window, &s, &foo, &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, &ufoo); _shaped = (s != 0); }@@ -341,7 +341,7 @@ #endif // SHAPE
} -void OBClient::calcLayer() { +void Client::calcLayer() { StackLayer l; if (_iconic) l = Layer_Icon;@@ -368,9 +368,9 @@ }
} -void OBClient::updateProtocols() +void Client::updateProtocols() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); Atom *proto; int num_return = 0;@@ -379,14 +379,14 @@ _focus_notify = false;
_decorations &= ~Decor_Close; _functions &= ~Func_Close; - if (XGetWMProtocols(otk::OBDisplay::display, _window, &proto, &num_return)) { + if (XGetWMProtocols(otk::Display::display, _window, &proto, &num_return)) { for (int i = 0; i < num_return; ++i) { - if (proto[i] == property->atom(otk::OBProperty::wm_delete_window)) { + if (proto[i] == property->atom(otk::Property::wm_delete_window)) { _decorations |= Decor_Close; _functions |= Func_Close; if (frame) frame->adjustSize(); // update the decorations - } else if (proto[i] == property->atom(otk::OBProperty::wm_take_focus)) + } else if (proto[i] == property->atom(otk::Property::wm_take_focus)) // if this protocol is requested, then the window will be notified // by the window manager whenever it receives focus _focus_notify = true;@@ -396,7 +396,7 @@ }
} -void OBClient::updateNormalHints() +void Client::updateNormalHints() { XSizeHints size; long ret;@@ -413,7 +413,7 @@ // XXX: might want to cancel any interactive resizing of the window at this
// point.. // get the hints from the window - if (XGetWMNormalHints(otk::OBDisplay::display, _window, &size, &ret)) { + if (XGetWMNormalHints(otk::Display::display, _window, &size, &ret)) { _positioned = (size.flags & (PPosition|USPosition)); if (size.flags & PWinGravity)@@ -443,7 +443,7 @@ }
} -void OBClient::updateWMHints() +void Client::updateWMHints() { XWMHints *hints;@@ -451,7 +451,7 @@ // assume a window takes input if it doesnt specify
_can_focus = true; _urgent = false; - if ((hints = XGetWMHints(otk::OBDisplay::display, _window)) != NULL) { + if ((hints = XGetWMHints(otk::Display::display, _window)) != NULL) { if (hints->flags & InputHint) _can_focus = hints->input;@@ -472,18 +472,18 @@ }
} -void OBClient::updateTitle() +void Client::updateTitle() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); _title = ""; // try netwm - if (! property->get(_window, otk::OBProperty::net_wm_name, - otk::OBProperty::utf8, &_title)) { + if (! property->get(_window, otk::Property::net_wm_name, + otk::Property::utf8, &_title)) { // try old x stuff - property->get(_window, otk::OBProperty::wm_name, - otk::OBProperty::ascii, &_title); + property->get(_window, otk::Property::wm_name, + otk::Property::ascii, &_title); } if (_title.empty())@@ -494,18 +494,18 @@ frame->setTitle(_title);
} -void OBClient::updateIconTitle() +void Client::updateIconTitle() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); _icon_title = ""; // try netwm - if (! property->get(_window, otk::OBProperty::net_wm_icon_name, - otk::OBProperty::utf8, &_icon_title)) { + if (! property->get(_window, otk::Property::net_wm_icon_name, + otk::Property::utf8, &_icon_title)) { // try old x stuff - property->get(_window, otk::OBProperty::wm_icon_name, - otk::OBProperty::ascii, &_icon_title); + property->get(_window, otk::Property::wm_icon_name, + otk::Property::ascii, &_icon_title); } if (_title.empty())@@ -513,38 +513,38 @@ _icon_title = _("Unnamed Window");
} -void OBClient::updateClass() +void Client::updateClass() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); // set the defaults _app_name = _app_class = _role = ""; - otk::OBProperty::StringVect v; + otk::Property::StringVect v; unsigned long num = 2; - if (property->get(_window, otk::OBProperty::wm_class, - otk::OBProperty::ascii, &num, &v)) { + if (property->get(_window, otk::Property::wm_class, + otk::Property::ascii, &num, &v)) { if (num > 0) _app_name = v[0]; if (num > 1) _app_class = v[1]; } v.clear(); num = 1; - if (property->get(_window, otk::OBProperty::wm_window_role, - otk::OBProperty::ascii, &num, &v)) { + if (property->get(_window, otk::Property::wm_window_role, + otk::Property::ascii, &num, &v)) { if (num > 0) _role = v[0]; } } -void OBClient::updateStrut() +void Client::updateStrut() { unsigned long num = 4; unsigned long *data; if (!Openbox::instance->property()->get(_window, - otk::OBProperty::net_wm_strut, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_wm_strut, + otk::Property::Atom_Cardinal, &num, &data)) return;@@ -561,12 +561,12 @@ delete [] data;
} -void OBClient::updateTransientFor() +void Client::updateTransientFor() { Window t = 0; - OBClient *c = 0; + Client *c = 0; - if (XGetTransientForHint(otk::OBDisplay::display, _window, &t) && + if (XGetTransientForHint(otk::Display::display, _window, &t) && t != _window) { // cant be transient to itself! c = Openbox::instance->findClient(t); assert(c != this); // if this happens then we need to check for it@@ -575,7 +575,7 @@ if (!c /*XXX: && _group*/) {
// not transient to a client, see if it is transient for a group if (//t == _group->leader() || t == None || - t == otk::OBDisplay::screenInfo(_screen)->rootWindow()) { + t == otk::Display::screenInfo(_screen)->rootWindow()) { // window is a transient for its group! // XXX: for now this is treated as non-transient. // this needs to be fixed!@@ -596,19 +596,19 @@ }
} -void OBClient::propertyHandler(const XPropertyEvent &e) +void Client::propertyHandler(const XPropertyEvent &e) { - otk::OtkEventHandler::propertyHandler(e); + otk::EventHandler::propertyHandler(e); - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); // compress changes to a single property into a single change XEvent ce; - while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) { + while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { // XXX: it would be nice to compress ALL changes to a property, not just // changes in a row without other props between. if (ce.xproperty.atom != e.atom) { - XPutBackEvent(otk::OBDisplay::display, &ce); + XPutBackEvent(otk::Display::display, &ce); break; } }@@ -624,22 +624,22 @@ calcLayer(); // type may have changed, so update the layer
setupDecorAndFunctions(); frame->adjustSize(); // this updates the frame for any new decor settings } - else if (e.atom == property->atom(otk::OBProperty::net_wm_name) || - e.atom == property->atom(otk::OBProperty::wm_name)) + else if (e.atom == property->atom(otk::Property::net_wm_name) || + e.atom == property->atom(otk::Property::wm_name)) updateTitle(); - else if (e.atom == property->atom(otk::OBProperty::net_wm_icon_name) || - e.atom == property->atom(otk::OBProperty::wm_icon_name)) + else if (e.atom == property->atom(otk::Property::net_wm_icon_name) || + e.atom == property->atom(otk::Property::wm_icon_name)) updateIconTitle(); - else if (e.atom == property->atom(otk::OBProperty::wm_class)) + else if (e.atom == property->atom(otk::Property::wm_class)) updateClass(); - else if (e.atom == property->atom(otk::OBProperty::wm_protocols)) + else if (e.atom == property->atom(otk::Property::wm_protocols)) updateProtocols(); - else if (e.atom == property->atom(otk::OBProperty::net_wm_strut)) + else if (e.atom == property->atom(otk::Property::net_wm_strut)) updateStrut(); } -void OBClient::setWMState(long state) +void Client::setWMState(long state) { if (state == _wmstate) return; // no change@@ -655,7 +655,7 @@ }
} -void OBClient::setDesktop(long target) +void Client::setDesktop(long target) { if (target == _desktop) return;@@ -666,8 +666,8 @@
_desktop = target; Openbox::instance->property()->set(_window, - otk::OBProperty::net_wm_desktop, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_wm_desktop, + otk::Property::Atom_Cardinal, (unsigned)_desktop); // 'move' the window to the new desktop@@ -679,9 +679,9 @@ frame->hide();
} -void OBClient::setState(StateAction action, long data1, long data2) +void Client::setState(StateAction action, long data1, long data2) { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); bool shadestate = _shaded; if (!(action == State_Add || action == State_Remove ||@@ -695,106 +695,106 @@ if (! state) continue;
// if toggling, then pick whether we're adding or removing if (action == State_Toggle) { - if (state == property->atom(otk::OBProperty::net_wm_state_modal)) + if (state == property->atom(otk::Property::net_wm_state_modal)) action = _modal ? State_Remove : State_Add; else if (state == - property->atom(otk::OBProperty::net_wm_state_maximized_vert)) + property->atom(otk::Property::net_wm_state_maximized_vert)) action = _max_vert ? State_Remove : State_Add; else if (state == - property->atom(otk::OBProperty::net_wm_state_maximized_horz)) + property->atom(otk::Property::net_wm_state_maximized_horz)) action = _max_horz ? State_Remove : State_Add; - else if (state == property->atom(otk::OBProperty::net_wm_state_shaded)) + else if (state == property->atom(otk::Property::net_wm_state_shaded)) action = _shaded ? State_Remove : State_Add; else if (state == - property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) + property->atom(otk::Property::net_wm_state_skip_taskbar)) action = _skip_taskbar ? State_Remove : State_Add; else if (state == - property->atom(otk::OBProperty::net_wm_state_skip_pager)) + property->atom(otk::Property::net_wm_state_skip_pager)) action = _skip_pager ? State_Remove : State_Add; else if (state == - property->atom(otk::OBProperty::net_wm_state_fullscreen)) + property->atom(otk::Property::net_wm_state_fullscreen)) action = _fullscreen ? State_Remove : State_Add; - else if (state == property->atom(otk::OBProperty::net_wm_state_above)) + else if (state == property->atom(otk::Property::net_wm_state_above)) action = _above ? State_Remove : State_Add; - else if (state == property->atom(otk::OBProperty::net_wm_state_below)) + else if (state == property->atom(otk::Property::net_wm_state_below)) action = _below ? State_Remove : State_Add; } if (action == State_Add) { - if (state == property->atom(otk::OBProperty::net_wm_state_modal)) { + if (state == property->atom(otk::Property::net_wm_state_modal)) { if (_modal) continue; _modal = true; // XXX: give it focus if another window has focus that shouldnt now } else if (state == - property->atom(otk::OBProperty::net_wm_state_maximized_vert)){ + property->atom(otk::Property::net_wm_state_maximized_vert)){ if (_max_vert) continue; _max_vert = true; // XXX: resize the window etc } else if (state == - property->atom(otk::OBProperty::net_wm_state_maximized_horz)){ + property->atom(otk::Property::net_wm_state_maximized_horz)){ if (_max_horz) continue; _max_horz = true; // XXX: resize the window etc } else if (state == - property->atom(otk::OBProperty::net_wm_state_shaded)) { + property->atom(otk::Property::net_wm_state_shaded)) { if (_shaded) continue; // shade when we're all thru here shadestate = true; } else if (state == - property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) { + property->atom(otk::Property::net_wm_state_skip_taskbar)) { _skip_taskbar = true; } else if (state == - property->atom(otk::OBProperty::net_wm_state_skip_pager)) { + property->atom(otk::Property::net_wm_state_skip_pager)) { _skip_pager = true; } else if (state == - property->atom(otk::OBProperty::net_wm_state_fullscreen)) { + property->atom(otk::Property::net_wm_state_fullscreen)) { if (_fullscreen) continue; _fullscreen = true; } else if (state == - property->atom(otk::OBProperty::net_wm_state_above)) { + property->atom(otk::Property::net_wm_state_above)) { if (_above) continue; _above = true; } else if (state == - property->atom(otk::OBProperty::net_wm_state_below)) { + property->atom(otk::Property::net_wm_state_below)) { if (_below) continue; _below = true; } } else { // action == State_Remove - if (state == property->atom(otk::OBProperty::net_wm_state_modal)) { + if (state == property->atom(otk::Property::net_wm_state_modal)) { if (!_modal) continue; _modal = false; } else if (state == - property->atom(otk::OBProperty::net_wm_state_maximized_vert)){ + property->atom(otk::Property::net_wm_state_maximized_vert)){ if (!_max_vert) continue; _max_vert = false; // XXX: resize the window etc } else if (state == - property->atom(otk::OBProperty::net_wm_state_maximized_horz)){ + property->atom(otk::Property::net_wm_state_maximized_horz)){ if (!_max_horz) continue; _max_horz = false; // XXX: resize the window etc } else if (state == - property->atom(otk::OBProperty::net_wm_state_shaded)) { + property->atom(otk::Property::net_wm_state_shaded)) { if (!_shaded) continue; // unshade when we're all thru here shadestate = false; } else if (state == - property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) { + property->atom(otk::Property::net_wm_state_skip_taskbar)) { _skip_taskbar = false; } else if (state == - property->atom(otk::OBProperty::net_wm_state_skip_pager)) { + property->atom(otk::Property::net_wm_state_skip_pager)) { _skip_pager = false; } else if (state == - property->atom(otk::OBProperty::net_wm_state_fullscreen)) { + property->atom(otk::Property::net_wm_state_fullscreen)) { if (!_fullscreen) continue; _fullscreen = false; } else if (state == - property->atom(otk::OBProperty::net_wm_state_above)) { + property->atom(otk::Property::net_wm_state_above)) { if (!_above) continue; _above = false; } else if (state == - property->atom(otk::OBProperty::net_wm_state_below)) { + property->atom(otk::Property::net_wm_state_below)) { if (!_below) continue; _below = false; }@@ -806,7 +806,7 @@ calcLayer();
} -void OBClient::toggleClientBorder(bool addborder) +void Client::toggleClientBorder(bool addborder) { // adjust our idea of where the client is, based on its border. When the // border is removed, the client should now be considered to be in a@@ -844,32 +844,32 @@ }
_area.setPos(x, y); if (addborder) { - XSetWindowBorderWidth(otk::OBDisplay::display, _window, _border_width); + XSetWindowBorderWidth(otk::Display::display, _window, _border_width); // move the client so it is back it the right spot _with_ its border! - XMoveWindow(otk::OBDisplay::display, _window, x, y); + XMoveWindow(otk::Display::display, _window, x, y); } else - XSetWindowBorderWidth(otk::OBDisplay::display, _window, 0); + XSetWindowBorderWidth(otk::Display::display, _window, 0); } -void OBClient::clientMessageHandler(const XClientMessageEvent &e) +void Client::clientMessageHandler(const XClientMessageEvent &e) { - otk::OtkEventHandler::clientMessageHandler(e); + otk::EventHandler::clientMessageHandler(e); if (e.format != 32) return; - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); - if (e.message_type == property->atom(otk::OBProperty::wm_change_state)) { + if (e.message_type == property->atom(otk::Property::wm_change_state)) { // compress changes into a single change bool compress = false; XEvent ce; - while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) { + while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { // XXX: it would be nice to compress ALL messages of a type, not just // messages in a row without other message types between. if (ce.xclient.message_type != e.message_type) { - XPutBackEvent(otk::OBDisplay::display, &ce); + XPutBackEvent(otk::Display::display, &ce); break; } compress = true;@@ -879,15 +879,15 @@ setWMState(ce.xclient.data.l[0]); // use the found event
else setWMState(e.data.l[0]); // use the original event } else if (e.message_type == - property->atom(otk::OBProperty::net_wm_desktop)) { + property->atom(otk::Property::net_wm_desktop)) { // compress changes into a single change bool compress = false; XEvent ce; - while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) { + while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { // XXX: it would be nice to compress ALL messages of a type, not just // messages in a row without other message types between. if (ce.xclient.message_type != e.message_type) { - XPutBackEvent(otk::OBDisplay::display, &ce); + XPutBackEvent(otk::Display::display, &ce); break; } compress = true;@@ -896,7 +896,7 @@ if (compress)
setDesktop(e.data.l[0]); // use the found event else setDesktop(e.data.l[0]); // use the original event - } else if (e.message_type == property->atom(otk::OBProperty::net_wm_state)) { + } else if (e.message_type == property->atom(otk::Property::net_wm_state)) { // can't compress these #ifdef DEBUG printf("net_wm_state %s %ld %ld for 0x%lx\n",@@ -906,13 +906,13 @@ e.data.l[1], e.data.l[2], _window);
#endif setState((StateAction)e.data.l[0], e.data.l[1], e.data.l[2]); } else if (e.message_type == - property->atom(otk::OBProperty::net_close_window)) { + property->atom(otk::Property::net_close_window)) { #ifdef DEBUG printf("net_close_window for 0x%lx\n", _window); #endif close(); } else if (e.message_type == - property->atom(otk::OBProperty::net_active_window)) { + property->atom(otk::Property::net_active_window)) { #ifdef DEBUG printf("net_active_window for 0x%lx\n", _window); #endif@@ -926,9 +926,9 @@ }
#if defined(SHAPE) -void OBClient::shapeHandler(const XShapeEvent &e) +void Client::shapeHandler(const XShapeEvent &e) { - otk::OtkEventHandler::shapeHandler(e); + otk::EventHandler::shapeHandler(e); if (e.kind == ShapeBounding) { _shaped = e.shaped;@@ -938,7 +938,7 @@ }
#endif -void OBClient::resize(Corner anchor, int w, int h, int x, int y) +void Client::resize(Corner anchor, int w, int h, int x, int y) { w -= _base_size.x(); h -= _base_size.y();@@ -992,7 +992,7 @@ }
_area.setSize(w, h); - XResizeWindow(otk::OBDisplay::display, _window, w, h); + XResizeWindow(otk::Display::display, _window, w, h); // resize the frame to match the request frame->adjustSize();@@ -1000,7 +1000,7 @@ move(x, y);
} -void OBClient::move(int x, int y) +void Client::move(int x, int y) { _area.setPos(x, y);@@ -1012,7 +1012,7 @@ // send synthetic configure notify (we don't need to if we aren't mapped
// yet) XEvent event; event.type = ConfigureNotify; - event.xconfigure.display = otk::OBDisplay::display; + event.xconfigure.display = otk::Display::display; event.xconfigure.event = _window; event.xconfigure.window = _window; event.xconfigure.x = x;@@ -1028,10 +1028,10 @@ }
} -void OBClient::close() +void Client::close() { XEvent ce; - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); if (!(_functions & Func_Close)) return;@@ -1042,62 +1042,62 @@ // turns a nice red, and if this function is called again, the client is
// explicitly killed. ce.xclient.type = ClientMessage; - ce.xclient.message_type = property->atom(otk::OBProperty::wm_protocols); - ce.xclient.display = otk::OBDisplay::display; + ce.xclient.message_type = property->atom(otk::Property::wm_protocols); + ce.xclient.display = otk::Display::display; ce.xclient.window = _window; ce.xclient.format = 32; - ce.xclient.data.l[0] = property->atom(otk::OBProperty::wm_delete_window); + ce.xclient.data.l[0] = property->atom(otk::Property::wm_delete_window); ce.xclient.data.l[1] = CurrentTime; ce.xclient.data.l[2] = 0l; ce.xclient.data.l[3] = 0l; ce.xclient.data.l[4] = 0l; - XSendEvent(otk::OBDisplay::display, _window, false, NoEventMask, &ce); + XSendEvent(otk::Display::display, _window, false, NoEventMask, &ce); } -void OBClient::changeState() +void Client::changeState() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); unsigned long state[2]; state[0] = _wmstate; state[1] = None; - property->set(_window, otk::OBProperty::wm_state, otk::OBProperty::wm_state, + property->set(_window, otk::Property::wm_state, otk::Property::wm_state, state, 2); Atom netstate[10]; int num = 0; if (_modal) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_modal); + netstate[num++] = property->atom(otk::Property::net_wm_state_modal); if (_shaded) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_shaded); + netstate[num++] = property->atom(otk::Property::net_wm_state_shaded); if (_iconic) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_hidden); + netstate[num++] = property->atom(otk::Property::net_wm_state_hidden); if (_skip_taskbar) netstate[num++] = - property->atom(otk::OBProperty::net_wm_state_skip_taskbar); + property->atom(otk::Property::net_wm_state_skip_taskbar); if (_skip_pager) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_skip_pager); + netstate[num++] = property->atom(otk::Property::net_wm_state_skip_pager); if (_fullscreen) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_fullscreen); + netstate[num++] = property->atom(otk::Property::net_wm_state_fullscreen); if (_max_vert) netstate[num++] = - property->atom(otk::OBProperty::net_wm_state_maximized_vert); + property->atom(otk::Property::net_wm_state_maximized_vert); if (_max_horz) netstate[num++] = - property->atom(otk::OBProperty::net_wm_state_maximized_horz); + property->atom(otk::Property::net_wm_state_maximized_horz); if (_above) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_above); + netstate[num++] = property->atom(otk::Property::net_wm_state_above); if (_below) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_below); - property->set(_window, otk::OBProperty::net_wm_state, - otk::OBProperty::Atom_Atom, netstate, num); + netstate[num++] = property->atom(otk::Property::net_wm_state_below); + property->set(_window, otk::Property::net_wm_state, + otk::Property::Atom_Atom, netstate, num); calcLayer(); } -void OBClient::shade(bool shade) +void Client::shade(bool shade) { if (shade == _shaded) return; // already done@@ -1108,7 +1108,7 @@ frame->adjustSize();
} -bool OBClient::focus() const +bool Client::focus() const { // won't try focus if the client doesn't want it, or if the window isn't // visible on the screen@@ -1117,31 +1117,31 @@
if (_focused) return true; if (_can_focus) - XSetInputFocus(otk::OBDisplay::display, _window, + XSetInputFocus(otk::Display::display, _window, RevertToNone, CurrentTime); if (_focus_notify) { XEvent ce; - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); ce.xclient.type = ClientMessage; - ce.xclient.message_type = property->atom(otk::OBProperty::wm_protocols); - ce.xclient.display = otk::OBDisplay::display; + ce.xclient.message_type = property->atom(otk::Property::wm_protocols); + ce.xclient.display = otk::Display::display; ce.xclient.window = _window; ce.xclient.format = 32; - ce.xclient.data.l[0] = property->atom(otk::OBProperty::wm_take_focus); + ce.xclient.data.l[0] = property->atom(otk::Property::wm_take_focus); ce.xclient.data.l[1] = Openbox::instance->lastTime(); ce.xclient.data.l[2] = 0l; ce.xclient.data.l[3] = 0l; ce.xclient.data.l[4] = 0l; - XSendEvent(otk::OBDisplay::display, _window, False, NoEventMask, &ce); + XSendEvent(otk::Display::display, _window, False, NoEventMask, &ce); } return true; } -void OBClient::unfocus() const +void Client::unfocus() const { if (!_focused) return;@@ -1150,13 +1150,13 @@ Openbox::instance->setFocusedClient(0);
} -void OBClient::focusHandler(const XFocusChangeEvent &e) +void Client::focusHandler(const XFocusChangeEvent &e) { #ifdef DEBUG // printf("FocusIn for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::focusHandler(e); + otk::EventHandler::focusHandler(e); frame->focus(); _focused = true;@@ -1165,13 +1165,13 @@ Openbox::instance->setFocusedClient(this);
} -void OBClient::unfocusHandler(const XFocusChangeEvent &e) +void Client::unfocusHandler(const XFocusChangeEvent &e) { #ifdef DEBUG // printf("FocusOut for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::unfocusHandler(e); + otk::EventHandler::unfocusHandler(e); frame->unfocus(); _focused = false;@@ -1181,13 +1181,13 @@ Openbox::instance->setFocusedClient(0);
} -void OBClient::configureRequestHandler(const XConfigureRequestEvent &e) +void Client::configureRequestHandler(const XConfigureRequestEvent &e) { #ifdef DEBUG printf("ConfigureRequest for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::configureRequestHandler(e); + otk::EventHandler::configureRequestHandler(e); // XXX: if we are iconic (or shaded? (fvwm does that)) ignore the event@@ -1246,7 +1246,7 @@ }
} -void OBClient::unmapHandler(const XUnmapEvent &e) +void Client::unmapHandler(const XUnmapEvent &e) { if (ignore_unmaps) { #ifdef DEBUG@@ -1260,27 +1260,27 @@ #ifdef DEBUG
printf("UnmapNotify for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::unmapHandler(e); + otk::EventHandler::unmapHandler(e); // this deletes us etc Openbox::instance->screen(_screen)->unmanageWindow(this); } -void OBClient::destroyHandler(const XDestroyWindowEvent &e) +void Client::destroyHandler(const XDestroyWindowEvent &e) { #ifdef DEBUG printf("DestroyNotify for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::destroyHandler(e); + otk::EventHandler::destroyHandler(e); // this deletes us etc Openbox::instance->screen(_screen)->unmanageWindow(this); } -void OBClient::reparentHandler(const XReparentEvent &e) +void Client::reparentHandler(const XReparentEvent &e) { // this is when the client is first taken captive in the frame if (e.parent == frame->plate()) return;@@ -1289,7 +1289,7 @@ #ifdef DEBUG
printf("ReparentNotify for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::reparentHandler(e); + otk::EventHandler::reparentHandler(e); /* This event is quite rare and is usually handled in unmapHandler.@@ -1302,7 +1302,7 @@ // we don't want the reparent event, put it back on the stack for the X
// server to deal with after we unmanage the window XEvent ev; ev.xreparent = e; - XPutBackEvent(otk::OBDisplay::display, &ev); + XPutBackEvent(otk::Display::display, &ev); // this deletes us etc Openbox::instance->screen(_screen)->unmanageWindow(this);
M
src/client.hh
→
src/client.hh
@@ -3,7 +3,7 @@ #ifndef __client_hh
#define __client_hh /*! @file client.hh - @brief The OBClient class maintains the state of a client window by handling + @brief The Client class maintains the state of a client window by handling property changes on the window and some client messages */@@ -26,7 +26,7 @@ #include <list>
namespace ob { -class OBFrame; +class Frame; //! The MWM Hints as retrieved from the window property /*!@@ -34,36 +34,36 @@ This structure only contains 3 elements, even though the Motif 2.0
structure contains 5. We only use the first 3, so that is all gets defined. */ struct MwmHints { - unsigned long flags; //!< A bitmask of OBClient::MwmFlags values - unsigned long functions; //!< A bitmask of OBClient::MwmFunctions values - unsigned long decorations;//!< A bitmask of OBClient::MwmDecorations values - //! The number of elements in the OBClient::MwmHints struct + unsigned long flags; //!< A bitmask of Client::MwmFlags values + unsigned long functions; //!< A bitmask of Client::MwmFunctions values + unsigned long decorations;//!< A bitmask of Client::MwmDecorations values + //! The number of elements in the Client::MwmHints struct static const unsigned int elements = 3; }; //! Maintains the state of a client window. /*! - OBClient maintains the state of a client window. The state consists of the + Client maintains the state of a client window. The state consists of the hints that the application sets on the window, such as the title, or window gravity. <p> - OBClient also manages client messages for the client window. When the + Client also manages client messages for the client window. When the application (or any application) requests something to be changed for the client, it will call the ActionHandler (for client messages) or update the class' member variables and call whatever is nessary to complete the change (such as causing a redraw of the titlebar after the title is changed). */ -class OBClient : public otk::OtkEventHandler, public OBWidget { +class Client : public otk::EventHandler, public WidgetBase { public: //! The frame window which decorates around the client window /*! NOTE: This should NEVER be used inside the client class's constructor! */ - OBFrame *frame; + Frame *frame; - //! Holds a list of OBClients - typedef std::list<OBClient*> List; + //! Holds a list of Clients + typedef std::list<Client*> List; //! The possible stacking layers a client window can be a part of enum StackLayer {@@ -126,7 +126,7 @@ Func_Iconify = 1 << 2, //!< Allow to be iconified
Func_Maximize = 1 << 3, //!< Allow to be maximized Func_Close = 1 << 4 //!< Allow to be closed }; - //! Holds a bitmask of OBClient::Function values + //! Holds a bitmask of Client::Function values typedef unsigned char FunctionFlags; //! The decorations the client window wants to be displayed on it@@ -138,7 +138,7 @@ Decor_Maximize = 1 << 4, //!< Display a maximize button
Decor_Sticky = 1 << 5, //!< Display a sticky button Decor_Close = 1 << 6 //!< Display a close button }; - //! Holds a bitmask of OBClient::Decoration values + //! Holds a bitmask of Client::Decoration values typedef unsigned char DecorationFlags; //! Possible actions that can be made with the _NET_WM_STATE client message@@ -173,10 +173,10 @@ //! The id of the group the window belongs to
Window _group; //! The client which this client is a transient (child) for - OBClient *_transient_for; + Client *_transient_for; //! The clients which are transients (children) of this client - OBClient::List _transients; + Client::List _transients; //! The desktop on which the window resides (0xffffffff for all desktops) long _desktop;@@ -296,38 +296,38 @@ bool _below;
StackLayer _layer; - //! A bitmask of values in the OBClient::Decoration enum + //! A bitmask of values in the Client::Decoration enum /*! The values in the variable are the decorations that the client wants to be displayed around it. */ DecorationFlags _decorations; - //! A bitmask of values in the OBClient::Function enum + //! A bitmask of values in the Client::Function enum /*! The values in the variable specify the ways in which the user is allowed to modify this window. */ FunctionFlags _functions; - //! Retrieves the desktop hint's value and sets OBClient::_desktop + //! Retrieves the desktop hint's value and sets Client::_desktop void getDesktop(); - //! Retrieves the window's type and sets OBClient::_type + //! Retrieves the window's type and sets Client::_type void getType(); - //! Gets the MWM Hints and adjusts OBClient::_functions and - //! OBClient::_decorations + //! Gets the MWM Hints and adjusts Client::_functions and + //! Client::_decorations void getMwmHints(); - //! Gets the position and size of the window and sets OBClient::_area + //! Gets the position and size of the window and sets Client::_area void getArea(); //! Gets the net_state hint and sets the boolean flags for any states set in //! the hint void getState(); //! Determines if the window uses the Shape extension and sets - //! OBClient::_shaped + //! Client::_shaped void getShaped(); //! Set up what decor should be shown on the window and what functions should - //! be allowed (OBClient::_decorations and OBClient::_functions). + //! be allowed (Client::_decorations and Client::_functions). /*! This also updates the NET_WM_ALLOWED_ACTIONS hint. */@@ -377,23 +377,23 @@ void shade(bool shade);
public: #ifndef SWIG - //! Constructs a new OBClient object around a specified window id + //! Constructs a new Client object around a specified window id /*! -BB @param window The window id that the OBClient class should handle +BB @param window The window id that the Client class should handle @param screen The screen on which the window resides */ - OBClient(int screen, Window window); - //! Destroys the OBClient object - virtual ~OBClient(); + Client(int screen, Window window); + //! Destroys the Client object + virtual ~Client(); #endif //! Returns the screen on which the clien resides inline int screen() const { return _screen; } - //! Returns the window id that the OBClient object is handling + //! Returns the window id that the Client object is handling inline Window window() const { return _window; } - //! Returns the type of the window, one of the OBClient::WindowType values + //! Returns the type of the window, one of the Client::WindowType values inline WindowType type() const { return _type; } //! Returns if the window should be treated as a normal window. /*!@@ -454,7 +454,7 @@ //! Returns the functions that the user can perform on the window
inline FunctionFlags funtions() const { return _functions; } //! Return the client this window is transient for - inline OBClient *transientFor() const { return _transient_for; } + inline Client *transientFor() const { return _transient_for; } //! Returns if the window is modal /*!
M
src/frame.cc
→
src/frame.cc
@@ -21,29 +21,29 @@ #include <string>
namespace ob { -const long OBFrame::event_mask; +const long Frame::event_mask; -OBFrame::OBFrame(OBClient *client, otk::Style *style) - : otk::OtkWidget(Openbox::instance, style, Horizontal, 0, 1, true), - OBWidget(Type_Frame), +Frame::Frame(Client *client, otk::Style *style) + : otk::Widget(Openbox::instance, style, Horizontal, 0, 1, true), + WidgetBase(WidgetBase::Type_Frame), _client(client), - _screen(otk::OBDisplay::screenInfo(client->screen())), - _plate(this, OBWidget::Type_Plate), - _titlebar(this, OBWidget::Type_Titlebar), - _button_close(&_titlebar, OBWidget::Type_CloseButton), - _button_iconify(&_titlebar, OBWidget::Type_IconifyButton), - _button_max(&_titlebar, OBWidget::Type_MaximizeButton), - _button_stick(&_titlebar, OBWidget::Type_StickyButton), - _label(&_titlebar, OBWidget::Type_Label), - _handle(this, OBWidget::Type_Handle), - _grip_left(&_handle, OBWidget::Type_LeftGrip), - _grip_right(&_handle, OBWidget::Type_RightGrip), + _screen(otk::Display::screenInfo(client->screen())), + _plate(this, WidgetBase::Type_Plate), + _titlebar(this, WidgetBase::Type_Titlebar), + _button_close(&_titlebar, WidgetBase::Type_CloseButton), + _button_iconify(&_titlebar, WidgetBase::Type_IconifyButton), + _button_max(&_titlebar, WidgetBase::Type_MaximizeButton), + _button_stick(&_titlebar, WidgetBase::Type_StickyButton), + _label(&_titlebar, WidgetBase::Type_Label), + _handle(this, WidgetBase::Type_Handle), + _grip_left(&_handle, WidgetBase::Type_LeftGrip), + _grip_right(&_handle, WidgetBase::Type_RightGrip), _decorations(client->decorations()) { assert(client); assert(style); - XSelectInput(otk::OBDisplay::display, _window, OBFrame::event_mask); + XSelectInput(otk::Display::display, _window, Frame::event_mask); _grip_left.setCursor(Openbox::instance->cursors().ll_angle); _grip_right.setCursor(Openbox::instance->cursors().lr_angle);@@ -53,29 +53,29 @@
_style = 0; setStyle(style); - otk::OtkWidget::unfocus(); // stuff starts out appearing focused in otk + otk::Widget::unfocus(); // stuff starts out appearing focused in otk _plate.show(); // the other stuff is shown based on decor settings } -OBFrame::~OBFrame() +Frame::~Frame() { } -void OBFrame::setTitle(const std::string &text) +void Frame::setTitle(const std::string &text) { _label.setText(text); _label.update(); } -void OBFrame::setStyle(otk::Style *style) +void Frame::setStyle(otk::Style *style) { assert(style); - otk::OtkWidget::setStyle(style); + otk::Widget::setStyle(style); // if a style was previously set, then 'replace' is true, cause we're // replacing a style@@ -98,27 +98,27 @@ }
} -void OBFrame::focus() +void Frame::focus() { - otk::OtkWidget::focus(); + otk::Widget::focus(); update(); } -void OBFrame::unfocus() +void Frame::unfocus() { - otk::OtkWidget::unfocus(); + otk::Widget::unfocus(); update(); } -void OBFrame::adjust() +void Frame::adjust() { // the party all happens in adjustSize } -void OBFrame::adjustSize() +void Frame::adjustSize() { // XXX: only if not overridden or something!!! MORE LOGIC HERE!! _decorations = _client->decorations();@@ -131,7 +131,7 @@ int cbwidth; // width of the inner client border
int butsize=0; // width and height of the titlebar buttons const int bevel = _style->getBevelWidth(); - if (_decorations & OBClient::Decor_Border) { + if (_decorations & Client::Decor_Border) { bwidth = _style->getBorderWidth(); cbwidth = _style->getFrameWidth(); } else@@ -148,7 +148,7 @@ _grip_left.setBorderWidth(bwidth);
_grip_right.setBorderWidth(bwidth); _handle.setBorderWidth(bwidth); - if (_decorations & OBClient::Decor_Titlebar) { + if (_decorations & Client::Decor_Titlebar) { // set the titlebar size _titlebar.setGeometry(-bwidth, -bwidth,@@ -160,13 +160,13 @@ // set the label size
_label.setGeometry(0, bevel, width, _style->getFont()->height()); // set the buttons sizes butsize = _label.height() - 2; - if (_decorations & OBClient::Decor_Iconify) + if (_decorations & Client::Decor_Iconify) _button_iconify.setGeometry(0, bevel + 1, butsize, butsize); - if (_decorations & OBClient::Decor_Maximize) + if (_decorations & Client::Decor_Maximize) _button_max.setGeometry(0, bevel + 1, butsize, butsize); - if (_decorations & OBClient::Decor_Sticky) + if (_decorations & Client::Decor_Sticky) _button_stick.setGeometry(0, bevel + 1, butsize, butsize); - if (_decorations & OBClient::Decor_Close) + if (_decorations & Client::Decor_Close) _button_close.setGeometry(0, bevel + 1, butsize, butsize); // separation between titlebar elements@@ -185,7 +185,7 @@ for (std::string::size_type i = 0; i < layout.size(); ++i) {
switch (layout[i]) { case 'i': case 'I': - if (!tit_i && (_decorations & OBClient::Decor_Iconify)) { + if (!tit_i && (_decorations & Client::Decor_Iconify)) { tit_i = true; continue; }@@ -199,21 +199,21 @@ }
break; case 'm': case 'M': - if (!tit_m && (_decorations & OBClient::Decor_Maximize)) { + if (!tit_m && (_decorations & Client::Decor_Maximize)) { tit_m = true; continue; } break; case 's': case 'S': - if (!tit_s && (_decorations & OBClient::Decor_Sticky)) { + if (!tit_s && (_decorations & Client::Decor_Sticky)) { tit_s = true; continue; } break; case 'c': case 'C': - if (!tit_c && (_decorations & OBClient::Decor_Close)) { + if (!tit_c && (_decorations & Client::Decor_Close)) { tit_c = true; continue; }@@ -272,7 +272,7 @@ x += sep;
} } - if (_decorations & OBClient::Decor_Handle) { + if (_decorations & Client::Decor_Handle) { _handle.setGeometry(-bwidth, _innersize.top + _client->area().height() + cbwidth, width, _style->getHandleWidth());@@ -306,7 +306,7 @@ _plate.setGeometry(_innersize.left - cbwidth, _innersize.top - cbwidth,
_client->area().width(), _client->area().height()); // map/unmap all the windows - if (_decorations & OBClient::Decor_Titlebar) { + if (_decorations & Client::Decor_Titlebar) { _label.show(); if (tit_i) _button_iconify.show();@@ -329,7 +329,7 @@ } else {
_titlebar.hide(true); } - if (_decorations & OBClient::Decor_Handle) + if (_decorations & Client::Decor_Handle) _handle.show(true); else _handle.hide(true);@@ -345,7 +345,7 @@ update();
} -void OBFrame::adjustPosition() +void Frame::adjustPosition() { int x, y; clientGravity(x, y);@@ -353,21 +353,21 @@ move(x, y);
} -void OBFrame::adjustShape() +void Frame::adjustShape() { #ifdef SHAPE - int bwidth = (_decorations & OBClient::Decor_Border) ? + int bwidth = (_decorations & Client::Decor_Border) ? _style->getBorderWidth() : 0; if (!_client->shaped()) { // clear the shape on the frame window - XShapeCombineMask(otk::OBDisplay::display, _window, ShapeBounding, + XShapeCombineMask(otk::Display::display, _window, ShapeBounding, _innersize.left, _innersize.top, None, ShapeSet); } else { // make the frame's shape match the clients - XShapeCombineShape(otk::OBDisplay::display, _window, ShapeBounding, + XShapeCombineShape(otk::Display::display, _window, ShapeBounding, _innersize.left, _innersize.top, _client->window(), ShapeBounding, ShapeSet);@@ -375,7 +375,7 @@
int num = 0; XRectangle xrect[2]; - if (_decorations & OBClient::Decor_Titlebar) { + if (_decorations & Client::Decor_Titlebar) { xrect[0].x = _titlebar.rect().x(); xrect[0].y = _titlebar.rect().y(); xrect[0].width = _titlebar.width() + bwidth * 2; // XXX: this is useless once the widget handles borders!@@ -383,7 +383,7 @@ xrect[0].height = _titlebar.height() + bwidth * 2;
++num; } - if (_decorations & OBClient::Decor_Handle) { + if (_decorations & Client::Decor_Handle) { xrect[1].x = _handle.rect().x(); xrect[1].y = _handle.rect().y(); xrect[1].width = _handle.width() + bwidth * 2; // XXX: this is useless once the widget handles borders!@@ -391,7 +391,7 @@ xrect[1].height = _handle.height() + bwidth * 2;
++num; } - XShapeCombineRectangles(otk::OBDisplay::display, window(), + XShapeCombineRectangles(otk::Display::display, window(), ShapeBounding, 0, 0, xrect, num, ShapeUnion, Unsorted); }@@ -399,10 +399,10 @@ #endif // SHAPE
} -void OBFrame::grabClient() +void Frame::grabClient() { // reparent the client to the frame - XReparentWindow(otk::OBDisplay::display, _client->window(), + XReparentWindow(otk::Display::display, _client->window(), _plate.window(), 0, 0); /* When reparenting the client window, it is usually not mapped yet, since@@ -416,38 +416,38 @@ if (Openbox::instance->state() == Openbox::State_Starting)
_client->ignore_unmaps += 2; // select the event mask on the client's parent (to receive config req's) - XSelectInput(otk::OBDisplay::display, _plate.window(), + XSelectInput(otk::Display::display, _plate.window(), SubstructureRedirectMask); // map the client so it maps when the frame does - XMapWindow(otk::OBDisplay::display, _client->window()); + XMapWindow(otk::Display::display, _client->window()); adjustSize(); adjustPosition(); } -void OBFrame::releaseClient() +void Frame::releaseClient() { XEvent ev; // check if the app has already reparented its window away - if (XCheckTypedWindowEvent(otk::OBDisplay::display, _client->window(), + if (XCheckTypedWindowEvent(otk::Display::display, _client->window(), ReparentNotify, &ev)) { - XPutBackEvent(otk::OBDisplay::display, &ev); + XPutBackEvent(otk::Display::display, &ev); // re-map the window since the unmanaging process unmaps it - XMapWindow(otk::OBDisplay::display, _client->window()); + XMapWindow(otk::Display::display, _client->window()); } else { // according to the ICCCM - if the client doesn't reparent itself, then we // will reparent the window to root for them - XReparentWindow(otk::OBDisplay::display, _client->window(), + XReparentWindow(otk::Display::display, _client->window(), _screen->rootWindow(), _client->area().x(), _client->area().y()); } } -void OBFrame::clientGravity(int &x, int &y) +void Frame::clientGravity(int &x, int &y) { x = _client->area().x(); y = _client->area().y();@@ -506,7 +506,7 @@ }
} -void OBFrame::frameGravity(int &x, int &y) +void Frame::frameGravity(int &x, int &y) { x = rect().x(); y = rect().y();
M
src/frame.hh
→
src/frame.hh
@@ -23,20 +23,20 @@ #include <string>
namespace ob { -//! Holds and decorates a frame around an OBClient (client window) +//! Holds and decorates a frame around an Client (client window) /*! The frame is responsible for calling XSelectInput on the client window's new parent with the SubstructureRedirectMask so that structure events for the client are sent to the window manager. */ -class OBFrame : public otk::OtkWidget, public OBWidget { +class Frame : public otk::Widget, public WidgetBase { public: //! The event mask to grab on frame windows static const long event_mask = EnterWindowMask | LeaveWindowMask; private: - OBClient *_client; + Client *_client; const otk::ScreenInfo *_screen; //! The style to use for size and display the decorations@@ -49,33 +49,33 @@ //! The size of the frame on each side of the client window inside the border
otk::Strut _innersize; // decoration windows - OBBackgroundWidget _plate; // sits entirely under the client window - OBBackgroundWidget _titlebar; - OBButtonWidget _button_close; - OBButtonWidget _button_iconify; - OBButtonWidget _button_max; - OBButtonWidget _button_stick; - OBLabelWidget _label; - OBBackgroundWidget _handle; - OBButtonWidget _grip_left; - OBButtonWidget _grip_right; + BackgroundWidget _plate; // sits entirely under the client window + BackgroundWidget _titlebar; + ButtonWidget _button_close; + ButtonWidget _button_iconify; + ButtonWidget _button_max; + ButtonWidget _button_stick; + LabelWidget _label; + BackgroundWidget _handle; + ButtonWidget _grip_left; + ButtonWidget _grip_right; //! The decorations to display on the window. /*! - This is by default the same value as in the OBClient::decorations, but it + This is by default the same value as in the Client::decorations, but it is duplicated here so that it can be overridden per-window by the user. */ - OBClient::DecorationFlags _decorations; + Client::DecorationFlags _decorations; public: - //! Constructs an OBFrame object, and reparents the client to itself + //! Constructs an Frame object, and reparents the client to itself /*! - @param client The client window which will be decorated by the new OBFrame + @param client The client window which will be decorated by the new Frame @param style The style to use to decorate the frame */ - OBFrame(OBClient *client, otk::Style *style); - //! Destroys the OBFrame object - virtual ~OBFrame(); + Frame(Client *client, otk::Style *style); + //! Destroys the Frame object + virtual ~Frame(); //! Set the style to decorate the frame with virtual void setStyle(otk::Style *style);
M
src/labelwidget.cc
→
src/labelwidget.cc
@@ -1,3 +1,4 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- #ifdef HAVE_CONFIG_H@@ -10,30 +11,30 @@ #include "labelwidget.hh"
namespace ob { -OBLabelWidget::OBLabelWidget(otk::OtkWidget *parent, OBWidget::WidgetType type) - : otk::OtkWidget(parent), - OBWidget(type) +LabelWidget::LabelWidget(otk::Widget *parent, WidgetBase::WidgetType type) + : otk::Widget(parent), + WidgetBase(type) { - const otk::ScreenInfo *info = otk::OBDisplay::screenInfo(_screen); - _xftdraw = XftDrawCreate(otk::OBDisplay::display, _window, info->visual(), + const otk::ScreenInfo *info = otk::Display::screenInfo(_screen); + _xftdraw = XftDrawCreate(otk::Display::display, _window, info->visual(), info->colormap()); } -OBLabelWidget::~OBLabelWidget() +LabelWidget::~LabelWidget() { XftDrawDestroy(_xftdraw); } -void OBLabelWidget::setText(const std::string &text) +void LabelWidget::setText(const std::string &text) { _text = text; _dirty = true; } -void OBLabelWidget::setTextures() +void LabelWidget::setTextures() { if (_focused) { setTexture(_style->getLabelFocus());@@ -45,9 +46,9 @@ }
} -void OBLabelWidget::setStyle(otk::Style *style) +void LabelWidget::setStyle(otk::Style *style) { - OtkWidget::setStyle(style); + otk::Widget::setStyle(style); setTextures(); _font = style->getFont(); assert(_font);@@ -56,25 +57,25 @@ _justify = style->textJustify();
} -void OBLabelWidget::focus() +void LabelWidget::focus() { - otk::OtkWidget::focus(); + otk::Widget::focus(); setTextures(); } -void OBLabelWidget::unfocus() +void LabelWidget::unfocus() { - otk::OtkWidget::unfocus(); + otk::Widget::unfocus(); setTextures(); } -void OBLabelWidget::update() +void LabelWidget::update() { bool draw = _dirty; - OtkWidget::update(); + otk::Widget::update(); if (draw) { std::string t = _text;@@ -111,7 +112,7 @@ }
} -void OBLabelWidget::adjust() +void LabelWidget::adjust() { // nothing to adjust. no children. }
M
src/labelwidget.hh
→
src/labelwidget.hh
@@ -9,12 +9,12 @@ #include "otk/style.hh"
namespace ob { -class OBLabelWidget : public otk::OtkWidget, public OBWidget +class LabelWidget : public otk::Widget, public WidgetBase { private: void setTextures(); - const otk::BFont *_font; - otk::BColor *_text_color; + const otk::Font *_font; + otk::Color *_text_color; int _sidemargin; otk::Style::TextJustify _justify; std::string _text;@@ -22,8 +22,8 @@ //! Object used by Xft to render to the drawable
XftDraw *_xftdraw; public: - OBLabelWidget(otk::OtkWidget *parent, OBWidget::WidgetType type); - virtual ~OBLabelWidget(); + LabelWidget(otk::Widget *parent, WidgetBase::WidgetType type); + virtual ~LabelWidget(); virtual void setStyle(otk::Style *style);
M
src/main.cc
→
src/main.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*- +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- /*! @file main.cc @brief Main entry point for the application@@ -15,9 +15,6 @@ #endif // HAVE_LOCALE_H
#include "gettext.h" } - -#include <string> -using std::string; #include "openbox.hh"
M
src/openbox.cc
→
src/openbox.cc
@@ -79,8 +79,8 @@ }
Openbox::Openbox(int argc, char **argv) - : otk::OtkEventDispatcher(), - otk::OtkEventHandler() + : otk::EventDispatcher(), + otk::EventHandler() { struct sigaction action;@@ -100,10 +100,10 @@
parseCommandLine(argc, argv); // open the X display (and gets some info about it, and its screens) - otk::OBDisplay::initialize(_displayreq); - assert(otk::OBDisplay::display); + otk::Display::initialize(_displayreq); + assert(otk::Display::display); - XSynchronize(otk::OBDisplay::display, _sync); + XSynchronize(otk::Display::display, _sync); // set up the signal handler action.sa_handler = Openbox::signalHandler;@@ -117,19 +117,19 @@ sigaction(SIGTERM, &action, (struct sigaction *) 0);
sigaction(SIGINT, &action, (struct sigaction *) 0); sigaction(SIGHUP, &action, (struct sigaction *) 0); - _property = new otk::OBProperty(); - _actions = new OBActions(); - _bindings = new OBBindings(); + _property = new otk::Property(); + _actions = new Actions(); + _bindings = new Bindings(); setMasterHandler(_actions); // set as the master event handler // 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); + _cursors.session = XCreateFontCursor(otk::Display::display, XC_left_ptr); + _cursors.move = XCreateFontCursor(otk::Display::display, XC_fleur); + _cursors.ll_angle = XCreateFontCursor(otk::Display::display, XC_ll_angle); + _cursors.lr_angle = XCreateFontCursor(otk::Display::display, XC_lr_angle); + _cursors.ul_angle = XCreateFontCursor(otk::Display::display, XC_ul_angle); + _cursors.ur_angle = XCreateFontCursor(otk::Display::display, XC_ur_angle); // initialize scripting python_init(argv[0]);@@ -143,11 +143,11 @@ if (!python_exec(_scriptfilepath.c_str()))
python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors // initialize all the screens - OBScreen *screen; - int i = _single ? DefaultScreen(otk::OBDisplay::display) : 0; - int max = _single ? i + 1 : ScreenCount(otk::OBDisplay::display); + Screen *screen; + int i = _single ? DefaultScreen(otk::Display::display) : 0; + int max = _single ? i + 1 : ScreenCount(otk::Display::display); for (; i < max; ++i) { - screen = new OBScreen(i); + screen = new Screen(i); if (screen->managed()) _screens.push_back(screen); else@@ -189,19 +189,19 @@ delete _property;
python_destroy(); - XSetInputFocus(otk::OBDisplay::display, PointerRoot, RevertToNone, + XSetInputFocus(otk::Display::display, PointerRoot, RevertToNone, CurrentTime); - XSync(otk::OBDisplay::display, false); + XSync(otk::Display::display, false); // this tends to block.. i honestly am not sure why. causing an x error in // the shutdown process unblocks it. blackbox simply did a ::exit(0), so // all im gunna do is the same. - //otk::OBDisplay::destroy(); + //otk::Display::destroy(); if (_restart) { if (!_restart_prog.empty()) { const std::string &dstr = - otk::OBDisplay::screenInfo(first_screen)->displayString(); + otk::Display::screenInfo(first_screen)->displayString(); otk::putenv(const_cast<char *>(dstr.c_str())); execlp(_restart_prog.c_str(), _restart_prog.c_str(), NULL); perror(_restart_prog.c_str());@@ -321,13 +321,13 @@ void Openbox::eventLoop()
{ while (!_shutdown) { _timermanager.fire(!_sync); // wait if not in sync mode - dispatchEvents(); // from OtkEventDispatcher - XFlush(otk::OBDisplay::display); // flush here before we go wait for timers + dispatchEvents(); // from otk::EventDispatcher + XFlush(otk::Display::display); // flush here before we go wait for timers } } -void Openbox::addClient(Window window, OBClient *client) +void Openbox::addClient(Window window, Client *client) { _clients[window] = client; }@@ -339,7 +339,7 @@ _clients.erase(window);
} -OBClient *Openbox::findClient(Window window) +Client *Openbox::findClient(Window window) { /* NOTE: we dont use _clients[] to find the value because that will insert@@ -350,27 +350,27 @@ ClientMap::iterator it = _clients.find(window);
if (it != _clients.end()) return it->second; else - return (OBClient*) 0; + return (Client*) 0; } -void Openbox::setFocusedClient(OBClient *c) +void Openbox::setFocusedClient(Client *c) { _focused_client = c; if (c) { _focused_screen = _screens[c->screen()]; } else { assert(_focused_screen); - XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(), + XSetInputFocus(otk::Display::display, _focused_screen->focuswindow(), RevertToNone, CurrentTime); } // set the NET_ACTIVE_WINDOW hint for all screens ScreenList::iterator it, end = _screens.end(); for (it = _screens.begin(); it != end; ++it) { int num = (*it)->number(); - Window root = otk::OBDisplay::screenInfo(num)->rootWindow(); - _property->set(root, otk::OBProperty::net_active_window, - otk::OBProperty::Atom_Window, + Window root = otk::Display::screenInfo(num)->rootWindow(); + _property->set(root, otk::Property::net_active_window, + otk::Property::Atom_Window, (c && _focused_screen == *it) ? c->window() : None); }@@ -381,9 +381,9 @@ }
void Openbox::execute(int screen, const std::string &bin) { - if (screen >= ScreenCount(otk::OBDisplay::display)) + if (screen >= ScreenCount(otk::Display::display)) screen = 0; - otk::bexec(bin, otk::OBDisplay::screenInfo(screen)->displayString()); + otk::bexec(bin, otk::Display::screenInfo(screen)->displayString()); } }
M
src/openbox.hh
→
src/openbox.hh
@@ -23,10 +23,10 @@ #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 {@@ -49,7 +49,7 @@ the Openbox::eventLoop function should be called. The eventLoop method does
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@@ -67,10 +67,10 @@ State_Exiting //!< The window manager is exiting (being destroyed)
}; //! A map for looking up a specific client class from the window id - typedef std::map<Window, OBClient *> ClientMap; + typedef std::map<Window, Client *> ClientMap; - //! A list of OBScreen classes - typedef std::vector<OBScreen *> ScreenList; + //! A list of Screen classes + typedef std::vector<Screen *> ScreenList; private: // stuff that can be passed on the command line@@ -106,24 +106,24 @@ ScreenList _screens;
//! Manages all timers for the application /*! - Use of the otk::OBTimerQueueManager::fire funtion in this object ensures + Use of the otk::TimerQueueManager::fire funtion in this object ensures that all timers fire when their times elapse. */ - otk::OBTimerQueueManager _timermanager; + otk::TimerQueueManager _timermanager; //! Cached atoms on the display /*! - This is a pointer because the OBProperty class uses otk::OBDisplay::display + This is a pointer because the Property class uses otk::Display::display in its constructor, so, it needs to be initialized <b>after</b> the display is initialized in this class' constructor. */ - otk::OBProperty *_property; + otk::Property *_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; + Bindings *_bindings; //! The running state of the window manager RunState _state;@@ -146,14 +146,14 @@ //! 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);@@ -180,24 +180,24 @@
//! Returns the state of the window manager (starting, exiting, etc) inline RunState state() const { return _state; } - //! Returns the otk::OBTimerQueueManager for the application + //! Returns the otk::TimerQueueManager for the application /*! - All otk::OBTimer objects used in the application should be made to use this - otk::OBTimerQueueManager. + All otk::Timer objects used in the application should be made to use this + otk::TimerQueueManager. */ - inline otk::OBTimerQueueManager *timerManager() { return &_timermanager; } + inline otk::TimerQueueManager *timerManager() { return &_timermanager; } - //! Returns the otk::OBProperty instance for the window manager - inline const otk::OBProperty *property() const { return _property; } + //! Returns the otk::Property instance for the window manager + inline const otk::Property *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;@@ -222,26 +222,26 @@ */
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 /*!
M
src/openbox.i
→
src/openbox.i
@@ -18,7 +18,7 @@ %}
%include "stl.i" //%include std_list.i -//%template(ClientList) std::list<OBClient*>; +//%template(ClientList) std::list<Client*>; %ignore ob::Openbox::instance; %inline %{@@ -90,15 +90,15 @@
} %} -%ignore ob::OBScreen::clients; +%ignore ob::Screen::clients; %{ #include <iterator> %} -%extend ob::OBScreen { - OBClient *client(int i) { +%extend ob::Screen { + Client *client(int i) { if (i >= (int)self->clients.size()) return NULL; - ob::OBClient::List::iterator it = self->clients.begin(); + ob::Client::List::iterator it = self->clients.begin(); std::advance(it,i); return *it; }@@ -107,9 +107,9 @@ return (int) self->clients.size();
} }; -%ignore otk::OBDisplay::display; +%ignore otk::Display::display; %inline %{ - Display *OBDisplay_display() { return otk::OBDisplay::display; } + Display *Display_display() { return otk::Display::display; } %}; %include "../otk/display.hh"@@ -118,11 +118,6 @@ %include "../otk/property.hh"
%include "../otk/rect.hh" %include "../otk/screeninfo.hh" %include "../otk/strut.hh" - -%rename(itostring_unsigned) itostring(unsigned int); -%rename(itostring_long) itostring(long); -%rename(itostring_unsigned_long) itostring(unsigned long); -%include "../otk/util.hh" %include "../otk/eventhandler.hh" %include "../otk/eventdispatcher.hh"
M
src/openbox.py
→
src/openbox.py
@@ -29,94 +29,94 @@
Openbox_instance = _openbox.Openbox_instance -OBDisplay_display = _openbox.OBDisplay_display +Display_display = _openbox.Display_display -class OBDisplay(_object): +class Display(_object): __swig_setmethods__ = {} - __setattr__ = lambda self, name, value: _swig_setattr(self, OBDisplay, name, value) + __setattr__ = lambda self, name, value: _swig_setattr(self, Display, name, value) __swig_getmethods__ = {} - __getattr__ = lambda self, name: _swig_getattr(self, OBDisplay, name) - __swig_getmethods__["initialize"] = lambda x: _openbox.OBDisplay_initialize - if _newclass:initialize = staticmethod(_openbox.OBDisplay_initialize) - __swig_getmethods__["destroy"] = lambda x: _openbox.OBDisplay_destroy - if _newclass:destroy = staticmethod(_openbox.OBDisplay_destroy) - __swig_getmethods__["gcCache"] = lambda x: _openbox.OBDisplay_gcCache - if _newclass:gcCache = staticmethod(_openbox.OBDisplay_gcCache) - __swig_getmethods__["screenInfo"] = lambda x: _openbox.OBDisplay_screenInfo - if _newclass:screenInfo = staticmethod(_openbox.OBDisplay_screenInfo) - __swig_getmethods__["findScreen"] = lambda x: _openbox.OBDisplay_findScreen - if _newclass:findScreen = staticmethod(_openbox.OBDisplay_findScreen) - __swig_getmethods__["xkb"] = lambda x: _openbox.OBDisplay_xkb - if _newclass:xkb = staticmethod(_openbox.OBDisplay_xkb) - __swig_getmethods__["xkbEventBase"] = lambda x: _openbox.OBDisplay_xkbEventBase - if _newclass:xkbEventBase = staticmethod(_openbox.OBDisplay_xkbEventBase) - __swig_getmethods__["shape"] = lambda x: _openbox.OBDisplay_shape - if _newclass:shape = staticmethod(_openbox.OBDisplay_shape) - __swig_getmethods__["shapeEventBase"] = lambda x: _openbox.OBDisplay_shapeEventBase - if _newclass:shapeEventBase = staticmethod(_openbox.OBDisplay_shapeEventBase) - __swig_getmethods__["xinerama"] = lambda x: _openbox.OBDisplay_xinerama - if _newclass:xinerama = staticmethod(_openbox.OBDisplay_xinerama) - __swig_getmethods__["numLockMask"] = lambda x: _openbox.OBDisplay_numLockMask - if _newclass:numLockMask = staticmethod(_openbox.OBDisplay_numLockMask) - __swig_getmethods__["scrollLockMask"] = lambda x: _openbox.OBDisplay_scrollLockMask - if _newclass:scrollLockMask = staticmethod(_openbox.OBDisplay_scrollLockMask) - __swig_getmethods__["grab"] = lambda x: _openbox.OBDisplay_grab - if _newclass:grab = staticmethod(_openbox.OBDisplay_grab) - __swig_getmethods__["ungrab"] = lambda x: _openbox.OBDisplay_ungrab - if _newclass:ungrab = staticmethod(_openbox.OBDisplay_ungrab) - __swig_getmethods__["grabButton"] = lambda x: _openbox.OBDisplay_grabButton - if _newclass:grabButton = staticmethod(_openbox.OBDisplay_grabButton) - __swig_getmethods__["ungrabButton"] = lambda x: _openbox.OBDisplay_ungrabButton - if _newclass:ungrabButton = staticmethod(_openbox.OBDisplay_ungrabButton) - __swig_getmethods__["grabKey"] = lambda x: _openbox.OBDisplay_grabKey - if _newclass:grabKey = staticmethod(_openbox.OBDisplay_grabKey) - __swig_getmethods__["ungrabKey"] = lambda x: _openbox.OBDisplay_ungrabKey - if _newclass:ungrabKey = staticmethod(_openbox.OBDisplay_ungrabKey) + __getattr__ = lambda self, name: _swig_getattr(self, Display, name) + __swig_getmethods__["initialize"] = lambda x: _openbox.Display_initialize + if _newclass:initialize = staticmethod(_openbox.Display_initialize) + __swig_getmethods__["destroy"] = lambda x: _openbox.Display_destroy + if _newclass:destroy = staticmethod(_openbox.Display_destroy) + __swig_getmethods__["gcCache"] = lambda x: _openbox.Display_gcCache + if _newclass:gcCache = staticmethod(_openbox.Display_gcCache) + __swig_getmethods__["screenInfo"] = lambda x: _openbox.Display_screenInfo + if _newclass:screenInfo = staticmethod(_openbox.Display_screenInfo) + __swig_getmethods__["findScreen"] = lambda x: _openbox.Display_findScreen + if _newclass:findScreen = staticmethod(_openbox.Display_findScreen) + __swig_getmethods__["xkb"] = lambda x: _openbox.Display_xkb + if _newclass:xkb = staticmethod(_openbox.Display_xkb) + __swig_getmethods__["xkbEventBase"] = lambda x: _openbox.Display_xkbEventBase + if _newclass:xkbEventBase = staticmethod(_openbox.Display_xkbEventBase) + __swig_getmethods__["shape"] = lambda x: _openbox.Display_shape + if _newclass:shape = staticmethod(_openbox.Display_shape) + __swig_getmethods__["shapeEventBase"] = lambda x: _openbox.Display_shapeEventBase + if _newclass:shapeEventBase = staticmethod(_openbox.Display_shapeEventBase) + __swig_getmethods__["xinerama"] = lambda x: _openbox.Display_xinerama + if _newclass:xinerama = staticmethod(_openbox.Display_xinerama) + __swig_getmethods__["numLockMask"] = lambda x: _openbox.Display_numLockMask + if _newclass:numLockMask = staticmethod(_openbox.Display_numLockMask) + __swig_getmethods__["scrollLockMask"] = lambda x: _openbox.Display_scrollLockMask + if _newclass:scrollLockMask = staticmethod(_openbox.Display_scrollLockMask) + __swig_getmethods__["grab"] = lambda x: _openbox.Display_grab + if _newclass:grab = staticmethod(_openbox.Display_grab) + __swig_getmethods__["ungrab"] = lambda x: _openbox.Display_ungrab + if _newclass:ungrab = staticmethod(_openbox.Display_ungrab) + __swig_getmethods__["grabButton"] = lambda x: _openbox.Display_grabButton + if _newclass:grabButton = staticmethod(_openbox.Display_grabButton) + __swig_getmethods__["ungrabButton"] = lambda x: _openbox.Display_ungrabButton + if _newclass:ungrabButton = staticmethod(_openbox.Display_ungrabButton) + __swig_getmethods__["grabKey"] = lambda x: _openbox.Display_grabKey + if _newclass:grabKey = staticmethod(_openbox.Display_grabKey) + __swig_getmethods__["ungrabKey"] = lambda x: _openbox.Display_ungrabKey + if _newclass:ungrabKey = staticmethod(_openbox.Display_ungrabKey) def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): - return "<C OBDisplay instance at %s>" % (self.this,) + return "<C Display instance at %s>" % (self.this,) -class OBDisplayPtr(OBDisplay): +class DisplayPtr(Display): def __init__(self,this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = OBDisplay -_openbox.OBDisplay_swigregister(OBDisplayPtr) -OBDisplay_initialize = _openbox.OBDisplay_initialize + self.__class__ = Display +_openbox.Display_swigregister(DisplayPtr) +Display_initialize = _openbox.Display_initialize -OBDisplay_destroy = _openbox.OBDisplay_destroy +Display_destroy = _openbox.Display_destroy -OBDisplay_gcCache = _openbox.OBDisplay_gcCache +Display_gcCache = _openbox.Display_gcCache -OBDisplay_screenInfo = _openbox.OBDisplay_screenInfo +Display_screenInfo = _openbox.Display_screenInfo -OBDisplay_findScreen = _openbox.OBDisplay_findScreen +Display_findScreen = _openbox.Display_findScreen -OBDisplay_xkb = _openbox.OBDisplay_xkb +Display_xkb = _openbox.Display_xkb -OBDisplay_xkbEventBase = _openbox.OBDisplay_xkbEventBase +Display_xkbEventBase = _openbox.Display_xkbEventBase -OBDisplay_shape = _openbox.OBDisplay_shape +Display_shape = _openbox.Display_shape -OBDisplay_shapeEventBase = _openbox.OBDisplay_shapeEventBase +Display_shapeEventBase = _openbox.Display_shapeEventBase -OBDisplay_xinerama = _openbox.OBDisplay_xinerama +Display_xinerama = _openbox.Display_xinerama -OBDisplay_numLockMask = _openbox.OBDisplay_numLockMask +Display_numLockMask = _openbox.Display_numLockMask -OBDisplay_scrollLockMask = _openbox.OBDisplay_scrollLockMask +Display_scrollLockMask = _openbox.Display_scrollLockMask -OBDisplay_grab = _openbox.OBDisplay_grab +Display_grab = _openbox.Display_grab -OBDisplay_ungrab = _openbox.OBDisplay_ungrab +Display_ungrab = _openbox.Display_ungrab -OBDisplay_grabButton = _openbox.OBDisplay_grabButton +Display_grabButton = _openbox.Display_grabButton -OBDisplay_ungrabButton = _openbox.OBDisplay_ungrabButton +Display_ungrabButton = _openbox.Display_ungrabButton -OBDisplay_grabKey = _openbox.OBDisplay_grabKey +Display_grabKey = _openbox.Display_grabKey -OBDisplay_ungrabKey = _openbox.OBDisplay_ungrabKey +Display_ungrabKey = _openbox.Display_ungrabKey class Point(_object):@@ -142,126 +142,126 @@ if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = Point _openbox.Point_swigregister(PointPtr) -class OBProperty(_object): +class Property(_object): __swig_setmethods__ = {} - __setattr__ = lambda self, name, value: _swig_setattr(self, OBProperty, name, value) + __setattr__ = lambda self, name, value: _swig_setattr(self, Property, name, value) __swig_getmethods__ = {} - __getattr__ = lambda self, name: _swig_getattr(self, OBProperty, name) - Atom_Cardinal = _openbox.OBProperty_Atom_Cardinal - Atom_Window = _openbox.OBProperty_Atom_Window - Atom_Pixmap = _openbox.OBProperty_Atom_Pixmap - Atom_Atom = _openbox.OBProperty_Atom_Atom - Atom_String = _openbox.OBProperty_Atom_String - Atom_Utf8 = _openbox.OBProperty_Atom_Utf8 - openbox_pid = _openbox.OBProperty_openbox_pid - wm_colormap_windows = _openbox.OBProperty_wm_colormap_windows - wm_protocols = _openbox.OBProperty_wm_protocols - wm_state = _openbox.OBProperty_wm_state - wm_delete_window = _openbox.OBProperty_wm_delete_window - wm_take_focus = _openbox.OBProperty_wm_take_focus - wm_change_state = _openbox.OBProperty_wm_change_state - wm_name = _openbox.OBProperty_wm_name - wm_icon_name = _openbox.OBProperty_wm_icon_name - wm_class = _openbox.OBProperty_wm_class - wm_window_role = _openbox.OBProperty_wm_window_role - motif_wm_hints = _openbox.OBProperty_motif_wm_hints - blackbox_attributes = _openbox.OBProperty_blackbox_attributes - blackbox_change_attributes = _openbox.OBProperty_blackbox_change_attributes - blackbox_hints = _openbox.OBProperty_blackbox_hints - blackbox_structure_messages = _openbox.OBProperty_blackbox_structure_messages - blackbox_notify_startup = _openbox.OBProperty_blackbox_notify_startup - blackbox_notify_window_add = _openbox.OBProperty_blackbox_notify_window_add - blackbox_notify_window_del = _openbox.OBProperty_blackbox_notify_window_del - blackbox_notify_window_focus = _openbox.OBProperty_blackbox_notify_window_focus - blackbox_notify_current_workspace = _openbox.OBProperty_blackbox_notify_current_workspace - blackbox_notify_workspace_count = _openbox.OBProperty_blackbox_notify_workspace_count - blackbox_notify_window_raise = _openbox.OBProperty_blackbox_notify_window_raise - blackbox_notify_window_lower = _openbox.OBProperty_blackbox_notify_window_lower - blackbox_change_workspace = _openbox.OBProperty_blackbox_change_workspace - blackbox_change_window_focus = _openbox.OBProperty_blackbox_change_window_focus - blackbox_cycle_window_focus = _openbox.OBProperty_blackbox_cycle_window_focus - openbox_show_root_menu = _openbox.OBProperty_openbox_show_root_menu - openbox_show_workspace_menu = _openbox.OBProperty_openbox_show_workspace_menu - net_supported = _openbox.OBProperty_net_supported - net_client_list = _openbox.OBProperty_net_client_list - net_client_list_stacking = _openbox.OBProperty_net_client_list_stacking - net_number_of_desktops = _openbox.OBProperty_net_number_of_desktops - net_desktop_geometry = _openbox.OBProperty_net_desktop_geometry - net_desktop_viewport = _openbox.OBProperty_net_desktop_viewport - net_current_desktop = _openbox.OBProperty_net_current_desktop - net_desktop_names = _openbox.OBProperty_net_desktop_names - net_active_window = _openbox.OBProperty_net_active_window - net_workarea = _openbox.OBProperty_net_workarea - net_supporting_wm_check = _openbox.OBProperty_net_supporting_wm_check - net_close_window = _openbox.OBProperty_net_close_window - net_wm_moveresize = _openbox.OBProperty_net_wm_moveresize - net_wm_name = _openbox.OBProperty_net_wm_name - net_wm_visible_name = _openbox.OBProperty_net_wm_visible_name - net_wm_icon_name = _openbox.OBProperty_net_wm_icon_name - net_wm_visible_icon_name = _openbox.OBProperty_net_wm_visible_icon_name - net_wm_desktop = _openbox.OBProperty_net_wm_desktop - net_wm_window_type = _openbox.OBProperty_net_wm_window_type - net_wm_state = _openbox.OBProperty_net_wm_state - net_wm_strut = _openbox.OBProperty_net_wm_strut - net_wm_allowed_actions = _openbox.OBProperty_net_wm_allowed_actions - net_wm_window_type_desktop = _openbox.OBProperty_net_wm_window_type_desktop - net_wm_window_type_dock = _openbox.OBProperty_net_wm_window_type_dock - net_wm_window_type_toolbar = _openbox.OBProperty_net_wm_window_type_toolbar - net_wm_window_type_menu = _openbox.OBProperty_net_wm_window_type_menu - net_wm_window_type_utility = _openbox.OBProperty_net_wm_window_type_utility - net_wm_window_type_splash = _openbox.OBProperty_net_wm_window_type_splash - net_wm_window_type_dialog = _openbox.OBProperty_net_wm_window_type_dialog - net_wm_window_type_normal = _openbox.OBProperty_net_wm_window_type_normal - net_wm_moveresize_size_topleft = _openbox.OBProperty_net_wm_moveresize_size_topleft - net_wm_moveresize_size_topright = _openbox.OBProperty_net_wm_moveresize_size_topright - net_wm_moveresize_size_bottomleft = _openbox.OBProperty_net_wm_moveresize_size_bottomleft - net_wm_moveresize_size_bottomright = _openbox.OBProperty_net_wm_moveresize_size_bottomright - net_wm_moveresize_move = _openbox.OBProperty_net_wm_moveresize_move - net_wm_action_move = _openbox.OBProperty_net_wm_action_move - net_wm_action_resize = _openbox.OBProperty_net_wm_action_resize - net_wm_action_shade = _openbox.OBProperty_net_wm_action_shade - net_wm_action_maximize_horz = _openbox.OBProperty_net_wm_action_maximize_horz - net_wm_action_maximize_vert = _openbox.OBProperty_net_wm_action_maximize_vert - net_wm_action_change_desktop = _openbox.OBProperty_net_wm_action_change_desktop - net_wm_action_close = _openbox.OBProperty_net_wm_action_close - net_wm_state_modal = _openbox.OBProperty_net_wm_state_modal - net_wm_state_sticky = _openbox.OBProperty_net_wm_state_sticky - net_wm_state_maximized_vert = _openbox.OBProperty_net_wm_state_maximized_vert - net_wm_state_maximized_horz = _openbox.OBProperty_net_wm_state_maximized_horz - net_wm_state_shaded = _openbox.OBProperty_net_wm_state_shaded - net_wm_state_skip_taskbar = _openbox.OBProperty_net_wm_state_skip_taskbar - net_wm_state_skip_pager = _openbox.OBProperty_net_wm_state_skip_pager - net_wm_state_hidden = _openbox.OBProperty_net_wm_state_hidden - net_wm_state_fullscreen = _openbox.OBProperty_net_wm_state_fullscreen - net_wm_state_above = _openbox.OBProperty_net_wm_state_above - net_wm_state_below = _openbox.OBProperty_net_wm_state_below - kde_net_system_tray_windows = _openbox.OBProperty_kde_net_system_tray_windows - kde_net_wm_system_tray_window_for = _openbox.OBProperty_kde_net_wm_system_tray_window_for - kde_net_wm_window_type_override = _openbox.OBProperty_kde_net_wm_window_type_override - NUM_ATOMS = _openbox.OBProperty_NUM_ATOMS - ascii = _openbox.OBProperty_ascii - utf8 = _openbox.OBProperty_utf8 - NUM_STRING_TYPE = _openbox.OBProperty_NUM_STRING_TYPE + __getattr__ = lambda self, name: _swig_getattr(self, Property, name) + Atom_Cardinal = _openbox.Property_Atom_Cardinal + Atom_Window = _openbox.Property_Atom_Window + Atom_Pixmap = _openbox.Property_Atom_Pixmap + Atom_Atom = _openbox.Property_Atom_Atom + Atom_String = _openbox.Property_Atom_String + Atom_Utf8 = _openbox.Property_Atom_Utf8 + openbox_pid = _openbox.Property_openbox_pid + wm_colormap_windows = _openbox.Property_wm_colormap_windows + wm_protocols = _openbox.Property_wm_protocols + wm_state = _openbox.Property_wm_state + wm_delete_window = _openbox.Property_wm_delete_window + wm_take_focus = _openbox.Property_wm_take_focus + wm_change_state = _openbox.Property_wm_change_state + wm_name = _openbox.Property_wm_name + wm_icon_name = _openbox.Property_wm_icon_name + wm_class = _openbox.Property_wm_class + wm_window_role = _openbox.Property_wm_window_role + motif_wm_hints = _openbox.Property_motif_wm_hints + blackbox_attributes = _openbox.Property_blackbox_attributes + blackbox_change_attributes = _openbox.Property_blackbox_change_attributes + blackbox_hints = _openbox.Property_blackbox_hints + blackbox_structure_messages = _openbox.Property_blackbox_structure_messages + blackbox_notify_startup = _openbox.Property_blackbox_notify_startup + blackbox_notify_window_add = _openbox.Property_blackbox_notify_window_add + blackbox_notify_window_del = _openbox.Property_blackbox_notify_window_del + blackbox_notify_window_focus = _openbox.Property_blackbox_notify_window_focus + blackbox_notify_current_workspace = _openbox.Property_blackbox_notify_current_workspace + blackbox_notify_workspace_count = _openbox.Property_blackbox_notify_workspace_count + blackbox_notify_window_raise = _openbox.Property_blackbox_notify_window_raise + blackbox_notify_window_lower = _openbox.Property_blackbox_notify_window_lower + blackbox_change_workspace = _openbox.Property_blackbox_change_workspace + blackbox_change_window_focus = _openbox.Property_blackbox_change_window_focus + blackbox_cycle_window_focus = _openbox.Property_blackbox_cycle_window_focus + openbox_show_root_menu = _openbox.Property_openbox_show_root_menu + openbox_show_workspace_menu = _openbox.Property_openbox_show_workspace_menu + net_supported = _openbox.Property_net_supported + net_client_list = _openbox.Property_net_client_list + net_client_list_stacking = _openbox.Property_net_client_list_stacking + net_number_of_desktops = _openbox.Property_net_number_of_desktops + net_desktop_geometry = _openbox.Property_net_desktop_geometry + net_desktop_viewport = _openbox.Property_net_desktop_viewport + net_current_desktop = _openbox.Property_net_current_desktop + net_desktop_names = _openbox.Property_net_desktop_names + net_active_window = _openbox.Property_net_active_window + net_workarea = _openbox.Property_net_workarea + net_supporting_wm_check = _openbox.Property_net_supporting_wm_check + net_close_window = _openbox.Property_net_close_window + net_wm_moveresize = _openbox.Property_net_wm_moveresize + net_wm_name = _openbox.Property_net_wm_name + net_wm_visible_name = _openbox.Property_net_wm_visible_name + net_wm_icon_name = _openbox.Property_net_wm_icon_name + net_wm_visible_icon_name = _openbox.Property_net_wm_visible_icon_name + net_wm_desktop = _openbox.Property_net_wm_desktop + net_wm_window_type = _openbox.Property_net_wm_window_type + net_wm_state = _openbox.Property_net_wm_state + net_wm_strut = _openbox.Property_net_wm_strut + net_wm_allowed_actions = _openbox.Property_net_wm_allowed_actions + net_wm_window_type_desktop = _openbox.Property_net_wm_window_type_desktop + net_wm_window_type_dock = _openbox.Property_net_wm_window_type_dock + net_wm_window_type_toolbar = _openbox.Property_net_wm_window_type_toolbar + net_wm_window_type_menu = _openbox.Property_net_wm_window_type_menu + net_wm_window_type_utility = _openbox.Property_net_wm_window_type_utility + net_wm_window_type_splash = _openbox.Property_net_wm_window_type_splash + net_wm_window_type_dialog = _openbox.Property_net_wm_window_type_dialog + net_wm_window_type_normal = _openbox.Property_net_wm_window_type_normal + net_wm_moveresize_size_topleft = _openbox.Property_net_wm_moveresize_size_topleft + net_wm_moveresize_size_topright = _openbox.Property_net_wm_moveresize_size_topright + net_wm_moveresize_size_bottomleft = _openbox.Property_net_wm_moveresize_size_bottomleft + net_wm_moveresize_size_bottomright = _openbox.Property_net_wm_moveresize_size_bottomright + net_wm_moveresize_move = _openbox.Property_net_wm_moveresize_move + net_wm_action_move = _openbox.Property_net_wm_action_move + net_wm_action_resize = _openbox.Property_net_wm_action_resize + net_wm_action_shade = _openbox.Property_net_wm_action_shade + net_wm_action_maximize_horz = _openbox.Property_net_wm_action_maximize_horz + net_wm_action_maximize_vert = _openbox.Property_net_wm_action_maximize_vert + net_wm_action_change_desktop = _openbox.Property_net_wm_action_change_desktop + net_wm_action_close = _openbox.Property_net_wm_action_close + net_wm_state_modal = _openbox.Property_net_wm_state_modal + net_wm_state_sticky = _openbox.Property_net_wm_state_sticky + net_wm_state_maximized_vert = _openbox.Property_net_wm_state_maximized_vert + net_wm_state_maximized_horz = _openbox.Property_net_wm_state_maximized_horz + net_wm_state_shaded = _openbox.Property_net_wm_state_shaded + net_wm_state_skip_taskbar = _openbox.Property_net_wm_state_skip_taskbar + net_wm_state_skip_pager = _openbox.Property_net_wm_state_skip_pager + net_wm_state_hidden = _openbox.Property_net_wm_state_hidden + net_wm_state_fullscreen = _openbox.Property_net_wm_state_fullscreen + net_wm_state_above = _openbox.Property_net_wm_state_above + net_wm_state_below = _openbox.Property_net_wm_state_below + kde_net_system_tray_windows = _openbox.Property_kde_net_system_tray_windows + kde_net_wm_system_tray_window_for = _openbox.Property_kde_net_wm_system_tray_window_for + kde_net_wm_window_type_override = _openbox.Property_kde_net_wm_window_type_override + NUM_ATOMS = _openbox.Property_NUM_ATOMS + ascii = _openbox.Property_ascii + utf8 = _openbox.Property_utf8 + NUM_STRING_TYPE = _openbox.Property_NUM_STRING_TYPE def __init__(self,*args): - self.this = apply(_openbox.new_OBProperty,args) + self.this = apply(_openbox.new_Property,args) self.thisown = 1 - def __del__(self, destroy= _openbox.delete_OBProperty): + def __del__(self, destroy= _openbox.delete_Property): try: if self.thisown: destroy(self) except: pass - def set(*args): return apply(_openbox.OBProperty_set,args) - def get(*args): return apply(_openbox.OBProperty_get,args) - def erase(*args): return apply(_openbox.OBProperty_erase,args) - def atom(*args): return apply(_openbox.OBProperty_atom,args) + def set(*args): return apply(_openbox.Property_set,args) + def get(*args): return apply(_openbox.Property_get,args) + def erase(*args): return apply(_openbox.Property_erase,args) + def atom(*args): return apply(_openbox.Property_atom,args) def __repr__(self): - return "<C OBProperty instance at %s>" % (self.this,) + return "<C Property instance at %s>" % (self.this,) -class OBPropertyPtr(OBProperty): +class PropertyPtr(Property): def __init__(self,this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = OBProperty -_openbox.OBProperty_swigregister(OBPropertyPtr) + self.__class__ = Property +_openbox.Property_swigregister(PropertyPtr) class Rect(_object): __swig_setmethods__ = {}@@ -365,110 +365,90 @@ if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = Strut _openbox.Strut_swigregister(StrutPtr) -expandTilde = _openbox.expandTilde - -bexec = _openbox.bexec - -textPropertyToString = _openbox.textPropertyToString - -itostring_unsigned_long = _openbox.itostring_unsigned_long - -itostring_long = _openbox.itostring_long - -itostring_unsigned = _openbox.itostring_unsigned - -itostring = _openbox.itostring - -putenv = _openbox.putenv - -basename = _openbox.basename - -class OtkEventHandler(_object): +class EventHandler(_object): __swig_setmethods__ = {} - __setattr__ = lambda self, name, value: _swig_setattr(self, OtkEventHandler, name, value) + __setattr__ = lambda self, name, value: _swig_setattr(self, EventHandler, name, value) __swig_getmethods__ = {} - __getattr__ = lambda self, name: _swig_getattr(self, OtkEventHandler, name) - def handle(*args): return apply(_openbox.OtkEventHandler_handle,args) - def keyPressHandler(*args): return apply(_openbox.OtkEventHandler_keyPressHandler,args) - def keyReleaseHandler(*args): return apply(_openbox.OtkEventHandler_keyReleaseHandler,args) - def buttonPressHandler(*args): return apply(_openbox.OtkEventHandler_buttonPressHandler,args) - def buttonReleaseHandler(*args): return apply(_openbox.OtkEventHandler_buttonReleaseHandler,args) - def motionHandler(*args): return apply(_openbox.OtkEventHandler_motionHandler,args) - def enterHandler(*args): return apply(_openbox.OtkEventHandler_enterHandler,args) - def leaveHandler(*args): return apply(_openbox.OtkEventHandler_leaveHandler,args) - def focusHandler(*args): return apply(_openbox.OtkEventHandler_focusHandler,args) - def unfocusHandler(*args): return apply(_openbox.OtkEventHandler_unfocusHandler,args) - def exposeHandler(*args): return apply(_openbox.OtkEventHandler_exposeHandler,args) - def graphicsExposeHandler(*args): return apply(_openbox.OtkEventHandler_graphicsExposeHandler,args) - def noExposeEventHandler(*args): return apply(_openbox.OtkEventHandler_noExposeEventHandler,args) - def circulateRequestHandler(*args): return apply(_openbox.OtkEventHandler_circulateRequestHandler,args) - def configureRequestHandler(*args): return apply(_openbox.OtkEventHandler_configureRequestHandler,args) - def mapRequestHandler(*args): return apply(_openbox.OtkEventHandler_mapRequestHandler,args) - def resizeRequestHandler(*args): return apply(_openbox.OtkEventHandler_resizeRequestHandler,args) - def circulateHandler(*args): return apply(_openbox.OtkEventHandler_circulateHandler,args) - def configureHandler(*args): return apply(_openbox.OtkEventHandler_configureHandler,args) - def createHandler(*args): return apply(_openbox.OtkEventHandler_createHandler,args) - def destroyHandler(*args): return apply(_openbox.OtkEventHandler_destroyHandler,args) - def gravityHandler(*args): return apply(_openbox.OtkEventHandler_gravityHandler,args) - def mapHandler(*args): return apply(_openbox.OtkEventHandler_mapHandler,args) - def mappingHandler(*args): return apply(_openbox.OtkEventHandler_mappingHandler,args) - def reparentHandler(*args): return apply(_openbox.OtkEventHandler_reparentHandler,args) - def unmapHandler(*args): return apply(_openbox.OtkEventHandler_unmapHandler,args) - def visibilityHandler(*args): return apply(_openbox.OtkEventHandler_visibilityHandler,args) - def colorMapHandler(*args): return apply(_openbox.OtkEventHandler_colorMapHandler,args) - def propertyHandler(*args): return apply(_openbox.OtkEventHandler_propertyHandler,args) - def selectionClearHandler(*args): return apply(_openbox.OtkEventHandler_selectionClearHandler,args) - def selectionHandler(*args): return apply(_openbox.OtkEventHandler_selectionHandler,args) - def selectionRequestHandler(*args): return apply(_openbox.OtkEventHandler_selectionRequestHandler,args) - def clientMessageHandler(*args): return apply(_openbox.OtkEventHandler_clientMessageHandler,args) - def __del__(self, destroy= _openbox.delete_OtkEventHandler): + __getattr__ = lambda self, name: _swig_getattr(self, EventHandler, name) + def handle(*args): return apply(_openbox.EventHandler_handle,args) + def keyPressHandler(*args): return apply(_openbox.EventHandler_keyPressHandler,args) + def keyReleaseHandler(*args): return apply(_openbox.EventHandler_keyReleaseHandler,args) + def buttonPressHandler(*args): return apply(_openbox.EventHandler_buttonPressHandler,args) + def buttonReleaseHandler(*args): return apply(_openbox.EventHandler_buttonReleaseHandler,args) + def motionHandler(*args): return apply(_openbox.EventHandler_motionHandler,args) + def enterHandler(*args): return apply(_openbox.EventHandler_enterHandler,args) + def leaveHandler(*args): return apply(_openbox.EventHandler_leaveHandler,args) + def focusHandler(*args): return apply(_openbox.EventHandler_focusHandler,args) + def unfocusHandler(*args): return apply(_openbox.EventHandler_unfocusHandler,args) + def exposeHandler(*args): return apply(_openbox.EventHandler_exposeHandler,args) + def graphicsExposeHandler(*args): return apply(_openbox.EventHandler_graphicsExposeHandler,args) + def noExposeEventHandler(*args): return apply(_openbox.EventHandler_noExposeEventHandler,args) + def circulateRequestHandler(*args): return apply(_openbox.EventHandler_circulateRequestHandler,args) + def configureRequestHandler(*args): return apply(_openbox.EventHandler_configureRequestHandler,args) + def mapRequestHandler(*args): return apply(_openbox.EventHandler_mapRequestHandler,args) + def resizeRequestHandler(*args): return apply(_openbox.EventHandler_resizeRequestHandler,args) + def circulateHandler(*args): return apply(_openbox.EventHandler_circulateHandler,args) + def configureHandler(*args): return apply(_openbox.EventHandler_configureHandler,args) + def createHandler(*args): return apply(_openbox.EventHandler_createHandler,args) + def destroyHandler(*args): return apply(_openbox.EventHandler_destroyHandler,args) + def gravityHandler(*args): return apply(_openbox.EventHandler_gravityHandler,args) + def mapHandler(*args): return apply(_openbox.EventHandler_mapHandler,args) + def mappingHandler(*args): return apply(_openbox.EventHandler_mappingHandler,args) + def reparentHandler(*args): return apply(_openbox.EventHandler_reparentHandler,args) + def unmapHandler(*args): return apply(_openbox.EventHandler_unmapHandler,args) + def visibilityHandler(*args): return apply(_openbox.EventHandler_visibilityHandler,args) + def colorMapHandler(*args): return apply(_openbox.EventHandler_colorMapHandler,args) + def propertyHandler(*args): return apply(_openbox.EventHandler_propertyHandler,args) + def selectionClearHandler(*args): return apply(_openbox.EventHandler_selectionClearHandler,args) + def selectionHandler(*args): return apply(_openbox.EventHandler_selectionHandler,args) + def selectionRequestHandler(*args): return apply(_openbox.EventHandler_selectionRequestHandler,args) + def clientMessageHandler(*args): return apply(_openbox.EventHandler_clientMessageHandler,args) + def __del__(self, destroy= _openbox.delete_EventHandler): try: if self.thisown: destroy(self) except: pass def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): - return "<C OtkEventHandler instance at %s>" % (self.this,) + return "<C EventHandler instance at %s>" % (self.this,) -class OtkEventHandlerPtr(OtkEventHandler): +class EventHandlerPtr(EventHandler): def __init__(self,this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = OtkEventHandler -_openbox.OtkEventHandler_swigregister(OtkEventHandlerPtr) -cvar = _openbox.cvar -BSENTINEL = cvar.BSENTINEL + self.__class__ = EventHandler +_openbox.EventHandler_swigregister(EventHandlerPtr) -class OtkEventDispatcher(_object): +class EventDispatcher(_object): __swig_setmethods__ = {} - __setattr__ = lambda self, name, value: _swig_setattr(self, OtkEventDispatcher, name, value) + __setattr__ = lambda self, name, value: _swig_setattr(self, EventDispatcher, name, value) __swig_getmethods__ = {} - __getattr__ = lambda self, name: _swig_getattr(self, OtkEventDispatcher, name) + __getattr__ = lambda self, name: _swig_getattr(self, EventDispatcher, name) def __init__(self,*args): - self.this = apply(_openbox.new_OtkEventDispatcher,args) + self.this = apply(_openbox.new_EventDispatcher,args) self.thisown = 1 - def __del__(self, destroy= _openbox.delete_OtkEventDispatcher): + def __del__(self, destroy= _openbox.delete_EventDispatcher): try: if self.thisown: destroy(self) except: pass - def clearAllHandlers(*args): return apply(_openbox.OtkEventDispatcher_clearAllHandlers,args) - def registerHandler(*args): return apply(_openbox.OtkEventDispatcher_registerHandler,args) - def clearHandler(*args): return apply(_openbox.OtkEventDispatcher_clearHandler,args) - def dispatchEvents(*args): return apply(_openbox.OtkEventDispatcher_dispatchEvents,args) - def setFallbackHandler(*args): return apply(_openbox.OtkEventDispatcher_setFallbackHandler,args) - def getFallbackHandler(*args): return apply(_openbox.OtkEventDispatcher_getFallbackHandler,args) - def setMasterHandler(*args): return apply(_openbox.OtkEventDispatcher_setMasterHandler,args) - def getMasterHandler(*args): return apply(_openbox.OtkEventDispatcher_getMasterHandler,args) - def findHandler(*args): return apply(_openbox.OtkEventDispatcher_findHandler,args) - def lastTime(*args): return apply(_openbox.OtkEventDispatcher_lastTime,args) + def clearAllHandlers(*args): return apply(_openbox.EventDispatcher_clearAllHandlers,args) + def registerHandler(*args): return apply(_openbox.EventDispatcher_registerHandler,args) + def clearHandler(*args): return apply(_openbox.EventDispatcher_clearHandler,args) + def dispatchEvents(*args): return apply(_openbox.EventDispatcher_dispatchEvents,args) + def setFallbackHandler(*args): return apply(_openbox.EventDispatcher_setFallbackHandler,args) + def getFallbackHandler(*args): return apply(_openbox.EventDispatcher_getFallbackHandler,args) + def setMasterHandler(*args): return apply(_openbox.EventDispatcher_setMasterHandler,args) + def getMasterHandler(*args): return apply(_openbox.EventDispatcher_getMasterHandler,args) + def findHandler(*args): return apply(_openbox.EventDispatcher_findHandler,args) + def lastTime(*args): return apply(_openbox.EventDispatcher_lastTime,args) def __repr__(self): - return "<C OtkEventDispatcher instance at %s>" % (self.this,) + return "<C EventDispatcher instance at %s>" % (self.this,) -class OtkEventDispatcherPtr(OtkEventDispatcher): +class EventDispatcherPtr(EventDispatcher): def __init__(self,this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = OtkEventDispatcher -_openbox.OtkEventDispatcher_swigregister(OtkEventDispatcherPtr) + self.__class__ = EventDispatcher +_openbox.EventDispatcher_swigregister(EventDispatcherPtr) class Cursors(_object): __swig_setmethods__ = {}@@ -504,12 +484,12 @@ if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = Cursors _openbox.Cursors_swigregister(CursorsPtr) -class Openbox(OtkEventDispatcher,OtkEventHandler): +class Openbox(EventDispatcher,EventHandler): __swig_setmethods__ = {} - for _s in [OtkEventDispatcher,OtkEventHandler]: __swig_setmethods__.update(_s.__swig_setmethods__) + for _s in [EventDispatcher,EventHandler]: __swig_setmethods__.update(_s.__swig_setmethods__) __setattr__ = lambda self, name, value: _swig_setattr(self, Openbox, name, value) __swig_getmethods__ = {} - for _s in [OtkEventDispatcher,OtkEventHandler]: __swig_getmethods__.update(_s.__swig_getmethods__) + for _s in [EventDispatcher,EventHandler]: __swig_getmethods__.update(_s.__swig_getmethods__) __getattr__ = lambda self, name: _swig_getattr(self, Openbox, name) State_Starting = _openbox.Openbox_State_Starting State_Normal = _openbox.Openbox_State_Normal@@ -542,43 +522,43 @@ if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = Openbox _openbox.Openbox_swigregister(OpenboxPtr) -class OBScreen(OtkEventHandler,): +class Screen(EventHandler,): __swig_setmethods__ = {} - for _s in [OtkEventHandler,]: __swig_setmethods__.update(_s.__swig_setmethods__) - __setattr__ = lambda self, name, value: _swig_setattr(self, OBScreen, name, value) + for _s in [EventHandler,]: __swig_setmethods__.update(_s.__swig_setmethods__) + __setattr__ = lambda self, name, value: _swig_setattr(self, Screen, name, value) __swig_getmethods__ = {} - for _s in [OtkEventHandler,]: __swig_getmethods__.update(_s.__swig_getmethods__) - __getattr__ = lambda self, name: _swig_getattr(self, OBScreen, name) - def client(*args): return apply(_openbox.OBScreen_client,args) - def clientCount(*args): return apply(_openbox.OBScreen_clientCount,args) - event_mask = _openbox.OBScreen_event_mask - def number(*args): return apply(_openbox.OBScreen_number,args) - def managed(*args): return apply(_openbox.OBScreen_managed,args) - def imageControl(*args): return apply(_openbox.OBScreen_imageControl,args) - def area(*args): return apply(_openbox.OBScreen_area,args) - def style(*args): return apply(_openbox.OBScreen_style,args) - def focuswindow(*args): return apply(_openbox.OBScreen_focuswindow,args) - def desktop(*args): return apply(_openbox.OBScreen_desktop,args) - def numDesktops(*args): return apply(_openbox.OBScreen_numDesktops,args) - def updateStrut(*args): return apply(_openbox.OBScreen_updateStrut,args) - def manageExisting(*args): return apply(_openbox.OBScreen_manageExisting,args) - def manageWindow(*args): return apply(_openbox.OBScreen_manageWindow,args) - def unmanageWindow(*args): return apply(_openbox.OBScreen_unmanageWindow,args) - def restack(*args): return apply(_openbox.OBScreen_restack,args) - def setDesktopName(*args): return apply(_openbox.OBScreen_setDesktopName,args) - def propertyHandler(*args): return apply(_openbox.OBScreen_propertyHandler,args) - def clientMessageHandler(*args): return apply(_openbox.OBScreen_clientMessageHandler,args) - def mapRequestHandler(*args): return apply(_openbox.OBScreen_mapRequestHandler,args) + for _s in [EventHandler,]: __swig_getmethods__.update(_s.__swig_getmethods__) + __getattr__ = lambda self, name: _swig_getattr(self, Screen, name) + def client(*args): return apply(_openbox.Screen_client,args) + def clientCount(*args): return apply(_openbox.Screen_clientCount,args) + event_mask = _openbox.Screen_event_mask + def number(*args): return apply(_openbox.Screen_number,args) + def managed(*args): return apply(_openbox.Screen_managed,args) + def imageControl(*args): return apply(_openbox.Screen_imageControl,args) + def area(*args): return apply(_openbox.Screen_area,args) + def style(*args): return apply(_openbox.Screen_style,args) + def focuswindow(*args): return apply(_openbox.Screen_focuswindow,args) + def desktop(*args): return apply(_openbox.Screen_desktop,args) + def numDesktops(*args): return apply(_openbox.Screen_numDesktops,args) + def updateStrut(*args): return apply(_openbox.Screen_updateStrut,args) + def manageExisting(*args): return apply(_openbox.Screen_manageExisting,args) + def manageWindow(*args): return apply(_openbox.Screen_manageWindow,args) + def unmanageWindow(*args): return apply(_openbox.Screen_unmanageWindow,args) + def restack(*args): return apply(_openbox.Screen_restack,args) + def setDesktopName(*args): return apply(_openbox.Screen_setDesktopName,args) + def propertyHandler(*args): return apply(_openbox.Screen_propertyHandler,args) + def clientMessageHandler(*args): return apply(_openbox.Screen_clientMessageHandler,args) + def mapRequestHandler(*args): return apply(_openbox.Screen_mapRequestHandler,args) def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): - return "<C OBScreen instance at %s>" % (self.this,) + return "<C Screen instance at %s>" % (self.this,) -class OBScreenPtr(OBScreen): +class ScreenPtr(Screen): def __init__(self,this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = OBScreen -_openbox.OBScreen_swigregister(OBScreenPtr) + self.__class__ = Screen +_openbox.Screen_swigregister(ScreenPtr) class MwmHints(_object): __swig_setmethods__ = {}@@ -606,120 +586,120 @@ if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = MwmHints _openbox.MwmHints_swigregister(MwmHintsPtr) -class OBClient(OtkEventHandler,): +class Client(EventHandler,): __swig_setmethods__ = {} - for _s in [OtkEventHandler,]: __swig_setmethods__.update(_s.__swig_setmethods__) - __setattr__ = lambda self, name, value: _swig_setattr(self, OBClient, name, value) + for _s in [EventHandler,]: __swig_setmethods__.update(_s.__swig_setmethods__) + __setattr__ = lambda self, name, value: _swig_setattr(self, Client, name, value) __swig_getmethods__ = {} - for _s in [OtkEventHandler,]: __swig_getmethods__.update(_s.__swig_getmethods__) - __getattr__ = lambda self, name: _swig_getattr(self, OBClient, name) - __swig_setmethods__["frame"] = _openbox.OBClient_frame_set - __swig_getmethods__["frame"] = _openbox.OBClient_frame_get - if _newclass:frame = property(_openbox.OBClient_frame_get,_openbox.OBClient_frame_set) - Layer_Icon = _openbox.OBClient_Layer_Icon - Layer_Desktop = _openbox.OBClient_Layer_Desktop - Layer_Below = _openbox.OBClient_Layer_Below - Layer_Normal = _openbox.OBClient_Layer_Normal - Layer_Above = _openbox.OBClient_Layer_Above - Layer_Top = _openbox.OBClient_Layer_Top - Layer_Fullscreen = _openbox.OBClient_Layer_Fullscreen - Layer_Internal = _openbox.OBClient_Layer_Internal - NUM_LAYERS = _openbox.OBClient_NUM_LAYERS - TopLeft = _openbox.OBClient_TopLeft - TopRight = _openbox.OBClient_TopRight - BottomLeft = _openbox.OBClient_BottomLeft - BottomRight = _openbox.OBClient_BottomRight - Type_Desktop = _openbox.OBClient_Type_Desktop - Type_Dock = _openbox.OBClient_Type_Dock - Type_Toolbar = _openbox.OBClient_Type_Toolbar - Type_Menu = _openbox.OBClient_Type_Menu - Type_Utility = _openbox.OBClient_Type_Utility - Type_Splash = _openbox.OBClient_Type_Splash - Type_Dialog = _openbox.OBClient_Type_Dialog - Type_Normal = _openbox.OBClient_Type_Normal - MwmFlag_Functions = _openbox.OBClient_MwmFlag_Functions - MwmFlag_Decorations = _openbox.OBClient_MwmFlag_Decorations - MwmFunc_All = _openbox.OBClient_MwmFunc_All - MwmFunc_Resize = _openbox.OBClient_MwmFunc_Resize - MwmFunc_Move = _openbox.OBClient_MwmFunc_Move - MwmFunc_Iconify = _openbox.OBClient_MwmFunc_Iconify - MwmFunc_Maximize = _openbox.OBClient_MwmFunc_Maximize - MwmDecor_All = _openbox.OBClient_MwmDecor_All - MwmDecor_Border = _openbox.OBClient_MwmDecor_Border - MwmDecor_Handle = _openbox.OBClient_MwmDecor_Handle - MwmDecor_Title = _openbox.OBClient_MwmDecor_Title - MwmDecor_Iconify = _openbox.OBClient_MwmDecor_Iconify - MwmDecor_Maximize = _openbox.OBClient_MwmDecor_Maximize - Func_Resize = _openbox.OBClient_Func_Resize - Func_Move = _openbox.OBClient_Func_Move - Func_Iconify = _openbox.OBClient_Func_Iconify - Func_Maximize = _openbox.OBClient_Func_Maximize - Func_Close = _openbox.OBClient_Func_Close - Decor_Titlebar = _openbox.OBClient_Decor_Titlebar - Decor_Handle = _openbox.OBClient_Decor_Handle - Decor_Border = _openbox.OBClient_Decor_Border - Decor_Iconify = _openbox.OBClient_Decor_Iconify - Decor_Maximize = _openbox.OBClient_Decor_Maximize - Decor_Sticky = _openbox.OBClient_Decor_Sticky - Decor_Close = _openbox.OBClient_Decor_Close - State_Remove = _openbox.OBClient_State_Remove - State_Add = _openbox.OBClient_State_Add - State_Toggle = _openbox.OBClient_State_Toggle - event_mask = _openbox.OBClient_event_mask - no_propagate_mask = _openbox.OBClient_no_propagate_mask - __swig_setmethods__["ignore_unmaps"] = _openbox.OBClient_ignore_unmaps_set - __swig_getmethods__["ignore_unmaps"] = _openbox.OBClient_ignore_unmaps_get - if _newclass:ignore_unmaps = property(_openbox.OBClient_ignore_unmaps_get,_openbox.OBClient_ignore_unmaps_set) - def screen(*args): return apply(_openbox.OBClient_screen,args) - def window(*args): return apply(_openbox.OBClient_window,args) - def type(*args): return apply(_openbox.OBClient_type,args) - def normal(*args): return apply(_openbox.OBClient_normal,args) - def desktop(*args): return apply(_openbox.OBClient_desktop,args) - def title(*args): return apply(_openbox.OBClient_title,args) - def iconTitle(*args): return apply(_openbox.OBClient_iconTitle,args) - def appName(*args): return apply(_openbox.OBClient_appName,args) - def appClass(*args): return apply(_openbox.OBClient_appClass,args) - def role(*args): return apply(_openbox.OBClient_role,args) - def canFocus(*args): return apply(_openbox.OBClient_canFocus,args) - def urgent(*args): return apply(_openbox.OBClient_urgent,args) - def focusNotify(*args): return apply(_openbox.OBClient_focusNotify,args) - def shaped(*args): return apply(_openbox.OBClient_shaped,args) - def gravity(*args): return apply(_openbox.OBClient_gravity,args) - def positionRequested(*args): return apply(_openbox.OBClient_positionRequested,args) - def decorations(*args): return apply(_openbox.OBClient_decorations,args) - def funtions(*args): return apply(_openbox.OBClient_funtions,args) - def transientFor(*args): return apply(_openbox.OBClient_transientFor,args) - def modal(*args): return apply(_openbox.OBClient_modal,args) - def shaded(*args): return apply(_openbox.OBClient_shaded,args) - def iconic(*args): return apply(_openbox.OBClient_iconic,args) - def maxVert(*args): return apply(_openbox.OBClient_maxVert,args) - def maxHorz(*args): return apply(_openbox.OBClient_maxHorz,args) - def layer(*args): return apply(_openbox.OBClient_layer,args) - def toggleClientBorder(*args): return apply(_openbox.OBClient_toggleClientBorder,args) - def area(*args): return apply(_openbox.OBClient_area,args) - def strut(*args): return apply(_openbox.OBClient_strut,args) - def move(*args): return apply(_openbox.OBClient_move,args) - def resize(*args): return apply(_openbox.OBClient_resize,args) - def focus(*args): return apply(_openbox.OBClient_focus,args) - def unfocus(*args): return apply(_openbox.OBClient_unfocus,args) - def focusHandler(*args): return apply(_openbox.OBClient_focusHandler,args) - def unfocusHandler(*args): return apply(_openbox.OBClient_unfocusHandler,args) - def propertyHandler(*args): return apply(_openbox.OBClient_propertyHandler,args) - def clientMessageHandler(*args): return apply(_openbox.OBClient_clientMessageHandler,args) - def configureRequestHandler(*args): return apply(_openbox.OBClient_configureRequestHandler,args) - def unmapHandler(*args): return apply(_openbox.OBClient_unmapHandler,args) - def destroyHandler(*args): return apply(_openbox.OBClient_destroyHandler,args) - def reparentHandler(*args): return apply(_openbox.OBClient_reparentHandler,args) + for _s in [EventHandler,]: __swig_getmethods__.update(_s.__swig_getmethods__) + __getattr__ = lambda self, name: _swig_getattr(self, Client, name) + __swig_setmethods__["frame"] = _openbox.Client_frame_set + __swig_getmethods__["frame"] = _openbox.Client_frame_get + if _newclass:frame = property(_openbox.Client_frame_get,_openbox.Client_frame_set) + Layer_Icon = _openbox.Client_Layer_Icon + Layer_Desktop = _openbox.Client_Layer_Desktop + Layer_Below = _openbox.Client_Layer_Below + Layer_Normal = _openbox.Client_Layer_Normal + Layer_Above = _openbox.Client_Layer_Above + Layer_Top = _openbox.Client_Layer_Top + Layer_Fullscreen = _openbox.Client_Layer_Fullscreen + Layer_Internal = _openbox.Client_Layer_Internal + NUM_LAYERS = _openbox.Client_NUM_LAYERS + TopLeft = _openbox.Client_TopLeft + TopRight = _openbox.Client_TopRight + BottomLeft = _openbox.Client_BottomLeft + BottomRight = _openbox.Client_BottomRight + Type_Desktop = _openbox.Client_Type_Desktop + Type_Dock = _openbox.Client_Type_Dock + Type_Toolbar = _openbox.Client_Type_Toolbar + Type_Menu = _openbox.Client_Type_Menu + Type_Utility = _openbox.Client_Type_Utility + Type_Splash = _openbox.Client_Type_Splash + Type_Dialog = _openbox.Client_Type_Dialog + Type_Normal = _openbox.Client_Type_Normal + MwmFlag_Functions = _openbox.Client_MwmFlag_Functions + MwmFlag_Decorations = _openbox.Client_MwmFlag_Decorations + MwmFunc_All = _openbox.Client_MwmFunc_All + MwmFunc_Resize = _openbox.Client_MwmFunc_Resize + MwmFunc_Move = _openbox.Client_MwmFunc_Move + MwmFunc_Iconify = _openbox.Client_MwmFunc_Iconify + MwmFunc_Maximize = _openbox.Client_MwmFunc_Maximize + MwmDecor_All = _openbox.Client_MwmDecor_All + MwmDecor_Border = _openbox.Client_MwmDecor_Border + MwmDecor_Handle = _openbox.Client_MwmDecor_Handle + MwmDecor_Title = _openbox.Client_MwmDecor_Title + MwmDecor_Iconify = _openbox.Client_MwmDecor_Iconify + MwmDecor_Maximize = _openbox.Client_MwmDecor_Maximize + Func_Resize = _openbox.Client_Func_Resize + Func_Move = _openbox.Client_Func_Move + Func_Iconify = _openbox.Client_Func_Iconify + Func_Maximize = _openbox.Client_Func_Maximize + Func_Close = _openbox.Client_Func_Close + Decor_Titlebar = _openbox.Client_Decor_Titlebar + Decor_Handle = _openbox.Client_Decor_Handle + Decor_Border = _openbox.Client_Decor_Border + Decor_Iconify = _openbox.Client_Decor_Iconify + Decor_Maximize = _openbox.Client_Decor_Maximize + Decor_Sticky = _openbox.Client_Decor_Sticky + Decor_Close = _openbox.Client_Decor_Close + State_Remove = _openbox.Client_State_Remove + State_Add = _openbox.Client_State_Add + State_Toggle = _openbox.Client_State_Toggle + event_mask = _openbox.Client_event_mask + no_propagate_mask = _openbox.Client_no_propagate_mask + __swig_setmethods__["ignore_unmaps"] = _openbox.Client_ignore_unmaps_set + __swig_getmethods__["ignore_unmaps"] = _openbox.Client_ignore_unmaps_get + if _newclass:ignore_unmaps = property(_openbox.Client_ignore_unmaps_get,_openbox.Client_ignore_unmaps_set) + def screen(*args): return apply(_openbox.Client_screen,args) + def window(*args): return apply(_openbox.Client_window,args) + def type(*args): return apply(_openbox.Client_type,args) + def normal(*args): return apply(_openbox.Client_normal,args) + def desktop(*args): return apply(_openbox.Client_desktop,args) + def title(*args): return apply(_openbox.Client_title,args) + def iconTitle(*args): return apply(_openbox.Client_iconTitle,args) + def appName(*args): return apply(_openbox.Client_appName,args) + def appClass(*args): return apply(_openbox.Client_appClass,args) + def role(*args): return apply(_openbox.Client_role,args) + def canFocus(*args): return apply(_openbox.Client_canFocus,args) + def urgent(*args): return apply(_openbox.Client_urgent,args) + def focusNotify(*args): return apply(_openbox.Client_focusNotify,args) + def shaped(*args): return apply(_openbox.Client_shaped,args) + def gravity(*args): return apply(_openbox.Client_gravity,args) + def positionRequested(*args): return apply(_openbox.Client_positionRequested,args) + def decorations(*args): return apply(_openbox.Client_decorations,args) + def funtions(*args): return apply(_openbox.Client_funtions,args) + def transientFor(*args): return apply(_openbox.Client_transientFor,args) + def modal(*args): return apply(_openbox.Client_modal,args) + def shaded(*args): return apply(_openbox.Client_shaded,args) + def iconic(*args): return apply(_openbox.Client_iconic,args) + def maxVert(*args): return apply(_openbox.Client_maxVert,args) + def maxHorz(*args): return apply(_openbox.Client_maxHorz,args) + def layer(*args): return apply(_openbox.Client_layer,args) + def toggleClientBorder(*args): return apply(_openbox.Client_toggleClientBorder,args) + def area(*args): return apply(_openbox.Client_area,args) + def strut(*args): return apply(_openbox.Client_strut,args) + def move(*args): return apply(_openbox.Client_move,args) + def resize(*args): return apply(_openbox.Client_resize,args) + def focus(*args): return apply(_openbox.Client_focus,args) + def unfocus(*args): return apply(_openbox.Client_unfocus,args) + def focusHandler(*args): return apply(_openbox.Client_focusHandler,args) + def unfocusHandler(*args): return apply(_openbox.Client_unfocusHandler,args) + def propertyHandler(*args): return apply(_openbox.Client_propertyHandler,args) + def clientMessageHandler(*args): return apply(_openbox.Client_clientMessageHandler,args) + def configureRequestHandler(*args): return apply(_openbox.Client_configureRequestHandler,args) + def unmapHandler(*args): return apply(_openbox.Client_unmapHandler,args) + def destroyHandler(*args): return apply(_openbox.Client_destroyHandler,args) + def reparentHandler(*args): return apply(_openbox.Client_reparentHandler,args) def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): - return "<C OBClient instance at %s>" % (self.this,) + return "<C Client instance at %s>" % (self.this,) -class OBClientPtr(OBClient): +class ClientPtr(Client): def __init__(self,this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = OBClient -_openbox.OBClient_swigregister(OBClientPtr) + self.__class__ = Client +_openbox.Client_swigregister(ClientPtr) MC_Frame = _openbox.MC_Frame MC_Titlebar = _openbox.MC_Titlebar
M
src/openbox_wrap.cc
→
src/openbox_wrap.cc
@@ -645,8 +645,8 @@
/* -------- TYPES TABLE (BEGIN) -------- */ -#define SWIGTYPE_p_ob__OBScreen swig_types[0] -#define SWIGTYPE_p_otk__Point swig_types[1] +#define SWIGTYPE_p_otk__Point swig_types[0] +#define SWIGTYPE_p_ob__Client swig_types[1] #define SWIGTYPE_p_XMapEvent swig_types[2] #define SWIGTYPE_p_XUnmapEvent swig_types[3] #define SWIGTYPE_p_XColormapEvent swig_types[4]@@ -668,10 +668,10 @@ #define SWIGTYPE_p_XVisibilityEvent swig_types[19]
#define SWIGTYPE_p_XPropertyEvent swig_types[20] #define SWIGTYPE_p_XSelectionRequestEvent swig_types[21] #define SWIGTYPE_p_ob__Cursors swig_types[22] -#define SWIGTYPE_p_ob__OBFrame swig_types[23] -#define SWIGTYPE_p_otk__BImageControl swig_types[24] -#define SWIGTYPE_p_ob__MwmHints swig_types[25] -#define SWIGTYPE_p_ob__OBWidget swig_types[26] +#define SWIGTYPE_p_otk__ImageControl swig_types[23] +#define SWIGTYPE_p_ob__MwmHints swig_types[24] +#define SWIGTYPE_p_ob__Screen swig_types[25] +#define SWIGTYPE_p_ob__Frame swig_types[26] #define SWIGTYPE_p_ob__KeyData swig_types[27] #define SWIGTYPE_p_XConfigureEvent swig_types[28] #define SWIGTYPE_p_XCirculateEvent swig_types[29]@@ -679,35 +679,34 @@ #define SWIGTYPE_p_XRectangle swig_types[30]
#define SWIGTYPE_p_std__string swig_types[31] #define SWIGTYPE_p_XCrossingEvent swig_types[32] #define SWIGTYPE_p_Display swig_types[33] -#define SWIGTYPE_p_otk__OBDisplay swig_types[34] +#define SWIGTYPE_p_otk__Display swig_types[34] #define SWIGTYPE_p_XMappingEvent swig_types[35] #define SWIGTYPE_p_otk__Style swig_types[36] -#define SWIGTYPE_p_otk__OtkEventHandler swig_types[37] +#define SWIGTYPE_p_otk__EventHandler swig_types[37] #define SWIGTYPE_p_XReparentEvent swig_types[38] -#define SWIGTYPE_p_otk__OtkEventDispatcher swig_types[39] -#define SWIGTYPE_p_otk__BGCCache swig_types[40] -#define SWIGTYPE_p_ob__OBBindings swig_types[41] +#define SWIGTYPE_p_otk__EventDispatcher swig_types[39] +#define SWIGTYPE_p_otk__GCCache swig_types[40] +#define SWIGTYPE_p_ob__Bindings swig_types[41] #define SWIGTYPE_p_ob__Openbox swig_types[42] -#define SWIGTYPE_p_ob__OBActions swig_types[43] +#define SWIGTYPE_p_ob__Actions swig_types[43] #define SWIGTYPE_p_XEvent swig_types[44] -#define SWIGTYPE_p_XTextProperty swig_types[45] -#define SWIGTYPE_p_otk__OBProperty swig_types[46] -#define SWIGTYPE_p_PyObject swig_types[47] -#define SWIGTYPE_p_otk__ScreenInfo swig_types[48] -#define SWIGTYPE_p_ob__OBClient swig_types[49] -#define SWIGTYPE_p_ob__EventData swig_types[50] -#define SWIGTYPE_p_XCreateWindowEvent swig_types[51] -#define SWIGTYPE_p_XDestroyWindowEvent swig_types[52] -#define SWIGTYPE_p_otk__OBProperty__StringVect swig_types[53] -#define SWIGTYPE_p_XKeyEvent swig_types[54] -#define SWIGTYPE_p_otk__Strut swig_types[55] -#define SWIGTYPE_p_unsigned_long swig_types[56] -#define SWIGTYPE_p_p_unsigned_long swig_types[57] -#define SWIGTYPE_p_XMotionEvent swig_types[58] -#define SWIGTYPE_p_XButtonEvent swig_types[59] -#define SWIGTYPE_p_XSelectionEvent swig_types[60] -#define SWIGTYPE_p_otk__OBTimerQueueManager swig_types[61] -static swig_type_info *swig_types[63]; +#define SWIGTYPE_p_otk__Property swig_types[45] +#define SWIGTYPE_p_PyObject swig_types[46] +#define SWIGTYPE_p_otk__ScreenInfo swig_types[47] +#define SWIGTYPE_p_ob__EventData swig_types[48] +#define SWIGTYPE_p_XCreateWindowEvent swig_types[49] +#define SWIGTYPE_p_XDestroyWindowEvent swig_types[50] +#define SWIGTYPE_p_otk__Property__StringVect swig_types[51] +#define SWIGTYPE_p_ob__WidgetBase swig_types[52] +#define SWIGTYPE_p_XKeyEvent swig_types[53] +#define SWIGTYPE_p_otk__Strut swig_types[54] +#define SWIGTYPE_p_unsigned_long swig_types[55] +#define SWIGTYPE_p_p_unsigned_long swig_types[56] +#define SWIGTYPE_p_XMotionEvent swig_types[57] +#define SWIGTYPE_p_XButtonEvent swig_types[58] +#define SWIGTYPE_p_XSelectionEvent swig_types[59] +#define SWIGTYPE_p_otk__TimerQueueManager swig_types[60] +static swig_type_info *swig_types[62]; /* -------- TYPES TABLE (END) -------- */@@ -883,16 +882,16 @@
#include <iterator> - Display *OBDisplay_display() { return otk::OBDisplay::display; } + Display *Display_display() { return otk::Display::display; } -ob::OBClient *ob_OBScreen_client(ob::OBScreen *self,int i){ +ob::Client *ob_Screen_client(ob::Screen *self,int i){ if (i >= (int)self->clients.size()) return NULL; - ob::OBClient::List::iterator it = self->clients.begin(); + ob::Client::List::iterator it = self->clients.begin(); std::advance(it,i); return *it; } -int ob_OBScreen_clientCount(ob::OBScreen const *self){ +int ob_Screen_clientCount(ob::Screen const *self){ return (int) self->clients.size(); } #ifdef __cplusplus@@ -912,12 +911,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_display(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_display(PyObject *self, PyObject *args) { PyObject *resultobj; Display *result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_display")) goto fail; - result = (Display *)OBDisplay_display(); + if(!PyArg_ParseTuple(args,(char *)":Display_display")) goto fail; + result = (Display *)Display_display(); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_Display, 0); return resultobj;@@ -926,12 +925,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_initialize(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_initialize(PyObject *self, PyObject *args) { PyObject *resultobj; char *arg1 ; - if(!PyArg_ParseTuple(args,(char *)"s:OBDisplay_initialize",&arg1)) goto fail; - otk::OBDisplay::initialize(arg1); + if(!PyArg_ParseTuple(args,(char *)"s:Display_initialize",&arg1)) goto fail; + otk::Display::initialize(arg1); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -940,11 +939,11 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_destroy(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_destroy(PyObject *self, PyObject *args) { PyObject *resultobj; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_destroy")) goto fail; - otk::OBDisplay::destroy(); + if(!PyArg_ParseTuple(args,(char *)":Display_destroy")) goto fail; + otk::Display::destroy(); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -953,27 +952,27 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_gcCache(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_gcCache(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::BGCCache *result; + otk::GCCache *result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_gcCache")) goto fail; - result = (otk::BGCCache *)otk::OBDisplay::gcCache(); + if(!PyArg_ParseTuple(args,(char *)":Display_gcCache")) goto fail; + result = (otk::GCCache *)otk::Display::gcCache(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__BGCCache, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__GCCache, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OBDisplay_screenInfo(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_screenInfo(PyObject *self, PyObject *args) { PyObject *resultobj; int arg1 ; otk::ScreenInfo *result; - if(!PyArg_ParseTuple(args,(char *)"i:OBDisplay_screenInfo",&arg1)) goto fail; - result = (otk::ScreenInfo *)otk::OBDisplay::screenInfo(arg1); + if(!PyArg_ParseTuple(args,(char *)"i:Display_screenInfo",&arg1)) goto fail; + result = (otk::ScreenInfo *)otk::Display::screenInfo(arg1); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__ScreenInfo, 0); return resultobj;@@ -982,16 +981,16 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_findScreen(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_findScreen(PyObject *self, PyObject *args) { PyObject *resultobj; Window arg1 ; otk::ScreenInfo *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBDisplay_findScreen",&obj0)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O:Display_findScreen",&obj0)) goto fail; arg1 = (Window) PyInt_AsLong(obj0); if (PyErr_Occurred()) SWIG_fail; - result = (otk::ScreenInfo *)otk::OBDisplay::findScreen(arg1); + result = (otk::ScreenInfo *)otk::Display::findScreen(arg1); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__ScreenInfo, 0); return resultobj;@@ -1000,12 +999,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_xkb(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_xkb(PyObject *self, PyObject *args) { PyObject *resultobj; bool result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_xkb")) goto fail; - result = (bool)otk::OBDisplay::xkb(); + if(!PyArg_ParseTuple(args,(char *)":Display_xkb")) goto fail; + result = (bool)otk::Display::xkb(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1014,12 +1013,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_xkbEventBase(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_xkbEventBase(PyObject *self, PyObject *args) { PyObject *resultobj; int result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_xkbEventBase")) goto fail; - result = (int)otk::OBDisplay::xkbEventBase(); + if(!PyArg_ParseTuple(args,(char *)":Display_xkbEventBase")) goto fail; + result = (int)otk::Display::xkbEventBase(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1028,12 +1027,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_shape(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_shape(PyObject *self, PyObject *args) { PyObject *resultobj; bool result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_shape")) goto fail; - result = (bool)otk::OBDisplay::shape(); + if(!PyArg_ParseTuple(args,(char *)":Display_shape")) goto fail; + result = (bool)otk::Display::shape(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1042,12 +1041,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_shapeEventBase(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_shapeEventBase(PyObject *self, PyObject *args) { PyObject *resultobj; int result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_shapeEventBase")) goto fail; - result = (int)otk::OBDisplay::shapeEventBase(); + if(!PyArg_ParseTuple(args,(char *)":Display_shapeEventBase")) goto fail; + result = (int)otk::Display::shapeEventBase(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1056,12 +1055,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_xinerama(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_xinerama(PyObject *self, PyObject *args) { PyObject *resultobj; bool result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_xinerama")) goto fail; - result = (bool)otk::OBDisplay::xinerama(); + if(!PyArg_ParseTuple(args,(char *)":Display_xinerama")) goto fail; + result = (bool)otk::Display::xinerama(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1070,12 +1069,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_numLockMask(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_numLockMask(PyObject *self, PyObject *args) { PyObject *resultobj; unsigned int result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_numLockMask")) goto fail; - result = (unsigned int)otk::OBDisplay::numLockMask(); + if(!PyArg_ParseTuple(args,(char *)":Display_numLockMask")) goto fail; + result = (unsigned int)otk::Display::numLockMask(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1084,12 +1083,12 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_scrollLockMask(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_scrollLockMask(PyObject *self, PyObject *args) { PyObject *resultobj; unsigned int result; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_scrollLockMask")) goto fail; - result = (unsigned int)otk::OBDisplay::scrollLockMask(); + if(!PyArg_ParseTuple(args,(char *)":Display_scrollLockMask")) goto fail; + result = (unsigned int)otk::Display::scrollLockMask(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1098,11 +1097,11 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_grab(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_grab(PyObject *self, PyObject *args) { PyObject *resultobj; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_grab")) goto fail; - otk::OBDisplay::grab(); + if(!PyArg_ParseTuple(args,(char *)":Display_grab")) goto fail; + otk::Display::grab(); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1111,11 +1110,11 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_ungrab(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_ungrab(PyObject *self, PyObject *args) { PyObject *resultobj; - if(!PyArg_ParseTuple(args,(char *)":OBDisplay_ungrab")) goto fail; - otk::OBDisplay::ungrab(); + if(!PyArg_ParseTuple(args,(char *)":Display_ungrab")) goto fail; + otk::Display::ungrab(); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1124,7 +1123,7 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_grabButton(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_grabButton(PyObject *self, PyObject *args) { PyObject *resultobj; unsigned int arg1 ; unsigned int arg2 ;@@ -1145,7 +1144,7 @@ PyObject * obj7 = 0 ;
PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOOOOiiOOO:OBDisplay_grabButton",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOOOOiiOOO:Display_grabButton",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&obj9)) goto fail; arg1 = (unsigned int) PyInt_AsLong(obj0); if (PyErr_Occurred()) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1);@@ -1162,7 +1161,7 @@ arg9 = (Cursor) PyInt_AsLong(obj8);
if (PyErr_Occurred()) SWIG_fail; arg10 = (bool) PyInt_AsLong(obj9); if (PyErr_Occurred()) SWIG_fail; - otk::OBDisplay::grabButton(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); + otk::Display::grabButton(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1171,7 +1170,7 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_ungrabButton(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_ungrabButton(PyObject *self, PyObject *args) { PyObject *resultobj; unsigned int arg1 ; unsigned int arg2 ;@@ -1180,14 +1179,14 @@ PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:OBDisplay_ungrabButton",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:Display_ungrabButton",&obj0,&obj1,&obj2)) goto fail; arg1 = (unsigned int) PyInt_AsLong(obj0); if (PyErr_Occurred()) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; arg3 = (Window) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; - otk::OBDisplay::ungrabButton(arg1,arg2,arg3); + otk::Display::ungrabButton(arg1,arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1196,7 +1195,7 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_grabKey(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_grabKey(PyObject *self, PyObject *args) { PyObject *resultobj; unsigned int arg1 ; unsigned int arg2 ;@@ -1211,7 +1210,7 @@ PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ; PyObject * obj6 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOOOiiO:OBDisplay_grabKey",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOOOiiO:Display_grabKey",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; arg1 = (unsigned int) PyInt_AsLong(obj0); if (PyErr_Occurred()) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1);@@ -1222,7 +1221,7 @@ arg4 = (bool) PyInt_AsLong(obj3);
if (PyErr_Occurred()) SWIG_fail; arg7 = (bool) PyInt_AsLong(obj6); if (PyErr_Occurred()) SWIG_fail; - otk::OBDisplay::grabKey(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + otk::Display::grabKey(arg1,arg2,arg3,arg4,arg5,arg6,arg7); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1231,7 +1230,7 @@ return NULL;
} -static PyObject *_wrap_OBDisplay_ungrabKey(PyObject *self, PyObject *args) { +static PyObject *_wrap_Display_ungrabKey(PyObject *self, PyObject *args) { PyObject *resultobj; unsigned int arg1 ; unsigned int arg2 ;@@ -1240,14 +1239,14 @@ PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:OBDisplay_ungrabKey",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:Display_ungrabKey",&obj0,&obj1,&obj2)) goto fail; arg1 = (unsigned int) PyInt_AsLong(obj0); if (PyErr_Occurred()) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; arg3 = (Window) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; - otk::OBDisplay::ungrabKey(arg1,arg2,arg3); + otk::Display::ungrabKey(arg1,arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1256,10 +1255,10 @@ return NULL;
} -static PyObject * OBDisplay_swigregister(PyObject *self, PyObject *args) { +static PyObject * Display_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_otk__OBDisplay, obj); + SWIG_TypeClientData(SWIGTYPE_p_otk__Display, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); }@@ -1418,27 +1417,27 @@ SWIG_TypeClientData(SWIGTYPE_p_otk__Point, obj);
Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_OBProperty(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_Property(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *result; + otk::Property *result; - if(!PyArg_ParseTuple(args,(char *)":new_OBProperty")) goto fail; - result = (otk::OBProperty *)new otk::OBProperty(); + if(!PyArg_ParseTuple(args,(char *)":new_Property")) goto fail; + result = (otk::Property *)new otk::Property(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OBProperty, 1); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__Property, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_OBProperty(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_Property(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:delete_OBProperty",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:delete_Property",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; delete arg1; Py_INCREF(Py_None); resultobj = Py_None;@@ -1448,9 +1447,9 @@ return NULL;
} -static PyObject *_wrap_OBProperty_set__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_set__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ;@@ -1459,13 +1458,13 @@ PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiO:OBProperty_set",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiO:Property_set",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; arg5 = (unsigned long) PyInt_AsLong(obj4); if (PyErr_Occurred()) SWIG_fail; - ((otk::OBProperty const *)arg1)->set(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::Atoms )arg4,arg5); + ((otk::Property const *)arg1)->set(arg2,(otk::Property::Atoms )arg3,(otk::Property::Atoms )arg4,arg5); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1474,9 +1473,9 @@ return NULL;
} -static PyObject *_wrap_OBProperty_set__SWIG_1(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_set__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ;@@ -1486,12 +1485,12 @@ PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiOi:OBProperty_set",&obj0,&obj1,&arg3,&arg4,&obj4,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiOi:Property_set",&obj0,&obj1,&arg3,&arg4,&obj4,&arg6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_unsigned_long,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - ((otk::OBProperty const *)arg1)->set(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::Atoms )arg4,arg5,arg6); + ((otk::Property const *)arg1)->set(arg2,(otk::Property::Atoms )arg3,(otk::Property::Atoms )arg4,arg5,arg6); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1500,9 +1499,9 @@ return NULL;
} -static PyObject *_wrap_OBProperty_set__SWIG_2(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_set__SWIG_2(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ;@@ -1512,8 +1511,8 @@ PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiO:OBProperty_set",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiO:Property_set",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; {@@ -1524,7 +1523,7 @@ }else {
SWIG_exception(SWIG_TypeError, "string expected"); } } - ((otk::OBProperty const *)arg1)->set(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::StringType )arg4,(std::string const &)*arg5); + ((otk::Property const *)arg1)->set(arg2,(otk::Property::Atoms )arg3,(otk::Property::StringType )arg4,(std::string const &)*arg5); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1533,26 +1532,26 @@ return NULL;
} -static PyObject *_wrap_OBProperty_set__SWIG_3(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_set__SWIG_3(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ; - otk::OBProperty::StringVect *arg5 = 0 ; + otk::Property::StringVect *arg5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiO:OBProperty_set",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiO:Property_set",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_otk__OBProperty__StringVect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_otk__Property__StringVect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg5 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - ((otk::OBProperty const *)arg1)->set(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::StringType )arg4,(otk::OBProperty::StringVect const &)*arg5); + ((otk::Property const *)arg1)->set(arg2,(otk::Property::Atoms )arg3,(otk::Property::StringType )arg4,(otk::Property::StringVect const &)*arg5); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -1561,7 +1560,7 @@ return NULL;
} -static PyObject *_wrap_OBProperty_set(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_set(PyObject *self, PyObject *args) { int argc; PyObject *argv[7]; int ii;@@ -1574,7 +1573,7 @@ if (argc == 5) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1596,7 +1595,7 @@ }
if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[4], (void **) &ptr, SWIGTYPE_p_otk__OBProperty__StringVect, 0) == -1) { + if (SWIG_ConvertPtr(argv[4], (void **) &ptr, SWIGTYPE_p_otk__Property__StringVect, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1604,7 +1603,7 @@ _v = 1;
} } if (_v) { - return _wrap_OBProperty_set__SWIG_3(self,args); + return _wrap_Property_set__SWIG_3(self,args); } } }@@ -1615,7 +1614,7 @@ if (argc == 5) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1639,7 +1638,7 @@ {
_v = (PyInt_Check(argv[4]) || PyLong_Check(argv[4])) ? 1 : 0; } if (_v) { - return _wrap_OBProperty_set__SWIG_0(self,args); + return _wrap_Property_set__SWIG_0(self,args); } } }@@ -1650,7 +1649,7 @@ if (argc == 5) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1674,7 +1673,7 @@ {
_v = PyString_Check(argv[4]) ? 1 : 0; } if (_v) { - return _wrap_OBProperty_set__SWIG_2(self,args); + return _wrap_Property_set__SWIG_2(self,args); } } }@@ -1685,7 +1684,7 @@ if (argc == 6) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1719,7 +1718,7 @@ {
_v = (PyInt_Check(argv[5]) || PyLong_Check(argv[5])) ? 1 : 0; } if (_v) { - return _wrap_OBProperty_set__SWIG_1(self,args); + return _wrap_Property_set__SWIG_1(self,args); } } }@@ -1728,14 +1727,14 @@ }
} } - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'OBProperty_set'"); + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Property_set'"); return NULL; } -static PyObject *_wrap_OBProperty_get__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_get__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ;@@ -1747,13 +1746,13 @@ PyObject * obj1 = 0 ;
PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiOO:OBProperty_get",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiOO:Property_get",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_unsigned_long,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_p_unsigned_long,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((otk::OBProperty const *)arg1)->get(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::Atoms )arg4,arg5,arg6); + result = (bool)((otk::Property const *)arg1)->get(arg2,(otk::Property::Atoms )arg3,(otk::Property::Atoms )arg4,arg5,arg6); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1762,9 +1761,9 @@ return NULL;
} -static PyObject *_wrap_OBProperty_get__SWIG_1(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_get__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ;@@ -1774,12 +1773,12 @@ PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiO:OBProperty_get",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiO:Property_get",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_unsigned_long,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((otk::OBProperty const *)arg1)->get(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::Atoms )arg4,arg5); + result = (bool)((otk::Property const *)arg1)->get(arg2,(otk::Property::Atoms )arg3,(otk::Property::Atoms )arg4,arg5); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1788,9 +1787,9 @@ return NULL;
} -static PyObject *_wrap_OBProperty_get__SWIG_2(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_get__SWIG_2(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ;@@ -1800,12 +1799,12 @@ PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiO:OBProperty_get",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiO:Property_get",&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_std__string,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((otk::OBProperty const *)arg1)->get(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::StringType )arg4,arg5); + result = (bool)((otk::Property const *)arg1)->get(arg2,(otk::Property::Atoms )arg3,(otk::Property::StringType )arg4,arg5); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1814,27 +1813,27 @@ return NULL;
} -static PyObject *_wrap_OBProperty_get__SWIG_3(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_get__SWIG_3(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; int arg4 ; unsigned long *arg5 = (unsigned long *) 0 ; - otk::OBProperty::StringVect *arg6 = (otk::OBProperty::StringVect *) 0 ; + otk::Property::StringVect *arg6 = (otk::Property::StringVect *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOiiOO:OBProperty_get",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOiiOO:Property_get",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_unsigned_long,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_otk__OBProperty__StringVect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((otk::OBProperty const *)arg1)->get(arg2,(otk::OBProperty::Atoms )arg3,(otk::OBProperty::StringType )arg4,arg5,arg6); + if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_otk__Property__StringVect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((otk::Property const *)arg1)->get(arg2,(otk::Property::Atoms )arg3,(otk::Property::StringType )arg4,arg5,arg6); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -1843,7 +1842,7 @@ return NULL;
} -static PyObject *_wrap_OBProperty_get(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_get(PyObject *self, PyObject *args) { int argc; PyObject *argv[7]; int ii;@@ -1856,7 +1855,7 @@ if (argc == 5) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1886,7 +1885,7 @@ _v = 1;
} } if (_v) { - return _wrap_OBProperty_get__SWIG_1(self,args); + return _wrap_Property_get__SWIG_1(self,args); } } }@@ -1897,7 +1896,7 @@ if (argc == 5) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1927,7 +1926,7 @@ _v = 1;
} } if (_v) { - return _wrap_OBProperty_get__SWIG_2(self,args); + return _wrap_Property_get__SWIG_2(self,args); } } }@@ -1938,7 +1937,7 @@ if (argc == 6) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -1978,7 +1977,7 @@ _v = 1;
} } if (_v) { - return _wrap_OBProperty_get__SWIG_0(self,args); + return _wrap_Property_get__SWIG_0(self,args); } } }@@ -1990,7 +1989,7 @@ if (argc == 6) {
int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__OBProperty, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_otk__Property, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -2022,7 +2021,7 @@ }
if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[5], (void **) &ptr, SWIGTYPE_p_otk__OBProperty__StringVect, 0) == -1) { + if (SWIG_ConvertPtr(argv[5], (void **) &ptr, SWIGTYPE_p_otk__Property__StringVect, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -2030,7 +2029,7 @@ _v = 1;
} } if (_v) { - return _wrap_OBProperty_get__SWIG_3(self,args); + return _wrap_Property_get__SWIG_3(self,args); } } }@@ -2039,24 +2038,24 @@ }
} } - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'OBProperty_get'"); + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Property_get'"); return NULL; } -static PyObject *_wrap_OBProperty_erase(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_erase(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; Window arg2 ; int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOi:OBProperty_erase",&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOi:Property_erase",&obj0,&obj1,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - ((otk::OBProperty const *)arg1)->erase(arg2,(otk::OBProperty::Atoms )arg3); + ((otk::Property const *)arg1)->erase(arg2,(otk::Property::Atoms )arg3); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -2065,16 +2064,16 @@ return NULL;
} -static PyObject *_wrap_OBProperty_atom(PyObject *self, PyObject *args) { +static PyObject *_wrap_Property_atom(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OBProperty *arg1 = (otk::OBProperty *) 0 ; + otk::Property *arg1 = (otk::Property *) 0 ; int arg2 ; Atom result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi:OBProperty_atom",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (Atom)((otk::OBProperty const *)arg1)->atom((otk::OBProperty::Atoms )arg2); + if(!PyArg_ParseTuple(args,(char *)"Oi:Property_atom",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (Atom)((otk::Property const *)arg1)->atom((otk::Property::Atoms )arg2); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -2083,10 +2082,10 @@ return NULL;
} -static PyObject * OBProperty_swigregister(PyObject *self, PyObject *args) { +static PyObject * Property_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_otk__OBProperty, obj); + SWIG_TypeClientData(SWIGTYPE_p_otk__Property, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); }@@ -3785,241 +3784,15 @@ SWIG_TypeClientData(SWIGTYPE_p_otk__Strut, obj);
Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_BSENTINEL_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BSENTINEL is read-only."); - return 1; -} - - -static PyObject *_wrap_BSENTINEL_get() { - PyObject *pyobj; - - pyobj = PyInt_FromLong((long)otk::BSENTINEL); - return pyobj; -} - - -static PyObject *_wrap_expandTilde(PyObject *self, PyObject *args) { - PyObject *resultobj; - std::string *arg1 = 0 ; - std::string result; - std::string temp1 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:expandTilde",&obj0)) goto fail; - { - if (PyString_Check(obj0)) { - temp1 = std::string(PyString_AsString(obj0)); - arg1 = &temp1; - }else { - SWIG_exception(SWIG_TypeError, "string expected"); - } - } - result = otk::expandTilde((std::string const &)*arg1); - - { - resultobj = PyString_FromString((&result)->c_str()); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_bexec(PyObject *self, PyObject *args) { - PyObject *resultobj; - std::string *arg1 = 0 ; - std::string *arg2 = 0 ; - std::string temp1 ; - std::string temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:bexec",&obj0,&obj1)) goto fail; - { - if (PyString_Check(obj0)) { - temp1 = std::string(PyString_AsString(obj0)); - arg1 = &temp1; - }else { - SWIG_exception(SWIG_TypeError, "string expected"); - } - } - { - if (PyString_Check(obj1)) { - temp2 = std::string(PyString_AsString(obj1)); - arg2 = &temp2; - }else { - SWIG_exception(SWIG_TypeError, "string expected"); - } - } - otk::bexec((std::string const &)*arg1,(std::string const &)*arg2); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_textPropertyToString(PyObject *self, PyObject *args) { - PyObject *resultobj; - Display *arg1 = (Display *) 0 ; - XTextProperty *arg2 = 0 ; - std::string result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:textPropertyToString",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XTextProperty,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - result = otk::textPropertyToString(arg1,*arg2); - - { - resultobj = PyString_FromString((&result)->c_str()); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_itostring_unsigned_long(PyObject *self, PyObject *args) { - PyObject *resultobj; - unsigned long arg1 ; - std::string result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:itostring_unsigned_long",&obj0)) goto fail; - arg1 = (unsigned long) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; - result = otk::itostring(arg1); - - { - resultobj = PyString_FromString((&result)->c_str()); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_itostring_long(PyObject *self, PyObject *args) { - PyObject *resultobj; - long arg1 ; - std::string result; - - if(!PyArg_ParseTuple(args,(char *)"l:itostring_long",&arg1)) goto fail; - result = otk::itostring(arg1); - - { - resultobj = PyString_FromString((&result)->c_str()); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_itostring_unsigned(PyObject *self, PyObject *args) { - PyObject *resultobj; - unsigned int arg1 ; - std::string result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:itostring_unsigned",&obj0)) goto fail; - arg1 = (unsigned int) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; - result = otk::itostring(arg1); - - { - resultobj = PyString_FromString((&result)->c_str()); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_itostring(PyObject *self, PyObject *args) { - PyObject *resultobj; - int arg1 ; - std::string result; - - if(!PyArg_ParseTuple(args,(char *)"i:itostring",&arg1)) goto fail; - result = otk::itostring(arg1); - - { - resultobj = PyString_FromString((&result)->c_str()); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_putenv(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_handle(PyObject *self, PyObject *args) { PyObject *resultobj; - std::string *arg1 = 0 ; - std::string temp1 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:putenv",&obj0)) goto fail; - { - if (PyString_Check(obj0)) { - temp1 = std::string(PyString_AsString(obj0)); - arg1 = &temp1; - }else { - SWIG_exception(SWIG_TypeError, "string expected"); - } - } - otk::putenv((std::string const &)*arg1); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_basename(PyObject *self, PyObject *args) { - PyObject *resultobj; - std::string *arg1 = 0 ; - std::string result; - std::string temp1 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:basename",&obj0)) goto fail; - { - if (PyString_Check(obj0)) { - temp1 = std::string(PyString_AsString(obj0)); - arg1 = &temp1; - }else { - SWIG_exception(SWIG_TypeError, "string expected"); - } - } - result = otk::basename((std::string const &)*arg1); - - { - resultobj = PyString_FromString((&result)->c_str()); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_OtkEventHandler_handle(PyObject *self, PyObject *args) { - PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_handle",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_handle",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4033,15 +3806,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_keyPressHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_keyPressHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XKeyEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_keyPressHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_keyPressHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4055,15 +3828,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_keyReleaseHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_keyReleaseHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XKeyEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_keyReleaseHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_keyReleaseHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4077,15 +3850,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_buttonPressHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_buttonPressHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XButtonEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_buttonPressHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_buttonPressHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XButtonEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4099,15 +3872,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_buttonReleaseHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_buttonReleaseHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XButtonEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_buttonReleaseHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_buttonReleaseHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XButtonEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4121,15 +3894,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_motionHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_motionHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XMotionEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_motionHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_motionHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XMotionEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4143,15 +3916,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_enterHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_enterHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XCrossingEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_enterHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_enterHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XCrossingEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4165,15 +3938,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_leaveHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_leaveHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XCrossingEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_leaveHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_leaveHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XCrossingEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4187,15 +3960,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_focusHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_focusHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XFocusChangeEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_focusHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_focusHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XFocusChangeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4209,15 +3982,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_unfocusHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_unfocusHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XFocusChangeEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_unfocusHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_unfocusHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XFocusChangeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4231,15 +4004,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_exposeHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_exposeHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XExposeEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_exposeHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_exposeHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XExposeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4253,15 +4026,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_graphicsExposeHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_graphicsExposeHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XGraphicsExposeEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_graphicsExposeHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_graphicsExposeHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XGraphicsExposeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4275,15 +4048,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_noExposeEventHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_noExposeEventHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XNoExposeEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_noExposeEventHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_noExposeEventHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XNoExposeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4297,15 +4070,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_circulateRequestHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_circulateRequestHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XCirculateRequestEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_circulateRequestHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_circulateRequestHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XCirculateRequestEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4319,15 +4092,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_configureRequestHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_configureRequestHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XConfigureRequestEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_configureRequestHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_configureRequestHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XConfigureRequestEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4341,15 +4114,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_mapRequestHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_mapRequestHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XMapRequestEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_mapRequestHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_mapRequestHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XMapRequestEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4363,15 +4136,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_resizeRequestHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_resizeRequestHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XResizeRequestEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_resizeRequestHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_resizeRequestHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XResizeRequestEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4385,15 +4158,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_circulateHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_circulateHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XCirculateEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_circulateHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_circulateHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XCirculateEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4407,15 +4180,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_configureHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_configureHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XConfigureEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_configureHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_configureHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XConfigureEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4429,15 +4202,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_createHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_createHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XCreateWindowEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_createHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_createHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XCreateWindowEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4451,15 +4224,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_destroyHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_destroyHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XDestroyWindowEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_destroyHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_destroyHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XDestroyWindowEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4473,15 +4246,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_gravityHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_gravityHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XGravityEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_gravityHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_gravityHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XGravityEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4495,15 +4268,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_mapHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_mapHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XMapEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_mapHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_mapHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XMapEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4517,15 +4290,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_mappingHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_mappingHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XMappingEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_mappingHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_mappingHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XMappingEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4539,15 +4312,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_reparentHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_reparentHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XReparentEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_reparentHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_reparentHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XReparentEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4561,15 +4334,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_unmapHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_unmapHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XUnmapEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_unmapHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_unmapHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XUnmapEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4583,15 +4356,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_visibilityHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_visibilityHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XVisibilityEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_visibilityHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_visibilityHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XVisibilityEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4605,15 +4378,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_colorMapHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_colorMapHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XColormapEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_colorMapHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_colorMapHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XColormapEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4627,15 +4400,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_propertyHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_propertyHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XPropertyEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_propertyHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_propertyHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XPropertyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4649,15 +4422,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_selectionClearHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_selectionClearHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XSelectionClearEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_selectionClearHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_selectionClearHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XSelectionClearEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4671,15 +4444,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_selectionHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_selectionHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XSelectionEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_selectionHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_selectionHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XSelectionEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4693,15 +4466,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_selectionRequestHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_selectionRequestHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XSelectionRequestEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_selectionRequestHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_selectionRequestHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XSelectionRequestEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4715,15 +4488,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventHandler_clientMessageHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventHandler_clientMessageHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; XClientMessageEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventHandler_clientMessageHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventHandler_clientMessageHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XClientMessageEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -4737,13 +4510,13 @@ return NULL;
} -static PyObject *_wrap_delete_OtkEventHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_EventHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventHandler *arg1 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg1 = (otk::EventHandler *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:delete_OtkEventHandler",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:delete_EventHandler",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; delete arg1; Py_INCREF(Py_None); resultobj = Py_None;@@ -4753,34 +4526,34 @@ return NULL;
} -static PyObject * OtkEventHandler_swigregister(PyObject *self, PyObject *args) { +static PyObject * EventHandler_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_otk__OtkEventHandler, obj); + SWIG_TypeClientData(SWIGTYPE_p_otk__EventHandler, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_OtkEventDispatcher(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_EventDispatcher(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *result; + otk::EventDispatcher *result; - if(!PyArg_ParseTuple(args,(char *)":new_OtkEventDispatcher")) goto fail; - result = (otk::OtkEventDispatcher *)new otk::OtkEventDispatcher(); + if(!PyArg_ParseTuple(args,(char *)":new_EventDispatcher")) goto fail; + result = (otk::EventDispatcher *)new otk::EventDispatcher(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OtkEventDispatcher, 1); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__EventDispatcher, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_OtkEventDispatcher(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_EventDispatcher(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:delete_OtkEventDispatcher",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:delete_EventDispatcher",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; delete arg1; Py_INCREF(Py_None); resultobj = Py_None;@@ -4790,13 +4563,13 @@ return NULL;
} -static PyObject *_wrap_OtkEventDispatcher_clearAllHandlers(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_clearAllHandlers(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OtkEventDispatcher_clearAllHandlers",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:EventDispatcher_clearAllHandlers",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->clearAllHandlers(); Py_INCREF(Py_None); resultobj = Py_None;@@ -4806,20 +4579,20 @@ return NULL;
} -static PyObject *_wrap_OtkEventDispatcher_registerHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_registerHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; Window arg2 ; - otk::OtkEventHandler *arg3 = (otk::OtkEventHandler *) 0 ; + otk::EventHandler *arg3 = (otk::EventHandler *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:OtkEventDispatcher_registerHandler",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:EventDispatcher_registerHandler",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->registerHandler(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None;@@ -4829,15 +4602,15 @@ return NULL;
} -static PyObject *_wrap_OtkEventDispatcher_clearHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_clearHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; Window arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventDispatcher_clearHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventDispatcher_clearHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; (arg1)->clearHandler(arg2);@@ -4849,13 +4622,13 @@ return NULL;
} -static PyObject *_wrap_OtkEventDispatcher_dispatchEvents(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_dispatchEvents(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OtkEventDispatcher_dispatchEvents",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:EventDispatcher_dispatchEvents",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->dispatchEvents(); Py_INCREF(Py_None); resultobj = Py_None;@@ -4865,16 +4638,16 @@ return NULL;
} -static PyObject *_wrap_OtkEventDispatcher_setFallbackHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_setFallbackHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; - otk::OtkEventHandler *arg2 = (otk::OtkEventHandler *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; + otk::EventHandler *arg2 = (otk::EventHandler *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventDispatcher_setFallbackHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventDispatcher_setFallbackHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->setFallbackHandler(arg2); Py_INCREF(Py_None); resultobj = Py_None;@@ -4884,33 +4657,33 @@ return NULL;
} -static PyObject *_wrap_OtkEventDispatcher_getFallbackHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_getFallbackHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; - otk::OtkEventHandler *result; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; + otk::EventHandler *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OtkEventDispatcher_getFallbackHandler",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (otk::OtkEventHandler *)((otk::OtkEventDispatcher const *)arg1)->getFallbackHandler(); + if(!PyArg_ParseTuple(args,(char *)"O:EventDispatcher_getFallbackHandler",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::EventHandler *)((otk::EventDispatcher const *)arg1)->getFallbackHandler(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OtkEventHandler, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__EventHandler, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OtkEventDispatcher_setMasterHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_setMasterHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; - otk::OtkEventHandler *arg2 = (otk::OtkEventHandler *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; + otk::EventHandler *arg2 = (otk::EventHandler *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventDispatcher_setMasterHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventDispatcher_setMasterHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_otk__EventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->setMasterHandler(arg2); Py_INCREF(Py_None); resultobj = Py_None;@@ -4920,53 +4693,53 @@ return NULL;
} -static PyObject *_wrap_OtkEventDispatcher_getMasterHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_getMasterHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; - otk::OtkEventHandler *result; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; + otk::EventHandler *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OtkEventDispatcher_getMasterHandler",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (otk::OtkEventHandler *)((otk::OtkEventDispatcher const *)arg1)->getMasterHandler(); + if(!PyArg_ParseTuple(args,(char *)"O:EventDispatcher_getMasterHandler",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::EventHandler *)((otk::EventDispatcher const *)arg1)->getMasterHandler(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OtkEventHandler, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__EventHandler, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OtkEventDispatcher_findHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_findHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; Window arg2 ; - otk::OtkEventHandler *result; + otk::EventHandler *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventDispatcher_findHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:EventDispatcher_findHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - result = (otk::OtkEventHandler *)(arg1)->findHandler(arg2); + result = (otk::EventHandler *)(arg1)->findHandler(arg2); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OtkEventHandler, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__EventHandler, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OtkEventDispatcher_lastTime(PyObject *self, PyObject *args) { +static PyObject *_wrap_EventDispatcher_lastTime(PyObject *self, PyObject *args) { PyObject *resultobj; - otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ; + otk::EventDispatcher *arg1 = (otk::EventDispatcher *) 0 ; Time result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OtkEventDispatcher_lastTime",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (Time)((otk::OtkEventDispatcher const *)arg1)->lastTime(); + if(!PyArg_ParseTuple(args,(char *)"O:EventDispatcher_lastTime",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__EventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (Time)((otk::EventDispatcher const *)arg1)->lastTime(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -4975,10 +4748,10 @@ return NULL;
} -static PyObject * OtkEventDispatcher_swigregister(PyObject *self, PyObject *args) { +static PyObject * EventDispatcher_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_otk__OtkEventDispatcher, obj); + SWIG_TypeClientData(SWIGTYPE_p_otk__EventDispatcher, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); }@@ -5231,14 +5004,14 @@
static PyObject *_wrap_Openbox_timerManager(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; - otk::OBTimerQueueManager *result; + otk::TimerQueueManager *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Openbox_timerManager",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (otk::OBTimerQueueManager *)(arg1)->timerManager(); + result = (otk::TimerQueueManager *)(arg1)->timerManager(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OBTimerQueueManager, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__TimerQueueManager, 0); return resultobj; fail: return NULL;@@ -5248,14 +5021,14 @@
static PyObject *_wrap_Openbox_property(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; - otk::OBProperty *result; + otk::Property *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Openbox_property",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (otk::OBProperty *)((ob::Openbox const *)arg1)->property(); + result = (otk::Property *)((ob::Openbox const *)arg1)->property(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OBProperty, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__Property, 0); return resultobj; fail: return NULL;@@ -5265,14 +5038,14 @@
static PyObject *_wrap_Openbox_actions(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; - ob::OBActions *result; + ob::Actions *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Openbox_actions",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBActions *)((ob::Openbox const *)arg1)->actions(); + result = (ob::Actions *)((ob::Openbox const *)arg1)->actions(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBActions, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Actions, 0); return resultobj; fail: return NULL;@@ -5282,14 +5055,14 @@
static PyObject *_wrap_Openbox_bindings(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; - ob::OBBindings *result; + ob::Bindings *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Openbox_bindings",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBBindings *)((ob::Openbox const *)arg1)->bindings(); + result = (ob::Bindings *)((ob::Openbox const *)arg1)->bindings(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBBindings, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Bindings, 0); return resultobj; fail: return NULL;@@ -5300,14 +5073,14 @@ static PyObject *_wrap_Openbox_screen(PyObject *self, PyObject *args) {
PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; int arg2 ; - ob::OBScreen *result; + ob::Screen *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"Oi:Openbox_screen",&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBScreen *)(arg1)->screen(arg2); + result = (ob::Screen *)(arg1)->screen(arg2); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBScreen, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Screen, 0); return resultobj; fail: return NULL;@@ -5355,7 +5128,7 @@ static PyObject *_wrap_Openbox_addClient(PyObject *self, PyObject *args) {
PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; Window arg2 ; - ob::OBClient *arg3 = (ob::OBClient *) 0 ; + ob::Client *arg3 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ;@@ -5364,7 +5137,7 @@ if(!PyArg_ParseTuple(args,(char *)"OOO:Openbox_addClient",&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->addClient(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None;@@ -5398,7 +5171,7 @@ static PyObject *_wrap_Openbox_findClient(PyObject *self, PyObject *args) {
PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; Window arg2 ; - ob::OBClient *result; + ob::Client *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ;@@ -5406,9 +5179,9 @@ if(!PyArg_ParseTuple(args,(char *)"OO:Openbox_findClient",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - result = (ob::OBClient *)(arg1)->findClient(arg2); + result = (ob::Client *)(arg1)->findClient(arg2); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBClient, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Client, 0); return resultobj; fail: return NULL;@@ -5418,14 +5191,14 @@
static PyObject *_wrap_Openbox_focusedClient(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; - ob::OBClient *result; + ob::Client *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Openbox_focusedClient",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient *)(arg1)->focusedClient(); + result = (ob::Client *)(arg1)->focusedClient(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBClient, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Client, 0); return resultobj; fail: return NULL;@@ -5435,13 +5208,13 @@
static PyObject *_wrap_Openbox_setFocusedClient(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:Openbox_setFocusedClient",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->setFocusedClient(arg2); Py_INCREF(Py_None); resultobj = Py_None;@@ -5454,14 +5227,14 @@
static PyObject *_wrap_Openbox_focusedScreen(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Openbox *arg1 = (ob::Openbox *) 0 ; - ob::OBScreen *result; + ob::Screen *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Openbox_focusedScreen",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Openbox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBScreen *)(arg1)->focusedScreen(); + result = (ob::Screen *)(arg1)->focusedScreen(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBScreen, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Screen, 0); return resultobj; fail: return NULL;@@ -5549,33 +5322,33 @@ SWIG_TypeClientData(SWIGTYPE_p_ob__Openbox, obj);
Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_OBScreen_client(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_client(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; int arg2 ; - ob::OBClient *result; + ob::Client *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi:OBScreen_client",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient *)ob_OBScreen_client(arg1,arg2); + if(!PyArg_ParseTuple(args,(char *)"Oi:Screen_client",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (ob::Client *)ob_Screen_client(arg1,arg2); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBClient, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Client, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OBScreen_clientCount(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_clientCount(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; int result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_clientCount",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)ob_OBScreen_clientCount((ob::OBScreen const *)arg1); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_clientCount",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)ob_Screen_clientCount((ob::Screen const *)arg1); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -5584,15 +5357,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_number(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_number(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; int result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_number",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)((ob::OBScreen const *)arg1)->number(); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_number",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)((ob::Screen const *)arg1)->number(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -5601,15 +5374,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_managed(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_managed(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_managed",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBScreen const *)arg1)->managed(); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_managed",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Screen const *)arg1)->managed(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -5618,33 +5391,33 @@ return NULL;
} -static PyObject *_wrap_OBScreen_imageControl(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_imageControl(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; - otk::BImageControl *result; + ob::Screen *arg1 = (ob::Screen *) 0 ; + otk::ImageControl *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_imageControl",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (otk::BImageControl *)(arg1)->imageControl(); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_imageControl",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::ImageControl *)(arg1)->imageControl(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__BImageControl, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__ImageControl, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OBScreen_area(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_area(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; otk::Rect *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_area",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Screen_area",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - otk::Rect const &_result_ref = ((ob::OBScreen const *)arg1)->area(); + otk::Rect const &_result_ref = ((ob::Screen const *)arg1)->area(); result = (otk::Rect *) &_result_ref; }@@ -5655,15 +5428,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_style(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_style(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; otk::Style *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_style",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (otk::Style *)((ob::OBScreen const *)arg1)->style(); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_style",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::Style *)((ob::Screen const *)arg1)->style(); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__Style, 0); return resultobj;@@ -5672,15 +5445,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_focuswindow(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_focuswindow(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; Window result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_focuswindow",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (Window)((ob::OBScreen const *)arg1)->focuswindow(); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_focuswindow",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (Window)((ob::Screen const *)arg1)->focuswindow(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -5689,15 +5462,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_desktop(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_desktop(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; long result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_desktop",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (long)((ob::OBScreen const *)arg1)->desktop(); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_desktop",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (long)((ob::Screen const *)arg1)->desktop(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -5706,15 +5479,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_numDesktops(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_numDesktops(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; long result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_numDesktops",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (long)((ob::OBScreen const *)arg1)->numDesktops(); + if(!PyArg_ParseTuple(args,(char *)"O:Screen_numDesktops",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (long)((ob::Screen const *)arg1)->numDesktops(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -5723,13 +5496,13 @@ return NULL;
} -static PyObject *_wrap_OBScreen_updateStrut(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_updateStrut(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_updateStrut",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Screen_updateStrut",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->updateStrut(); Py_INCREF(Py_None); resultobj = Py_None;@@ -5739,13 +5512,13 @@ return NULL;
} -static PyObject *_wrap_OBScreen_manageExisting(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_manageExisting(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBScreen_manageExisting",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Screen_manageExisting",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->manageExisting(); Py_INCREF(Py_None); resultobj = Py_None;@@ -5755,15 +5528,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_manageWindow(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_manageWindow(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; Window arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBScreen_manageWindow",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Screen_manageWindow",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; (arg1)->manageWindow(arg2);@@ -5775,16 +5548,16 @@ return NULL;
} -static PyObject *_wrap_OBScreen_unmanageWindow(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_unmanageWindow(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBScreen_unmanageWindow",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Screen_unmanageWindow",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->unmanageWindow(arg2); Py_INCREF(Py_None); resultobj = Py_None;@@ -5794,20 +5567,20 @@ return NULL;
} -static PyObject *_wrap_OBScreen_restack(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_restack(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; bool arg2 ; - ob::OBClient *arg3 = (ob::OBClient *) 0 ; + ob::Client *arg3 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:OBScreen_restack",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:Screen_restack",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (bool) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->restack(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None;@@ -5817,17 +5590,17 @@ return NULL;
} -static PyObject *_wrap_OBScreen_setDesktopName(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_setDesktopName(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; long arg2 ; std::string *arg3 = 0 ; std::string temp3 ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OlO:OBScreen_setDesktopName",&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OlO:Screen_setDesktopName",&obj0,&arg2,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (PyString_Check(obj2)) { temp3 = std::string(PyString_AsString(obj2));@@ -5845,15 +5618,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_propertyHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_propertyHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; XPropertyEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBScreen_propertyHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Screen_propertyHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XPropertyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -5867,15 +5640,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_clientMessageHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_clientMessageHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; XClientMessageEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBScreen_clientMessageHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Screen_clientMessageHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XClientMessageEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -5889,15 +5662,15 @@ return NULL;
} -static PyObject *_wrap_OBScreen_mapRequestHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Screen_mapRequestHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; + ob::Screen *arg1 = (ob::Screen *) 0 ; XMapRequestEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBScreen_mapRequestHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Screen_mapRequestHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XMapRequestEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -5911,10 +5684,10 @@ return NULL;
} -static PyObject * OBScreen_swigregister(PyObject *self, PyObject *args) { +static PyObject * Screen_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_ob__OBScreen, obj); + SWIG_TypeClientData(SWIGTYPE_p_ob__Screen, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); }@@ -6036,16 +5809,16 @@ SWIG_TypeClientData(SWIGTYPE_p_ob__MwmHints, obj);
Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_OBClient_frame_set(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_frame_set(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; - ob::OBFrame *arg2 = (ob::OBFrame *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; + ob::Frame *arg2 = (ob::Frame *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_frame_set",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBFrame,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_frame_set",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Frame,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; if (arg1) (arg1)->frame = arg2; Py_INCREF(Py_None); resultobj = Py_None;@@ -6055,31 +5828,31 @@ return NULL;
} -static PyObject *_wrap_OBClient_frame_get(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_frame_get(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; - ob::OBFrame *result; + ob::Client *arg1 = (ob::Client *) 0 ; + ob::Frame *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_frame_get",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBFrame *) ((arg1)->frame); + if(!PyArg_ParseTuple(args,(char *)"O:Client_frame_get",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (ob::Frame *) ((arg1)->frame); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBFrame, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Frame, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OBClient_ignore_unmaps_set(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_ignore_unmaps_set(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int arg2 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi:OBClient_ignore_unmaps_set",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"Oi:Client_ignore_unmaps_set",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1) (arg1)->ignore_unmaps = arg2; Py_INCREF(Py_None); resultobj = Py_None;@@ -6089,14 +5862,14 @@ return NULL;
} -static PyObject *_wrap_OBClient_ignore_unmaps_get(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_ignore_unmaps_get(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_ignore_unmaps_get",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_ignore_unmaps_get",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->ignore_unmaps); resultobj = PyInt_FromLong((long)result);@@ -6106,15 +5879,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_screen(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_screen(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_screen",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)((ob::OBClient const *)arg1)->screen(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_screen",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)((ob::Client const *)arg1)->screen(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6123,15 +5896,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_window(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_window(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; Window result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_window",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (Window)((ob::OBClient const *)arg1)->window(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_window",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (Window)((ob::Client const *)arg1)->window(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6140,15 +5913,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_type(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_type(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_type",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)((ob::OBClient const *)arg1)->type(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_type",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)((ob::Client const *)arg1)->type(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6157,15 +5930,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_normal(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_normal(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_normal",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->normal(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_normal",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->normal(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6174,15 +5947,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_desktop(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_desktop(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; long result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_desktop",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (long)((ob::OBClient const *)arg1)->desktop(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_desktop",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (long)((ob::Client const *)arg1)->desktop(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6191,16 +5964,16 @@ return NULL;
} -static PyObject *_wrap_OBClient_title(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_title(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; std::string *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_title",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_title",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - std::string const &_result_ref = ((ob::OBClient const *)arg1)->title(); + std::string const &_result_ref = ((ob::Client const *)arg1)->title(); result = (std::string *) &_result_ref; }@@ -6213,16 +5986,16 @@ return NULL;
} -static PyObject *_wrap_OBClient_iconTitle(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_iconTitle(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; std::string *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_iconTitle",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_iconTitle",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - std::string const &_result_ref = ((ob::OBClient const *)arg1)->iconTitle(); + std::string const &_result_ref = ((ob::Client const *)arg1)->iconTitle(); result = (std::string *) &_result_ref; }@@ -6235,16 +6008,16 @@ return NULL;
} -static PyObject *_wrap_OBClient_appName(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_appName(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; std::string *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_appName",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_appName",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - std::string const &_result_ref = ((ob::OBClient const *)arg1)->appName(); + std::string const &_result_ref = ((ob::Client const *)arg1)->appName(); result = (std::string *) &_result_ref; }@@ -6257,16 +6030,16 @@ return NULL;
} -static PyObject *_wrap_OBClient_appClass(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_appClass(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; std::string *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_appClass",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_appClass",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - std::string const &_result_ref = ((ob::OBClient const *)arg1)->appClass(); + std::string const &_result_ref = ((ob::Client const *)arg1)->appClass(); result = (std::string *) &_result_ref; }@@ -6279,16 +6052,16 @@ return NULL;
} -static PyObject *_wrap_OBClient_role(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_role(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; std::string *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_role",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_role",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - std::string const &_result_ref = ((ob::OBClient const *)arg1)->role(); + std::string const &_result_ref = ((ob::Client const *)arg1)->role(); result = (std::string *) &_result_ref; }@@ -6301,15 +6074,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_canFocus(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_canFocus(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_canFocus",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->canFocus(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_canFocus",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->canFocus(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6318,15 +6091,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_urgent(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_urgent(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_urgent",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->urgent(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_urgent",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->urgent(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6335,15 +6108,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_focusNotify(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_focusNotify(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_focusNotify",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->focusNotify(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_focusNotify",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->focusNotify(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6352,15 +6125,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_shaped(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_shaped(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_shaped",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->shaped(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_shaped",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->shaped(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6369,15 +6142,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_gravity(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_gravity(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_gravity",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)((ob::OBClient const *)arg1)->gravity(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_gravity",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)((ob::Client const *)arg1)->gravity(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6386,15 +6159,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_positionRequested(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_positionRequested(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_positionRequested",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->positionRequested(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_positionRequested",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->positionRequested(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6403,15 +6176,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_decorations(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_decorations(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; - ob::OBClient::DecorationFlags result; + ob::Client *arg1 = (ob::Client *) 0 ; + ob::Client::DecorationFlags result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_decorations",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient::DecorationFlags)((ob::OBClient const *)arg1)->decorations(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_decorations",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (ob::Client::DecorationFlags)((ob::Client const *)arg1)->decorations(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6420,15 +6193,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_funtions(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_funtions(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; - ob::OBClient::FunctionFlags result; + ob::Client *arg1 = (ob::Client *) 0 ; + ob::Client::FunctionFlags result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_funtions",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient::FunctionFlags)((ob::OBClient const *)arg1)->funtions(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_funtions",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (ob::Client::FunctionFlags)((ob::Client const *)arg1)->funtions(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6437,32 +6210,32 @@ return NULL;
} -static PyObject *_wrap_OBClient_transientFor(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_transientFor(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; - ob::OBClient *result; + ob::Client *arg1 = (ob::Client *) 0 ; + ob::Client *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_transientFor",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient *)((ob::OBClient const *)arg1)->transientFor(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_transientFor",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (ob::Client *)((ob::Client const *)arg1)->transientFor(); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBClient, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Client, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_OBClient_modal(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_modal(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_modal",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->modal(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_modal",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->modal(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6471,15 +6244,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_shaded(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_shaded(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_shaded",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->shaded(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_shaded",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->shaded(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6488,15 +6261,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_iconic(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_iconic(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_iconic",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->iconic(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_iconic",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->iconic(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6505,15 +6278,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_maxVert(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_maxVert(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_maxVert",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->maxVert(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_maxVert",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->maxVert(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6522,15 +6295,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_maxHorz(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_maxHorz(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_maxHorz",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->maxHorz(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_maxHorz",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->maxHorz(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6539,15 +6312,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_layer(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_layer(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_layer",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)((ob::OBClient const *)arg1)->layer(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_layer",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)((ob::Client const *)arg1)->layer(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6556,15 +6329,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_toggleClientBorder(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_toggleClientBorder(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_toggleClientBorder",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_toggleClientBorder",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (bool) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; (arg1)->toggleClientBorder(arg2);@@ -6576,16 +6349,16 @@ return NULL;
} -static PyObject *_wrap_OBClient_area(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_area(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; otk::Rect *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_area",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_area",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - otk::Rect const &_result_ref = ((ob::OBClient const *)arg1)->area(); + otk::Rect const &_result_ref = ((ob::Client const *)arg1)->area(); result = (otk::Rect *) &_result_ref; }@@ -6596,16 +6369,16 @@ return NULL;
} -static PyObject *_wrap_OBClient_strut(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_strut(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; otk::Strut *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_strut",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Client_strut",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - otk::Strut const &_result_ref = ((ob::OBClient const *)arg1)->strut(); + otk::Strut const &_result_ref = ((ob::Client const *)arg1)->strut(); result = (otk::Strut *) &_result_ref; }@@ -6616,15 +6389,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_move(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_move(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int arg2 ; int arg3 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oii:OBClient_move",&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"Oii:Client_move",&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->move(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None;@@ -6634,9 +6407,9 @@ return NULL;
} -static PyObject *_wrap_OBClient_resize(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_resize(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; int arg2 ; int arg3 ; int arg4 ;@@ -6644,9 +6417,9 @@ int arg5 = (int) INT_MIN ;
int arg6 = (int) INT_MIN ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oiii|ii:OBClient_resize",&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - (arg1)->resize((ob::OBClient::Corner )arg2,arg3,arg4,arg5,arg6); + if(!PyArg_ParseTuple(args,(char *)"Oiii|ii:Client_resize",&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + (arg1)->resize((ob::Client::Corner )arg2,arg3,arg4,arg5,arg6); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -6655,15 +6428,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_focus(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_focus(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; bool result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_focus",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (bool)((ob::OBClient const *)arg1)->focus(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_focus",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((ob::Client const *)arg1)->focus(); resultobj = PyInt_FromLong((long)result); return resultobj;@@ -6672,14 +6445,14 @@ return NULL;
} -static PyObject *_wrap_OBClient_unfocus(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_unfocus(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBClient_unfocus",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - ((ob::OBClient const *)arg1)->unfocus(); + if(!PyArg_ParseTuple(args,(char *)"O:Client_unfocus",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + ((ob::Client const *)arg1)->unfocus(); Py_INCREF(Py_None); resultobj = Py_None; return resultobj;@@ -6688,15 +6461,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_focusHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_focusHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XFocusChangeEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_focusHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_focusHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XFocusChangeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6710,15 +6483,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_unfocusHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_unfocusHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XFocusChangeEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_unfocusHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_unfocusHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XFocusChangeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6732,15 +6505,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_propertyHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_propertyHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XPropertyEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_propertyHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_propertyHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XPropertyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6754,15 +6527,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_clientMessageHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_clientMessageHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XClientMessageEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_clientMessageHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_clientMessageHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XClientMessageEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6776,15 +6549,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_configureRequestHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_configureRequestHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XConfigureRequestEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_configureRequestHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_configureRequestHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XConfigureRequestEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6798,15 +6571,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_unmapHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_unmapHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XUnmapEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_unmapHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_unmapHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XUnmapEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6820,15 +6593,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_destroyHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_destroyHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XDestroyWindowEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_destroyHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_destroyHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XDestroyWindowEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6842,15 +6615,15 @@ return NULL;
} -static PyObject *_wrap_OBClient_reparentHandler(PyObject *self, PyObject *args) { +static PyObject *_wrap_Client_reparentHandler(PyObject *self, PyObject *args) { PyObject *resultobj; - ob::OBClient *arg1 = (ob::OBClient *) 0 ; + ob::Client *arg1 = (ob::Client *) 0 ; XReparentEvent *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:OBClient_reparentHandler",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Client_reparentHandler",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_XReparentEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;@@ -6864,10 +6637,10 @@ return NULL;
} -static PyObject * OBClient_swigregister(PyObject *self, PyObject *args) { +static PyObject * Client_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_ob__OBClient, obj); + SWIG_TypeClientData(SWIGTYPE_p_ob__Client, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); }@@ -6908,13 +6681,13 @@
static PyObject *_wrap_MouseData_client_set(PyObject *self, PyObject *args) { PyObject *resultobj; ob::MouseData *arg1 = (ob::MouseData *) 0 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:MouseData_client_set",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__MouseData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; if (arg1) (arg1)->client = arg2; Py_INCREF(Py_None); resultobj = Py_None;@@ -6927,14 +6700,14 @@
static PyObject *_wrap_MouseData_client_get(PyObject *self, PyObject *args) { PyObject *resultobj; ob::MouseData *arg1 = (ob::MouseData *) 0 ; - ob::OBClient *result; + ob::Client *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:MouseData_client_get",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__MouseData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient *) ((arg1)->client); + result = (ob::Client *) ((arg1)->client); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBClient, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Client, 0); return resultobj; fail: return NULL;@@ -7395,7 +7168,7 @@
static PyObject *_wrap_new_MouseData__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; int arg1 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; Time arg3 ; unsigned int arg4 ; unsigned int arg5 ;@@ -7414,7 +7187,7 @@ PyObject * obj9 = 0 ;
PyObject * obj10 = 0 ; if(!PyArg_ParseTuple(args,(char *)"iOOOOiiiiOO:new_MouseData",&arg1,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10)) goto fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg3 = (Time) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; arg4 = (unsigned int) PyInt_AsLong(obj3);@@ -7441,7 +7214,7 @@
static PyObject *_wrap_new_MouseData__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; int arg1 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; Time arg3 ; unsigned int arg4 ; unsigned int arg5 ;@@ -7454,7 +7227,7 @@ PyObject * obj3 = 0 ;
PyObject * obj4 = 0 ; if(!PyArg_ParseTuple(args,(char *)"iOOOOii:new_MouseData",&arg1,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg3 = (Time) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; arg4 = (unsigned int) PyInt_AsLong(obj3);@@ -7487,7 +7260,7 @@ }
if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_ob__OBClient, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_ob__Client, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -7532,7 +7305,7 @@ }
if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_ob__OBClient, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_ob__Client, 0) == -1) { _v = 0; PyErr_Clear(); }else {@@ -7651,13 +7424,13 @@
static PyObject *_wrap_EventData_client_set(PyObject *self, PyObject *args) { PyObject *resultobj; ob::EventData *arg1 = (ob::EventData *) 0 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:EventData_client_set",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__EventData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; if (arg1) (arg1)->client = arg2; Py_INCREF(Py_None); resultobj = Py_None;@@ -7670,14 +7443,14 @@
static PyObject *_wrap_EventData_client_get(PyObject *self, PyObject *args) { PyObject *resultobj; ob::EventData *arg1 = (ob::EventData *) 0 ; - ob::OBClient *result; + ob::Client *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:EventData_client_get",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__EventData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient *) ((arg1)->client); + result = (ob::Client *) ((arg1)->client); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBClient, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Client, 0); return resultobj; fail: return NULL;@@ -7758,7 +7531,7 @@
static PyObject *_wrap_new_EventData(PyObject *self, PyObject *args) { PyObject *resultobj; int arg1 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; int arg3 ; unsigned int arg4 ; ob::EventData *result;@@ -7766,7 +7539,7 @@ PyObject * obj1 = 0 ;
PyObject * obj3 = 0 ; if(!PyArg_ParseTuple(args,(char *)"iOiO:new_EventData",&arg1,&obj1,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg4 = (unsigned int) PyInt_AsLong(obj3); if (PyErr_Occurred()) SWIG_fail; result = (ob::EventData *)new ob::EventData(arg1,arg2,(ob::EventAction )arg3,arg4);@@ -7822,13 +7595,13 @@
static PyObject *_wrap_KeyData_client_set(PyObject *self, PyObject *args) { PyObject *resultobj; ob::KeyData *arg1 = (ob::KeyData *) 0 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:KeyData_client_set",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__KeyData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; if (arg1) (arg1)->client = arg2; Py_INCREF(Py_None); resultobj = Py_None;@@ -7841,14 +7614,14 @@
static PyObject *_wrap_KeyData_client_get(PyObject *self, PyObject *args) { PyObject *resultobj; ob::KeyData *arg1 = (ob::KeyData *) 0 ; - ob::OBClient *result; + ob::Client *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:KeyData_client_get",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__KeyData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (ob::OBClient *) ((arg1)->client); + result = (ob::Client *) ((arg1)->client); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__OBClient, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Client, 0); return resultobj; fail: return NULL;@@ -7968,7 +7741,7 @@
static PyObject *_wrap_new_KeyData(PyObject *self, PyObject *args) { PyObject *resultobj; int arg1 ; - ob::OBClient *arg2 = (ob::OBClient *) 0 ; + ob::Client *arg2 = (ob::Client *) 0 ; Time arg3 ; unsigned int arg4 ; unsigned int arg5 ;@@ -7979,7 +7752,7 @@ PyObject * obj3 = 0 ;
PyObject * obj4 = 0 ; if(!PyArg_ParseTuple(args,(char *)"iOOOO:new_KeyData",&arg1,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg3 = (Time) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; arg4 = (unsigned int) PyInt_AsLong(obj3);@@ -8125,26 +7898,26 @@
static PyMethodDef SwigMethods[] = { { (char *)"Openbox_instance", _wrap_Openbox_instance, METH_VARARGS }, - { (char *)"OBDisplay_display", _wrap_OBDisplay_display, METH_VARARGS }, - { (char *)"OBDisplay_initialize", _wrap_OBDisplay_initialize, METH_VARARGS }, - { (char *)"OBDisplay_destroy", _wrap_OBDisplay_destroy, METH_VARARGS }, - { (char *)"OBDisplay_gcCache", _wrap_OBDisplay_gcCache, METH_VARARGS }, - { (char *)"OBDisplay_screenInfo", _wrap_OBDisplay_screenInfo, METH_VARARGS }, - { (char *)"OBDisplay_findScreen", _wrap_OBDisplay_findScreen, METH_VARARGS }, - { (char *)"OBDisplay_xkb", _wrap_OBDisplay_xkb, METH_VARARGS }, - { (char *)"OBDisplay_xkbEventBase", _wrap_OBDisplay_xkbEventBase, METH_VARARGS }, - { (char *)"OBDisplay_shape", _wrap_OBDisplay_shape, METH_VARARGS }, - { (char *)"OBDisplay_shapeEventBase", _wrap_OBDisplay_shapeEventBase, METH_VARARGS }, - { (char *)"OBDisplay_xinerama", _wrap_OBDisplay_xinerama, METH_VARARGS }, - { (char *)"OBDisplay_numLockMask", _wrap_OBDisplay_numLockMask, METH_VARARGS }, - { (char *)"OBDisplay_scrollLockMask", _wrap_OBDisplay_scrollLockMask, METH_VARARGS }, - { (char *)"OBDisplay_grab", _wrap_OBDisplay_grab, METH_VARARGS }, - { (char *)"OBDisplay_ungrab", _wrap_OBDisplay_ungrab, METH_VARARGS }, - { (char *)"OBDisplay_grabButton", _wrap_OBDisplay_grabButton, METH_VARARGS }, - { (char *)"OBDisplay_ungrabButton", _wrap_OBDisplay_ungrabButton, METH_VARARGS }, - { (char *)"OBDisplay_grabKey", _wrap_OBDisplay_grabKey, METH_VARARGS }, - { (char *)"OBDisplay_ungrabKey", _wrap_OBDisplay_ungrabKey, METH_VARARGS }, - { (char *)"OBDisplay_swigregister", OBDisplay_swigregister, METH_VARARGS }, + { (char *)"Display_display", _wrap_Display_display, METH_VARARGS }, + { (char *)"Display_initialize", _wrap_Display_initialize, METH_VARARGS }, + { (char *)"Display_destroy", _wrap_Display_destroy, METH_VARARGS }, + { (char *)"Display_gcCache", _wrap_Display_gcCache, METH_VARARGS }, + { (char *)"Display_screenInfo", _wrap_Display_screenInfo, METH_VARARGS }, + { (char *)"Display_findScreen", _wrap_Display_findScreen, METH_VARARGS }, + { (char *)"Display_xkb", _wrap_Display_xkb, METH_VARARGS }, + { (char *)"Display_xkbEventBase", _wrap_Display_xkbEventBase, METH_VARARGS }, + { (char *)"Display_shape", _wrap_Display_shape, METH_VARARGS }, + { (char *)"Display_shapeEventBase", _wrap_Display_shapeEventBase, METH_VARARGS }, + { (char *)"Display_xinerama", _wrap_Display_xinerama, METH_VARARGS }, + { (char *)"Display_numLockMask", _wrap_Display_numLockMask, METH_VARARGS }, + { (char *)"Display_scrollLockMask", _wrap_Display_scrollLockMask, METH_VARARGS }, + { (char *)"Display_grab", _wrap_Display_grab, METH_VARARGS }, + { (char *)"Display_ungrab", _wrap_Display_ungrab, METH_VARARGS }, + { (char *)"Display_grabButton", _wrap_Display_grabButton, METH_VARARGS }, + { (char *)"Display_ungrabButton", _wrap_Display_ungrabButton, METH_VARARGS }, + { (char *)"Display_grabKey", _wrap_Display_grabKey, METH_VARARGS }, + { (char *)"Display_ungrabKey", _wrap_Display_ungrabKey, METH_VARARGS }, + { (char *)"Display_swigregister", Display_swigregister, METH_VARARGS }, { (char *)"new_Point", _wrap_new_Point, METH_VARARGS }, { (char *)"Point_setX", _wrap_Point_setX, METH_VARARGS }, { (char *)"Point_x", _wrap_Point_x, METH_VARARGS },@@ -8152,13 +7925,13 @@ { (char *)"Point_setY", _wrap_Point_setY, METH_VARARGS },
{ (char *)"Point_y", _wrap_Point_y, METH_VARARGS }, { (char *)"Point_setPoint", _wrap_Point_setPoint, METH_VARARGS }, { (char *)"Point_swigregister", Point_swigregister, METH_VARARGS }, - { (char *)"new_OBProperty", _wrap_new_OBProperty, METH_VARARGS }, - { (char *)"delete_OBProperty", _wrap_delete_OBProperty, METH_VARARGS }, - { (char *)"OBProperty_set", _wrap_OBProperty_set, METH_VARARGS }, - { (char *)"OBProperty_get", _wrap_OBProperty_get, METH_VARARGS }, - { (char *)"OBProperty_erase", _wrap_OBProperty_erase, METH_VARARGS }, - { (char *)"OBProperty_atom", _wrap_OBProperty_atom, METH_VARARGS }, - { (char *)"OBProperty_swigregister", OBProperty_swigregister, METH_VARARGS }, + { (char *)"new_Property", _wrap_new_Property, METH_VARARGS }, + { (char *)"delete_Property", _wrap_delete_Property, METH_VARARGS }, + { (char *)"Property_set", _wrap_Property_set, METH_VARARGS }, + { (char *)"Property_get", _wrap_Property_get, METH_VARARGS }, + { (char *)"Property_erase", _wrap_Property_erase, METH_VARARGS }, + { (char *)"Property_atom", _wrap_Property_atom, METH_VARARGS }, + { (char *)"Property_swigregister", Property_swigregister, METH_VARARGS }, { (char *)"new_Rect", _wrap_new_Rect, METH_VARARGS }, { (char *)"Rect_left", _wrap_Rect_left, METH_VARARGS }, { (char *)"Rect_top", _wrap_Rect_top, METH_VARARGS },@@ -8209,63 +7982,54 @@ { (char *)"Strut_right_set", _wrap_Strut_right_set, METH_VARARGS },
{ (char *)"Strut_right_get", _wrap_Strut_right_get, METH_VARARGS }, { (char *)"new_Strut", _wrap_new_Strut, METH_VARARGS }, { (char *)"Strut_swigregister", Strut_swigregister, METH_VARARGS }, - { (char *)"expandTilde", _wrap_expandTilde, METH_VARARGS }, - { (char *)"bexec", _wrap_bexec, METH_VARARGS }, - { (char *)"textPropertyToString", _wrap_textPropertyToString, METH_VARARGS }, - { (char *)"itostring_unsigned_long", _wrap_itostring_unsigned_long, METH_VARARGS }, - { (char *)"itostring_long", _wrap_itostring_long, METH_VARARGS }, - { (char *)"itostring_unsigned", _wrap_itostring_unsigned, METH_VARARGS }, - { (char *)"itostring", _wrap_itostring, METH_VARARGS }, - { (char *)"putenv", _wrap_putenv, METH_VARARGS }, - { (char *)"basename", _wrap_basename, METH_VARARGS }, - { (char *)"OtkEventHandler_handle", _wrap_OtkEventHandler_handle, METH_VARARGS }, - { (char *)"OtkEventHandler_keyPressHandler", _wrap_OtkEventHandler_keyPressHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_keyReleaseHandler", _wrap_OtkEventHandler_keyReleaseHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_buttonPressHandler", _wrap_OtkEventHandler_buttonPressHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_buttonReleaseHandler", _wrap_OtkEventHandler_buttonReleaseHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_motionHandler", _wrap_OtkEventHandler_motionHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_enterHandler", _wrap_OtkEventHandler_enterHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_leaveHandler", _wrap_OtkEventHandler_leaveHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_focusHandler", _wrap_OtkEventHandler_focusHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_unfocusHandler", _wrap_OtkEventHandler_unfocusHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_exposeHandler", _wrap_OtkEventHandler_exposeHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_graphicsExposeHandler", _wrap_OtkEventHandler_graphicsExposeHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_noExposeEventHandler", _wrap_OtkEventHandler_noExposeEventHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_circulateRequestHandler", _wrap_OtkEventHandler_circulateRequestHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_configureRequestHandler", _wrap_OtkEventHandler_configureRequestHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_mapRequestHandler", _wrap_OtkEventHandler_mapRequestHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_resizeRequestHandler", _wrap_OtkEventHandler_resizeRequestHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_circulateHandler", _wrap_OtkEventHandler_circulateHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_configureHandler", _wrap_OtkEventHandler_configureHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_createHandler", _wrap_OtkEventHandler_createHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_destroyHandler", _wrap_OtkEventHandler_destroyHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_gravityHandler", _wrap_OtkEventHandler_gravityHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_mapHandler", _wrap_OtkEventHandler_mapHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_mappingHandler", _wrap_OtkEventHandler_mappingHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_reparentHandler", _wrap_OtkEventHandler_reparentHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_unmapHandler", _wrap_OtkEventHandler_unmapHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_visibilityHandler", _wrap_OtkEventHandler_visibilityHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_colorMapHandler", _wrap_OtkEventHandler_colorMapHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_propertyHandler", _wrap_OtkEventHandler_propertyHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_selectionClearHandler", _wrap_OtkEventHandler_selectionClearHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_selectionHandler", _wrap_OtkEventHandler_selectionHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_selectionRequestHandler", _wrap_OtkEventHandler_selectionRequestHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_clientMessageHandler", _wrap_OtkEventHandler_clientMessageHandler, METH_VARARGS }, - { (char *)"delete_OtkEventHandler", _wrap_delete_OtkEventHandler, METH_VARARGS }, - { (char *)"OtkEventHandler_swigregister", OtkEventHandler_swigregister, METH_VARARGS }, - { (char *)"new_OtkEventDispatcher", _wrap_new_OtkEventDispatcher, METH_VARARGS }, - { (char *)"delete_OtkEventDispatcher", _wrap_delete_OtkEventDispatcher, METH_VARARGS }, - { (char *)"OtkEventDispatcher_clearAllHandlers", _wrap_OtkEventDispatcher_clearAllHandlers, METH_VARARGS }, - { (char *)"OtkEventDispatcher_registerHandler", _wrap_OtkEventDispatcher_registerHandler, METH_VARARGS }, - { (char *)"OtkEventDispatcher_clearHandler", _wrap_OtkEventDispatcher_clearHandler, METH_VARARGS }, - { (char *)"OtkEventDispatcher_dispatchEvents", _wrap_OtkEventDispatcher_dispatchEvents, METH_VARARGS }, - { (char *)"OtkEventDispatcher_setFallbackHandler", _wrap_OtkEventDispatcher_setFallbackHandler, METH_VARARGS }, - { (char *)"OtkEventDispatcher_getFallbackHandler", _wrap_OtkEventDispatcher_getFallbackHandler, METH_VARARGS }, - { (char *)"OtkEventDispatcher_setMasterHandler", _wrap_OtkEventDispatcher_setMasterHandler, METH_VARARGS }, - { (char *)"OtkEventDispatcher_getMasterHandler", _wrap_OtkEventDispatcher_getMasterHandler, METH_VARARGS }, - { (char *)"OtkEventDispatcher_findHandler", _wrap_OtkEventDispatcher_findHandler, METH_VARARGS }, - { (char *)"OtkEventDispatcher_lastTime", _wrap_OtkEventDispatcher_lastTime, METH_VARARGS }, - { (char *)"OtkEventDispatcher_swigregister", OtkEventDispatcher_swigregister, METH_VARARGS }, + { (char *)"EventHandler_handle", _wrap_EventHandler_handle, METH_VARARGS }, + { (char *)"EventHandler_keyPressHandler", _wrap_EventHandler_keyPressHandler, METH_VARARGS }, + { (char *)"EventHandler_keyReleaseHandler", _wrap_EventHandler_keyReleaseHandler, METH_VARARGS }, + { (char *)"EventHandler_buttonPressHandler", _wrap_EventHandler_buttonPressHandler, METH_VARARGS }, + { (char *)"EventHandler_buttonReleaseHandler", _wrap_EventHandler_buttonReleaseHandler, METH_VARARGS }, + { (char *)"EventHandler_motionHandler", _wrap_EventHandler_motionHandler, METH_VARARGS }, + { (char *)"EventHandler_enterHandler", _wrap_EventHandler_enterHandler, METH_VARARGS }, + { (char *)"EventHandler_leaveHandler", _wrap_EventHandler_leaveHandler, METH_VARARGS }, + { (char *)"EventHandler_focusHandler", _wrap_EventHandler_focusHandler, METH_VARARGS }, + { (char *)"EventHandler_unfocusHandler", _wrap_EventHandler_unfocusHandler, METH_VARARGS }, + { (char *)"EventHandler_exposeHandler", _wrap_EventHandler_exposeHandler, METH_VARARGS }, + { (char *)"EventHandler_graphicsExposeHandler", _wrap_EventHandler_graphicsExposeHandler, METH_VARARGS }, + { (char *)"EventHandler_noExposeEventHandler", _wrap_EventHandler_noExposeEventHandler, METH_VARARGS }, + { (char *)"EventHandler_circulateRequestHandler", _wrap_EventHandler_circulateRequestHandler, METH_VARARGS }, + { (char *)"EventHandler_configureRequestHandler", _wrap_EventHandler_configureRequestHandler, METH_VARARGS }, + { (char *)"EventHandler_mapRequestHandler", _wrap_EventHandler_mapRequestHandler, METH_VARARGS }, + { (char *)"EventHandler_resizeRequestHandler", _wrap_EventHandler_resizeRequestHandler, METH_VARARGS }, + { (char *)"EventHandler_circulateHandler", _wrap_EventHandler_circulateHandler, METH_VARARGS }, + { (char *)"EventHandler_configureHandler", _wrap_EventHandler_configureHandler, METH_VARARGS }, + { (char *)"EventHandler_createHandler", _wrap_EventHandler_createHandler, METH_VARARGS }, + { (char *)"EventHandler_destroyHandler", _wrap_EventHandler_destroyHandler, METH_VARARGS }, + { (char *)"EventHandler_gravityHandler", _wrap_EventHandler_gravityHandler, METH_VARARGS }, + { (char *)"EventHandler_mapHandler", _wrap_EventHandler_mapHandler, METH_VARARGS }, + { (char *)"EventHandler_mappingHandler", _wrap_EventHandler_mappingHandler, METH_VARARGS }, + { (char *)"EventHandler_reparentHandler", _wrap_EventHandler_reparentHandler, METH_VARARGS }, + { (char *)"EventHandler_unmapHandler", _wrap_EventHandler_unmapHandler, METH_VARARGS }, + { (char *)"EventHandler_visibilityHandler", _wrap_EventHandler_visibilityHandler, METH_VARARGS }, + { (char *)"EventHandler_colorMapHandler", _wrap_EventHandler_colorMapHandler, METH_VARARGS }, + { (char *)"EventHandler_propertyHandler", _wrap_EventHandler_propertyHandler, METH_VARARGS }, + { (char *)"EventHandler_selectionClearHandler", _wrap_EventHandler_selectionClearHandler, METH_VARARGS }, + { (char *)"EventHandler_selectionHandler", _wrap_EventHandler_selectionHandler, METH_VARARGS }, + { (char *)"EventHandler_selectionRequestHandler", _wrap_EventHandler_selectionRequestHandler, METH_VARARGS }, + { (char *)"EventHandler_clientMessageHandler", _wrap_EventHandler_clientMessageHandler, METH_VARARGS }, + { (char *)"delete_EventHandler", _wrap_delete_EventHandler, METH_VARARGS }, + { (char *)"EventHandler_swigregister", EventHandler_swigregister, METH_VARARGS }, + { (char *)"new_EventDispatcher", _wrap_new_EventDispatcher, METH_VARARGS }, + { (char *)"delete_EventDispatcher", _wrap_delete_EventDispatcher, METH_VARARGS }, + { (char *)"EventDispatcher_clearAllHandlers", _wrap_EventDispatcher_clearAllHandlers, METH_VARARGS }, + { (char *)"EventDispatcher_registerHandler", _wrap_EventDispatcher_registerHandler, METH_VARARGS }, + { (char *)"EventDispatcher_clearHandler", _wrap_EventDispatcher_clearHandler, METH_VARARGS }, + { (char *)"EventDispatcher_dispatchEvents", _wrap_EventDispatcher_dispatchEvents, METH_VARARGS }, + { (char *)"EventDispatcher_setFallbackHandler", _wrap_EventDispatcher_setFallbackHandler, METH_VARARGS }, + { (char *)"EventDispatcher_getFallbackHandler", _wrap_EventDispatcher_getFallbackHandler, METH_VARARGS }, + { (char *)"EventDispatcher_setMasterHandler", _wrap_EventDispatcher_setMasterHandler, METH_VARARGS }, + { (char *)"EventDispatcher_getMasterHandler", _wrap_EventDispatcher_getMasterHandler, METH_VARARGS }, + { (char *)"EventDispatcher_findHandler", _wrap_EventDispatcher_findHandler, METH_VARARGS }, + { (char *)"EventDispatcher_lastTime", _wrap_EventDispatcher_lastTime, METH_VARARGS }, + { (char *)"EventDispatcher_swigregister", EventDispatcher_swigregister, METH_VARARGS }, { (char *)"Cursors_session_set", _wrap_Cursors_session_set, METH_VARARGS }, { (char *)"Cursors_session_get", _wrap_Cursors_session_get, METH_VARARGS }, { (char *)"Cursors_move_set", _wrap_Cursors_move_set, METH_VARARGS },@@ -8297,26 +8061,26 @@ { (char *)"Openbox_shutdown", _wrap_Openbox_shutdown, METH_VARARGS },
{ (char *)"Openbox_restart", _wrap_Openbox_restart, METH_VARARGS }, { (char *)"Openbox_execute", _wrap_Openbox_execute, METH_VARARGS }, { (char *)"Openbox_swigregister", Openbox_swigregister, METH_VARARGS }, - { (char *)"OBScreen_client", _wrap_OBScreen_client, METH_VARARGS }, - { (char *)"OBScreen_clientCount", _wrap_OBScreen_clientCount, METH_VARARGS }, - { (char *)"OBScreen_number", _wrap_OBScreen_number, METH_VARARGS }, - { (char *)"OBScreen_managed", _wrap_OBScreen_managed, METH_VARARGS }, - { (char *)"OBScreen_imageControl", _wrap_OBScreen_imageControl, METH_VARARGS }, - { (char *)"OBScreen_area", _wrap_OBScreen_area, METH_VARARGS }, - { (char *)"OBScreen_style", _wrap_OBScreen_style, METH_VARARGS }, - { (char *)"OBScreen_focuswindow", _wrap_OBScreen_focuswindow, METH_VARARGS }, - { (char *)"OBScreen_desktop", _wrap_OBScreen_desktop, METH_VARARGS }, - { (char *)"OBScreen_numDesktops", _wrap_OBScreen_numDesktops, METH_VARARGS }, - { (char *)"OBScreen_updateStrut", _wrap_OBScreen_updateStrut, METH_VARARGS }, - { (char *)"OBScreen_manageExisting", _wrap_OBScreen_manageExisting, METH_VARARGS }, - { (char *)"OBScreen_manageWindow", _wrap_OBScreen_manageWindow, METH_VARARGS }, - { (char *)"OBScreen_unmanageWindow", _wrap_OBScreen_unmanageWindow, METH_VARARGS }, - { (char *)"OBScreen_restack", _wrap_OBScreen_restack, METH_VARARGS }, - { (char *)"OBScreen_setDesktopName", _wrap_OBScreen_setDesktopName, METH_VARARGS }, - { (char *)"OBScreen_propertyHandler", _wrap_OBScreen_propertyHandler, METH_VARARGS }, - { (char *)"OBScreen_clientMessageHandler", _wrap_OBScreen_clientMessageHandler, METH_VARARGS }, - { (char *)"OBScreen_mapRequestHandler", _wrap_OBScreen_mapRequestHandler, METH_VARARGS }, - { (char *)"OBScreen_swigregister", OBScreen_swigregister, METH_VARARGS }, + { (char *)"Screen_client", _wrap_Screen_client, METH_VARARGS }, + { (char *)"Screen_clientCount", _wrap_Screen_clientCount, METH_VARARGS }, + { (char *)"Screen_number", _wrap_Screen_number, METH_VARARGS }, + { (char *)"Screen_managed", _wrap_Screen_managed, METH_VARARGS }, + { (char *)"Screen_imageControl", _wrap_Screen_imageControl, METH_VARARGS }, + { (char *)"Screen_area", _wrap_Screen_area, METH_VARARGS }, + { (char *)"Screen_style", _wrap_Screen_style, METH_VARARGS }, + { (char *)"Screen_focuswindow", _wrap_Screen_focuswindow, METH_VARARGS }, + { (char *)"Screen_desktop", _wrap_Screen_desktop, METH_VARARGS }, + { (char *)"Screen_numDesktops", _wrap_Screen_numDesktops, METH_VARARGS }, + { (char *)"Screen_updateStrut", _wrap_Screen_updateStrut, METH_VARARGS }, + { (char *)"Screen_manageExisting", _wrap_Screen_manageExisting, METH_VARARGS }, + { (char *)"Screen_manageWindow", _wrap_Screen_manageWindow, METH_VARARGS }, + { (char *)"Screen_unmanageWindow", _wrap_Screen_unmanageWindow, METH_VARARGS }, + { (char *)"Screen_restack", _wrap_Screen_restack, METH_VARARGS }, + { (char *)"Screen_setDesktopName", _wrap_Screen_setDesktopName, METH_VARARGS }, + { (char *)"Screen_propertyHandler", _wrap_Screen_propertyHandler, METH_VARARGS }, + { (char *)"Screen_clientMessageHandler", _wrap_Screen_clientMessageHandler, METH_VARARGS }, + { (char *)"Screen_mapRequestHandler", _wrap_Screen_mapRequestHandler, METH_VARARGS }, + { (char *)"Screen_swigregister", Screen_swigregister, METH_VARARGS }, { (char *)"MwmHints_flags_set", _wrap_MwmHints_flags_set, METH_VARARGS }, { (char *)"MwmHints_flags_get", _wrap_MwmHints_flags_get, METH_VARARGS }, { (char *)"MwmHints_functions_set", _wrap_MwmHints_functions_set, METH_VARARGS },@@ -8324,51 +8088,51 @@ { (char *)"MwmHints_functions_get", _wrap_MwmHints_functions_get, METH_VARARGS },
{ (char *)"MwmHints_decorations_set", _wrap_MwmHints_decorations_set, METH_VARARGS }, { (char *)"MwmHints_decorations_get", _wrap_MwmHints_decorations_get, METH_VARARGS }, { (char *)"MwmHints_swigregister", MwmHints_swigregister, METH_VARARGS }, - { (char *)"OBClient_frame_set", _wrap_OBClient_frame_set, METH_VARARGS }, - { (char *)"OBClient_frame_get", _wrap_OBClient_frame_get, METH_VARARGS }, - { (char *)"OBClient_ignore_unmaps_set", _wrap_OBClient_ignore_unmaps_set, METH_VARARGS }, - { (char *)"OBClient_ignore_unmaps_get", _wrap_OBClient_ignore_unmaps_get, METH_VARARGS }, - { (char *)"OBClient_screen", _wrap_OBClient_screen, METH_VARARGS }, - { (char *)"OBClient_window", _wrap_OBClient_window, METH_VARARGS }, - { (char *)"OBClient_type", _wrap_OBClient_type, METH_VARARGS }, - { (char *)"OBClient_normal", _wrap_OBClient_normal, METH_VARARGS }, - { (char *)"OBClient_desktop", _wrap_OBClient_desktop, METH_VARARGS }, - { (char *)"OBClient_title", _wrap_OBClient_title, METH_VARARGS }, - { (char *)"OBClient_iconTitle", _wrap_OBClient_iconTitle, METH_VARARGS }, - { (char *)"OBClient_appName", _wrap_OBClient_appName, METH_VARARGS }, - { (char *)"OBClient_appClass", _wrap_OBClient_appClass, METH_VARARGS }, - { (char *)"OBClient_role", _wrap_OBClient_role, METH_VARARGS }, - { (char *)"OBClient_canFocus", _wrap_OBClient_canFocus, METH_VARARGS }, - { (char *)"OBClient_urgent", _wrap_OBClient_urgent, METH_VARARGS }, - { (char *)"OBClient_focusNotify", _wrap_OBClient_focusNotify, METH_VARARGS }, - { (char *)"OBClient_shaped", _wrap_OBClient_shaped, METH_VARARGS }, - { (char *)"OBClient_gravity", _wrap_OBClient_gravity, METH_VARARGS }, - { (char *)"OBClient_positionRequested", _wrap_OBClient_positionRequested, METH_VARARGS }, - { (char *)"OBClient_decorations", _wrap_OBClient_decorations, METH_VARARGS }, - { (char *)"OBClient_funtions", _wrap_OBClient_funtions, METH_VARARGS }, - { (char *)"OBClient_transientFor", _wrap_OBClient_transientFor, METH_VARARGS }, - { (char *)"OBClient_modal", _wrap_OBClient_modal, METH_VARARGS }, - { (char *)"OBClient_shaded", _wrap_OBClient_shaded, METH_VARARGS }, - { (char *)"OBClient_iconic", _wrap_OBClient_iconic, METH_VARARGS }, - { (char *)"OBClient_maxVert", _wrap_OBClient_maxVert, METH_VARARGS }, - { (char *)"OBClient_maxHorz", _wrap_OBClient_maxHorz, METH_VARARGS }, - { (char *)"OBClient_layer", _wrap_OBClient_layer, METH_VARARGS }, - { (char *)"OBClient_toggleClientBorder", _wrap_OBClient_toggleClientBorder, METH_VARARGS }, - { (char *)"OBClient_area", _wrap_OBClient_area, METH_VARARGS }, - { (char *)"OBClient_strut", _wrap_OBClient_strut, METH_VARARGS }, - { (char *)"OBClient_move", _wrap_OBClient_move, METH_VARARGS }, - { (char *)"OBClient_resize", _wrap_OBClient_resize, METH_VARARGS }, - { (char *)"OBClient_focus", _wrap_OBClient_focus, METH_VARARGS }, - { (char *)"OBClient_unfocus", _wrap_OBClient_unfocus, METH_VARARGS }, - { (char *)"OBClient_focusHandler", _wrap_OBClient_focusHandler, METH_VARARGS }, - { (char *)"OBClient_unfocusHandler", _wrap_OBClient_unfocusHandler, METH_VARARGS }, - { (char *)"OBClient_propertyHandler", _wrap_OBClient_propertyHandler, METH_VARARGS }, - { (char *)"OBClient_clientMessageHandler", _wrap_OBClient_clientMessageHandler, METH_VARARGS }, - { (char *)"OBClient_configureRequestHandler", _wrap_OBClient_configureRequestHandler, METH_VARARGS }, - { (char *)"OBClient_unmapHandler", _wrap_OBClient_unmapHandler, METH_VARARGS }, - { (char *)"OBClient_destroyHandler", _wrap_OBClient_destroyHandler, METH_VARARGS }, - { (char *)"OBClient_reparentHandler", _wrap_OBClient_reparentHandler, METH_VARARGS }, - { (char *)"OBClient_swigregister", OBClient_swigregister, METH_VARARGS }, + { (char *)"Client_frame_set", _wrap_Client_frame_set, METH_VARARGS }, + { (char *)"Client_frame_get", _wrap_Client_frame_get, METH_VARARGS }, + { (char *)"Client_ignore_unmaps_set", _wrap_Client_ignore_unmaps_set, METH_VARARGS }, + { (char *)"Client_ignore_unmaps_get", _wrap_Client_ignore_unmaps_get, METH_VARARGS }, + { (char *)"Client_screen", _wrap_Client_screen, METH_VARARGS }, + { (char *)"Client_window", _wrap_Client_window, METH_VARARGS }, + { (char *)"Client_type", _wrap_Client_type, METH_VARARGS }, + { (char *)"Client_normal", _wrap_Client_normal, METH_VARARGS }, + { (char *)"Client_desktop", _wrap_Client_desktop, METH_VARARGS }, + { (char *)"Client_title", _wrap_Client_title, METH_VARARGS }, + { (char *)"Client_iconTitle", _wrap_Client_iconTitle, METH_VARARGS }, + { (char *)"Client_appName", _wrap_Client_appName, METH_VARARGS }, + { (char *)"Client_appClass", _wrap_Client_appClass, METH_VARARGS }, + { (char *)"Client_role", _wrap_Client_role, METH_VARARGS }, + { (char *)"Client_canFocus", _wrap_Client_canFocus, METH_VARARGS }, + { (char *)"Client_urgent", _wrap_Client_urgent, METH_VARARGS }, + { (char *)"Client_focusNotify", _wrap_Client_focusNotify, METH_VARARGS }, + { (char *)"Client_shaped", _wrap_Client_shaped, METH_VARARGS }, + { (char *)"Client_gravity", _wrap_Client_gravity, METH_VARARGS }, + { (char *)"Client_positionRequested", _wrap_Client_positionRequested, METH_VARARGS }, + { (char *)"Client_decorations", _wrap_Client_decorations, METH_VARARGS }, + { (char *)"Client_funtions", _wrap_Client_funtions, METH_VARARGS }, + { (char *)"Client_transientFor", _wrap_Client_transientFor, METH_VARARGS }, + { (char *)"Client_modal", _wrap_Client_modal, METH_VARARGS }, + { (char *)"Client_shaded", _wrap_Client_shaded, METH_VARARGS }, + { (char *)"Client_iconic", _wrap_Client_iconic, METH_VARARGS }, + { (char *)"Client_maxVert", _wrap_Client_maxVert, METH_VARARGS }, + { (char *)"Client_maxHorz", _wrap_Client_maxHorz, METH_VARARGS }, + { (char *)"Client_layer", _wrap_Client_layer, METH_VARARGS }, + { (char *)"Client_toggleClientBorder", _wrap_Client_toggleClientBorder, METH_VARARGS }, + { (char *)"Client_area", _wrap_Client_area, METH_VARARGS }, + { (char *)"Client_strut", _wrap_Client_strut, METH_VARARGS }, + { (char *)"Client_move", _wrap_Client_move, METH_VARARGS }, + { (char *)"Client_resize", _wrap_Client_resize, METH_VARARGS }, + { (char *)"Client_focus", _wrap_Client_focus, METH_VARARGS }, + { (char *)"Client_unfocus", _wrap_Client_unfocus, METH_VARARGS }, + { (char *)"Client_focusHandler", _wrap_Client_focusHandler, METH_VARARGS }, + { (char *)"Client_unfocusHandler", _wrap_Client_unfocusHandler, METH_VARARGS }, + { (char *)"Client_propertyHandler", _wrap_Client_propertyHandler, METH_VARARGS }, + { (char *)"Client_clientMessageHandler", _wrap_Client_clientMessageHandler, METH_VARARGS }, + { (char *)"Client_configureRequestHandler", _wrap_Client_configureRequestHandler, METH_VARARGS }, + { (char *)"Client_unmapHandler", _wrap_Client_unmapHandler, METH_VARARGS }, + { (char *)"Client_destroyHandler", _wrap_Client_destroyHandler, METH_VARARGS }, + { (char *)"Client_reparentHandler", _wrap_Client_reparentHandler, METH_VARARGS }, + { (char *)"Client_swigregister", Client_swigregister, METH_VARARGS }, { (char *)"MouseData_screen_set", _wrap_MouseData_screen_set, METH_VARARGS }, { (char *)"MouseData_screen_get", _wrap_MouseData_screen_get, METH_VARARGS }, { (char *)"MouseData_client_set", _wrap_MouseData_client_set, METH_VARARGS },@@ -8434,29 +8198,29 @@
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static void *_p_ob__OBScreenTo_p_ob__OBWidget(void *x) { - return (void *)((ob::OBWidget *) ((ob::OBScreen *) x)); +static void *_p_ob__ActionsTo_p_otk__EventHandler(void *x) { + return (void *)((otk::EventHandler *) ((ob::Actions *) x)); } -static void *_p_ob__OBClientTo_p_ob__OBWidget(void *x) { - return (void *)((ob::OBWidget *) ((ob::OBClient *) x)); +static void *_p_ob__OpenboxTo_p_otk__EventHandler(void *x) { + return (void *)((otk::EventHandler *) ((ob::Openbox *) x)); } -static void *_p_ob__OBActionsTo_p_otk__OtkEventHandler(void *x) { - return (void *)((otk::OtkEventHandler *) ((ob::OBActions *) x)); +static void *_p_ob__ScreenTo_p_otk__EventHandler(void *x) { + return (void *)((otk::EventHandler *) ((ob::Screen *) x)); } -static void *_p_ob__OpenboxTo_p_otk__OtkEventHandler(void *x) { - return (void *)((otk::OtkEventHandler *) ((ob::Openbox *) x)); +static void *_p_ob__ClientTo_p_otk__EventHandler(void *x) { + return (void *)((otk::EventHandler *) ((ob::Client *) x)); } -static void *_p_ob__OBScreenTo_p_otk__OtkEventHandler(void *x) { - return (void *)((otk::OtkEventHandler *) ((ob::OBScreen *) x)); +static void *_p_ob__OpenboxTo_p_otk__EventDispatcher(void *x) { + return (void *)((otk::EventDispatcher *) ((ob::Openbox *) x)); } -static void *_p_ob__OBClientTo_p_otk__OtkEventHandler(void *x) { - return (void *)((otk::OtkEventHandler *) ((ob::OBClient *) x)); +static void *_p_ob__ScreenTo_p_ob__WidgetBase(void *x) { + return (void *)((ob::WidgetBase *) ((ob::Screen *) x)); } -static void *_p_ob__OpenboxTo_p_otk__OtkEventDispatcher(void *x) { - return (void *)((otk::OtkEventDispatcher *) ((ob::Openbox *) x)); +static void *_p_ob__ClientTo_p_ob__WidgetBase(void *x) { + return (void *)((ob::WidgetBase *) ((ob::Client *) x)); } -static swig_type_info _swigt__p_ob__OBScreen[] = {{"_p_ob__OBScreen", 0, "ob::OBScreen *", 0},{"_p_ob__OBScreen"},{0}}; static swig_type_info _swigt__p_otk__Point[] = {{"_p_otk__Point", 0, "otk::Point *", 0},{"_p_otk__Point"},{0}}; +static swig_type_info _swigt__p_ob__Client[] = {{"_p_ob__Client", 0, "ob::Client *", 0},{"_p_ob__Client"},{0}}; static swig_type_info _swigt__p_XMapEvent[] = {{"_p_XMapEvent", 0, "XMapEvent *", 0},{"_p_XMapEvent"},{0}}; static swig_type_info _swigt__p_XUnmapEvent[] = {{"_p_XUnmapEvent", 0, "XUnmapEvent *", 0},{"_p_XUnmapEvent"},{0}}; static swig_type_info _swigt__p_XColormapEvent[] = {{"_p_XColormapEvent", 0, "XColormapEvent *", 0},{"_p_XColormapEvent"},{0}};@@ -8478,10 +8242,10 @@ static swig_type_info _swigt__p_XVisibilityEvent[] = {{"_p_XVisibilityEvent", 0, "XVisibilityEvent *", 0},{"_p_XVisibilityEvent"},{0}};
static swig_type_info _swigt__p_XPropertyEvent[] = {{"_p_XPropertyEvent", 0, "XPropertyEvent *", 0},{"_p_XPropertyEvent"},{0}}; static swig_type_info _swigt__p_XSelectionRequestEvent[] = {{"_p_XSelectionRequestEvent", 0, "XSelectionRequestEvent *", 0},{"_p_XSelectionRequestEvent"},{0}}; static swig_type_info _swigt__p_ob__Cursors[] = {{"_p_ob__Cursors", 0, "ob::Cursors *", 0},{"_p_ob__Cursors"},{0}}; -static swig_type_info _swigt__p_ob__OBFrame[] = {{"_p_ob__OBFrame", 0, "ob::OBFrame *", 0},{"_p_ob__OBFrame"},{0}}; -static swig_type_info _swigt__p_otk__BImageControl[] = {{"_p_otk__BImageControl", 0, "otk::BImageControl *", 0},{"_p_otk__BImageControl"},{0}}; +static swig_type_info _swigt__p_otk__ImageControl[] = {{"_p_otk__ImageControl", 0, "otk::ImageControl *", 0},{"_p_otk__ImageControl"},{0}}; static swig_type_info _swigt__p_ob__MwmHints[] = {{"_p_ob__MwmHints", 0, "ob::MwmHints *", 0},{"_p_ob__MwmHints"},{0}}; -static swig_type_info _swigt__p_ob__OBWidget[] = {{"_p_ob__OBWidget", 0, "ob::OBWidget *", 0},{"_p_ob__OBWidget"},{"_p_ob__OBScreen", _p_ob__OBScreenTo_p_ob__OBWidget},{"_p_ob__OBClient", _p_ob__OBClientTo_p_ob__OBWidget},{0}}; +static swig_type_info _swigt__p_ob__Screen[] = {{"_p_ob__Screen", 0, "ob::Screen *", 0},{"_p_ob__Screen"},{0}}; +static swig_type_info _swigt__p_ob__Frame[] = {{"_p_ob__Frame", 0, "ob::Frame *", 0},{"_p_ob__Frame"},{0}}; static swig_type_info _swigt__p_ob__KeyData[] = {{"_p_ob__KeyData", 0, "ob::KeyData *", 0},{"_p_ob__KeyData"},{0}}; static swig_type_info _swigt__p_XConfigureEvent[] = {{"_p_XConfigureEvent", 0, "XConfigureEvent *", 0},{"_p_XConfigureEvent"},{0}}; static swig_type_info _swigt__p_XCirculateEvent[] = {{"_p_XCirculateEvent", 0, "XCirculateEvent *", 0},{"_p_XCirculateEvent"},{0}};@@ -8489,26 +8253,25 @@ static swig_type_info _swigt__p_XRectangle[] = {{"_p_XRectangle", 0, "XRectangle *", 0},{"_p_XRectangle"},{0}};
static swig_type_info _swigt__p_std__string[] = {{"_p_std__string", 0, "std::string *", 0},{"_p_std__string"},{0}}; static swig_type_info _swigt__p_XCrossingEvent[] = {{"_p_XCrossingEvent", 0, "XCrossingEvent *", 0},{"_p_XCrossingEvent"},{0}}; static swig_type_info _swigt__p_Display[] = {{"_p_Display", 0, "Display *", 0},{"_p_Display"},{0}}; -static swig_type_info _swigt__p_otk__OBDisplay[] = {{"_p_otk__OBDisplay", 0, "otk::OBDisplay *", 0},{"_p_otk__OBDisplay"},{0}}; +static swig_type_info _swigt__p_otk__Display[] = {{"_p_otk__Display", 0, "otk::Display *", 0},{"_p_otk__Display"},{0}}; static swig_type_info _swigt__p_XMappingEvent[] = {{"_p_XMappingEvent", 0, "XMappingEvent *", 0},{"_p_XMappingEvent"},{0}}; static swig_type_info _swigt__p_otk__Style[] = {{"_p_otk__Style", 0, "otk::Style *", 0},{"_p_otk__Style"},{0}}; -static swig_type_info _swigt__p_otk__OtkEventHandler[] = {{"_p_otk__OtkEventHandler", 0, "otk::OtkEventHandler *", 0},{"_p_ob__OBActions", _p_ob__OBActionsTo_p_otk__OtkEventHandler},{"_p_otk__OtkEventHandler"},{"_p_ob__Openbox", _p_ob__OpenboxTo_p_otk__OtkEventHandler},{"_p_ob__OBScreen", _p_ob__OBScreenTo_p_otk__OtkEventHandler},{"_p_ob__OBClient", _p_ob__OBClientTo_p_otk__OtkEventHandler},{0}}; +static swig_type_info _swigt__p_otk__EventHandler[] = {{"_p_otk__EventHandler", 0, "otk::EventHandler *", 0},{"_p_ob__Client", _p_ob__ClientTo_p_otk__EventHandler},{"_p_ob__Actions", _p_ob__ActionsTo_p_otk__EventHandler},{"_p_otk__EventHandler"},{"_p_ob__Openbox", _p_ob__OpenboxTo_p_otk__EventHandler},{"_p_ob__Screen", _p_ob__ScreenTo_p_otk__EventHandler},{0}}; static swig_type_info _swigt__p_XReparentEvent[] = {{"_p_XReparentEvent", 0, "XReparentEvent *", 0},{"_p_XReparentEvent"},{0}}; -static swig_type_info _swigt__p_otk__OtkEventDispatcher[] = {{"_p_otk__OtkEventDispatcher", 0, "otk::OtkEventDispatcher *", 0},{"_p_otk__OtkEventDispatcher"},{"_p_ob__Openbox", _p_ob__OpenboxTo_p_otk__OtkEventDispatcher},{0}}; -static swig_type_info _swigt__p_otk__BGCCache[] = {{"_p_otk__BGCCache", 0, "otk::BGCCache *", 0},{"_p_otk__BGCCache"},{0}}; -static swig_type_info _swigt__p_ob__OBBindings[] = {{"_p_ob__OBBindings", 0, "ob::OBBindings *", 0},{"_p_ob__OBBindings"},{0}}; +static swig_type_info _swigt__p_otk__EventDispatcher[] = {{"_p_otk__EventDispatcher", 0, "otk::EventDispatcher *", 0},{"_p_otk__EventDispatcher"},{"_p_ob__Openbox", _p_ob__OpenboxTo_p_otk__EventDispatcher},{0}}; +static swig_type_info _swigt__p_otk__GCCache[] = {{"_p_otk__GCCache", 0, "otk::GCCache *", 0},{"_p_otk__GCCache"},{0}}; +static swig_type_info _swigt__p_ob__Bindings[] = {{"_p_ob__Bindings", 0, "ob::Bindings *", 0},{"_p_ob__Bindings"},{0}}; static swig_type_info _swigt__p_ob__Openbox[] = {{"_p_ob__Openbox", 0, "ob::Openbox *", 0},{"_p_ob__Openbox"},{0}}; -static swig_type_info _swigt__p_ob__OBActions[] = {{"_p_ob__OBActions", 0, "ob::OBActions *", 0},{"_p_ob__OBActions"},{0}}; +static swig_type_info _swigt__p_ob__Actions[] = {{"_p_ob__Actions", 0, "ob::Actions *", 0},{"_p_ob__Actions"},{0}}; static swig_type_info _swigt__p_XEvent[] = {{"_p_XEvent", 0, "XEvent *", 0},{"_p_XEvent"},{0}}; -static swig_type_info _swigt__p_XTextProperty[] = {{"_p_XTextProperty", 0, "XTextProperty *", 0},{"_p_XTextProperty"},{0}}; -static swig_type_info _swigt__p_otk__OBProperty[] = {{"_p_otk__OBProperty", 0, "otk::OBProperty *", 0},{"_p_otk__OBProperty"},{0}}; +static swig_type_info _swigt__p_otk__Property[] = {{"_p_otk__Property", 0, "otk::Property *", 0},{"_p_otk__Property"},{0}}; static swig_type_info _swigt__p_PyObject[] = {{"_p_PyObject", 0, "PyObject *", 0},{"_p_PyObject"},{0}}; static swig_type_info _swigt__p_otk__ScreenInfo[] = {{"_p_otk__ScreenInfo", 0, "otk::ScreenInfo *", 0},{"_p_otk__ScreenInfo"},{0}}; -static swig_type_info _swigt__p_ob__OBClient[] = {{"_p_ob__OBClient", 0, "ob::OBClient *", 0},{"_p_ob__OBClient"},{0}}; static swig_type_info _swigt__p_ob__EventData[] = {{"_p_ob__EventData", 0, "ob::EventData *", 0},{"_p_ob__EventData"},{0}}; static swig_type_info _swigt__p_XCreateWindowEvent[] = {{"_p_XCreateWindowEvent", 0, "XCreateWindowEvent *", 0},{"_p_XCreateWindowEvent"},{0}}; static swig_type_info _swigt__p_XDestroyWindowEvent[] = {{"_p_XDestroyWindowEvent", 0, "XDestroyWindowEvent *", 0},{"_p_XDestroyWindowEvent"},{0}}; -static swig_type_info _swigt__p_otk__OBProperty__StringVect[] = {{"_p_otk__OBProperty__StringVect", 0, "otk::OBProperty::StringVect *", 0},{"_p_otk__OBProperty__StringVect"},{0}}; +static swig_type_info _swigt__p_otk__Property__StringVect[] = {{"_p_otk__Property__StringVect", 0, "otk::Property::StringVect *", 0},{"_p_otk__Property__StringVect"},{0}}; +static swig_type_info _swigt__p_ob__WidgetBase[] = {{"_p_ob__WidgetBase", 0, "ob::WidgetBase *", 0},{"_p_ob__WidgetBase"},{"_p_ob__Client", _p_ob__ClientTo_p_ob__WidgetBase},{"_p_ob__Screen", _p_ob__ScreenTo_p_ob__WidgetBase},{0}}; static swig_type_info _swigt__p_XKeyEvent[] = {{"_p_XKeyEvent", 0, "XKeyEvent *", 0},{"_p_XKeyEvent"},{0}}; static swig_type_info _swigt__p_otk__Strut[] = {{"_p_otk__Strut", 0, "otk::Strut *", 0},{"_p_otk__Strut"},{0}}; static swig_type_info _swigt__p_unsigned_long[] = {{"_p_unsigned_long", 0, "unsigned long *", 0},{"_p_unsigned_long"},{0}};@@ -8516,11 +8279,11 @@ static swig_type_info _swigt__p_p_unsigned_long[] = {{"_p_p_unsigned_long", 0, "unsigned long **", 0},{"_p_p_unsigned_long"},{0}};
static swig_type_info _swigt__p_XMotionEvent[] = {{"_p_XMotionEvent", 0, "XMotionEvent *", 0},{"_p_XMotionEvent"},{0}}; static swig_type_info _swigt__p_XButtonEvent[] = {{"_p_XButtonEvent", 0, "XButtonEvent *", 0},{"_p_XButtonEvent"},{0}}; static swig_type_info _swigt__p_XSelectionEvent[] = {{"_p_XSelectionEvent", 0, "XSelectionEvent *", 0},{"_p_XSelectionEvent"},{0}}; -static swig_type_info _swigt__p_otk__OBTimerQueueManager[] = {{"_p_otk__OBTimerQueueManager", 0, "otk::OBTimerQueueManager *", 0},{"_p_otk__OBTimerQueueManager"},{0}}; +static swig_type_info _swigt__p_otk__TimerQueueManager[] = {{"_p_otk__TimerQueueManager", 0, "otk::TimerQueueManager *", 0},{"_p_otk__TimerQueueManager"},{0}}; static swig_type_info *swig_types_initial[] = { -_swigt__p_ob__OBScreen, _swigt__p_otk__Point, +_swigt__p_ob__Client, _swigt__p_XMapEvent, _swigt__p_XUnmapEvent, _swigt__p_XColormapEvent,@@ -8542,10 +8305,10 @@ _swigt__p_XVisibilityEvent,
_swigt__p_XPropertyEvent, _swigt__p_XSelectionRequestEvent, _swigt__p_ob__Cursors, -_swigt__p_ob__OBFrame, -_swigt__p_otk__BImageControl, +_swigt__p_otk__ImageControl, _swigt__p_ob__MwmHints, -_swigt__p_ob__OBWidget, +_swigt__p_ob__Screen, +_swigt__p_ob__Frame, _swigt__p_ob__KeyData, _swigt__p_XConfigureEvent, _swigt__p_XCirculateEvent,@@ -8553,26 +8316,25 @@ _swigt__p_XRectangle,
_swigt__p_std__string, _swigt__p_XCrossingEvent, _swigt__p_Display, -_swigt__p_otk__OBDisplay, +_swigt__p_otk__Display, _swigt__p_XMappingEvent, _swigt__p_otk__Style, -_swigt__p_otk__OtkEventHandler, +_swigt__p_otk__EventHandler, _swigt__p_XReparentEvent, -_swigt__p_otk__OtkEventDispatcher, -_swigt__p_otk__BGCCache, -_swigt__p_ob__OBBindings, +_swigt__p_otk__EventDispatcher, +_swigt__p_otk__GCCache, +_swigt__p_ob__Bindings, _swigt__p_ob__Openbox, -_swigt__p_ob__OBActions, +_swigt__p_ob__Actions, _swigt__p_XEvent, -_swigt__p_XTextProperty, -_swigt__p_otk__OBProperty, +_swigt__p_otk__Property, _swigt__p_PyObject, _swigt__p_otk__ScreenInfo, -_swigt__p_ob__OBClient, _swigt__p_ob__EventData, _swigt__p_XCreateWindowEvent, _swigt__p_XDestroyWindowEvent, -_swigt__p_otk__OBProperty__StringVect, +_swigt__p_otk__Property__StringVect, +_swigt__p_ob__WidgetBase, _swigt__p_XKeyEvent, _swigt__p_otk__Strut, _swigt__p_unsigned_long,@@ -8580,7 +8342,7 @@ _swigt__p_p_unsigned_long,
_swigt__p_XMotionEvent, _swigt__p_XButtonEvent, _swigt__p_XSelectionEvent, -_swigt__p_otk__OBTimerQueueManager, +_swigt__p_otk__TimerQueueManager, 0 };@@ -8588,157 +8350,157 @@
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"OBProperty_Atom_Cardinal", (long) otk::OBProperty::Atom_Cardinal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_Atom_Window", (long) otk::OBProperty::Atom_Window, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_Atom_Pixmap", (long) otk::OBProperty::Atom_Pixmap, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_Atom_Atom", (long) otk::OBProperty::Atom_Atom, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_Atom_String", (long) otk::OBProperty::Atom_String, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_Atom_Utf8", (long) otk::OBProperty::Atom_Utf8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_openbox_pid", (long) otk::OBProperty::openbox_pid, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_colormap_windows", (long) otk::OBProperty::wm_colormap_windows, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_protocols", (long) otk::OBProperty::wm_protocols, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_state", (long) otk::OBProperty::wm_state, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_delete_window", (long) otk::OBProperty::wm_delete_window, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_take_focus", (long) otk::OBProperty::wm_take_focus, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_change_state", (long) otk::OBProperty::wm_change_state, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_name", (long) otk::OBProperty::wm_name, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_icon_name", (long) otk::OBProperty::wm_icon_name, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_class", (long) otk::OBProperty::wm_class, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_wm_window_role", (long) otk::OBProperty::wm_window_role, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_motif_wm_hints", (long) otk::OBProperty::motif_wm_hints, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_attributes", (long) otk::OBProperty::blackbox_attributes, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_change_attributes", (long) otk::OBProperty::blackbox_change_attributes, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_hints", (long) otk::OBProperty::blackbox_hints, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_structure_messages", (long) otk::OBProperty::blackbox_structure_messages, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_startup", (long) otk::OBProperty::blackbox_notify_startup, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_window_add", (long) otk::OBProperty::blackbox_notify_window_add, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_window_del", (long) otk::OBProperty::blackbox_notify_window_del, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_window_focus", (long) otk::OBProperty::blackbox_notify_window_focus, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_current_workspace", (long) otk::OBProperty::blackbox_notify_current_workspace, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_workspace_count", (long) otk::OBProperty::blackbox_notify_workspace_count, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_window_raise", (long) otk::OBProperty::blackbox_notify_window_raise, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_notify_window_lower", (long) otk::OBProperty::blackbox_notify_window_lower, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_change_workspace", (long) otk::OBProperty::blackbox_change_workspace, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_change_window_focus", (long) otk::OBProperty::blackbox_change_window_focus, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_blackbox_cycle_window_focus", (long) otk::OBProperty::blackbox_cycle_window_focus, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_openbox_show_root_menu", (long) otk::OBProperty::openbox_show_root_menu, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_openbox_show_workspace_menu", (long) otk::OBProperty::openbox_show_workspace_menu, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_supported", (long) otk::OBProperty::net_supported, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_client_list", (long) otk::OBProperty::net_client_list, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_client_list_stacking", (long) otk::OBProperty::net_client_list_stacking, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_number_of_desktops", (long) otk::OBProperty::net_number_of_desktops, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_desktop_geometry", (long) otk::OBProperty::net_desktop_geometry, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_desktop_viewport", (long) otk::OBProperty::net_desktop_viewport, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_current_desktop", (long) otk::OBProperty::net_current_desktop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_desktop_names", (long) otk::OBProperty::net_desktop_names, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_active_window", (long) otk::OBProperty::net_active_window, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_workarea", (long) otk::OBProperty::net_workarea, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_supporting_wm_check", (long) otk::OBProperty::net_supporting_wm_check, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_close_window", (long) otk::OBProperty::net_close_window, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_moveresize", (long) otk::OBProperty::net_wm_moveresize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_name", (long) otk::OBProperty::net_wm_name, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_visible_name", (long) otk::OBProperty::net_wm_visible_name, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_icon_name", (long) otk::OBProperty::net_wm_icon_name, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_visible_icon_name", (long) otk::OBProperty::net_wm_visible_icon_name, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_desktop", (long) otk::OBProperty::net_wm_desktop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type", (long) otk::OBProperty::net_wm_window_type, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state", (long) otk::OBProperty::net_wm_state, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_strut", (long) otk::OBProperty::net_wm_strut, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_allowed_actions", (long) otk::OBProperty::net_wm_allowed_actions, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_desktop", (long) otk::OBProperty::net_wm_window_type_desktop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_dock", (long) otk::OBProperty::net_wm_window_type_dock, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_toolbar", (long) otk::OBProperty::net_wm_window_type_toolbar, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_menu", (long) otk::OBProperty::net_wm_window_type_menu, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_utility", (long) otk::OBProperty::net_wm_window_type_utility, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_splash", (long) otk::OBProperty::net_wm_window_type_splash, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_dialog", (long) otk::OBProperty::net_wm_window_type_dialog, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_window_type_normal", (long) otk::OBProperty::net_wm_window_type_normal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_moveresize_size_topleft", (long) otk::OBProperty::net_wm_moveresize_size_topleft, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_moveresize_size_topright", (long) otk::OBProperty::net_wm_moveresize_size_topright, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_moveresize_size_bottomleft", (long) otk::OBProperty::net_wm_moveresize_size_bottomleft, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_moveresize_size_bottomright", (long) otk::OBProperty::net_wm_moveresize_size_bottomright, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_moveresize_move", (long) otk::OBProperty::net_wm_moveresize_move, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_action_move", (long) otk::OBProperty::net_wm_action_move, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_action_resize", (long) otk::OBProperty::net_wm_action_resize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_action_shade", (long) otk::OBProperty::net_wm_action_shade, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_action_maximize_horz", (long) otk::OBProperty::net_wm_action_maximize_horz, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_action_maximize_vert", (long) otk::OBProperty::net_wm_action_maximize_vert, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_action_change_desktop", (long) otk::OBProperty::net_wm_action_change_desktop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_action_close", (long) otk::OBProperty::net_wm_action_close, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_modal", (long) otk::OBProperty::net_wm_state_modal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_sticky", (long) otk::OBProperty::net_wm_state_sticky, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_maximized_vert", (long) otk::OBProperty::net_wm_state_maximized_vert, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_maximized_horz", (long) otk::OBProperty::net_wm_state_maximized_horz, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_shaded", (long) otk::OBProperty::net_wm_state_shaded, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_skip_taskbar", (long) otk::OBProperty::net_wm_state_skip_taskbar, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_skip_pager", (long) otk::OBProperty::net_wm_state_skip_pager, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_hidden", (long) otk::OBProperty::net_wm_state_hidden, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_fullscreen", (long) otk::OBProperty::net_wm_state_fullscreen, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_above", (long) otk::OBProperty::net_wm_state_above, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_net_wm_state_below", (long) otk::OBProperty::net_wm_state_below, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_kde_net_system_tray_windows", (long) otk::OBProperty::kde_net_system_tray_windows, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_kde_net_wm_system_tray_window_for", (long) otk::OBProperty::kde_net_wm_system_tray_window_for, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_kde_net_wm_window_type_override", (long) otk::OBProperty::kde_net_wm_window_type_override, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_NUM_ATOMS", (long) otk::OBProperty::NUM_ATOMS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_ascii", (long) otk::OBProperty::ascii, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_utf8", (long) otk::OBProperty::utf8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBProperty_NUM_STRING_TYPE", (long) otk::OBProperty::NUM_STRING_TYPE, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_Atom_Cardinal", (long) otk::Property::Atom_Cardinal, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_Atom_Window", (long) otk::Property::Atom_Window, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_Atom_Pixmap", (long) otk::Property::Atom_Pixmap, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_Atom_Atom", (long) otk::Property::Atom_Atom, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_Atom_String", (long) otk::Property::Atom_String, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_Atom_Utf8", (long) otk::Property::Atom_Utf8, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_openbox_pid", (long) otk::Property::openbox_pid, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_colormap_windows", (long) otk::Property::wm_colormap_windows, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_protocols", (long) otk::Property::wm_protocols, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_state", (long) otk::Property::wm_state, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_delete_window", (long) otk::Property::wm_delete_window, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_take_focus", (long) otk::Property::wm_take_focus, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_change_state", (long) otk::Property::wm_change_state, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_name", (long) otk::Property::wm_name, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_icon_name", (long) otk::Property::wm_icon_name, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_class", (long) otk::Property::wm_class, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_wm_window_role", (long) otk::Property::wm_window_role, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_motif_wm_hints", (long) otk::Property::motif_wm_hints, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_attributes", (long) otk::Property::blackbox_attributes, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_change_attributes", (long) otk::Property::blackbox_change_attributes, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_hints", (long) otk::Property::blackbox_hints, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_structure_messages", (long) otk::Property::blackbox_structure_messages, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_startup", (long) otk::Property::blackbox_notify_startup, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_window_add", (long) otk::Property::blackbox_notify_window_add, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_window_del", (long) otk::Property::blackbox_notify_window_del, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_window_focus", (long) otk::Property::blackbox_notify_window_focus, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_current_workspace", (long) otk::Property::blackbox_notify_current_workspace, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_workspace_count", (long) otk::Property::blackbox_notify_workspace_count, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_window_raise", (long) otk::Property::blackbox_notify_window_raise, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_notify_window_lower", (long) otk::Property::blackbox_notify_window_lower, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_change_workspace", (long) otk::Property::blackbox_change_workspace, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_change_window_focus", (long) otk::Property::blackbox_change_window_focus, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_blackbox_cycle_window_focus", (long) otk::Property::blackbox_cycle_window_focus, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_openbox_show_root_menu", (long) otk::Property::openbox_show_root_menu, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_openbox_show_workspace_menu", (long) otk::Property::openbox_show_workspace_menu, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_supported", (long) otk::Property::net_supported, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_client_list", (long) otk::Property::net_client_list, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_client_list_stacking", (long) otk::Property::net_client_list_stacking, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_number_of_desktops", (long) otk::Property::net_number_of_desktops, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_desktop_geometry", (long) otk::Property::net_desktop_geometry, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_desktop_viewport", (long) otk::Property::net_desktop_viewport, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_current_desktop", (long) otk::Property::net_current_desktop, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_desktop_names", (long) otk::Property::net_desktop_names, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_active_window", (long) otk::Property::net_active_window, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_workarea", (long) otk::Property::net_workarea, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_supporting_wm_check", (long) otk::Property::net_supporting_wm_check, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_close_window", (long) otk::Property::net_close_window, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_moveresize", (long) otk::Property::net_wm_moveresize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_name", (long) otk::Property::net_wm_name, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_visible_name", (long) otk::Property::net_wm_visible_name, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_icon_name", (long) otk::Property::net_wm_icon_name, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_visible_icon_name", (long) otk::Property::net_wm_visible_icon_name, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_desktop", (long) otk::Property::net_wm_desktop, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type", (long) otk::Property::net_wm_window_type, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state", (long) otk::Property::net_wm_state, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_strut", (long) otk::Property::net_wm_strut, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_allowed_actions", (long) otk::Property::net_wm_allowed_actions, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_desktop", (long) otk::Property::net_wm_window_type_desktop, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_dock", (long) otk::Property::net_wm_window_type_dock, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_toolbar", (long) otk::Property::net_wm_window_type_toolbar, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_menu", (long) otk::Property::net_wm_window_type_menu, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_utility", (long) otk::Property::net_wm_window_type_utility, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_splash", (long) otk::Property::net_wm_window_type_splash, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_dialog", (long) otk::Property::net_wm_window_type_dialog, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_window_type_normal", (long) otk::Property::net_wm_window_type_normal, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_moveresize_size_topleft", (long) otk::Property::net_wm_moveresize_size_topleft, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_moveresize_size_topright", (long) otk::Property::net_wm_moveresize_size_topright, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_moveresize_size_bottomleft", (long) otk::Property::net_wm_moveresize_size_bottomleft, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_moveresize_size_bottomright", (long) otk::Property::net_wm_moveresize_size_bottomright, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_moveresize_move", (long) otk::Property::net_wm_moveresize_move, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_action_move", (long) otk::Property::net_wm_action_move, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_action_resize", (long) otk::Property::net_wm_action_resize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_action_shade", (long) otk::Property::net_wm_action_shade, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_action_maximize_horz", (long) otk::Property::net_wm_action_maximize_horz, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_action_maximize_vert", (long) otk::Property::net_wm_action_maximize_vert, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_action_change_desktop", (long) otk::Property::net_wm_action_change_desktop, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_action_close", (long) otk::Property::net_wm_action_close, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_modal", (long) otk::Property::net_wm_state_modal, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_sticky", (long) otk::Property::net_wm_state_sticky, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_maximized_vert", (long) otk::Property::net_wm_state_maximized_vert, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_maximized_horz", (long) otk::Property::net_wm_state_maximized_horz, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_shaded", (long) otk::Property::net_wm_state_shaded, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_skip_taskbar", (long) otk::Property::net_wm_state_skip_taskbar, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_skip_pager", (long) otk::Property::net_wm_state_skip_pager, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_hidden", (long) otk::Property::net_wm_state_hidden, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_fullscreen", (long) otk::Property::net_wm_state_fullscreen, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_above", (long) otk::Property::net_wm_state_above, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_net_wm_state_below", (long) otk::Property::net_wm_state_below, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_kde_net_system_tray_windows", (long) otk::Property::kde_net_system_tray_windows, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_kde_net_wm_system_tray_window_for", (long) otk::Property::kde_net_wm_system_tray_window_for, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_kde_net_wm_window_type_override", (long) otk::Property::kde_net_wm_window_type_override, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_NUM_ATOMS", (long) otk::Property::NUM_ATOMS, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_ascii", (long) otk::Property::ascii, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_utf8", (long) otk::Property::utf8, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Property_NUM_STRING_TYPE", (long) otk::Property::NUM_STRING_TYPE, 0, 0, 0}, { SWIG_PY_INT, (char *)"Openbox_State_Starting", (long) ob::Openbox::State_Starting, 0, 0, 0}, { SWIG_PY_INT, (char *)"Openbox_State_Normal", (long) ob::Openbox::State_Normal, 0, 0, 0}, { SWIG_PY_INT, (char *)"Openbox_State_Exiting", (long) ob::Openbox::State_Exiting, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBScreen_event_mask", (long) ob::OBScreen::event_mask, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Screen_event_mask", (long) ob::Screen::event_mask, 0, 0, 0}, { SWIG_PY_INT, (char *)"MwmHints_elements", (long) ob::MwmHints::elements, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Icon", (long) ob::OBClient::Layer_Icon, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Desktop", (long) ob::OBClient::Layer_Desktop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Below", (long) ob::OBClient::Layer_Below, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Normal", (long) ob::OBClient::Layer_Normal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Above", (long) ob::OBClient::Layer_Above, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Top", (long) ob::OBClient::Layer_Top, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Fullscreen", (long) ob::OBClient::Layer_Fullscreen, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Layer_Internal", (long) ob::OBClient::Layer_Internal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_NUM_LAYERS", (long) ob::OBClient::NUM_LAYERS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_TopLeft", (long) ob::OBClient::TopLeft, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_TopRight", (long) ob::OBClient::TopRight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_BottomLeft", (long) ob::OBClient::BottomLeft, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_BottomRight", (long) ob::OBClient::BottomRight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Desktop", (long) ob::OBClient::Type_Desktop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Dock", (long) ob::OBClient::Type_Dock, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Toolbar", (long) ob::OBClient::Type_Toolbar, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Menu", (long) ob::OBClient::Type_Menu, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Utility", (long) ob::OBClient::Type_Utility, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Splash", (long) ob::OBClient::Type_Splash, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Dialog", (long) ob::OBClient::Type_Dialog, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Type_Normal", (long) ob::OBClient::Type_Normal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmFlag_Functions", (long) ob::OBClient::MwmFlag_Functions, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmFlag_Decorations", (long) ob::OBClient::MwmFlag_Decorations, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmFunc_All", (long) ob::OBClient::MwmFunc_All, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmFunc_Resize", (long) ob::OBClient::MwmFunc_Resize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmFunc_Move", (long) ob::OBClient::MwmFunc_Move, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmFunc_Iconify", (long) ob::OBClient::MwmFunc_Iconify, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmFunc_Maximize", (long) ob::OBClient::MwmFunc_Maximize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmDecor_All", (long) ob::OBClient::MwmDecor_All, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmDecor_Border", (long) ob::OBClient::MwmDecor_Border, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmDecor_Handle", (long) ob::OBClient::MwmDecor_Handle, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmDecor_Title", (long) ob::OBClient::MwmDecor_Title, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmDecor_Iconify", (long) ob::OBClient::MwmDecor_Iconify, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_MwmDecor_Maximize", (long) ob::OBClient::MwmDecor_Maximize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Func_Resize", (long) ob::OBClient::Func_Resize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Func_Move", (long) ob::OBClient::Func_Move, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Func_Iconify", (long) ob::OBClient::Func_Iconify, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Func_Maximize", (long) ob::OBClient::Func_Maximize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Func_Close", (long) ob::OBClient::Func_Close, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Decor_Titlebar", (long) ob::OBClient::Decor_Titlebar, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Decor_Handle", (long) ob::OBClient::Decor_Handle, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Decor_Border", (long) ob::OBClient::Decor_Border, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Decor_Iconify", (long) ob::OBClient::Decor_Iconify, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Decor_Maximize", (long) ob::OBClient::Decor_Maximize, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Decor_Sticky", (long) ob::OBClient::Decor_Sticky, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_Decor_Close", (long) ob::OBClient::Decor_Close, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_State_Remove", (long) ob::OBClient::State_Remove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_State_Add", (long) ob::OBClient::State_Add, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_State_Toggle", (long) ob::OBClient::State_Toggle, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_event_mask", (long) ob::OBClient::event_mask, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OBClient_no_propagate_mask", (long) ob::OBClient::no_propagate_mask, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Icon", (long) ob::Client::Layer_Icon, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Desktop", (long) ob::Client::Layer_Desktop, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Below", (long) ob::Client::Layer_Below, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Normal", (long) ob::Client::Layer_Normal, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Above", (long) ob::Client::Layer_Above, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Top", (long) ob::Client::Layer_Top, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Fullscreen", (long) ob::Client::Layer_Fullscreen, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Layer_Internal", (long) ob::Client::Layer_Internal, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_NUM_LAYERS", (long) ob::Client::NUM_LAYERS, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_TopLeft", (long) ob::Client::TopLeft, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_TopRight", (long) ob::Client::TopRight, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_BottomLeft", (long) ob::Client::BottomLeft, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_BottomRight", (long) ob::Client::BottomRight, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Desktop", (long) ob::Client::Type_Desktop, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Dock", (long) ob::Client::Type_Dock, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Toolbar", (long) ob::Client::Type_Toolbar, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Menu", (long) ob::Client::Type_Menu, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Utility", (long) ob::Client::Type_Utility, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Splash", (long) ob::Client::Type_Splash, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Dialog", (long) ob::Client::Type_Dialog, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Type_Normal", (long) ob::Client::Type_Normal, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmFlag_Functions", (long) ob::Client::MwmFlag_Functions, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmFlag_Decorations", (long) ob::Client::MwmFlag_Decorations, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmFunc_All", (long) ob::Client::MwmFunc_All, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmFunc_Resize", (long) ob::Client::MwmFunc_Resize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmFunc_Move", (long) ob::Client::MwmFunc_Move, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmFunc_Iconify", (long) ob::Client::MwmFunc_Iconify, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmFunc_Maximize", (long) ob::Client::MwmFunc_Maximize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmDecor_All", (long) ob::Client::MwmDecor_All, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmDecor_Border", (long) ob::Client::MwmDecor_Border, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmDecor_Handle", (long) ob::Client::MwmDecor_Handle, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmDecor_Title", (long) ob::Client::MwmDecor_Title, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmDecor_Iconify", (long) ob::Client::MwmDecor_Iconify, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_MwmDecor_Maximize", (long) ob::Client::MwmDecor_Maximize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Func_Resize", (long) ob::Client::Func_Resize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Func_Move", (long) ob::Client::Func_Move, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Func_Iconify", (long) ob::Client::Func_Iconify, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Func_Maximize", (long) ob::Client::Func_Maximize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Func_Close", (long) ob::Client::Func_Close, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Decor_Titlebar", (long) ob::Client::Decor_Titlebar, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Decor_Handle", (long) ob::Client::Decor_Handle, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Decor_Border", (long) ob::Client::Decor_Border, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Decor_Iconify", (long) ob::Client::Decor_Iconify, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Decor_Maximize", (long) ob::Client::Decor_Maximize, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Decor_Sticky", (long) ob::Client::Decor_Sticky, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_Decor_Close", (long) ob::Client::Decor_Close, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_State_Remove", (long) ob::Client::State_Remove, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_State_Add", (long) ob::Client::State_Add, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_State_Toggle", (long) ob::Client::State_Toggle, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_event_mask", (long) ob::Client::event_mask, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"Client_no_propagate_mask", (long) ob::Client::no_propagate_mask, 0, 0, 0}, { SWIG_PY_INT, (char *)"MC_Frame", (long) ob::MC_Frame, 0, 0, 0}, { SWIG_PY_INT, (char *)"MC_Titlebar", (long) ob::MC_Titlebar, 0, 0, 0}, { SWIG_PY_INT, (char *)"MC_Handle", (long) ob::MC_Handle, 0, 0, 0},@@ -9138,7 +8900,5 @@ typeinit = 1;
} SWIG_InstallConstants(d,swig_const_table); - PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); - SWIG_addvarlink(SWIG_globals,(char*)"BSENTINEL",_wrap_BSENTINEL_get, _wrap_BSENTINEL_set); }
M
src/python.cc
→
src/python.cc
@@ -133,7 +133,7 @@ PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list.");
return NULL; } - ob::OBBindings::StringVect vectkeylist; + ob::Bindings::StringVect vectkeylist; for (int i = 0, end = PyList_Size(keylist); i < end; ++i) { PyObject *str = PyList_GetItem(keylist, i); if (!PyString_Check(str)) {@@ -163,7 +163,7 @@ PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
return NULL; } - ob::OBBindings::StringVect vectkeylist; + ob::Bindings::StringVect vectkeylist; for (int i = 0, end = PyList_Size(keylist); i < end; ++i) { PyObject *str = PyList_GetItem(keylist, i); if (!PyString_Check(str)) {@@ -195,9 +195,9 @@ PyObject *send_client_msg(Window target, int type, Window about,
long data, long data1, long data2, long data3, long data4) { - if (type < 0 || type >= otk::OBProperty::NUM_ATOMS) { + if (type < 0 || type >= otk::Property::NUM_ATOMS) { PyErr_SetString(PyExc_TypeError, - "Invalid atom type. Must be from otk::OBProperty::Atoms"); + "Invalid atom type. Must be from otk::Property::Atoms"); return NULL; }@@ -205,7 +205,7 @@ XEvent e;
e.xclient.type = ClientMessage; e.xclient.format = 32; e.xclient.message_type = - Openbox::instance->property()->atom((otk::OBProperty::Atoms)type); + Openbox::instance->property()->atom((otk::Property::Atoms)type); e.xclient.window = about; e.xclient.data.l[0] = data; e.xclient.data.l[1] = data1;@@ -213,7 +213,7 @@ e.xclient.data.l[2] = data2;
e.xclient.data.l[3] = data3; e.xclient.data.l[4] = data4; - XSendEvent(otk::OBDisplay::display, target, false, + XSendEvent(otk::Display::display, target, false, SubstructureRedirectMask | SubstructureNotifyMask, &e); Py_INCREF(Py_None); return Py_None;
M
src/python.hh
→
src/python.hh
@@ -21,7 +21,7 @@ #include <vector>
namespace ob { -class OBClient; +class Client; enum MouseContext { MC_Frame,@@ -68,7 +68,7 @@
class MouseData { public: int screen; - OBClient *client; + Client *client; Time time; unsigned int state; unsigned int button;@@ -83,7 +83,7 @@ int press_clienty;
int press_clientwidth; int press_clientheight; - MouseData(int screen, OBClient *client, Time time, unsigned int state, + MouseData(int screen, Client *client, Time time, unsigned int state, unsigned int button, MouseContext context, MouseAction action, int xroot, int yroot, const otk::Point &initpos, const otk::Rect &initarea) {@@ -103,7 +103,7 @@ this->press_clienty = initarea.y();
this->press_clientwidth = initarea.width(); this->press_clientheight = initarea.height(); } - MouseData(int screen, OBClient *client, Time time, unsigned int state, + MouseData(int screen, Client *client, Time time, unsigned int state, unsigned int button, MouseContext context, MouseAction action) { this->screen = screen; this->client = client;@@ -126,11 +126,11 @@
class EventData { public: int screen; - OBClient *client; + Client *client; unsigned int state; EventAction action; - EventData(int screen, OBClient *client, EventAction action, + EventData(int screen, Client *client, EventAction action, unsigned int state) { this->screen = screen; this->client = client;@@ -142,18 +142,18 @@
class KeyData { public: int screen; - OBClient *client; + Client *client; Time time; unsigned int state; std::string key; - KeyData(int screen, OBClient *client, Time time, unsigned int state, + KeyData(int screen, Client *client, Time time, unsigned int state, unsigned int key) { this->screen = screen; this->client = client; this->time = time; this->state = state; - this->key = XKeysymToString(XKeycodeToKeysym(otk::OBDisplay::display, + this->key = XKeysymToString(XKeycodeToKeysym(otk::Display::display, key, 0)); } };
M
src/screen.cc
→
src/screen.cc
@@ -45,18 +45,18 @@
namespace ob { -OBScreen::OBScreen(int screen) - : OBWidget(OBWidget::Type_Root), +Screen::Screen(int screen) + : WidgetBase(WidgetBase::Type_Root), _number(screen) { - assert(screen >= 0); assert(screen < ScreenCount(otk::OBDisplay::display)); - _info = otk::OBDisplay::screenInfo(screen); + assert(screen >= 0); assert(screen < ScreenCount(otk::Display::display)); + _info = otk::Display::screenInfo(screen); ::running = false; XErrorHandler old = XSetErrorHandler(::anotherWMRunning); - XSelectInput(otk::OBDisplay::display, _info->rootWindow(), - OBScreen::event_mask); - XSync(otk::OBDisplay::display, false); + XSelectInput(otk::Display::display, _info->rootWindow(), + Screen::event_mask); + XSync(otk::Display::display, false); XSetErrorHandler(old); _managed = !::running;@@ -66,17 +66,17 @@ printf(_("Managing screen %d: visual 0x%lx, depth %d\n"),
_number, XVisualIDFromVisual(_info->visual()), _info->depth()); Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::openbox_pid, - otk::OBProperty::Atom_Cardinal, + otk::Property::openbox_pid, + otk::Property::Atom_Cardinal, (unsigned long) getpid()); // set the mouse cursor for the root window (the default cursor) - XDefineCursor(otk::OBDisplay::display, _info->rootWindow(), + XDefineCursor(otk::Display::display, _info->rootWindow(), Openbox::instance->cursors().session); // initialize the shit that is used for all drawing on the screen - _image_control = new otk::BImageControl(Openbox::instance->timerManager(), - _info, true); + _image_control = new otk::ImageControl(Openbox::instance->timerManager(), + _info, true); _image_control->installRootColormap(); _root_cmap_installed = True;@@ -102,16 +102,16 @@ // Set the netwm properties for geometry
unsigned long geometry[] = { _info->width(), _info->height() }; Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_desktop_geometry, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_desktop_geometry, + otk::Property::Atom_Cardinal, geometry, 2); // Set the net_desktop_names property std::vector<std::string> names; python_get_stringlist("desktop_names", &names); Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_desktop_names, - otk::OBProperty::utf8, + otk::Property::net_desktop_names, + otk::Property::utf8, names); // the above set() will cause the updateDesktopNames to fire right away so // we have a list of desktop names@@ -126,10 +126,10 @@
// create the window which gets focus when no clients get it XSetWindowAttributes attr; attr.override_redirect = true; - _focuswindow = XCreateWindow(otk::OBDisplay::display, _info->rootWindow(), + _focuswindow = XCreateWindow(otk::Display::display, _info->rootWindow(), -100, -100, 1, 1, 0, 0, InputOnly, _info->visual(), CWOverrideRedirect, &attr); - XMapWindow(otk::OBDisplay::display, _focuswindow); + XMapWindow(otk::Display::display, _focuswindow); // these may be further updated if any pre-existing windows are found in // the manageExising() function@@ -145,11 +145,11 @@ Openbox::instance->bindings()->fireEvent(&data);
} -OBScreen::~OBScreen() +Screen::~Screen() { if (! _managed) return; - XSelectInput(otk::OBDisplay::display, _info->rootWindow(), NoEventMask); + XSelectInput(otk::Display::display, _info->rootWindow(), NoEventMask); // unmanage all windows while (!clients.empty())@@ -159,25 +159,25 @@ // call the python Shutdown callbacks
EventData data(_number, 0, EventShutdown, 0); Openbox::instance->bindings()->fireEvent(&data); - XDestroyWindow(otk::OBDisplay::display, _focuswindow); - XDestroyWindow(otk::OBDisplay::display, _supportwindow); + XDestroyWindow(otk::Display::display, _focuswindow); + XDestroyWindow(otk::Display::display, _supportwindow); delete _image_control; } -void OBScreen::manageExisting() +void Screen::manageExisting() { unsigned int i, j, nchild; Window r, p, *children; - XQueryTree(otk::OBDisplay::display, _info->rootWindow(), &r, &p, + XQueryTree(otk::Display::display, _info->rootWindow(), &r, &p, &children, &nchild); // preen the window list of all icon windows... for better dockapp support for (i = 0; i < nchild; i++) { if (children[i] == None) continue; - XWMHints *wmhints = XGetWMHints(otk::OBDisplay::display, + XWMHints *wmhints = XGetWMHints(otk::Display::display, children[i]); if (wmhints) {@@ -201,7 +201,7 @@ if (children[i] == None)
continue; XWindowAttributes attrib; - if (XGetWindowAttributes(otk::OBDisplay::display, children[i], &attrib)) { + if (XGetWindowAttributes(otk::Display::display, children[i], &attrib)) { if (attrib.override_redirect) continue; if (attrib.map_state != IsUnmapped) {@@ -214,11 +214,11 @@ XFree(children);
} -void OBScreen::updateStrut() +void Screen::updateStrut() { _strut.left = _strut.right = _strut.top = _strut.bottom = 0; - OBClient::List::iterator it, end = clients.end(); + Client::List::iterator it, end = clients.end(); for (it = clients.begin(); it != end; ++it) { const otk::Strut &s = (*it)->strut(); _strut.left = std::max(_strut.left, s.left);@@ -230,7 +230,7 @@ calcArea();
} -void OBScreen::calcArea() +void Screen::calcArea() { otk::Rect old_area = _area;@@ -276,103 +276,103 @@ changeWorkArea();
} -void OBScreen::changeSupportedAtoms() +void Screen::changeSupportedAtoms() { // create the netwm support window - _supportwindow = XCreateSimpleWindow(otk::OBDisplay::display, + _supportwindow = XCreateSimpleWindow(otk::Display::display, _info->rootWindow(), 0, 0, 1, 1, 0, 0, 0); // set supporting window Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_supporting_wm_check, - otk::OBProperty::Atom_Window, + otk::Property::net_supporting_wm_check, + otk::Property::Atom_Window, _supportwindow); //set properties on the supporting window Openbox::instance->property()->set(_supportwindow, - otk::OBProperty::net_wm_name, - otk::OBProperty::utf8, + otk::Property::net_wm_name, + otk::Property::utf8, "Openbox"); Openbox::instance->property()->set(_supportwindow, - otk::OBProperty::net_supporting_wm_check, - otk::OBProperty::Atom_Window, + otk::Property::net_supporting_wm_check, + otk::Property::Atom_Window, _supportwindow); Atom supported[] = { - otk::OBProperty::net_current_desktop, - otk::OBProperty::net_number_of_desktops, - otk::OBProperty::net_desktop_geometry, - otk::OBProperty::net_desktop_viewport, - otk::OBProperty::net_active_window, - otk::OBProperty::net_workarea, - otk::OBProperty::net_client_list, - otk::OBProperty::net_client_list_stacking, - otk::OBProperty::net_desktop_names, - otk::OBProperty::net_close_window, - otk::OBProperty::net_wm_name, - otk::OBProperty::net_wm_visible_name, - otk::OBProperty::net_wm_icon_name, - otk::OBProperty::net_wm_visible_icon_name, + otk::Property::net_current_desktop, + otk::Property::net_number_of_desktops, + otk::Property::net_desktop_geometry, + otk::Property::net_desktop_viewport, + otk::Property::net_active_window, + otk::Property::net_workarea, + otk::Property::net_client_list, + otk::Property::net_client_list_stacking, + otk::Property::net_desktop_names, + otk::Property::net_close_window, + otk::Property::net_wm_name, + otk::Property::net_wm_visible_name, + otk::Property::net_wm_icon_name, + otk::Property::net_wm_visible_icon_name, /* - otk::OBProperty::net_wm_desktop, + otk::Property::net_wm_desktop, */ - otk::OBProperty::net_wm_strut, - otk::OBProperty::net_wm_window_type, - otk::OBProperty::net_wm_window_type_desktop, - otk::OBProperty::net_wm_window_type_dock, - otk::OBProperty::net_wm_window_type_toolbar, - otk::OBProperty::net_wm_window_type_menu, - otk::OBProperty::net_wm_window_type_utility, - otk::OBProperty::net_wm_window_type_splash, - otk::OBProperty::net_wm_window_type_dialog, - otk::OBProperty::net_wm_window_type_normal, + otk::Property::net_wm_strut, + otk::Property::net_wm_window_type, + otk::Property::net_wm_window_type_desktop, + otk::Property::net_wm_window_type_dock, + otk::Property::net_wm_window_type_toolbar, + otk::Property::net_wm_window_type_menu, + otk::Property::net_wm_window_type_utility, + otk::Property::net_wm_window_type_splash, + otk::Property::net_wm_window_type_dialog, + otk::Property::net_wm_window_type_normal, /* - otk::OBProperty::net_wm_moveresize, - otk::OBProperty::net_wm_moveresize_size_topleft, - otk::OBProperty::net_wm_moveresize_size_topright, - otk::OBProperty::net_wm_moveresize_size_bottomleft, - otk::OBProperty::net_wm_moveresize_size_bottomright, - otk::OBProperty::net_wm_moveresize_move, + otk::Property::net_wm_moveresize, + otk::Property::net_wm_moveresize_size_topleft, + otk::Property::net_wm_moveresize_size_topright, + otk::Property::net_wm_moveresize_size_bottomleft, + otk::Property::net_wm_moveresize_size_bottomright, + otk::Property::net_wm_moveresize_move, */ /* - otk::OBProperty::net_wm_allowed_actions, - otk::OBProperty::net_wm_action_move, - otk::OBProperty::net_wm_action_resize, - otk::OBProperty::net_wm_action_shade, - otk::OBProperty::net_wm_action_maximize_horz, - otk::OBProperty::net_wm_action_maximize_vert, - otk::OBProperty::net_wm_action_change_desktop, - otk::OBProperty::net_wm_action_close, + otk::Property::net_wm_allowed_actions, + otk::Property::net_wm_action_move, + otk::Property::net_wm_action_resize, + otk::Property::net_wm_action_shade, + otk::Property::net_wm_action_maximize_horz, + otk::Property::net_wm_action_maximize_vert, + otk::Property::net_wm_action_change_desktop, + otk::Property::net_wm_action_close, */ - otk::OBProperty::net_wm_state, - otk::OBProperty::net_wm_state_modal, - otk::OBProperty::net_wm_state_maximized_vert, - otk::OBProperty::net_wm_state_maximized_horz, - otk::OBProperty::net_wm_state_shaded, - otk::OBProperty::net_wm_state_skip_taskbar, - otk::OBProperty::net_wm_state_skip_pager, - otk::OBProperty::net_wm_state_hidden, - otk::OBProperty::net_wm_state_fullscreen, - otk::OBProperty::net_wm_state_above, - otk::OBProperty::net_wm_state_below, + otk::Property::net_wm_state, + otk::Property::net_wm_state_modal, + otk::Property::net_wm_state_maximized_vert, + otk::Property::net_wm_state_maximized_horz, + otk::Property::net_wm_state_shaded, + otk::Property::net_wm_state_skip_taskbar, + otk::Property::net_wm_state_skip_pager, + otk::Property::net_wm_state_hidden, + otk::Property::net_wm_state_fullscreen, + otk::Property::net_wm_state_above, + otk::Property::net_wm_state_below, }; const int num_supported = sizeof(supported)/sizeof(Atom); // convert to the atom values for (int i = 0; i < num_supported; ++i) supported[i] = - Openbox::instance->property()->atom((otk::OBProperty::Atoms)supported[i]); + Openbox::instance->property()->atom((otk::Property::Atoms)supported[i]); Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_supported, - otk::OBProperty::Atom_Atom, + otk::Property::net_supported, + otk::Property::Atom_Atom, supported, num_supported); } -void OBScreen::changeClientList() +void Screen::changeClientList() { Window *windows; unsigned int size = clients.size();@@ -383,16 +383,16 @@ Window *win_it;
windows = new Window[size]; win_it = windows; - OBClient::List::const_iterator it = clients.begin(); - const OBClient::List::const_iterator end = clients.end(); + Client::List::const_iterator it = clients.begin(); + const Client::List::const_iterator end = clients.end(); for (; it != end; ++it, ++win_it) *win_it = (*it)->window(); } else windows = (Window*) 0; Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_client_list, - otk::OBProperty::Atom_Window, + otk::Property::net_client_list, + otk::Property::Atom_Window, windows, size); if (size)@@ -402,7 +402,7 @@ changeStackingList();
} -void OBScreen::changeStackingList() +void Screen::changeStackingList() { Window *windows; unsigned int size = _stacking.size();@@ -416,16 +416,16 @@ Window *win_it;
windows = new Window[size]; win_it = windows; - OBClient::List::const_iterator it = _stacking.begin(); - const OBClient::List::const_iterator end = _stacking.end(); + Client::List::const_iterator it = _stacking.begin(); + const Client::List::const_iterator end = _stacking.end(); for (; it != end; ++it, ++win_it) *win_it = (*it)->window(); } else windows = (Window*) 0; Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_client_list_stacking, - otk::OBProperty::Atom_Window, + otk::Property::net_client_list_stacking, + otk::Property::Atom_Window, windows, size); if (size)@@ -433,7 +433,7 @@ delete [] windows;
} -void OBScreen::changeWorkArea() { +void Screen::changeWorkArea() { unsigned long *dims = new unsigned long[4 * _num_desktops]; for (long i = 0; i < _num_desktops; ++i) { // XXX: this could be different for each workspace@@ -443,27 +443,27 @@ dims[(i * 4) + 2] = _area.width();
dims[(i * 4) + 3] = _area.height(); } Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_workarea, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_workarea, + otk::Property::Atom_Cardinal, dims, 4 * _num_desktops); delete [] dims; } -void OBScreen::manageWindow(Window window) +void Screen::manageWindow(Window window) { - OBClient *client = 0; + Client *client = 0; XWMHints *wmhint; XSetWindowAttributes attrib_set; - otk::OBDisplay::grab(); + otk::Display::grab(); // is the window a docking app - if ((wmhint = XGetWMHints(otk::OBDisplay::display, window))) { + if ((wmhint = XGetWMHints(otk::Display::display, window))) { if ((wmhint->flags & StateHint) && wmhint->initial_state == WithdrawnState) { //slit->addClient(w); // XXX: make dock apps work! - otk::OBDisplay::ungrab(); + otk::Display::ungrab(); XFree(wmhint); return;@@ -472,13 +472,13 @@ XFree(wmhint);
} // choose the events we want to receive on the CLIENT window - attrib_set.event_mask = OBClient::event_mask; - attrib_set.do_not_propagate_mask = OBClient::no_propagate_mask; - XChangeWindowAttributes(otk::OBDisplay::display, window, + attrib_set.event_mask = Client::event_mask; + attrib_set.do_not_propagate_mask = Client::no_propagate_mask; + XChangeWindowAttributes(otk::Display::display, window, CWEventMask|CWDontPropagate, &attrib_set); - // create the OBClient class, which gets all of the hints on the window - client = new OBClient(_number, window); + // create the Client class, which gets all of the hints on the window + client = new Client(_number, window); // register for events Openbox::instance->registerHandler(window, client); // add to the wm's map@@ -489,7 +489,7 @@ client->toggleClientBorder(false);
// specify that if we exit, the window should not be destroyed and should be // reparented back to root automatically - XChangeSaveSet(otk::OBDisplay::display, window, SetModeInsert); + XChangeSaveSet(otk::Display::display, window, SetModeInsert); if (!(Openbox::instance->state() == Openbox::State_Starting || client->positionRequested())) {@@ -500,7 +500,7 @@ Openbox::instance->bindings()->fireEvent(&data);
} // create the decoration frame for the client window - client->frame = new OBFrame(client, &_style); + client->frame = new Frame(client, &_style); // add to the wm's map Openbox::instance->addClient(client->frame->window(), client);@@ -526,7 +526,7 @@ }
// XXX: handle any requested states such as maximized - otk::OBDisplay::ungrab(); + otk::Display::ungrab(); // add to the screen's list clients.push_back(client);@@ -548,9 +548,9 @@ #endif
} -void OBScreen::unmanageWindow(OBClient *client) +void Screen::unmanageWindow(Client *client) { - OBFrame *frame = client->frame; + Frame *frame = client->frame; // call the python CLOSEWINDOW binding EventData data(_number, client, EventCloseWindow, 0);@@ -575,10 +575,10 @@ // unregister for handling events
Openbox::instance->clearHandler(client->window()); // remove the window from our save set - XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete); + XChangeSaveSet(otk::Display::display, client->window(), SetModeDelete); // we dont want events no more - XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask); + XSelectInput(otk::Display::display, client->window(), NoEventMask); frame->hide();@@ -610,7 +610,7 @@ // update the root properties
changeClientList(); } -void OBScreen::restack(bool raise, OBClient *client) +void Screen::restack(bool raise, Client *client) { const int layer = client->layer(); std::vector<Window> wins;@@ -619,7 +619,7 @@ _stacking.remove(client);
// the stacking list is from highest to lowest - OBClient::List::iterator it = _stacking.begin(), end = _stacking.end(); + Client::List::iterator it = _stacking.begin(), end = _stacking.end(); // insert the windows above this window for (; it != end; ++it) { if ((*it)->layer() < layer || (raise && (*it)->layer() == layer))@@ -633,11 +633,11 @@ // insert the remaining below this window
for (; it != end; ++it) wins.push_back((*it)->frame->window()); - XRestackWindows(otk::OBDisplay::display, &wins[0], wins.size()); + XRestackWindows(otk::Display::display, &wins[0], wins.size()); changeStackingList(); } -void OBScreen::changeDesktop(long desktop) +void Screen::changeDesktop(long desktop) { assert(desktop >= 0 && desktop < _num_desktops);@@ -649,13 +649,13 @@ long old = _desktop;
_desktop = desktop; Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_current_desktop, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_current_desktop, + otk::Property::Atom_Cardinal, _desktop); if (old == _desktop) return; - OBClient::List::iterator it, end = clients.end(); + Client::List::iterator it, end = clients.end(); for (it = clients.begin(); it != end; ++it) { if ((*it)->desktop() == old) { (*it)->frame->hide();@@ -669,7 +669,7 @@ if (!Openbox::instance->focusedClient())
Openbox::instance->setFocusedClient(0); } -void OBScreen::changeNumDesktops(long num) +void Screen::changeNumDesktops(long num) { assert(num > 0);@@ -679,16 +679,16 @@ // XXX: move windows on desktops that will no longer exist!
_num_desktops = num; Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_number_of_desktops, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_number_of_desktops, + otk::Property::Atom_Cardinal, _num_desktops); // set the viewport hint unsigned long *viewport = new unsigned long[_num_desktops * 2]; memset(viewport, 0, sizeof(unsigned long) * _num_desktops * 2); Openbox::instance->property()->set(_info->rootWindow(), - otk::OBProperty::net_desktop_viewport, - otk::OBProperty::Atom_Cardinal, + otk::Property::net_desktop_viewport, + otk::Property::Atom_Cardinal, viewport, _num_desktops * 2); delete [] viewport;@@ -697,79 +697,79 @@ changeWorkArea();
} -void OBScreen::updateDesktopNames() +void Screen::updateDesktopNames() { - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); unsigned long num = (unsigned) -1; if (!property->get(_info->rootWindow(), - otk::OBProperty::net_desktop_names, - otk::OBProperty::utf8, &num, &_desktop_names)) + otk::Property::net_desktop_names, + otk::Property::utf8, &num, &_desktop_names)) _desktop_names.clear(); while ((long)_desktop_names.size() < _num_desktops) _desktop_names.push_back("Unnamed"); } -void OBScreen::setDesktopName(long i, const std::string &name) +void Screen::setDesktopName(long i, const std::string &name) { assert(i >= 0); if (i >= _num_desktops) return; - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); - otk::OBProperty::StringVect newnames = _desktop_names; + otk::Property::StringVect newnames = _desktop_names; newnames[i] = name; - property->set(_info->rootWindow(), otk::OBProperty::net_desktop_names, - otk::OBProperty::utf8, newnames); + property->set(_info->rootWindow(), otk::Property::net_desktop_names, + otk::Property::utf8, newnames); } -void OBScreen::propertyHandler(const XPropertyEvent &e) +void Screen::propertyHandler(const XPropertyEvent &e) { - otk::OtkEventHandler::propertyHandler(e); + otk::EventHandler::propertyHandler(e); - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); // compress changes to a single property into a single change XEvent ce; - while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) { + while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { // XXX: it would be nice to compress ALL changes to a property, not just // changes in a row without other props between. if (ce.xproperty.atom != e.atom) { - XPutBackEvent(otk::OBDisplay::display, &ce); + XPutBackEvent(otk::Display::display, &ce); break; } } - if (e.atom == property->atom(otk::OBProperty::net_desktop_names)) + if (e.atom == property->atom(otk::Property::net_desktop_names)) updateDesktopNames(); } -void OBScreen::clientMessageHandler(const XClientMessageEvent &e) +void Screen::clientMessageHandler(const XClientMessageEvent &e) { - otk::OtkEventHandler::clientMessageHandler(e); + otk::EventHandler::clientMessageHandler(e); if (e.format != 32) return; - const otk::OBProperty *property = Openbox::instance->property(); + const otk::Property *property = Openbox::instance->property(); - if (e.message_type == property->atom(otk::OBProperty::net_current_desktop)) { + if (e.message_type == property->atom(otk::Property::net_current_desktop)) { changeDesktop(e.data.l[0]); } else if (e.message_type == - property->atom(otk::OBProperty::net_number_of_desktops)) { + property->atom(otk::Property::net_number_of_desktops)) { changeNumDesktops(e.data.l[0]); } // XXX: so many client messages to handle here! ..or not.. they go to clients } -void OBScreen::mapRequestHandler(const XMapRequestEvent &e) +void Screen::mapRequestHandler(const XMapRequestEvent &e) { - otk::OtkEventHandler::mapRequestHandler(e); + otk::EventHandler::mapRequestHandler(e); #ifdef DEBUG printf("MapRequest for 0x%lx\n", e.window);@@ -780,15 +780,15 @@ MapRequest events come here even after the window exists instead of going
right to the client window, because of how they are sent and their struct layout. */ - OBClient *c = Openbox::instance->findClient(e.window); + Client *c = Openbox::instance->findClient(e.window); if (c) { // send a net_active_window message XEvent ce; ce.xclient.type = ClientMessage; ce.xclient.message_type = - Openbox::instance->property()->atom(otk::OBProperty::net_active_window); - ce.xclient.display = otk::OBDisplay::display; + Openbox::instance->property()->atom(otk::Property::net_active_window); + ce.xclient.display = otk::Display::display; ce.xclient.window = c->window(); ce.xclient.format = 32; ce.xclient.data.l[0] = 0l;@@ -796,7 +796,7 @@ ce.xclient.data.l[1] = 0l;
ce.xclient.data.l[2] = 0l; ce.xclient.data.l[3] = 0l; ce.xclient.data.l[4] = 0l; - XSendEvent(otk::OBDisplay::display, _info->rootWindow(), false, + XSendEvent(otk::Display::display, _info->rootWindow(), false, SubstructureRedirectMask | SubstructureNotifyMask, &ce); } else
M
src/screen.hh
→
src/screen.hh
@@ -3,7 +3,7 @@ #ifndef __screen_hh
#define __screen_hh /*! @file screen.hh - @brief OBScreen manages a single screen + @brief Screen manages a single screen */ extern "C" {@@ -25,13 +25,13 @@ #include <list>
namespace ob { -class OBClient; -class OBRootWindow; +class Client; +class RootWindow; //! Manages a single screen /*! */ -class OBScreen : public otk::OtkEventHandler, public OBWidget { +class Screen : public otk::EventHandler, public WidgetBase { public: //! Holds a list of otk::Strut objects typedef std::list<otk::Strut*> StrutList;@@ -46,7 +46,7 @@ ButtonPressMask |
ButtonReleaseMask; //! All managed clients on the screen (in order of being mapped) - OBClient::List clients; + Client::List clients; private: //! Was %Openbox able to manage the screen?@@ -59,7 +59,7 @@ //! Information about this screen
const otk::ScreenInfo *_info; //! The Image Control used for rendering on the screen - otk::BImageControl *_image_control; + otk::ImageControl *_image_control; //! The style with which to render on the screen otk::Style _style;@@ -81,7 +81,7 @@ //! running
Window _supportwindow; //! A list of all managed clients on the screen, in their stacking order - OBClient::List _stacking; + Client::List _stacking; //! The desktop currently being displayed long _desktop;@@ -90,16 +90,16 @@ //! The number of desktops
long _num_desktops; //! The names of all desktops - otk::OBProperty::StringVect _desktop_names; + otk::Property::StringVect _desktop_names; - //! Calculate the OBScreen::_area member + //! Calculate the Screen::_area member void calcArea(); //! Set the list of supported NETWM atoms on the root window void changeSupportedAtoms(); //! Set the client list on the root window /*! Sets the _NET_CLIENT_LIST root window property.<br> - Also calls OBScreen::updateStackingList. + Also calls Screen::updateStackingList. */ void changeClientList(); //! Set the client stacking list on the root window@@ -133,10 +133,10 @@ void changeNumDesktops(long num);
public: #ifndef SWIG - //! Constructs a new OBScreen object - OBScreen(int screen); - //! Destroys the OBScreen object - virtual ~OBScreen(); + //! Constructs a new Screen object + Screen(int screen); + //! Destroys the Screen object + virtual ~Screen(); #endif inline int number() const { return _number; }@@ -148,7 +148,7 @@ used.
*/ inline bool managed() const { return _managed; } //! Returns the Image Control used for rendering on the screen - inline otk::BImageControl *imageControl() { return _image_control; } + inline otk::ImageControl *imageControl() { return _image_control; } //! Returns the area of the screen not reserved by applications' Struts inline const otk::Rect &area() const { return _area; } //! Returns the style in use on the screen@@ -179,11 +179,11 @@ This removes the window's frame, reparents it to root, unselects events on
it, etc. @param client The client to unmanage */ - void unmanageWindow(OBClient *client); + void unmanageWindow(Client *client); //! Raises/Lowers a client window above/below all others in its stacking //! layer - void restack(bool raise, OBClient *client); + void restack(bool raise, Client *client); //! Sets the name of a desktop by changing the root window property /*!
M
src/widgetbase.hh
→
src/widgetbase.hh
@@ -1,12 +1,12 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifndef __obwidgetbase_hh -#define __obwidgetbase_hh +#ifndef __widgetbase_hh +#define __widgetbase_hh #include "python.hh" namespace ob { -class OBWidget { +class WidgetBase { public: enum WidgetType { Type_Frame,@@ -28,7 +28,7 @@ private:
WidgetType _type; public: - OBWidget(WidgetType type) : _type(type) {} + WidgetBase(WidgetType type) : _type(type) {} inline WidgetType type() const { return _type; }@@ -68,4 +68,4 @@ };
} -#endif // __obwidgetbase_hh +#endif // __widgetbase_hh