X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=a724473c397cf4b7cc5ecda5cb8a0c56f65110a9;hb=f8bebb561d52fa25b320904bb0c6a08347d05611;hp=3eadda417c86aadf55a1955aeae9038f1ed04d8a;hpb=ad50533aef71e9697fe78bb636e64079f198f985;p=chaz%2Ftint2

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 3eadda4..a724473 100644
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -33,26 +33,30 @@ static int x, y, width, height;
 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 = {
-	.tooltip_text = 0,
-	.area = 0,
-	.panel = 0,
-	.window = 0,
-	.show_timeout_msec = 0,
-	.hide_timeout_msec = 0,
-	.enabled = False,
-	.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,
-	.timeout = 0
-};
+
+Tooltip g_tooltip;
+
+
+void default_tooltip()
+{
+	// give the tooltip some reasonable default values
+	memset(&g_tooltip, 0, sizeof(Tooltip));
+
+	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()
+{
+	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 init_tooltip()
 {
@@ -71,23 +75,6 @@ void init_tooltip()
 }
 
 
-void cleanup_tooltip()
-{
-	stop_tooltip_timeout();
-	tooltip_hide(0);
-	g_tooltip.enabled = False;
-	tooltip_copy_text(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;
-	}
-}
-
-
 void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
 {
 	x = x_root;
@@ -115,6 +102,7 @@ void tooltip_show(void* arg)
 		tooltip_copy_text(area);
 		g_tooltip.mapped = True;
 		XMapWindow(server.dsp, g_tooltip.window);
+		tooltip_update();
 		XFlush(server.dsp);
 	}
 }
@@ -132,8 +120,8 @@ void tooltip_update_geometry()
 	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.panel;
 	if (panel_horizontal && panel_position & BOTTOM)
@@ -214,9 +202,9 @@ 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;
-	Border b = g_tooltip.border;
-	if (real_transparency) {
+	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);
@@ -227,12 +215,14 @@ void tooltip_update()
 	}
 	cairo_fill(c);
 	cairo_set_line_width(c, 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);
+	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);
@@ -243,7 +233,7 @@ void tooltip_update()
 	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);