X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=a75b1b4d4117ec860665e17ac3b03e0cbb3e9973;hb=ee8eefd5400319f8ceafbe00c6ef9ae112306bb4;hp=e228aae355109f0f3f9f50347fc4c92e7dfea79f;hpb=cb9288bcb990b5ff5b550285f6d3ef752bd44d68;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index e228aae..a75b1b4 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -35,38 +35,44 @@
 #include "config.h"
 #include "task.h"
 #include "taskbar.h"
+#include "systraybar.h"
 #include "panel.h"
-#include "docker.h"
-#include "net.h"
-#include "kde.h"
 
 
 void signal_handler(int sig)
 {
 	// signal handler is light as it should be
-	panel.signal_pending = sig;
+	signal_pending = sig;
 }
 
 
-void init ()
+void init (int argc, char *argv[])
 {
+   int c;
+
+	// read options
+   c = getopt (argc, argv, "c:");
+   if (c != -1) {
+		config_path = strdup (optarg);
+	   c = getopt (argc, argv, "j:");
+	   if (c != -1)
+			thumbnail_path = strdup (optarg);
+	}
+
 	// Set signal handler
    signal(SIGUSR1, signal_handler);
-   signal(SIGINT, signal_handler);
-   signal(SIGTERM, signal_handler);
+	signal(SIGINT, signal_handler);
+	signal(SIGTERM, signal_handler);
+	signal(SIGHUP, signal_handler);
+	signal(SIGCHLD, SIG_IGN);		// don't have to wait() after fork()
 
    // set global data
-   memset(&panel, 0, sizeof(Panel));
    memset(&server, 0, sizeof(Server_global));
-   memset(&g_task, 0, sizeof(Global_task));
-   memset(&g_taskbar, 0, sizeof(Area));
-   panel.clock.area.draw_foreground = draw_foreground_clock;
-   g_task.area.draw_foreground = draw_foreground_task;
-   window.main_win = 0;
+   memset(&systray, 0, sizeof(Systraybar));
 
    server.dsp = XOpenDisplay (NULL);
    if (!server.dsp) {
-      fprintf(stderr, "Could not open display.\n");
+      fprintf(stderr, "tint2 exit : could not open display.\n");
       exit(0);
    }
    server_init_atoms ();
@@ -80,14 +86,6 @@ void init ()
 
    XSetErrorHandler ((XErrorHandler) server_catch_error);
 
-   // init systray
-   //display = server.dsp;
-   //root = RootWindow(display, DefaultScreen(display));
-   //create_main_window();
-   //kde_init();
-   //net_init();
-   //printf("ici 4\n");
-
    imlib_context_set_display (server.dsp);
    imlib_context_set_visual (server.visual);
    imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen));
@@ -99,133 +97,275 @@ void init ()
 }
 
 
-void window_action (Task *tsk, int action)
+void cleanup()
 {
-   switch (action) {
-      case CLOSE:
-         set_close (tsk->win);
-         break;
-      case TOGGLE:
-         set_active(tsk->win);
-         break;
-      case ICONIFY:
-         XIconifyWindow (server.dsp, tsk->win, server.screen);
-         break;
-      case TOGGLE_ICONIFY:
-         if (tsk == panel.task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
-         else set_active (tsk->win);
-         break;
-      case SHADE:
-         window_toggle_shade (tsk->win);
-         break;
-   }
+	cleanup_panel();
+
+   if (time1_font_desc) pango_font_description_free(time1_font_desc);
+   if (time2_font_desc) pango_font_description_free(time2_font_desc);
+   if (time1_format) g_free(time1_format);
+   if (time2_format) g_free(time2_format);
+#ifdef ENABLE_BATTERY
+   if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
+   if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
+	if (battery_low_cmd) g_free(battery_low_cmd);
+	if (path_energy_now) g_free(path_energy_now);
+	if (path_energy_full) g_free(path_energy_full);
+	if (path_current_now) g_free(path_current_now);
+	if (path_status) g_free(path_status);
+#endif
+	if (clock_lclick_command) g_free(clock_lclick_command);
+	if (clock_rclick_command) g_free(clock_rclick_command);
+	if (config_path) g_free(config_path);
+	if (thumbnail_path) g_free(thumbnail_path);
+
+   if (server.monitor) free(server.monitor);
+   XFreeGC(server.dsp, server.gc);
+   XCloseDisplay(server.dsp);
 }
 
 
-void event_button_press (int x, int y)
+Taskbar *click_taskbar (Panel *panel, XEvent *e)
 {
-   if (panel.mode == SINGLE_DESKTOP) {
-      // drag and drop disabled
-      XLowerWindow (server.dsp, window.main_win);
-      return;
-   }
+	GSList *l0;
+	Taskbar *tskbar = NULL;
+	if (panel_horizontal) {
+		int x = e->xbutton.x;
+		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+			tskbar = l0->data;
+			if (!tskbar->area.on_screen) continue;
+			if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+				break;
+		}
+	}
+	else {
+		int y = e->xbutton.y;
+		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+			tskbar = l0->data;
+			if (!tskbar->area.on_screen) continue;
+			if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
+				break;
+		}
+	}
+	return tskbar;
+}
 
