badline 0.11.1 → 0.12.0

data/lib/badline/frontend/keys.rb

@@ -6,7 +6,27 @@ module Badline
     # keys, the C128's own keys and, in joystick mode, the joystick
     # directions.
     module Keys
+      RETURN = 40
+      ESCAPE = 41
+      BACKSPACE = 42
       TAB = 43
+      SPACE = 44
+      F8 = 65
+      F9 = 66
+      F10 = 67
+      F11 = 68
+      F12 = 69
+      HOME = 74
+      PAGE_UP = 75
+      END_KEY = 77
+      PAGE_DOWN = 78
+      RIGHT = 79
+      LEFT = 80
+      DOWN = 81
+      UP = 82
+
+      # The arrow keys, which move through the menus.
+      DIRECTIONS = { RIGHT => :right, LEFT => :left, DOWN => :down, UP => :up }.freeze
 
       LETTERS = %i[a b c d e f g h i j k l m n o p q r s t u v w x y z].freeze
       DIGITS = %i[1 2 3 4 5 6 7 8 9 0].freeze
@@ -36,14 +56,6 @@ module Badline
         63 => :forty_eighty, 72 => :forty_eighty, 78 => :run_stop
       }.freeze
 
-      ESCAPE = 41
-
-      F8 = 65
-      F9 = 66
-      F10 = 67
-      F11 = 68
-      F12 = 69
-
       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
 
@@ -65,6 +77,19 @@ module Badline
         C128_OTHERS[scancode] || c64_key(scancode)
       end
 
+      # 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)
+        if scancode.between?(4, 29)
+          letter = (97 + scancode - 4).chr
+          shift ? letter.upcase : letter
+        elsif scancode.between?(30, 39)
+          "1234567890"[scancode - 30]
+        else
+          ""
+        end
+      end
+
       def self.arrows(scancode) = ARROWS[scancode] || :none
 
       def self.wasd(scancode) = WASD[scancode] || :none

data/lib/badline/frontend/media_slots.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Badline
+  module Frontend
+    # The machine's media slots as the pause menu and the --at events
+    # both take media out of them: device 8, a true drive there or else
+    # the KERNAL traps, and the expansion port.
+    module MediaSlots
+      class << self
+        # Whether device 8 has a disk in.
+        def disk?(computer)
+          drive = Media::TrueDrive.drive(computer)
+          drive.nil? ? computer.mounted? : !drive.disk.nil?
+        end
+
+        # The expanded path of the disk in device 8, however it went in, or
+        # an empty one.
+        def disk_path(computer)
+          drive = Media::TrueDrive.drive(computer)
+          unless drive.nil?
+            disk = drive.disk
+            return disk.nil? ? "" : disk.path.to_s
+          end
+
+          path = computer.mounted_path
+          path.empty? ? path : File.expand_path(path)
+        end
+
+        def eject_disk(computer)
+          drive = Media::TrueDrive.drive(computer)
+          drive.nil? ? computer.unmount : drive.insert(nil)
+        end
+
+        # Takes the cartridge out with the power off.
+        def remove_cartridge(computer)
+          computer.address_bus.detach_cartridge
+          computer.power_cycle!
+        end
+      end
+    end
+  end
+end

data/lib/badline/frontend/{confirmation.rb → menu/confirmation.rb}

@@ -43,11 +43,11 @@ module Badline
 
       def draw(left, top)
         painter = @painter
-        painter.text(left, top, TITLES.fetch(@kind), PauseMenu::BRIGHT)
-        painter.text(left, top + 20, Painter.fit(File.basename(@path), 40), PauseMenu::TEXT) unless @path.empty?
+        painter.text(left, top, TITLES.fetch(@kind), MenuTheme::BRIGHT)
+        painter.text(left, top + 20, Painter.fit(File.basename(@path), 40), MenuTheme::TEXT) unless @path.empty?
         warning = WARNINGS.fetch(@kind)
-        painter.text(left, top + 44, warning[0], PauseMenu::TEXT)
-        painter.text(left, top + 56, warning[1], PauseMenu::TEXT) unless warning[1].empty?
+        painter.text(left, top + 44, warning[0], MenuTheme::TEXT)
+        painter.text(left, top + 56, warning[1], MenuTheme::TEXT) unless warning[1].empty?
         @buttons.row([left, top + 80, MenuPages::ROW_WIDTH], "CANCEL", :cancel)
         @buttons.row([left, top + 80 + Buttons::HEIGHT + 2, MenuPages::ROW_WIDTH], ANSWERS.fetch(@kind), :confirm)
       end

