From e48b3e0cfdbf9b73e4179c51beff857339254920 Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Thu, 9 Jan 2003 18:32:09 +0000 Subject: removed rootmenu --- src/Tab.cc | 7 ++++--- src/fluxbox.cc | 11 +++++------ 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Tab.cc,v 1.49 2003/01/05 22:38:53 fluxgen Exp $ +// $Id: Tab.cc,v 1.50 2003/01/09 18:32:09 fluxgen Exp $ #include "Tab.hh" @@ -27,7 +27,6 @@ #include "DrawUtil.hh" #include "Screen.hh" #include "fluxbox.hh" -#include "Rootmenu.hh" #include "ImageControl.hh" #include <iostream> @@ -656,7 +655,7 @@ void Tab::buttonPressEvent(XButtonEvent *be) { draw(true); //invoke root menu with auto-tab? - if (be->button == 3) { + /* if (be->button == 3) { BScreen *screen = m_win->getScreen(); Rootmenu *rootmenu = screen->getRootmenu(); if (! rootmenu->isVisible()) { @@ -666,6 +665,7 @@ void Tab::buttonPressEvent(XButtonEvent *be) { rootmenu->show(); } } + //otherwise let the window handle the event else { //set window to titlewindow so we can take advantage of drag function @@ -674,6 +674,7 @@ void Tab::buttonPressEvent(XButtonEvent *be) { //call windows buttonpress eventhandler m_win->buttonPressEvent(*be); } + */ } /** 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 @@ // fluxbox.cc for Fluxbox Window Manager -// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) +// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) // // blackbox.cc for blackbox - an X11 Window manager -// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) +// Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net) // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"), @@ -16,13 +16,13 @@ // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.cc,v 1.88 2003/01/05 22:41:21 fluxgen Exp $ +// $Id: fluxbox.cc,v 1.89 2003/01/09 18:30:49 fluxgen Exp $ #include "fluxbox.hh" @@ -30,7 +30,6 @@ #include "i18n.hh" #include "Basemenu.hh" #include "Clientmenu.hh" -#include "Rootmenu.hh" #include "Screen.hh" #include "Toolbar.hh" #include "Window.hh" @@ -48,7 +47,7 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "../config.h" #endif // HAVE_CONFIG_H -- cgit v0.11.2