-   Taskbar *tskbar;
-   GSList *l0;
-   for (l0 = panel.area.list; l0 ; l0 = l0->next) {
-      tskbar = l0->data;
-      if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
-         break;
-   }
 
-   if (l0) {
-      Task *tsk;
-      for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
-         tsk = l0->data;
-         if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
-            panel.task_drag = tsk;
-            break;
-         }
-      }
+Task *click_task (Panel *panel, XEvent *e)
+{
+	GSList *l0;
+	Taskbar *tskbar;
+
+	if ( (tskbar = click_taskbar(panel, e)) ) {
+		if (panel_horizontal) {
+			int x = e->xbutton.x;
+			Task *tsk;
+			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+				tsk = l0->data;
+				if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
+					return tsk;
+				}
+			}
+		}
+		else {
+			int y = e->xbutton.y;
+			Task *tsk;
+			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+				tsk = l0->data;
+				if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
+					return tsk;
+				}
+			}
+		}
+	}
+	return NULL;
+}
+
+
+int click_padding(Panel *panel, XEvent *e)
+{
+	if (panel_horizontal) {
+		if (e->xbutton.x < panel->area.paddingxlr || e->xbutton.x > panel->area.width-panel->area.paddingxlr)
+		return 1;
+	}
+	else {
+		if (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr)
+		return 1;
+	}
+	return 0;
+}
+
+
+int click_clock(Panel *panel, XEvent *e)
+{
+	Clock clk = panel->clock;
+	if (panel_horizontal) {
+		if (clk.area.on_screen && e->xbutton.x >= clk.area.posx && e->xbutton.x <= (clk.area.posx + clk.area.width))
+			return TRUE;
+	} else {
+		if (clk.area.on_screen && e->xbutton.y >= clk.area.posy && e->xbutton.y <= (clk.area.posy + clk.area.height))
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
+void window_action (Task *tsk, int action)
+{
+   if (!tsk) return;
+	int desk;
+	switch (action) {
+		case CLOSE:
+			set_close (tsk->win);
+			break;
+		case TOGGLE:
+			set_active(tsk->win);
+			break;
+		case ICONIFY:
+			XIconifyWindow (server.dsp, tsk->win, server.screen);
+			break;
+		case TOGGLE_ICONIFY:
+			if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
+			else set_active (tsk->win);
+			break;
+		case SHADE:
+			window_toggle_shade (tsk->win);
+			break;
+		case MAXIMIZE_RESTORE:
+			window_maximize_restore (tsk->win);
+			break;
+		case MAXIMIZE:
+			window_maximize_restore (tsk->win);
+			break;
+		case RESTORE:
+			window_maximize_restore (tsk->win);
+			break;
+		case DESKTOP_LEFT:
+			if ( tsk->desktop == 0 ) break;
+			desk = tsk->desktop - 1;
+			windows_set_desktop(tsk->win, desk);
+			if (desk == server.desktop)
+				set_active(tsk->win);
+			break;
+		case DESKTOP_RIGHT:
+			if (tsk->desktop == server.nb_desktop ) break;
+			desk = tsk->desktop + 1;
+			windows_set_desktop(tsk->win, desk);
+			if (desk == server.desktop)
+				set_active(tsk->win);
+	}
+}
+
+
+void event_button_press (XEvent *e)
+{
+   Panel *panel = get_panel(e->xany.window);
+	if (!panel) return;
+
+	if (panel_mode == MULTI_DESKTOP)
+		task_drag = click_task(panel, e);
+
+   if (wm_menu && !task_drag && !click_clock(panel, e) && (e->xbutton.button != 1) ) {
+		// 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;
    }
 
-   XLowerWindow (server.dsp, window.main_win);
+   XLowerWindow (server.dsp, panel->main_win);
 }
 
 
-void event_button_release (int button, int x, int y)
+void event_button_release (XEvent *e)
 {
-   int action = TOGGLE_ICONIFY;
-   // TODO: convert event_button_press(int x, int y) to area->event_button_press()
-   // if systray is ok
+   Panel *panel = get_panel(e->xany.window);
+	if (!panel) return;
 
-   switch (button) {
+	if (wm_menu && click_padding(panel, e)) {
+			// 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;
+   switch (e->xbutton.button) {
       case 2:
-         action = panel.mouse_middle;
+         action = mouse_middle;
          break;
       case 3:
-         action = panel.mouse_right;
+         action = mouse_right;
          break;
       case 4:
-         action = panel.mouse_scroll_up;
+         action = mouse_scroll_up;
          break;
       case 5:
-         action = panel.mouse_scroll_down;
+         action = mouse_scroll_down;
+         break;
+      case 6:
+         action = mouse_tilt_left;
+         break;
+      case 7:
+         action = mouse_tilt_right;
          break;
    }
 
-   // search taskbar
-   Taskbar *tskbar;
-   GSList *l0;
-   for (l0 = panel.area.list; l0 ; l0 = l0->next) {
-      tskbar = l0->data;
-      if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
-         goto suite;
-   }
-
-   // TODO: check better solution to keep window below
-   XLowerWindow (server.dsp, window.main_win);
-   panel.task_drag = 0;
-   return;
+	if ( click_clock(panel, e)) {
+		clock_action(e->xbutton.button);
+		XLowerWindow (server.dsp, panel->main_win);
+		task_drag = 0;
+		return;
+	}
+
+	Taskbar *tskbar;
+	if ( !(tskbar = click_taskbar(panel, e)) ) {
+		// TODO: check better solution to keep window below
+		XLowerWindow (server.dsp, panel->main_win);
+		task_drag = 0;
+		return;
+	}
 
-suite:
    // drag and drop task
-   if (panel.task_drag) {
-      if (tskbar != panel.task_drag->area.parent && action == TOGGLE_ICONIFY) {
-         if (!panel.task_drag->all_desktop && panel.mode == MULTI_DESKTOP) {
-            windows_set_desktop(panel.task_drag->win, tskbar->desktop);
+   if (task_drag) {
+      if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) {
+         if (task_drag->desktop != ALLDESKTOP && panel_mode == MULTI_DESKTOP) {
+            windows_set_desktop(task_drag->win, tskbar->desktop);
             if (tskbar->desktop == server.desktop)
-               set_active(panel.task_drag->win);
-            panel.task_drag = 0;
+               set_active(task_drag->win);
+            task_drag = 0;
          }
          return;
       }
-      else panel.task_drag = 0;
+      else task_drag = 0;
    }
 
    // switch desktop
-   if (panel.mode == MULTI_DESKTOP)
-      if (tskbar->desktop != server.desktop && action != CLOSE)
+   if (panel_mode == MULTI_DESKTOP) {
+      if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT)
          set_desktop (tskbar->desktop);
+	}
 
    // action on task
-   Task *tsk;
-   GSList *l;
-   for (l = tskbar->area.list ; l ; l = l->next) {
-      tsk = l->data;
-      if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
-         window_action (tsk, action);
-         break;
-      }
-   }
+   window_action( click_task(panel, e), action);
 
    // to keep window below
-   XLowerWindow (server.dsp, window.main_win);
+   XLowerWindow (server.dsp, panel->main_win);
 }
 
 
-void event_property_notify (Window win, Atom at)
+void event_property_notify (XEvent *e)
 {
+  	int i, j;
+   Task *tsk;
+   Window win = e->xproperty.window;
+   Atom at = e->xproperty.atom;
 
    if (win == server.root_win) {
       if (!server.got_root_win) {
@@ -233,41 +373,72 @@ void event_property_notify (Window win, Atom at)
          server.got_root_win = 1;
       }
 
-      /* Change number of desktops */
+      // Change number of desktops
       else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
-         config_taskbar();
-         visible_object();
+	      server.nb_desktop = server_get_number_of_desktop ();
+		  	cleanup_taskbar();
+			init_taskbar();
+			visible_object();
+			for (i=0 ; i < nb_panel ; i++) {
+				panel1[i].area.resize = 1;
+			}
+			task_refresh_tasklist();
+			panel_refresh = 1;
       }
-      /* Change desktop */
+      // Change desktop
       else if (at == server.atom._NET_CURRENT_DESKTOP) {
          server.desktop = server_get_current_desktop ();
-         if (panel.mode != MULTI_DESKTOP) {
-            visible_object();
+			for (i=0 ; i < nb_panel ; i++) {
+			   Panel *panel = &panel1[i];
+				if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
+					// redraw taskbar
+					panel_refresh = 1;
+					Taskbar *tskbar;
+					Task *tsk;
+					GSList *l;
+					for (j=0 ; j < panel->nb_desktop ; j++) {
+						tskbar = &panel->taskbar[j];
+						if (tskbar->area.is_active) {
+							tskbar->area.is_active = 0;
+							tskbar->area.redraw = 1;
+							for (l = tskbar->area.list; l ; l = l->next) {
+								tsk = l->data;
+								tsk->area.redraw = 1;
+							}
+						}
+						if (j == server.desktop) {
+							tskbar->area.is_active = 1;
+							tskbar->area.redraw = 1;
+							for (l = tskbar->area.list; l ; l = l->next) {
+								tsk = l->data;
+								tsk->area.redraw = 1;
+							}
+						}
+					}
+				}
+			}
+         if (panel_mode != MULTI_DESKTOP) {
+				visible_object();
          }
       }
-      /* Window list */
+      // Window list
       else if (at == server.atom._NET_CLIENT_LIST) {
-         task_refresh_tasklist ();
-         panel.refresh = 1;
+         task_refresh_tasklist();
+         panel_refresh = 1;
       }
-      /* Change active */
+      // Change active
       else if (at == server.atom._NET_ACTIVE_WINDOW) {
-      	if (panel.task_active) {
-         	if (panel.task_active->all_desktop) {
-               Task *tsk;
-               GSList *l0;
-               int i, nb;
-               nb = server.nb_desktop * server.nb_monitor;
-               for (i=0 ; i < nb ; i++) {
-                  for (l0 = panel.taskbar[i].area.list; l0 ; l0 = l0->next) {
+         GSList *l0;
+      	if (task_active) {
+				for (i=0 ; i < nb_panel ; i++) {
+					for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                  for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
                      tsk = l0->data;
              		   tsk->area.is_active = 0;
                   }
-               }
-            }
-            else
-         		panel.task_active->area.is_active = 0;
-         	panel.task_active = 0;
+					}
+				}
+         	task_active = 0;
 			}
          Window w1 = window_get_active ();
          Task *t = task_get_task(w1);
@@ -276,98 +447,124 @@ void event_property_notify (Window win, Atom at)
             if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
                if (w2) t = task_get_task(w2);
          }
+			if (task_urgent == t) {
+				init_precision();
+				task_urgent = 0;
+			}
+			// put active state on all task (multi_desktop)
          if (t) {
-         	if (t->all_desktop) {
-               Task *tsk;
-               GSList *l0;
-               int i, nb;
-               nb = server.nb_desktop * server.nb_monitor;
-               for (i=0 ; i < nb ; i++) {
-                  for (l0 = panel.taskbar[i].area.list; l0 ; l0 = l0->next) {
+				for (i=0 ; i < nb_panel ; i++) {
+					for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                  for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
                      tsk = l0->data;
-                     if (tsk->win == t->win)
+                     if (tsk->win == t->win) {
                   		tsk->area.is_active = 1;
+                  		//printf("active monitor %d, task %s\n", panel1[i].monitor, tsk->title);
+                  	}
                   }
-               }
-            }
-            else
-   	      	t->area.is_active = 1;
-         	panel.task_active = t;
+					}
+				}
+         	task_active = t;
 			}
-         panel.refresh = 1;
+         panel_refresh = 1;
       }
-      /* Wallpaper changed */
       else if (at == server.atom._XROOTPMAP_ID) {
-			set_panel_background();
-         panel.refresh = 1;
+			// change Wallpaper
+			for (i=0 ; i < nb_panel ; i++) {
+				set_panel_background(&panel1[i]);
+			}
+         panel_refresh = 1;
       }
    }
    else {
-      Task *tsk;
       tsk = task_get_task (win);
       if (!tsk) return;
       //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
 
-      /* Window title changed */
+      // Window title changed
       if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
-         if (tsk->all_desktop) {
-            Task *tsk2;
-            GSList *l0;
-            int i, nb;
-            nb = server.nb_desktop * server.nb_monitor;
-            for (i=0 ; i < nb ; i++) {
-               for (l0 = panel.taskbar[i].area.list; l0 ; l0 = l0->next) {
-                  tsk2 = l0->data;
-                  if (tsk->win == tsk2->win) {
-                     get_title(tsk2);
-                     tsk2->area.redraw = 1;
-                  }
-               }
-            }
-         }
-         else {
-            get_title(tsk);
-            tsk->area.redraw = 1;
-         }
-         panel.refresh = 1;
+			Task *tsk2;
+			GSList *l0;
+			get_title(tsk);
+			// changed other tsk->title
+			for (i=0 ; i < nb_panel ; i++) {
+				for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+					for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
+						tsk2 = l0->data;
+						if (tsk->win == tsk2->win && tsk != tsk2) {
+							tsk2->title = tsk->title;
+							tsk2->area.redraw = 1;
+						}
+					}
+				}
+			}
+         panel_refresh = 1;
       }
