badline 0.16.1 → 0.17.0

data/lib/badline/frontend/keys.rb

@@ -3,8 +3,8 @@
 module Badline
   module Frontend
     # SDL scancodes follow key positions on a US layout. They map onto the C64
-    # keys, the C128's and the 264's own keys and, in joystick mode, the
-    # joystick directions.
+    # keys, the C128's, the 264's, the PET's and the CBM-II's own keys and,
+    # in joystick mode, the joystick directions.
     module Keys
       RETURN = 40
       ESCAPE = 41
@@ -118,6 +118,41 @@ module Badline
       # The cursor keys, CRSR ⇔ and CRSR ⇕, each with SHIFT for left or up.
       PET_CURSORS = { RIGHT => :cursor_h, LEFT => :cursor_h, DOWN => :cursor_v, UP => :cursor_v }.freeze
 
+      # The CBM-II's keys for the characters a host key types: those it
+      # types without SHIFT, then those it types with it, as the KERNAL's
+      # key tables place them. ← is on _ and `, and SHIFT turns it into \.
+      CBM2_CHARACTERS = {
+        "1" => :"1", "2" => :"2", "3" => :"3", "4" => :"4", "5" => :"5", "6" => :"6", "7" => :"7", "8" => :"8",
+        "9" => :"9", "0" => :"0", "-" => :-, "=" => :"=", "[" => :"[", "]" => :"]", ";" => :";", "'" => :"'",
+        "," => :",", "." => :".", "/" => :/, "_" => :left_arrow, "`" => :left_arrow
+      }.freeze
+
+      CBM2_SHIFTED = {
+        "!" => :"1", "@" => :"2", "#" => :"3", "$" => :"4", "%" => :"5", "^" => :"6", "&" => :"7", "*" => :"8",
+        "(" => :"9", ")" => :"0", "+" => :"=", ":" => :";", "\"" => :"'", "<" => :",", ">" => :".", "?" => :/,
+        "\\" => :left_arrow
+      }.freeze
+
+      # The CBM-II's keys that don't type a character, which keep the
+      # host's SHIFT: RETURN, INST/DEL on Backspace, CLR/HOME on Home, ESC,
+      # TAB, RUN/STOP on F12, CTRL on Control, the four cursor keys on the
+      # arrows, F1-F8 on F1-F8, and the keypad on the host's.
+      CBM2_KEYS = {
+        40 => :return, 42 => :delete, 44 => :space, 74 => :clr_home, 41 => :escape, 43 => :tab, 69 => :run_stop,
+        224 => :control, 228 => :control, 79 => :cursor_right, 80 => :cursor_left, 81 => :cursor_down,
+        82 => :cursor_up, 58 => :f1, 59 => :f2, 60 => :f3, 61 => :f4, 62 => :f5, 63 => :f6, 64 => :f7, 65 => :f8,
+        84 => :kp_divide, 85 => :kp_multiply, 86 => :kp_minus, 87 => :kp_plus, 88 => :kp_enter, 89 => :kp1,
+        90 => :kp2, 91 => :kp3, 92 => :kp4, 93 => :kp5, 94 => :kp6, 95 => :kp7, 96 => :kp8, 97 => :kp9,
+        98 => :kp0, 99 => :kp_period
+      }.freeze
+
+      # The CBM-II's keys that Alt and a host key press: C= on C, CE on E,
+      # NORM/GRAPH on G, OFF/RVS on R, π on P, 00 on 0, and F9 and F10 on
+      # F9 and F10, which open the pause menu and mute without Alt.
+      CBM2_ALT_KEYS = {
+        6 => :cbm, 8 => :ce, 10 => :norm_graph, 21 => :off_rvs, 19 => :pi, 39 => :kp00, 66 => :f9, 67 => :f10
+      }.freeze
+
       ARROWS = { 44 => :fire, 228 => :fire, 79 => :right, 80 => :left, 81 => :down, 82 => :up }.freeze
       WASD = { 225 => :fire, 7 => :right, 4 => :left, 22 => :down, 26 => :up }.freeze
 
