X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=7bfd7093f895ff710ad9d48713cbb95b7342ceb9;hb=35e206acc0a7b9dca7611fe4a7e17c7acc381ad0;hp=3d8c7aa0a800494f8e1799934c3f7b9da817e8be;hpb=8a24822a1c1cafcbd55a9225314b01cab5e4d82a;p=chaz%2Ftint2 diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c index 3d8c7aa..7bfd709 100644 --- a/src/tooltip/tooltip.c +++ b/src/tooltip/tooltip.c @@ -17,33 +17,41 @@ #include #include +#include +#include #include #include #include "server.h" #include "tooltip.h" #include "panel.h" - -// TODO: Use timer_create instead of setitimer, because SIGALRM is not the right signal for this... -// Reason: If we want to implement autohide we have to use another signal... +#include "timer.h" 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_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 = { .it_interval={0, 0}, .it_value={0, 0} }, - .hide_timeout = { .it_interval={0, 0}, .it_value={0, 0} }, + .show_timeout_msec = 0, + .hide_timeout_msec = 0, .enabled = False, - .current_state = TOOLTIP_ABOUT_TO_HIDE, .mapped = False, .paddingx = 0, .paddingy = 0, .font_color = { .color={1, 1, 1}, .alpha=1 }, .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 + .font_desc = 0, + .timeout = 0 }; void init_tooltip() @@ -53,7 +61,7 @@ void init_tooltip() XSetWindowAttributes attr; attr.override_redirect = True; - attr.event_mask = ExposureMask; + attr.event_mask = StructureNotifyMask; 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); } @@ -61,13 +69,10 @@ void init_tooltip() void cleanup_tooltip() { - alarm(0); + stop_tooltip_timeout(); tooltip_hide(); g_tooltip.enabled = False; - g_tooltip.current_state = TOOLTIP_ABOUT_TO_HIDE; - 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; @@ -79,46 +84,34 @@ void cleanup_tooltip() } -void tooltip_sighandler(int sig) -{ - if (g_tooltip.current_state == TOOLTIP_ABOUT_TO_SHOW) - tooltip_show(); - else if (g_tooltip.current_state == TOOLTIP_ABOUT_TO_HIDE) - tooltip_hide(); -} - - -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(); - alarm(0); + stop_tooltip_timeout(); } else if (!g_tooltip.mapped) { - g_tooltip.current_state = TOOLTIP_ABOUT_TO_SHOW; - g_tooltip.task = task; - struct timeval t = g_tooltip.show_timeout.it_value; - if (t.tv_sec == 0 && t.tv_usec == 0) { - alarm(0); - tooltip_show(); - } - else - setitimer(ITIMER_REAL, &g_tooltip.show_timeout, 0); + start_show_timeout(); } } 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(); - alarm(0); + XFlush(server.dsp); } } @@ -132,13 +125,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) @@ -147,9 +140,7 @@ void tooltip_update_geometry() x = panel->posx + panel->area.width; else x = panel->posx - width; - - //printf("tooltip_update_geometry x_root %d, y_root %d\n", x, y); - //printf(" panel posx %d, posy %d\n", panel->posx, panel->posy); + g_object_unref(layout); cairo_destroy(c); cairo_surface_destroy(cs); @@ -162,7 +153,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) @@ -200,12 +191,11 @@ void tooltip_adjust_geometry() y=min_y; if (height>max_height) height=max_height; - //printf("tooltip_adjust_geometry x_root %d, y_root %d\n", x, y); } void tooltip_update() { - if (!g_tooltip.task) { + if (!g_tooltip.tooltip_text) { tooltip_hide(); return; } @@ -234,7 +224,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); @@ -253,27 +243,60 @@ void tooltip_update() void tooltip_trigger_hide(Tooltip* tooltip) { if (g_tooltip.mapped) { - g_tooltip.current_state = TOOLTIP_ABOUT_TO_HIDE; - struct timeval t = g_tooltip.hide_timeout.it_value; - g_tooltip.task = 0; - if (t.tv_sec == 0 && t.tv_usec == 0) { - tooltip_hide(); - alarm(0); - } - else - setitimer(ITIMER_REAL, &g_tooltip.hide_timeout, 0); + tooltip_copy_text(0); + start_hide_timeout(); } else { - // tooltip not visible yet, but maybe an alarm is still pending - alarm(0); + // tooltip not visible yet, but maybe a timeout is still pending + 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() +{ + 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() +{ + if (g_tooltip.timeout) + change_timeout(g_tooltip.timeout, g_tooltip.hide_timeout_msec, 0, tooltip_hide); + else + g_tooltip.timeout = add_timeout(g_tooltip.hide_timeout_msec, 0, tooltip_hide); +} + + +void stop_tooltip_timeout() +{ + 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; +}