data/lib/badline/frontend/{file_browser.rb → menu/file_browser.rb}

@@ -12,19 +12,6 @@ module Badline
       ROWS = 12
       COLUMNS = 40
 
-      RETURN = 40
-      ESCAPE = 41
-      BACKSPACE = 42
-      HOME = 74
-      PAGE_UP = 75
-      END_KEY = 77
-      PAGE_DOWN = 78
-      RIGHT = 79
-      LEFT = 80
-      DOWN = 81
-      UP = 82
-      DIGITS = "1234567890"
-
       attr_reader :directory
 
       def initialize(painter, buttons)
@@ -60,9 +47,9 @@ module Badline
       # Handles a key, and returns the path of a file picked, :cancel when
       # Esc leaves the browser, or nil.
       def key(scancode)
-        return :cancel if scancode == ESCAPE
-        return pick if [RETURN, RIGHT].include?(scancode)
-        return up if [LEFT, BACKSPACE].include?(scancode)
+        return :cancel if scancode == Keys::ESCAPE
+        return pick if [Keys::RETURN, Keys::RIGHT].include?(scancode)
+        return up if [Keys::LEFT, Keys::BACKSPACE].include?(scancode)
 
         select(@selected + step(scancode)) unless step(scancode).zero?
         jump(scancode)
@@ -83,14 +70,14 @@ module Badline
       end
 
       def draw(left, top, width, title)
-        @painter.text(left, top, title, PauseMenu::BRIGHT)
-        @painter.text(left, top + ROW + 2, shown_directory, PauseMenu::DIM)
+        @painter.text(left, top, title, MenuTheme::BRIGHT)
+        @painter.text(left, top + ROW + 2, shown_directory, MenuTheme::DIM)
         @list_top = top + (ROW * 2) + 8
         @buttons.area([left, @list_top, width, ROW * ROWS], :browse)
         draw_rows(left, width)
         draw_bar(left + width - 2) if @names.size > ROWS
         @painter.text(left, @list_top + (ROW * ROWS) + 6, "RETURN: OPEN  LEFT: BACK  ESC: CANCEL",
-                      PauseMenu::DIM)
+                      MenuTheme::DIM)
       end
 
       private
@@ -109,10 +96,10 @@ module Badline
           name = label(index)
           top = @list_top + (row * ROW)
           if index == @selected
-            @painter.box(left - 2, top - 2, width - 4, ROW, PauseMenu::TEXT)
-            @painter.text(left, top, name, PauseMenu::PANEL)
+            @painter.box(left - 2, top - 2, width - 4, ROW, MenuTheme::TEXT)
+            @painter.text(left, top, name, MenuTheme::PANEL)
           else
-            @painter.text(left, top, name, index < @folders ? PauseMenu::BRIGHT : PauseMenu::TEXT)
+            @painter.text(left, top, name, index < @folders ? MenuTheme::BRIGHT : MenuTheme::TEXT)
           end
         end
       end
@@ -121,8 +108,8 @@ module Badline
         height = ROW * ROWS
         size = [(height * ROWS) / @names.size, 4].max
         offset = ((height - size) * @top) / [@names.size - ROWS, 1].max
-        @painter.box(left, @list_top - 2, 2, height, PauseMenu::EDGE)
-        @painter.box(left, @list_top - 2 + offset, 2, size, PauseMenu::TEXT)
+        @painter.box(left, @list_top - 2, 2, height, MenuTheme::EDGE)
+        @painter.box(left, @list_top - 2 + offset, 2, size, MenuTheme::TEXT)
       end
 
       def label(index)
@@ -133,12 +120,12 @@ module Badline
 
       def step(scancode)
         case scancode
-        when UP then -1
-        when DOWN then 1
-        when PAGE_UP then -ROWS
-        when PAGE_DOWN then ROWS
-        when HOME then -@names.size
-        when END_KEY then @names.size
+        when Keys::UP then -1
+        when Keys::DOWN then 1
+        when Keys::PAGE_UP then -ROWS
+        when Keys::PAGE_DOWN then ROWS
+        when Keys::HOME then -@names.size
+        when Keys::END_KEY then @names.size
         else 0
         end
       end
@@ -154,10 +141,7 @@ module Badline
       # Selects the next name after the one selected that starts with the
       # key's letter or digit.
       def jump(scancode)