-      /* Iconic state */
+		// Demand attention
+      else if (at == server.atom._NET_WM_STATE) {
+         if (window_is_urgent (win)) {
+				task_urgent = tsk;
+				tick_urgent = 0;
+				time_precision = 1;
+			}
+		}
       else if (at == server.atom.WM_STATE) {
-         if (window_is_iconified (win))
-            if (panel.task_active) {
-               if (panel.task_active->win == tsk->win) {
-                  if (tsk->all_desktop) {
-                     Task *tsk2;
-                     GSList *l0;
-                     int i, nb;
-                     nb = server.nb_desktop * server.nb_monitor;
-                     for (i=0 ; i < nb ; i++) {
-                        for (l0 = panel.taskbar[i].area.list; l0 ; l0 = l0->next) {
-                           tsk2 = l0->data;
-                           tsk2->area.is_active = 0;
-                        }
-                     }
-                  }
-                  else
-                     panel.task_active->area.is_active = 0;
-                  panel.task_active = 0;
+      	// Iconic state
+			// TODO : try to delete following code
+         if (window_is_iconified (win)) {
+            if (task_active) {
+               if (task_active->win == tsk->win) {
+						Task *tsk2;
+						GSList *l0;
+						for (i=0 ; i < nb_panel ; i++) {
+							for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+								for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
+									tsk2 = l0->data;
+									tsk2->area.is_active = 0;
+								}
+							}
+						}
+                  task_active = 0;
                }
             }
-      }
-      /* Window icon changed */
+			}
+		}
+      // Window icon changed
       else if (at == server.atom._NET_WM_ICON) {
-         if (tsk->icon_data) {
-            free (tsk->icon_data);
-            tsk->icon_data = 0;
-         }
-         tsk->area.redraw = 1;
-         panel.refresh = 1;
+		   get_icon(tsk);
+			Task *tsk2;
+			GSList *l0;
+			for (i=0 ; i < nb_panel ; i++) {
+				for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+					for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
+						tsk2 = l0->data;
+						if (tsk->win == tsk2->win && tsk != tsk2) {
+							tsk2->icon_width = tsk->icon_width;
+							tsk2->icon_height = tsk->icon_height;
+							tsk2->icon_data = tsk->icon_data;
+							tsk2->icon_data_active = tsk->icon_data_active;
+							tsk2->area.redraw = 1;
+						}
+					}
+				}
+			}
+         panel_refresh = 1;
       }
