gemba 0.1.0 → 0.2.0

data/test/test_settings_window.rb

@@ -6,161 +6,12 @@ require_relative "shared/tk_test_helper"
 class TestMGBASettingsWindow < Minitest::Test
   include TeekTestHelper
 
-  # -- Video scale --------------------------------------------------------
-
-  def test_scale_combobox_defaults_to_3x
-    assert_tk_app("scale combobox defaults to 3x") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '3x', app.get_variable(Gemba::SettingsWindow::VAR_SCALE)
-    end
-  end
-
-  def test_selecting_2x_scale_fires_callback
-    assert_tk_app("selecting 2x scale fires on_scale_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_scale_change: proc { |s| received = s }
-      })
-      sw.show
-      app.update
-
-      # Simulate user selecting "2x" from the combobox
-      app.set_variable(Gemba::SettingsWindow::VAR_SCALE, '2x')
-      app.command(:event, 'generate', Gemba::SettingsWindow::SCALE_COMBO, '<<ComboboxSelected>>')
-      app.update
-
-      assert_equal 2, received
-    end
-  end
-
-  def test_selecting_4x_scale_fires_callback
-    assert_tk_app("selecting 4x scale fires on_scale_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_scale_change: proc { |s| received = s }
-      })
-      sw.show
-      app.update
-
-      app.set_variable(Gemba::SettingsWindow::VAR_SCALE, '4x')
-      app.command(:event, 'generate', Gemba::SettingsWindow::SCALE_COMBO, '<<ComboboxSelected>>')
-      app.update
-
-      assert_equal 4, received
-    end
-  end
-
-  # -- Volume slider ------------------------------------------------------
-
-  def test_volume_defaults_to_100
-    assert_tk_app("volume defaults to 100") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '100', app.get_variable(Gemba::SettingsWindow::VAR_VOLUME)
-    end
-  end
-
-  def test_dragging_volume_to_50_fires_callback
-    assert_tk_app("dragging volume to 50 fires on_volume_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_volume_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      # Simulate user dragging volume slider to 50
-      app.command(Gemba::SettingsWindow::VOLUME_SCALE, 'set', 50)
-      app.update
-
-      assert_in_delta 0.5, received, 0.01
-    end
-  end
-
-  def test_volume_at_zero
-    assert_tk_app("volume at zero") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_volume_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      app.command(Gemba::SettingsWindow::VOLUME_SCALE, 'set', 0)
-      app.update
-
-      assert_in_delta 0.0, received, 0.01
-    end
-  end
-
-  # -- Mute checkbox ------------------------------------------------------
-
-  def test_mute_defaults_to_off
-    assert_tk_app("mute defaults to off") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '0', app.get_variable(Gemba::SettingsWindow::VAR_MUTE)
-    end
-  end
-
-  def test_clicking_mute_fires_callback
-    assert_tk_app("clicking mute fires on_mute_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_mute_change: proc { |m| received = m }
-      })
-      sw.show
-      app.update
-
-      # Simulate user clicking the mute checkbox
-      app.command(Gemba::SettingsWindow::MUTE_CHECK, 'invoke')
-      app.update
-
-      assert_equal true, received
-    end
-  end
-
-  def test_clicking_mute_twice_unmutes
-    assert_tk_app("clicking mute twice unmutes") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_mute_change: proc { |m| received = m }
-      })
-      sw.show
-      app.update
-
-      app.command(Gemba::SettingsWindow::MUTE_CHECK, 'invoke')
-      app.update
-      assert_equal true, received
-
-      app.command(Gemba::SettingsWindow::MUTE_CHECK, 'invoke')
-      app.update
-      assert_equal false, received
-    end
-  end
-
   # -- Window lifecycle ---------------------------------------------------
 
   def test_settings_starts_hidden
     assert_tk_app("settings starts hidden") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       app.update
 
       assert_equal 'withdrawn', app.command(:wm, 'state', Gemba::SettingsWindow::TOP)
@@ -169,10 +20,10 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_show_and_hide
     assert_tk_app("show makes window visible, hide withdraws it") do
-      require "gemba/settings_window"
+      require "gemba/headless"
       app.show
       app.update
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      sw = Gemba::SettingsWindow.new(app)
 
       sw.show
       app.command(:focus, '-force', Gemba::SettingsWindow::TOP)
@@ -189,8 +40,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_gamepad_tab_exists
     assert_tk_app("gamepad tab exists in notebook") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -201,8 +52,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_deadzone_defaults_to_25
     assert_tk_app("dead zone defaults to 25") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -212,11 +63,11 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_deadzone_change_fires_callback
     assert_tk_app("dead zone change fires on_deadzone_change") do
