X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=d606047f2d85b4270a2b89db0e61f8a45baa0d93;hb=21dcd195642692401f855ef07b239364b5ef0c1b;hp=07af226aa4e1aea6f4035ee9be199a80a6957fb6;hpb=61232646c1684ec38a7281abc473b44fde11efd0;p=chaz%2Ftint2 diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c index 07af226..d606047 100644 --- a/src/tooltip/tooltip.c +++ b/src/tooltip/tooltip.c @@ -17,6 +17,8 @@ #include #include +#include +#include #include #include @@ -30,14 +32,17 @@ 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 Tooltip g_tooltip = { - .task = 0, + .tooltip_text = 0, + .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, @@ -46,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() @@ -55,27 +59,24 @@ void init_tooltip() if (!g_tooltip.font_desc) g_tooltip.font_desc = pango_font_description_from_string("sans 10"); - if (g_tooltip.show_timer_id == 0) - g_tooltip.show_timer_id = install_timer(0, 0, 0, 0, tooltip_show); - if (g_tooltip.hide_timer_id == 0) - g_tooltip.hide_timer_id = install_timer(0, 0, 0, 0, tooltip_hide); - XSetWindowAttributes attr; attr.override_redirect = True; - attr.event_mask = ExposureMask; + 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; - 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 +88,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(); + stop_tooltip_timeout(); } else if (!g_tooltip.mapped) { - g_tooltip.task = task; start_show_timeout(); } } @@ -106,10 +106,16 @@ void tooltip_trigger_show(Task* task, int x_root, int y_root) void tooltip_show() { - if (!g_tooltip.mapped) { + 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); } } @@ -123,13 +129,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) @@ -151,7 +157,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) @@ -193,12 +199,11 @@ void tooltip_adjust_geometry() void tooltip_update() { - if (!g_tooltip.task) { + if (!g_tooltip.tooltip_text) { tooltip_hide(); return; } - //printf("tooltip_update\n"); tooltip_update_geometry(); tooltip_adjust_geometry(); XMoveResizeWindow(server.dsp, g_tooltip.window, x, y, width, height); @@ -210,20 +215,27 @@ 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; 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); @@ -242,48 +254,60 @@ 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 { // tooltip not visible yet, but maybe a timeout is still pending - stop_timeouts(); + stop_tooltip_timeout(); } } void tooltip_hide() { + stop_tooltip_timeout(); if (g_tooltip.mapped) { g_tooltip.mapped = False; XUnmapWindow(server.dsp, g_tooltip.window); + XFlush(server.dsp); } } 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(); + if (g_tooltip.timeout) + change_timeout(g_tooltip.timeout, g_tooltip.show_timeout_msec, 0, tooltip_show); else - reset_timer(g_tooltip.show_timer_id, t.tv_sec, t.tv_nsec, 0, 0); + 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; + } +} + + +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; }