fixed WM menu management git-svn-id: http://tint2.googlecode.com/svn/trunk@213 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
lorthiois@bbsoft.fr lorthiois@bbsoft.fr@121b4492-b84c-0410-8b4c-0d4edfb3f3cc
4 files changed,
3 insertions(+),
12 deletions(-)
M
src/config.c
→
src/config.c
@@ -91,7 +91,7 @@ panel_config->g_task.alpha_active = 100;
systray.sort = 3; // window manager's menu default value == false - wm_menu = wm_menu_open = 0; + wm_menu = 0; max_tick_urgent = 7; }
M
src/panel.c
→
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;
M
src/panel.h
→
src/panel.h
@@ -38,7 +38,7 @@
//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
M
src/tint.c
→
src/tint.c
@@ -270,7 +270,6 @@ task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
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.@@ -291,14 +290,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) {