// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
+/* A few comments about stacked cycling:
+ * When stacked cycling is turned on, the focused window is always at the top
+ * (front) of the list (_clients), EXCEPT for when we are in cycling mode.
+ * (_cycling is true) If we were to add the focused window to the top of the
+ * stack while we were cycling, we would end in a deadlock between 2 windows.
+ * When the modifiers are released, the window that has focus (but it's not
+ * at the top of the stack, since we are cycling) is placed at the top of the
+ * stack and raised.
+ * Hooray and Bummy. - Marius
+ */
+
#ifdef HAVE_CONFIG_H
# include "../../config.h"
#endif // HAVE_CONFIG_H
using std::dec;
using std::string;
-#include "../../src/BaseDisplay.hh"
-#include "../../src/XAtom.hh"
+#include "../../src/basedisplay.hh"
+#include "../../src/xatom.hh"
#include "screen.hh"
#include "epist.hh"
#include "config.hh"
screen::screen(epist *epist, int number)
: _clients(epist->clientsList()), _active(epist->activeWindow()),
_config(epist->getConfig()), _grabbed(true), _cycling(false),
- _stacked_cycling(false)
+ _stacked_cycling(false), _stacked_raise(false)
{
_epist = epist;
_xatom = _epist->xatom();
_info = _epist->getScreenInfo(_number);
_root = _info->getRootWindow();
- _config->getBoolValue(Config::stackedCycling, _stacked_cycling);
+ _config->getValue(Config::stackedCycling, _stacked_cycling);
+ if (_stacked_cycling)
+ _config->getValue(Config::stackedCyclingRaise, _stacked_raise);
// find a window manager supporting NETWM, waiting for it to load if we must
int count = 20; // try for 20 seconds
DestroyNotify, &ev) ||
XCheckTypedWindowEvent(_epist->getXDisplay(), e.xany.window,
UnmapNotify, &ev)) {
- processEvent(ev);
+
+ XWindow *win = _epist->findWindow(e.xany.window);
+ if (win) win->processEvent(ev);
}
updateClientList();
}
-void screen::handleKeyrelease(const XEvent &e) {
- // we're not interested in non-modifiers
- if (!isModifier(e.xkey.keycode))
- return;
-
+void screen::handleKeyrelease(const XEvent &) {
// the only keyrelease event we care about (for now) is when we do stacked
// cycling and the modifier is released
if (_stacked_cycling && _cycling && nothingIsPressed()) {
- XWindow *w = *_active;
-
// all modifiers have been released. ungrab the keyboard, move the
// focused window to the top of the Z-order and raise it
ungrabModifiers();
- _clients.remove(w);
- _clients.push_front(w);
- w->raise();
+ if (_active != _clients.end()) {
+ XWindow *w = *_active;
+ bool e = _last_active == _active;
+ _clients.remove(w);
+ _clients.push_front(w);
+ _active = _clients.begin();
+ if (e) _last_active = _active;
+ w->raise();
+ }
_cycling = false;
}
const WindowList::iterator end = _clients.end();
unsigned long i;
- // insert new clients after the active window
for (i = 0; i < num; ++i) {
for (it = _clients.begin(); it != end; ++it)
if (**it == rootclients[i])
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;
+ // insert new clients after the active window
_clients.insert(insert_point, new XWindow(_epist, this,
rootclients[i]));
}
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))
+ (*it)->canFocus() &&
+ ((*it)->desktop() == 0xffffffff ||
+ (*it)->desktop() == _active_desktop))
return *it;
// no windows on this screen
break;
}
}
+
_active = it;
- if (it != end)
- _last_active = it;
+
+ if (_active != end) {
+ /* if we're not cycling and a window gets focus, add it to the top of the
+ * cycle stack.
+ */
+ if (_stacked_cycling && !_cycling) {
+ XWindow *win = *_active;
+ _clients.remove(win);
+ _clients.push_front(win);
+ _active = _clients.begin();
+
+ _last_active = _active;
+ }
+ }
/* cout << "Active window is now: ";
if (_active == _clients.end()) cout << "None\n";
void screen::execCommand(const string &cmd) const {
pid_t pid;
if ((pid = fork()) == 0) {
+ // disconnect the child from epist's session and the tty
+ if (setsid() == -1) {
+ cout << "warning: could not start a new process group\n";
+ perror("setsid");
+ }
+
// 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";
}
// if the window is on another desktop, we can't use XSetInputFocus, since
- // it doesn't imply a woskpace change.
- if (t->desktop() == _active_desktop)
- t->focus(false); // focus, but don't raise
+ // it doesn't imply a workspace change.
+ if (_stacked_raise || (t->desktop() != _active_desktop &&
+ t->desktop() != 0xffffffff))
+ t->focus(); // raise
else
- t->focus(); // change workspace and focus
+ t->focus(false); // don't raise
}
else {
t->focus();
int active_desktop = (signed)_active_desktop;
int wnum = 0;
- _config->getNumberValue(Config::workspaceColumns, width);
+ _config->getValue(Config::workspaceColumns, width);
if (width > num_desktops || width <= 0)
return;
int active_desktop = (signed)_active_desktop;
int wnum = 0;
- _config->getNumberValue(Config::workspaceColumns, width);
+ _config->getValue(Config::workspaceColumns, width);
if (width > num_desktops || width <= 0)
return;
}
-bool screen::isModifier(const KeyCode kc) const {
- KeySym ks = XKeycodeToKeysym(_epist->getXDisplay(), kc, 0);
-
- if (ks == XK_Shift_L || ks == XK_Shift_R ||
- ks == XK_Control_L || ks == XK_Control_R ||
- ks == XK_Meta_L || ks == XK_Meta_R ||
- ks == XK_Alt_L || ks == XK_Alt_R ||
- ks == XK_Super_L || ks == XK_Super_R ||
- ks == XK_Hyper_L || ks == XK_Hyper_R)
- return true;
- else
- return false;
-}
-
-
bool screen::nothingIsPressed(void) const
{
char keys[32];