[devtools] [refactor] Move screen inspector to separate package

Author: elgopher

devtools/devtools.go

@@ -5,6 +5,7 @@ package devtools
 
 import (
 	"github.com/elgopher/pi"
+	"github.com/elgopher/pi/devtools/internal/inspector"
 	"github.com/elgopher/pi/vm"
 )
 
@@ -23,6 +24,8 @@ func MustRun(runBackend func() error) {
 	update := pi.Update
 	draw := pi.Draw
 
+	inspector.BgColor, inspector.FgColor = BgColor, FgColor
+
 	pi.Update = func() {
 		updateDevTools()
 

devtools/draw.go

@@ -3,67 +3,8 @@
 
 package devtools
 
-import (
-	"fmt"
-
-	"github.com/elgopher/pi"
-	"github.com/elgopher/pi/devtools/internal/icons"
-	"github.com/elgopher/pi/devtools/internal/snapshot"
-	"github.com/elgopher/pi/vm"
-)
+import "github.com/elgopher/pi/devtools/internal/inspector"
 
 func drawDevTools() {
-	snapshot.Draw()
-
-	// I check the input in Draw function because only during Draw operation
-	// I have access to screen restored from snapshot
-	if pi.MouseBtnp(pi.MouseLeft) {
-		x, y := pi.MousePos()
-		fmt.Printf("Screen pixel (%d, %d) with color %d selected\n", x, y, pi.Pget(x, y))
-	}
-
-	moveBarIfNeeded()
-	drawBar()
-	drawPointer()
-}
-
-var isBarOnTop bool
-
-func moveBarIfNeeded() {
-	_, mouseY := pi.MousePos()
-	switch {
-	case isBarOnTop && mouseY <= 12:
-		isBarOnTop = false
-	case !isBarOnTop && mouseY >= vm.ScreenHeight-12:
-		isBarOnTop = true
-	}
-}
-
-func drawBar() {
-	mouseX, mouseY := pi.MousePos()
-	var barY int
-	if !isBarOnTop {
-		barY = vm.ScreenHeight - 7
-	}
-
-	pi.RectFill(0, barY, vm.ScreenWidth, barY+6, BgColor)
-
-	mostX := printCoords(mouseX, mouseY, 1, barY+1)
-	color := pi.Pget(mouseX, mouseY)
-	printPixelColor(color, mostX+4, barY+1)
-}
-
-func printCoords(mouseX int, mouseY int, x, y int) int {
-	coords := fmt.Sprintf("%d %d", mouseX, mouseY)
-	return pi.Print(coords, x, y, FgColor)
-}
-
-func printPixelColor(color byte, x int, y int) int {
-	c := fmt.Sprintf("%d", color)
-	return pi.Print(c, x, y, color)
-}
-
-func drawPointer() {
-	x, y := pi.MousePos()
-	icons.Draw(icons.Pointer, x, y, FgColor)
+	inspector.Draw()
 }

devtools/internal/inspector/draw.go

@@ -0,0 +1,59 @@
+// (c) 2022 Jacek Olszak
+// This code is licensed under MIT license (see LICENSE for details)
+
+package inspector
+
+import (
+	"fmt"
+
+	"github.com/elgopher/pi"
+	"github.com/elgopher/pi/devtools/internal/icons"
+	"github.com/elgopher/pi/devtools/internal/snapshot"
+	"github.com/elgopher/pi/vm"
+)
+
+var BgColor, FgColor byte
+
+func Draw() {
+	snapshot.Draw()
+
+	// I check the input in Draw function because only during Draw operation
+	// I have access to screen restored from snapshot
+	if pi.MouseBtnp(pi.MouseLeft) {
+		x, y := pi.MousePos()
+		fmt.Printf("Screen pixel (%d, %d) with color %d selected\n", x, y, pi.Pget(x, y))
+	}
+
+	moveBarIfNeeded()
+	drawBar()
+	drawPointer()
+}
+
+func drawBar() {
+	mouseX, mouseY := pi.MousePos()
+	var barY int
+	if !isBarOnTop {
+		barY = vm.ScreenHeight - 7
+	}
+
+	pi.RectFill(0, barY, vm.ScreenWidth, barY+6, BgColor)
+
+	mostX := printCoords(mouseX, mouseY, 1, barY+1)
+	color := pi.Pget(mouseX, mouseY)
+	printPixelColor(color, mostX+4, barY+1)
+}
+
+func printCoords(mouseX int, mouseY int, x, y int) int {
+	coords := fmt.Sprintf("%d %d", mouseX, mouseY)
+	return pi.Print(coords, x, y, FgColor)
+}
+
+func printPixelColor(color byte, x int, y int) int {
+	c := fmt.Sprintf("%d", color)
+	return pi.Print(c, x, y, color)
+}
+
+func drawPointer() {
+	x, y := pi.MousePos()
+	icons.Draw(icons.Pointer, x, y, FgColor)
+}

devtools/internal/inspector/inspector.go

@@ -0,0 +1,21 @@
+// (c) 2022 Jacek Olszak
+// This code is licensed under MIT license (see LICENSE for details)
+
+package inspector
+
+import (
+	"github.com/elgopher/pi"
+	"github.com/elgopher/pi/vm"
+)
+
+var isBarOnTop bool
+
+func moveBarIfNeeded() {
+	_, mouseY := pi.MousePos()
+	switch {
+	case isBarOnTop && mouseY <= 12:
+		isBarOnTop = false
+	case !isBarOnTop && mouseY >= vm.ScreenHeight-12:
+		isBarOnTop = true
+	}
+}