fixed WM menu management

diff --git a/src/config.c b/src/config.c
index bb50b874fe98422f6044dbf63bee7e1712e6069f..8de01cd54eefc7f14fbe057de17afc7df5128adc 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -91,7 +91,7 @@ void init_config()
        systray.sort = 3;
 
        // window manager's menu default value == false
-       wm_menu = wm_menu_open = 0;
+       wm_menu = 0;
        max_tick_urgent = 7;
 }
 

diff --git a/src/panel.c b/src/panel.c
index 2e4708581429c4f5401ea438e212462c88c60b86..2341237b90db8c82490cfcbfef0b515d25810865 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -43,7 +43,7 @@ int mouse_tilt_left;
 int mouse_tilt_right;
 
 int panel_mode;
-int wm_menu, wm_menu_open;
+int wm_menu;
 int panel_dock=0;  // default not in the dock
 int panel_position;
 int panel_horizontal;

diff --git a/src/panel.h b/src/panel.h
index b3c8fded14817dad4217637fdd73c1f67b8da6c3..962c61f66e94773811d6ca14f7d231fb039c4e19 100644 (file)
--- a/src/panel.h
+++ b/src/panel.h
@@ -38,7 +38,7 @@ extern int mouse_tilt_right;
 //panel mode
 enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
 extern int panel_mode;
-extern int wm_menu, wm_menu_open;
+extern int wm_menu;
 extern int panel_dock;
 
 //panel position

diff --git a/src/tint.c b/src/tint.c
index f1de4772a583d21e83efda144ab86a03c91c55ff..d0985622cdbc5d4b55d9620b096c96eb18622de7 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -270,7 +270,6 @@ void event_button_press (XEvent *e)
 
        if (wm_menu && !task_drag && !click_clock(panel, e->xbutton.x, e->xbutton.y) && (e->xbutton.button != 1) ) {
                // forward the click to the desktop window (thanks conky)
-               wm_menu_open = 1;
                XUngrabPointer(server.dsp, e->xbutton.time);
                e->xbutton.window = server.root_win;
                // icewm doesn't open under the mouse.
@@ -292,14 +291,6 @@ void event_button_release (XEvent *e)
        Panel *panel = get_panel(e->xany.window);
        if (!panel) return;
 
-       if (wm_menu && wm_menu_open) {
-               // forward the click to the desktop window (thanks conky)
-               wm_menu_open = 0;
-               e->xbutton.window = server.root_win;
-               XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
-               return;
-       }
-
        int action = TOGGLE_ICONIFY;
        switch (e->xbutton.button) {
                case 2: