X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=48eaaaf27c74973dcd72966fcc18ebfc6635b0fd;hb=9be80896ef4bc12bfd6a1d218b976c06482b6e2b;hp=1086ce4ab861aa0a0844c9f250012fbd286c2773;hpb=a0cf45a0ef5f7e2cbf0833f4d8655131912400cc;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 1086ce4a..48eaaaf2 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.
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// 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
@@ -48,27 +48,29 @@ using std::string;
 #include "../../src/XAtom.hh"
 #include "screen.hh"
 #include "epist.hh"
+#include "config.hh"
 
-
-screen::screen(epist *epist, int number) {
+screen::screen(epist *epist, int number) 
+  : _clients(epist->clientsList()),
+    _active(epist->activeWindow()) {
   _epist = epist;
   _xatom = _epist->xatom();
+  _last_active = _clients.end();
   _number = number;
-  _active = _clients.end();
   _info = _epist->getScreenInfo(_number);
   _root = _info->getRootWindow();
-  
+
   // find a window manager supporting NETWM, waiting for it to load if we must
   int count = 20;  // try for 20 seconds
   _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";
@@ -76,14 +78,8 @@ screen::screen(epist *epist, int number) {
   }
  
   XSelectInput(_epist->getXDisplay(), _root, PropertyChangeMask);
-
-  updateNumDesktops();
-  updateActiveDesktop();
-  updateClientList();
-  updateActiveWindow();
 }
 
-
 screen::~screen() {
   if (_managed)
     XSelectInput(_epist->getXDisplay(), _root, None);
@@ -120,12 +116,6 @@ void screen::processEvent(const XEvent &e) {
   assert(_managed);
   assert(e.xany.window == _root);
 
-  XWindow *window = 0;
-  if (e.xany.window != _root) {
-    window = findWindow(e);  // find the window
-    assert(window); // we caught an event for a window we don't know about!?
-  }
-
   switch (e.type) {
   case PropertyNotify:
     // root window
@@ -156,147 +146,181 @@ 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::nextWorkspace:
-        cycleWorkspace(true);
-        return;
+    cycleWindow(true, it->number() != 0 ? it->number(): 1);
+    return;
 
-      case Action::prevWorkspace:
-        cycleWorkspace(false);
-        return;
+  case Action::prevWindow:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1);
+    return;
 
-      case Action::nextWindow:
-        cycleWindow(true);
-        return;
+  case Action::nextWindowOnAllWorkspaces:
+    cycleWindow(true, it->number() != 0 ? it->number(): 1,  false, true);
+    return;
 
-      case Action::prevWindow:
-        cycleWindow(false);
-        return;
+  case Action::prevWindowOnAllWorkspaces:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1, false, true);
+    return;
 
-      case Action::nextWindowOnAllWorkspaces:
-        cycleWindow(true, true);
-        return;
+  case Action::nextWindowOnAllScreens:
+    cycleWindow(true, it->number() != 0 ? it->number(): 1, true);
+    return;
 
-      case Action::prevWindowOnAllWorkspaces:
-        cycleWindow(false, true);
-        return;
+  case Action::prevWindowOnAllScreens:
+    cycleWindow(false, it->number() != 0 ? it->number(): 1, true);
+    return;
 
-      case Action::nextWindowOfClass:
-        cycleWindow(true, false, true, it->string());
-        return;
+  case Action::nextWindowOfClass:
+    cycleWindow(true, it->number() != 0 ? it->number(): 1,
+                false, false, true, it->string());
+    return;
 
-      case Action::prevWindowOfClass:
-        cycleWindow(false, false, true, it->string());
-        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::nextWindowOfClassOnAllWorkspaces:
-        cycleWindow(true, true, true, it->string());
-        return;
+  case Action::changeWorkspace:
+    changeWorkspace(it->number());
+    return;
 
-      case Action::prevWindowOfClassOnAllWorkspaces:
-        cycleWindow(false, true, true, it->string());
-        return;
+  case Action::upWorkspace:
+    changeWorkspaceVert(-1);
+    return;
 
-      case Action::changeWorkspace:
-        changeWorkspace(it->number());
-        return;
+  case Action::downWorkspace:
+    changeWorkspaceVert(1);
+    return;
 
-      case Action::execute:
-        execCommand(it->string());
-        return;
+  case Action::leftWorkspace:
+    changeWorkspaceHorz(-1);
+    return;
 
-      default:
-        break;
-      }
+  case Action::rightWorkspace:
+    changeWorkspaceHorz(1);
+    return;
+
+  case Action::execute:
+    execCommand(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::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;
+  default:
+    break;
+  }
+
+  // these actions require an active window
+  if (_active != _clients.end()) {
+    XWindow *window = *_active;
       
-        case Action::moveWindowDown:
-          window->move(window->x(), window->y() + it->number());
-          return;
+    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::moveWindowLeft:
-          window->move(window->x() - it->number(), window->y());
-          return;
+    case Action::moveWindowDown:
+      window->move(window->x(), window->y() + it->number());
+      return;
       
-        case Action::moveWindowRight:
-          window->move(window->x() + it->number(), window->y());
-          return;
+    case Action::moveWindowLeft:
+      window->move(window->x() - it->number(), window->y());
+      return;
       
-        case Action::resizeWindowWidth:
-          window->resize(window->width() + it->number(), window->height());
-          return;
+    case Action::moveWindowRight:
+      window->move(window->x() + it->number(), window->y());
+      return;
       
-        case Action::resizeWindowHeight:
-          window->resize(window->width(), window->height() + it->number());
-          return;
+    case Action::resizeWindowWidth:
+      window->resizeRel(it->number(), 0);
+      return;
       
-        case Action::toggleshade:
-          window->shade(! window->shaded());
-          return;
+    case Action::resizeWindowHeight:
+      window->resizeRel(0, it->number());
+      return;
       
-        case Action::toggleMaximizeHorizontal:
-          window->toggleMaximize(XWindow::Max_Horz);
-          return;
+    case Action::toggleshade:
+      window->shade(! window->shaded());
+      return;
       
-        case Action::toggleMaximizeVertical:
-          window->toggleMaximize(XWindow::Max_Vert);
-          return;
+    case Action::toggleMaximizeHorizontal:
+      window->toggleMaximize(XWindow::Max_Horz);
+      return;
       
-        case Action::toggleMaximizeFull:
-          window->toggleMaximize(XWindow::Max_Full);
-          return;
+    case Action::toggleMaximizeVertical:
+      window->toggleMaximize(XWindow::Max_Vert);
+      return;
       
-        default:
-          assert(false);  // unhandled action type!
-          break;
-        }
-      }
+    case Action::toggleMaximizeFull:
+      window->toggleMaximize(XWindow::Max_Full);
+      return;
+      
+    default:
+      assert(false);  // unhandled action type!
+      break;
     }
   }
 }
