소스 검색

Fix high CPU usage when rendering status bar

Looking up the width of special color setting characters was causing
high CPU usage. Ignore special characters when calculating the width.
Frans Bergman 4 년 전
부모
커밋
23937acdbc
1개의 변경된 파일14개의 추가작업 그리고 1개의 파일을 삭제
  1. 14 1
      dwm.c

+ 14 - 1
dwm.c

@@ -885,7 +885,20 @@ drawbar(Monitor *m)
 	/* draw status first so it can be overdrawn by tags later */
 	if (m == selmon) { /* status is only drawn on selected monitor */
 		drw_setscheme(drw, scheme[SchemeNorm]);
-		sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+		/* calculate text width while ignoring special chars */
+		sw = 0;
+		while (1) {
+			if ((unsigned int)*ts > LENGTH(colors)) { ts++; continue ; }
+			ctmp = *ts;
+			*ts = '\0';
+			sw += TEXTW(tp) -lrpad;
+			if (ctmp == '\0') { break; }
+			*ts = ctmp;
+			tp = ++ts;
+		}
+		ts = stext;
+		tp = stext;
+		/* render text */
 		while (1) {
 			if ((unsigned int)*ts > LENGTH(colors)) { ts++; continue ; }
 			ctmp = *ts;