handle mouse clicks in the python scripts now

4 files changed, 45 insertions, 0 deletions

diff --git a/src/client.cc b/src/client.cc
index a0dc6d76..a22a18a6 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -835,6 +835,30 @@ void OBClient::move(int x, int y)
 }
 
 
+void OBClient::close()
+{
+  XEvent ce;
+  const otk::OBProperty *property = Openbox::instance->property();
+
+  if (!(_functions & Func_Close)) return;
+
+  // XXX: itd be cool to do timeouts and shit here for killing the client's
+  //      process off
+
+  ce.xclient.type = ClientMessage;
+  ce.xclient.message_type =  property->atom(otk::OBProperty::wm_protocols);
+  ce.xclient.display = otk::OBDisplay::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[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);
+}
+
+
 void OBClient::configureRequestHandler(const XConfigureRequestEvent &e)
 {
   OtkEventHandler::configureRequestHandler(e);
diff --git a/src/client.hh b/src/client.hh
index de250f37..eeb04232 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -428,6 +428,9 @@ public:
     @param y The Y component of the new size for the client
   */
   void resize(Corner anchor, int x, int y);
+
+  //! Request the client to close its window.
+  void close();
   
   virtual void propertyHandler(const XPropertyEvent &e);
   virtual void clientMessageHandler(const XClientMessageEvent &e);
diff --git a/src/openbox.cc b/src/openbox.cc
index cf41975d..41f0c7b1 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -163,6 +163,7 @@ Openbox::Openbox(int argc, char **argv)
   PyRun_SimpleString("openbox = Openbox_instance()");
 
   runPython(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients
+  runPython(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks
   runPython(_scriptfilepath.c_str());
  
   // initialize all the screens
diff --git a/src/openbox_wrap.cc b/src/openbox_wrap.cc
index 75c9a376..b95ae259 100644
--- a/src/openbox_wrap.cc
+++ b/src/openbox_wrap.cc
@@ -2156,6 +2156,22 @@ static PyObject *_wrap_OBClient_resize(PyObject *self, PyObject *args) {
 }
 
 
+static PyObject *_wrap_OBClient_close(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    ob::OBClient *arg1 = (ob::OBClient *) 0 ;
+    PyObject * obj0  = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:OBClient_close",&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    (arg1)->close();
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_OBClient_propertyHandler(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     ob::OBClient *arg1 = (ob::OBClient *) 0 ;
@@ -2408,6 +2424,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"OBClient_area", _wrap_OBClient_area, METH_VARARGS },
 	 { (char *)"OBClient_move", _wrap_OBClient_move, METH_VARARGS },
 	 { (char *)"OBClient_resize", _wrap_OBClient_resize, METH_VARARGS },
+	 { (char *)"OBClient_close", _wrap_OBClient_close, METH_VARARGS },
 	 { (char *)"OBClient_propertyHandler", _wrap_OBClient_propertyHandler, METH_VARARGS },
 	 { (char *)"OBClient_clientMessageHandler", _wrap_OBClient_clientMessageHandler, METH_VARARGS },
 	 { (char *)"OBClient_shapeHandler", _wrap_OBClient_shapeHandler, METH_VARARGS },