@@ -177,6 +212,30 @@ module Badline
         shifted.nil? ? %i[none host] : [shifted, :on]
       end
 
+      # The CBM-II key for the scancode, with the host's SHIFT down if
+      # +shift+, and how the CBM-II's SHIFT goes with it, as pet_key gives
+      # them.
+      def self.cbm2_key(scancode, shift)
+        return [LETTERS[scancode - 4], :host] if scancode.between?(4, 29)
+
+        key = CBM2_KEYS[scancode]
+        return [key, :host] unless key.nil?
+
+        characters = US_CHARACTERS[scancode]
+        return %i[none host] if characters.nil?
+
+        character = characters[shift ? 1 : 0]
+        unshifted = CBM2_CHARACTERS[character]
+        return [unshifted, :off] unless unshifted.nil?
+
+        shifted = CBM2_SHIFTED[character]
+        shifted.nil? ? %i[none host] : [shifted, :on]
+      end
+
+      # The CBM-II key Alt and the scancode press, which keeps the host's
+      # SHIFT, or :none.
+      def self.cbm2_alt_key(scancode) = [CBM2_ALT_KEYS[scancode] || :none, :host]
+
       # The character the key types on a US layout: a letter, a capital
       # with `shift`, or a digit, and "" for any other key.
       def self.character(scancode, shift)

data/lib/badline/frontend/media_slots.rb

@@ -35,7 +35,7 @@ module Badline
         # either cartridge's slots.
         def cartridge?(computer)
           return !computer.cartridge_slots.empty? if computer.family == :plus4
-          return false if computer.family == :pet
+          return false if %i[pet cbm2].include?(computer.family)
 
           !computer.address_bus.cartridge.nil?
         end

data/lib/badline/frontend/menu/menu_media.rb

@@ -50,6 +50,8 @@ module Badline
             Media.insert_disk(@computer, disk, read_only: !@writable)
             list(path)
           else
+            raise Machine::Unsupported, "the CBM-II has no datasette" if @computer.family == :cbm2
+
             @computer.datasette.insert(Storage::TAP.new(path))
           end
         end
@@ -100,17 +102,18 @@ module Badline
       end
 
       # The extensions of the cartridges the machine takes: .crt, on the
-      # Plus/4 raw .bin ROM images too, and none on the PET.
+      # Plus/4 raw .bin ROM images too, and none on the PET, or on the
+      # CBM-II, whose cartridge goes in from the command line.
       def cartridge_extensions
-        extensions = Media::Extensions.of(@computer.family == :pet ? %i[none] : %i[cartridge])
+        extensions = Media::Extensions.of(%i[pet cbm2].include?(@computer.family) ? %i[none] : %i[cartridge])
         @computer.family == :plus4 ? extensions + [Media::Plus4Media::ROM_IMAGE] : extensions
       end
 
-      # The extensions of what goes in device 8: on the PET the 8050's and
-      # 8250's disk images besides the others, and no raw GCR, which only
-      # a serial true drive reads.
+      # The extensions of what goes in device 8: on the PET and the CBM-II
+      # the 8050's and 8250's disk images besides the others, and no raw
+      # GCR, which only a serial true drive reads.
       def disk_extensions
-        return Media::Extensions.of(%i[disk ieee_disk archive disk_list]) if @computer.family == :pet
+        return Media::Extensions.of(%i[disk ieee_disk archive disk_list]) if %i[pet cbm2].include?(@computer.family)
 
         Media::Extensions::DEVICE8
       end
@@ -125,14 +128,14 @@ module Badline
 
       # What a save of the machine is named after: the cartridge, the disk,
       # the tape, or BASIC, without the bracketed parts of a file's name. A
