X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=b6f1dad8a1026c4ff00b75b72ef54acd5bdfcf92;hb=14cf42ff0780bf58a6b54c9443c87c7402b61faa;hp=6750cc58e7dd02469753eafdff70adf2777c12be;hpb=56d7b547ae156e17c8e03ada3b80468f5a0b2605;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 6750cc58..b6f1dad8 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,10 +1,16 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
 #endif
 
 #include "actions.hh"
+#include "widget.hh"
+#include "openbox.hh"
+#include "client.hh"
+#include "python.hh"
+#include "bindings.hh"
+#include "otk/display.hh"
 
 #include <stdio.h>
 
@@ -13,11 +19,8 @@ namespace ob {
 const unsigned int OBActions::DOUBLECLICKDELAY = 300;
 
 OBActions::OBActions()
-  : _button(0), _enter_win(0)
+  : _button(0)
 {
-  _presses[0] = new MousePressAction();
-  _presses[1] = new MousePressAction();
-
   // XXX: load a configuration out of somewhere
 
 }
@@ -28,39 +31,38 @@ OBActions::~OBActions()
 }
 
 
-void OBActions::insertPress(Window win, unsigned int button, Time time)
-{
-  MousePressAction *a = _presses[1];
-  _presses[1] = _presses[0];
-  _presses[0] = a;
-  a->win = win;
-  a->button = button;
-  a->time = time;
-}
-
-
 void OBActions::buttonPressHandler(const XButtonEvent &e)
 {
-  // XXX: run the PRESS guile hook
-  printf("GUILE: PRESS: win %lx modifiers %u button %u time %lx\n",
-         (long)e.window, e.state, e.button, e.time);
+  OtkEventHandler::buttonPressHandler(e);
+  
+  // run the PRESS python hook
+  OBWidget *w = dynamic_cast<OBWidget*>
+    (Openbox::instance->findHandler(e.window));
+
+  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
 
   _button = e.button;
-
-  insertPress(e.window, e.button, e.time);
 }
   
 
 void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 {
-  // XXX: run the RELEASE guile hook
-  printf("GUILE: RELEASE: win %lx modifiers %u button %u time %lx\n",
-         (long)e.window, e.state, e.button, e.time);
+  OtkEventHandler::buttonReleaseHandler(e);
+  
+  OBWidget *w = dynamic_cast<OBWidget*>
+    (Openbox::instance->findHandler(e.window));
+
+  // run the RELEASE python hook
+  doCallback(Action_ButtonRelease, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1),
+             e.state, e.button, e.x_root, e.y_root, e.time);
 
   // not for the button we're watching?
-  if (_button && _button != e.button) return;
+  if (_button != e.button) return;
 
   _button = 0;
 
@@ -73,58 +75,193 @@ 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 modifiers %u button %u time %lx\n",
-         (long)e.window, e.state, e.button, e.time);
-
-  if (_presses[0]->win == _presses[1]->win &&
-      _presses[0]->button == _presses[1]->button &&
-      e.time - _presses[1]->time < DOUBLECLICKDELAY) {
+  // 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);
 
-    // XXX: run the DOUBLECLICK guile hook
-    printf("GUILE: DOUBLECLICK: win %lx modifiers %u button %u time %lx\n",
-           (long)e.window, e.state, e.button, e.time);
+  if (e.time - _release.time < DOUBLECLICKDELAY &&
+      _release.win == e.window && _release.button == e.button) {
 
+    // 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;
+    _release.time = 0;
+  } else {
+    // save the button release, might be part of a double click
+    _release.win = e.window;
+    _release.button = e.button;
+    _release.time = e.time;
   }
 }
 
 
-void OBActions::enter(Window win, unsigned int modifiers)
+void OBActions::enterHandler(const XCrossingEvent &e)
 {
-  _enter_win = win;
+  OtkEventHandler::enterHandler(e);
+  
+  OBWidget *w = dynamic_cast<OBWidget*>
+    (Openbox::instance->findHandler(e.window));
+
+  // run the ENTER python hook
+  doCallback(Action_EnterWindow, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
+}
+
+
+void OBActions::leaveHandler(const XCrossingEvent &e)
+{
+  OtkEventHandler::leaveHandler(e);
 
-  (void)modifiers;
-  // XXX: run the ENTER guile hook
-  printf("GUILE: ENTER: win %lx modifiers %u\n", (long)win, modifiers);
+  OBWidget *w = dynamic_cast<OBWidget*>
+    (Openbox::instance->findHandler(e.window));
 
+  // run the LEAVE python hook
+  doCallback(Action_LeaveWindow, e.window,
+             (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
 }
 
 
-void OBActions::leave(unsigned int modifiers)
+void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-  (void)modifiers;
-  // XXX: run the LEAVE guile hook
-  printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)_enter_win, modifiers);
+//  OBWidget *w = dynamic_cast<OBWidget*>
+//    (Openbox::instance->findHandler(e.window));
 
-  _enter_win = 0;
+  Openbox::instance->bindings()->fire(e.state, e.keycode, e.time);
 }
 
 
-void OBActions::drag(Window win, otk::Point delta, unsigned int modifiers,
-                     unsigned int button, Time time)
+void OBActions::motionHandler(const XMotionEvent &e)
 {
-  (void)win;(void)delta;(void)modifiers;(void)button;(void)time;
+  if (!e.same_screen) return; // this just gets stupid
 
-  // XXX: some guile shit...
+  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));
+
+  // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
+  //      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, e.x_root, e.y_root, e.time);
 }
 
+void OBActions::mapRequestHandler(const XMapRequestEvent &e)
+{
+  doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1,
+             0, 0, 0, 0, 0);
+}
+
+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::key(Window win, unsigned int modifiers, unsigned int keycode)
+void OBActions::doCallback(ActionType action, Window window,
+                           OBWidget::WidgetType type, unsigned int state,
+                           unsigned int button, int xroot, int yroot,
+                           Time time)
 {
-  (void)win;(void)modifiers;(void)keycode;
+  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);
+}
 
-  // XXX: some guile shit...
+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;
+}
 
 }