@@ -318,6 +342,14 @@ bool screen::doAddWindow(Window window) const {
 }
 
 
+void screen::updateEverything() {
+  updateNumDesktops();
+  updateActiveDesktop();
+  updateClientList();
+  updateActiveWindow();
+}
+
+
 void screen::updateNumDesktops() {
   assert(_managed);
 
@@ -348,16 +380,11 @@ void screen::updateClientList() {
   Window *rootclients = 0;
   unsigned long num = (unsigned) -1;
   if (! _xatom->getValue(_root, XAtom::net_client_list, XAtom::window, num,
-                         &rootclients)) {
-    while (! _clients.empty()) {
-      delete _clients.front();
-      _clients.erase(_clients.begin());
-    }
-    if (rootclients) delete [] rootclients;
-    return;
-  }
-  
-  WindowList::iterator it, end = _clients.end();
+                         &rootclients))
+    num = 0;
+
+  WindowList::iterator it;
+  const WindowList::iterator end = _clients.end();
   unsigned long i;
   
   // insert new clients after the active window
@@ -367,21 +394,32 @@ 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]));
       }
     }
   }
 
-  // remove clients that no longer exist
+  // remove clients that no longer exist (that belong to this screen)
   for (it = _clients.begin(); it != end;) {
-    WindowList::iterator it2 = it++;
+    WindowList::iterator it2 = it;
+    ++it;
+
+    // is on another screen?
+    if ((*it2)->getScreen() != this)
+      continue;
+
     for (i = 0; i < num; ++i)
       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();
+      if (it2 == _last_active)
+        _last_active = _clients.end();
       delete *it2;
       _clients.erase(it2);
     }
@@ -391,6 +429,22 @@ void screen::updateClientList() {
 }
 
 