-      require "gemba/settings_window"
+      require "gemba/headless"
       received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_deadzone_change: proc { |t| received = t }
-      })
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:deadzone_changed) { |t| received = t }
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -236,8 +87,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_clicking_gba_button_enters_listen_mode
     assert_tk_app("clicking GBA button enters listen mode") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -253,12 +104,12 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_capture_mapping_updates_button_label
     assert_tk_app("capture_mapping updates button label") do
-      require "gemba/settings_window"
+      require "gemba/headless"
       received_gba = nil
       received_key = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_keyboard_map_change: proc { |g, b| received_gba = g; received_key = b }
-      })
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:keyboard_map_changed) { |g, b| received_gba = g; received_key = b }
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -280,8 +131,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_gamepad_selector_defaults_to_keyboard_only
     assert_tk_app("gamepad selector defaults to Keyboard Only") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -293,8 +144,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_undo_starts_disabled
     assert_tk_app("undo button starts disabled") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -305,8 +156,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_undo_enabled_after_remap
     assert_tk_app("undo enabled after capturing a mapping") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -322,11 +173,11 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_undo_fires_callback_and_disables
     assert_tk_app("undo fires on_undo_gamepad and disables itself") do
-      require "gemba/settings_window"
+      require "gemba/headless"
       undo_called = false
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_undo_gamepad: proc { undo_called = true }
-      })
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:undo_gamepad) { undo_called = true }
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -348,8 +199,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_reset_disables_undo
     assert_tk_app("reset to defaults disables undo button") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -372,93 +223,12 @@ class TestMGBASettingsWindow < Minitest::Test
     end
   end
 
-  # -- Aspect ratio checkbox ------------------------------------------------
-
-  def test_aspect_ratio_defaults_to_on
-    assert_tk_app("aspect ratio checkbox defaults to on") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '1', app.get_variable(Gemba::SettingsWindow::VAR_ASPECT_RATIO)
-    end
-  end
-
-  def test_unchecking_aspect_ratio_fires_callback
-    assert_tk_app("unchecking aspect ratio fires on_aspect_ratio_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_aspect_ratio_change: proc { |keep| received = keep }
-      })
-      sw.show
-      app.update
-
-      # Simulate user unchecking the checkbox
-      app.command(Gemba::SettingsWindow::ASPECT_CHECK, 'invoke')
-      app.update
-
-      assert_equal false, received
-    end
-  end
-
-  def test_checking_aspect_ratio_fires_callback
-    assert_tk_app("re-checking aspect ratio fires callback with true") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_aspect_ratio_change: proc { |keep| received = keep }
-      })
-      sw.show
-      app.update
-
-      # Uncheck then re-check
-      app.command(Gemba::SettingsWindow::ASPECT_CHECK, 'invoke')
-      app.update
-      app.command(Gemba::SettingsWindow::ASPECT_CHECK, 'invoke')
-      app.update
-
-      assert_equal true, received
-    end
-  end
-
-  # -- Show FPS checkbox ----------------------------------------------------
-
-  def test_show_fps_defaults_to_on
-    assert_tk_app("show fps checkbox defaults to on") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '1', app.get_variable(Gemba::SettingsWindow::VAR_SHOW_FPS)
-    end
-  end
-
-  def test_unchecking_show_fps_fires_callback
-    assert_tk_app("unchecking show fps fires on_show_fps_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_show_fps_change: proc { |show| received = show }
-      })
-      sw.show
-      app.update
-
-      app.command(Gemba::SettingsWindow::SHOW_FPS_CHECK, 'invoke')
-      app.update
-
-      assert_equal false, received
-    end
-  end
-
   # -- Keyboard mode --------------------------------------------------------
 
   def test_starts_in_keyboard_mode
     assert_tk_app("starts in keyboard mode") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -468,8 +238,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_keyboard_mode_labels_show_keysyms
     assert_tk_app("keyboard mode shows keysym labels") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -482,8 +252,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_switching_to_gamepad_mode_changes_labels
     assert_tk_app("switching to gamepad shows gamepad labels") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -502,8 +272,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_deadzone_disabled_in_keyboard_mode
     assert_tk_app("dead zone slider disabled in keyboard mode") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -514,8 +284,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_deadzone_enabled_in_gamepad_mode
     assert_tk_app("dead zone slider enabled in gamepad mode") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -531,12 +301,12 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_keyboard_capture_fires_keyboard_callback
     assert_tk_app("keyboard capture fires on_keyboard_map_change") do
-      require "gemba/settings_window"
+      require "gemba/headless"
       received_gba = nil
       received_key = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_keyboard_map_change: proc { |g, k| received_gba = g; received_key = k }
