resizing works and whatnot

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index b83b521dd1794f6b96a0efe2cad72a0b4f77dd3a..c13dc7f5de78c2df2376efc6ef0ff4887a368b62 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,6 +5,9 @@
 #endif
 
 #include "actions.hh"
+#include "widget.hh"
+#include "openbox.hh"
+#include "client.hh"
 #include "otk/display.hh"
 
 #include <stdio.h>
@@ -39,7 +42,10 @@ void OBActions::insertPress(const XButtonEvent &e)
     _posqueue[i] = _posqueue[--i];
   _posqueue[0] = a;
   a->button = e.button;
-  a->pos.setPoint(e.x, e.y);
+  a->pos.setPoint(e.x_root, e.y_root);
+
+  OBClient *c = Openbox::instance->findClient(e.window);
+  a->clientarea = c->area();
 }
 
 void OBActions::removePress(const XButtonEvent &e)
@@ -63,8 +69,11 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
   insertPress(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);
+  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);
     
   if (_button) return; // won't count toward CLICK events
 
@@ -78,8 +87,11 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
   removePress(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);
+  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;
@@ -96,15 +108,15 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     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);
+  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);
 
   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 modifiers %u button %u time %lx\n",
-           (long)e.window, e.state, e.button, e.time);
+    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);
 
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -124,7 +136,11 @@ void OBActions::enterHandler(const XCrossingEvent &e)
   OtkEventHandler::enterHandler(e);
   
   // XXX: run the ENTER guile hook
-  printf("GUILE: ENTER: win %lx modifiers %u\n", (long)e.window, e.state);
+  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);
 }
 
 
@@ -133,15 +149,22 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
   OtkEventHandler::leaveHandler(e);
 
   // XXX: run the LEAVE guile hook
-  printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)e.window, e.state);
+  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);
 }
 
 
 void OBActions::keyPressHandler(const XKeyEvent &e)
 {
   // XXX: run the KEY guile hook
-  printf("GUILE: KEY: win %lx modifiers %u keycode %u\n",
-         (long)e.window, e.state, e.keycode);
+  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);
 }
 
 
@@ -149,10 +172,53 @@ 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 = 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 modifiers %u x %d y %d\n",
-         (long)e.window, e.state,
-         e.x - _posqueue[0]->pos.x(), e.y - _posqueue[0]->pos.y());
+  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);
+
+  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;
+    }
+  }
 }