fix: opacity winrule not apply

src/config/parse_config.h

@@ -1348,6 +1348,10 @@ void parse_config_line(Config *config, const char *line) {
 					rule->isunglobal = atoi(val);
 				} else if (strcmp(key, "isglobal") == 0) {
 					rule->isglobal = atoi(val);
+				} else if (strcmp(key, "unfocused_opacity") == 0) {
+					rule->unfocused_opacity = atof(val);
+				} else if (strcmp(key, "focused_opacity") == 0) {
+					rule->focused_opacity = atof(val);
 				} else if (strcmp(key, "isoverlay") == 0) {
 					rule->isoverlay = atoi(val);
 				} else if (strcmp(key, "isterm") == 0) {

src/maomao.c

@@ -1433,31 +1433,32 @@ void client_apply_clip(Client *c) {
 
 bool client_draw_frame(Client *c) {
 
-  if (!c || !client_surface(c)->mapped)
+	if (!c || !client_surface(c)->mapped)
-    return false;
+		return false;
 
-  if(c->isfullscreen) {
+	if (c->isfullscreen) {
-    client_set_opacity(c, 1);
+		client_set_opacity(c, 1);
-  } else if(c == selmon->sel && !c->animation.running) {
+	} else if (c == selmon->sel && !c->animation.running) {
-    client_set_opacity(c, c->focused_opacity);
+		client_set_opacity(c, c->focused_opacity);
-  } else if(!c->animation.running) {
+	} else if (!c->animation.running) {
-    client_set_opacity(c, c->unfocused_opacity);
+		client_set_opacity(c, c->unfocused_opacity);
-  }
+	}
 
-  if (!c->need_output_flush)
+	if (!c->need_output_flush)
-    return false;
+		return false;
 
-  if (animations && c->animation.running) {
+	if (animations && c->animation.running) {
-    client_animation_next_tick(c);
+		client_animation_next_tick(c);
-    client_apply_clip(c);
+		client_apply_clip(c);
-  } else {
+	} else {
-    wlr_scene_node_set_position(&c->scene->node, c->pending.x, c->pending.y);
+		wlr_scene_node_set_position(&c->scene->node, c->pending.x,
-    c->animainit_geom = c->animation.initial = c->pending = c->current =
+									c->pending.y);
-        c->geom;
+		c->animainit_geom = c->animation.initial = c->pending = c->current =
-    client_apply_clip(c);
+			c->geom;
-    c->need_output_flush = false;
+		client_apply_clip(c);
-  }
+		c->need_output_flush = false;
-  return true;
+	}
+	return true;
 }
 
 bool client_draw_fadeout_frame(Client *c) {
@@ -2029,9 +2030,9 @@ applyrules(Client *c) {
 			c->isglobal = r->isglobal >= 0 ? r->isglobal : c->isglobal;
 			c->isoverlay = r->isoverlay >= 0 ? r->isoverlay : c->isoverlay;
 			c->isunglobal = r->isunglobal >= 0 ? r->isunglobal : c->isunglobal;
-			c->focused_opacity = r->focused_opacity > 0 ? r->focused_opacity
+			c->focused_opacity = r->focused_opacity > 0.0f ? r->focused_opacity
-														: c->focused_opacity;
+														   : c->focused_opacity;
-			c->unfocused_opacity = r->unfocused_opacity > 0
+			c->unfocused_opacity = r->unfocused_opacity > 0.0f
 									   ? r->unfocused_opacity
 									   : c->unfocused_opacity;
 
@@ -5672,18 +5673,18 @@ void resize(Client *c, struct wlr_box geo, int interact) {
 	c->configure_serial = client_set_size(c, c->geom.width - 2 * c->bw,
 										  c->geom.height - 2 * c->bw);
 
-  if (!animations || c == grabc) {
+	if (!animations || c == grabc) {
-    c->animation.running = false;
+		c->animation.running = false;
-    c->need_output_flush = false;
+		c->need_output_flush = false;
-    c->animainit_geom = c->current = c->pending = c->animation.current =
+		c->animainit_geom = c->current = c->pending = c->animation.current =
-        c->geom;
+			c->geom;
-    wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
+		wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
-    apply_border(c, c->geom, 0, 0, CORNER_LOCATION_ALL);
+		apply_border(c, c->geom, 0, 0, CORNER_LOCATION_ALL);
-    client_draw_shadow(c);
+		client_draw_shadow(c);
-    client_get_clip(c, &clip);
+		client_get_clip(c, &clip);
-    wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
+		wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
-    return;
+		return;
-  }
+	}
 	// 如果不是工作区切换时划出去的窗口，就让动画的结束位置，就是上面的真实位置和大小
 	// c->pending 决定动画的终点，一般在其他调用resize的函数的附近设置了
 	if (!c->animation.tagouting && !c->iskilling) {