X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=1753ac576f624c618fdfcd9f353558142db8730b;hb=343070b2c8c943fdbece1b34c94506d51f7c8c8c;hp=1429adf8154eb97b2bd2e1966e9955c353d93c8c;hpb=0fb8a9c21818afd0c742771e46c0e5b57cb3b70c;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index 1429adf..1753ac5 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -50,8 +50,9 @@ void init ()
 {
 	// 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);
 
    // set global data
    memset(&server, 0, sizeof(Server_global));
@@ -92,6 +93,7 @@ void cleanup()
    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);
@@ -99,6 +101,7 @@ void cleanup()
 	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);
 
@@ -137,10 +140,15 @@ void event_button_press (XEvent *e)
 	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)) {
+		if ((panel_horizontal && (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)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) {
 			// 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;
@@ -157,25 +165,44 @@ void event_button_press (XEvent *e)
 
    GSList *l0;
    Taskbar *tskbar;
-   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;
-   }
-
-   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)) {
-            task_drag = tsk;
-            break;
-         }
-      }
-   }
-
+	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;
+		}
+		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)) {
+					task_drag = tsk;
+					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;
+		}
+		if (l0) {
+			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)) {
+					task_drag = tsk;
+					break;
+				}
+			}
+		}
+	}
    XLowerWindow (server.dsp, panel->main_win);
 }
 
@@ -186,7 +213,7 @@ void event_button_release (XEvent *e)
 	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)) {
+		if ((panel_horizontal && (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)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) {
 			// forward the click to the desktop window (thanks conky)
 			e->xbutton.window = server.root_win;
 			XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
@@ -196,7 +223,7 @@ void event_button_release (XEvent *e)
 
    int action = TOGGLE_ICONIFY;
    int x = e->xbutton.x;
-   //int y = e->xbutton.y; // unused
+   int y = e->xbutton.y;
    switch (e->xbutton.button) {
       case 2:
          action = mouse_middle;
@@ -216,14 +243,28 @@ void event_button_release (XEvent *e)
    Taskbar *tskbar;
    GSList *l0;
 	Clock clk = panel->clock;
-	if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
-		clock_action(e->xbutton.button);
+	if (panel_horizontal) {
+		if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
+			clock_action(e->xbutton.button);
+		else {
+			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))
+					goto suite;
+			}
+		}
+	}
 	else {
-		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))
-				goto suite;
+		if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height))
+			clock_action(e->xbutton.button);
+		else {
+			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))
+					goto suite;
+			}
 		}
 	}
 
@@ -257,10 +298,18 @@ suite:
    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;
-      }
+		if (panel_horizontal) {
+			if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
+				window_action (tsk, action);
+				break;
+			}
+		}
+		else {
+			if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
+				window_action (tsk, action);
+				break;
+			}
+		}
    }
 
    // to keep window below
@@ -302,13 +351,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++) {
@@ -348,8 +395,8 @@ void event_property_notify (XEvent *e)
 			}
          panel_refresh = 1;
       }
-      // Wallpaper changed
       else if (at == server.atom._XROOTPMAP_ID) {
+			// change Wallpaper
 			for (i=0 ; i < nb_panel ; i++) {
 				set_panel_background(&panel1[i]);
 			}
@@ -384,6 +431,7 @@ void event_property_notify (XEvent *e)
       else if (at == server.atom._NET_WM_STATE) {
          if (window_is_urgent (win)) {
 				task_urgent = tsk;
+				tick_urgent = 0;
 				time_precision = 1;
 			}
 		}
@@ -430,9 +478,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);
@@ -446,42 +499,34 @@ void event_expose (XEvent *e)
 
 	panel = get_panel(e->xany.window);
 	if (!panel) return;
-/*
-	if (systray.area.on_screen) {
-		// force trayer refresh
-		//XClearWindow(tray_data.dpy, ti->mid_parent);
-		//x11_send_visibility(tray_data.dpy, dst, VisibilityFullyObscured);
-		//x11_send_visibility(tray_data.dpy, dst, VisibilityUnobscured);
-
-		GSList *l;
-		TrayWindow *traywin;
-		for (l = systray.list_icons; l ; l = l->next) {
-			traywin = (TrayWindow*)l->data;
-			// send Expose event
-			XClearArea(server.dsp, traywin->id, 0, 0, systray.area.width, systray.area.height, True);
-			//printf("expose %lx\n", traywin->id);
-		}
-
-		//x11_refresh_window(tray_data.dpy, ti->wid, ti->l.wnd_sz.x, ti->l.wnd_sz.y, True);
-	}
-*/
+	// TODO : one panel_refresh per panel ?
    panel_refresh = 1;
-	//XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
-
 }
 
 
 void event_configure_notify (Window win)
 {
-   if (panel_mode != SINGLE_MONITOR) return;
-   if (server.nb_monitor == 1) return;
+	// 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;
 
    Panel *p = tsk->area.panel;
    if (p->monitor != window_get_monitor (win)) {
-      // task on another monitor
       remove_task (tsk);
       add_task (win);
       if (win == window_get_active ()) {
@@ -502,24 +547,29 @@ 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) {
-		task_urgent->area.is_active = !task_urgent->area.is_active;
-		task_urgent->area.redraw = 1;
+		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(&battery_state);
+		update_battery();
 		for (i=0 ; i < nb_panel ; i++)
 			panel1[i].battery.area.resize = 1;
 	}
+#endif
 
 	// 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;
 	}
@@ -536,14 +586,22 @@ int main (int argc, char *argv[])
    Panel *panel;
 	GSList *it;
 
-   c = getopt (argc, argv, "c:");
    init ();
 
 load_config:
    i = 0;
+   c = getopt (argc, argv, "c:");
 	init_config();
-   if (c != -1)
+   if (c != -1) {
       i = config_read_file (optarg);
+	   c = getopt (argc, argv, "j:");
+	   if (c != -1) {
+			// usage: tint2 [-c] <config_file> -j <jpeg_file> for internal use
+   	   printf("jpeg file %s\n", optarg);
+	      cleanup();
+   	   exit(0);
+		}
+	}
    if (!i)
       i = config_read ();
    if (!i) {
@@ -594,9 +652,13 @@ load_config:
                      event_configure_notify (e.xconfigure.window);
                   break;
 
+					case ReparentNotify:
+						if (e.xany.window == server.root_win) // reparented to us
+							break;
 					case UnmapNotify:
 					case DestroyNotify:
-						if (!systray.area.on_screen) break;
+						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);
@@ -607,7 +669,6 @@ load_config:
 
 					case ClientMessage:
 						if (!systray.area.on_screen) break;
-						//printf("ClientMessage\n");
 						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);
 						}
@@ -615,13 +676,15 @@ load_config:
             }
          }
       }
-      else event_timer();
+      event_timer();
 
 		switch (signal_pending) {
 			case SIGUSR1:
+				signal_pending = 0;
             goto load_config;
 			case SIGINT:
 			case SIGTERM:
+			case SIGHUP:
 			   cleanup ();
 			   return 0;
       }
@@ -629,6 +692,10 @@ load_config:
       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];
 
@@ -639,14 +706,17 @@ load_config:
 			   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();
+			}
 		}
    }
 }
 
-// ****************************************************
-// 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);