-        char = if scancode.between?(4, 29) then (97 + scancode - 4).chr
-               elsif scancode.between?(30, 39) then DIGITS[scancode - 30]
-               else ""
-               end
+        char = Keys.character(scancode, false)
         return if char.empty? || @names.empty?
 
         @names.size.times do |offset|

data/lib/badline/frontend/{menu_dialogs.rb → menu/menu_dialogs.rb}

@@ -14,10 +14,6 @@ module Badline
       TITLES = { disk: "INSERT A DISK", tape: "INSERT A TAPE", cartridge: "INSERT A CARTRIDGE",
                  program: "QUICK OPEN", snapshot: "LOAD A SAVE" }.freeze
 
-      ESCAPE = 41
-      RETURN = 40
-      SPACE = 44
-
       # The machine Quick open started or a save loaded.
       attr_reader :computer
 
@@ -78,10 +74,10 @@ module Badline
         if @name_field.open? && !@confirmation.open?
           return named(@name_field.key(scancode, SDL.event_mod(SDL.event).anybits?(SDL::KMOD_SHIFT)))
         end
-        return answer(:cancel) if scancode == ESCAPE
-        return answer(@buttons.focus) if [RETURN, SPACE].include?(scancode)
+        return answer(:cancel) if scancode == Keys::ESCAPE
+        return answer(@buttons.focus) if [Keys::RETURN, Keys::SPACE].include?(scancode)
 
-        direction = PauseMenu::ARROWS[scancode]
+        direction = Keys::DIRECTIONS[scancode]
         @buttons.shift(direction == :up ? -1 : 1, 1) if %i[up down].include?(direction)
         nil
       end

data/lib/badline/frontend/{menu_media.rb → menu/menu_media.rb}

@@ -25,40 +25,22 @@ module Badline
 
       def writable? = @writable
 
-      # The expanded path of the disk in device 8, however it went in, or
-      # an empty one.
-      def disk_path
-        drive = @computer.true_drive
-        unless drive.nil?
-          disk = drive.disk
-          return disk.nil? ? "" : disk.path.to_s
-        end
-
-        path = @computer.mounted_path
-        path.empty? ? path : File.expand_path(path)
-      end
+      def disk_path = MediaSlots.disk_path(@computer)
 
-      def inserted?
-        drive = @computer.true_drive
-        drive.nil? ? @computer.mounted? : !drive.disk.nil?
-      end
+      def inserted? = MediaSlots.disk?(@computer)
 
       # Puts a disk in device 8 or a tape in the datasette, `kind` :disk or
       # :tape, and says whether it went in. A list puts its first disk in.
       def insert(kind, path)
-        @problem = ""
-        if kind == :disk
-          disk = Media::DiskList.disk(path)
-          Media.insert_disk(@computer, disk, read_only: !@writable)
-          list(path)
-        else
-          @computer.datasette.insert(Storage::TAP.new(path))
+        succeeds? do
+          if kind == :disk
+            disk = Media::DiskList.disk(path)
+            Media.insert_disk(@computer, disk, read_only: !@writable)
+            list(path)
+          else
+            @computer.datasette.insert(Storage::TAP.new(path))
+          end
         end
-        true
-      rescue ArgumentError, SystemCallError, Storage::TAP::FormatError, Storage::T64::FormatError,
-             Storage::G64Image::FormatError => e
-        @problem = e.message
-        false
       end
 
       # Does what the Drive page's :eject_disk, :previous_disk, :next_disk,
@@ -72,10 +54,7 @@ module Badline
         end
       end
 
-      def eject_disk
-        drive = @computer.true_drive
-        drive.nil? ? @computer.unmount : drive.insert(nil)
-      end
+      def eject_disk = MediaSlots.eject_disk(@computer)
 
       # Sets whether disks are writable, for the disk in the drive too,
       # which goes in again as the notch now says.
@@ -111,12 +90,7 @@ module Badline
       # Swaps the cartridge for the one at `path`, which power cycles the
       # machine, and says whether it went in.
       def attach_cartridge(path)
-        @problem = ""
-        Media.attach(@computer, path)
-        true
-      rescue ArgumentError, SystemCallError, Storage::CRTFile::FormatError, Cartridge::UnsupportedTypeError => e
-        @problem = e.message
-        false
+        succeeds? { Media.attach(@computer, path) }
       end
 
       # What a save of the machine is named after: the cartridge, the disk,
