summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbTk/Menu.cc5
-rw-r--r--src/fluxbox.cc6
2 files changed, 2 insertions, 9 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 67ec949..c9943b3 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.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: Menu.cc,v 1.27 2003/07/03 12:47:22 fluxgen Exp $ 25// $Id: Menu.cc,v 1.28 2003/07/10 11:57:37 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -83,7 +83,6 @@ Menu *Menu::s_focused = 0;
83Menu::Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl): 83Menu::Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl):
84 m_theme(tm), 84 m_theme(tm),
85 m_screen_num(screen_num), 85 m_screen_num(screen_num),
86 m_prev_focused_window(0),
87 m_image_ctrl(imgctrl), 86 m_image_ctrl(imgctrl),
88 m_display(FbTk::App::instance()->display()), 87 m_display(FbTk::App::instance()->display()),
89 m_parent(0), 88 m_parent(0),
@@ -1035,11 +1034,9 @@ bool Menu::isItemEnabled(unsigned int index) const {
1035 1034
1036void Menu::handleEvent(XEvent &event) { 1035void Menu::handleEvent(XEvent &event) {
1037 if (event.type == FocusOut) { 1036 if (event.type == FocusOut) {
1038 cerr<<"Focus out"<<endl;
1039 if (s_focused == this) 1037 if (s_focused == this)
1040 s_focused = 0; 1038 s_focused = 0;
1041 } else if (event.type == FocusIn) { 1039 } else if (event.type == FocusIn) {
1042 cerr<<"Focus in"<<endl;
1043 if (s_focused != this) 1040 if (s_focused != this)
1044 s_focused = this; 1041 s_focused = this;
1045 } 1042 }
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 75a6502..eaa62f9 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.169 2003/07/04 14:06:20 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.170 2003/07/10 12:00:49 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -877,7 +877,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
877 } 877 }
878 } break; 878 } break;
879 case FocusIn: { 879 case FocusIn: {
880
881 if (e->xfocus.mode == NotifyUngrab || 880 if (e->xfocus.mode == NotifyUngrab ||
882 e->xfocus.detail == NotifyPointer) 881 e->xfocus.detail == NotifyPointer)
883 break; 882 break;
@@ -888,9 +887,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
888 887
889 } break; 888 } break;
890 case FocusOut:{ 889 case FocusOut:{
891#ifdef DEBUG
892 cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out!"<<endl;
893#endif // DEBUG
894 if (e->xfocus.mode == NotifyUngrab || 890 if (e->xfocus.mode == NotifyUngrab ||
895 e->xfocus.detail == NotifyPointer) 891 e->xfocus.detail == NotifyPointer)
896 break; 892 break;