#endif // HAVE_CONFIG_H
extern "C" {
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif // HAVE_STDIO_H
+
#ifdef HAVE_UNISTD_H
# include <sys/types.h>
# include <unistd.h>
using std::dec;
using std::string;
+#include "../../src/BaseDisplay.hh"
#include "../../src/XAtom.hh"
#include "screen.hh"
#include "epist.hh"
_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
case Action::changeWorkspace:
changeWorkspace(it->number());
return;
+
+ case Action::execute:
+ execCommand(it->string());
+ return;
+
+ default:
+ break;
}
// these actions require an active window
window->lower();
return;
+ case Action::sendToWorkspace:
+ window->sendTo(it->number());
+ return;
+
case Action::toggleomnipresent:
if (window->desktop() == 0xffffffff)
window->sendTo(_active_desktop);
case Action::toggleshade:
window->shade(! window->shaded());
return;
+
+ default:
+ assert(false); // unhandled action type!
+ break;
}
}
}
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<char*>(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<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);
+ } 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,
WindowList::const_iterator target = _active;
+ string classname;
+ if (sameclass && target != _clients.end())
+ classname = (*target)->appClass();
+
if (target == _clients.end())
target = _clients.begin();
} 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();