@@ -147,27 +121,28 @@ module Badline
       end
 
       # Takes the cartridge out with the power off.
-      def remove_cartridge
-        @computer.address_bus.detach_cartridge
-        @computer.power_cycle!
-      end
+      def remove_cartridge = MediaSlots.remove_cartridge(@computer)
 
       # A new machine started on `path`, as the command line would, or nil
       # when it won't start.
       def start(options, path)
-        @problem = ""
-        computer = Frontend.start(options, path, @writable)
-        list(path)
-        computer
-      rescue ArgumentError, SystemCallError, Media::TrueDrive::Error, Storage::SIDFile::FormatError,
-             Storage::T64::FormatError, Storage::TAP::FormatError, Storage::CRTFile::FormatError,
-             Storage::G64Image::FormatError, Cartridge::UnsupportedTypeError => e
-        @problem = e.message
-        nil
+        computer = nil
+        started = succeeds? do
+          computer = Frontend.start(options, path, @writable)
+          list(path)
+        end
+        started ? computer : nil
       end
 
       private
 
+      # Runs the block, keeps the media error it raised as the problem, and
+      # says whether there was none.
+      def succeeds?(&)
+        @problem = Frontend.media_problem(&)
+        @problem.empty?
+      end
+
       # Keeps `path` as the list the set comes from, if it's a list.
       def list(path)
         return unless Media::DiskList.list?(path)

data/lib/badline/frontend/{menu_pages.rb → menu/menu_pages.rb}

@@ -9,13 +9,10 @@ module Badline
     class MenuPages
       include MenuPorts
 
-      TEXT = PauseMenu::TEXT
-      DIM = PauseMenu::DIM
       LINE = 12
       COLUMNS = 25
       ROW_WIDTH = 200
 
-      WARNING = 0xff7a6b
       RECENT = %i[recent0 recent1 recent2 recent3 recent4 recent5 recent6 recent7].freeze
 
       SID_MODELS = %i[mos6581 mos8580].freeze
@@ -51,7 +48,7 @@ module Badline
 
       def draw(page, left, top)
         problem = @media.problem
-        @painter.text(left, top + 186, problem[0, COLUMNS], WARNING) unless problem.empty?
+        @painter.text(left, top + 186, problem[0, COLUMNS], MenuTheme::WARNING) unless problem.empty?
         @left = left
         @top = top
         case page
@@ -95,7 +92,7 @@ module Badline
       # 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)
+        @painter.text(@left, @top, "NOT ON THE VIC-20 YET", MenuTheme::DIM)
       end
 
       def draw_drive
@@ -182,11 +179,11 @@ module Badline
       # A label, and its value under it, or NONE in the dim colour when the
       # value is empty.
       def info(label, value)
-        @painter.text(@left, @top, label, DIM)
+        @painter.text(@left, @top, label, MenuTheme::DIM)
         if value.empty?
-          @painter.text(@left, @top + LINE, "NONE", DIM)
+          @painter.text(@left, @top + LINE, "NONE", MenuTheme::DIM)
         else
-          @painter.text(@left, @top + LINE, Painter.fit(value, COLUMNS), TEXT)
+          @painter.text(@left, @top + LINE, Painter.fit(value, COLUMNS), MenuTheme::TEXT)
         end
         @top += (LINE * 2) + 6
       end

data/lib/badline/frontend/{name_field.rb → menu/name_field.rb}

@@ -8,14 +8,8 @@ module Badline
     # name and Esc leaves it.
     class NameField
       COLUMNS = 30
-      LETTERS = "abcdefghijklmnopqrstuvwxyz"
-      DIGITS = "1234567890"
       OTHERS = { 44 => [" ", " "], 45 => ["-", "_"], 55 => [".", "."] }.freeze
 
-      RETURN = 40
-      ESCAPE = 41
-      BACKSPACE = 42
-
       attr_reader :text
 
       def initialize(painter)
@@ -47,11 +41,11 @@ module Badline
       # Handles a key, and returns :done for Return, :cancel for Esc, or
       # nil.
       def key(scancode, shift)
-        return :done if scancode == RETURN
-        return :cancel if scancode == ESCAPE
+        return :done if scancode == Keys::RETURN
+        return :cancel if scancode == Keys::ESCAPE
 
         @problem = ""
-        if scancode == BACKSPACE
+        if scancode == Keys::BACKSPACE
           @text = @text[0, @text.length - 1].to_s
         else
           char = character(scancode, shift)
