nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor cleaning

Browse source
This commit is contained in:
fluxgen 2003-07-10 12:00:49 +00:00
parent 0e1a719781
commit 4fb4805251
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/FbTk/Menu.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Menu.cc,v 1.27 2003/07/03 12:47:22 fluxgen Exp $ // $Id: Menu.cc,v 1.28 2003/07/10 11:57:37 fluxgen Exp $
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -83,7 +83,6 @@ Menu *Menu::s_focused = 0;
Menu::Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl): Menu::Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl):
m_theme(tm), m_theme(tm),
m_screen_num(screen_num), m_screen_num(screen_num),
m_prev_focused_window(0),
m_image_ctrl(imgctrl), m_image_ctrl(imgctrl),
m_display(FbTk::App::instance()->display()), m_display(FbTk::App::instance()->display()),
m_parent(0), m_parent(0),
@ -1035,11 +1034,9 @@ bool Menu::isItemEnabled(unsigned int index) const {
void Menu::handleEvent(XEvent &event) { void Menu::handleEvent(XEvent &event) {
if (event.type == FocusOut) { if (event.type == FocusOut) {
cerr<<"Focus out"<<endl;
if (s_focused == this) if (s_focused == this)
s_focused = 0; s_focused = 0;
} else if (event.type == FocusIn) { } else if (event.type == FocusIn) {
cerr<<"Focus in"<<endl;
if (s_focused != this) if (s_focused != this)
s_focused = this; s_focused = this;
} }

6
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.169 2003/07/04 14:06:20 rathnor Exp $ // $Id: fluxbox.cc,v 1.170 2003/07/10 12:00:49 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -877,7 +877,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
} }
} break; } break;
case FocusIn: { case FocusIn: {
if (e->xfocus.mode == NotifyUngrab || if (e->xfocus.mode == NotifyUngrab ||
e->xfocus.detail == NotifyPointer) e->xfocus.detail == NotifyPointer)
break; break;
@ -888,9 +887,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
} break; } break;
case FocusOut:{ case FocusOut:{
#ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out!"<<endl;
#endif // DEBUG
if (e->xfocus.mode == NotifyUngrab || if (e->xfocus.mode == NotifyUngrab ||
e->xfocus.detail == NotifyPointer) e->xfocus.detail == NotifyPointer)
break; break;