X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=714e0a324d6af8eb407bb86eedfca38959d44f71;hb=8d8f2511d4e863c7b63c1069be0a32adac15f0ef;hp=a2277b398fed3d023b1d262bb280114edd6f774a;hpb=d1efbd72c7ff364eed326c16eaf2b20599b089e5;p=chaz%2Ftint2

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index a2277b3..714e0a3 100644
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -33,30 +33,37 @@ 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 },
-	.bg = 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()
 {
 	if (!g_tooltip.font_desc)
 		g_tooltip.font_desc = pango_font_description_from_string("sans 10");
+	if (g_tooltip.bg == 0)
+		g_tooltip.bg = &g_array_index(backgrounds, Background, 0);
 
 	XSetWindowAttributes attr;
 	attr.override_redirect = True;
@@ -70,27 +77,13 @@ void init_tooltip()
 }
 
 
-void cleanup_tooltip()
+void tooltip_trigger_show(Area* area, Panel* p, XEvent *e)
 {
-	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;
-	y = y_root;
+	// 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);
@@ -105,10 +98,13 @@ void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
 
 void tooltip_show(void* arg)
 {
-  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);
+	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);
@@ -160,22 +156,22 @@ void tooltip_adjust_geometry()
 	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)
+	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
@@ -216,7 +212,7 @@ void tooltip_update()
 	c = cairo_create(cs);
 	Color bc = g_tooltip.bg->back;
 	Border b = g_tooltip.bg->border;
-	if (real_transparency) {
+	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,8 +223,10 @@ 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);