@@ -62,26 +56,19 @@ module Badline
 
       def draw(left, top, width)
         painter = @painter
-        painter.text(left, top, @title, PauseMenu::BRIGHT)
-        painter.box(left, top + 18, width, Buttons::HEIGHT + 4, PauseMenu::FILL)
-        painter.text(left + 4, top + 22, "#{@text}_", PauseMenu::TEXT)
-        painter.text(left, top + 42, @problem, MenuPages::WARNING) unless @problem.empty?
-        painter.text(left, top + 60, "RETURN: SAVE  ESC: CANCEL", PauseMenu::DIM)
+        painter.text(left, top, @title, MenuTheme::BRIGHT)
+        painter.box(left, top + 18, width, Buttons::HEIGHT + 4, MenuTheme::FILL)
+        painter.text(left + 4, top + 22, "#{@text}_", MenuTheme::TEXT)
+        painter.text(left, top + 42, @problem, MenuTheme::WARNING) unless @problem.empty?
+        painter.text(left, top + 60, "RETURN: SAVE  ESC: CANCEL", MenuTheme::DIM)
       end
 
       private
 
       def character(scancode, shift)
-        if scancode.between?(4, 29)
-          letter = LETTERS[scancode - 4]
-          shift ? letter.upcase : letter
-        elsif scancode.between?(30, 39)
-          DIGITS[scancode - 30]
-        elsif OTHERS.key?(scancode)
-          OTHERS[scancode][shift ? 1 : 0]
-        else
-          ""
-        end
+        return OTHERS[scancode][shift ? 1 : 0] if OTHERS.key?(scancode)
+
+        Keys.character(scancode, shift)
       end
     end
   end

data/lib/badline/frontend/{pause_menu.rb → menu/pause_menu.rb}

@@ -17,30 +17,18 @@ module Badline
       SECTIONS = ["SNAPSHOTS", "DRIVE 8", "DATASETTE", "EXPANSION PORT", "PORTS", "SOUND", "POWER"].freeze
       PAGES = %i[snapshots drive datasette expansion ports sound power].freeze
 
-      PANEL = 0x1d2230
-      EDGE = 0x3a4256
-      TEXT = 0xc9d1e0
-      BRIGHT = 0xffc66d
-      DIM = 0x6b7489
-      FILL = 0x343c50
-
       MARGIN = 16
       WIDTH = 352
       HEIGHT = 240
       BODY = 138
 
-      ESCAPE = 41
-      RETURN = 40
-      SPACE = 44
       SNAPSHOT_ACTIONS = %i[quicksave_now save_as load_save].freeze
-      ARROWS = { 79 => :right, 80 => :left, 81 => :down, 82 => :up }.freeze
-      MOUSEWHEEL = 0x403
 
       # Takes the media, the REU and whether disks are writable from Options.
       def initialize(painter, options, snapshots)
         media_path = options.media_path.to_s
         @painter = painter
-        @buttons = Buttons.new(painter, [TEXT, BRIGHT, PANEL, FILL])
+        @buttons = Buttons.new(painter, [MenuTheme::TEXT, MenuTheme::BRIGHT, MenuTheme::PANEL, MenuTheme::FILL])
         @pages = MenuPages.new(painter, @buttons, media_path, options, snapshots)
         @snapshots = snapshots
         @dialogs = MenuDialogs.new(painter, @buttons, @pages.media, options, snapshots)
@@ -76,10 +64,7 @@ module Badline
       # goes straight in, and anything else asks first.
       def drop(computer, controls, sound)
         show(computer, controls, sound)
-        file = SDL.event_file(SDL.event)
-        asks = @dialogs.drop(LibC.strstr(file, ""))
-        LibC.free(file)
-        asks
+        @dialogs.drop(SDL.dropped_file)
       end
 
       # Handles a key pressed while the menu is open: the arrows move
@@ -91,10 +76,10 @@ module Badline
       def key(scancode)
         return :resume if scancode == Keys::F9
         return @dialogs.key(scancode) if @dialogs.open?
-        return :resume if scancode == ESCAPE
-        return choose(@buttons.focus) if [RETURN, SPACE].include?(scancode)
+        return :resume if scancode == Keys::ESCAPE
+        return choose(@buttons.focus) if [Keys::RETURN, Keys::SPACE].include?(scancode)
 
-        direction = ARROWS[scancode]
+        direction = Keys::DIRECTIONS[scancode]
         move(direction) unless direction.nil?
         nil
       end
