From 9d53b3272efb95d542724115dcbf39a0c7b29eb9 Mon Sep 17 00:00:00 2001
From: Jorj Bauer <jorj@jorj.org>
Date: Wed, 20 Jan 2021 21:16:32 -0500
Subject: [PATCH] remove constructs assuming the Y resolution < 256 pixels

---
 physicaldisplay.h         |  6 +++---
 sdl/sdl-display.cpp       | 10 +++++-----
 sdl/sdl-display.h         |  6 +++---
 sdl/sdl-keyboard.cpp      |  1 -
 teensy/teensy-display.cpp | 12 ++++++------
 teensy/teensy-display.h   |  6 +++---
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/physicaldisplay.h b/physicaldisplay.h
index 47bc7e3..6fe3fc9 100644
--- a/physicaldisplay.h
+++ b/physicaldisplay.h
@@ -15,10 +15,10 @@ class PhysicalDisplay {
   virtual void blit() = 0;             // blit everything to the display (including UI area)
   virtual void blit(AiieRect r) = 0;   // blit a piece of the VM area to the display
 
-  virtual void drawImageOfSizeAt(const uint8_t *img, uint16_t sizex, uint8_t sizey, uint16_t wherex, uint8_t wherey) = 0;
+  virtual void drawImageOfSizeAt(const uint8_t *img, uint16_t sizex, uint16_t sizey, uint16_t wherex, uint16_t wherey) = 0;
 
-  virtual void drawCharacter(uint8_t mode, uint16_t x, uint8_t y, char c) = 0;
-  virtual void drawString(uint8_t mode, uint16_t x, uint8_t y, const char *str) = 0;
+  virtual void drawCharacter(uint8_t mode, uint16_t x, uint16_t y, char c) = 0;
+  virtual void drawString(uint8_t mode, uint16_t x, uint16_t y, const char *str) = 0;
   virtual void debugMsg(const char *msg) {   strncpy(overlayMessage, msg, sizeof(overlayMessage));overlayMessage[strlen(overlayMessage)] = 0; }
 
   virtual void drawPixel(uint16_t x, uint16_t y, uint16_t color) = 0;
diff --git a/sdl/sdl-display.cpp b/sdl/sdl-display.cpp
index bd80e1b..17e5f2e 100644
--- a/sdl/sdl-display.cpp
+++ b/sdl/sdl-display.cpp
@@ -101,10 +101,10 @@ void SDLDisplay::redraw()
 // images themselves aren't aware of the double resolution. This is an
 // inconsistency that probably should be addressed. FIXME?
 void SDLDisplay::drawImageOfSizeAt(const uint8_t *img,
-				   uint16_t sizex, uint8_t sizey,
-				   uint16_t wherex, uint8_t wherey)
+				   uint16_t sizex, uint16_t sizey,
+				   uint16_t wherex, uint16_t wherey)
 {
-  for (uint8_t y=0; y<sizey; y++) {
+  for (uint16_t y=0; y<sizey; y++) {
     for (uint16_t x=0; x<sizex; x++) {
       const uint8_t *p = &img[(y * sizex + x)*3];
       p = &img[(y * sizex + x)*3];
@@ -189,7 +189,7 @@ void SDLDisplay::drawPixel(uint16_t x, uint16_t y, uint8_t r, uint8_t g, uint8_t
   }
 }
 
-void SDLDisplay::drawCharacter(uint8_t mode, uint16_t x, uint8_t y, char c)
+void SDLDisplay::drawCharacter(uint8_t mode, uint16_t x, uint16_t y, char c)
 {
   int8_t xsize = 8,
     ysize = 0x07;
@@ -234,7 +234,7 @@ void SDLDisplay::drawCharacter(uint8_t mode, uint16_t x, uint8_t y, char c)
   }
 }
 
-void SDLDisplay::drawString(uint8_t mode, uint16_t x, uint8_t y, const char *str)
+void SDLDisplay::drawString(uint8_t mode, uint16_t x, uint16_t y, const char *str)
 {
   int8_t xsize = 8; // width of a char in this font
   
diff --git a/sdl/sdl-display.h b/sdl/sdl-display.h
index 55a5ba4..3428bf5 100644
--- a/sdl/sdl-display.h
+++ b/sdl/sdl-display.h
@@ -25,15 +25,15 @@ class SDLDisplay : public PhysicalDisplay {
 
   virtual void flush();
 
-  virtual void drawImageOfSizeAt(const uint8_t *img, uint16_t sizex, uint8_t sizey, uint16_t wherex, uint8_t wherey);
+  virtual void drawImageOfSizeAt(const uint8_t *img, uint16_t sizex, uint16_t sizey, uint16_t wherex, uint16_t wherey);
 
   virtual void drawPixel(uint16_t x, uint16_t y, uint16_t color);
   virtual void drawPixel(uint16_t x, uint16_t y, uint8_t r, uint8_t g, uint8_t b);
 
   virtual void drawUIPixel(uint16_t x, uint16_t y, uint16_t color);
 
-  virtual void drawCharacter(uint8_t mode, uint16_t x, uint8_t y, char c);
-  virtual void drawString(uint8_t mode, uint16_t x, uint8_t y, const char *str);
+  virtual void drawCharacter(uint8_t mode, uint16_t x, uint16_t y, char c);
+  virtual void drawString(uint8_t mode, uint16_t x, uint16_t y, const char *str);
   virtual void clrScr(uint8_t coloridx);
 
   virtual void cachePixel(uint16_t x, uint16_t y, uint8_t color);
diff --git a/sdl/sdl-keyboard.cpp b/sdl/sdl-keyboard.cpp
index ac6799b..cd486bd 100644
--- a/sdl/sdl-keyboard.cpp
+++ b/sdl/sdl-keyboard.cpp
@@ -169,7 +169,6 @@ void SDLKeyboard::maintainKeyboard()
       // didn't belong here, but this REALLY is wrong.
     case SDL_WINDOWEVENT:
       if (event.window.event == SDL_WINDOWEVENT_RESIZED) {
-	printf("Window was resized\n");
 	((SDLDisplay *)g_display)->windowResized(event.window.data1, event.window.data2);
       }
       break;
diff --git a/teensy/teensy-display.cpp b/teensy/teensy-display.cpp
index 6ebaa36..86de029 100644
--- a/teensy/teensy-display.cpp
+++ b/teensy/teensy-display.cpp
@@ -100,13 +100,13 @@ void TeensyDisplay::redraw()
 }
 
 void TeensyDisplay::drawImageOfSizeAt(const uint8_t *img, 
-				      uint16_t sizex, uint8_t sizey, 
-				      uint16_t wherex, uint8_t wherey)
+				      uint16_t sizex, uint16_t sizey, 
+				      uint16_t wherex, uint16_t wherey)
 {
   uint8_t r, g, b;
 
   // FIXME this needs to scale with TEENSYDISPLAY_SCALE
-  for (uint8_t y=0; y<sizey; y++) {
+  for (uint16_t y=0; y<sizey; y++) {
     for (uint16_t x=0; x<sizex; x++) {
       r = pgm_read_byte(&img[(y*sizex + x)*3 + 0]);
       g = pgm_read_byte(&img[(y*sizex + x)*3 + 1]);
@@ -157,7 +157,7 @@ void TeensyDisplay::drawPixel(uint16_t x, uint16_t y, uint8_t r, uint8_t g, uint
   drawPixel(x,y,color16);
 }
 
-void TeensyDisplay::drawCharacter(uint8_t mode, uint16_t x, uint8_t y, char c)
+void TeensyDisplay::drawCharacter(uint8_t mode, uint16_t x, uint16_t y, char c)
 {
   int8_t xsize = 8,
     ysize = 0x07;
@@ -201,7 +201,7 @@ void TeensyDisplay::drawCharacter(uint8_t mode, uint16_t x, uint8_t y, char c)
   }
 }
 
-void TeensyDisplay::drawString(uint8_t mode, uint16_t x, uint8_t y, const char *str)
+void TeensyDisplay::drawString(uint8_t mode, uint16_t x, uint16_t y, const char *str)
 {
   int8_t xsize = 8; // width of a char in this font                                                 
 
@@ -224,7 +224,7 @@ void TeensyDisplay::clrScr(uint8_t coloridx)
       color16 = loresPixelColors[coloridx];
     // This could be faster - make one line, then memcpy the line to the other
     // lines?
-    for (uint8_t y=0; y<TEENSYDISPLAY_HEIGHT; y++) {
+    for (uint16_t y=0; y<TEENSYDISPLAY_HEIGHT; y++) {
       for (uint16_t x=0; x<TEENSYDISPLAY_WIDTH; x++) {
 	dmaBuffer[y][x] = color16;
       }
diff --git a/teensy/teensy-display.h b/teensy/teensy-display.h
index 395726c..55b9910 100644
--- a/teensy/teensy-display.h
+++ b/teensy/teensy-display.h
@@ -26,10 +26,10 @@ class TeensyDisplay : public PhysicalDisplay {
   virtual void clrScr(uint8_t coloridx);
   virtual void flush();
 
-  virtual void drawCharacter(uint8_t mode, uint16_t x, uint8_t y, char c);
-  virtual void drawString(uint8_t mode, uint16_t x, uint8_t y, const char *str);
+  virtual void drawCharacter(uint8_t mode, uint16_t x, uint16_t y, char c);
+  virtual void drawString(uint8_t mode, uint16_t x, uint16_t y, const char *str);
 
-  virtual void drawImageOfSizeAt(const uint8_t *img, uint16_t sizex, uint8_t sizey, uint16_t wherex, uint8_t wherey);
+  virtual void drawImageOfSizeAt(const uint8_t *img, uint16_t sizex, uint16_t sizey, uint16_t wherex, uint16_t wherey);
 
   void cacheDoubleWidePixel(uint16_t x, uint16_t y, uint16_t color16);
   virtual void cacheDoubleWidePixel(uint16_t x, uint16_t y, uint8_t color);