#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>
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:
return;
case Action::execute:
- execCommand("aterm");
+ execCommand(it->string());
return;
+
+ default:
+ break;
}
// these actions require an active window
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;
}
}
}
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();
} 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();