X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=64e763d76c2838699fa7d80796a4c55dcc96c76e;hb=4721c53868187d10e3732cea63efa9fbd352178d;hp=2c527b799f25138124d69b0d7ed63a0bc2e08705;hpb=732bfd191dbf1f5cf3473a794f9a736dcba6117e;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 2c527b79..64e763d7 100644
--- 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"
@@ -8,6 +8,8 @@
 #include "widget.hh"
 #include "openbox.hh"
 #include "client.hh"
+#include "python.hh"
+#include "bindings.hh"
 #include "otk/display.hh"
 
 #include <stdio.h>
@@ -15,14 +17,10 @@
 namespace ob {
 
 const unsigned int OBActions::DOUBLECLICKDELAY = 300;
-const int OBActions::BUTTONS;
 
 OBActions::OBActions()
   : _button(0)
 {
-  for (int i=0; i<BUTTONS; ++i)
-    _posqueue[i] = new ButtonPressAction();
-
   // XXX: load a configuration out of somewhere
 
 }
@@ -30,47 +28,20 @@ OBActions::OBActions()
 
 OBActions::~OBActions()
 {
-  for (int i=0; i<BUTTONS; ++i)
-    delete _posqueue[i];
-}
-
-
-void OBActions::insertPress(const XButtonEvent &e)
-{
-  ButtonPressAction *a = _posqueue[BUTTONS - 1];
-  for (int i=BUTTONS-1; i>0;)
-    _posqueue[i] = _posqueue[--i];
-  _posqueue[0] = a;
-  a->button = e.button;
-  a->pos.setPoint(e.x, e.y);
 }
 
-void OBActions::removePress(const XButtonEvent &e)
-{
-  ButtonPressAction *a = 0;
-  for (int i=0; i<BUTTONS; ++i) {
-    if (_posqueue[i]->button == e.button)
-      a = _posqueue[i];
-    if (a) // found one and removed it
-      _posqueue[i] = _posqueue[i+1];
-  }
-  if (a) { // found one
-    _posqueue[BUTTONS-1] = a;
-    a->button = 0;
-  }
-}
 
 void OBActions::buttonPressHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonPressHandler(e);
-  insertPress(e);
   
-  // XXX: run the PRESS guile hook
+  // run the PRESS python hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: PRESS: win %lx type %d modifiers %u button %u time %lx\n",
-         (long)e.window, (w ? w->type():-1), e.state, e.button, e.time);
+  doCallback(Action_ButtonPress, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1),
+             e.state, e.button, e.x_root, e.y_root, e.time);
     
   if (_button) return; // won't count toward CLICK events
 
@@ -81,15 +52,10 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
 void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonReleaseHandler(e);
-  removePress(e);
   
-  // XXX: run the RELEASE guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: RELEASE: win %lx type %d, modifiers %u button %u time %lx\n",
-         (long)e.window, (w ? w->type():-1), e.state, e.button, e.time);
-
   // not for the button we're watching?
   if (_button != e.button) return;
 
@@ -104,17 +70,19 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
         e.x < attr.width && e.y < attr.height))
     return;
 
-  // XXX: run the CLICK guile hook
-  printf("GUILE: CLICK: win %lx type %d modifiers %u button %u time %lx\n",
-         (long)e.window, (w ? w->type():-1), e.state, e.button, e.time);
+  // run the CLICK python hook
+  doCallback(Action_Click, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1),
+             e.state, e.button, e.x_root, e.y_root, e.time);
 
   if (e.time - _release.time < DOUBLECLICKDELAY &&
       _release.win == e.window && _release.button == e.button) {
 
-    // XXX: run the DOUBLECLICK guile hook
-    printf("GUILE: DOUBLECLICK: win %lx type %d modifiers %u button %u time %lx\n",
-           (long)e.window, (w ? w->type():-1), e.state, e.button, e.time);
-
+    // run the DOUBLECLICK python hook
+    doCallback(Action_DoubleClick, e.window,
+               (OBWidget::WidgetType)(w ? w->type():-1),
+               e.state, e.button, e.x_root, e.y_root, e.time);
+    
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
     _release.button = 0;
@@ -132,12 +100,12 @@ void OBActions::enterHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::enterHandler(e);
   
-  // XXX: run the ENTER guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: ENTER: win %lx type %d modifiers %u\n",
-         (long)e.window, (w ? w->type():-1), e.state);
+  // run the ENTER python hook
+  doCallback(Action_EnterWindow, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
 }
 
 
@@ -145,23 +113,21 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::leaveHandler(e);
 
