X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=2bf656d8620a4696f27c54350d1c74772636dba9;hb=58cd3958a331e55699b3c1f640c0d2da907cdf22;hp=67943a847f9ad2c8e3b3e2993aff70fea55801fc;hpb=ca3e463057ebf8a7a48a5997aedc062cdac72f3f;p=chaz%2Fopenbox

diff --git a/src/python.hh b/src/python.hh
index 67943a84..2bf656d8 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -48,6 +48,14 @@ enum KeyContext {
   NUM_KEY_CONTEXT
 };
 
+enum EventAction {
+  EventEnterWindow,
+  EventLeaveWindow,
+  EventNewWindow,
+  EventCloseWindow,
+  NUM_EVENTS
+};
+
 #ifndef SWIG
 
 // *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
@@ -80,6 +88,13 @@ typedef struct {
   MouseAction action;
 } ButtonData;
 
+typedef struct {
+  PyObject_HEAD;
+  Window window;
+  unsigned int state;
+  EventAction action;
+} EventData;
+
 typedef struct {
   PyObject_HEAD;
   Window window;
@@ -100,21 +115,25 @@ MotionData *new_motion_data(Window window, Time time, unsigned int state,
 ButtonData *new_button_data(Window window, Time time, unsigned int state,
                             unsigned int button, MouseContext context,
                             MouseAction action);
+EventData *new_event_data(Window window, EventAction action,
+                           unsigned int state);
 KeyData *new_key_data(Window window, Time time, unsigned int state,
                       unsigned int key);
 
 void python_callback(PyObject *func, PyObject *data);
 
+bool python_get_long(const char *name, long *value);
 bool python_get_string(const char *name, std::string *value);
 bool python_get_stringlist(const char *name, std::vector<std::string> *value);
 #endif
 
-PyObject * mbind(const std::string &button, ob::MouseContext context,
-                 ob::MouseAction action, PyObject *func);
+PyObject *mbind(const std::string &button, ob::MouseContext context,
+                ob::MouseAction action, PyObject *func);
+
+PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func);
+
+PyObject *ebind(ob::EventAction action, PyObject *func);
 
-PyObject * kbind(PyObject *keylist, ob::KeyContext context, PyObject *func);
-PyObject * kunbind(PyObject *keylist);
-void kunbind_all();
 void set_reset_key(const std::string &key);
 
 }