X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=eb9edc39fd93fcbbaad9e1e508761d04c322fd9f;hb=2241f5c8eaa932d458791dc559f420b9dd58fef4;hp=281a093e3aa10745bee6978eb301b5a6b6302670;hpb=33cce0d97e6ec4ccf11775a450cb65f5938c88b7;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 281a093e..eb9edc39 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -1,5 +1,5 @@
 // -*- mode: C++; indent-tabs-mode: nil; -*-
-// screen.cc for Epistophy - a key handler for NETWM/EWMH window managers.
+// screen.cc for Epistrophy - a key handler for NETWM/EWMH window managers.
 // Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -65,12 +65,12 @@ screen::screen(epist *epist, int number)
   _managed = false;
   while (! (_epist->doShutdown() || _managed || count <= 0)) {
     if (! (_managed = findSupportingWM()))
-      usleep(1000);
+      sleep(1);
     --count;
   }
   if (_managed)
     cout << "Found compatible window manager '" << _wm_name << "' for screen "
-      << _number << ".\n";
+         << _number << ".\n";
   else {
     cout << "Unable to find a compatible window manager for screen " <<
       _number << ".\n";
@@ -146,163 +146,165 @@ void screen::processEvent(const XEvent &e) {
 
 void screen::handleKeypress(const XEvent &e) {
   int scrolllockMask, numlockMask;
-
-  ActionList::const_iterator it = _epist->actions().begin();
-  ActionList::const_iterator end = _epist->actions().end();
-
   _epist->getLockModifiers(numlockMask, scrolllockMask);
   
-  for (; it != end; ++it) {
-    unsigned int state = e.xkey.state & ~(LockMask|scrolllockMask|numlockMask);
+  // Mask out the lock modifiers. We want our keys to always work
+  // This should be made an option
+  unsigned int state = e.xkey.state & ~(LockMask|scrolllockMask|numlockMask);
+  const Action *it = _epist->getKeyTree().getAction(e, state, this);
+  
+  if (!it)
+    return;
+
+  switch (it->type()) {
+  case Action::nextScreen:
+    _epist->cycleScreen(_number, true);
+    return;
+
+  case Action::prevScreen:
+    _epist->cycleScreen(_number, false);
+    return;
+
+  case Action::nextWorkspace:
+    cycleWorkspace(true, it->number() != 0 ? it->number(): 1);
+    return;
+
+  case Action::prevWorkspace:
+    cycleWorkspace(false, it->number() != 0 ? it->number(): 1);
+    return;
+
+  case Action::nextWindow:
     
-    if (e.xkey.keycode == it->keycode() &&
-        state == it->modifierMask()) {
-      switch (it->type()) {
-      case Action::nextScreen:
-        _epist->cycleScreen(_number, true);
-        return;
+    cycleWindow(true, it->number() != 0 ? it->number(): 1);
+    return;
 
-      case Action::prevScreen:
-        _epist->cycleScreen(_number, false);
-        return;
+  case Action::prevWindow:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1);
+    return;
 
-      case Action::nextWorkspace:
-        cycleWorkspace(true);
-        return;
+  case Action::nextWindowOnAllWorkspaces:
+    cycleWindow(true, it->number() != 0 ? it->number(): 1,  false, true);
+    return;
 
-      case Action::prevWorkspace:
-        cycleWorkspace(false);
-        return;
+  case Action::prevWindowOnAllWorkspaces:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1, false, true);
+    return;
 
-      case Action::nextWindow:
-        cycleWindow(true);
-        return;
+  case Action::nextWindowOnAllScreens:
+    cycleWindow(true, it->number() != 0 ? it->number(): 1, true);
+    return;
 
-      case Action::prevWindow:
-        cycleWindow(false);
-        return;
+  case Action::prevWindowOnAllScreens:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1, true);
+    return;
 
-      case Action::nextWindowOnAllWorkspaces:
-        cycleWindow(true, false, true);
-        return;
+  case Action::nextWindowOfClass:
+    cycleWindow(true, it->number() != 0 ? it->number(): 1,
+                false, false, true, it->string());
+    return;
 
-      case Action::prevWindowOnAllWorkspaces:
-        cycleWindow(false, false, true);
-        return;
+  case Action::prevWindowOfClass:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1,
+                false, false, true, it->string());
+    return;
+      
+  case Action::nextWindowOfClassOnAllWorkspaces:
+    cycleWindow(true, it->number() != 0 ? it->number(): 1,
+                false, true, true, it->string());
+    return;
+      
+  case Action::prevWindowOfClassOnAllWorkspaces:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1,
+                false, true, true, it->string());
+    return;
 
-      case Action::nextWindowOnAllScreens:
-        cycleWindow(true, true);
-        return;
+  case Action::changeWorkspace:
+    changeWorkspace(it->number());
+    return;
 
-      case Action::prevWindowOnAllScreens:
-        cycleWindow(false, true);
-        return;
+  case Action::execute:
+    execCommand(it->string());
+    return;
 
-      case Action::nextWindowOfClass:
-        cycleWindow(true, false, false, true, it->string());
-        return;
+  default:
+    break;
+  }
 
-      case Action::prevWindowOfClass:
-        cycleWindow(false, false, false, true, it->string());
-        return;
+  // these actions require an active window
+  if (_active != _clients.end()) {
+    XWindow *window = *_active;
+      
+    switch (it->type()) {
+    case Action::iconify:
+      window->iconify();
+      return;
 
-      case Action::nextWindowOfClassOnAllWorkspaces:
-        cycleWindow(true, false, true, true, it->string());
-        return;
+    case Action::close:
+      window->close();
+      return;
 
-      case Action::prevWindowOfClassOnAllWorkspaces:
-        cycleWindow(false, false, true, true, it->string());
-        return;
+    case Action::raise:
+      window->raise();
+      return;
 
-      case Action::changeWorkspace:
-        changeWorkspace(it->number());
-        return;
+    case Action::lower:
+      window->lower();
+      return;
 
-      case Action::execute:
-        execCommand(it->string());
-        return;
+    case Action::sendToWorkspace:
+      window->sendTo(it->number());
+      return;
 
-      default:
-        break;
-      }
+    case Action::toggleomnipresent:
+      if (window->desktop() == 0xffffffff)
+        window->sendTo(_active_desktop);
+      else
+        window->sendTo(0xffffffff);
+      return;
 
-      // these actions require an active window
-      if (_active != _clients.end()) {
-        XWindow *window = *_active;
-
-        switch (it->type()) {
-        case Action::iconify:
-          window->iconify();
-          return;
-
-        case Action::close:
-          window->close();
-          return;
-
-        case Action::raise:
-          window->raise();
-          return;
-
-        case Action::lower:
-          window->lower();
-          return;
-
-        case Action::sendToWorkspace:
-          window->sendTo(it->number());
-          return;
-
-        case Action::toggleomnipresent:
-          if (window->desktop() == 0xffffffff)
-            window->sendTo(_active_desktop);
-          else
-            window->sendTo(0xffffffff);
-          return;
-
-        case Action::moveWindowUp:
-          window->move(window->x(), window->y() - it->number());
-          return;
+    case Action::moveWindowUp:
+      window->move(window->x(), window->y() - it->number());
+      return;
       
-        case Action::moveWindowDown:
-          window->move(window->x(), window->y() + it->number());
-          return;
+    case Action::moveWindowDown:
+      window->move(window->x(), window->y() + it->number());
+      return;
       
-        case Action::moveWindowLeft:
-          window->move(window->x() - it->number(), window->y());
-          return;
+    case Action::moveWindowLeft:
+      window->move(window->x() - it->number(), window->y());
+      return;
       
-        case Action::moveWindowRight:
-          window->move(window->x() + it->number(), window->y());
-          return;
+    case Action::moveWindowRight:
+      window->move(window->x() + it->number(), window->y());
+      return;
       
-        case Action::resizeWindowWidth:
-          window->resize(window->width() + it->number(), window->height());
-          return;
+    case Action::resizeWindowWidth:
+      window->resizeRel(it->number(), 0);
+      return;
       
-        case Action::resizeWindowHeight:
-          window->resize(window->width(), window->height() + it->number());
-          return;
+    case Action::resizeWindowHeight:
+      window->resizeRel(0, it->number());
+      return;
       
-        case Action::toggleshade:
-          window->shade(! window->shaded());
-          return;
+    case Action::toggleshade:
+      window->shade(! window->shaded());
+      return;
       
-        case Action::toggleMaximizeHorizontal:
-          window->toggleMaximize(XWindow::Max_Horz);
-          return;
+    case Action::toggleMaximizeHorizontal:
+      window->toggleMaximize(XWindow::Max_Horz);
+      return;
       
-        case Action::toggleMaximizeVertical:
-          window->toggleMaximize(XWindow::Max_Vert);
-          return;
+    case Action::toggleMaximizeVertical:
+      window->toggleMaximize(XWindow::Max_Vert);
+      return;
       
-        case Action::toggleMaximizeFull:
-          window->toggleMaximize(XWindow::Max_Full);
-          return;
+    case Action::toggleMaximizeFull:
+      window->toggleMaximize(XWindow::Max_Full);
+      return;
       
-        default:
-          assert(false);  // unhandled action type!
-          break;
-        }
-      }
+    default:
+      assert(false);  // unhandled action type!
+      break;
     }
   }
 }
