badline 0.9.0 → 0.10.1

data/lib/badline/frontend/menu_pages.rb

@@ -7,6 +7,8 @@ module Badline
     # row for each thing to do, a setting showing its value on the right,
     # which a press steps on.
     class MenuPages
+      include MenuPorts
+
       TEXT = PauseMenu::TEXT
       DIM = PauseMenu::DIM
       LINE = 12
@@ -16,10 +18,11 @@ module Badline
       WARNING = 0xff7a6b
       RECENT = %i[recent0 recent1 recent2 recent3 recent4 recent5 recent6 recent7].freeze
 
-      PORT_DEVICES = %i[joystick mouse paddles].freeze
-      PORT_NAMES = %w[JOY MOUSE PADDLES].freeze
-      PORT_ACTIONS = [%i[port1_joystick port1_mouse port1_paddles], %i[port2_joystick port2_mouse port2_paddles]].freeze
-      POTS = [%i[none mouse1 paddles1], %i[none mouse2 paddles2]].freeze
+      SID_MODELS = %i[mos6581 mos8580].freeze
+      RAM_NAMES = {
+        unexpanded: "", "3k": "3K", "8k": "8K", "16k": "16K", "24k": "24K", "32k": "32K",
+        all: "35K, ALL BLOCKS"
+      }.freeze
 
       # The disks, tapes and cartridges the pages put in and take out.
       attr_reader :media
@@ -75,7 +78,7 @@ module Badline
         when :keys_c64, :keys_joystick then keys(action == :keys_c64 ? :keyboard : :joystick)
         when :swap then @controls.swap_ports
         when :sound_on, :mute then @sound.toggle_mute unless @sound.muted? == (action == :mute)
-        when :sid6581, :sid8580 then @computer.sid.model = action == :sid8580 ? :mos8580 : :mos6581
+        when :sid6581, :sid8580 then @computer.sound_source.model = action == :sid8580 ? :mos8580 : :mos6581
         when :reset then @computer.reset!
         when :power_cycle then @computer.power_cycle!
         else pick_port(action)
@@ -84,6 +87,14 @@ module Badline
 
       private
 
+      def vic20? = @computer.family == :vic20
+
+      # Says in the dim colour that the VIC-20 hasn't got what the page
+      # shows.
+      def note
+        @painter.text(@left, @top, "NOT ON THE VIC-20 YET", DIM)
+      end
+
       def draw_drive
         media = @media
         inserted = media.inserted?
@@ -114,6 +125,8 @@ module Badline
       end
 
       def draw_expansion
+        return info("RAM EXPANSION", RAM_NAMES.fetch(@computer.ram_configuration)) if vic20?
+
         cartridge = @computer.address_bus.cartridge
         info("CARTRIDGE", cartridge.nil? ? "" : cartridge.name)
         row("INSERT...", :insert_cartridge)
@@ -125,27 +138,17 @@ module Badline
         info("RAM EXPANSION", "REU, #{@reu_kb} KB")
       end
 
-      def draw_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))])
-        joystick = @controls.joystick_mode?
-        toggle("KEYS", :keys, [%w[C64 JOYSTICK], %i[keys_c64 keys_joystick], joystick ? 1 : 0])
-        return unless joystick
-
-        row("SWAP JOYSTICKS", :swap)
-        skip
-        arrows = @controls.arrows_port
-        info("ARROWS, SPACE", "PORT #{arrows}")
-        info("WASD, LEFT SHIFT", "PORT #{3 - arrows}")
-      end
-
+      # The SID's model is a setting, and other sound chips have none.
       def draw_sound
         if @sound.on?
           toggle("OUTPUT", :output, [%w[ON MUTED], %i[sound_on mute], @sound.muted? ? 1 : 0])
         else
           info("OUTPUT", "OFF")
         end
-        toggle("SID", :sid, [%w[6581 8580], %i[sid6581 sid8580], @computer.sid.model == :mos8580 ? 1 : 0])
+        model = @computer.sound_source.model
+        return unless SID_MODELS.include?(model)
+
+        toggle("SID", :sid, [%w[6581 8580], %i[sid6581 sid8580], model == :mos8580 ? 1 : 0])
       end
 
       # Saving now and by name, loading a named save, and the quicksaves
@@ -195,26 +198,6 @@ module Badline
       def skip
         @top += LINE
       end
