X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fwindow.cc;h=695322729ad0288f20772f97b2cc16ebdfc1ff72;hb=cd6c4ebcb27b796b214296aefd78a41235dd8640;hp=7ee674268551c8e3d8598bc66a2f717472967d1c;hpb=6595476d81f01cee9001bbc90dda5b37915e5821;p=chaz%2Fopenbox

diff --git a/util/epist/window.cc b/util/epist/window.cc
index 7ee67426..69532272 100644
--- a/util/epist/window.cc
+++ b/util/epist/window.cc
@@ -44,8 +44,9 @@ XWindow::XWindow(epist *epist, screen *screen, Window window)
   XSelectInput(_epist->getXDisplay(), _window,
                PropertyChangeMask | StructureNotifyMask);
 
+  updateNormalHints();
+  updateWMHints();
   updateDimentions();
-  updateGravity();
   updateState();
   updateDesktop();
   updateTitle();
@@ -77,15 +78,40 @@ void XWindow::updateDimentions() {
 }
 
 
-void XWindow::updateGravity() {
+void XWindow::updateNormalHints() {
   XSizeHints size;
   long ret;
 
-  if (XGetWMNormalHints(_epist->getXDisplay(), _window, &size, &ret) &&
-      (size.flags & PWinGravity))
-    _gravity = size.win_gravity;
-  else
-    _gravity = NorthWestGravity;
+  // defaults
+  _gravity = NorthWestGravity;
+  _inc_x = _inc_y = 1;
+  _base_x = _base_y = 0;
+  
+  if (XGetWMNormalHints(_epist->getXDisplay(), _window, &size, &ret)) {
+    if (size.flags & PWinGravity)
+      _gravity = size.win_gravity;
+    if (size.flags & PBaseSize) {
+      _base_x = size.base_width;
+      _base_y = size.base_height;
+    }
+    if (size.flags & PResizeInc) {
+      _inc_x = size.width_inc;
+      _inc_y = size.height_inc;
+    }
+  }
+}
+
+
+void XWindow::updateWMHints() {
+  XWMHints *hints;
+
+  if ((hints = XGetWMHints(_epist->getXDisplay(), _window)) != NULL) {
+    _can_focus = hints->input;
+    XFree(hints);
+  } else {
+    // assume a window takes input if it doesnt specify
+    _can_focus = True;
+  }
 }
 
 
@@ -158,7 +184,9 @@ void XWindow::processEvent(const XEvent &e) {
     break;
   case PropertyNotify:
     if (e.xproperty.atom == XA_WM_NORMAL_HINTS)
-      updateGravity();
+      updateNormalHints();
+    if (e.xproperty.atom == XA_WM_HINTS)
+      updateWMHints();
     else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_wm_state))
       updateState();
     else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_wm_desktop))
@@ -207,9 +235,12 @@ void XWindow::iconify() const {
 
 
 void XWindow::focus() const {
-  // this will also unshade the window..
+  cout << "Focusing window: 0x" << hex << _window << dec << endl;
+  // this will cause the window to be uniconified also
   _xatom->sendClientMessage(_screen->rootWindow(), XAtom::net_active_window,
                             _window);
+ 
+  //XSetInputFocus(_epist->getXDisplay(), _window, None, CurrentTime);
 }
 
 
@@ -307,7 +338,27 @@ void XWindow::move(int x, int y) const {
 
 
 void XWindow::resize(unsigned int width, unsigned int height) const {
-  XResizeWindow(_epist->getXDisplay(), _window, width, height);
+  // resize in increments if requested by the window
+
+  unsigned int wdest = width / _inc_x * _inc_x + _base_x;
+  unsigned int hdest = height / _inc_y * _inc_y + _base_y;
+
+  if (width > wdest) {
+    while (width > wdest)
+      wdest += _inc_x;
+  } else {
+    while (width < wdest)
+      wdest -= _inc_x;
+  }
+  if (height > hdest) {
+    while (height > hdest)
+      hdest += _inc_y;
+  } else {
+    while (height < hdest)
+      hdest -= _inc_y;
+  }
+  
+  XResizeWindow(_epist->getXDisplay(), _window, wdest, hdest);
 }