@@ -376,7 +378,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]));
       }
@@ -396,7 +398,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;
       // watch for the active and last-active window
       if (it2 == _active)
         _active = _clients.end();
@@ -442,34 +444,25 @@ void screen::updateActiveWindow() {
     }
   }
   _active = it;
-  if (it != end)
-    _last_active = it;
+  _last_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;
+  */
 }
 
 
 void screen::execCommand(const string &cmd) const {
   pid_t pid;
   if ((pid = fork()) == 0) {
-    extern char **environ;
-
-    char *const argv[] = {
-      "sh",
-      "-c",
-      const_cast<char *>(cmd.c_str()),
-      0
-    };
     // make the command run on the correct screen
     if (putenv(const_cast<char*>(_info->displayString().c_str()))) {
       cout << "warning: couldn't set environment variable 'DISPLAY'\n";
       perror("putenv()");
     }
-    execve("/bin/sh", argv, environ);
-    exit(127);
+    execl("/bin/sh", "sh", "-c", cmd.c_str(), NULL);
+    exit(-1);
   } else if (pid == -1) {
     cout << _epist->getApplicationName() <<
       ": Could not fork a process for executing a command\n";
@@ -477,68 +470,83 @@ void screen::execCommand(const string &cmd) const {
 }
 
 
-void screen::cycleWindow(const bool forward, const bool allscreens,
-                         const bool alldesktops, const bool sameclass,
-                         const string &cn) const {
+void screen::cycleWindow(const bool forward, const int increment,
+                         const bool allscreens, const bool alldesktops,
+                         const bool sameclass, const string &cn) const {
   assert(_managed);
 
   if (_clients.empty()) return;
-  
+
   string classname(cn);
   if (sameclass && classname.empty() && _active != _clients.end())
     classname = (*_active)->appClass();
 
   WindowList::const_iterator target = _active,
-                             first = _active,
-                             begin = _clients.begin(),
-                             end = _clients.end();
- 
-  do {
-    if (forward) {
-      if (target == end) {
-        target = begin;
-      } else {
-        ++target;
-        if (target == end)
+    begin = _clients.begin(),
+    end = _clients.end();
+
+  const XWindow *t;
+  
+  for (int x = 0; x < increment; ++x) {
+    while (1) {
+      if (forward) {
+        if (target == end) {
           target = begin;
+        } else {
+          ++target;
+        }
+      } else {
+        if (target == begin)
+          target = end;
+        --target;
       }
-    } else {
-      if (target == begin)
-        target = end;
-      --target;
+
+      // must be no window to focus
+      if (target == _active)
+        return;
+
+      // start back at the beginning of the loop
+      if (target == end)
+        continue;
+
+      // determine if this window is invalid for cycling to
+      t = *target;
+      if (t->iconic()) continue;
+      if (! allscreens && t->getScreen() != this) continue;
+      if (! alldesktops && ! (t->desktop() == _active_desktop ||
+                              t->desktop() == 0xffffffff)) continue;
+      if (sameclass && ! classname.empty() &&
+          t->appClass() != classname) continue;
+      if (! t->canFocus()) continue;
+
+      // found a good window so break out of the while, and perhaps continue
+      // with the for loop
+      break;
     }
+  }
 
-    // must be no window to focus
-    if (target == first)
-      return;
-  } while ((*target)->iconic() ||
-           (! allscreens && (*target)->getScreen() != this) ||
-           (! alldesktops &&
-            (*target)->desktop() != _active_desktop &&
-            (*target)->desktop() != 0xffffffff) ||
-           (sameclass && ! classname.empty() &&
-            (*target)->appClass() != classname));
-  
-  if (target != _clients.end())
-    (*target)->focus();
+  // phew. we found the window, so focus it.
+  t->focus();
 }
 
 
-void screen::cycleWorkspace(const bool forward, const bool loop) const {
+void screen::cycleWorkspace(const bool forward, const int increment, const bool loop) const {
   assert(_managed);
 
   unsigned int destination = _active_desktop;
 
-  if (forward) {
-    if (destination < _num_desktops - 1)
-      ++destination;
-    else if (loop)
-      destination = 0;
-  } else {
-    if (destination > 0)
-      --destination;
-    else if (loop)
-      destination = _num_desktops - 1;
+  for (int x = 0; x < increment; ++x) {
+    if (forward) {
+      if (destination < _num_desktops - 1)
+        ++destination;
+      else if (loop)
+        destination = 0;
+    } else {
+      if (destination > 0)
+        --destination;
+      else if (loop)
+        destination = _num_desktops - 1;
+    }
   }
 
   if (destination != _active_desktop) 
@@ -585,3 +593,21 @@ void screen::grabKey(const KeyCode keyCode, const int modifierMask) const {
            modifierMask|numlockMask|LockMask|scrolllockMask,
            _root, True, GrabModeAsync, GrabModeAsync);
 }
+
+void screen::ungrabKey(const KeyCode keyCode, const int modifierMask) const {
+
+  Display *display = _epist->getXDisplay();
+  int numlockMask, scrolllockMask;
+
+  _epist->getLockModifiers(numlockMask, scrolllockMask);
+
+  XUngrabKey(display, keyCode, modifierMask, _root);
+  XUngrabKey(display, keyCode, modifierMask|LockMask, _root);
+  XUngrabKey(display, keyCode, modifierMask|scrolllockMask, _root);
+  XUngrabKey(display, keyCode, modifierMask|numlockMask, _root);
+  XUngrabKey(display, keyCode, modifierMask|LockMask|scrolllockMask, _root);
+  XUngrabKey(display, keyCode, modifierMask|scrolllockMask|numlockMask, _root);
+  XUngrabKey(display, keyCode, modifierMask|numlockMask|LockMask, _root);
+  XUngrabKey(display, keyCode, modifierMask|numlockMask|LockMask|
+             scrolllockMask, _root);
+}