Fix scaling issues on Linux

README.md

@@ -1,9 +1,9 @@
-SYMON - A 6502 System Simulator
+kSYMON - A 6502 System Simulator
 ===============================
 
-**Version:** 1.5.0
+**Version:** 1.5.1k
 
-**Last Updated:** 30 March, 2025
+**Last Updated:** 24 September, 2026
 
 See the file COPYING for license.
 
@@ -71,6 +71,13 @@ memory.
   - `$6000`--`$600F`: 6522 VIA
   - `$8000`--`$FFFF`: 16KB ROM
 
+#### 3.1.5 Mike42 Memory Map
+
+  - `$0000`--`$7FFF`: 32KB RAM
+  - `$8000`--`$800F`: 6522 VIA
+  - `$8400`--`$8403`: MOS 6551 ACIA (Serial Console)
+  - `$C000`--`$FFFF`: 16KB ROM
+
 ### 3.2 Serial Console and CPU Status
 
 ![Serial Console](https://codeberg.org/sethm/symon/raw/master/screenshots/console.png)

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.loomcom.symon</groupId>
     <artifactId>symon</artifactId>
     <packaging>jar</packaging>
-    <version>1.5.0</version>
+    <version>1.5.1k</version>
     <name>symon</name>
     <url>https://git.loomcom.com/seth/symon</url>
     <properties>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.16</version>
+            <version>1.5.34</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -55,6 +55,11 @@
             <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.14.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -66,7 +71,7 @@
                 <configuration>
                     <transformers>
                         <transformer
-                            implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             <mainClass>com.loomcom.symon.Main</mainClass>
                         </transformer>
                     </transformers>
@@ -97,8 +102,8 @@
                 <version>3.7.0</version>
                 <configuration>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
 

src/main/java/com/loomcom/symon/Simulator.java

@@ -23,6 +23,7 @@
 
 package com.loomcom.symon;
 
+import com.formdev.flatlaf.util.UIScale;
 import com.loomcom.symon.devices.Memory;
 import com.loomcom.symon.exceptions.*;
 import com.loomcom.symon.machines.Machine;
@@ -53,7 +54,7 @@ public class Simulator {
 
     // UI constants
     private static final int DEFAULT_FONT_SIZE = 12;
-    private static final Font DEFAULT_FONT = new Font(Font.MONOSPACED, Font.PLAIN, DEFAULT_FONT_SIZE);
+    private static final Font DEFAULT_FONT = new Font(Font.MONOSPACED, Font.PLAIN, UIScale.scale(DEFAULT_FONT_SIZE));
     private static final int CONSOLE_BORDER_WIDTH = 10;
 
     // Clock periods, in NS, for each speed. 0MHz, 1MHz, 2MHz, 3MHz, 4MHz, 5MHz, 6MHz, 7MHz, 8MHz.

src/main/java/com/loomcom/symon/machines/MichaelBillingtonMachine.java

@@ -0,0 +1,134 @@
+package com.loomcom.symon.machines;
+
+import com.loomcom.symon.Bus;
+import com.loomcom.symon.Cpu;
+import com.loomcom.symon.InstructionTable;
+import com.loomcom.symon.devices.*;
+import com.loomcom.symon.exceptions.MemoryRangeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+public class MichaelBillingtonMachine implements Machine{
+
+    private static final Logger logger = LoggerFactory.getLogger(MichaelBillingtonMachine.class.getName());
+
+    // Constants used by the simulated system
+    private static final int BUS_BOTTOM = 0x0000;
+    private static final int BUS_TOP    = 0xffff;
+
+    // 32k of ram, from $0000 to $7fff
+    private static final int MEMORY_BASE = 0x0000;
+    private static final int MEMORY_SIZE = 0x8000;
+
+    // VIA at $8000-$800f
+    private static final int PIA_BASE = 0x8000;
+
+    // ACIA at $8400-$8403
+    private static final int ACIA_BASE = 0x8400;
+
+    // 16k ROM from $c000 to $ffff
+    private static final int ROM_BASE = 0xc000;
+    private static final int ROM_SIZE = 0x4000;
+
+    private final   Bus     bus;
+    private final   Cpu     cpu;
+    private final   Acia    acia;
+    private final   Pia     pia;
+    private final   Memory  ram;
+    private         Memory  rom;
+
+    public MichaelBillingtonMachine(String romFile) throws Exception {
+        this.bus = new Bus(BUS_BOTTOM, BUS_TOP);
+        this.cpu = new Cpu();
+        this.ram = new Memory(MEMORY_BASE, MEMORY_BASE + MEMORY_SIZE - 1);
+        this.pia = new Via6522(PIA_BASE);
+        this.acia = new Acia6551(ACIA_BASE);
+
+        bus.addCpu(cpu);
+        bus.addDevice(ram);
+        bus.addDevice(pia);
+        bus.addDevice(acia);
+
+        if (romFile != null) {
+            File romImage = new File(romFile);
+            if (romImage.canRead()) {
+                logger.info("Loading ROM image from file {}", romImage);
+                this.rom = Memory.makeROM(ROM_BASE, ROM_BASE + ROM_SIZE - 1, romImage);
+            } else {
+                logger.info("Default ROM file {} not found, loading empty R/W memory image.", romImage);
+                this.rom = Memory.makeRAM(ROM_BASE, ROM_BASE + ROM_SIZE - 1);
+            }
+        } else {
+            logger.info("No ROM file specified, loading empty R/W memory image.");
+            this.rom = Memory.makeRAM(ROM_BASE, ROM_BASE + ROM_SIZE - 1);
+        }
+
+        bus.addDevice(rom);
+    }
+
+    @Override
+    public Bus getBus() {
+        return bus;
+    }
+
+    @Override
+    public Cpu getCpu() {
+        return cpu;
+    }
+
+    @Override
+    public Memory getRam() {
+        return ram;
+    }
+
+    @Override
+    public Acia getAcia() {
+        return acia;
+    }
+
+    @Override
+    public Pia getPia() {
+        return pia;
+    }
+
+    @Override
+    public Crtc getCrtc() {
+        return null;
+    }
+
+    @Override
+    public Memory getRom() {
+        return rom;
+    }
+
+    @Override
+    public void setRom(Memory rom) throws MemoryRangeException {
+        if (this.rom != null) {
+            bus.removeDevice(this.rom);
+        }
+        this.rom = rom;
+        bus.addDevice(this.rom);
+    }
+
+    @Override
+    public int getRomBase() {
+        return ROM_BASE;
+    }
+
+    @Override
+    public int getRomSize() {
+        return ROM_SIZE;
+    }
+
+    @Override
+    public int getMemorySize() {
+        return MEMORY_SIZE;
+    }
+
+    @Override
+    public String getName() {
+        return "mike42";
+    }
+}

src/main/java/com/loomcom/symon/ui/StatusPanel.java

@@ -23,6 +23,7 @@
 
 package com.loomcom.symon.ui;
 
+import com.formdev.flatlaf.util.UIScale;
 import com.loomcom.symon.Cpu;
 import com.loomcom.symon.CpuState;
 import com.loomcom.symon.machines.Machine;
@@ -34,6 +35,7 @@ import javax.swing.plaf.metal.MetalTextFieldUI;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Objects;
 
 /**
  * UI component that displays the current state of the simulated CPU.
@@ -74,7 +76,7 @@ public class StatusPanel extends JPanel {
 
     private static final int EMPTY_BORDER = 10;
     private static final Border LABEL_BORDER = BorderFactory.createEmptyBorder(0, 5, 0, 0);
-    private static final Font LABEL_FONT = new Font(Font.SANS_SERIF, Font.BOLD, 12);
+    private static final Font LABEL_FONT = new Font(Font.SANS_SERIF, Font.BOLD, UIScale.scale(12));
     private static final Dimension LARGE_TEXT_FIELD_SIZE = new Dimension(134, 22);
     private static final Dimension SMALL_TEXT_FIELD_SIZE = new Dimension(65, 22);
 
@@ -99,20 +101,20 @@ public class StatusPanel extends JPanel {
         JPanel statusFlagsPanel = new JPanel();
         statusFlagsPanel.setAlignmentX(LEFT_ALIGNMENT);
 
-        carryOn = new ImageIcon(this.getClass().getResource("/C_on.png"));
-        carryOff = new ImageIcon(this.getClass().getResource("/C_off.png"));
-        zeroOn = new ImageIcon(this.getClass().getResource("/Z_on.png"));
-        zeroOff = new ImageIcon(this.getClass().getResource("/Z_off.png"));
-        irqOn = new ImageIcon(this.getClass().getResource("/I_on.png"));
-        irqOff = new ImageIcon(this.getClass().getResource("/I_off.png"));
-        decimalOn = new ImageIcon(this.getClass().getResource("/D_on.png"));
-        decimalOff = new ImageIcon(this.getClass().getResource("/D_off.png"));
-        breakOn = new ImageIcon(this.getClass().getResource("/B_on.png"));
-        breakOff = new ImageIcon(this.getClass().getResource("/B_off.png"));
-        overflowOn = new ImageIcon(this.getClass().getResource("/O_on.png"));
-        overflowOff = new ImageIcon(this.getClass().getResource("/O_off.png"));
-        negativeOn = new ImageIcon(this.getClass().getResource("/N_on.png"));
-        negativeOff = new ImageIcon(this.getClass().getResource("/N_off.png"));
+        carryOn = loadScaledIcon("/C_on.png");
+        carryOff = loadScaledIcon("/C_off.png");
+        zeroOn = loadScaledIcon("/Z_on.png");
+        zeroOff = loadScaledIcon("/Z_off.png");
+        irqOn = loadScaledIcon("/I_on.png");
+        irqOff = loadScaledIcon("/I_off.png");
+        decimalOn = loadScaledIcon("/D_on.png");
+        decimalOff = loadScaledIcon("/D_off.png");
+        breakOn = loadScaledIcon("/B_on.png");
+        breakOff = loadScaledIcon("/B_off.png");
+        overflowOn = loadScaledIcon("/O_on.png");
+        overflowOff = loadScaledIcon("/O_off.png");
+        negativeOn = loadScaledIcon("/N_on.png");
+        negativeOff = loadScaledIcon("/N_off.png");
 
         // Initialize all to off
         carryFlagLabel = new JLabel(carryOff, JLabel.CENTER);
@@ -387,9 +389,11 @@ public class StatusPanel extends JPanel {
         JTextField textField = new JTextField("");
         textField.setAlignmentX(LEFT_ALIGNMENT);
         textField.setEditable(editable);
-        textField.setMinimumSize(size);
-        textField.setMaximumSize(size);
-        textField.setPreferredSize(size);
+
+        Dimension scaleSize = UIScale.scale(size);
+        textField.setMinimumSize(scaleSize);
+        textField.setMaximumSize(scaleSize);
+        textField.setPreferredSize(scaleSize);
 
         return textField;
     }
@@ -398,4 +402,14 @@ public class StatusPanel extends JPanel {
         String val = source.getText().replaceAll("[^0-9a-fA-F]", "");
         return Integer.parseInt(val, 16);
     }
+
+    private ImageIcon loadScaledIcon(String resourcePath) {
+        ImageIcon icon = new ImageIcon(Objects.requireNonNull(this.getClass().getResource(resourcePath)));
+
+        int scaledWidth = UIScale.scale(icon.getIconWidth());
+        int scaledHeight = UIScale.scale(icon.getIconHeight());
+
+        Image scaleImage = icon.getImage().getScaledInstance(scaledWidth, scaledHeight, Image.SCALE_SMOOTH);
+        return new ImageIcon(scaleImage);
+    }
 }

src/main/java/com/loomcom/symon/ui/Ui.java

@@ -30,6 +30,7 @@ import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 
+import com.loomcom.symon.machines.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,10 +39,13 @@ import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.jthemedetecor.OsThemeDetector;
-import com.loomcom.symon.machines.BenEaterMachine;
-import com.loomcom.symon.machines.MulticompMachine;
-import com.loomcom.symon.machines.SimpleMachine;
-import com.loomcom.symon.machines.SymonMachine;
+
+import java.awt.*;
+import java.beans.PropertyChangeListener;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 public final class Ui {
     private final static Logger logger = LoggerFactory.getLogger(Ui.class.getName());
@@ -50,10 +54,14 @@ public final class Ui {
         // Location of properties resources for app-specific UI defaults:
         FlatLaf.registerCustomDefaultsSource("com.loomcom.symon.themes");
 
+        logger.debug("AWT Toolkit class: {}", Toolkit.getDefaultToolkit().getClass().getName());
+
         // Enable automatic scaling, based on system DPI settings:
-        System.setProperty("sun.java2d.uiScale.enabled", "true");
-        System.setProperty("sun.java2d.uiScale", "1x");
-        System.setProperty("flatlaf.uiScale", "1x");
+        //System.setProperty("sun.java2d.uiScale.enabled", "true");
+        //System.setProperty("sun.java2d.uiScale", "1x");
+        //System.setProperty("flatlaf.uiScale", "1x");
+
+        applyDetectedUiScale();
 
         // OS-specific tweaking:
 
@@ -84,7 +92,7 @@ public final class Ui {
     }
 
     public static Class<?> showMachineSelectionDialog() {
-        Object[] possibilities = { "Symon", "Multicomp", "Simple", "BenEater" };
+        Object[] possibilities = { "Symon", "Multicomp", "Simple", "BenEater", "Mike42" };
         String s = (String) JOptionPane.showInputDialog(
                 null,
                 "Please choose the machine type to be emulated:",
@@ -100,6 +108,8 @@ public final class Ui {
             return SimpleMachine.class;
         } else if (s != null && s.equals("BenEater")) {
             return BenEaterMachine.class;
+        } else if (s != null && s.equals("Mike42")) {
+            return MichaelBillingtonMachine.class;
         } else {
             return SymonMachine.class;
         }
@@ -121,4 +131,21 @@ public final class Ui {
         return theme;
     }
 
+    private static void applyDetectedUiScale() {
+        Double rawScale = X11ResourceReader.readXftDpiScale(); // ex: 1.5, 2.0, 2.5...
+
+        if (rawScale != null && rawScale > 1.0) {
+            // flatlaf.uiScale aceita frações — mantém a precisão original
+            System.setProperty("flatlaf.uiScale", rawScale + "x");
+
+            // sun.java2d.uiScale só aceita inteiros — arredonda para cima
+            int javaScale = (int) Math.ceil(rawScale);
+            //System.setProperty("sun.java2d.uiScale", String.valueOf(javaScale));
+
+            logger.debug("Detected scale {}x, applying flatlaf.uiScale={}x, sun.java2d.uiScale={}x",
+                    rawScale, rawScale, javaScale);
+        } else {
+            logger.debug("No X11 HiDPI scale detected, using default.");
+        }
+    }
 }

src/main/java/com/loomcom/symon/ui/X11ResourceReader.java

@@ -0,0 +1,54 @@
+package com.loomcom.symon.ui;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class X11ResourceReader {
+
+    private final static Logger logger = LoggerFactory.getLogger(X11ResourceReader.class.getName());
+
+
+    public interface X11 extends Library {
+        X11 INSTANCE = Native.load("X11", X11.class);
+
+        Pointer XOpenDisplay(String display);
+        Pointer XResourceManagerString(Pointer display);
+        void XCloseDisplay(Pointer display);
+    }
+
+    public static Double readXftDpiScale() {
+        Pointer display = null;
+        try {
+            display = X11.INSTANCE.XOpenDisplay(null);
+            if (display == null) {
+                return null; // não conseguimos ligar ao X server (ex: Wayland puro sem XWayland)
+            }
+
+            Pointer resourceString = X11.INSTANCE.XResourceManagerString(display);
+            if (resourceString == null) {
+                return null;
+            }
+
+            String resources = resourceString.getString(0);
+            for (String line : resources.split("\n")) {
+                if (line.startsWith("Xft.dpi:")) {
+                    int dpi = Integer.parseInt(line.split(":")[1].trim());
+                    return Math.round((dpi / 96.0) * 4) / 4.0;
+                }
+            }
+            return null;
+        } catch (UnsatisfiedLinkError | Exception e) {
+            logger.debug("Could not read X11 resource manager (libX11 unavailable?)", e);
+            return null;
+        } finally {
+            if (display != null) {
+                X11.INSTANCE.XCloseDisplay(display);
+            }
+        }
+    }
+}