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

diff --git a/src/tint.c b/src/tint.c
index baaaf03..a75b1b4 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -46,13 +46,25 @@ void signal_handler(int 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(SIGHUP, signal_handler);
+	signal(SIGCHLD, SIG_IGN);		// don't have to wait() after fork()
 
    // set global data
    memset(&server, 0, sizeof(Server_global));
@@ -104,6 +116,8 @@ void cleanup()
 #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);
@@ -111,77 +125,158 @@ void cleanup()
 }
 
 
-void window_action (Task *tsk, int action)
+Taskbar *click_taskbar (Panel *panel, XEvent *e)
 {
-   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;
-   }
+	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;
 }
 
 
-void event_button_press (XEvent *e)
+Task *click_task (Panel *panel, XEvent *e)
 {
-   Panel *panel = get_panel(e->xany.window);
-	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)) {
-			// 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;
+	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;
+}
 
-	if (e->xbutton.button != 1) return;
 
-   if (panel_mode != MULTI_DESKTOP) {
-      // drag and drop disabled
-      XLowerWindow (server.dsp, panel->main_win);
-      return;
-   }
+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;
+}
 
-   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;
-         }
-      }
+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, panel->main_win);
@@ -193,18 +288,14 @@ void event_button_release (XEvent *e)
    Panel *panel = get_panel(e->xany.window);
 	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 (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;
-   int x = e->xbutton.x;
-   //int y = e->xbutton.y; // unused
    switch (e->xbutton.button) {
       case 2:
          action = mouse_middle;
@@ -218,29 +309,29 @@ void event_button_release (XEvent *e)
       case 5:
          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;
-	Clock clk = panel->clock;
-	if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
+	if ( click_clock(panel, e)) {
 		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;
-		}
+		XLowerWindow (server.dsp, panel->main_win);
+		task_drag = 0;
+		return;
 	}
 
-   // TODO: check better solution to keep window below
-   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 (task_drag) {
       if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) {
@@ -256,20 +347,13 @@ suite:
    }
 
    // 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, panel->main_win);
@@ -304,6 +388,35 @@ void event_property_notify (XEvent *e)
       // Change desktop
       else if (at == server.atom._NET_CURRENT_DESKTOP) {
          server.desktop = server_get_current_desktop ();
+			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();
          }
@@ -338,6 +451,7 @@ void event_property_notify (XEvent *e)
 				init_precision();
 				task_urgent = 0;
 			}
+			// put active state on all task (multi_desktop)
          if (t) {
 				for (i=0 ; i < nb_panel ; i++) {
 					for (j=0 ; j < panel1[i].nb_desktop ; j++) {
@@ -359,7 +473,6 @@ void event_property_notify (XEvent *e)
 			for (i=0 ; i < nb_panel ; i++) {
 				set_panel_background(&panel1[i]);
 			}
-			refresh_systray();
          panel_refresh = 1;
       }
    }
@@ -391,6 +504,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;
 			}
 		}
@@ -428,6 +542,7 @@ void event_property_notify (XEvent *e)
 							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;
 						}
 					}
@@ -438,11 +553,16 @@ void event_property_notify (XEvent *e)
       // Window desktop changed
       else if (at == server.atom._NET_WM_DESKTOP) {
 			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);
-				add_task (win);
+				tsk = add_task (win);
+				if (tsk && active) {
+					tsk->area.is_active = 1;
+					task_active = tsk;
+				}
 				panel_refresh = 1;
 			}
       }
@@ -511,8 +631,11 @@ void event_timer()
 
 	// 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
@@ -537,27 +660,32 @@ 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:
    i = 0;
 	init_config();
-   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);
-   }
+   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);
@@ -601,8 +729,13 @@ load_config:
                   break;
 
 					case ReparentNotify:
-						if (e.xany.window == server.root_win) // reparented to us
+						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)
@@ -628,6 +761,7 @@ load_config:
 
 		switch (signal_pending) {
 			case SIGUSR1:
+				signal_pending = 0;
             goto load_config;
 			case SIGINT:
 			case SIGTERM:
@@ -639,6 +773,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];
 
@@ -649,6 +787,15 @@ 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();
+			}
 		}
    }
 }