-  // XXX: run the LEAVE guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: LEAVE: win %lx type %d modifiers %u\n",
-         (long)e.window, (w ? w->type():-1), e.state);
+  // run the LEAVE python hook
+  doCallback(Action_LeaveWindow, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
 }
 
 
 void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-  // XXX: run the KEY guile hook
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
+//  OBWidget *w = dynamic_cast<OBWidget*>
+//    (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: KEY: win %lx type %d modifiers %u keycode %u\n",
-         (long)e.window, (w ? w->type():-1), e.state, e.keycode);
+  Openbox::instance->bindings()->fire(e.state, e.keycode, e.time);
 }
 
 
@@ -169,22 +135,128 @@ void OBActions::motionHandler(const XMotionEvent &e)
 {
   if (!e.same_screen) return; // this just gets stupid
 
+  int x_root = e.x_root, y_root = e.y_root;
+  
+  // compress changes to a window into a single change
+  XEvent ce;
+  while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+    if (ce.xmotion.window != e.window) {
+      XPutBackEvent(otk::OBDisplay::display, &ce);
+      break;
+    } else {
+      x_root = e.x_root;
+      y_root = e.y_root;
+    }
+  }
+
+
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  _dx = e.x - _posqueue[0]->pos.x();
-  _dy = e.y - _posqueue[0]->pos.y();
-  
   // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
-  printf("GUILE: MOTION: win %lx type %d  modifiers %u x %d y %d\n",
-         (long)e.window, (w ? w->type():-1), e.state, _dx, _dy);
+  //      maybe that should all be done via python tho.. (or radial menus!)
+  // run the simple MOTION python hook for now...
+  doCallback(Action_MouseMotion, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1),
+             e.state, (unsigned)-1, x_root, y_root, e.time);
+}
+
+void OBActions::mapRequestHandler(const XMapRequestEvent &e)
+{
+  doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1,
+             0, 0, 0, 0, 0);
+}
 
-  if (w && (w->type() == OBWidget::Type_Titlebar ||
-            w->type() == OBWidget::Type_Label)) {
-    OBClient *c = Openbox::instance->findClient(e.window);
-    if (c) c->move(c->area().x() + _dx, c->area().y() + _dy);
+void OBActions::unmapHandler(const XUnmapEvent &e)
+{
+  (void)e;
+  doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
+             0, 0, 0, 0, 0);
+}
+
+void OBActions::destroyHandler(const XDestroyWindowEvent &e)
+{
+  (void)e;
+  doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
+             0, 0, 0, 0, 0);
+}
+
+void OBActions::doCallback(ActionType action, Window window,
+                           OBWidget::WidgetType type, unsigned int state,
+                           unsigned int button, int xroot, int yroot,
+                           Time time)
+{
+  std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
+    _callbacks.equal_range(action);
+
+  CallbackMap::iterator it;
+  for (it = it_pair.first; it != it_pair.second; ++it)
+    python_callback(it->second, action, window, type, state,
+                    button, xroot, yroot, time);
+}
+
+bool OBActions::registerCallback(ActionType action, PyObject *func,
+                                 bool atfront)
+{
+  if (action < 0 || action >= OBActions::NUM_ACTIONS ||
+      action == OBActions::Action_KeyPress) {
+    return false;
   }
+  if (!func)
+    return false;
+
+  std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
+    _callbacks.equal_range(action);
+
+  CallbackMap::iterator it;
+  for (it = it_pair.first; it != it_pair.second; ++it)
+    if (it->second == func)
+      break;
+  if (it == it_pair.second) // not already in there
+    if (atfront)
+      _callbacks.insert(_callbacks.begin(), CallbackMapPair(action, func));
+    else
+      _callbacks.insert(CallbackMapPair(action, func));
+  Py_INCREF(func);
+  return true;
 }
 
+bool OBActions::unregisterCallback(ActionType action, PyObject *func)
+{
+  if (action < 0 || action >= OBActions::NUM_ACTIONS ||
+      action == OBActions::Action_KeyPress) {
+    return false;
+  }
+  if (!func)
+    return false;
+  
+  std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
+    _callbacks.equal_range(action);
+  
+  CallbackMap::iterator it;
+  for (it = it_pair.first; it != it_pair.second; ++it)
+    if (it->second == func)
+      break;
+  if (it != it_pair.second) { // its been registered before
+    Py_DECREF(func);
+    _callbacks.erase(it);
+  }
+  return true;
+}
+
+bool OBActions::unregisterAllCallbacks(ActionType action)
+{
+  if (action < 0 || action >= OBActions::NUM_ACTIONS ||
+      action == OBActions::Action_KeyPress) {
+    return false;
+  }
+
+  while (!_callbacks.empty()) {
+    CallbackMap::iterator it = _callbacks.begin();
+    Py_DECREF(it->second);
+    _callbacks.erase(it);
+  }
+  return true;
+}
 
 }