X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=78f3a9d0805b5c2a21707685075ce8552cc3b0cb;hb=df7120d5ff0942dcae5a20bed79052e7be9bc1d1;hp=cd749aeea2b3a5421f035f02908bbe73799c130f;hpb=f7a41999bfa20750f192d7fa5447bb133451db76;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index cd749aee..78f3a9d0 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -246,25 +246,45 @@ void screen::handleKeypress(const XEvent &e) {
           return;
 
         case Action::moveWindowUp:
-          window->move(0, -it->number());
+          window->move(window->x(), window->y() - it->number());
           return;
       
         case Action::moveWindowDown:
-          window->move(0, it->number());
+          window->move(window->x(), window->y() + it->number());
           return;
       
         case Action::moveWindowLeft:
-          window->move(-it->number(), 0);
+          window->move(window->x() - it->number(), window->y());
           return;
       
         case Action::moveWindowRight:
-          window->move(it->number(), 0);
+          window->move(window->x() + it->number(), window->y());
+          return;
+      
+        case Action::resizeWindowWidth:
+          window->resize(window->width() + it->number(), window->height());
+          return;
+      
+        case Action::resizeWindowHeight:
+          window->resize(window->width(), window->height() + it->number());
           return;
       
         case Action::toggleshade:
           window->shade(! window->shaded());
           return;
       
+        case Action::toggleMaximizeHorizontal:
+          window->toggleMaximize(XWindow::Max_Horz);
+          return;
+      
+        case Action::toggleMaximizeVertical:
+          window->toggleMaximize(XWindow::Max_Vert);
+          return;
+      
+        case Action::toggleMaximizeFull:
+          window->toggleMaximize(XWindow::Max_Full);
+          return;
+      
         default:
           assert(false);  // unhandled action type!
           break;
@@ -340,7 +360,7 @@ void screen::updateClientList() {
         break;
     if (it == end) {  // didn't already exist
       if (doAddWindow(rootclients[i])) {
-        cout << "Added window: 0x" << hex << rootclients[i] << dec << endl;
+        //cout << "Added window: 0x" << hex << rootclients[i] << dec << endl;
         _clients.insert(insert_point, new XWindow(_epist, this,
                                                   rootclients[i]));
       }
@@ -354,7 +374,7 @@ void screen::updateClientList() {
       if (**it2 == rootclients[i])
         break;
     if (i == num)  { // no longer exists
-      cout << "Removed window: 0x" << hex << (*it2)->window() << dec << endl;
+      //cout << "Removed window: 0x" << hex << (*it2)->window() << dec << endl;
       delete *it2;
       _clients.erase(it2);
     }
@@ -377,9 +397,9 @@ void screen::updateActiveWindow() {
   }
   _active = it;
 
-  cout << "Active window is now: ";
-  if (_active == _clients.end()) cout << "None\n";
-  else cout << "0x" << hex << (*_active)->window() << dec << endl;
+  //cout << "Active window is now: ";
+  //if (_active == _clients.end()) cout << "None\n";
+  //else cout << "0x" << hex << (*_active)->window() << dec << endl;
 }