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

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 4e85c94..317cd8f 100644
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -36,6 +36,13 @@
 
 static int urgent_timer = 0;
 
+const char* task_get_tooltip(void* obj)
+{
+	Task* t = obj;
+	return t->title;
+}
+
+
 Task *add_task (Window win)
 {
 	if (!win) return 0;
@@ -82,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;
@@ -102,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);
@@ -159,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);
@@ -365,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;