-      })
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:keyboard_map_changed) { |g, k| received_gba = g; received_key = k }
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -552,8 +322,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_switching_mode_cancels_listen
     assert_tk_app("switching input mode cancels active listen") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -578,7 +348,7 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_virtual_gamepad_listen_and_capture
     assert_tk_app("virtual gamepad button press captured in listen mode") do
-      require "gemba/settings_window"
+      require "gemba/headless"
       require "teek/sdl2"
       gp_cls = Teek::SDL2::Gamepad
 
@@ -588,9 +358,9 @@ class TestMGBASettingsWindow < Minitest::Test
 
       received_gba = nil
       received_gp = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_gamepad_map_change: proc { |g, b| received_gba = g; received_gp = b }
-      })
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:gamepad_map_changed) { |g, b| received_gba = g; received_gp = b }
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -637,12 +407,13 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_kb_mapping_rejected_when_conflicting_with_hotkey
     assert_tk_app("keyboard mapping rejected when key conflicts with hotkey") do
-      require "gemba/settings_window"
-      require "gemba/hotkey_map"
+      require "gemba/headless"
+      require "gemba/headless"
       received = false
       conflict_msg = nil
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:keyboard_map_changed) { |*| received = true }
       sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_keyboard_map_change: proc { |*| received = true },
         on_validate_kb_mapping: ->(keysym) {
           # Simulate: 'F5' is the Quick Save hotkey
           keysym == 'F5' ? '"F5" is assigned to hotkey: Quick save' : nil
@@ -669,11 +440,12 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_kb_mapping_accepted_when_no_conflict
     assert_tk_app("keyboard mapping accepted when no conflict") do
-      require "gemba/settings_window"
-      require "gemba/hotkey_map"
+      require "gemba/headless"
+      require "gemba/headless"
       received_gba = nil
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:keyboard_map_changed) { |g, _| received_gba = g }
       sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_keyboard_map_change: proc { |g, _| received_gba = g },
         on_validate_kb_mapping: ->(_) { nil },
       })
       sw.show
@@ -692,8 +464,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_gamepad_mapping_skips_validation
     assert_tk_app("gamepad mode skips keyboard validation") do
-      require "gemba/settings_window"
-      require "gemba/hotkey_map"
+      require "gemba/headless"
+      require "gemba/headless"
       require "teek/sdl2"
       gp_cls = Teek::SDL2::Gamepad
       gp_cls.init_subsystem
@@ -701,8 +473,9 @@ class TestMGBASettingsWindow < Minitest::Test
       gp = gp_cls.open(idx)
 
       received_gba = nil
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:gamepad_map_changed) { |g, _| received_gba = g }
       sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_gamepad_map_change: proc { |g, _| received_gba = g },
         on_validate_kb_mapping: ->(_) { "should not be called" },
       })
       sw.show
@@ -728,173 +501,12 @@ class TestMGBASettingsWindow < Minitest::Test
     end
   end
 
