Center the tooltip correctly when the text changes while the tooltip is visible

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

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 58169fd3eafe56793ccd05212bbd753e9df42e92..d703a2ed17706071cacf6fe55049f2097d5982ff 100644 (file)
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -27,31 +27,36 @@
 #include "panel.h"
 #include "timer.h"
 
-static int x, y, width, height;
+static int x_original, y_original, x, y, width, height;
 
 // the next functions are helper functions for tooltip handling
 void start_show_timeout();
 void start_hide_timeout();
 void stop_tooltip_timeout();
-void tooltip_copy_text(Area* area);
-
-// give the tooltip some reasonable default values
-Tooltip g_tooltip = {
-       .tooltip_text = 0,
-       .area = 0,
-       .panel = 0,
-       .window = 0,
-       .show_timeout_msec = 0,
-       .hide_timeout_msec = 0,
-       .enabled = False,
-       .mapped = False,
-       .paddingx = 0,
-       .paddingy = 0,
-       .font_color = { .color={1, 1, 1}, .alpha=1 },
-       .bg = 0,
-       .font_desc = 0,
-       .timeout = 0
-};
+
+Tooltip g_tooltip;
+
+
+void default_tooltip()
+{
+       // give the tooltip some reasonable default values
+       memset(&g_tooltip, 0, sizeof(Tooltip));
+
+       g_tooltip.font_color.color[0] = 1;
+       g_tooltip.font_color.color[1] = 1;
+       g_tooltip.font_color.color[2] = 1;
+       g_tooltip.font_color.alpha = 1;
+}
+
+void cleanup_tooltip()
+{
+       stop_tooltip_timeout();
+       tooltip_hide(0);
+       tooltip_copy_text(0);
+       if (g_tooltip.window) XDestroyWindow(server.dsp, g_tooltip.window);
+       if (g_tooltip.font_desc) pango_font_description_free(g_tooltip.font_desc);
+}
+
 
 void init_tooltip()
 {
@@ -70,27 +75,11 @@ void init_tooltip()
 }
 
 
-void cleanup_tooltip()
-{
-       stop_tooltip_timeout();
-       tooltip_hide(0);
-       g_tooltip.enabled = False;
-       tooltip_copy_text(0);
-       if (g_tooltip.window) {
-               XDestroyWindow(server.dsp, g_tooltip.window);
-               g_tooltip.window = 0;
-       }
-       if (g_tooltip.font_desc) {
-               pango_font_description_free(g_tooltip.font_desc);
-               g_tooltip.font_desc = 0;
-       }
-}
-
-
-void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
+void tooltip_trigger_show(Area* area, Panel* p, XEvent *e)
 {
-       x = x_root;
-       y = y_root;
+       // Position the tooltip in the center of the area
+       x = x_original = area->posx + area->width / 2 + e->xmotion.x_root - e->xmotion.x;
+       y = y_original = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y;
        g_tooltip.panel = p;
        if (g_tooltip.mapped && g_tooltip.area != area) {
                tooltip_copy_text(area);
@@ -105,15 +94,16 @@ void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
 
 void tooltip_show(void* arg)
 {
-  int mx, my;
-  Window w;
-  XTranslateCoordinates( server.dsp, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
-  Area* area = click_area(g_tooltip.panel, mx, my);
+       int mx, my;
+       Window w;
+       XTranslateCoordinates( server.dsp, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
+       Area* area = click_area(g_tooltip.panel, mx, my);
        stop_tooltip_timeout();
        if (!g_tooltip.mapped && area->_get_tooltip_text) {
                tooltip_copy_text(area);
                g_tooltip.mapped = True;
                XMapWindow(server.dsp, g_tooltip.window);
+               tooltip_update();
                XFlush(server.dsp);
        }
 }
@@ -134,6 +124,9 @@ void tooltip_update_geometry()
        width = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingx + r2.width;
        height = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingy + r2.height;
 
+       x = x_original;
+       y = y_original;
+
        Panel* panel = g_tooltip.panel;
        if (panel_horizontal && panel_position & BOTTOM)
                y = panel->posy-height;
@@ -144,6 +137,9 @@ void tooltip_update_geometry()
        else
                x = panel->posx - width;
 
+       if (!panel_horizontal)
+               y -= height/2;
+
        g_object_unref(layout);
        cairo_destroy(c);
        cairo_surface_destroy(cs);
@@ -215,7 +211,7 @@ void tooltip_update()
        c = cairo_create(cs);
        Color bc = g_tooltip.bg->back;
        Border b = g_tooltip.bg->border;
-       if (real_transparency) {
+       if (server.real_transparency) {
                clear_pixmap(g_tooltip.window, 0, 0, width, height);
                draw_rect(c, b.width, b.width, width-2*b.width, height-2*b.width, b.rounded-b.width/1.571);
                cairo_set_source_rgba(c, bc.color[0], bc.color[1], bc.color[2], bc.alpha);
@@ -226,8 +222,10 @@ void tooltip_update()
        }
        cairo_fill(c);
        cairo_set_line_width(c, b.width);
-       if (real_transparency) draw_rect(c, b.width/2.0, b.width/2.0, width - b.width, height - b.width, b.rounded);
-       else cairo_rectangle(c, b.width/2.0, b.width/2.0, width-b.width, height-b.width);
+       if (server.real_transparency)
+               draw_rect(c, b.width/2.0, b.width/2.0, width - b.width, height - b.width, b.rounded);
+       else
+               cairo_rectangle(c, b.width/2.0, b.width/2.0, width-b.width, height-b.width);
        cairo_set_source_rgba(c, b.color[0], b.color[1], b.color[2], b.alpha);
        cairo_stroke(c);