X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftask.c;h=317cd8fd952ad9202ce08140c7f2796727a03eb2;hb=1b1f2a1a069edcf3db99ae07020eeedae3023f76;hp=c180f85c62115b0941564be834a34888d8eb2738;hpb=0fae0eb881c82e304878bc47b0462b3caed05ed7;p=chaz%2Ftint2

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index c180f85..317cd8f 100644
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -32,7 +32,15 @@
 #include "server.h"
 #include "panel.h"
 #include "tooltip.h"
+#include "timer.h"
 
+static int urgent_timer = 0;
+
+const char* task_get_tooltip(void* obj)
+{
+	Task* t = obj;
+	return t->title;
+}
 
 
 Task *add_task (Window win)
@@ -81,6 +89,7 @@ Task *add_task (Window win)
 				new_tsk2->area.on_screen = 0;
 			}
 			new_tsk2->title = new_tsk.title;
+			new_tsk2->area._get_tooltip_text = task_get_tooltip;
 			new_tsk2->icon = new_tsk.icon;
 			new_tsk2->icon_active = new_tsk.icon_active;
 			new_tsk2->icon_width = new_tsk.icon_width;
@@ -101,12 +110,6 @@ void remove_task (Task *tsk)
 	Window win = tsk->win;
 	int desktop = tsk->desktop;
 
-	if (g_tooltip.task == tsk) {
-		tooltip_hide();
-		alarm(0);
-		g_tooltip.task = 0;
-	}
-
 	// free title and icon just for the first task
 	// even with task_on_all_desktop and with task_on_all_panel
 	//printf("remove_task %s %d\n", tsk->title, tsk->desktop);
@@ -158,12 +161,6 @@ void get_title(Task *tsk)
 
 	if (!panel->g_task.text && !g_tooltip.enabled) return;
 
-	if (g_tooltip.task == tsk) {
-		tooltip_hide();
-		alarm(0);
-		g_tooltip.task = 0;
-	}
-
 	name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0);
 	if (!name || !strlen(name)) {
 		name = server_get_property (tsk->win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 0);
@@ -364,6 +361,55 @@ void draw_task (void *obj, cairo_t *c, int active)
 }
 
 
+Task *next_task(Task *tsk)
+{
+	GSList *l0;
+	int i, j;
+	Task *tsk1;
+
+	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) {
+				tsk1 = l0->data;
+				if (tsk1 == tsk) {
+					if (l0->next == NULL) l0 = panel1[i].taskbar[j].area.list;
+					else l0 = l0->next;
+					return l0->data;
+				}
+			}
+		}
+	}
+
+	return NULL;
+}
+
+Task *prev_task(Task *tsk)
+{
+	GSList *l0;
+	int i, j;
+	Task *tsk1, *tsk2;
+
+	for (i=0 ; i < nb_panel ; i++) {
+		for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+			tsk2 = NULL;
+			for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
+				tsk1 = l0->data;
+				if (tsk1 == tsk) {
+					if (l0 == panel1[i].taskbar[j].area.list) {
+						l0 = g_slist_last ( l0 );
+						tsk2 = l0->data;
+					}
+					return tsk2;
+				}
+				tsk2 = tsk1;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+
 void active_task()
 {
 	GSList *l0;
@@ -383,15 +429,16 @@ void active_task()
 	}
 
 	Window w1 = window_get_active ();
+	//printf("Change active task %ld\n", w1);
+
 	tsk2 = task_get_task(w1);
 	if (!tsk2) {
 		Window w2;
 		if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
 			if (w2) tsk2 = task_get_task(w2);
 	}
-	if (task_urgent == tsk2) {
-		init_precision();
-		task_urgent = 0;
+	if ( is_urgent(tsk2) ) {
+		del_urgent(tsk2);
 	}
 	// put active state on all task (multi_desktop)
 	if (tsk2) {
@@ -409,3 +456,75 @@ void active_task()
 	}
 }
 
+
+void blink_urgent()
+{
+	GSList* urgent_task = urgent_list;
+	while (urgent_task) {
+		Task_urgent* t = urgent_task->data;
+		if ( t->tick < max_tick_urgent) {
+			t->tsk->area.is_active = !t->tsk->area.is_active;
+			t->tsk->area.redraw = 1;
+			t->tick++;
+		}
+		urgent_task = urgent_task->next;
+	}
+	panel_refresh = 1;
+}
+
+
+void add_urgent(Task *tsk)
+{
+	// first check if task is already in the list and reset the counter
+	GSList* urgent_task = urgent_list;
+	while (urgent_task) {
+		Task_urgent* t = urgent_task->data;
+		if (t->tsk == tsk) {
+			t->tick = 0;
+			return;
+		}
+		urgent_task = urgent_task->next;
+	}
+
+	// not yet in the list, so we have to add it
+	Task_urgent* t = malloc(sizeof(Task_urgent));
+	if (!t)
+		return;
+	t->tsk = tsk;
+	t->tick = 0;
+	urgent_list = g_slist_prepend(urgent_list, t);
+
+	if (urgent_timer == 0)
+		urgent_timer = install_timer(0, 1000000, 1, 0, blink_urgent);
+	else
+		reset_timer(urgent_timer, 0, 1000000, 1, 0);
+}
+
+
+void del_urgent(Task *tsk)
+{
+	GSList* urgent_task = urgent_list;
+	while (urgent_task) {
+		Task_urgent* t = urgent_task->data;
+		if (t->tsk == tsk) {
+			urgent_list = g_slist_remove(urgent_list, t);
+			free(t);
+			if (!urgent_list)
+				reset_timer(urgent_timer, 0, 0, 0, 0);
+			return;
+		}
+		urgent_task = urgent_task->next;
+	}
+}
+
+int is_urgent(Task *tsk)
+{
+	GSList* urgent_task = urgent_list;
+	while (urgent_task) {
+		Task_urgent* t = urgent_task->data;
+		if (t->tsk == tsk)
+			return 1;
+		urgent_task = urgent_task->next;
+	}
+	return 0;
+}