X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=74a11d1a4d92bef98a46ab251d4274965bf74a70;hb=eb19a6b69e89c6adae1b99705b0a26edc344c87a;hp=b9dac6a842d6cc7c6aa17bdeddd2bb993d72931d;hpb=f32096dcd2c5a4e44763def56c290ce37aa548ba;p=chaz%2Fopenbox diff --git a/util/epist/epist.cc b/util/epist/epist.cc index b9dac6a8..74a11d1a 100644 --- a/util/epist/epist.cc +++ b/util/epist/epist.cc @@ -1,5 +1,5 @@ -// -*- mode: C++; indent-tabs-mode: nil; -*- -// epist.cc for Epistophy - a key handler for NETWM/EWMH window managers. +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- +// epist.cc for Epistrophy - a key handler for NETWM/EWMH window managers. // Copyright (c) 2002 - 2002 Ben Jansens // // Permission is hereby granted, free of charge, to any person obtaining a @@ -41,6 +41,16 @@ extern "C" { #ifdef HAVE_LIBGEN_H # include #endif // HAVE_LIBGEN_H + +#ifdef HAVE_UNISTD_H +# include +# include +#endif // HAVE_UNISTD_H + +#ifdef HAVE_SYS_STAT_H +# include +# include +#endif // HAVE_SYS_STAT_H } #include @@ -50,15 +60,17 @@ using std::cout; using std::endl; using std::string; +#include "actions.hh" #include "epist.hh" #include "screen.hh" #include "window.hh" -#include "../../src/XAtom.hh" +#include "parser.hh" +#include "../../src/xatom.hh" epist::epist(char **argv, char *dpy_name, char *rc_file) : BaseDisplay(argv[0], dpy_name) { - + _argv = argv; if (rc_file) @@ -66,100 +78,33 @@ epist::epist(char **argv, char *dpy_name, char *rc_file) else _rc_file = expandTilde("~/.openbox/epistrc"); + struct stat buf; + if (0 != stat(_rc_file.c_str(), &buf) || + !S_ISREG(buf.st_mode)) + _rc_file = DEFAULTRC; + _xatom = new XAtom(getXDisplay()); + _active = _clients.end(); - screen *s = new screen(this, DefaultScreen(getXDisplay())); - if (s->managed()) - _screens.push_back(s); + _config = new Config; + _ktree = new keytree(getXDisplay(), this); + + // set up the key tree + parser p(_ktree, _config); + p.parse(_rc_file); + + for (unsigned int i = 0; i < getNumberOfScreens(); ++i) { + screen *s = new screen(this, i); + if (s->managed()) { + _screens.push_back(s); + s->updateEverything(); + } + } if (_screens.empty()) { cout << "No compatible window manager found on any screens. Aborting.\n"; ::exit(1); } - _actions.push_back(Action(Action::nextWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("Tab")), - ControlMask)); - _actions.push_back(Action(Action::prevWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("Tab")), - ControlMask | ShiftMask)); - _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")), - Mod1Mask)); - _actions.push_back(Action(Action::prevWindow, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("Tab")), - Mod1Mask | ShiftMask)); - _actions.push_back(Action(Action::nextWindowOnAllWorkspaces, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("Tab")), - Mod1Mask | ControlMask)); - _actions.push_back(Action(Action::prevWindowOnAllWorkspaces, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("Tab")), - Mod1Mask | ShiftMask | ControlMask)); - _actions.push_back(Action(Action::raise, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("Up")), - Mod1Mask)); - _actions.push_back(Action(Action::lower, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("Down")), - Mod1Mask)); - _actions.push_back(Action(Action::iconify, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("I")), - Mod1Mask | ControlMask)); - _actions.push_back(Action(Action::toggleomnipresent, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("O")), - Mod1Mask | ControlMask)); - _actions.push_back(Action(Action::changeWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("1")), - Mod1Mask | ControlMask, 0)); - _actions.push_back(Action(Action::changeWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("2")), - Mod1Mask | ControlMask, 1)); - _actions.push_back(Action(Action::changeWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("3")), - Mod1Mask | ControlMask, 2)); - _actions.push_back(Action(Action::changeWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("4")), - Mod1Mask | ControlMask, 3)); - _actions.push_back(Action(Action::sendToWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("1")), - Mod1Mask | ControlMask | ShiftMask, 0)); - _actions.push_back(Action(Action::sendToWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("2")), - Mod1Mask | ControlMask | ShiftMask, 1)); - _actions.push_back(Action(Action::sendToWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("3")), - Mod1Mask | ControlMask | ShiftMask, 2)); - _actions.push_back(Action(Action::sendToWorkspace, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("4")), - Mod1Mask | ControlMask | ShiftMask, 3)); - _actions.push_back(Action(Action::execute, - XKeysymToKeycode(getXDisplay(), - XStringToKeysym("F6")), - Mod1Mask)); activateGrabs(); } @@ -172,24 +117,23 @@ void epist::activateGrabs() { ScreenList::const_iterator scrit, scrend = _screens.end(); - for (scrit = _screens.begin(); scrit != scrend; ++scrit) { - ActionList::const_iterator ait, end = _actions.end(); - - for(ait = _actions.begin(); ait != end; ++ait) { - XGrabKey(getXDisplay(), ait->keycode(), ait->modifierMask(), - (*scrit)->rootWindow(), False, GrabModeAsync, GrabModeAsync); - } - } + for (scrit = _screens.begin(); scrit != scrend; ++scrit) + _ktree->grabDefaults(*scrit); } bool epist::handleSignal(int sig) { switch (sig) { - case SIGHUP: + case SIGHUP: { cout << "epist: Restarting on request.\n"; + execvp(_argv[0], _argv); - execvp(basename(_argv[0]), _argv); + + string base(basename(_argv[0])); + execvp(base.c_str(), _argv); + return false; // this should be unreachable + } case SIGTERM: case SIGINT: @@ -203,16 +147,9 @@ bool epist::handleSignal(int sig) { void epist::process_event(XEvent *e) { - Window root; - - if (e->xany.type == KeyPress) - root = e->xkey.root; - else - root = e->xany.window; - ScreenList::const_iterator it, end = _screens.end(); for (it = _screens.begin(); it != end; ++it) { - if ((*it)->rootWindow() == root) { + if ((*it)->rootWindow() == e->xany.window) { (*it)->processEvent(*e); return; } @@ -241,3 +178,22 @@ XWindow *epist::findWindow(Window window) const { return 0; } + + +void epist::cycleScreen(int current, bool forward) const { + unsigned int i; + for (i = 0; i < _screens.size(); ++i) + if (_screens[i]->number() == current) { + current = i; + break; + } + assert(i < _screens.size()); // current is for an unmanaged screen + + int dest = current + (forward ? 1 : -1); + + if (dest < 0) dest = (signed)_screens.size() - 1; + else if (dest >= (signed)_screens.size()) dest = 0; + + const XWindow *target = _screens[dest]->lastActiveWindow(); + if (target) target->focus(); +}