2048-ruby 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 363aba227984e0848f9b6a40a1eb04b5540c1c5572f061c6d2a61d0ba7a3829e
-  data.tar.gz: ca798754075c148bc7ff45cde0f6287c336a8a2dd7400399b7f323a0b9b9751a
+  metadata.gz: edcff0be5bfa1663ba3da973074496bd7d24eba83e7c4bb092eef6eaf593e2b5
+  data.tar.gz: 3446c4f1d961faee7105a2cbaaedf2d6b9e42d1cfa757e4c23ce39b4a858e2c7
 SHA512:
-  metadata.gz: 8cd4332ea3a8ccdbc4636906c9648aee7419f3b1aa20a099355c601f7e98bc5765dbabc9898c93abe6d4a0931fa985397a3999609b45c3b50dca1c8f6dc8f783
-  data.tar.gz: 6fcfe4af73f38cade1f2831324a5dff732c43f9f945794cefafe1d1425dbbde3549cd1d1449f00d3735613411fa6d70a27c50cec584a3f60ee6bfe86abc58831
+  metadata.gz: ff183265592e526c7d534ff9ad2ec848c65f1884c6af218fc984ea7d1acf111bfce6146579ffdbe644ddb4f236bc9ff8bc0c79aa1aaec710a452eb0d436f2d6f
+  data.tar.gz: 96b2497fb4d441f3b11b23ab7218a1b75923f12317f43dc36828617c9db26706f1bc87cb7c108e93becefecc6ccb2f510c0d647a9ecf0cdde380d23de7e66098

data/lib/game_2048/game.rb

@@ -17,20 +17,28 @@ module Game2048
 
     def run
       @running = true
-      @terminal.raw_mode
-      @terminal.hide_cursor
-      @render.refresh
+      terminal_init
 
       Kernel.trap('SIGWINCH') do
         @render.refresh
       end
 
+      Kernel.trap('SIGCONT') do
+        terminal_init
+      end
+
       while @running
         @render.draw
         key = @terminal.read
+
         case key
-        when 'q'
+        when 'q', :ctrl_c
           stop
+        when :ctrl_l
+          @render.refresh
+        when :ctrl_z
+          terminal_clear
+          Process.kill('SIGSTOP', Process.pid)
         when 'r'
           @tiles.reset
         when '+'
@@ -57,10 +65,22 @@ module Game2048
         end
       end
 
+      terminal_clear
+    end
+
+    private
+
+    def terminal_init
+      @terminal.raw_mode
+      @terminal.alt_screen_on
+      @terminal.hide_cursor
+      @render.refresh
+    end
+
+    def terminal_clear
       @terminal.cooked_mode
-      @terminal.erase_display
+      @terminal.alt_screen_off
       @terminal.show_cursor
-      @terminal.move_home
     end
   end
 end

data/lib/game_2048/render.rb

@@ -166,7 +166,11 @@ module Game2048
     end
 
     def align
-      @rows, @cols = @terminal.display_size
+      rows, cols = @terminal.display_size
+      return if rows.nil? || cols.nil?
+
+      @rows = rows
+      @cols = cols
       n = Math.sqrt(Tiles::SIZE).to_i
       @width = @size * 2 * n + n + 1
       @height = @size * n + n + 1

data/lib/game_2048/terminal.rb

@@ -19,6 +19,8 @@ module Game2048
 
     HIDE_CURSOR = '?25l'
     SHOW_CURSOR = '?25h'
+    ALT_SCREEN_ON = '?1049h'
+    ALT_SCREEN_OFF = '?1049l'
 
     RESET = 0
     BOLD = 1
@@ -47,6 +49,12 @@ module Game2048
       CUB => :left
     }.freeze
 
+    CHARS_MAP = {
+      "\x03" => :ctrl_c,
+      "\x0c" => :ctrl_l,
+      "\x1a" => :ctrl_z
+    }.freeze
+
     def initialize(input: $stdin, output: $stdout)
       @input = input
       @output = output
@@ -108,6 +116,14 @@ module Game2048
       @output.write("#{CSI}#{SHOW_CURSOR}")
     end
 
+    def alt_screen_on
+      @output.write("#{CSI}#{ALT_SCREEN_ON}")
+    end
+
+    def alt_screen_off
+      @output.write("#{CSI}#{ALT_SCREEN_OFF}")
+    end
+
     def display_size
       move_to(999, 999)
       @output.write("#{CSI}#{CPR}")
@@ -145,7 +161,7 @@ module Game2048
         end
       end
 
-      data
+      CHARS_MAP.fetch(data, data)
     end
 
     def raw_mode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 2048-ruby
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - anim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: me@telpart.ru