From aa911ee5431ac6ae1fb445df614352c68199ded8 Mon Sep 17 00:00:00 2001
From: Denis Molony <dmolony@iinet.net.au>
Date: Sun, 19 Aug 2018 11:48:04 +1000
Subject: [PATCH] char rom change

---
 .../diskbrowser/applefile/CharacterRom.java   | 37 ++++++++++++-------
 src/com/bytezone/diskbrowser/nib/MC3470.java  | 12 ++++++
 src/com/bytezone/diskbrowser/nib/WozFile.java |  2 +-
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/com/bytezone/diskbrowser/applefile/CharacterRom.java b/src/com/bytezone/diskbrowser/applefile/CharacterRom.java
index d0dd342..aa2675d 100644
--- a/src/com/bytezone/diskbrowser/applefile/CharacterRom.java
+++ b/src/com/bytezone/diskbrowser/applefile/CharacterRom.java
@@ -26,27 +26,22 @@ public class CharacterRom extends AbstractFile
     int sizeX = buffer[5] & 0xFF;
     int sizeY = buffer[6] & 0xFF;
 
-    int gapX = 4;
-    int gapY = 4;
+    int gapX = 2;
+    int gapY = 2;
     int marginX = 2;
     int marginY = 2;
-    int heading = 20;
+    int heading = 15;
 
-    image = new BufferedImage (8 * (sizeX + gapX), 12 * (sizeY + gapY) + heading,
-        BufferedImage.TYPE_BYTE_GRAY);
+    image = new BufferedImage (16 * (sizeX + gapX) + 2 * marginX - gapX,
+        6 * (sizeY + gapY) + 2 * marginY - gapY + heading, BufferedImage.TYPE_BYTE_GRAY);
     Graphics2D g2d = image.createGraphics ();
     g2d.setComposite (AlphaComposite.getInstance (AlphaComposite.SRC_OVER, (float) 1.0));
 
     int x = marginX;
-    int y = marginY;
+    int y = marginY + heading;
     int count = 0;
     int ptr = 256;
 
-    Font font = Platform.getFont (FontType.SANS_SERIF, 10);
-    g2d.setFont (font);
-    g2d.drawString (description, x, y + 10);
-    y += heading;
-
     while (ptr < buffer.length)
     {
       Character character = new Character (buffer, ptr);
@@ -55,12 +50,28 @@ public class CharacterRom extends AbstractFile
 
       g2d.drawImage (character.image, x, y, null);
       x += sizeX + gapX;
-      if (++count % 8 == 0)
+      if (++count % 16 == 0)
       {
         x = marginX;
         y += sizeY + gapY;
       }
     }
+
+    y = marginY;
+    x = marginX;
+    Font font = Platform.getFont (FontType.SANS_SERIF, 10);
+    g2d.setFont (font);
+
+    for (int i = 0; i < description.length (); i++)
+    {
+      int pos = description.charAt (i);
+      if (pos == 0)
+        break;
+      Character character = characters.get (pos - 32);
+      g2d.drawImage (character.image, x, y, null);
+      x += sizeX;
+    }
+
     g2d.dispose ();
   }
 
@@ -87,7 +98,7 @@ public class CharacterRom extends AbstractFile
 
   public static boolean isRom (byte[] buffer)
   {
-    if (buffer.length < 4)
+    if (buffer.length != 0x400)
       return false;
 
     // no idea what these mean
diff --git a/src/com/bytezone/diskbrowser/nib/MC3470.java b/src/com/bytezone/diskbrowser/nib/MC3470.java
index a978caa..bec910f 100644
--- a/src/com/bytezone/diskbrowser/nib/MC3470.java
+++ b/src/com/bytezone/diskbrowser/nib/MC3470.java
@@ -77,6 +77,7 @@ class MC3470
     int inPtr = offset;                 // keep offset in case we have to loop around
     final int max = offset + bytesUsed;
     finished = false;
+    int zeroBits = 0;
 
     while (inPtr < max && !finished)
     {
@@ -89,7 +90,17 @@ class MC3470
       {
         value <<= 1;
         if ((b & mask) != 0)
+        {
           value |= 0x01;
+          zeroBits = 0;
+        }
+        else
+        {
+          ++zeroBits;
+          if (zeroBits > 2)
+            System.out.printf (zeroBits + " consecutive zeroes @ %d/%d %s%n",
+                diskSectors.size (), dataPtr, currentState);
+        }
 
         if ((value & 0x80) != 0)     // value is not valid until the hi-bit is set
         {
@@ -121,6 +132,7 @@ class MC3470
       {
         inPtr = offset;
         restarted = true;
+        System.out.println ("wrapping around");
       }
     }
 
diff --git a/src/com/bytezone/diskbrowser/nib/WozFile.java b/src/com/bytezone/diskbrowser/nib/WozFile.java
index 5cb433a..67e6b21 100644
--- a/src/com/bytezone/diskbrowser/nib/WozFile.java
+++ b/src/com/bytezone/diskbrowser/nib/WozFile.java
@@ -176,7 +176,7 @@ public class WozFile
       NibbleTrack nibbleTrack = mc3470.getNibbleTrack (buffer, ptr, bytesUsed, bitCount);
       nibbleTracks.add (nibbleTrack);
     }
-    System.out.println (HexFormatter.format (nibbleTracks.get (0).buffer));
+    System.out.println (HexFormatter.format (nibbleTracks.get (2).buffer));
   }
 
   // ---------------------------------------------------------------------------------//