-
-      def keys(mode) = @controls.joystick_mode = mode == :joystick
-
-      def port_device(port)
-        index = POTS[port - 1].index(@controls.pot)
-        index.nil? ? :joystick : PORT_DEVICES[index]
-      end
-
-      # Plugs the device a choice such as :port1_mouse names into its port.
-      def pick_port(action)
-        index = PORT_ACTIONS[0].include?(action) ? 0 : 1
-        choice = PORT_ACTIONS[index].index(action)
-        plug_device(index + 1, choice) unless choice.nil? || choice == PORT_DEVICES.index(port_device(index + 1))
-      end
-
-      # Plugs PORT_DEVICES[choice] into the port. A joystick there takes out
-      # the pot device.
-      def plug_device(port, choice)
-        @controls.plug(POTS[port - 1][choice])
-      end
     end
   end
 end

data/lib/badline/frontend/menu_ports.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Badline
+  module Frontend
+    # The pause menu's PORTS page, which MenuPages draws: what each C64
+    # 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.
+    module MenuPorts
+      PORT_DEVICES = %i[joystick mouse paddles].freeze
+      PORT_NAMES = %w[JOY MOUSE PADDLES].freeze
+      PORT_ACTIONS = [%i[port1_joystick port1_mouse port1_paddles], %i[port2_joystick port2_mouse port2_paddles]].freeze
+      POTS = [%i[none mouse1 paddles1], %i[none mouse2 paddles2]].freeze
+
+      private
+
+      def draw_ports
+        return draw_vic20_port if @computer.family == :vic20
+
+        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))])
+        return unless draw_keys("C64")
+
+        row("SWAP JOYSTICKS", :swap)
+        skip
+        arrows = @controls.arrows_port
+        info("ARROWS, SPACE", "PORT #{arrows}")
+        info("WASD, LEFT SHIFT", "PORT #{3 - arrows}")
+      end
+
+      # The VIC-20's one joystick, which both sets of keys drive.
+      def draw_vic20_port
+        return unless draw_keys("VIC-20")
+
+        skip
+        info("ARROWS, SPACE", "JOYSTICK")
+        info("WASD, LEFT SHIFT", "JOYSTICK")
+      end
+
+      # The toggle between the keyboard named and the joysticks, and
+      # whether the keys drive the joysticks.
+      def draw_keys(keyboard)
+        joystick = @controls.joystick_mode?
+        toggle("KEYS", :keys, [[keyboard, "JOYSTICK"], %i[keys_c64 keys_joystick], joystick ? 1 : 0])
+        joystick
+      end
+
+      def keys(mode) = @controls.joystick_mode = mode == :joystick
+
+      def port_device(port)
+        index = POTS[port - 1].index(@controls.pot)
+        index.nil? ? :joystick : PORT_DEVICES[index]
+      end
+
+      # Plugs the device a choice such as :port1_mouse names into its port.
+      def pick_port(action)
+        index = PORT_ACTIONS[0].include?(action) ? 0 : 1
+        choice = PORT_ACTIONS[index].index(action)
+        plug_device(index + 1, choice) unless choice.nil? || choice == PORT_DEVICES.index(port_device(index + 1))
+      end
+
+      # Plugs PORT_DEVICES[choice] into the port. A joystick there takes out
+      # the pot device.
+      def plug_device(port, choice)
+        @controls.plug(POTS[port - 1][choice])
+      end
+    end
+  end
+end

data/lib/badline/frontend/pacer.rb

@@ -13,7 +13,8 @@ module Badline
     # SAFETY, so no samples are dropped. #measure fits the frames to the
     # rate the display presents at, measured over the whole run.
     #
-    # Without vsync, a frame is one of the machine's frames, 20 ms on PAL.
+    # Without vsync, a frame is one of the machine's frames, as its Timing
+    # gives them, 20 ms on PAL.
     # With the sound playing, #wait lasts until the audio queue is down to
     # Sound::AHEAD; otherwise it waits out the rest of the frame.
     class Pacer
@@ -23,12 +24,12 @@ module Badline
 
       attr_reader :rate
 
-      def initialize(paced:, vsync:, verbose:, region: Region::PAL)
+      def initialize(paced:, vsync:, verbose:, timing:)
         @paced = paced
         @verbose = verbose
         @vsync = paced && vsync
-        @region = region
-        @rate = FrameRate.machine(region)
+        @timing = timing
+        @rate = FrameRate.machine(timing)
         @deadline = 0.0
         @measured_frames = 0
         @measured_seconds = 0.0
@@ -39,7 +40,7 @@ module Badline
       # Fits the frames to the display's refresh rate, once the window has
       # been opened with vsync.
       def fit(refresh)
