From 65ce3a88e63dba1fbbc179759ba80ef55c502d4a Mon Sep 17 00:00:00 2001 From: fluxgen Date: Sun, 8 Sep 2002 19:31:27 +0000 Subject: update workspace and check for tab in next/prev window keyevent --- src/fluxbox.cc | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 345cde8..10ddc09 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.cc,v 1.74 2002/09/07 20:25:39 fluxgen Exp $ +// $Id: fluxbox.cc,v 1.75 2002/09/08 19:31:27 fluxgen Exp $ #include "fluxbox.hh" @@ -344,7 +344,7 @@ key(0) // setup atom handlers m_atomhandler.push_back(new Gnome()); -// m_atomhandler.push_back(new Ewmh()); // TODO +// m_atomhandler.push_back(new Ewmh()); //singleton pointer singleton = this; @@ -1264,12 +1264,12 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) { break; case Keys::NEXTWINDOW: //activate next window screen->nextFocus(key->getParam()); - if (focused_window) + if (focused_window && focused_window->getTab()) focused_window->getTab()->raise(); break; case Keys::PREVWINDOW: //activate prev window screen->prevFocus(key->getParam()); - if (focused_window) + if (focused_window && focused_window->getTab()) focused_window->getTab()->raise(); break; case Keys::NEXTTAB: @@ -1613,25 +1613,32 @@ void Fluxbox::update(FbTk::Subject *changedsub) { FluxboxWindow &win = winsub->win(); if ((&(win.hintSig())) == changedsub) { // hint signal #ifdef DEBUG - cerr<<__FILE__<<"("<<__LINE__<<") hint signal from "<<&win<update()) - m_atomhandler[i]->updateHints(&win); + m_atomhandler[i]->updateHints(win); } } else if ((&(win.stateSig())) == changedsub) { // state signal #ifdef DEBUG - cerr<<__FILE__<<"("<<__LINE__<<") state signal from "<<&win<update()) - m_atomhandler[i]->updateState(&win); + m_atomhandler[i]->updateState(win); } } else if ((&(win.workspaceSig())) == changedsub) { // workspace signal #ifdef DEBUG - cerr<<__FILE__<<"("<<__LINE__<<") workspace signal from "<<&win<update()) + m_atomhandler[i]->updateWorkspace(win); + } + } else { +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<"): WINDOW uncought signal from "<<&win<setupWindow(win); + } } - BScreen *Fluxbox::searchScreen(Window window) { BScreen *screen = (BScreen *) 0; ScreenList::iterator it = screenList.begin(); @@ -1775,12 +1784,10 @@ void Fluxbox::removeGroupSearch(Window window) { groupSearch.erase(window); } - void Fluxbox::removeMenuSearch(Window window) { menuSearch.erase(window); } - void Fluxbox::removeToolbarSearch(Window window) { toolbarSearch.erase(window); } -- cgit v0.11.2