X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=15a3e6c2667f0b9c88cd5a700f3d6fd9619c9709;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=c13dc7f5de78c2df2376efc6ef0ff4887a368b62;hpb=38f8155bf50af2a2bf13e8767236dae924abb157;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index c13dc7f5..15a3e6c2 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,20 +1,22 @@
-// -*- 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 "widgetbase.hh"
 #include "openbox.hh"
 #include "client.hh"
+#include "screen.hh"
+#include "python.hh"
+#include "bindings.hh"
 #include "otk/display.hh"
 
 #include <stdio.h>
 
 namespace ob {
 
-const unsigned int OBActions::DOUBLECLICKDELAY = 300;
 const int OBActions::BUTTONS;
 
 OBActions::OBActions()
@@ -22,9 +24,6 @@ OBActions::OBActions()
 {
   for (int i=0; i<BUTTONS; ++i)
     _posqueue[i] = new ButtonPressAction();
-
-  // XXX: load a configuration out of somewhere
-
 }
 
 
@@ -45,7 +44,7 @@ void OBActions::insertPress(const XButtonEvent &e)
   a->pos.setPoint(e.x_root, e.y_root);
 
   OBClient *c = Openbox::instance->findClient(e.window);
-  a->clientarea = c->area();
+  if (c) a->clientarea = c->area();
 }
 
 void OBActions::removePress(const XButtonEvent &e)
@@ -68,16 +67,38 @@ 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));
+  assert(w); // everything should be a widget
 
-  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);
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  int screen;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+                 MousePress);
+  Openbox::instance->bindings()->fireButton(&data);
     
   if (_button) return; // won't count toward CLICK events
 
   _button = e.button;
+
+  if (w->mcontext() == MC_Window) {
+    /*
+      Because of how events are grabbed on the client window, we can't get
+      ButtonRelease events, so instead we simply manufacture them here, so that
+      clicks/doubleclicks etc still work.
+    */
+    //XButtonEvent ev = e;
+    //ev.type = ButtonRelease;
+    buttonReleaseHandler(e);
+  }
 }
   
 
@@ -86,12 +107,9 @@ 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);
+  assert(w); // everything should be a widget
 
   // not for the button we're watching?
   if (_button != e.button) return;
@@ -107,17 +125,33 @@ 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
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  int screen;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+                 MouseClick);
+  Openbox::instance->bindings()->fireButton(&data);
+    
 
-  if (e.time - _release.time < DOUBLECLICKDELAY &&
-      _release.win == e.window && _release.button == e.button) {
+  // XXX: dont load this every time!!@*
+  long dblclick;
+  if (!python_get_long("double_click_delay", &dblclick))
+    dblclick = 300;
 
-    // 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);
+  if (e.time - _release.time < (unsigned)dblclick &&
+      _release.win == e.window && _release.button == e.button) {
 
+    // run the DOUBLECLICK python hook
+    data.action = MouseDoubleClick;
+    Openbox::instance->bindings()->fireButton(&data);
+    
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
     _release.button = 0;
@@ -135,12 +169,15 @@ 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
+  int screen;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::findScreen(e.root)->screen();
+  EventData data(screen, c, EventEnterWindow, e.state);
+  Openbox::instance->bindings()->fireEvent(&data);
 }
 
 
@@ -148,28 +185,35 @@ 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
+  int screen;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::findScreen(e.root)->screen();
+  EventData data(screen, c, EventLeaveWindow, e.state);
+  Openbox::instance->bindings()->fireEvent(&data);
 }
 
 
 void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-  // XXX: run the KEY guile hook
-  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);
+  OtkEventHandler::keyPressHandler(e);
+
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  Openbox::instance->bindings()->
+    fireKey(otk::OBDisplay::findScreen(e.root)->screen(),
+            state, e.keycode, e.time);
 }
 
 
 void OBActions::motionHandler(const XMotionEvent &e)
 {
+  OtkEventHandler::motionHandler(e);
+
   if (!e.same_screen) return; // this just gets stupid
 
   int x_root = e.x_root, y_root = e.y_root;
@@ -186,40 +230,66 @@ void OBActions::motionHandler(const XMotionEvent &e)
     }
   }
 
-
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
+  assert(w); // everything should be a widget
+
+  // run the MOTION python hook
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  unsigned int button = _posqueue[0]->button;
+  int screen;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
+                 x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
+  Openbox::instance->bindings()->fireButton(&data);
+}
 
-  _dx = x_root - _posqueue[0]->pos.x();
-  _dy = y_root - _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);
+void OBActions::mapRequestHandler(const XMapRequestEvent &e)
+{
+  OtkEventHandler::mapRequestHandler(e);
+  // do this in OBScreen::manageWindow
+}
 
-  OBClient *c = Openbox::instance->findClient(e.window);
-  if (w && c) {
-    switch (w->type()) {
-    case OBWidget::Type_Titlebar:
-    case OBWidget::Type_Label:
-      c->move(_posqueue[0]->clientarea.x() + _dx,
-              _posqueue[0]->clientarea.y() + _dy);
-      break;
-    case OBWidget::Type_LeftGrip:
-      c->resize(OBClient::TopRight,
-                _posqueue[0]->clientarea.width() - _dx,
-                _posqueue[0]->clientarea.height() + _dy);
-      break;
-    case OBWidget::Type_RightGrip:
-      c->resize(OBClient::TopLeft,
-                _posqueue[0]->clientarea.width() + _dx,
-                _posqueue[0]->clientarea.height() + _dy);
-      break;
-    default:
-      break;
-    }
-  }
+void OBActions::unmapHandler(const XUnmapEvent &e)
+{
+  OtkEventHandler::unmapHandler(e);
+  // do this in OBScreen::unmanageWindow
 }
 
+void OBActions::destroyHandler(const XDestroyWindowEvent &e)
+{
+  OtkEventHandler::destroyHandler(e);
+  // do this in OBScreen::unmanageWindow
+}
 
+#ifdef    XKB
+void OBActions::xkbHandler(const XkbEvent &e)
+{
+  Window w;
+  int screen;
+  
+  OtkEventHandler::xkbHandler(e);
+
+  switch (((XkbAnyEvent*)&e)->xkb_type) {
+  case XkbBellNotify:
+    w = ((XkbBellNotifyEvent*)&e)->window;
+    OBClient *c = Openbox::instance->findClient(w);
+    if (c)
+      screen = c->screen();
+    else
+      screen = Openbox::instance->focusedScreen()->number();
+    EventData data(screen, c, EventBell, 0);
+    Openbox::instance->bindings()->fireEvent(&data);
+    break;
+  }
 }
+#endif // XKB
+
+}
+