add the ability to close a window
Dana Jansens danakj@orodu.net
5 files changed,
21 insertions(+),
6 deletions(-)
M
util/epist/actions.hh
→
util/epist/actions.hh
@@ -36,17 +36,17 @@ enum ActionType {
noaction = 0, execute, iconify, - raiseWindow, - lowerWindow, - closeWindow, - toggleshade, + raise, + lower, + close, //done + toggleshade, //done moveWindowUp, moveWindowDown, moveWindowLeft, moveWindowRight, - nextWindow, - prevWindow, + nextWindow, //done for now + prevWindow, //done for now nextWindowOnAllWorkspaces, prevWindowOnAllWorkspaces,
M
util/epist/epist.cc
→
util/epist/epist.cc
@@ -88,6 +88,10 @@ _actions.push_back(Action(Action::toggleshade,
XKeysymToKeycode(getXDisplay(), XStringToKeysym("F5")), Mod1Mask)); + _actions.push_back(Action(Action::close, + XKeysymToKeycode(getXDisplay(), + XStringToKeysym("F4")), + Mod1Mask)); _actions.push_back(Action(Action::nextWindow, XKeysymToKeycode(getXDisplay(), XStringToKeysym("Tab")),
M
util/epist/screen.cc
→
util/epist/screen.cc
@@ -175,6 +175,10 @@ if (_active != _clients.end()) {
XWindow *window = *_active; switch (it->type()) { + case Action::close: + window->close(); + return; + case Action::toggleshade: window->shade(! window->shaded()); return;
M
util/epist/window.cc
→
util/epist/window.cc
@@ -148,3 +148,9 @@ _xatom->sendClientMessage(_screen->rootWindow(), XAtom::net_wm_state,
_window, (sh ? 1 : 0), _xatom->getAtom(XAtom::net_wm_state_shaded)); } + + +void XWindow::close() const { + _xatom->sendClientMessage(_screen->rootWindow(), XAtom::net_close_window, + _window); +}
M
util/epist/window.hh
→
util/epist/window.hh
@@ -81,6 +81,7 @@
void processEvent(const XEvent &e); void shade(const bool sh) const; + void close() const; bool operator == (const XWindow &w) const { return w._window == _window; } bool operator == (const Window &w) const { return w == _window; }