teek 0.1.1 → 0.1.3

data/sample/{minesweeper/minesweeper.rb → yam/yam.rb}

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# teek-record: title=Yet Another Minesweeper, audio=1
 #
 # Minesweeper clone built with Teek.
 #
@@ -13,8 +14,14 @@
 #
 # Tile artwork: "Minesweeper Tile Set" by eugeneloza (CC0)
 # https://opengameart.org/content/minesweeper-tile-set
+#
+# Sound effects: generated with jsfxr (https://sfxr.me), public domain
+# Music: "Vaporware" by The Cynic Project (CC0)
+#   https://opengameart.org/content/calm-piano-1-vaporware
+#   cynicmusic.com / pixelsphere.org
 
 require_relative '../../lib/teek'
+require_relative '../../teek-sdl2/lib/teek/sdl2'
 
 class Minesweeper
   # The source PNGs are 216x216. Tk can shrink them with "copy -subsample N N"
@@ -28,15 +35,22 @@ class Minesweeper
     expert:       { cols: 30, rows: 16, mines: 99 }
   }.freeze
 
+  attr_reader :app
+
   def initialize(app, level: :beginner)
     @app = app
     @level = level
     apply_level
     load_images
+    load_sounds
     build_ui
     new_game
   end
 
+  # Simulate press/release on a cell for demo/test automation.
+  def press_cell(r, c) = on_left_press(r, c)
+  def release_cell(r, c) = on_left_release(r, c)
+
   private
 
   # -- Setup ---------------------------------------------------------------
@@ -83,10 +97,21 @@ class Minesweeper
     end
   end
 
+  def load_sounds
+    dir = File.join(__dir__, 'assets')
+    @snd_click     = Teek::SDL2::Sound.new(File.join(dir, 'click.wav'))
+    @snd_sweep     = Teek::SDL2::Sound.new(File.join(dir, 'sweep.wav'))
+    @snd_flag      = Teek::SDL2::Sound.new(File.join(dir, 'flag.wav'))
+    @snd_explosion = Teek::SDL2::Sound.new(File.join(dir, 'explosion.wav'))
+    @music = Teek::SDL2::Music.new(File.join(dir, 'music.mp3'))
+    @music.volume = 48
+    @music_on = true
+  end
+
   def build_ui
     # "wm" commands control the window manager -- title, resizability, etc.
     # "." is the root Tk window (every widget path starts from here).
-    @app.command(:wm, :title, '.', 'Minesweeper')
+    @app.command(:wm, :title, '.', 'Yet Another Minesweeper')
     @app.command(:wm, :resizable, '.', 0, 0)
 
     build_menu
@@ -165,6 +190,13 @@ class Minesweeper
                  font: 'TkFixedFont 14 bold', fg: :red, bg: :black,
                  relief: :sunken, anchor: :center)
     @app.command(:pack, '.hdr.time', side: :right, padx: 5, pady: 3)
+
+    # Music toggle (right, next to timer)
+    @music_btn = '.hdr.music'
+    @app.command(:button, @music_btn, text: "\u266A", width: 2,
+                 font: 'TkDefaultFont 10',
+                 command: proc { |*| toggle_music })
+    @app.command(:pack, @music_btn, side: :right, padx: 2, pady: 3)
   end
 
   # The game grid is a single Tk canvas filled with image items.
@@ -184,15 +216,27 @@ class Minesweeper
     @app.command(:canvas, @canvas, width: cw, height: ch, highlightthickness: 0)
     @app.command(:pack, @canvas)
 
