fixed issue 90 and issue 81 : window manager s menu in panel padding

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index ee6a8480b84eba192ec7ec629a74dcc2fdf2cf91..568375be0c38e085aa3f50b4e6e8ca5270d779d9 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -136,6 +136,17 @@ void event_button_press (XEvent *e)
    Panel *panel = get_panel(e->xany.window);
        if (!panel) return;
 
+       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 +156,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 +180,16 @@ 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 ((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
@@ -302,15 +317,15 @@ void event_property_notify (XEvent *e)
                        }
          Window w1 = window_get_active ();
          Task *t = task_get_task(w1);
-                       if (task_urgent == t) {
-                               init_precision();
-                               task_urgent = 0;
-                       }
          if (!t) {
             Window w2;
             if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
                if (w2) t = task_get_task(w2);
          }
+                       if (task_urgent == t) {
+                               init_precision();
+                               task_urgent = 0;
+                       }
          if (t) {
                                for (i=0 ; i < nb_panel ; i++) {
                                        for (j=0 ; j < panel1[i].nb_desktop ; j++) {
@@ -551,8 +566,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: