summaryrefslogtreecommitdiff
path: root/src/openbox.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-09 22:54:31 +0000
committerDana Jansens <danakj@orodu.net>2003-01-09 22:54:31 +0000
commit345d957e1ea577480f807b892b73c3f52fe913d2 (patch)
tree489dd8d159f22bbc3828ad094ced5288eb582628 /src/openbox.cc
parentb1739374a61d0c33270bafe84da9d787e79c0686 (diff)
new python callbacks data, infrastructure. going to rework bindings code. cvs wont work for shit now. but thats life.
Diffstat (limited to 'src/openbox.cc')
-rw-r--r--src/openbox.cc20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/openbox.cc b/src/openbox.cc
index a15f369b..b44a1861 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -288,7 +288,8 @@ void Openbox::showHelp()
printf(_("Compile time options:\n\
Debugging: %s\n\
Shape: %s\n\
- Xinerama: %s\n"),
+ Xinerama: %s\n\
+ Xkb: %s\n"),
#ifdef DEBUG
_("yes"),
#else // !DEBUG
@@ -302,10 +303,16 @@ void Openbox::showHelp()
#endif // SHAPE
#ifdef XINERAMA
- _("yes")
+ _("yes"),
#else // !XINERAMA
- _("no")
+ _("no"),
#endif // XINERAMA
+
+#ifdef XKB
+ _("yes")
+#else // !XKB
+ _("no")
+#endif // XKB
);
}
@@ -368,11 +375,8 @@ void Openbox::setFocusedClient(OBClient *c)
}
// call the python Focus callbacks
- EventData *data = new_event_data(_focused_screen->number(),
- c ? c->window() : 0,
- EventFocus, 0);
- Openbox::instance->bindings()->fireEvent(data);
- Py_XDECREF((PyObject*)data);
+ EventData data(_focused_screen->number(), c, EventFocus, 0);
+ Openbox::instance->bindings()->fireEvent(&data);
}
void Openbox::execute(int screen, const std::string &bin)