-  # -- Pixel filter combo ----------------------------------------------------
-
-  def test_pixel_filter_defaults_to_nearest
-    assert_tk_app("pixel filter defaults to Nearest Neighbor") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal 'Nearest Neighbor', app.get_variable(Gemba::SettingsWindow::VAR_FILTER)
-    end
-  end
-
-  def test_selecting_bilinear_fires_callback
-    assert_tk_app("selecting Bilinear fires on_filter_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_filter_change: proc { |f| received = f }
-      })
-      sw.show
-      app.update
-
-      app.set_variable(Gemba::SettingsWindow::VAR_FILTER, 'Bilinear')
-      app.command(:event, 'generate', Gemba::SettingsWindow::FILTER_COMBO, '<<ComboboxSelected>>')
-      app.update
-
-      assert_equal 'linear', received
-    end
-  end
-
-  # -- Integer scaling checkbox ----------------------------------------------
-
-  def test_integer_scale_defaults_to_off
-    assert_tk_app("integer scale checkbox defaults to off") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '0', app.get_variable(Gemba::SettingsWindow::VAR_INTEGER_SCALE)
-    end
-  end
-
-  def test_clicking_integer_scale_fires_callback
-    assert_tk_app("clicking integer scale fires on_integer_scale_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_integer_scale_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      app.command(Gemba::SettingsWindow::INTEGER_SCALE_CHECK, 'invoke')
-      app.update
-
-      assert_equal true, received
-    end
-  end
-
-  # -- Color correction checkbox --------------------------------------------
-
-  def test_color_correction_defaults_to_off
-    assert_tk_app("color correction checkbox defaults to off") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '0', app.get_variable(Gemba::SettingsWindow::VAR_COLOR_CORRECTION)
-    end
-  end
-
-  def test_clicking_color_correction_fires_callback
-    assert_tk_app("clicking color correction fires on_color_correction_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_color_correction_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      app.command(Gemba::SettingsWindow::COLOR_CORRECTION_CHECK, 'invoke')
-      app.update
-
-      assert_equal true, received
-    end
-  end
-
-  def test_unchecking_color_correction_fires_false
-    assert_tk_app("unchecking color correction fires callback with false") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_color_correction_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      # Check then uncheck
-      app.command(Gemba::SettingsWindow::COLOR_CORRECTION_CHECK, 'invoke')
-      app.update
-      app.command(Gemba::SettingsWindow::COLOR_CORRECTION_CHECK, 'invoke')
-      app.update
-
-      assert_equal false, received
-    end
-  end
-
-  # -- Frame blending checkbox -----------------------------------------------
-
-  def test_frame_blending_defaults_to_off
-    assert_tk_app("frame blending checkbox defaults to off") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '0', app.get_variable(Gemba::SettingsWindow::VAR_FRAME_BLENDING)
-    end
-  end
-
-  def test_clicking_frame_blending_fires_callback
-    assert_tk_app("clicking frame blending fires on_frame_blending_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_frame_blending_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      app.command(Gemba::SettingsWindow::FRAME_BLENDING_CHECK, 'invoke')
-      app.update
-
-      assert_equal true, received
-    end
-  end
-
-  def test_unchecking_frame_blending_fires_false
-    assert_tk_app("unchecking frame blending fires callback with false") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_frame_blending_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      # Check then uncheck
-      app.command(Gemba::SettingsWindow::FRAME_BLENDING_CHECK, 'invoke')
-      app.update
-      app.command(Gemba::SettingsWindow::FRAME_BLENDING_CHECK, 'invoke')
-      app.update
-
-      assert_equal false, received
-    end
-  end
-
   # -- Per-game settings checkbox -------------------------------------------
 
   def test_per_game_checkbox_defaults_disabled
     assert_tk_app("per-game checkbox defaults disabled") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -905,8 +517,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_set_per_game_available_enables_checkbox
     assert_tk_app("set_per_game_available enables checkbox") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -920,11 +532,11 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_per_game_toggle_fires_callback
     assert_tk_app("per-game toggle fires on_per_game_toggle") do
-      require "gemba/settings_window"
+      require "gemba/headless"
       received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_per_game_toggle: proc { |v| received = v }
-      })
+      Gemba.bus = Gemba::EventBus.new
+      Gemba.bus.on(:per_game_toggled) { |v| received = v }
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -939,8 +551,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_set_per_game_active_syncs_variable
     assert_tk_app("set_per_game_active syncs variable") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -954,8 +566,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_per_game_disabled_on_gamepad_tab
     assert_tk_app("per-game disabled on gamepad tab") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -974,8 +586,8 @@ class TestMGBASettingsWindow < Minitest::Test
 
   def test_per_game_re_enabled_on_video_tab
     assert_tk_app("per-game re-enabled on video tab") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
+      require "gemba/headless"
+      sw = Gemba::SettingsWindow.new(app)
       sw.show
       app.update
 
@@ -993,47 +605,4 @@ class TestMGBASettingsWindow < Minitest::Test
     end
   end
 
-  # -- Recording tab -------------------------------------------------------
-
-  def test_recording_tab_exists
-    assert_tk_app("recording tab exists in notebook") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      tabs = app.command(Gemba::SettingsWindow::NB, 'tabs')
-      assert_includes tabs, Gemba::SettingsWindow::REC_TAB
-    end
-  end
-
-  def test_compression_combobox_defaults_to_1
-    assert_tk_app("compression combobox defaults to 1") do
-      require "gemba/settings_window"
-      sw = Gemba::SettingsWindow.new(app, callbacks: {})
-      sw.show
-      app.update
-
-      assert_equal '1', app.get_variable(Gemba::SettingsWindow::VAR_REC_COMPRESSION)
-    end
-  end
-
-  def test_selecting_compression_fires_callback
-    assert_tk_app("selecting compression fires on_compression_change") do
-      require "gemba/settings_window"
-      received = nil
-      sw = Gemba::SettingsWindow.new(app, callbacks: {
-        on_compression_change: proc { |v| received = v }
-      })
-      sw.show
-      app.update
-
-      app.set_variable(Gemba::SettingsWindow::VAR_REC_COMPRESSION, '6')
-      app.command(:event, 'generate', Gemba::SettingsWindow::REC_COMPRESSION_COMBO, '<<ComboboxSelected>>')
-      app.update
-
-      assert_equal 6, received
-    end
-  end
-
 end