-        @rate = FrameRate.display(refresh, @region.clock_hz)
+        @rate = FrameRate.display(refresh, @timing.clock_hz)
         puts "Display #{@rate.refresh} Hz, vsync: #{@rate.base_cycles} cycles a frame" if @verbose
       end
 

data/lib/badline/frontend/pause_menu.rb

@@ -16,7 +16,6 @@ module Badline
     class PauseMenu
       SECTIONS = ["SNAPSHOTS", "DRIVE 8", "DATASETTE", "EXPANSION PORT", "PORTS", "SOUND", "POWER"].freeze
       PAGES = %i[snapshots drive datasette expansion ports sound power].freeze
-      DISKS = %w[.d64 .d71 .d81 .g64 .t64].freeze
 
       PANEL = 0x1d2230
       EDGE = 0x3a4256
@@ -25,11 +24,10 @@ module Badline
       DIM = 0x6b7489
       FILL = 0x343c50
 
-      LEFT = 16
-      TOP = 16
-      WIDTH = Screen::WIDTH - 32
-      HEIGHT = Screen::HEIGHT - 32
-      BODY = 154
+      MARGIN = 16
+      WIDTH = 352
+      HEIGHT = 240
+      BODY = 138
 
       ESCAPE = 41
       RETURN = 40
@@ -48,20 +46,15 @@ module Badline
         @dialogs = MenuDialogs.new(painter, @buttons, @pages.media, options, snapshots)
         @open = false
         @section = 0
-      end
-
-      # The path of the disk the command line puts in device 8, a list's
-      # first, or an empty one for other media.
-      def self.disk_path(path)
-        return "" if path.empty?
-        return path if File.directory?(path)
-        return Media::DiskList.disks(path).first.to_s if Media::DiskList.list?(path)
-
-        DISKS.include?(File.extname(path).downcase) ? path : ""
+        @left = MARGIN
+        @top = MARGIN
       end
 
       def open? = @open
 
+      # The index in PAGES of the page #show opens on.
+      attr_writer :section
+
       # The machine Quick open started, which the app runs in place of the
       # one before once #frame returns :swap.
       def computer = @dialogs.computer
@@ -116,10 +109,10 @@ module Badline
       end
 
       # Handles the events that came in, draws the menu over the frozen
-      # picture, dimmed, and returns the action the app has to take on, if
-      # any, leaving the events after one for the machine. Key releases
-      # still reach the machine, so no key stays held down while it stands
-      # still.
+      # picture, dimmed, for the app to present, and returns the action the
+      # app has to take on, if any, leaving the events after one for the
+      # machine. Key releases still reach the machine, so no key stays held
+      # down while it stands still.
       def frame(renderer, texture, controls)
         action = nil
         action = event(SDL.event_type(SDL.event), controls) while action.nil? && SDL.SDL_PollEvent(SDL.event) != 0
@@ -129,26 +122,30 @@ module Badline
         SDL.SDL_SetTextureColorMod(texture, 255, 255, 255)
         draw
         SDL.SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255)
-        SDL.SDL_RenderPresent(renderer)
-        SDL.SDL_Delay(10)
         action
       end
 
+      # Centres the menu on a screen `width` by `height`.
+      def center(width, height)
+        @left = (width - WIDTH) / 2
+        @top = (height - HEIGHT) / 2
+      end
+
       def draw
         painter = @painter
         @buttons.forget
-        painter.box(LEFT, TOP, WIDTH, HEIGHT, PANEL)
-        painter.box(LEFT, TOP + 24, WIDTH, 1, EDGE)
-        painter.text(LEFT + 8, TOP + 9, "PAUSED", BRIGHT)
+        painter.box(@left, @top, WIDTH, HEIGHT, PANEL)
+        painter.box(@left, @top + 24, WIDTH, 1, EDGE)
+        painter.text(@left + 8, @top + 9, "PAUSED", BRIGHT)
         resume = "RESUME"
-        @buttons.plain(LEFT + WIDTH - 8 - Painter.width(resume) - (Buttons::PAD * 2), TOP + 7, resume, :resume)
-        return @dialogs.draw(LEFT + 8, TOP + 34, WIDTH - 16) if @dialogs.open?
+        @buttons.plain(@left + WIDTH - 8 - Painter.width(resume) - (Buttons::PAD * 2), @top + 7, resume, :resume)
+        return @dialogs.draw(@left + 8, @top + 34, WIDTH - 16) if @dialogs.open?
 
