X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=7cec766712a9ac1376f9dff7b38400b3d0e65eb3;hb=39f19f427b68058b00e17ac972c5d9dfbda8c2e0;hp=a2cfa366772e32d3284b4b9a3696447ff39eea9a;hpb=cdcc526a0274cace9f542960fe4eee4ddcc23d31;p=chaz%2Fopenbox

diff --git a/src/python.hh b/src/python.hh
index a2cfa366..7cec7667 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -32,7 +32,7 @@ enum MouseContext {
   MC_MaximizeButton,
   MC_CloseButton,
   MC_IconifyButton,
-  MC_StickyButton,
+  MC_AllDesktopsButton,
   MC_Grip,
   MC_Root,
   MC_MenuItem,
@@ -61,6 +61,7 @@ enum EventAction {
   EventCloseWindow,
   EventStartup,
   EventShutdown,
+  EventKey,
   EventFocus,
   EventBell,
   NUM_EVENTS
@@ -147,6 +148,7 @@ public:
   Time time;
   unsigned int state;
   std::string key;
+  EventAction action; // this is here so that all the Data structs have .action
 
   KeyData(int screen, Client *client, Time time, unsigned int state,
           unsigned int key) {
@@ -156,6 +158,7 @@ public:
     this->state  = state;
     this->key    = XKeysymToString(XKeycodeToKeysym(**otk::display,
                                                     key, 0));
+    this->action = EventKey;
   }
 };
 
@@ -187,7 +190,7 @@ PyObject *ebind(ob::EventAction action, PyObject *func);
 
 void set_reset_key(const std::string &key);
 
-PyObject *send_client_msg(Window target, int type, Window about,
+PyObject *send_client_msg(Window target, Atom type, Window about,
                           long data, long data1 = 0, long data2 = 0,
                           long data3 = 0, long data4 = 0);
 }