fixed issue 98

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 1429adf8154eb97b2bd2e1966e9955c353d93c8c..654421948f650874fffc1c7884ec074aa6e66121 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -302,13 +302,11 @@ 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++) {
@@ -430,9 +428,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);
@@ -473,7 +476,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);
@@ -502,6 +505,9 @@ 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;
+printf("event_timer %d\n", time_precision);
 
        // urgent task
        if (task_urgent) {
@@ -518,8 +524,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;
        }
@@ -615,7 +619,7 @@ load_config:
             }
          }
       }
-      else event_timer();
+      event_timer();
 
                switch (signal_pending) {
                        case SIGUSR1:
@@ -643,10 +647,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);