round_borders_rule bugfix

Author: ibhagwan

picom.sample.conf

@@ -31,7 +31,7 @@ round-borders-rule = [
   "3:class_g      = 'XTerm'",
   "3:class_g      = 'URxvt'",
   "10:class_g     = 'Alacritty'",
-  "15:class_g     = 'Signal'",
+  "15:class_g     = 'Signal'"
 ];
 
 #################################

src/backend/gl/gl_common.c

@@ -966,8 +966,8 @@ bool gl_round(backend_t *backend_data attr_unused, struct managed_win *w, void *
 	auto gd = (struct gl_data *)backend_data;
 	auto img = (struct gl_image*)image_data;
 
-	//log_warn("r(%d) b(%d), wxy(%d %d) wwh(%d %d) img(%d %d)",
-	//	w->corner_radius, w->g.border_width, w->g.x, w->g.y,
+	//log_warn("r(%d) b(%d) bo(%d), wxy(%d %d) wwh(%d %d) img(%d %d)",
+	//	w->corner_radius, w->g.border_width, w->border_width, w->g.x, w->g.y,
 	//	w->widthb, w->heightb, img->inner->width, img->inner->height);
 
 	int nrects;
@@ -1038,7 +1038,7 @@ bool gl_round(backend_t *backend_data attr_unused, struct managed_win *w, void *
 	if (ppass->unifm_texsize)
 		glUniform2f(ppass->unifm_texsize, (float)w->widthb, (float)w->heightb);
 	if (ppass->unifm_borderw)
-		glUniform1f(ppass->unifm_borderw, (w->round_borders) ? w->g.border_width : 0);
+		glUniform1f(ppass->unifm_borderw, (w->round_borders) ? (w->border_width > 0 ? w->border_width : w->g.border_width) : 0);
 	if (ppass->unifm_resolution)
 		glUniform2f(ppass->unifm_resolution, (float)gd->width, (float)gd->height);
 

src/opengl.c

@@ -2342,7 +2342,7 @@ bool glx_round_corners_dst0(session_t *ps, struct managed_win *w, const glx_text
 	//log_warn("dxy(%d, %d) wh(%d %d) rwh(%d %d) bw(%d)",
 	//	dx, dy, width, height, ps->root_width, ps->root_height, w->g.border_width);
 
-	if (w->g.border_width >= 1 /*&& w->border_col[0] == -1.0*/) {
+	if (w->g.border_width >= 1 || w->border_width > 0) {
 		glx_read_border_pixel(w, ps->root_height, dx, dy, width, height, w->corner_radius, &w->border_col[0]);
 	}
 
@@ -2442,7 +2442,7 @@ bool glx_round_corners_dst0(session_t *ps, struct managed_win *w, const glx_text
 		if (ppass->unifm_texsize >= 0)
 			glUniform2f(ppass->unifm_texsize, (float)mwidth, (float)mheight);
 		if (ppass->unifm_borderw >= 0)
-			glUniform1f(ppass->unifm_borderw, (w->round_borders && w->border_col[0] != -1.) ? w->g.border_width : 0);
+			glUniform1f(ppass->unifm_borderw, (w->round_borders && w->border_col[0] != -1.) ? (w->border_width > 0 ? w->border_width : w->g.border_width) : 0);
 		if (ppass->unifm_borderc >= 0)
 			glUniform4fv(ppass->unifm_borderc, 1, (GLfloat *)&w->border_col[0]);
 		if (ppass->unifm_resolution >= 0)
@@ -2529,7 +2529,7 @@ bool glx_round_corners_dst1(session_t *ps, struct managed_win *w, const glx_text
 	assert(ps->psglx->round_passes[1].prog);
 	bool ret = false;
 
-	if (w->g.border_width >= 1 /*&& w->border_col[0] == -1.0*/) {
+	if (w->g.border_width >= 1 || w->border_width > 0) {
 		glx_read_border_pixel(w, ps->root_height, dx, dy, width, height, w->corner_radius, &w->border_col[0]);
 	}
 
@@ -2561,7 +2561,7 @@ bool glx_round_corners_dst1(session_t *ps, struct managed_win *w, const glx_text
 		if (ppass->unifm_texsize >= 0)
 			glUniform2f(ppass->unifm_texsize, (float)width, (float)height);
 		if (ppass->unifm_borderw >= 0)
-			glUniform1f(ppass->unifm_borderw, (w->round_borders && w->border_col[0] != -1.) ? w->g.border_width : 0);
+			glUniform1f(ppass->unifm_borderw, (w->round_borders && w->border_col[0] != -1.) ? (w->border_width > 0 ? w->border_width : w->g.border_width) : 0);
 		if (ppass->unifm_borderc >= 0)
 			glUniform4fv(ppass->unifm_borderc, 1, (GLfloat *)&w->border_col[0]);
 		if (ppass->unifm_resolution >= 0)

src/win.c

@@ -936,9 +936,11 @@ static void win_determine_rounded_corners(session_t *ps, struct managed_win *w)
         }
 
 	    void *val = NULL;
-        if (w && c2_match(ps, w, ps->o.round_borders_rules, &val)) {
-            w->g.border_width = (uint16_t)((long)val);
+        if (c2_match(ps, w, ps->o.round_borders_rules, &val)) {
+            w->border_width = (uint16_t)((long)val);
             //log_warn("xy(%d %d) wh(%d %d) border_width:rule:%d", w->g.x, w->g.y, w->widthb, w->heightb, w->g.border_width);
+        } else {
+            w->border_width = 0;
         }
 
         if (w && c2_match(ps, w, ps->o.round_borders_blacklist, NULL)) {

src/win.h

@@ -206,6 +206,7 @@ struct managed_win {
 	int corner_radius;
 	bool round_borders;
 	float border_col[4];
+    uint16_t border_width;
 
 	// Fading-related members
 	/// Override value of window fade state. Set by D-Bus method calls.