-        painter.box(BODY - 8, TOP + 32, 1, HEIGHT - 56, EDGE)
+        painter.box(@left + BODY - 8, @top + 32, 1, HEIGHT - 56, EDGE)
         draw_sections
-        @buttons.plain(LEFT + 6, TOP + HEIGHT - 28, "QUICK OPEN...", :quick_open)
-        painter.text(LEFT + 8, TOP + HEIGHT - 12, "F9/ESC: RESUME", DIM)
-        @pages.draw(PAGES[@section], BODY, TOP + 34)
+        @buttons.plain(@left + 6, @top + HEIGHT - 28, "QUICK OPEN...", :quick_open)
+        painter.text(@left + 8, @top + HEIGHT - 12, "F9/ESC: RESUME", DIM)
+        @pages.draw(PAGES[@section], @left + BODY, @top + 34)
       end
 
       private
@@ -253,9 +250,9 @@ module Badline
       end
 
       def draw_sections
-        top = TOP + 32
+        top = @top + 32
         SECTIONS.each_with_index do |name, index|
-          @buttons.plain(LEFT + 6, top, name.ljust(14), PAGES[index], on: index == @section)
+          @buttons.plain(@left + 6, top, name.ljust(14), PAGES[index], on: index == @section)
           top += Buttons::HEIGHT + 2
         end
       end

data/lib/badline/frontend/player_screen.rb

@@ -10,7 +10,7 @@ module Badline
       HEADER = 64
       SCALE = 2
       TITLE = "Badline"
-      BACKGROUND = Screen::COLORS[6]
+      BACKGROUND = VIC::PALETTE[6]
 
       attr_reader :buttons, :info
 

data/lib/badline/frontend/player_window.rb

@@ -23,7 +23,7 @@ module Badline
       UP = 82
       DOWN = 81
 
-      WARNING = Screen::COLORS[10]
+      WARNING = VIC::PALETTE[10]
 
       CHIPS = PlayerHeader::CHIPS
 

data/lib/badline/frontend/screen.rb

@@ -2,60 +2,62 @@
 
 module Badline
   module Frontend
-    # The visible part of the VIC's display, the crop of the machine's
-    # region, repacked for an SDL texture in XRGB8888. Spinel hands an
-    # Array of Integers to C as 64-bit words, as badline/ffi does on CRuby,
-    # so each word carries two neighbouring pixels, the left one in the low
-    # half. The texture is PAL's crop, 384x272, and a region with fewer
-    # lines to show sits in the middle of it, between black bands.
+    # The visible part of the video chip's display, the crop of the
+    # machine's timing, repacked for an SDL texture in XRGB8888 in the
+    # chip's palette. Spinel hands an Array of Integers to C as 64-bit
+    # words, as badline/ffi does on CRuby, so each word carries two
+    # neighbouring pixels, the left one in the low half.
+    #
+    # The texture is as wide as the crop and at least as high as PAL's
+    # C64 crop, 272 lines, so a C64 shows in the same window whatever its
+    # region: a crop with fewer lines sits in the middle of the texture,
+    # between black bands. The VIC-20's 284 by 284 crop fills its own.
     class Screen
-      WIDTH = Region::PAL.crop[2]
-      HEIGHT = Region::PAL.crop[3]
-      ROW_BYTES = WIDTH * 4
-      ROW_WORDS = WIDTH / 2
+      MIN_HEIGHT = Region::PAL.crop[3]
 
-      COLORS = [
-        0x000000, 0xffffff, 0x924a40, 0x84c5cc,
-        0x9351b6, 0x72b14b, 0x483aaa, 0xd5df7c,
-        0x675200, 0xc33d00, 0xc18178, 0x606060,
-        0x8a8a8a, 0xb3ec91, 0x867ade, 0xb3b3b3
-      ].freeze
+      attr_reader :pixels, :width, :height
 
-      PAIRS = Array.new(256) { |pair| COLORS[pair & 0x0f] | (COLORS[pair >> 4] << 32) }.freeze
-
-      attr_reader :pixels
-
-      def initialize(vic)
-        @vic = vic
-        crop = vic.region.crop
+      def initialize(video, crop)
+        @video = video
         @col_offset = crop[0]
         @row_offset = crop[1]
