fixed WM menu management
git-svn-id: http://tint2.googlecode.com/svn/trunk@213 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
@@ -91,7 +91,7 @@ void init_config()
|
|||||||
systray.sort = 3;
|
systray.sort = 3;
|
||||||
|
|
||||||
// window manager's menu default value == false
|
// window manager's menu default value == false
|
||||||
wm_menu = wm_menu_open = 0;
|
wm_menu = 0;
|
||||||
max_tick_urgent = 7;
|
max_tick_urgent = 7;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ int mouse_tilt_left;
|
|||||||
int mouse_tilt_right;
|
int mouse_tilt_right;
|
||||||
|
|
||||||
int panel_mode;
|
int panel_mode;
|
||||||
int wm_menu, wm_menu_open;
|
int wm_menu;
|
||||||
int panel_dock=0; // default not in the dock
|
int panel_dock=0; // default not in the dock
|
||||||
int panel_position;
|
int panel_position;
|
||||||
int panel_horizontal;
|
int panel_horizontal;
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ extern int mouse_tilt_right;
|
|||||||
//panel mode
|
//panel mode
|
||||||
enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
|
enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
|
||||||
extern int panel_mode;
|
extern int panel_mode;
|
||||||
extern int wm_menu, wm_menu_open;
|
extern int wm_menu;
|
||||||
extern int panel_dock;
|
extern int panel_dock;
|
||||||
|
|
||||||
//panel position
|
//panel position
|
||||||
|
|||||||
@@ -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) ) {
|
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)
|
// forward the click to the desktop window (thanks conky)
|
||||||
wm_menu_open = 1;
|
|
||||||
XUngrabPointer(server.dsp, e->xbutton.time);
|
XUngrabPointer(server.dsp, e->xbutton.time);
|
||||||
e->xbutton.window = server.root_win;
|
e->xbutton.window = server.root_win;
|
||||||
// icewm doesn't open under the mouse.
|
// icewm doesn't open under the mouse.
|
||||||
@@ -292,14 +291,6 @@ void event_button_release (XEvent *e)
|
|||||||
Panel *panel = get_panel(e->xany.window);
|
Panel *panel = get_panel(e->xany.window);
|
||||||
if (!panel) return;
|
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;
|
int action = TOGGLE_ICONIFY;
|
||||||
switch (e->xbutton.button) {
|
switch (e->xbutton.button) {
|
||||||
case 2:
|
case 2:
|
||||||
|
|||||||
Reference in New Issue
Block a user