summaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 6dd4506..d2cfe8d 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.162 2003/06/24 18:34:52 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.163 2003/06/25 06:02:53 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -524,7 +524,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
524#endif // HAVE_RANDR 524#endif // HAVE_RANDR
525 525
526 m_screen_list.push_back(screen); 526 m_screen_list.push_back(screen);
527 m_atomhandler.push_back(&screen->toolbarHandler()); 527 m_atomhandler.push_back(new ToolbarHandler(*screen));
528 528
529 // attach screen signals to this 529 // attach screen signals to this
530 screen->currentWorkspaceSig().attach(this); 530 screen->currentWorkspaceSig().attach(this);
@@ -911,9 +911,6 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
911 if (screen->slit()) 911 if (screen->slit())
912 screen->slit()->menu().hide(); 912 screen->slit()->menu().hide();
913#endif // SLIT 913#endif // SLIT
914 // hide toolbar menu
915 if (screen->toolbar())
916 screen->toolbar()->menu().hide();
917 914
918 if (be.button == 1) { 915 if (be.button == 1) {
919 if (! screen->isRootColormapInstalled()) 916 if (! screen->isRootColormapInstalled())
@@ -2303,7 +2300,6 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2303#endif // DEBUG 2300#endif // DEBUG
2304 BScreen *old_screen = 0, *screen = 0; 2301 BScreen *old_screen = 0, *screen = 0;
2305 FluxboxWindow *old_win = 0; 2302 FluxboxWindow *old_win = 0;
2306 Toolbar *old_tbar = 0, *tbar = 0;
2307 Workspace *old_wkspc = 0, *wkspc = 0; 2303 Workspace *old_wkspc = 0, *wkspc = 0;
2308 2304
2309 if (m_focused_window != 0) { 2305 if (m_focused_window != 0) {
@@ -2325,7 +2321,6 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2325 old_win = m_focused_window; 2321 old_win = m_focused_window;
2326 old_screen = &old_win->screen(); 2322 old_screen = &old_win->screen();
2327 2323
2328 old_tbar = old_screen->toolbar();
2329 old_wkspc = old_screen->getWorkspace(old_win->workspaceNumber()); 2324 old_wkspc = old_screen->getWorkspace(old_win->workspaceNumber());
2330 2325
2331 old_win->setFocusFlag(false); 2326 old_win->setFocusFlag(false);
@@ -2341,7 +2336,6 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2341 m_focused_window = 0; // the window pointer wasn't valid, mark no window focused 2336 m_focused_window = 0; // the window pointer wasn't valid, mark no window focused
2342 } else { 2337 } else {
2343 screen = *winscreen; 2338 screen = *winscreen;
2344 tbar = screen->toolbar();
2345 wkspc = screen->getWorkspace(win->workspaceNumber()); 2339 wkspc = screen->getWorkspace(win->workspaceNumber());
2346 m_focused_window = win; // update focused window 2340 m_focused_window = win; // update focused window
2347 win->setFocusFlag(true); // set focus flag 2341 win->setFocusFlag(true); // set focus flag
@@ -2349,13 +2343,10 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2349 } else 2343 } else
2350 m_focused_window = 0; 2344 m_focused_window = 0;
2351 2345
2352 if (tbar != 0) 2346
2353 tbar->redrawWindowLabel(true);
2354 if (screen != 0) 2347 if (screen != 0)
2355 screen->updateNetizenWindowFocus(); 2348 screen->updateNetizenWindowFocus();
2356 2349
2357 if (old_tbar && old_tbar != tbar)
2358 old_tbar->redrawWindowLabel(true);
2359 if (old_screen && old_screen != screen) 2350 if (old_screen && old_screen != screen)
2360 old_screen->updateNetizenWindowFocus(); 2351 old_screen->updateNetizenWindowFocus();
2361 2352