-        @height = crop[3]
-        @band = (HEIGHT - @height) / 2
-        @pixels = Array.new(HEIGHT * ROW_WORDS, 0)
+        @lines = crop[3]
+        @width = crop[2]
+        @stride = video.width.to_i
+        @height = [@lines, MIN_HEIGHT].max
+        @row_words = @width / 2
+        @band = (@height - @lines) / 2
+        palette = video.palette
+        @pairs = Array.new(256) { |pair| palette[pair & 0x0f] | (palette[pair >> 4] << 32) }
+        @pixels = Array.new(@height * @row_words, 0)
       end
 
-      # Repacks only the lines the VIC has changed since the last frame.
+      # The bytes of one row of the texture.
+      def row_bytes = @width * 4
+
+      # Repacks only the lines the chip has changed since the last frame.
       def update
-        dirty = @vic.dirty_lines
+        video = @video
+        dirty = video.dirty_lines
+        display = video.display
         row = 0
-        while row < @height
-          pack_row(row) if dirty[row + @row_offset]
+        while row < @lines
+          pack_row(display, row) if dirty[row + @row_offset]
           row += 1
         end
-        @vic.clear_dirty_lines!
+        video.clear_dirty_lines!
       end
 
       private
 
-      def pack_row(row)
-        display = @vic.display
+      def pack_row(display, row)
         pixels = @pixels
-        from = ((row + @row_offset) * @vic.width) + @col_offset
-        to = (row + @band) * ROW_WORDS
-        last = to + ROW_WORDS
+        pairs = @pairs
+        from = ((row + @row_offset) * @stride) + @col_offset
+        to = (row + @band) * @row_words
+        last = to + @row_words
         while to < last
-          pixels[to] = PAIRS[(display[from] & 0x0f) | ((display[from + 1] & 0x0f) << 4)]
+          pixels[to] = pairs[(display[from] & 0x0f) | ((display[from + 1] & 0x0f) << 4)]
           from += 2
           to += 1
         end

data/lib/badline/frontend/sid_view.rb

@@ -8,7 +8,7 @@ module Badline
     # a tune on more than one gets a row of buttons above the voices that
     # pick it, which makes the view PICKER taller.
     class SIDView
-      COLORS = Screen::COLORS
+      COLORS = VIC::PALETTE
       TEXT = COLORS[14]
       BRIGHT = COLORS[1]
       DIM = COLORS[11]

data/lib/badline/frontend/sound.rb

@@ -2,7 +2,9 @@
 
 module Badline
   module Frontend
-    # The SID's output on SDL's audio queue, as mono signed 16-bit samples.
+    # The machine's sound source, the C64's SID or the VIC-20's VIC, on
+    # SDL's audio queue, as mono signed 16-bit samples. Both take
+    # #record(rate:, clock_hz:) and #drain_samples.
     # Once the device plays, it is the clock: #wait holds each frame until
     # the queue is down to `AHEAD`, so the machine runs at the device's pace.
     #
@@ -13,7 +15,7 @@ module Badline
     # only happens unpaced.
     #
     # Each frame's samples go to SDL through an IO::Buffer of 16-bit values.
-    # The SID's cycles are converted at `clock_hz`, the machine's clock, so
+    # The chip's cycles are converted at `clock_hz`, the machine's clock, so
     # an NTSC or Drean machine plays at its own pitch.
     class Sound
       RATE = 44_100
@@ -22,8 +24,8 @@ module Badline
 
       attr_reader :rate, :underruns, :dropped, :queued, :low, :high
 
-      def initialize(sid, clock_hz, wanted, verbose)
-        @sid = sid
+      def initialize(source, clock_hz, wanted, verbose)
+        @source = source
         @clock_hz = clock_hz
         @verbose = verbose
         @device = 0
@@ -40,9 +42,9 @@ module Badline
 
       def on? = @device != 0
 
-      # Plays another machine's SID from here on, at that machine's clock.
-      def switch(sid, clock_hz)
-        @sid = sid
+      # Plays another machine's sound from here on, at that machine's clock.
+      def switch(source, clock_hz)
+        @source = source
         @clock_hz = clock_hz
         record if on?
       end
@@ -54,7 +56,7 @@ module Badline
       def feed
         return unless on?
 
-        samples = @sid.drain_samples
+        samples = @source.drain_samples
         return if @muted || samples.empty?
 
         level = queued_seconds
@@ -110,7 +112,7 @@ module Badline
         puts "Sound at #{@rate} Hz" if @verbose
       end
 
-      def record = @sid.record(rate: @rate, clock_hz: @clock_hz)
+      def record = @source.record(rate: @rate, clock_hz: @clock_hz)
 
       def queued_seconds = SDL.SDL_GetQueuedAudioSize(@device) / (2.0 * @rate)
 

