fixed issue 56 : with windowmaker

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 8353faf1b6d103ab4f210b4f5239864381d9df83..8da6866d5b310af2031b10f04937223057e82660 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -136,6 +136,19 @@ void event_button_press (XEvent *e)
    Panel *panel = get_panel(e->xany.window);
        if (!panel) return;
 
+       if (wm_menu) {
+               if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
+                       // forward the click to the desktop window (thanks conky)
+                       XUngrabPointer(server.dsp, e->xbutton.time);
+                       e->xbutton.window = server.root_win;
+                       XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
+                       XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
+                       return;
+               }
+       }
+
+       if (e->xbutton.button != 1) return;
+
    if (panel_mode != MULTI_DESKTOP) {
       // drag and drop disabled
       XLowerWindow (server.dsp, panel->main_win);
@@ -145,7 +158,6 @@ void event_button_press (XEvent *e)
    GSList *l0;
    Taskbar *tskbar;
    int x = e->xbutton.x;
-   //int y = e->xbutton.y; // unused
    for (l0 = panel->area.list; l0 ; l0 = l0->next) {
       tskbar = l0->data;
       if (!tskbar->area.on_screen) continue;
@@ -170,11 +182,18 @@ void event_button_press (XEvent *e)
 
 void event_button_release (XEvent *e)
 {
-   // TODO: convert event_button_press(int x, int y) to area->event_button_press()
-
    Panel *panel = get_panel(e->xany.window);
        if (!panel) return;
 
+       if (wm_menu) {
+               if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
+                       // forward the click to the desktop window (thanks conky)
+                       e->xbutton.window = server.root_win;
+                       XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
+                       return;
+               }
+       }
+
    int action = TOGGLE_ICONIFY;
    int x = e->xbutton.x;
    //int y = e->xbutton.y; // unused
@@ -283,11 +302,13 @@ void event_property_notify (XEvent *e)
       }
       // Window list
       else if (at == server.atom._NET_CLIENT_LIST) {
+                       //printf("Window list\n");
          task_refresh_tasklist();
          panel_refresh = 1;
       }
       // Change active
       else if (at == server.atom._NET_ACTIVE_WINDOW) {
+                       //printf("Change active\n");
          GSList *l0;
        if (task_active) {
                                for (i=0 ; i < nb_panel ; i++) {
@@ -409,9 +430,14 @@ void event_property_notify (XEvent *e)
       }
       // Window desktop changed
       else if (at == server.atom._NET_WM_DESKTOP) {
-         remove_task (tsk);
-         add_task (win);
-         panel_refresh = 1;
+                       int desktop = window_get_desktop (win);
+                       //printf("  Window desktop changed %d, %d\n", tsk->desktop, desktop);
+                       // bug in windowmaker : send unecessary 'desktop changed' when focus changed
+                       if (desktop != tsk->desktop) {
+                               remove_task (tsk);
+                               add_task (win);
+                               panel_refresh = 1;
+                       }
       }
 
       if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen);
@@ -551,8 +577,7 @@ load_config:
 
             switch (e.type) {
                case ButtonPress:
-                  //printf("ButtonPress %lx\n", e.xproperty.window);
-                  if (e.xbutton.button == 1) event_button_press (&e);
+                  event_button_press (&e);
                   break;
 
                case ButtonRelease: