X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=99de22b4c0ed7a7018bf90bc09da554064a51329;hb=f6a3cd61f814c9a5190acb4af3b339dd4cd08647;hp=d6ce9bbbd0591cde2ccf3367a8f303e4537d0c80;hpb=92864e8d1db97ed3154b4b40a9318dbe26d978be;p=chaz%2Fopenbox diff --git a/util/epist/screen.cc b/util/epist/screen.cc index d6ce9bbb..99de22b4 100644 --- a/util/epist/screen.cc +++ b/util/epist/screen.cc @@ -25,6 +25,10 @@ #endif // HAVE_CONFIG_H extern "C" { +#ifdef HAVE_STDIO_H +# include +#endif // HAVE_STDIO_H + #ifdef HAVE_UNISTD_H # include # include @@ -40,6 +44,7 @@ using std::hex; using std::dec; using std::string; +#include "../../src/BaseDisplay.hh" #include "../../src/XAtom.hh" #include "screen.hh" #include "epist.hh" @@ -50,7 +55,8 @@ screen::screen(epist *epist, int number) { _xatom = _epist->xatom(); _number = number; _active = _clients.end(); - _root = RootWindow(_epist->getXDisplay(), _number); + _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 @@ -114,12 +120,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 @@ -149,11 +149,18 @@ 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); + if (e.xkey.keycode == it->keycode() && - e.xkey.state == it->modifierMask()) { + state == it->modifierMask()) { switch (it->type()) { case Action::nextWorkspace: cycleWorkspace(true); @@ -180,24 +187,31 @@ void screen::handleKeypress(const XEvent &e) { return; case Action::nextWindowOfClass: - cycleWindow(true, false, true); + cycleWindow(true, false, true, it->string()); return; case Action::prevWindowOfClass: - cycleWindow(false, false, true); + cycleWindow(false, false, true, it->string()); return; case Action::nextWindowOfClassOnAllWorkspaces: - cycleWindow(true, true, true); + cycleWindow(true, true, true, it->string()); return; case Action::prevWindowOfClassOnAllWorkspaces: - cycleWindow(false, true, true); + cycleWindow(false, true, true, it->string()); return; case Action::changeWorkspace: changeWorkspace(it->number()); return; + + case Action::execute: + execCommand(it->string()); + return; + + default: + break; } // these actions require an active window @@ -221,9 +235,60 @@ void screen::handleKeypress(const XEvent &e) { 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::moveWindowDown: + window->move(window->x(), window->y() + it->number()); + 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::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; } } } @@ -277,16 +342,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 @@ -296,7 +356,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])); } @@ -305,12 +365,17 @@ void screen::updateClientList() { // remove clients that no longer exist for (it = _clients.begin(); it != end;) { - WindowList::iterator it2 = it++; + WindowList::iterator it2 = it; + ++it; + 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 window + if (it2 == _active) + _active = _clients.end(); delete *it2; _clients.erase(it2); } @@ -333,31 +398,51 @@ 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; } -/* - * use this when execing a command to have it on the right screen - string dtmp = (string)"DISPLAY=" + display_name; - if (putenv(const_cast(dtmp.c_str()))) { - cout << "warning: couldn't set environment variable 'DISPLAY'\n"; - perror("putenv()"); - } - */ + +void screen::execCommand(const std::string &cmd) const { + pid_t pid; + if ((pid = fork()) == 0) { + extern char **environ; + + char *const argv[] = { + "sh", + "-c", + const_cast(cmd.c_str()), + 0 + }; + // make the command run on the correct screen + if (putenv(const_cast(_info->displayString().c_str()))) { + cout << "warning: couldn't set environment variable 'DISPLAY'\n"; + perror("putenv()"); + } + execve("/bin/sh", argv, environ); + exit(127); + } else if (pid == -1) { + cout << _epist->getApplicationName() << + ": Could not fork a process for executing a command\n"; + } +} void screen::cycleWindow(const bool forward, const bool alldesktops, - const bool sameclass) const { + const bool sameclass, const string &cn) const { assert(_managed); - if (_clients.empty()) return; - WindowList::const_iterator target = _active; + string classname = cn; + if (sameclass && classname.empty() && target != _clients.end()) + classname = (*target)->appClass(); + if (target == _clients.end()) target = _clients.begin(); + + WindowList::const_iterator begin = target; do { if (forward) { @@ -369,11 +454,15 @@ void screen::cycleWindow(const bool forward, const bool alldesktops, target = _clients.end(); --target; } + + // no window to focus + if (target == begin) + return; } while (target == _clients.end() || (*target)->iconic() || (! alldesktops && (*target)->desktop() != _active_desktop) || - (sameclass && _active != _clients.end() && - (*target)->appClass() != (*_active)->appClass())); + (sameclass && ! classname.empty() && + (*target)->appClass() != classname)); if (target != _clients.end()) (*target)->focus(); @@ -407,3 +496,37 @@ void screen::changeWorkspace(const int num) const { _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num); } + +void screen::grabKey(const KeyCode keyCode, const int modifierMask) const { + + Display *display = _epist->getXDisplay(); + int numlockMask, scrolllockMask; + + _epist->getLockModifiers(numlockMask, scrolllockMask); + + XGrabKey(display, keyCode, modifierMask, + _root, True, GrabModeAsync, GrabModeAsync); + XGrabKey(display, keyCode, + modifierMask|LockMask, + _root, True, GrabModeAsync, GrabModeAsync); + XGrabKey(display, keyCode, + modifierMask|scrolllockMask, + _root, True, GrabModeAsync, GrabModeAsync); + XGrabKey(display, keyCode, + modifierMask|numlockMask, + _root, True, GrabModeAsync, GrabModeAsync); + + XGrabKey(display, keyCode, + modifierMask|LockMask|scrolllockMask, + _root, True, GrabModeAsync, GrabModeAsync); + XGrabKey(display, keyCode, + modifierMask|scrolllockMask|numlockMask, + _root, True, GrabModeAsync, GrabModeAsync); + XGrabKey(display, keyCode, + modifierMask|numlockMask|LockMask, + _root, True, GrabModeAsync, GrabModeAsync); + + XGrabKey(display, keyCode, + modifierMask|numlockMask|LockMask|scrolllockMask, + _root, True, GrabModeAsync, GrabModeAsync); +}