Full-width rune support in the canvas.

- SetCell now returns the number of occupied cells.
- Apply skips over partial cells.

canvas/canvas.go

@@ -72,22 +72,26 @@ func (c *Canvas) Clear() error {
 	return nil
 }
 
-// SetCell sets the value of the specified cell on the canvas.
+// SetCell sets the rune of the specified cell on the canvas. Returns the
+// number of cells the rune occupies, wide runes can occupy multiple cells when
+// printed on the terminal. See http://www.unicode.org/reports/tr11/.
 // Use the options to specify which attributes to modify, if an attribute
 // option isn't specified, the attribute retains its previous value.
-func (c *Canvas) SetCell(p image.Point, r rune, opts ...cell.Option) error {
+func (c *Canvas) SetCell(p image.Point, r rune, opts ...cell.Option) (int, error) {
-	ar, err := area.FromSize(c.buffer.Size())
+	return c.buffer.SetCell(p, r, opts...)
+}
+
+// Cell returns a copy of the specified cell.
+func (c *Canvas) Cell(p image.Point) (*cell.Cell, error) {
+	ar, err := area.FromSize(c.Size())
 	if err != nil {
-		return err
+		return nil, err
 	}
 	if !p.In(ar) {
-		return fmt.Errorf("cell at point %+v falls out of the canvas area %+v", p, ar)
+		return nil, fmt.Errorf("point %v falls outside of the area %v occupied by the canvas", p, ar)
 	}
 
-	cell := c.buffer[p.X][p.Y]
+	return c.buffer[p.X][p.Y].Copy(), nil
-	cell.Rune = r
-	cell.Apply(opts...)
-	return nil
 }
 
 // Apply applies the canvas to the corresponding area of the terminal.
@@ -109,6 +113,17 @@ func (c *Canvas) Apply(t terminalapi.Terminal) error {
 
 	for col := range c.buffer {
 		for row := range c.buffer[col] {
+			partial, err := c.buffer.IsPartial(image.Point{col, row})
+			if err != nil {
+				return err
+			}
+			if partial {
+				// Skip over partial cells, i.e. cells that follow a cell
+				// containing a full-width rune. A full-width rune takes only
+				// one cell in the buffer, but two on the terminal.
+				// See http://www.unicode.org/reports/tr11/.
+				continue
+			}
 			cell := c.buffer[col][row]
 			// The image.Point{0, 0} of this canvas isn't always exactly at
 			// image.Point{0, 0} on the terminal.

canvas/canvas_test.go

@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/kylelemons/godebug/pretty"
+	"github.com/mum4k/termdash/area"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/terminal/faketerm"
 )
@@ -108,6 +109,7 @@ func TestSetCellAndApply(t *testing.T) {
 		r              rune
 		opts           []cell.Option
 		want           cell.Buffer // Expected back buffer in the fake terminal.
+		wantCells      int
 		wantSetCellErr bool
 		wantApplyErr   bool
 	}{
@@ -124,6 +126,7 @@ func TestSetCellAndApply(t *testing.T) {
 			canvasArea: image.Rect(1, 1, 3, 3),
 			point:      image.Point{0, 0},
 			r:          'X',
+			wantCells:  1,
 			want: cell.Buffer{
 				{
 					cell.New(0),
@@ -142,12 +145,46 @@ func TestSetCellAndApply(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc:       "sets a full-width rune in the top-left corner cell",
+			termSize:   image.Point{3, 3},
+			canvasArea: image.Rect(1, 1, 3, 3),
+			point:      image.Point{0, 0},
+			r:          '界',
+			wantCells:  2,
+			want: cell.Buffer{
+				{
+					cell.New(0),
+					cell.New(0),
+					cell.New(0),
+				},
+				{
+					cell.New(0),
+					cell.New('界'),
+					cell.New(0),
+				},
+				{
+					cell.New(0),
+					cell.New(0),
+					cell.New(0),
+				},
+			},
+		},
+		{
+			desc:           "not enough space for a full-width rune",
+			termSize:       image.Point{3, 3},
+			canvasArea:     image.Rect(1, 1, 3, 3),
+			point:          image.Point{1, 0},
+			r:              '界',
+			wantSetCellErr: true,
+		},
 		{
 			desc:       "sets a top-right corner cell",
 			termSize:   image.Point{3, 3},
 			canvasArea: image.Rect(1, 1, 3, 3),
 			point:      image.Point{1, 0},
 			r:          'X',
+			wantCells:  1,
 			want: cell.Buffer{
 				{
 					cell.New(0),
@@ -172,6 +209,7 @@ func TestSetCellAndApply(t *testing.T) {
 			canvasArea: image.Rect(1, 1, 3, 3),
 			point:      image.Point{0, 1},
 			r:          'X',
+			wantCells:  1,
 			want: cell.Buffer{
 				{
 					cell.New(0),
@@ -196,6 +234,7 @@ func TestSetCellAndApply(t *testing.T) {
 			canvasArea: image.Rect(1, 1, 3, 3),
 			point:      image.Point{1, 1},
 			r:          'Z',
+			wantCells:  1,
 			want: cell.Buffer{
 				{
 					cell.New(0),
@@ -223,6 +262,7 @@ func TestSetCellAndApply(t *testing.T) {
 			opts: []cell.Option{
 				cell.BgColor(cell.ColorRed),
 			},
+			wantCells: 1,
 			want: cell.Buffer{
 				{
 					cell.New(0),
@@ -247,6 +287,7 @@ func TestSetCellAndApply(t *testing.T) {
 			canvasArea: image.Rect(0, 0, 1, 1),
 			point:      image.Point{0, 0},
 			r:          'A',
+			wantCells:  1,
 			want: cell.Buffer{
 				{
 					cell.New('A'),
@@ -259,6 +300,7 @@ func TestSetCellAndApply(t *testing.T) {
 			canvasArea:   image.Rect(0, 0, 2, 2),
 			point:        image.Point{0, 0},
 			r:            'A',
+			wantCells:    1,
 			wantApplyErr: true,
 		},
 	}
@@ -270,7 +312,7 @@ func TestSetCellAndApply(t *testing.T) {
 				t.Fatalf("New => unexpected error: %v", err)
 			}
 
-			err = c.SetCell(tc.point, tc.r, tc.opts...)
+			gotCells, err := c.SetCell(tc.point, tc.r, tc.opts...)
 			if (err != nil) != tc.wantSetCellErr {
 				t.Errorf("SetCell => unexpected error: %v, wantSetCellErr: %v", err, tc.wantSetCellErr)
 			}
@@ -278,6 +320,10 @@ func TestSetCellAndApply(t *testing.T) {
 				return
 			}
 
+			if gotCells != tc.wantCells {
+				t.Errorf("SetCell => unexpected number of cells %d, want %d", gotCells, tc.wantCells)
+			}
+
 			ft, err := faketerm.New(tc.termSize)
 			if err != nil {
 				t.Fatalf("faketerm.New => unexpected error: %v", err)
@@ -304,7 +350,7 @@ func TestClear(t *testing.T) {
 		t.Fatalf("New => unexpected error: %v", err)
 	}
 
-	if err := c.SetCell(image.Point{0, 0}, 'X'); err != nil {
+	if _, err := c.SetCell(image.Point{0, 0}, 'X'); err != nil {
 		t.Fatalf("SetCell => unexpected error: %v", err)
 	}
 
@@ -375,3 +421,113 @@ func TestClear(t *testing.T) {
 		t.Errorf("faketerm.BackBuffer after Clear => unexpected diff (-want, +got):\n%s", diff)
 	}
 }
+
+// TestApplyFullWidthRunes verifies that when applying a full-width rune to the
+// terminal, canvas doesn't touch the neighbor cell that holds the remaining
+// part of the full-width rune.
+func TestApplyFullWidthRunes(t *testing.T) {
+	ar := image.Rect(0, 0, 3, 3)
+	c, err := New(ar)
+	if err != nil {
+		t.Fatalf("New => unexpected error: %v", err)
+	}
+
+	fullP := image.Point{0, 0}
+	if _, err := c.SetCell(fullP, '界'); err != nil {
+		t.Fatalf("SetCell => unexpected error: %v", err)
+	}
+
+	ft, err := faketerm.New(area.Size(ar))
+	if err != nil {
+		t.Fatalf("faketerm.New => unexpected error: %v", err)
+	}
+	partP := image.Point{1, 0}
+	if err := ft.SetCell(partP, 'A'); err != nil {
+		t.Fatalf("faketerm.SetCell => unexpected error: %v", err)
+	}
+
+	if err := c.Apply(ft); err != nil {
+		t.Fatalf("Apply => unexpected error: %v", err)
+	}
+
+	want, err := cell.NewBuffer(area.Size(ar))
+	if err != nil {
+		t.Fatalf("NewBuffer => unexpected error: %v", err)
+	}
+	want[fullP.X][fullP.Y].Rune = '界'
+	want[partP.X][partP.Y].Rune = 'A'
+
+	got := ft.BackBuffer()
+	if diff := pretty.Compare(want, got); diff != "" {
+		t.Errorf("faketerm.BackBuffer => unexpected diff (-want, +got):\n%s", diff)
+	}
+}
+
+func TestCell(t *testing.T) {
+	tests := []struct {
+		desc    string
+		cvs     func() (*Canvas, error)
+		point   image.Point
+		want    *cell.Cell
+		wantErr bool
+	}{
+		{
+			desc: "requested point falls outside of the canvas",
+			cvs: func() (*Canvas, error) {
+				cvs, err := New(image.Rect(0, 0, 1, 1))
+				if err != nil {
+					return nil, err
+				}
+				return cvs, nil
+			},
+			point:   image.Point{1, 1},
+			wantErr: true,
+		},
+		{
+			desc: "returns the cell",
+			cvs: func() (*Canvas, error) {
+				cvs, err := New(image.Rect(0, 0, 2, 2))
+				if err != nil {
+					return nil, err
+				}
+				if _, err := cvs.SetCell(
+					image.Point{1, 1}, 'A',
+					cell.FgColor(cell.ColorRed),
+					cell.BgColor(cell.ColorBlue),
+				); err != nil {
+					return nil, err
+				}
+				return cvs, nil
+			},
+			point: image.Point{1, 1},
+			want: &cell.Cell{
+				Rune: 'A',
+				Opts: cell.NewOptions(
+					cell.FgColor(cell.ColorRed),
+					cell.BgColor(cell.ColorBlue),
+				),
+			},
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.desc, func(t *testing.T) {
+			cvs, err := tc.cvs()
+			if err != nil {
+				t.Fatalf("tc.cvs => unexpected error: %v", err)
+			}
+
+			got, err := cvs.Cell(tc.point)
+			if (err != nil) != tc.wantErr {
+				t.Errorf("Cell => unexpected error: %v, wantErr: %v", err, tc.wantErr)
+			}
+			if err != nil {
+				return
+			}
+
+			if diff := pretty.Compare(tc.want, got); diff != "" {
+				t.Errorf("Cell => unexpected diff (-want, +got):\n%s", diff)
+			}
+		})
+	}
+}

canvas/testcanvas/testcanvas.go

@@ -40,9 +40,13 @@ func MustApply(c *canvas.Canvas, t *faketerm.Terminal) {
 	}
 }
 
-// MustSetCell sets the cell value or panics.
+// MustSetCell sets the cell value or panics. Returns the number of cells the
-func MustSetCell(c *canvas.Canvas, p image.Point, r rune, opts ...cell.Option) {
+// rune occupies, wide runes can occupy multiple cells when printed on the
-	if err := c.SetCell(p, r, opts...); err != nil {
+// terminal. See http://www.unicode.org/reports/tr11/.
+func MustSetCell(c *canvas.Canvas, p image.Point, r rune, opts ...cell.Option) int {
+	cells, err := c.SetCell(p, r, opts...)
+	if err != nil {
 		panic(fmt.Sprintf("canvas.SetCell => unexpected error: %v", err))
 	}
+	return cells
 }