cleanup and issue 99

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 568375be0c38e085aa3f50b4e6e8ca5270d779d9..718668f160e43d33604edbfd57074ba9eeba7715 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -136,13 +136,20 @@ 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 (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;
+                       // icewm doesn't open under the mouse.
+                       // and xfce doesn't open at all.
+                       //e->xbutton.x = e->xbutton.x_root;
+                       //e->xbutton.y = e->xbutton.y_root;
+                       //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
+                       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;
@@ -183,11 +190,13 @@ void event_button_release (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)
-               e->xbutton.window = server.root_win;
-               XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
-          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;
@@ -424,9 +433,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);
@@ -467,7 +481,7 @@ void event_expose (XEvent *e)
 
 void event_configure_notify (Window win)
 {
-   if (panel_mode != SINGLE_MONITOR) return;
+   if (nb_panel == 1) return;
    if (server.nb_monitor == 1) return;
 
    Task *tsk = task_get_task (win);
@@ -496,6 +510,8 @@ void event_timer()
    if (gettimeofday(&stv, 0)) return;
 
    if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return;
+       time_clock.tv_sec = stv.tv_sec;
+       time_clock.tv_sec -= time_clock.tv_sec % time_precision;
 
        // urgent task
        if (task_urgent) {
@@ -512,8 +528,6 @@ void event_timer()
 
        // update clock
    if (time1_format) {
-               time_clock.tv_sec = stv.tv_sec;
-               time_clock.tv_sec -= time_clock.tv_sec % time_precision;
                for (i=0 ; i < nb_panel ; i++)
                panel1[i].clock.area.resize = 1;
        }
@@ -609,7 +623,7 @@ load_config:
             }
          }
       }
-      else event_timer();
+      event_timer();
 
                switch (signal_pending) {
                        case SIGUSR1:
@@ -637,10 +651,4 @@ load_config:
    }
 }
 
-// ****************************************************
-// main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right.
-// this feature is disabled !
-//XCopyArea (server.dsp, server.pmap, p->main_win, server.gc, p->area.paddingxlr, 0, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, 0);
-//XCopyArea (server.dsp, panel.area.pix.pmap, server.root_win, server.gc_root, 0, 0, panel.area.width, panel.area.height, server.posx, server.posy);
-//XCopyArea (server.dsp, server.pmap, panel.main_win, server.gc, panel.area.paddingxlr, 0, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, 0);