@@ -134,18 +119,18 @@ module Badline
       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, MenuTheme::PANEL)
+        painter.box(@left, @top + 24, WIDTH, 1, MenuTheme::EDGE)
+        painter.text(@left + 8, @top + 9, "PAUSED", MenuTheme::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?
 
-        painter.box(@left + BODY - 8, @top + 32, 1, HEIGHT - 56, EDGE)
+        painter.box(@left + BODY - 8, @top + 32, 1, HEIGHT - 56, MenuTheme::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)
-        painter.text(@left + BODY, @top + HEIGHT - 12, "F6: 40/80 KEY  F8: SCREEN", DIM) if @pages.c128?
+        painter.text(@left + 8, @top + HEIGHT - 12, "F9/ESC: RESUME", MenuTheme::DIM)
+        painter.text(@left + BODY, @top + HEIGHT - 12, "F6: 40/80 KEY  F8: SCREEN", MenuTheme::DIM) if @pages.c128?
         @pages.draw(PAGES[@section], @left + BODY, @top + 34)
       end
 
@@ -241,13 +226,13 @@ module Badline
         when SDL::MOUSEMOTION then @buttons.point(SDL.event_x(event), SDL.event_y(event)) && nil
         when SDL::MOUSEBUTTONDOWN
           SDL.event_button(event) == 1 ? click(SDL.event_x(event), SDL.event_y(event)) : nil
-        when MOUSEWHEEL then @dialogs.scroll(-3 * SDL.event_x(event)) && nil
+        when SDL::MOUSEWHEEL then @dialogs.scroll(-3 * SDL.event_x(event)) && nil
         end
       end
 
       # A key held down repeats only the arrows.
       def key_down(scancode, repeat)
-        repeat.zero? || ARROWS.key?(scancode) ? key(scancode) : nil
+        repeat.zero? || Keys::DIRECTIONS.key?(scancode) ? key(scancode) : nil
       end
 
       def draw_sections

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Badline
+  module Frontend
+    # The pause menu's colours, which its pages and dialogs share. They lie
+    # outside the C64's palette, so the menu reads as the emulator's and
+    # not the machine's.
+    module MenuTheme
+      PANEL = 0x1d2230
+      EDGE = 0x3a4256
+      TEXT = 0xc9d1e0
+      BRIGHT = 0xffc66d
+      DIM = 0x6b7489
+      FILL = 0x343c50
+      WARNING = 0xff7a6b
+    end
+  end
+end

data/lib/badline/frontend/{filter_view.rb → player/filter_view.rb}

@@ -6,10 +6,10 @@ module Badline
     # resonance and volume, and its response across the audible range on
     # the chip playing, whose cutoff curve the two models don't share.
     class FilterView
-      TEXT = SIDView::TEXT
-      BRIGHT = SIDView::BRIGHT
-      DIM = SIDView::DIM
-      BOX = SIDView::BOX
+      TEXT = PlayerTheme::TEXT
+      BRIGHT = PlayerTheme::BRIGHT
+      DIM = PlayerTheme::DIM
+      BOX = PlayerTheme::BOX
 
       MODES = ["LP", "BP", "HP", "3 OFF"].freeze
 

data/lib/badline/frontend/{info_view.rb → player/info_view.rb}

@@ -52,7 +52,7 @@ module Badline
       def draw
         index = 0
         while index < ROWS && @offset + index < @lines.size
-          @painter.text(LEFT, @top + (index * LINE), @lines[@offset + index], SIDView::TEXT)
+          @painter.text(LEFT, @top + (index * LINE), @lines[@offset + index], PlayerTheme::TEXT)
           index += 1
         end
         draw_bar if @lines.size > ROWS
@@ -110,10 +110,10 @@ module Badline
 
       def draw_bar
         @buttons.area([BAR_LEFT, @top, BAR, HEIGHT], :scroll)
-        @painter.box(BAR_LEFT, @top, BAR, HEIGHT, SIDView::BOX)
+        @painter.box(BAR_LEFT, @top, BAR, HEIGHT, PlayerTheme::BOX)
         thumb = [HEIGHT * ROWS / @lines.size, 8].max
         place = (HEIGHT - thumb) * @offset / [last_offset, 1].max
-        @painter.box(BAR_LEFT, @top + place, BAR, thumb, SIDView::TEXT)
+        @painter.box(BAR_LEFT, @top + place, BAR, thumb, PlayerTheme::TEXT)
       end
     end
   end