data/lib/badline/frontend/timeline.rb

@@ -21,13 +21,20 @@ module Badline
         @failed = false
       end
 
-      # What's wrong with the events, the first key that names nothing,
-      # or an empty string.
+      # What's wrong with the events, the first key or menu page that
+      # names nothing, or an empty string.
       def self.error(events)
         event = events.find { |candidate| candidate.action == "key" && !key?(candidate.argument) }
-        event.nil? ? "" : "no such key: #{event.argument}"
+        return "no such key: #{event.argument}" unless event.nil?
+
+        event = events.find { |candidate| candidate.action == "menu" && !page?(candidate.argument) }
+        event.nil? ? "" : "no such menu page: #{event.argument}"
       end
 
+      # Whether the pause menu has a page of the name, such as drive or
+      # sound. An empty one is its first.
+      def self.page?(name) = name.empty? || PauseMenu::PAGES.any? { |page| page.to_s == name }
+
       def self.key?(name) = name == "restore" || !keyboard_key(name).nil? || !joystick_direction(name).nil?
 
       # The Keyboard's key for a name such as space, return or a.
@@ -67,6 +74,22 @@ module Badline
       # events do.
       def press_freeze(computer, frame) = freeze(computer, Options::Event.new(frame, "freeze", ""))
 
+      # Whether the pause menu opens at the frame, or turns to another page.
+      def menu?(frame) = @events.any? { |event| event.frame == frame && event.action == "menu" }
+
+      # The index in PauseMenu::PAGES of the page the frame's menu event
+      # names, 0 for the first.
+      def menu_section(frame)
+        page = ""
+        @events.each { |event| page = event.argument if event.frame == frame && event.action == "menu" }
+        section = 0
+        PauseMenu::PAGES.each_with_index { |name, index| section = index if name.to_s == page }
+        section
+      end
+
+      # Whether the pause menu closes at the frame.
+      def resume?(frame) = @events.any? { |event| event.frame == frame && event.action == "resume" }
+
       # Whether the run ends at the frame: at a quit, or once an event failed.
       def quit?(frame) = @failed || @events.any? { |event| event.frame == frame && event.action == "quit" }
 
@@ -98,7 +121,7 @@ module Badline
         name = event.argument
         if name == "restore"
           computer.press_restore
-          return
+          return hold(event)
         end
 
         direction = Timeline.joystick_direction(name)
@@ -110,7 +133,10 @@ module Badline
         hold(event)
       end
 
+      # The VIC-20 has no cartridge with a button yet.
       def freeze(computer, event)
+        return if computer.family == :vic20
+
         computer.press_cartridge_button
         hold(event)
       end
@@ -123,6 +149,8 @@ module Badline
         return computer.release_cartridge_button if event.action == "freeze"
 
         name = event.argument
+        return computer.release_restore if name == "restore"
+
         direction = Timeline.joystick_direction(name)
         if direction.nil?
           computer.keyboard.release(Timeline.keyboard_key(name))
@@ -141,7 +169,7 @@ module Badline
       end
 
       def eject(computer, what)
-        return puts "No #{what} to eject" unless inserted?(computer, what)
+        return puts "No #{what} to eject" unless ejectable?(computer, what)
 
         if what == "disk"
           eject_disk(computer)
@@ -154,6 +182,9 @@ module Badline
         puts "Ejected the #{what}"
       end
 
+      # Whether there's one in to eject. A VIC-20 has no cartridge to take out yet.
+      def ejectable?(computer, what) = (computer.family == :c64 || what != "cartridge") && inserted?(computer, what)
+
       def inserted?(computer, what)
         return !computer.datasette.tape.nil? if what == "tape"
         return !computer.address_bus.cartridge.nil? if what == "cartridge"

data/lib/badline/frontend.rb

@@ -15,6 +15,7 @@ require "badline/frontend/frame_report"
 require "badline/frontend/controls"
 require "badline/frontend/pad_port"
 require "badline/frontend/gamepads"
+require "badline/frontend/machine_window"
 require "badline/frontend/app"
 require "badline/frontend/audio_sink"
 require "badline/frontend/painter"
@@ -37,4 +38,5 @@ require "badline/frontend/confirmation"
 require "badline/frontend/name_field"
 require "badline/frontend/menu_dialogs"
 require "badline/frontend/menu_media"
+require "badline/frontend/menu_ports"
 require "badline/frontend/menu_pages"