X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=fe8866225d319b2583789550c2332859ea392a0b;hb=7eab00cba528e4deb51b2f0eaff6f809c3b1e384;hp=5d8b90ff2d3312c299c8fe4b91f083420305ef57;hpb=386f2fec6d8d7c3ebe1e2192f4632ed0b12f0df1;p=chaz%2Ftint2 diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c index 5d8b90f..fe88662 100644 --- a/src/tooltip/tooltip.c +++ b/src/tooltip/tooltip.c @@ -17,33 +17,42 @@ #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_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 = { .it_interval={0, 0}, .it_value={0, 0} }, - .hide_timeout = { .it_interval={0, 0}, .it_value={0, 0} }, + .show_timeout = { 0, 0 }, + .hide_timeout = { 0, 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, + .show_timer_id = 0, + .hide_timer_id = 0 }; void init_tooltip() @@ -51,9 +60,14 @@ 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; 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 +75,10 @@ void init_tooltip() void cleanup_tooltip() { - alarm(0); + stop_timeouts(); 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 +90,31 @@ 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_timeouts(); } 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) { + Area* area = click_area(g_tooltip.panel, x, y); + stop_timeouts(); + 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 +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) @@ -146,7 +142,8 @@ void tooltip_update_geometry() else if (panel_position & LEFT) x = panel->posx + panel->area.width; else - x = panel->posx - width; + x = panel->posx - width; + g_object_unref(layout); cairo_destroy(c); cairo_surface_destroy(cs); @@ -159,9 +156,9 @@ 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; - int screen_width = server.monitor[panel->monitor].width; - int screen_height = server.monitor[panel->monitor].height; + 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) return; // no adjustment needed @@ -184,10 +181,10 @@ void tooltip_adjust_geometry() min_x=0; } - if (x+width > server.monitor[panel->monitor].width) - x = server.monitor[panel->monitor].width-width; - if ( y+height>server.monitor[panel->monitor].height) - y = server.monitor[panel->monitor].height-height; + if (x+width > server.monitor[panel->monitor].x + server.monitor[panel->monitor].width) + x = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width - width; + if ( y+height > server.monitor[panel->monitor].y + server.monitor[panel->monitor].height) + y = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height - height; if (xtitle, -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); @@ -249,27 +247,63 @@ 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_timeouts(); } } void tooltip_hide() { + stop_timeouts(); 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(); + } + else { + reset_timer(g_tooltip.show_timer_id, t.tv_sec, t.tv_nsec, 0, 0); + } +} + + +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(); + else + reset_timer(g_tooltip.hide_timer_id, t.tv_sec, t.tv_nsec, 0, 0); +} + +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; +}