supply the same interface with optional arguments as before. increment callback funct...

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index 7422d0a198f16d4b7ccec3e747f358a4f4f0a284..5419832585bdb6292877110c1df73b01e574eb0d 100644 (file)
--- 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"
@@ -18,23 +19,22 @@
 
 %include "stl.i"
 //%include std_list.i
-//%template(ClientList) std::list<OBClient*>;
+//%template(ClientList) std::list<Client*>;
 
-%ignore ob::Openbox::instance;
+%ignore ob::openbox;
 %inline %{
-  ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+  ob::Openbox *Openbox_instance() { return ob::openbox; }
 %};
 
 %{
 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);
@@ -90,15 +88,17 @@ void python_callback(PyObject *func, KeyData *data)
 }
 %}
 
-%ignore ob::OBScreen::clients;
+#ignore ob::openbox;
+
+%ignore ob::Screen::clients;
 %{
   #include <iterator>
 %}
-%extend ob::OBScreen {
-  OBClient *client(int i) {
-    if (i >= (int)self->clients.size())
+%extend ob::Screen {
+  Client *client(int i) {
+    if (i < 0 || 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,17 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%ignore otk::OBDisplay::display;
+/*
+%include "../otk/ustring.i"
+
+%ignore otk::display;
 %inline %{
-  Display *OBDisplay_display() { return otk::OBDisplay::display; }
+  otk::Display *Display_instance() { return otk::display; }
+%};
+
+%ignore otk::Property::atoms;
+%inline %{
+  const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
 %};
 
 %include "../otk/display.hh"
@@ -119,20 +127,20 @@ void python_callback(PyObject *func, KeyData *data)
 %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"
 
+%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