-      /* Window desktop changed */
+      // 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);
+			int active = tsk->area.is_active;
+			//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);
+				tsk = add_task (win);
+				if (tsk && active) {
+					tsk->area.is_active = 1;
+					task_active = tsk;
+				}
+				panel_refresh = 1;
+			}
       }
 
       if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen);
@@ -375,19 +572,48 @@ void event_property_notify (Window win, Atom at)
 }
 
 
-void event_configure_notify (Window win)
+void event_expose (XEvent *e)
 {
-   if (panel.mode != MULTI_MONITOR) return;
+   Panel *panel;
+
+	panel = get_panel(e->xany.window);
+	if (!panel) return;
+	// TODO : one panel_refresh per panel ?
+   panel_refresh = 1;
+}
 
+
+void event_configure_notify (Window win)
+{
+	// check 'win' move in systray
+	TrayWindow *traywin;
+	GSList *l;
+	for (l = systray.list_icons; l ; l = l->next) {
+		traywin = (TrayWindow*)l->data;
+		if (traywin->id == win) {
+			//printf("move tray %d\n", traywin->x);
+			XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
+	      panel_refresh = 1;
+			return;
+		}
+	}
+
+	// check 'win' move in another monitor
+   if (nb_panel == 1) return;
+   if (server.nb_monitor == 1) return;
    Task *tsk = task_get_task (win);
    if (!tsk) return;
 
-   Taskbar *tskbar = tsk->area.parent;
-   if (tskbar->monitor != window_get_monitor (win)) {
-      // task on another monitor
+   Panel *p = tsk->area.panel;
+   if (p->monitor != window_get_monitor (win)) {
       remove_task (tsk);
       add_task (win);
-      panel.refresh = 1;
+      if (win == window_get_active ()) {
+		   Task *tsk = task_get_task (win);
+			tsk->area.is_active = 1;
+			task_active = tsk;
+		}
+      panel_refresh = 1;
    }
 }
 
@@ -395,18 +621,38 @@ void event_configure_notify (Window win)
 void event_timer()
 {
    struct timeval stv;
-
-   if (!time1_format) return;
+	int i;
 
    if (gettimeofday(&stv, 0)) return;
 
    if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return;
-
-   // update clock
-   time_clock.tv_sec = stv.tv_sec;
-   time_clock.tv_sec -= time_clock.tv_sec % time_precision;
-   panel.clock.area.redraw = 1;
-   panel.refresh = 1;
+	time_clock.tv_sec = stv.tv_sec;
+	time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+
+	// urgent task
+	if (task_urgent) {
+		if (tick_urgent < max_tick_urgent) {
+			task_urgent->area.is_active = !task_urgent->area.is_active;
+			task_urgent->area.redraw = 1;
+			tick_urgent++;
+		}
+	}
+
+	// update battery
+#ifdef ENABLE_BATTERY
+	if (panel1[0].battery.area.on_screen) {
+		update_battery();
+		for (i=0 ; i < nb_panel ; i++)
+			panel1[i].battery.area.resize = 1;
+	}
+#endif
+
+	// update clock
+   if (time1_format) {
+		for (i=0 ; i < nb_panel ; i++)
+	   	panel1[i].clock.area.resize = 1;
+	}
+	panel_refresh = 1;
 }
 
 
@@ -414,36 +660,35 @@ int main (int argc, char *argv[])
 {
    XEvent e;
    fd_set fd;
-   int x11_fd, i, c;
+   int x11_fd, i;
    struct timeval tv;
+   Panel *panel;
+	GSList *it;
 
-   c = getopt (argc, argv, "c:");
-   init ();
+   init (argc, argv);
 
 load_config:
-   // append full transparency background
-   list_back = g_slist_append(0, calloc(1, sizeof(Area)));
-
-   // read tint2rc config
    i = 0;
-   if (c != -1)
-      i = config_read_file (optarg);
-   if (!i)
-      i = config_read ();
-   if (!i) {
-      fprintf(stderr, "usage: tint2 [-c] <config_file>\n");
-      cleanup();
-      exit(1);
-   }
-   config_finish ();
-
-   window_draw_panel ();
-
-   // BUG: refresh(clock) is needed here, but 'on the paper' it's not necessary.
-   refresh(&panel.clock.area);
-
-   x11_fd = ConnectionNumber (server.dsp);
-   XSync (server.dsp, False);
+	init_config();
+   if (config_path)
+      i = config_read_file (config_path);
+	else
+		i = config_read ();
+	if (!i) {
+		fprintf(stderr, "usage: tint2 [-c] <config_file>\n");
+		cleanup();
+		exit(1);
+	}
+   config_finish();
+	if (thumbnail_path) {
+		// usage: tint2 -j <file> for internal use
+		printf("file %s\n", thumbnail_path);
+		cleanup();
+		exit(0);
+	}
+
+   x11_fd = ConnectionNumber(server.dsp);
+   XSync(server.dsp, False);
 
    while (1) {
       // thanks to AngryLlama for the timer
@@ -461,22 +706,19 @@ load_config:
 
             switch (e.type) {
                case ButtonPress:
-                  if (e.xbutton.button == 1) event_button_press (e.xbutton.x, e.xbutton.y);
+                  event_button_press (&e);
                   break;
 
                case ButtonRelease:
-                  event_button_release (e.xbutton.button, e.xbutton.x, e.xbutton.y);
+                  event_button_release(&e);
                   break;
 
                case Expose:
-                  //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, window.main_win, server.gc, panel.area.paddingxlr, 0, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, 0);
-                  XCopyArea (server.dsp, server.pmap, window.main_win, server.gc, 0, 0, panel.area.width, panel.area.height, 0, 0);
+               	event_expose(&e);
                   break;
 
                case PropertyNotify:
-                  //printf("PropertyNotify\n");
-                  event_property_notify (e.xproperty.window, e.xproperty.atom);
+                  event_property_notify(&e);
                   break;
 
                case ConfigureNotify:
@@ -484,25 +726,77 @@ load_config:
                      goto load_config;
                   else
                      event_configure_notify (e.xconfigure.window);
+                  break;
+
+					case ReparentNotify:
+						if (!systray.area.on_screen)
+							break;
+						panel = (Panel*)systray.area.panel;
+						if (e.xany.window == panel->main_win) // reparented to us
+							break;
+						// FIXME: 'reparent to us' badly detected => disabled
+						break;
+					case UnmapNotify:
+					case DestroyNotify:
+						if (!systray.area.on_screen)
+							break;
+						for (it = systray.list_icons; it; it = g_slist_next(it)) {
+							if (((TrayWindow*)it->data)->id == e.xany.window) {
+								remove_icon((TrayWindow*)it->data);
+								break;
+							}
+						}
+					break;
+
+					case ClientMessage:
+						if (!systray.area.on_screen) break;
+						if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+							net_message(&e.xclient);
+						}
                   break;
             }
          }
       }
-      else event_timer();
+      event_timer();
 
-		switch (panel.signal_pending) {
+		switch (signal_pending) {
 			case SIGUSR1:
+				signal_pending = 0;
             goto load_config;
 			case SIGINT:
 			case SIGTERM:
+			case SIGHUP:
 			   cleanup ();
 			   return 0;
       }
 
-      if (panel.refresh && !panel.sleep_mode) {
-         visual_refresh ();
-         //printf("   *** visual_refresh\n");
-      }
+      if (panel_refresh) {
+			panel_refresh = 0;
+
+			if (refresh_systray) {
+				panel = (Panel*)systray.area.panel;
+				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);
+			}
+			for (i=0 ; i < nb_panel ; i++) {
+				panel = &panel1[i];
+
+				if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
+				panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+
+			 	refresh(&panel->area);
+			   XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+			}
+			XFlush (server.dsp);
+
+			if (refresh_systray) {
+				refresh_systray = 0;
+				panel = (Panel*)systray.area.panel;
+				// tint2 doen't draw systray icons. it just redraw background.
+				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
+				// force icon's refresh
+				refresh_systray_icon();
+			}
+		}
    }
 }