+const XWindow *screen::lastActiveWindow() const {
+  if (_last_active != _clients.end())
+    return *_last_active;
+
+  // find a window if one exists
+  WindowList::const_iterator it, end = _clients.end();
+  for (it = _clients.begin(); it != end; ++it)
+    if ((*it)->getScreen() == this && ! (*it)->iconic() &&
+        ((*it)->desktop() == 0xffffffff || (*it)->desktop() == _active_desktop))
+      return *it;
+
+  // no windows on this screen
+  return 0;
+}
+
+
 void screen::updateActiveWindow() {
   assert(_managed);
 
@@ -399,35 +453,33 @@ void screen::updateActiveWindow() {
   
   WindowList::iterator it, end = _clients.end();
   for (it = _clients.begin(); it != end; ++it) {
-    if (**it == a)
+    if (**it == a) {
+      if ((*it)->getScreen() != this)
+        return;
       break;
+    }
   }
   _active = it;
+  if (it != end)
+    _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 std::string &cmd) const {
+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";
@@ -435,57 +487,86 @@ void screen::execCommand(const std::string &cmd) const {
 }
 
 
-void screen::cycleWindow(const bool forward, const bool alldesktops,
+void screen::cycleWindow(const bool forward, const int increment,
+                         const bool allscreens, const bool alldesktops,
                          const bool sameclass, const string &cn) const {
   assert(_managed);
+  assert(increment > 0);
 
   if (_clients.empty()) return;
-    
-  WindowList::const_iterator target = _active;
 
-  string classname = cn;
-  if (sameclass && classname.empty() && target != _clients.end())
-    classname = (*target)->appClass();
+  string classname(cn);
+  if (sameclass && classname.empty() && _active != _clients.end())
+    classname = (*_active)->appClass();
 
-  if (target == _clients.end())
-    target = _clients.begin();
- 
-  do {
-    if (forward) {
-      ++target;
-      if (target == _clients.end())
-        target = _clients.begin();
-    } else {
-      if (target == _clients.begin())
-        target = _clients.end();
-      --target;
-    }
-  } while (target == _clients.end() ||
-           (*target)->iconic() ||
-           (! alldesktops && (*target)->desktop() != _active_desktop) ||
-           (sameclass && ! classname.empty() &&
-            (*target)->appClass() != classname));
+  WindowList::const_iterator target = _active,
+    begin = _clients.begin(),
+    end = _clients.end();
+
+  const XWindow *t = 0;
   
-  if (target != _clients.end())
-    (*target)->focus();
+  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;
+      }
+
+      // 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;
+    }
+  }
+
+  // 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);
+  assert(increment > 0);
 
   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) 
@@ -499,6 +580,66 @@ void screen::changeWorkspace(const int num) const {
   _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num);
 }
 
+void screen::changeWorkspaceVert(const int num) const {
+  assert(_managed);
+  const Config *conf = _epist->getConfig();
+  int width = conf->getNumberValue(Config::workspaceColumns);
+
+  if (width > _num_desktops || width <= 0)
+    return;
+
+  int wnum;
+  
+  // a cookie to the person that makes this pretty
+  if (num < 0) {
+    wnum = _active_desktop - width;
+    if (wnum < 0) {
+      wnum = _num_desktops/width * width + _active_desktop;
+      if (wnum >= _num_desktops)
+        wnum = _num_desktops - 1;
+    }
+  }
+  else {
+    wnum = _active_desktop + width;
+    if (wnum >= _num_desktops) {
+      wnum = (_active_desktop + width) % _num_desktops - 1;
+      if (wnum < 0)
+        wnum = 0;
+    }
+  }
+  changeWorkspace(wnum);
+}
+
+void screen::changeWorkspaceHorz(const int num) const {
+  assert(_managed);
+  const Config *conf = _epist->getConfig();
+  int width = conf->getNumberValue(Config::workspaceColumns);
+  int wnum;
+  
+  if (width > _num_desktops || width <= 0)
+    return;
+
+  if (num < 0) {
+    if (_active_desktop % width != 0)
+      changeWorkspace(_active_desktop - 1);
+    else {
+      wnum = _active_desktop + width - 1;
+      if (wnum >= _num_desktops)
+        wnum = _num_desktops - 1;
+    }
+  }
+  else {
+    if (_active_desktop % width != width - 1) {
+      wnum = _active_desktop + 1;
+      if (wnum >= _num_desktops)
+        wnum = _num_desktops / width * width;
+    }
+    else
+      wnum = _active_desktop - width + 1;
+  }
+  changeWorkspace(wnum);
+}
+
 void screen::grabKey(const KeyCode keyCode, const int modifierMask) const {
 
   Display *display = _epist->getXDisplay();
@@ -532,3 +673,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);
+}