-    # Left-click: reveal a cell
-    lcb = @app.register_callback(proc { |*|
+    # Left-click: press shows sunken tile + suspense face, release reveals.
+    # This mimics classic Windows Minesweeper's press-and-hold behavior.
+    @pressed_cell = nil
+
+    press_cb = @app.register_callback(proc { |*|
       row, col = canvas_cell
-      on_left_click(row, col) if row
+      on_left_press(row, col) if row
     })
-    @app.tcl_eval("bind #{@canvas} <Button-1> " \
+    @app.tcl_eval("bind #{@canvas} <ButtonPress-1> " \
                   "{set ::_ms_x [#{@canvas} canvasx %x]; " \
                   "set ::_ms_y [#{@canvas} canvasy %y]; " \
-                  "ruby_callback #{lcb}}")
+                  "ruby_callback #{press_cb}}")
+
+    release_cb = @app.register_callback(proc { |*|
+      row, col = canvas_cell
+      on_left_release(row, col) if row
+    })
+    @app.tcl_eval("bind #{@canvas} <ButtonRelease-1> " \
+                  "{set ::_ms_x [#{@canvas} canvasx %x]; " \
+                  "set ::_ms_y [#{@canvas} canvasy %y]; " \
+                  "ruby_callback #{release_cb}}")
 
     # Right-click: toggle flag. Binding all three events covers:
     #   Button-2  -- right-click on macOS
@@ -240,6 +284,7 @@ class Minesweeper
     @app.command(@face, :configure, text: ':)')
 
     draw_board
+    @music.play if @music_on && !@music.playing?
   end
 
   # Changing difficulty resizes the canvas and resets. The window auto-shrinks
@@ -285,7 +330,8 @@ class Minesweeper
 
     candidates = []
     @rows.times { |r| @cols.times { |c| candidates << [r, c] unless safe[[r, c]] } }
-    candidates.shuffle!.first(@num_mines).each { |r, c| @mine[r][c] = true }
+    rng = ENV['SEED'] ? Random.new(ENV['SEED'].to_i) : Random.new
+    candidates.shuffle!(random: rng).first(@num_mines).each { |r, c| @mine[r][c] = true }
 
     # Precompute how many mines neighbor each cell
     @rows.times do |r|
@@ -298,7 +344,29 @@ class Minesweeper
 
   # -- Click handlers ------------------------------------------------------
 
-  def on_left_click(r, c)
+  def on_left_press(r, c)
+    return if @game_over || @flagged[r][c] || @revealed[r][c]
+
+    # Show sunken/pressed tile and suspense face
+    @pressed_cell = [r, c]
+    set_cell_image(r, c, :empty)
+    @app.command(@face, :configure, text: ':o')
+  end
+
+  def on_left_release(r, c)
+    prev = @pressed_cell
+    @pressed_cell = nil
+
+    # Restore face
+    @app.command(@face, :configure, text: ':)') unless @game_over
+
+    # If released on a different cell than pressed, restore the pressed cell
+    if prev && prev != [r, c]
+      pr, pc = prev
+      set_cell_image(pr, pc, :hidden) unless @revealed[pr][pc]
+      return
+    end
+
     return if @game_over || @flagged[r][c] || @revealed[r][c]
 
     if @first_click
@@ -308,8 +376,10 @@ class Minesweeper
     end
 
     if @mine[r][c]
+      @snd_explosion.play
       game_over_lose(r, c)
     else
+      @cascading = false
       reveal(r, c)
       check_win
     end
@@ -318,6 +388,7 @@ class Minesweeper
   def on_right_click(r, c)
     return if @game_over || @revealed[r][c]
 
+    @snd_flag.play
     if @flagged[r][c]
       @flagged[r][c] = false
       @flags_placed -= 1
@@ -344,8 +415,13 @@ class Minesweeper
 
     if count == 0
       set_cell_image(r, c, :empty)
+      unless @cascading
+        @cascading = true
+        @snd_sweep.play
+      end
       neighbors(r, c).each { |nr, nc| reveal(nr, nc) }
     else
+      @snd_click.play unless @cascading
       set_cell_image(r, c, count)
     end
   end
@@ -375,6 +451,7 @@ class Minesweeper
     @game_over = true
     stop_timer
     @app.command(@face, :configure, text: ':(')
+    Teek::SDL2.fade_out_music(1500) if @music_on
 
     @rows.times do |r|
       @cols.times do |c|
@@ -405,6 +482,24 @@ class Minesweeper
     @app.after(1000) { tick_timer }
   end
 
+  # -- Music ---------------------------------------------------------------
+
+  def toggle_music
+    if @music_on
+      @music.pause
+      @music_on = false
+      @app.command(@music_btn, :configure, text: '--')
+    else
+      if @music.paused?
+        @music.resume
+      else
+        @music.play
+      end
+      @music_on = true
+      @app.command(@music_btn, :configure, text: "\u266A")
+    end
+  end
+
   # -- Helpers -------------------------------------------------------------
 
   def in_bounds?(r, c)
@@ -437,16 +532,56 @@ app = Teek::App.new(track_widgets: false)
 # The root window starts withdrawn by default in Teek -- show it.
 app.show
 
-Minesweeper.new(app)
+game = Minesweeper.new(app)
 
 # Automated demo support (for rake docker:test and recording)
 require_relative '../../lib/teek/demo_support'
 TeekDemo.app = app
 
-if TeekDemo.testing?
-  TeekDemo.after_idle do
-    app.after(500) { TeekDemo.finish }
+if TeekDemo.active?
+  ENV['SEED'] = '42'
+  game.send(:new_game) # restart with deterministic layout
+
+  if TeekDemo.recording?
+    app.set_window_geometry('+0+0')
+    app.tcl_eval('. configure -cursor none')
+    TeekDemo.signal_recording_ready
   end
+
+  # Capture all audio output to WAV when TEEK_RECORD_AUDIO is set.
+  # The WAV can be muxed with the screen recording via ffmpeg:
+  #   ffmpeg -i screen.mp4 -i yam_audio.wav -c:v copy -c:a aac -shortest out.mp4
+  audio_capture_path = ENV['TEEK_RECORD_AUDIO']
+  audio_capture_path = nil if audio_capture_path&.empty?
+  Teek::SDL2.start_audio_capture(audio_capture_path) if audio_capture_path
+
+  TeekDemo.after_idle {
+    d = TeekDemo.method(:delay)
+
+    # Click (row=2, col=3) — safe reveal, then (row=0, col=4) — mine. Boom!
+    steps = [
+      -> { game.press_cell(2, 3) },
+      -> { game.release_cell(2, 3) },
+      nil,
+      -> { game.press_cell(0, 4) },
+      -> { game.release_cell(0, 4) },
+      nil, nil,
+      -> {
+        Teek::SDL2.stop_audio_capture if audio_capture_path
+        TeekDemo.finish
+      },
+    ]
+
+    i = 0
+    run_step = proc {
+      steps[i]&.call
+      i += 1
+      if i < steps.length
+        app.after(d.call(test: 50, record: 1500)) { run_step.call }
+      end
+    }
+    run_step.call
+  }
 end
 
 app.mainloop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teek
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - James Cook
@@ -124,6 +124,7 @@ files:
 - ext/teek/tcl9compat.h
 - ext/teek/tcltkbridge.c
 - ext/teek/tcltkbridge.h
+- ext/teek/tkeventsource.c
 - ext/teek/tkfont.c
 - ext/teek/tkphoto.c
 - ext/teek/tkwin.c
@@ -134,27 +135,62 @@ files:
 - lib/teek/debugger.rb
 - lib/teek/demo_support.rb
 - lib/teek/method_coverage_service.rb
+- lib/teek/photo.rb
 - lib/teek/ractor_support.rb
 - lib/teek/version.rb
 - lib/teek/widget.rb
 - sample/calculator.rb
 - sample/debug_demo.rb
+- sample/gamepad_viewer/assets/controller.png
+- sample/gamepad_viewer/gamepad_viewer.rb
 - sample/goldberg.rb
 - sample/goldberg_helpers.rb
-- sample/minesweeper/assets/MINESWEEPER_0.png
-- sample/minesweeper/assets/MINESWEEPER_1.png
-- sample/minesweeper/assets/MINESWEEPER_2.png
-- sample/minesweeper/assets/MINESWEEPER_3.png
-- sample/minesweeper/assets/MINESWEEPER_4.png
-- sample/minesweeper/assets/MINESWEEPER_5.png
-- sample/minesweeper/assets/MINESWEEPER_6.png
-- sample/minesweeper/assets/MINESWEEPER_7.png
-- sample/minesweeper/assets/MINESWEEPER_8.png
-- sample/minesweeper/assets/MINESWEEPER_F.png
-- sample/minesweeper/assets/MINESWEEPER_M.png
-- sample/minesweeper/assets/MINESWEEPER_X.png
-- sample/minesweeper/minesweeper.rb
+- sample/optcarrot.rb
+- sample/optcarrot/thwaite.nes
+- sample/optcarrot/vendor/optcarrot.rb
+- sample/optcarrot/vendor/optcarrot/apu.rb
+- sample/optcarrot/vendor/optcarrot/config.rb
+- sample/optcarrot/vendor/optcarrot/cpu.rb
+- sample/optcarrot/vendor/optcarrot/driver.rb
+- sample/optcarrot/vendor/optcarrot/mapper/cnrom.rb
+- sample/optcarrot/vendor/optcarrot/mapper/mmc1.rb
+- sample/optcarrot/vendor/optcarrot/mapper/mmc3.rb
+- sample/optcarrot/vendor/optcarrot/mapper/uxrom.rb
+- sample/optcarrot/vendor/optcarrot/nes.rb
+- sample/optcarrot/vendor/optcarrot/opt.rb
+- sample/optcarrot/vendor/optcarrot/pad.rb
+- sample/optcarrot/vendor/optcarrot/palette.rb
+- sample/optcarrot/vendor/optcarrot/ppu.rb
+- sample/optcarrot/vendor/optcarrot/rom.rb
+- sample/paint/assets/bucket.png
+- sample/paint/assets/cursor.png
+- sample/paint/assets/eraser.png
+- sample/paint/assets/pencil.png
+- sample/paint/assets/spray.png
+- sample/paint/layer.rb
+- sample/paint/layer_manager.rb
+- sample/paint/paint_demo.rb
+- sample/paint/sparse_pixel_buffer.rb
+- sample/sdl2_demo.rb
 - sample/threading_demo.rb
+- sample/yam/assets/MINESWEEPER_0.png
+- sample/yam/assets/MINESWEEPER_1.png
+- sample/yam/assets/MINESWEEPER_2.png
+- sample/yam/assets/MINESWEEPER_3.png
+- sample/yam/assets/MINESWEEPER_4.png
+- sample/yam/assets/MINESWEEPER_5.png
+- sample/yam/assets/MINESWEEPER_6.png
+- sample/yam/assets/MINESWEEPER_7.png
+- sample/yam/assets/MINESWEEPER_8.png
+- sample/yam/assets/MINESWEEPER_F.png
+- sample/yam/assets/MINESWEEPER_M.png
+- sample/yam/assets/MINESWEEPER_X.png
+- sample/yam/assets/click.wav
+- sample/yam/assets/explosion.wav
+- sample/yam/assets/flag.wav
+- sample/yam/assets/music.mp3
+- sample/yam/assets/sweep.wav
+- sample/yam/yam.rb
 - teek.gemspec
 homepage: https://github.com/jamescook/teek
 licenses: