cleanup

[chaz/tint2] / src / tooltip / tooltip.c

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index e2f8a1d02f626f75367e3b44057c81bae7868c22..fe8866225d319b2583789550c2332859ea392a0b 100644 (file)
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -17,6 +17,8 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <cairo.h>
 #include <cairo-xlib.h>
 
@@ -31,10 +33,13 @@ static int x, y, width, height;
 void start_show_timeout();
 void start_hide_timeout();
 void stop_timeouts();
+void tooltip_copy_text(Area* area);
 
 // give the tooltip some reasonable default values
 Tooltip g_tooltip = {
-       .task = 0,
+       .tooltip_text = 0,
+       .area = 0,
+       .panel = 0,
        .window = 0,
        .show_timeout = { 0, 0 },
        .hide_timeout = { 0, 0 },
@@ -73,9 +78,7 @@ void cleanup_tooltip()
        stop_timeouts();
        tooltip_hide();
        g_tooltip.enabled = False;
-       if (g_tooltip.task) {
-               g_tooltip.task = 0;
-       }
+       tooltip_copy_text(0);
        if (g_tooltip.window) {
                XDestroyWindow(server.dsp, g_tooltip.window);
                g_tooltip.window = 0;
@@ -87,18 +90,17 @@ void cleanup_tooltip()
 }
 
 
-void tooltip_trigger_show(Task* task, int x_root, int y_root)
+void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
 {
        x = x_root;
        y = y_root;
-
-       if (g_tooltip.mapped && g_tooltip.task != task) {
-               g_tooltip.task = task;
+       g_tooltip.panel = p;
+       if (g_tooltip.mapped && g_tooltip.area != area) {
+               tooltip_copy_text(area);
                tooltip_update();
                stop_timeouts();
        }
        else if (!g_tooltip.mapped) {
-               g_tooltip.task = task;
                start_show_timeout();
        }
 }
@@ -106,8 +108,10 @@ void tooltip_trigger_show(Task* task, int x_root, int y_root)
 
 void tooltip_show()
 {
+       Area* area = click_area(g_tooltip.panel, x, y);
        stop_timeouts();
-       if (!g_tooltip.mapped) {
+       if (!g_tooltip.mapped && area->_get_tooltip_text) {
+               tooltip_copy_text(area);
                g_tooltip.mapped = True;
                XMapWindow(server.dsp, g_tooltip.window);
                XFlush(server.dsp);
@@ -124,13 +128,13 @@ void tooltip_update_geometry()
        c = cairo_create(cs);
        layout = pango_cairo_create_layout(c);
        pango_layout_set_font_description(layout, g_tooltip.font_desc);
-       pango_layout_set_text(layout, g_tooltip.task->title, -1);
+       pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
        PangoRectangle r1, r2;
        pango_layout_get_pixel_extents(layout, &r1, &r2);
        width = 2*g_tooltip.border.width + 2*g_tooltip.paddingx + r2.width;
        height = 2*g_tooltip.border.width + 2*g_tooltip.paddingy + r2.height;
 
-       Panel* panel = g_tooltip.task->area.panel;
+       Panel* panel = g_tooltip.panel;
        if (panel_horizontal && panel_position & BOTTOM)
                y = panel->posy-height;
        else if (panel_horizontal && panel_position & TOP)
@@ -152,7 +156,7 @@ void tooltip_adjust_geometry()
        // it seems quite impossible that the height needs to be adjusted, but we do it anyway.
 
        int min_x, min_y, max_width, max_height;
-       Panel* panel = g_tooltip.task->area.panel;
+       Panel* panel = g_tooltip.panel;
        int screen_width = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width;
        int screen_height = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height;
        if ( x+width <= screen_width && y+height <= screen_height && x>=0 && y>=0)
@@ -194,7 +198,7 @@ void tooltip_adjust_geometry()
 
 void tooltip_update()
 {
-       if (!g_tooltip.task) {
+       if (!g_tooltip.tooltip_text) {
                tooltip_hide();
                return;
        }
@@ -224,7 +228,7 @@ void tooltip_update()
        cairo_set_source_rgba(c, fc.color[0], fc.color[1], fc.color[2], fc.alpha);
        layout = pango_cairo_create_layout(c);
        pango_layout_set_font_description(layout, g_tooltip.font_desc);
-       pango_layout_set_text(layout, g_tooltip.task->title, -1);
+       pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
        PangoRectangle r1, r2;
        pango_layout_get_pixel_extents(layout, &r1, &r2);
        pango_layout_set_width(layout, width*PANGO_SCALE);
@@ -243,7 +247,7 @@ void tooltip_update()
 void tooltip_trigger_hide(Tooltip* tooltip)
 {
        if (g_tooltip.mapped) {
-               g_tooltip.task = 0;
+               tooltip_copy_text(0);
                start_hide_timeout();
        }
        else {
@@ -268,10 +272,12 @@ void start_show_timeout()
 {
        reset_timer(g_tooltip.hide_timer_id, 0, 0, 0, 0);
        struct timespec t = g_tooltip.show_timeout;
-       if (t.tv_sec == 0 && t.tv_nsec == 0)
+       if (t.tv_sec == 0 && t.tv_nsec == 0) {
                tooltip_show();
-       else
+       }
+       else {
                reset_timer(g_tooltip.show_timer_id, t.tv_sec, t.tv_nsec, 0, 0);
+       }
 }
 
 
@@ -290,3 +296,14 @@ void stop_timeouts()
        reset_timer(g_tooltip.show_timer_id, 0, 0, 0, 0);
        reset_timer(g_tooltip.hide_timer_id, 0, 0, 0, 0);
 }
+
+
+void tooltip_copy_text(Area* area)
+{
+       free(g_tooltip.tooltip_text);
+       if (area && area->_get_tooltip_text)
+               g_tooltip.tooltip_text = strdup(area->_get_tooltip_text(area));
+       else
+               g_tooltip.tooltip_text = 0;
+       g_tooltip.area = area;
+}