X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=5419832585bdb6292877110c1df73b01e574eb0d;hb=73a584981e853f03cbd01930d27d138c6b95707b;hp=657e31b741e2640a4e6c70a74ee67b5b626f73dd;hpb=63a74632ac39d445cb15cda510c8267da9ff6bbb;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 657e31b7..54198325 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -1,12 +1,13 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-%module openbox
+%module ob
 
 %{
 #ifdef HAVE_CONFIG_H
 #  include "../config.h"
 #endif
 
+#include "frame.hh"
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
@@ -29,12 +30,11 @@
 namespace ob {
 void python_callback(PyObject *func, MouseData *data)
 {
-  PyObject *arglist;
-  PyObject *result;
+  PyObject *arglist, *result, *pdata;
 
-  arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
-                                                    SWIGTYPE_p_ob__MouseData,
-                                                    0));
+  pdata = SWIG_NewPointerObj((void *) data, SWIGTYPE_p_ob__MouseData, 0);
+  arglist = Py_BuildValue("(O)", pdata);
+  Py_DECREF(pdata);
   
   // call the callback
   result = PyEval_CallObject(func, arglist);
@@ -49,12 +49,11 @@ void python_callback(PyObject *func, MouseData *data)
 
 void python_callback(PyObject *func, EventData *data)
 {
-  PyObject *arglist;
-  PyObject *result;
+  PyObject *arglist, *result, *pdata;
 
-  arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
-                                                    SWIGTYPE_p_ob__EventData,
-                                                    0));
+  pdata = SWIG_NewPointerObj((void *) data, SWIGTYPE_p_ob__EventData, 0);
+  arglist = Py_BuildValue("(O)", pdata);
+  Py_DECREF(pdata);
   
   // call the callback
   result = PyEval_CallObject(func, arglist);
@@ -69,12 +68,11 @@ void python_callback(PyObject *func, EventData *data)
 
 void python_callback(PyObject *func, KeyData *data)
 {
-  PyObject *arglist;
-  PyObject *result;
+  PyObject *arglist, *result, *pdata;
 
-  arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
-                                                    SWIGTYPE_p_ob__KeyData,
-                                                    0));
+  pdata = SWIG_NewPointerObj((void *) data, SWIGTYPE_p_ob__KeyData, 0);
+  arglist = Py_BuildValue("(O)", pdata);
+  Py_DECREF(pdata);
   
   // call the callback
   result = PyEval_CallObject(func, arglist);
@@ -109,12 +107,18 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
+/*
+%include "../otk/ustring.i"
+
 %ignore otk::display;
 %inline %{
   otk::Display *Display_instance() { return otk::display; }
 %};
 
-%include "../otk/ustring.i"
+%ignore otk::Property::atoms;
+%inline %{
+  const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
+%};
 
 %include "../otk/display.hh"
 %include "../otk/point.hh"
@@ -126,12 +130,17 @@ void python_callback(PyObject *func, KeyData *data)
 %include "../otk/eventhandler.hh"
 %include "../otk/eventdispatcher.hh"
 
+%import "../otk/widget.hh"
+*/
+%import "../otk/otk.i"
+
 %import "widgetbase.hh"
 %import "actions.hh"
 
 %include "openbox.hh"
 %include "screen.hh"
 %include "client.hh"
+%include "frame.hh"
 %include "python.hh"
 
 // for Mod1Mask etc