load config options from the python environment

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index 0dbe46405128135b5cb874299242ecc88c190333..50259c89e518f1223150b8a8473db24eefe50ab2 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
@@ -9,6 +9,7 @@
 #include "openbox.hh"
 #include "client.hh"
 #include "python.hh"
+#include "bindings.hh"
 #include "otk/display.hh"
 
 #include <stdio.h>
@@ -34,7 +35,7 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonPressHandler(e);
   
-  // run the PRESS guile hook
+  // run the PRESS python hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
@@ -55,7 +56,7 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  // run the RELEASE guile hook
+  // run the RELEASE python hook
   python_callback(Action_ButtonRelease, e.window,
                   (OBWidget::WidgetType)(w ? w->type():-1),
                   e.state, e.button, e.x_root, e.y_root, e.time);
@@ -74,7 +75,7 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
         e.x < attr.width && e.y < attr.height))
     return;
 
-  // run the CLICK guile hook
+  // run the CLICK python hook
   python_callback(Action_Click, e.window,
                   (OBWidget::WidgetType)(w ? w->type():-1),
                   e.state, e.button, e.time);
@@ -82,11 +83,11 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
   if (e.time - _release.time < DOUBLECLICKDELAY &&
       _release.win == e.window && _release.button == e.button) {
 
-    // run the DOUBLECLICK guile hook
+    // run the DOUBLECLICK python hook
     python_callback(Action_DoubleClick, e.window,
                   (OBWidget::WidgetType)(w ? w->type():-1),
                   e.state, e.button, e.time);
-
+    
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
     _release.button = 0;
@@ -107,7 +108,7 @@ void OBActions::enterHandler(const XCrossingEvent &e)
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  // run the ENTER guile hook
+  // run the ENTER python hook
   python_callback(Action_EnterWindow, e.window,
                   (OBWidget::WidgetType)(w ? w->type():-1), e.state);
 }
@@ -120,7 +121,7 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  // run the LEAVE guile hook
+  // run the LEAVE python hook
   python_callback(Action_LeaveWindow, e.window,
                   (OBWidget::WidgetType)(w ? w->type():-1), e.state);
 }
@@ -128,13 +129,10 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
 
 void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
+//  OBWidget *w = dynamic_cast<OBWidget*>
+//    (Openbox::instance->findHandler(e.window));
 
-  // run the KEY guile hook
-  python_callback(Action_KeyPress, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.keycode);
+  Openbox::instance->bindings()->fire(e.window, e.state, e.keycode, e.time);
 }
 
 
@@ -161,12 +159,23 @@ void OBActions::motionHandler(const XMotionEvent &e)
     (Openbox::instance->findHandler(e.window));
 
   // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
-  //      maybe that should all be done via python tho..
-  // run the simple MOTION guile hook for now...
+  //      maybe that should all be done via python tho.. (or radial menus!)
+  // run the simple MOTION python hook for now...
   python_callback(Action_MouseMotion, e.window,
                   (OBWidget::WidgetType)(w ? w->type():-1),
                   e.state, e.x_root, e.y_root, e.time);
 }
 
+void OBActions::mapRequestHandler(const XMapRequestEvent &e)
+{
+}
+
+void OBActions::unmapHandler(const XUnmapEvent &e)
+{
+}
+
+void OBActions::destroyHandler(const XDestroyWindowEvent &e)
+{
+}
 
 }