aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-09 18:32:09 (GMT)
committerfluxgen <fluxgen>2003-01-09 18:32:09 (GMT)
commite48b3e0cfdbf9b73e4179c51beff857339254920 (patch)
tree54b657ebdb750e3ce385f1aa7a61fa3cf31560db
parentf123c69829cf754effbb3e3f98979cd59e420d2e (diff)
downloadfluxbox-e48b3e0cfdbf9b73e4179c51beff857339254920.zip
fluxbox-e48b3e0cfdbf9b73e4179c51beff857339254920.tar.bz2
removed rootmenu
-rw-r--r--src/Tab.cc7
-rw-r--r--src/fluxbox.cc11
2 files changed, 9 insertions, 9 deletions
diff --git a/src/Tab.cc b/src/Tab.cc
index b72942c..47faeae 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Tab.cc,v 1.49 2003/01/05 22:38:53 fluxgen Exp $ 22// $Id: Tab.cc,v 1.50 2003/01/09 18:32:09 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -27,7 +27,6 @@
27#include "DrawUtil.hh" 27#include "DrawUtil.hh"
28#include "Screen.hh" 28#include "Screen.hh"
29#include "fluxbox.hh" 29#include "fluxbox.hh"
30#include "Rootmenu.hh"
31#include "ImageControl.hh" 30#include "ImageControl.hh"
32 31
33#include <iostream> 32#include <iostream>
@@ -656,7 +655,7 @@ void Tab::buttonPressEvent(XButtonEvent *be) {
656 draw(true); 655 draw(true);
657 656
658 //invoke root menu with auto-tab? 657 //invoke root menu with auto-tab?
659 if (be->button == 3) { 658 /* if (be->button == 3) {
660 BScreen *screen = m_win->getScreen(); 659 BScreen *screen = m_win->getScreen();
661 Rootmenu *rootmenu = screen->getRootmenu(); 660 Rootmenu *rootmenu = screen->getRootmenu();
662 if (! rootmenu->isVisible()) { 661 if (! rootmenu->isVisible()) {
@@ -666,6 +665,7 @@ void Tab::buttonPressEvent(XButtonEvent *be) {
666 rootmenu->show(); 665 rootmenu->show();
667 } 666 }
668 } 667 }
668
669 //otherwise let the window handle the event 669 //otherwise let the window handle the event
670 else { 670 else {
671 //set window to titlewindow so we can take advantage of drag function 671 //set window to titlewindow so we can take advantage of drag function
@@ -674,6 +674,7 @@ void Tab::buttonPressEvent(XButtonEvent *be) {
674 //call windows buttonpress eventhandler 674 //call windows buttonpress eventhandler
675 m_win->buttonPressEvent(*be); 675 m_win->buttonPressEvent(*be);
676 } 676 }
677 */
677} 678}
678 679
679/** 680/**
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 4a8bb0c..1e09ef2 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1,8 +1,8 @@
1// fluxbox.cc for Fluxbox Window Manager 1// fluxbox.cc for Fluxbox Window Manager
2// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) 2// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3// 3//
4// blackbox.cc for blackbox - an X11 Window manager 4// blackbox.cc for blackbox - an X11 Window manager
5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
6// 6//
7// Permission is hereby granted, free of charge, to any person obtaining a 7// Permission is hereby granted, free of charge, to any person obtaining a
8// copy of this software and associated documentation files (the "Software"), 8// copy of this software and associated documentation files (the "Software"),
@@ -16,13 +16,13 @@
16// 16//
17// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 17// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 18// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 19// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 20// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 21// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
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.88 2003/01/05 22:41:21 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.89 2003/01/09 18:30:49 fluxgen Exp $
26 26
27 27
28#include "fluxbox.hh" 28#include "fluxbox.hh"
@@ -30,7 +30,6 @@
30#include "i18n.hh" 30#include "i18n.hh"
31#include "Basemenu.hh" 31#include "Basemenu.hh"
32#include "Clientmenu.hh" 32#include "Clientmenu.hh"
33#include "Rootmenu.hh"
34#include "Screen.hh" 33#include "Screen.hh"
35#include "Toolbar.hh" 34#include "Toolbar.hh"
36#include "Window.hh" 35#include "Window.hh"
@@ -48,7 +47,7 @@
48#define _GNU_SOURCE 47#define _GNU_SOURCE
49#endif // _GNU_SOURCE 48#endif // _GNU_SOURCE
50 49
51#ifdef HAVE_CONFIG_H 50#ifdef HAVE_CONFIG_H
52#include "../config.h" 51#include "../config.h"
53#endif // HAVE_CONFIG_H 52#endif // HAVE_CONFIG_H
54 53