X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=05da0d03588a7aa9c2647431607641bf0d835af1;hb=c2af725585ae95742d189361a1f0b604a9dad887;hp=157b65cd13376fe8462810798468a5f3a219e025;hpb=83f23be9b6b5c2f1ae39d7d045353036b07f872d;p=chaz%2Ftint2

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 157b65c..05da0d0 100644
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -17,107 +17,99 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <cairo.h>
 #include <cairo-xlib.h>
 
 #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;
 
-// give the tooltip some reasonable default values
-Tooltip g_tooltip = {
-	.task = 0,
-	.window = 0,
-	.show_timeout = { .it_interval={0, 0}, .it_value={0, 0} },
-	.hide_timeout = { .it_interval={0, 0}, .it_value={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
-};
+// the next functions are helper functions for tooltip handling
+void start_show_timeout();
+void start_hide_timeout();
+void stop_tooltip_timeout();
 
-void init_tooltip()
+Tooltip g_tooltip;
+
+
+void default_tooltip()
 {
-	if (!g_tooltip.font_desc)
-		g_tooltip.font_desc = pango_font_description_from_string("sans 10");
+	// give the tooltip some reasonable default values
+	memset(&g_tooltip, 0, sizeof(Tooltip));
 
-	XSetWindowAttributes attr;
-	attr.override_redirect = True;
-	attr.event_mask = ExposureMask;
-	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.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()
 {
-	tooltip_hide();
-	g_tooltip.enabled = False;
-	if (g_tooltip.task) {
-		alarm(0);
-		g_tooltip.task = 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;
-	}
+	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 tooltip_sighandler(int sig)
+void init_tooltip()
 {
-	if (g_tooltip.current_state == TOOLTIP_ABOUT_TO_SHOW)
-		tooltip_show();
-	else if (g_tooltip.current_state == TOOLTIP_ABOUT_TO_HIDE)
-		tooltip_hide();
+	if (!g_tooltip.font_desc)
+		g_tooltip.font_desc = pango_font_description_from_string("sans 10");
+
+	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, server.visual, mask, &attr);
 }
 
 
-void tooltip_trigger_show(Task* task, int x_root, int y_root)
+void tooltip_trigger_show(Area* area, Panel* p, XEvent *e)
 {
-	x = x_root;
-	y = y_root;
-
-	if (g_tooltip.mapped && g_tooltip.task != task) {
-		g_tooltip.task = task;
+	// Position the tooltip in the center of the area
+	x = area->posx + area->width / 2 + e->xmotion.x_root - e->xmotion.x;
+	y = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y;
+	if (!panel_horizontal)
+		y -= height/2;
+	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()
+void tooltip_show(void* arg)
 {
-	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;
+	if (!panel_horizontal)
+		my += height/2; /* we adjusted y in tooltip_trigger_show, revert or we won't find the correct area anymore */
+	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);
 	}
 }
 
@@ -131,13 +123,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;
+	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;
 
-	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)
@@ -145,7 +137,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);
@@ -158,35 +151,35 @@ 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;
-	if ( x+width <= screen_width && y+height <= screen_height && x>=0 && y>=0)
+	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>=server.monitor[panel->monitor].x && y>=server.monitor[panel->monitor].y )
 		return;    // no adjustment needed
 
 	if (panel_horizontal) {
 		min_x=0;
-		max_width=screen_width;
-		max_height=screen_height-panel->area.height;
+		max_width=server.monitor[panel->monitor].width;
+		max_height=server.monitor[panel->monitor].height-panel->area.height;
 		if (panel_position & BOTTOM)
 			min_y=0;
 		else
 			min_y=panel->area.height;
 	}
 	else {
-		max_width=screen_width-panel->area.width;
+		max_width=server.monitor[panel->monitor].width-panel->area.width;
 		min_y=0;
-		max_height=screen_height;
+		max_height=server.monitor[panel->monitor].height;
 		if (panel_position & LEFT)
 			min_x=panel->area.width;
 		else
 			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 (x<min_x)
 		x=min_x;
@@ -200,8 +193,8 @@ void tooltip_adjust_geometry()
 
 void tooltip_update()
 {
-	if (!g_tooltip.task) {
-		tooltip_hide();
+	if (!g_tooltip.tooltip_text) {
+		tooltip_hide(0);
 		return;
 	}
 
@@ -215,28 +208,38 @@ void tooltip_update()
 	PangoLayout* layout;
 	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]);
+	Color bc = g_tooltip.bg->back;
+	Border b = g_tooltip.bg->border;
+	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);
+	}
+	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);
-	Border b = g_tooltip.border;
-	cairo_set_source_rgba(c, b.color[0], b.color[1], b.color[2], b.alpha);
 	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 (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);
 
-	config_color fc = g_tooltip.font_color;
+	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);
 	pango_layout_set_height(layout, height*PANGO_SCALE);
 	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
 	// I do not know why this is the right way, but with the below cairo_move_to it seems to be centered (horiz. and vert.)
-	cairo_move_to(c, -r1.x/2+g_tooltip.border.width+g_tooltip.paddingx, -r1.y/2+g_tooltip.border.width+g_tooltip.paddingy);
+	cairo_move_to(c, -r1.x/2+g_tooltip.bg->border.width+g_tooltip.paddingx, -r1.y/2+g_tooltip.bg->border.width+g_tooltip.paddingy);
 	pango_cairo_show_layout (c, layout);
 
 	g_object_unref (layout);
@@ -248,27 +251,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()
+void tooltip_hide(void* arg)
 {
+	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, 0);
+	else
+		g_tooltip.timeout = add_timeout(g_tooltip.show_timeout_msec, 0, tooltip_show, 0);
+}
+
+
+void start_hide_timeout()
+{
+	if (g_tooltip.timeout)
+		change_timeout(g_tooltip.timeout, g_tooltip.hide_timeout_msec, 0, tooltip_hide, 0);
+	else
+		g_tooltip.timeout = add_timeout(g_tooltip.hide_timeout_msec, 0, tooltip_hide, 0);
+}
+
+
+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;
+}