X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=98ad67f276dce330ee51925e31571494fa5e8fb8;hb=f32096dcd2c5a4e44763def56c290ce37aa548ba;hp=fd65db4c5e6796f8a1ac9a688ee50a486b5819d9;hpb=c517f511000c8ec775f7413527b9e276b7995806;p=chaz%2Fopenbox diff --git a/util/epist/screen.cc b/util/epist/screen.cc index fd65db4c..98ad67f2 100644 --- a/util/epist/screen.cc +++ b/util/epist/screen.cc @@ -40,6 +40,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 +51,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 @@ -70,7 +72,9 @@ screen::screen(epist *epist, int number) { } XSelectInput(_epist->getXDisplay(), _root, PropertyChangeMask); - + + updateNumDesktops(); + updateActiveDesktop(); updateClientList(); updateActiveWindow(); } @@ -121,6 +125,10 @@ void screen::processEvent(const XEvent &e) { switch (e.type) { case PropertyNotify: // root window + if (e.xproperty.atom == _xatom->getAtom(XAtom::net_number_of_desktops)) + updateNumDesktops(); + if (e.xproperty.atom == _xatom->getAtom(XAtom::net_current_desktop)) + updateActiveDesktop(); if (e.xproperty.atom == _xatom->getAtom(XAtom::net_active_window)) updateActiveWindow(); if (e.xproperty.atom == _xatom->getAtom(XAtom::net_client_list)) { @@ -145,29 +153,96 @@ void screen::processEvent(const XEvent &e) { void screen::handleKeypress(const XEvent &e) { ActionList::const_iterator it = _epist->actions().begin(); ActionList::const_iterator end = _epist->actions().end(); - cout << "key press\n"; for (; it != end; ++it) { if (e.xkey.keycode == it->keycode() && e.xkey.state == it->modifierMask()) { switch (it->type()) { case Action::nextWorkspace: cycleWorkspace(true); - break; + return; case Action::prevWorkspace: cycleWorkspace(false); - break; + return; + + case Action::nextWindow: + cycleWindow(true); + return; + + case Action::prevWindow: + cycleWindow(false); + return; + + case Action::nextWindowOnAllWorkspaces: + cycleWindow(true, true); + return; + + case Action::prevWindowOnAllWorkspaces: + cycleWindow(false, true); + return; + + case Action::nextWindowOfClass: + cycleWindow(true, false, true); + return; + + case Action::prevWindowOfClass: + cycleWindow(false, false, true); + return; + + case Action::nextWindowOfClassOnAllWorkspaces: + cycleWindow(true, true, true); + return; + + case Action::prevWindowOfClassOnAllWorkspaces: + cycleWindow(false, true, true); + return; case Action::changeWorkspace: changeWorkspace(it->number()); - break; + return; - case Action::shade: - (*_active)->shade(! (*_active)->shaded()); - break; + case Action::execute: + execCommand("aterm"); + return; } - break; + // 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::toggleshade: + window->shade(! window->shaded()); + return; + } + } } } } @@ -189,6 +264,25 @@ bool screen::doAddWindow(Window window) const { } +void screen::updateNumDesktops() { + assert(_managed); + + if (! _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal, + (unsigned long)_num_desktops)) + _num_desktops = 1; // assume that there is at least 1 desktop! +} + + +void screen::updateActiveDesktop() { + assert(_managed); + + if (! _xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal, + (unsigned long)_active_desktop)) + _active_desktop = 0; // there must be at least one desktop, and it must + // be the current one +} + + void screen::updateClientList() { assert(_managed); @@ -261,38 +355,88 @@ void screen::updateActiveWindow() { 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::cycleWorkspace(const bool forward) const { - unsigned long currentDesktop = 0; - unsigned long numDesktops = 0; - - if (_xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal, - currentDesktop)) { - if (forward) - ++currentDesktop; - else - --currentDesktop; - - _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal, - numDesktops); +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 { + assert(_managed); + + if (_clients.empty()) return; - if ( ( (signed)currentDesktop) == -1) - currentDesktop = numDesktops - 1; - else if (currentDesktop >= numDesktops) - currentDesktop = 0; + WindowList::const_iterator target = _active; - changeWorkspace(currentDesktop); + 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 && _active != _clients.end() && + (*target)->appClass() != (*_active)->appClass())); + + if (target != _clients.end()) + (*target)->focus(); +} + + +void screen::cycleWorkspace(const bool forward, 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; } + + if (destination != _active_desktop) + changeWorkspace(destination); } + void screen::changeWorkspace(const int num) const { + assert(_managed); + _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num); }