Merge pull request #5 from danielgatis/fix-issue-4

fix for issue #4

Author: danielgatis

performer_csi.go

@@ -431,24 +431,22 @@ func (p *Performer) CsiDispatch(params [][]uint16, intermediates []byte, ignore
 				p.handler.SetTerminalCharAttribute(attrWithNamedColor(CharAttributeForeground, NamedColorWhite))
 
 			case 38:
-				for paramsIter.HasNext() {
-					m, ok := paramsIter.GetNext()
-					if !ok {
-						continue
-					}
-
-					switch m {
-					case 2:
-						r := paramsIter.GetNextOrDefault(0)
-						g := paramsIter.GetNextOrDefault(0)
-						b := paramsIter.GetNextOrDefault(0)
-
-						p.handler.SetTerminalCharAttribute(attrWithRGBColor(CharAttributeForeground, r, g, b))
-
-					case 5:
-						i := paramsIter.GetNextOrDefault(0)
-						p.handler.SetTerminalCharAttribute(attrWithIndexedColor(CharAttributeForeground, i))
-					}
+				m, ok := paramsIter.GetNext()
+				if !ok {
+					continue
+				}
+
+				switch m {
+				case 2:
+					r := paramsIter.GetNextOrDefault(0)
+					g := paramsIter.GetNextOrDefault(0)
+					b := paramsIter.GetNextOrDefault(0)
+
+					p.handler.SetTerminalCharAttribute(attrWithRGBColor(CharAttributeForeground, r, g, b))
+
+				case 5:
+					i := paramsIter.GetNextOrDefault(0)
+					p.handler.SetTerminalCharAttribute(attrWithIndexedColor(CharAttributeForeground, i))
 				}
 
 			case 39:
@@ -479,47 +477,43 @@ func (p *Performer) CsiDispatch(params [][]uint16, intermediates []byte, ignore
 				p.handler.SetTerminalCharAttribute(attrWithNamedColor(CharAttributeBackground, NamedColorWhite))
 
 			case 48:
-				for paramsIter.HasNext() {
-					m, ok := paramsIter.GetNext()
-					if !ok {
-						continue
-					}
-
-					switch m {
-					case 2:
-						r := paramsIter.GetNextOrDefault(0)
-						g := paramsIter.GetNextOrDefault(0)
-						b := paramsIter.GetNextOrDefault(0)
-
-						p.handler.SetTerminalCharAttribute(attrWithRGBColor(CharAttributeBackground, r, g, b))
-
-					case 5:
-						i := paramsIter.GetNextOrDefault(0)
-						p.handler.SetTerminalCharAttribute(attrWithIndexedColor(CharAttributeBackground, i))
-					}
+				m, ok := paramsIter.GetNext()
+				if !ok {
+					continue
+				}
+
+				switch m {
+				case 2:
+					r := paramsIter.GetNextOrDefault(0)
+					g := paramsIter.GetNextOrDefault(0)
+					b := paramsIter.GetNextOrDefault(0)
+
+					p.handler.SetTerminalCharAttribute(attrWithRGBColor(CharAttributeBackground, r, g, b))
+
+				case 5:
+					i := paramsIter.GetNextOrDefault(0)
+					p.handler.SetTerminalCharAttribute(attrWithIndexedColor(CharAttributeBackground, i))
 				}
 
 			case 49:
 				p.handler.SetTerminalCharAttribute(attrWithNamedColor(CharAttributeBackground, NamedColorBackground))
 
 			case 58:
-				for paramsIter.HasNext() {
-					m, ok := paramsIter.GetNext()
-					if !ok {
-						continue
-					}
-
-					switch m {
-					case 2:
-						r := paramsIter.GetNextOrDefault(0)
-						g := paramsIter.GetNextOrDefault(0)
-						b := paramsIter.GetNextOrDefault(0)
-
-						p.handler.SetTerminalCharAttribute(attrWithRGBColor(CharAttributeUnderlineColor, r, g, b))
-					case 5:
-						i := paramsIter.GetNextOrDefault(0)
-						p.handler.SetTerminalCharAttribute(attrWithIndexedColor(CharAttributeUnderlineColor, i))
-					}
+				m, ok := paramsIter.GetNext()
+				if !ok {
+					continue
+				}
+
+				switch m {
+				case 2:
+					r := paramsIter.GetNextOrDefault(0)
+					g := paramsIter.GetNextOrDefault(0)
+					b := paramsIter.GetNextOrDefault(0)
+
+					p.handler.SetTerminalCharAttribute(attrWithRGBColor(CharAttributeUnderlineColor, r, g, b))
+				case 5:
+					i := paramsIter.GetNextOrDefault(0)
+					p.handler.SetTerminalCharAttribute(attrWithIndexedColor(CharAttributeUnderlineColor, i))
 				}
 
 			case 59:

performer_csi_test.go

@@ -177,6 +177,7 @@ func TestPerformer_CsiDispatch(t *testing.T) {
 		{name: "CSI 37 m", args: args{params: [][]uint16{{37}}, action: 'm'}, want: want{mock: m("SetTerminalCharAttribute", attrWithNamedColor(CharAttributeForeground, NamedColorWhite))}},
 		{name: "CSI 38 ; 5 ; 31 m", args: args{params: [][]uint16{{38}, {5}, {31}}, action: 'm'}, want: want{mock: m("SetTerminalCharAttribute", attrWithIndexedColor(CharAttributeForeground, 31))}},
 		{name: "CSI 38 ; 2 ; 3 ; 3 ; 3 m", args: args{params: [][]uint16{{38}, {2}, {3}, {3}, {3}}, action: 'm'}, want: want{mock: m("SetTerminalCharAttribute", attrWithRGBColor(CharAttributeForeground, 3, 3, 3))}},
+		{name: "CSI 38; 2; 0; 0; 0; 48; 2; 255; 255; 255 m", args: args{params: [][]uint16{{38}, {2}, {0}, {0}, {0}, {48}, {2}, {255}, {255}, {255}}, action: 'm'}, want: want{mock: ms([]string{"SetTerminalCharAttribute", "SetTerminalCharAttribute"}, attrWithRGBColor(CharAttributeForeground, 0, 0, 0), attrWithRGBColor(CharAttributeBackground, 255, 255, 255))}},
 		{name: "CSI 39 m", args: args{params: [][]uint16{{39}}, action: 'm'}, want: want{mock: m("SetTerminalCharAttribute", attrWithNamedColor(CharAttributeForeground, NamedColorForeground))}},
 		{name: "CSI 40 m", args: args{params: [][]uint16{{40}}, action: 'm'}, want: want{mock: m("SetTerminalCharAttribute", attrWithNamedColor(CharAttributeBackground, NamedColorBlack))}},
 		{name: "CSI 41 m", args: args{params: [][]uint16{{41}}, action: 'm'}, want: want{mock: m("SetTerminalCharAttribute", attrWithNamedColor(CharAttributeBackground, NamedColorRed))}},