*add* real transparency is now supported... most systray applications work out of...

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

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 8e74972ab783026220f87a4532b4506b158339af..d606047f2d85b4270a2b89db0e61f8a45baa0d93 100644 (file)
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -32,7 +32,7 @@ static int x, y, width, height;
 // the next functions are helper functions for tooltip handling
 void start_show_timeout();
 void start_hide_timeout();
-void stop_timeouts();
+void stop_tooltip_timeout();
 void tooltip_copy_text(Area* area);
 
 // give the tooltip some reasonable default values
@@ -41,8 +41,8 @@ Tooltip g_tooltip = {
        .area = 0,
        .panel = 0,
        .window = 0,
-       .show_timeout = { 0, 0 },
-       .hide_timeout = { 0, 0 },
+       .show_timeout_msec = 0,
+       .hide_timeout_msec = 0,
        .enabled = False,
        .mapped = False,
        .paddingx = 0,
@@ -51,8 +51,7 @@ Tooltip g_tooltip = {
        .background_color = { .color={0.5, 0.4, 0.5}, .alpha=1 },
        .border = { .color={0, 0, 0}, .alpha=1,  .width=1, .rounded=0 },
        .font_desc = 0,
-       .show_timer_id = 0,
-       .hide_timer_id = 0
+       .timeout = 0
 };
 
 void init_tooltip()
@@ -60,20 +59,21 @@ void init_tooltip()
        if (!g_tooltip.font_desc)
                g_tooltip.font_desc = pango_font_description_from_string("sans 10");
 
-       g_tooltip.show_timer_id = install_timer(0, 0, 0, 0, tooltip_show);
-       g_tooltip.hide_timer_id = install_timer(0, 0, 0, 0, tooltip_hide);
-
        XSetWindowAttributes attr;
        attr.override_redirect = True;
        attr.event_mask = StructureNotifyMask;
+       attr.colormap = server.colormap;
+       attr.background_pixel = 0;
+       attr.border_pixel = 0;
+       unsigned long mask = CWEventMask|CWColormap|CWBorderPixel|CWBackPixel|CWOverrideRedirect;
        if (g_tooltip.window) XDestroyWindow(server.dsp, g_tooltip.window);
-       g_tooltip.window = XCreateWindow(server.dsp, server.root_win, 0, 0, 100, 20, 0, server.depth, InputOutput, CopyFromParent, CWOverrideRedirect|CWEventMask, &attr);
+       g_tooltip.window = XCreateWindow(server.dsp, server.root_win, 0, 0, 100, 20, 0, server.depth, InputOutput, server.visual, mask, &attr);
 }
 
 
 void cleanup_tooltip()
 {
-       stop_timeouts();
+       stop_tooltip_timeout();
        tooltip_hide();
        g_tooltip.enabled = False;
        tooltip_copy_text(0);
@@ -96,7 +96,7 @@ void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
        if (g_tooltip.mapped && g_tooltip.area != area) {
                tooltip_copy_text(area);
                tooltip_update();
-               stop_timeouts();
+               stop_tooltip_timeout();
        }
        else if (!g_tooltip.mapped) {
                start_show_timeout();
@@ -110,7 +110,7 @@ void tooltip_show()
   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_timeouts();
+       stop_tooltip_timeout();
        if (!g_tooltip.mapped && area->_get_tooltip_text) {
                tooltip_copy_text(area);
                g_tooltip.mapped = True;
@@ -204,7 +204,6 @@ void tooltip_update()
                return;
        }
 
-//     printf("tooltip_update\n");
        tooltip_update_geometry();
        tooltip_adjust_geometry();
        XMoveResizeWindow(server.dsp, g_tooltip.window, x, y, width, height);
@@ -216,13 +215,20 @@ void tooltip_update()
        cs = cairo_xlib_surface_create(server.dsp, g_tooltip.window, server.visual, width, height);
        c = cairo_create(cs);
        Color bc = g_tooltip.background_color;
-       cairo_rectangle(c, 0, 0, width, height);
-       cairo_set_source_rgb(c, bc.color[0], bc.color[1], bc.color[2]);
-       cairo_fill(c);
        Border b = g_tooltip.border;
-       cairo_set_source_rgba(c, b.color[0], b.color[1], b.color[2], b.alpha);
+       if (real_transparency) {
+               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);
+       }
+       else {
+               cairo_rectangle(c, 0., 0, width, height);
+               cairo_set_source_rgb(c, bc.color[0], bc.color[1], bc.color[2]);
+       }
+       cairo_fill(c);
        cairo_set_line_width(c, b.width);
-       cairo_rectangle(c, b.width/2.0, b.width/2.0, width-b.width, height-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);
+       cairo_set_source_rgba(c, b.color[0], b.color[1], b.color[2], b.alpha);
        cairo_stroke(c);
 
        config_color fc = g_tooltip.font_color;
@@ -253,14 +259,14 @@ void tooltip_trigger_hide(Tooltip* tooltip)
        }
        else {
                // tooltip not visible yet, but maybe a timeout is still pending
-               stop_timeouts();
+               stop_tooltip_timeout();
        }
 }
 
 
 void tooltip_hide()
 {
-       stop_timeouts();
+       stop_tooltip_timeout();
        if (g_tooltip.mapped) {
                g_tooltip.mapped = False;
                XUnmapWindow(server.dsp, g_tooltip.window);
@@ -271,31 +277,28 @@ void tooltip_hide()
 
 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) {
-               tooltip_show();
-       }
-       else {
-               reset_timer(g_tooltip.show_timer_id, t.tv_sec, t.tv_nsec, 0, 0);
-       }
+       if (g_tooltip.timeout)
+               change_timeout(g_tooltip.timeout, g_tooltip.show_timeout_msec, 0, tooltip_show);
+       else
+               g_tooltip.timeout = add_timeout(g_tooltip.show_timeout_msec, 0, tooltip_show);
 }
 
 
 void start_hide_timeout()
 {
-       reset_timer(g_tooltip.show_timer_id, 0, 0, 0, 0);
-       struct timespec t = g_tooltip.hide_timeout;
-       if (t.tv_sec == 0 && t.tv_nsec == 0)
-               tooltip_hide();
+       if (g_tooltip.timeout)
+               change_timeout(g_tooltip.timeout, g_tooltip.hide_timeout_msec, 0, tooltip_hide);
        else
-               reset_timer(g_tooltip.hide_timer_id, t.tv_sec, t.tv_nsec, 0, 0);
+               g_tooltip.timeout = add_timeout(g_tooltip.hide_timeout_msec, 0, tooltip_hide);
 }
 
-void stop_timeouts()
+
+void stop_tooltip_timeout()
 {
-       reset_timer(g_tooltip.show_timer_id, 0, 0, 0, 0);
-       reset_timer(g_tooltip.hide_timer_id, 0, 0, 0, 0);
+       if (g_tooltip.timeout) {
+               stop_timeout(g_tooltip.timeout);
+               g_tooltip.timeout = 0;
+       }
 }