-      # VIC-20's are named after its disk, or else the machine, and a
-      # Plus/4's or a PET's after its disk or tape.
+      # VIC-20's are named after its disk, or else the machine, a Plus/4's
+      # or a PET's after its disk or tape, and a CBM-II's after its disk.
       def game_name
         vic20 = @computer.family == :vic20
-        name = vic20 || %i[plus4 pet].include?(@computer.family) ? "" : cartridge_name
+        name = vic20 || %i[plus4 pet cbm2].include?(@computer.family) ? "" : cartridge_name
         disk = disk_path
         name = File.basename(disk, File.extname(disk)) if name.empty? && !disk.empty?
-        name = tape_name if name.empty? && !vic20
+        name = tape_name if name.empty? && !vic20 && @computer.family != :cbm2
         name = name.sub(/\s*[(\[].*\z/, "").strip
         return name unless name.empty?
 
@@ -154,7 +157,7 @@ module Badline
         case @computer.family
         when :plus4 then @computer.cartridge_slots.map { |slot| slot_name(slot) }.uniq.join(", ")
         when :vic20 then @computer.cartridge_name
-        when :pet then ""
+        when :pet, :cbm2 then ""
         else
           cartridge = @computer.address_bus.cartridge
           cartridge.nil? ? "" : cartridge.name

data/lib/badline/frontend/menu/menu_pages.rb

@@ -88,6 +88,14 @@ module Badline
       # Whether the machine is a PET, whose ports page shows its keyboard.
       def pet? = @computer.family == :pet
 
+      # Whether the machine is a CBM-II, whose ports page shows its keyboard
+      # too.
+      def cbm2? = @computer.family == :cbm2
+
+      # Whether the machine is the CBM-II's B series, whose ports page is
+      # its keyboard's alone.
+      def b_series? = cbm2? && !Controls.p500?(@computer)
+
       private
 
       def vic20? = @computer.family == :vic20
@@ -112,7 +120,10 @@ module Badline
         info("DEVICE", drive.nil? ? "FAST LOADING" : "#{drive.model_name}, TRUE DRIVE")
       end
 
+      # The CBM-II has no datasette.
       def draw_datasette
+        return info("TAPE", "") if cbm2?
+
         datasette = @computer.datasette
         tape = datasette.tape
         info("TAPE", tape.nil? ? "" : File.basename(tape.path))
@@ -126,6 +137,7 @@ module Badline
 
       def draw_expansion
         return draw_pet_memory if pet?
+        return info("RAM", "#{@computer.model.ram_kb}K") if cbm2?
 
         info("CARTRIDGE", @media.cartridge_name)
         return info("RAM EXPANSION", RAM_NAMES.fetch(@computer.ram_configuration)) if vic20?
@@ -186,12 +198,14 @@ module Badline
         end
       end
 
-      # The C128 names its model and the mode it runs in first, the Plus/4
-      # and the PET their model and RAM, and the Plus/4 its RAM expansion if
-      # it has one.
+      # The C128 names its model and the mode it runs in first, the Plus/4,
+      # the PET and the CBM-II their model and RAM, the Plus/4 its RAM
+      # expansion if it has one, and the CBM-II its KERNAL, the B series'
+      # 901244 or the P500's 901234.
       def draw_power
         info("MACHINE", "#{@computer.model.name.upcase}, #{@computer.mode.to_s.upcase} MODE") if c128?
-        info("MACHINE", @computer.model_label) if pet?
+        info("MACHINE", @computer.model_label.upcase) if pet? || cbm2?
+        info("KERNAL", "#{Controls.p500?(@computer) ? 901_234 : 901_244}-#{@computer.kernal.upcase}") if cbm2?
         if plus4?
           info("MACHINE", @computer.model_label)
           expansion = @computer.ram_expansion_label

data/lib/badline/frontend/menu/menu_ports.rb

@@ -6,8 +6,9 @@ module Badline
     # control port has plugged in, a joystick or a pot device, and whether
     # the keys type or drive the joysticks. The VIC-20 has one port, a
     # joystick's, and the Plus/4 two joysticks and no pot devices. The PET
-    # has no ports, and the page, KEYBOARD there, says where its keys are
-    # instead.
+    # and the CBM-II's B series have no ports, and the page, KEYBOARD
+    # there, says where their keys are instead. The P500 has two joysticks,
+    # and the page says where its keys are while they type.
     module MenuPorts
       PORT_DEVICES = %i[joystick mouse paddles].freeze
       PORT_NAMES = %w[JOY MOUSE PADDLES].freeze
@@ -21,15 +22,21 @@ module Badline
       PET_GRAPHICS_KEYS = ["ESC: RUN/STOP", "SHIFT+LETTER: GRAPHIC", "ALT+SYMBOL: GRAPHIC"].freeze
       PET_BUSINESS_KEYS = ["ESC: ESC", "TAB: TAB", "PAGE UP: REPEAT", "KEYPAD: KEYPAD", "ALT+KEY: SHIFT+KEY"].freeze
 
+      # Where the CBM-II's keys without a character of their own are.
+      CBM2_KEYS = ["ESC: ESC", "F12: RUN/STOP", "HOME: CLR/HOME", "BACKSPACE: INST/DEL", "F1-F8: F1-F8",
+                   "ALT+F9, ALT+F10: F9, F10", "KEYPAD: KEYPAD", "ALT+0: KEYPAD 00", "ALT+C: C=  ALT+E: CE",
+                   "ALT+G: NORM/GRAPH", "ALT+R: OFF/RVS  ALT+P: PI", "_: LEFT ARROW"].freeze
+
       private
 
       def draw_ports
         return draw_vic20_port if @computer.family == :vic20
         return draw_plus4_ports if @computer.family == :plus4
         return draw_pet_keys if @computer.family == :pet
+        return draw_p500_ports if Controls.p500?(@computer)
+        return draw_cbm2_keys if @computer.family == :cbm2
 
-        toggle("PORT 1", :port1, [PORT_NAMES, PORT_ACTIONS[0], PORT_DEVICES.index(port_device(1))])
-        toggle("PORT 2", :port2, [PORT_NAMES, PORT_ACTIONS[1], PORT_DEVICES.index(port_device(2))])
+        draw_pot_ports
         return unless draw_keys(@computer.family == :c128 ? "C128" : "C64")
 
         row("SWAP JOYSTICKS", :swap)
@@ -70,6 +77,35 @@ module Badline
         end
       end
 
+      # What each control port has plugged in, a joystick, a mouse or
+      # paddles.
+      def draw_pot_ports
+        toggle("PORT 1", :port1, [PORT_NAMES, PORT_ACTIONS[0], PORT_DEVICES.index(port_device(1))])
+        toggle("PORT 2", :port2, [PORT_NAMES, PORT_ACTIONS[1], PORT_DEVICES.index(port_device(2))])
+      end
+
+      # The P500's two ports, its joysticks one for each set of keys, and
+      # while the keys type, where its keys are.
+      def draw_p500_ports
+        draw_pot_ports
+        return draw_cbm2_keys unless draw_keys("P500")
+
+        row("SWAP JOYSTICKS", :swap)
+        skip
+        arrows = @controls.arrows_port
+        info("ARROWS, SPACE", "JOYSTICK #{arrows}")
+        info("WASD, LEFT SHIFT", "JOYSTICK #{3 - arrows}")
+      end
+
+      # The CBM-II's keyboard, which types as the PET's does, and the keys
+      # that stand for the rest of its keys.
+      def draw_cbm2_keys
+        CBM2_KEYS.each do |line|
+          @painter.text(@left, @top, line, MenuTheme::TEXT)
+          @top += MenuPages::LINE
+        end
+      end
+
       # The toggle between the keyboard named and the joysticks, and
       # whether the keys drive the joysticks.
       def draw_keys(keyboard)

data/lib/badline/frontend/menu/pause_menu.rb

@@ -238,7 +238,7 @@ module Badline
       def draw_sections
         top = @top + 32
         SECTIONS.each_with_index do |name, index|
-          name = "KEYBOARD" if PAGES[index] == :ports && @pages.pet?
+          name = "KEYBOARD" if PAGES[index] == :ports && (@pages.pet? || @pages.b_series?)
           @buttons.plain(@left + 6, top, name.ljust(14), PAGES[index], on: index == @section)
           top += Buttons::HEIGHT + 2
         end

data/lib/badline/frontend/pet_keyboard.rb

@@ -12,16 +12,22 @@ module Badline
     # With either Alt down, a key that types a character presses the PET
     # key its unshifted character is on with the PET's SHIFT, so the
     # graphics on the graphics keyboard's symbol keys can be typed.
+    #
+    # The CBM-II's keyboard goes the same way (Keys.cbm2_key), and there
+    # Alt with a key presses one of the keys the host has none for
+    # (Keys.cbm2_alt_key).
     class PETKeyboard
       LSHIFT = 225
       RSHIFT = 229
       LALT = 226
       RALT = 230
 
-      # +layout+ is the PET's keyboard, :graphics or :business.
+      # +layout+ is the PET's keyboard, :graphics or :business, or :cbm2
+      # for the CBM-II's.
       def initialize(keyboard, layout)
         @keyboard = keyboard
         @layout = layout
+        @shift = layout == :cbm2 ? :shift : :lshift
         @held = {}
         @left_shift = false
         @right_shift = false
@@ -43,6 +49,11 @@ module Badline
         end
       end
 
+      # Whether a key the scancode pressed is still down.
+      def holds?(scancode) = @held.key?(scancode)
+
+      def alt? = @left_alt || @right_alt
+
       # Lets go of every key, SHIFT among them.
       def release_all
         @held.each_value { |key| @keyboard.release(key) }
@@ -59,7 +70,7 @@ module Badline
 
       def key_down(scancode)
         key_up(scancode) if @held.key?(scancode)
-        key, shift = alt? ? shifted_key(scancode) : Keys.pet_key(scancode, shifted?, @layout)
+        key, shift = alt? ? shifted_key(scancode) : layout_key(scancode, shifted?)
         return if key == :none
 
         unless shift == :host
@@ -99,10 +110,17 @@ module Badline
         end
       end
 
+      def layout_key(scancode, shift)
+        @layout == :cbm2 ? Keys.cbm2_key(scancode, shift) : Keys.pet_key(scancode, shift, @layout)
+      end
+
       # The PET key for the scancode with Alt down: for a letter or a key
       # that types a character, the key its unshifted character is on, with
-      # SHIFT, and for any other key the one it presses without Alt.
+      # SHIFT, and for any other key the one it presses without Alt. The
+      # CBM-II's is the one Keys.cbm2_alt_key names.
       def shifted_key(scancode)
+        return Keys.cbm2_alt_key(scancode) if @layout == :cbm2
+
         key, shift = Keys.pet_key(scancode, false, @layout)
         return [key, shift] if key == :none
         return [key, shift] unless scancode.between?(4, 29) || Keys::US_CHARACTERS.key?(scancode)
@@ -112,12 +130,10 @@ module Badline
 
       def shifted? = @left_shift || @right_shift
 
-      def alt? = @left_alt || @right_alt
-
       def sync_shift
         shift = @forced == -1 ? shifted? : @forced_shift
-        @keyboard.release(:lshift)
-        @keyboard.press(:lshift) if shift
+        @keyboard.release(@shift)
+        @keyboard.press(@shift) if shift
       end
     end
   end

data/lib/badline/frontend/timeline.rb

@@ -25,7 +25,8 @@ module Badline
       LOCKS = %w[caps_lock forty_eighty].freeze
 
       # What's wrong with the events for the family's machine, the first
-      # key or menu page that names nothing, or an empty string.
+      # key or menu page that names nothing, or an empty string. The
+      # CBM-II's P500 is family :p500 here, for its joysticks.
       def self.error(events, family)
         event = events.find { |candidate| candidate.action == "key" && !key?(candidate.argument, family) }
         return "no such key: #{event.argument}" unless event.nil?
@@ -38,23 +39,26 @@ module Badline
       # sound. An empty one is its first.
       def self.page?(name) = name.empty? || PauseMenu::PAGES.any? { |page| page.to_s == name }
 
-      # Whether the family's machine has a key of the name. The Plus/4 has
-      # no RESTORE, and the PET neither that nor joysticks.
+      # Whether the family's machine has a key of the name, the CBM-II's
+      # P500's as family :p500. The Plus/4 has no RESTORE, the P500 none
+      # either, and the PET and the CBM-II's B series neither that nor
+      # joysticks.
       def self.key?(name, family)
-        pet = family == :pet
-        (name == "restore" && !pet && family != :plus4) || (family == :c128 && LOCKS.include?(name)) ||
+        pet = %i[pet cbm2].include?(family)
+        (name == "restore" && !pet && !%i[plus4 p500].include?(family)) || (family == :c128 && LOCKS.include?(name)) ||
           !keyboard_key(name, family).nil? || (!pet && !joystick_direction(name).nil?)
       end
 
       # The family's Keyboard key for a name such as space, return or a,
       # on the C128 esc or keypad1, on the Plus/4 help or crsr_up, or on
-      # the PET rvs or kp1, of either of its keyboards. The shifted cursor
-      # keys, such as cursor_up, are the C64's and the C128's.
+      # the PET rvs or kp1, of either of its keyboards, or on the CBM-II
+      # escape, norm_graph or kp00. The shifted cursor keys, such as
+      # cursor_up, are the C64's and the C128's.
       def self.keyboard_key(name, family)
         return nil if name == "none"
 
         key = keyboard_matrix(family).flatten.find { |candidate| candidate.to_s == name }
-        return key unless key.nil? && !%i[plus4 pet].include?(family)
+        return key unless key.nil? && !%i[plus4 pet cbm2 p500].include?(family)
 
         Input::Keyboard::COMBINATIONS.keys.find { |candidate| candidate.to_s == name }
       end
@@ -64,6 +68,7 @@ module Badline
         when :c128 then C128::KEYBOARD_MATRIX
         when :plus4 then Plus4::KeyboardPort::MATRIX
         when :pet then PET::KeyboardPorts::GRAPHICS_MATRIX + PET::KeyboardPorts::BUSINESS_MATRIX
+        when :cbm2, :p500 then CBM2::KeyboardPorts::MATRIX
         else Input::Keyboard::C64_MATRIX
         end
       end
@@ -228,9 +233,13 @@ module Badline
       end
 
       # Whether there's one in to eject. A VIC-20 has no cartridge to take
-      # out yet, and a PET no expansion port.
+      # out yet, a PET no expansion port, and a CBM-II no datasette, and
+      # its cartridge stays in.
       def ejectable?(computer, what)
-        (what != "cartridge" || !%i[vic20 pet].include?(computer.family)) && inserted?(computer, what)
+        family = computer.family
+        return false if family == :cbm2 && what != "disk"
+
+        (what != "cartridge" || !%i[vic20 pet].include?(family)) && inserted?(computer, what)
       end
 
       def inserted?(computer, what)

data/lib/badline/kernal_trap/dos/disk_commands.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Badline
+  module KernalTrap
+    class DOS
+      # N, R and C: the commands that format a disk, rename a file and copy
+      # files. Each takes its names after a colon. A name can't hold a
+      # wildcard, and R and C take their new name before an "=". The DOS
+      # here has one drive, so a file on drive 1 is never found, and C
+      # without a colon, which copies a whole disk between the drives of a
+      # dual drive, and D, which duplicates one, are invalid commands, as on
+      # a single drive.
+      module DiskCommands
+        WILDCARD = /[*?]/
+        OTHER_DRIVE = /\A[1-9]\d*:/
+        DRIVE_ZERO = /\A0+:/
+
+        private
+
+        # N with an ID after a comma formats the disk, and without one only
+        # clears it. The ID is the two bytes after the comma, which takes the
+        # carriage return PRINT# ends the command with when the ID is one
+        # character. A comma with nothing after it gives no ID.
+        def new_disk(text)
+          colon = text.index(":")
+          return report(NO_FILE_GIVEN) unless colon
+
+          command = text.chomp("\r")
+          name, id = command[(colon + 1)..].split(",", 2)
+          return report(SYNTAX_ERROR) if name.to_s.match?(/[*?=]/)
+          return report(WRITE_PROTECT_ON) unless @storage.respond_to?(:format)
+
+          id = id.to_s.empty? ? nil : text.bytes[(command.index(",") + 1), 2]
+          writing { @storage.format(name.to_s, id && (id + [Storage::DiskImage::NAME_PADDING]).first(2)) }
+        end
+
+        # R takes the new name, then the file's.
+        def rename_file(text)
+          new_name, old_names = file_names(text, NO_FILE_GIVEN)
+          return unless new_name
+          return report(SYNTAX_ERROR) unless old_names.one?
+          return report(WRITE_PROTECT_ON) unless @storage.respond_to?(:rename)
+          return report(FILE_NOT_FOUND) if old_names.first.match?(OTHER_DRIVE)
+
+          writing { @storage.rename(Storage.strip_drive_prefix(old_names.first), new_name) }
+        end
+
+        # C takes the new name, then the files it joins, separated by
+        # commas. A first file named with drive 0 that is the new file
+        # itself has the others added to its end.
+        def copy_file(text)
+          new_name, old_names = file_names(text, INVALID_COMMAND)
+          return unless new_name
+          return report(WRITE_PROTECT_ON) unless @storage.respond_to?(:copy)
+          return report(FILE_NOT_FOUND) if old_names.any? { |name| name.match?(OTHER_DRIVE) }
+
+          names = old_names.map { |name| Storage.strip_drive_prefix(name) }
+          in_place = old_names.first.match?(DRIVE_ZERO) && names.first == new_name
+          writing { in_place ? @storage.concat(new_name, names.drop(1)) : @storage.copy(new_name, names) }
+        end
+
+        # The new name and the old ones of "new=old,...", or nil once it
+        # has reported what's wrong.
+        def file_names(text, missing_colon)
+          colon = text.index(":")
+          return report(missing_colon) unless colon
+
+          new_name, rest = text[(colon + 1)..].split("=", 2)
+          new_name = new_name.to_s
+          return report(SYNTAX_ERROR) if rest.nil? || new_name.include?(",")
+
+          old_names = rest.empty? ? [""] : rest.split(",", -1)
+          return report(SYNTAX_ERROR) if [new_name, *old_names].any? { |name| name.match?(WILDCARD) }
+
+          [new_name, old_names]
+        end
+      end
+    end
+  end
+end

data/lib/badline/kernal_trap/dos/status.rb

@@ -15,8 +15,11 @@ module Badline
           28 => "WRITE ERROR",
           29 => "DISK ID MISMATCH",
           30 => "SYNTAX ERROR",
+          31 => "SYNTAX ERROR",
+          34 => "SYNTAX ERROR",
           62 => "FILE NOT FOUND",
           63 => "FILE EXISTS",
+          64 => "FILE TYPE MISMATCH",
           65 => "NO BLOCK",
           66 => "ILLEGAL TRACK OR SECTOR",
           70 => "NO CHANNEL",

data/lib/badline/kernal_trap/dos.rb

@@ -3,6 +3,7 @@
 require "badline/kernal_trap/dos/block_commands"
 require "badline/kernal_trap/dos/channel"
 require "badline/kernal_trap/dos/channels"
+require "badline/kernal_trap/dos/disk_commands"
 require "badline/kernal_trap/dos/memory"
 require "badline/kernal_trap/dos/parameters"
 require "badline/kernal_trap/dos/status"
@@ -15,10 +16,12 @@ module Badline
     # command channel and its status message. `U1` reads a raw block into a
     # buffer channel, which is how block-access loaders bypass the KERNAL's
     # LOAD. A disk image whose host file takes writes takes files, blocks
-    # and BAM changes too. Other disks are write-protected, though storage
-    # that can write files still takes a SAVE handed over whole.
+    # and BAM changes too, and N, R and C format it, rename and copy files.
+    # Other disks are write-protected, though storage that can write files
+    # still takes a SAVE handed over whole.
     class DOS
       include BlockCommands
+      include DiskCommands
       include Writes
 
       COMMAND_CHANNEL = 15
@@ -28,6 +31,8 @@ module Badline
       FILES_SCRATCHED = 1
       WRITE_PROTECT_ON = 26
       SYNTAX_ERROR = 30
+      INVALID_COMMAND = 31
+      NO_FILE_GIVEN = 34
       FILE_NOT_FOUND = 62
       FILE_EXISTS = 63
       NO_BLOCK = 65
@@ -60,11 +65,15 @@ module Badline
         /\AV/i => :initialized,
         /\AB-A\s*:?\s*(.*)/i => :block_allocate,
         /\AB-F\s*:?\s*(.*)/i => :block_free,
-        /\AS[^:]*:(.*)/im => :scratch
+        /\AS[^:]*:(.*)/im => :scratch,
+        /\AN(.*)/im => :new_disk,
+        /\AR(.*)/im => :rename_file,
+        /\AC(.*)/im => :copy_file,
+        /\AD/i => :invalid
       }.freeze
 
       # Commands that take their argument as text rather than numbers.
-      TEXT_COMMANDS = %i[scratch].freeze
+      TEXT_COMMANDS = %i[scratch new_disk rename_file copy_file].freeze
 
       # A drive powers on reporting its DOS version, as a reset does. It
       # can take the RAM of a drive it replaces, and initializes its disk.
@@ -197,7 +206,7 @@ module Badline
         return report(SYNTAX_ERROR) unless action
 
         action = USER_TABLE[(command.getbyte(1) - 1) & 0x0f] if action == :user
-        argument = pattern.match(command)[1]
+        argument = pattern.match(action == :new_disk ? text.lstrip : command)[1]
         run_command(action, TEXT_COMMANDS.include?(action) ? argument : Parameters.parse(argument))
       end
 
@@ -218,6 +227,10 @@ module Badline
         when :block_allocate then block_allocate(arguments)
         when :block_free then block_free(arguments)
         when :scratch then scratch(arguments)
+        when :new_disk then new_disk(arguments)
+        when :rename_file then rename_file(arguments)
+        when :copy_file then copy_file(arguments)
+        when :invalid then report(INVALID_COMMAND)
         when :cold_reset then reset(cold: true)
         when :warm_reset then reset(cold: false)
         when :memory_write then memory_write(arguments)

data/lib/badline/kernal_trap/ieee.rb

@@ -54,7 +54,9 @@ module Badline
         address_device if @listening
       end
 
-      def addressed? = @bus.peek(zero_page.device) == @device
+      # The device TALK or LISTEN addresses: the one in A or in FA, as the
+      # layout says.
+      def addressed? = (@layout.device_in_a ? @cpu.a : @bus.peek(zero_page.device)) == @device
 
       # TALK and LISTEN end with the command sent under ATN, which stays
       # low, and A holding $FF.
@@ -116,7 +118,7 @@ module Badline
       def acptr
         return unless @talking
 
-        @layout.listen_to_talker(@bus)
+        @layout.byte_received(@bus)
         byte, status = received
         time_serial_byte(Routine::ACPTR_TIMEOUT)
         @cpu.a = byte