From 02bde9e7951589646c14f6f304643ff15b407415 Mon Sep 17 00:00:00 2001
From: Ivan Izaguirre <ivanizag@gmail.com>
Date: Mon, 9 Sep 2024 21:39:22 +0200
Subject: [PATCH] Remove warnings

---
 doc/update_readme.go            |  7 +++----
 frontend/a2fyne/fyneKeyboard.go |  6 +-----
 frontend/a2sdl/sdlKeyboard.go   |  6 +-----
 keyboard.go                     |  1 -
 screen/screen_test.go           |  9 ++++-----
 screen/snapshots.go             | 11 +++++++++++
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/update_readme.go b/doc/update_readme.go
index b529d8b..f21f558 100644
--- a/doc/update_readme.go
+++ b/doc/update_readme.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"strings"
@@ -20,7 +19,7 @@ func main() {
 	}
 
 	// Read the contents of the usage file
-	usageBytes, err := ioutil.ReadFile(usagePath)
+	usageBytes, err := os.ReadFile(usagePath)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -29,7 +28,7 @@ func main() {
 	usage := string(usageBytes)
 
 	// Read the contents of the readme file
-	readmeBytes, err := ioutil.ReadFile(readmePath)
+	readmeBytes, err := os.ReadFile(readmePath)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -47,7 +46,7 @@ func main() {
 	newReadme := readme[:startIndex+len(startMarker)] + "\n```terminal\n" + usage + "\n```\n" + readme[endIndex:]
 
 	// Write the updated readme back to the file
-	err = ioutil.WriteFile(readmePath, []byte(newReadme), os.ModePerm)
+	err = os.WriteFile(readmePath, []byte(newReadme), os.ModePerm)
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/frontend/a2fyne/fyneKeyboard.go b/frontend/a2fyne/fyneKeyboard.go
index 966e2a1..d0e8c92 100644
--- a/frontend/a2fyne/fyneKeyboard.go
+++ b/frontend/a2fyne/fyneKeyboard.go
@@ -113,11 +113,7 @@ func (k *keyboard) putKey(keyEvent *fyne.KeyEvent) {
 	case fyne.KeyF5:
 		k.s.a.SendCommand(izapple2.CommandShowSpeed)
 	case fyne.KeyF6:
-		if k.s.screenMode != screen.ScreenModeGreen {
-			k.s.screenMode = screen.ScreenModeGreen
-		} else {
-			k.s.screenMode = screen.ScreenModeNTSC
-		}
+		k.s.screenMode = screen.NextScreenMode(k.s.screenMode)
 	case fyne.KeyF7:
 		k.s.showPages = !k.s.showPages
 	case fyne.KeyF9:
diff --git a/frontend/a2sdl/sdlKeyboard.go b/frontend/a2sdl/sdlKeyboard.go
index 1f2bd41..b911282 100644
--- a/frontend/a2sdl/sdlKeyboard.go
+++ b/frontend/a2sdl/sdlKeyboard.go
@@ -108,11 +108,7 @@ func (k *sdlKeyboard) putKey(keyEvent *sdl.KeyboardEvent) {
 			k.a.SendCommand(izapple2.CommandToggleSpeed)
 		}
 	case sdl.K_F6:
-		if k.screenMode == screen.ScreenModeNTSC {
-			k.screenMode = screen.ScreenModeGreen
-		} else {
-			k.screenMode = screen.ScreenModeNTSC
-		}
+		k.screenMode = screen.NextScreenMode(k.screenMode)
 	case sdl.K_F7:
 		k.showPages = !k.showPages
 	case sdl.K_F9:
diff --git a/keyboard.go b/keyboard.go
index 261f60b..53f9b48 100644
--- a/keyboard.go
+++ b/keyboard.go
@@ -41,7 +41,6 @@ func (k *KeyboardChannel) PutRune(ch rune) {
 	// Some substitutions useful for Macs that transform chars with the option key
 	pos := slices.Index(macOptionChars, ch)
 	if pos >= 0 {
-		println("Mac option char: ", string(ch), " -> ", string(macOptionSubs[pos]))
 		ch = rune(macOptionSubs[pos])
 	}
 
diff --git a/screen/screen_test.go b/screen/screen_test.go
index 7c5cf3a..df6c74f 100644
--- a/screen/screen_test.go
+++ b/screen/screen_test.go
@@ -2,7 +2,6 @@ package screen
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -10,7 +9,7 @@ import (
 
 func TestSnapshots(t *testing.T) {
 	// Verifies all the scenarios on the ./test_resources folder
-	files, err := ioutil.ReadDir("./test_resources/")
+	files, err := os.ReadDir("./test_resources/")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -34,16 +33,16 @@ func testScenario(t *testing.T, fileName string) {
 		referenceName := buildImageName(fileName, screenMode, false)
 		actualName := buildImageName(fileName, screenMode, true)
 
-		reference, err := ioutil.ReadFile(referenceName)
+		reference, err := os.ReadFile(referenceName)
 		if err != nil {
 			t.Fatal(err)
 		}
-		actual, err := ioutil.ReadFile(actualName)
+		actual, err := os.ReadFile(actualName)
 		if err != nil {
 			t.Fatal(err)
 		}
 
-		if bytes.Compare(reference, actual) != 0 {
+		if !bytes.Equal(reference, actual) {
 			t.Errorf("Files %s and %s should be equal", referenceName, actualName)
 			replaceIfNeeded(referenceName, actualName)
 		} else {
diff --git a/screen/snapshots.go b/screen/snapshots.go
index fa69f81..ca5df29 100644
--- a/screen/snapshots.go
+++ b/screen/snapshots.go
@@ -23,6 +23,17 @@ const (
 	ScreenModeNTSC
 )
 
+func NextScreenMode(screenMode int) int {
+	switch screenMode {
+	case ScreenModeGreen:
+		return ScreenModePlain
+	case ScreenModePlain:
+		return ScreenModeNTSC
+	default:
+		return ScreenModeGreen
+	}
+}
+
 // Snapshot the currently visible screen
 func Snapshot(vs VideoSource, screenMode int) *image.RGBA {
 	videoMode := vs.GetCurrentVideoMode()