X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=wrap%2Fotk.i;h=8d06d6f0a7bb7cd33e95f000273c4a7e256e98f2;hb=99cd843fc6dc7a7f55b6c90fd1162f233853aad2;hp=5bf17a216084ec0442076ce518591821e1170488;hpb=67fbe8354f27386235e0c8dc57bd036e34a4fe5e;p=chaz%2Fopenbox

diff --git a/wrap/otk.i b/wrap/otk.i
index 5bf17a21..8d06d6f0 100644
--- a/wrap/otk.i
+++ b/wrap/otk.i
@@ -10,15 +10,8 @@
 //%include std_list.i
 %include "ustring.i"
 
-%ignore otk::display;
-%inline %{
-  otk::Display *Display_instance() { return otk::display; }
-%};
-
-%ignore otk::Property::atoms;
-%inline %{
-  const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
-%};
+%immutable otk::display;
+%immutable otk::Property::atoms;
 
 namespace otk {
 /*%rename(setValue_bool) Configuration::setValue(std::string const &,bool);
@@ -77,5 +70,11 @@ namespace otk {
 %include "timer.hh"
 %include "util.hh"
 
-// for Mod1Mask etc
-%include "X11/X.h"
+// for Window etc
+%import "X11/X.h"
+
+// globals
+%pythoncode %{
+display = cvar.display;
+atoms = cvar.Property_atoms;
+%}