Merge 9dc4e9e9ec into 0daa1c1fdd

README.md

@@ -28,7 +28,7 @@ dwl -s 'dwlb -font "monospace:size=16"'
 ```
 
 ## Ipc
-If dwl is [patched](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/ipc) appropriately, dwlb is capable of communicating directly with dwl. When ipc is enabled with `-ipc`, dwlb does not read from stdin, and clicking tags functions as you would expect. Ipc can be disabled with `-no-ipc`.
+If dwl is [patched](https://github.com/djpohly/dwl/wiki/ipc) appropriately, dwlb is capable of communicating directly with dwl. When ipc is enabled with `-ipc`, dwlb does not read from stdin, and clicking tags functions as you would expect. Ipc can be disabled with `-no-ipc`.
 
 ## Commands
 Command options send instructions to existing instances of dwlb. All commands take at least one argument to specify a bar on which to operate. This may be zxdg_output_v1 name, "all" to affect all outputs, or "selected" for the current output.

dwlb.c

@@ -244,7 +244,6 @@ draw_text(char *text,
 	  uint32_t x,
 	  uint32_t y,
 	  pixman_image_t *foreground,
-	  pixman_image_t *foreground_mask,
 	  pixman_image_t *background,
 	  pixman_color_t *fg_color,
 	  pixman_color_t *bg_color,
@@ -266,13 +265,10 @@ draw_text(char *text,
 	bool draw_fg = foreground && fg_color;
 	bool draw_bg = background && bg_color;
 	
-	pixman_image_t *fg_mask_fill;
+	pixman_image_t *fg_fill;
-	pixman_color_t *cur_fg_color;
 	pixman_color_t *cur_bg_color;
-	if (draw_fg) {
+	if (draw_fg)
-		cur_fg_color = fg_color;
+		fg_fill = pixman_image_create_solid_fill(fg_color);
-		fg_mask_fill= pixman_image_create_solid_fill(&(pixman_color_t){0xFFFF,0xFFFF,0xFFFF,0xFFFF});
-	}
 	if (draw_bg)
 		cur_bg_color = bg_color;
 
@@ -285,7 +281,8 @@ draw_text(char *text,
 					if (draw_bg)
 						cur_bg_color = &colors[color_ind].color;
 				} else if (draw_fg) {
-					cur_fg_color = &colors[color_ind].color;
+					pixman_image_unref(fg_fill);
+					fg_fill = pixman_image_create_solid_fill(&colors[color_ind].color);
 				}
 				color_ind++;
 			}
@@ -313,19 +310,20 @@ draw_text(char *text,
 		if (draw_fg) {
 			/* Detect and handle pre-rendered glyphs (e.g. emoji) */
 			if (pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8) {
+				/* Only the alpha channel of the mask is used, so we can
+				 * use fgfill here to blend prerendered glyphs with the
+				 * same opacity */
 				pixman_image_composite32(
-					PIXMAN_OP_OVER, glyph->pix, NULL, foreground, 0, 0, 0, 0,
+					PIXMAN_OP_OVER, glyph->pix, fg_fill, foreground, 0, 0, 0, 0,
 					x + glyph->x, y - glyph->y, glyph->width, glyph->height);
 			} else {
-				pixman_image_fill_boxes(PIXMAN_OP_OVER, foreground,
+				/* Applying the foreground color here would mess up
-					cur_fg_color, 1, &(pixman_box32_t){
+				 * component alphas for subpixel-rendered text, so we
-						.x1 = x, .x2 = nx,
+				 * apply it when blending. */
-						.y1 = 0, .y2 = buf_height
+				pixman_image_composite32(
-					});
+					PIXMAN_OP_OVER, fg_fill, glyph->pix, foreground, 0, 0, 0, 0,
+					x + glyph->x, y - glyph->y, glyph->width, glyph->height);
 			}
-			pixman_image_composite32(
-				PIXMAN_OP_OVER, glyph->pix, fg_mask_fill, foreground_mask, 0, 0, 0, 0,
-				x + glyph->x, y - glyph->y, glyph->width, glyph->height);
 		}
 		
 		if (draw_bg) {
@@ -341,7 +339,7 @@ draw_text(char *text,
 	}
 	
 	if (draw_fg)
-		pixman_image_unref(fg_mask_fill);
+		pixman_image_unref(fg_fill);
 	if (!last_cp)
 		return ix;
 	
@@ -364,7 +362,7 @@ draw_text(char *text,
 }
 
 #define TEXT_WIDTH(text, maxwidth, padding)				\
-	draw_text(text, 0, 0, NULL, NULL, NULL, NULL, NULL, maxwidth, 0, padding, NULL, 0)
+	draw_text(text, 0, 0, NULL, NULL, NULL, NULL, maxwidth, 0, padding, NULL, 0)
 
 static int
 draw_frame(Bar *bar)
@@ -391,7 +389,6 @@ draw_frame(Bar *bar)
 	
 	/* Text background and foreground layers */
 	pixman_image_t *foreground = pixman_image_create_bits(PIXMAN_a8r8g8b8, bar->width, bar->height, NULL, bar->width * 4);
-	pixman_image_t *foreground_mask = pixman_image_create_bits(PIXMAN_a8, bar->width, bar->height, NULL, bar->width * 4);
 	pixman_image_t *background = pixman_image_create_bits(PIXMAN_a8r8g8b8, bar->width, bar->height, NULL, bar->width * 4);
 	
 	/* Draw on images */
@@ -417,12 +414,6 @@ draw_frame(Bar *bar)
 							.x1 = x + boxs, .x2 = x + boxs + boxw,
 							.y1 = boxs, .y2 = boxs + boxw
 						});
-			pixman_image_fill_boxes(PIXMAN_OP_SRC, foreground_mask,
-						&(pixman_color_t){0xFFFF,0xFFFF,0xFFFF,0xFFFF},
-						1, &(pixman_box32_t){
-							.x1 = x + boxs, .x2 = x + boxs + boxw,
-							.y1 = boxs, .y2 = boxs + boxw
-						});
 			if ((!bar->sel || !active) && boxw >= 3) {
 				/* Make box hollow */
 				pixman_image_fill_boxes(PIXMAN_OP_SRC, foreground,
@@ -431,25 +422,19 @@ draw_frame(Bar *bar)
 								.x1 = x + boxs + 1, .x2 = x + boxs + boxw - 1,
 								.y1 = boxs + 1, .y2 = boxs + boxw - 1
 							});
-				pixman_image_fill_boxes(PIXMAN_OP_SRC, foreground_mask,
-							&(pixman_color_t){ 0 },
-							1, &(pixman_box32_t){
-								.x1 = x + boxs + 1, .x2 = x + boxs + boxw - 1,
-								.y1 = boxs + 1, .y2 = boxs + boxw - 1
-							});
 			}
 		}
 		
-		x = draw_text(tags[i], x, y, foreground, foreground_mask, background, fg_color, bg_color,
+		x = draw_text(tags[i], x, y, foreground, background, fg_color, bg_color,
 			      bar->width, bar->height, bar->textpadding, NULL, 0);
 	}
 	
-	x = draw_text(bar->layout, x, y, foreground, foreground_mask, background,
+	x = draw_text(bar->layout, x, y, foreground, background,
 		      &inactive_fg_color, &inactive_bg_color, bar->width,
 		      bar->height, bar->textpadding, NULL, 0);
 	
 	uint32_t status_width = TEXT_WIDTH(bar->status.text, bar->width - x, bar->textpadding);
-	draw_text(bar->status.text, bar->width - status_width, y, foreground, foreground_mask,
+	draw_text(bar->status.text, bar->width - status_width, y, foreground,
 		  background, &inactive_fg_color, &inactive_bg_color,
 		  bar->width, bar->height, bar->textpadding,
 		  bar->status.colors, bar->status.colors_l);
@@ -457,7 +442,7 @@ draw_frame(Bar *bar)
 	uint32_t nx;
 	if (center_title) {
 		uint32_t title_width = TEXT_WIDTH(custom_title ? bar->title.text : bar->window_title, bar->width - status_width - x, 0);
-		nx = MAX(x, MIN((bar->width - title_width) / 2, bar->width - status_width - title_width));
+		nx = MAX(x, MIN(((bar->width - title_width - x - status_width) / 2) + x, bar->width - status_width - title_width));
 	} else {
 		nx = MIN(x + bar->textpadding, bar->width - status_width);
 	}
@@ -470,7 +455,7 @@ draw_frame(Bar *bar)
 	x = nx;
 	
 	x = draw_text(custom_title ? bar->title.text : bar->window_title,
-		      x, y, foreground, foreground_mask, background,
+		      x, y, foreground, background,
 		      (bar->sel && active_color_title) ? &active_fg_color : &inactive_fg_color,
 		      (bar->sel && active_color_title) ? &active_bg_color : &inactive_bg_color,
 		      bar->width - status_width, bar->height, 0,
@@ -486,11 +471,9 @@ draw_frame(Bar *bar)
 
 	/* Draw background and foreground on bar */
 	pixman_image_composite32(PIXMAN_OP_OVER, background, NULL, final, 0, 0, 0, 0, 0, 0, bar->width, bar->height);
-	pixman_image_set_alpha_map(foreground, foreground_mask, 0, 0);
+	pixman_image_composite32(PIXMAN_OP_OVER, foreground, NULL, final, 0, 0, 0, 0, 0, 0, bar->width, bar->height);
-	pixman_image_composite32(PIXMAN_OP_OVER, foreground, foreground_mask, final, 0, 0, 0, 0, 0, 0, bar->width, bar->height);
 
 	pixman_image_unref(foreground);
-	pixman_image_unref(foreground_mask);
 	pixman_image_unref(background);
 	pixman_image_unref(final);