|
|
@@ -86,38 +86,31 @@ func makeColorFunc(code string) colorFunc {
|
|
|
}
|
|
|
|
|
|
var nextColor = rainbowColor
|
|
|
+var rainbow []colorFunc
|
|
|
+var currentIndex = 0
|
|
|
|
|
|
func rainbowColor() colorFunc {
|
|
|
- return <-loop
|
|
|
+ result := rainbow[currentIndex]
|
|
|
+ currentIndex = (currentIndex + 1) % len(rainbow)
|
|
|
+ return result
|
|
|
}
|
|
|
|
|
|
-var loop = make(chan colorFunc)
|
|
|
-
|
|
|
func init() {
|
|
|
colors := map[string]colorFunc{}
|
|
|
for i, name := range names {
|
|
|
colors[name] = makeColorFunc(strconv.Itoa(30 + i))
|
|
|
colors["intense_"+name] = makeColorFunc(strconv.Itoa(30+i) + ";1")
|
|
|
}
|
|
|
-
|
|
|
- go func() {
|
|
|
- i := 0
|
|
|
- rainbow := []colorFunc{
|
|
|
- colors["cyan"],
|
|
|
- colors["yellow"],
|
|
|
- colors["green"],
|
|
|
- colors["magenta"],
|
|
|
- colors["blue"],
|
|
|
- colors["intense_cyan"],
|
|
|
- colors["intense_yellow"],
|
|
|
- colors["intense_green"],
|
|
|
- colors["intense_magenta"],
|
|
|
- colors["intense_blue"],
|
|
|
- }
|
|
|
-
|
|
|
- for {
|
|
|
- loop <- rainbow[i]
|
|
|
- i = (i + 1) % len(rainbow)
|
|
|
- }
|
|
|
- }()
|
|
|
+ rainbow = []colorFunc{
|
|
|
+ colors["cyan"],
|
|
|
+ colors["yellow"],
|
|
|
+ colors["green"],
|
|
|
+ colors["magenta"],
|
|
|
+ colors["blue"],
|
|
|
+ colors["intense_cyan"],
|
|
|
+ colors["intense_yellow"],
|
|
|
+ colors["intense_green"],
|
|
|
+ colors["intense_magenta"],
|
|
|
+ colors["intense_blue"],
|
|
|
+ }
|
|
|
}
|
AhmedGrati