Merge pull request #3 from Simponic/draw_board

Draw board

TODO.md

@@ -0,0 +1 @@
+Change the menu and board to be genserverse, board subscribes to game, 

lib/chessh/ssh/client.ex

@@ -1,123 +0,0 @@
-defmodule Chessh.SSH.Client do
-  alias IO.ANSI
-  alias Chessh.SSH.Client.Menu
-  require Logger
-
-  use GenServer
-
-  @clear_codes [
-    ANSI.clear(),
-    ANSI.reset(),
-    ANSI.home()
-  ]
-
-  @min_terminal_width 64
-  @min_terminal_height 31
-  @max_terminal_width 255
-  @max_terminal_height 127
-
-  @terminal_bad_dim_msg [
-    @clear_codes | "The dimensions of your terminal are not within in the valid range"
-  ]
-
-  defmodule State do
-    defstruct tui_pid: nil,
-              width: 0,
-              height: 0,
-              player_session: nil,
-              buffer: [],
-              state_stack: [{Menu, %Menu.State{}}]
-  end
-
-  @impl true
-  def init([%State{tui_pid: tui_pid} = state]) do
-    send(tui_pid, {:send_data, render(state)})
-    {:ok, state}
-  end
-
-  @impl true
-  def handle_info(:quit, %State{} = state) do
-    {:stop, :normal, state}
-  end
-
-  @impl true
-  def handle_info(msg, state) do
-    [burst_ms, burst_rate] =
-      Application.get_env(:chessh, RateLimits)
-      |> Keyword.take([:player_session_message_burst_ms, :player_session_message_burst_rate])
-      |> Keyword.values()
-
-    case Hammer.check_rate_inc(
-           "player-session-#{state.player_session.id}-burst-message-rate",
-           burst_ms,
-           burst_rate,
-           1
-         ) do
-      {:allow, _count} ->
-        handle(msg, state)
-
-      {:deny, _limit} ->
-        {:noreply, state}
-    end
-  end
-
-  def handle(
-        {:data, data},
-        %State{tui_pid: tui_pid, state_stack: [{module, _screen_state} | _tail]} = state
-      ) do
-    action = keymap(data)
-
-    if action == :quit do
-      {:stop, :normal, state}
-    else
-      new_state = module.handle_input(action, state)
-
-      send(tui_pid, {:send_data, render(new_state)})
-
-      {:noreply, new_state}
-    end
-  end
-
-  def handle({:resize, {width, height}}, %State{tui_pid: tui_pid} = state) do
-    new_state = %State{state | width: width, height: height}
-
-    if height <= @max_terminal_height || width <= @max_terminal_width do
-      send(tui_pid, {:send_data, render(new_state)})
-    end
-
-    {:noreply, new_state}
-  end
-
-  def keymap(key) do
-    case key do
-      # Exit keys - C-c and C-d
-      <<3>> -> :quit
-      <<4>> -> :quit
-      # Arrow keys
-      "\e[A" -> :up
-      "\e[B" -> :down
-      "\e[D" -> :left
-      "\e[C" -> :right
-      "\r" -> :return
-      x -> x
-    end
-  end
-
-  def terminal_size_allowed(width, height) do
-    Enum.member?(@min_terminal_width..@max_terminal_width, width) &&
-      Enum.member?(@min_terminal_height..@max_terminal_height, height)
-  end
-
-  def render(
-        %State{width: width, height: height, state_stack: [{module, _screen_state} | _]} = state
-      ) do
-    if terminal_size_allowed(width, height) do
-      [
-        @clear_codes ++
-          module.render(state)
-      ]
-    else
-      @terminal_bad_dim_msg
-    end
-  end
-end

lib/chessh/ssh/client/board/board.ex

@@ -0,0 +1,123 @@
+defmodule Chessh.SSH.Client.Board do
+  require Logger
+  alias Chessh.Utils
+  alias Chessh.SSH.Client.Board.Renderer
+
+  defmodule State do
+    defstruct cursor: %{x: 7, y: 7},
+              highlighted: %{},
+              move_from: nil,
+              game_id: nil,
+              client_pid: nil,
+              binbo_pid: nil,
+              width: 0,
+              height: 0,
+              flipped: false
+  end
+
+  use Chessh.SSH.Client.Screen
+
+  def init([%State{client_pid: client_pid, game_id: game_id} = state | _]) do
+    :syn.add_node_to_scopes([:games])
+    :ok = :syn.join(:games, {:game, game_id}, self())
+
+    :binbo.start()
+    {:ok, binbo_pid} = :binbo.new_server()
+    :binbo.new_game(binbo_pid)
+
+    send(client_pid, {:send_to_ssh, Utils.clear_codes()})
+
+    {:ok, %State{state | binbo_pid: binbo_pid}}
+  end
+
+  def handle_info({:new_move, move}, %State{binbo_pid: binbo_pid, client_pid: client_pid} = state) do
+    case :binbo.move(binbo_pid, move) do
+      {:ok, :continue} ->
+        send(client_pid, {:send_to_ssh, render_state(state)})
+
+      _ ->
+        nil
+    end
+
+    {:noreply, state}
+  end
+
+  def input(
+        width,
+        height,
+        action,
+        %State{
+          move_from: move_from,
+          game_id: game_id,
+          cursor: %{x: cursor_x, y: cursor_y} = cursor,
+          client_pid: client_pid,
+          flipped: flipped
+        } = state
+      ) do
+    new_cursor =
+      case action do
+        :left -> %{y: cursor_y, x: Utils.wrap_around(cursor_x, -1, Renderer.chess_board_width())}
+        :right -> %{y: cursor_y, x: Utils.wrap_around(cursor_x, 1, Renderer.chess_board_width())}
+        :down -> %{y: Utils.wrap_around(cursor_y, 1, Renderer.chess_board_height()), x: cursor_x}
+        :up -> %{y: Utils.wrap_around(cursor_y, -1, Renderer.chess_board_height()), x: cursor_x}
+        _ -> cursor
+      end
+
+    {new_move_from, move_to} =
+      if action == :return do
+        coords = {new_cursor.y, new_cursor.x}
+
+        case move_from do
+          nil -> {coords, nil}
+          _ -> {nil, coords}
+        end
+      else
+        {move_from, nil}
+      end
+
+    # TODO: Check move here, then publish new move, subscribers get from DB instead
+    if move_from && move_to do
+      attempted_move =
+        if flipped,
+          do:
+            "#{Renderer.to_chess_coord(flip(move_from))}#{Renderer.to_chess_coord(flip(move_to))}",
+          else: "#{Renderer.to_chess_coord(move_from)}#{Renderer.to_chess_coord(move_to)}"
+
+      :syn.publish(:games, {:game, game_id}, {:new_move, attempted_move})
+    end
+
+    new_state = %State{
+      state
+      | cursor: new_cursor,
+        move_from: new_move_from,
+        highlighted: %{
+          {new_cursor.y, new_cursor.x} => Renderer.to_select_background(),
+          new_move_from => Renderer.from_select_background()
+        },
+        width: width,
+        height: height,
+        flipped: if(action == "f", do: !flipped, else: flipped)
+    }
+
+    send(client_pid, {:send_to_ssh, render_state(new_state)})
+    new_state
+  end
+
+  def render(width, height, %State{client_pid: client_pid} = state) do
+    send(client_pid, {:send_to_ssh, render_state(state)})
+    %State{state | width: width, height: height}
+  end
+
+  def flip({y, x}),
+    do: {Renderer.chess_board_height() - 1 - y, Renderer.chess_board_width() - 1 - x}
+
+  defp render_state(
+         %State{
+           binbo_pid: binbo_pid
+         } = state
+       ) do
+    {:ok, fen} = :binbo.get_fen(binbo_pid)
+
+    Renderer.render_board_state(fen, state)
+  end
+end

lib/chessh/ssh/client/board/renderer.ex

@@ -0,0 +1,252 @@
+defmodule Chessh.SSH.Client.Board.Renderer do
+  alias IO.ANSI
+  alias Chessh.Utils
+  alias Chessh.SSH.Client.Board
+  require Logger
+
+  @chess_board_height 8
+  @chess_board_width 8
+
+  @tile_width 7
+  @tile_height 4
+
+  @from_select_background ANSI.light_blue_background()
+  @to_select_background ANSI.blue_background()
+  @dark_piece_color ANSI.light_red()
+  @light_piece_color ANSI.light_magenta()
+
+  def chess_board_height(), do: @chess_board_height
+  def chess_board_width(), do: @chess_board_width
+  def to_select_background(), do: @to_select_background
+  def from_select_background(), do: @from_select_background
+
+  def to_chess_coord({y, x})
+      when x >= 0 and x < @chess_board_width and y >= 0 and y < @chess_board_height do
+    "#{List.to_string([?a + x])}#{@chess_board_height - y}"
+  end
+
+  def render_board_state(fen, %Board.State{
+        width: _width,
+        height: _height,
+        highlighted: highlighted,
+        flipped: flipped
+      }) do
+    board =
+      draw_board(
+        fen,
+        {@tile_width, @tile_height},
+        highlighted,
+        flipped
+      )
+
+    [ANSI.home()] ++
+      Enum.map(
+        Enum.zip(1..length(board), board),
+        fn {i, line} ->
+          [ANSI.cursor(i, 0), line]
+        end
+      )
+  end
+
+  defp tileIsLight(row, col) do
+    rem(row, 2) == rem(col, 2)
+  end
+
+  defp piece_type(char) do
+    case String.capitalize(char) do
+      "P" -> "pawn"
+      "N" -> "knight"
+      "R" -> "rook"
+      "B" -> "bishop"
+      "K" -> "king"
+      "Q" -> "queen"
+      _ -> nil
+    end
+  end
+
+  defp skip_cols_or_place_piece_reduce(char, {curr_column, data}, rowI) do
+    case Integer.parse(char) do
+      {skip, ""} ->
+        {curr_column + skip, data}
+
+      _ ->
+        case piece_type(char) do
+          nil ->
+            {curr_column, data}
+
+          type ->
+            shade = if(char == String.capitalize(char), do: "light", else: "dark")
+
+            {curr_column + 1,
+             Map.put(
+               data,
+               "#{rowI}, #{curr_column}",
+               {shade, type}
+             )}
+        end
+    end
+  end
+
+  defp make_coordinate_to_piece_art_map(fen) do
+    rows =
+      String.split(fen, " ")
+      |> List.first()
+      |> String.split("/")
+
+    Enum.zip(rows, 0..(length(rows) - 1))
+    |> Enum.map(fn {row, rowI} ->
+      {@chess_board_height, pieces_per_row} =
+        Enum.reduce(
+          String.split(row, ""),
+          {0, %{}},
+          &skip_cols_or_place_piece_reduce(&1, &2, rowI)
+        )
+
+      pieces_per_row
+    end)
+    |> Enum.reduce(%{}, fn pieces_map_for_this_row, acc ->
+      Map.merge(acc, pieces_map_for_this_row)
+    end)
+  end
+
+  defp draw_board(
+         fen,
+         {tile_width, tile_height} = tile_dims,
+         highlights,
+         flipped
+       ) do
+    coordinate_to_piece = make_coordinate_to_piece_art_map(fen)
+    board = make_board(tile_dims)
+
+    (Enum.zip_with([board, 0..(length(board) - 1)], fn [row_str, row] ->
+       curr_y = div(row, tile_height)
+
+       %{row_chars: row_chars} =
+         Enum.reduce(
+           Enum.zip(String.graphemes(row_str), 0..(String.length(row_str) - 1)),
+           %{current_color: ANSI.black(), row_chars: []},
+           fn {char, col}, %{current_color: current_color, row_chars: row_chars} = row_state ->
+             curr_x = div(col, tile_width)
+
+             key =
+               "#{if !flipped, do: curr_y, else: @chess_board_height - curr_y - 1}, #{if !flipped, do: curr_x, else: @chess_board_width - curr_x - 1}"
+
+             relative_to_tile_col = col - curr_x * tile_width
+
+             prefix =
+               if relative_to_tile_col == 0 do
+                 case Map.fetch(highlights, {curr_y, curr_x}) do
+                   {:ok, color} ->
+                     color
+
+                   _ ->
+                     ANSI.default_background()
+                 end
+               end
+
+             {color, row_chars} =
+               case Map.fetch(coordinate_to_piece, key) do
+                 {:ok, {shade, type}} ->
+                   piece = Utils.ascii_chars()["pieces"][shade][type]
+                   piece_line = Enum.at(piece, row - curr_y * tile_height)
+                   pad_left_right = div(tile_width - String.length(piece_line), 2)
+
+                   if relative_to_tile_col >= pad_left_right &&
+                        relative_to_tile_col < tile_width - pad_left_right do
+                     piece_char = String.at(piece_line, relative_to_tile_col - pad_left_right)
+                     new_char = if piece_char == " ", do: char, else: piece_char
+
+                     color =
+                       if piece_char == " ",
+                         do: ANSI.default_color(),
+                         else:
+                           if(shade == "dark", do: @dark_piece_color, else: @light_piece_color)
+
+                     if color != current_color do
+                       {color, row_chars ++ [prefix, color, new_char]}
+                     else
+                       {current_color, row_chars ++ [prefix, new_char]}
+                     end
+                   else
+                     {ANSI.default_color(), row_chars ++ [prefix, ANSI.default_color(), char]}
+                   end
+
+                 _ ->
+                   if ANSI.default_color() != current_color do
+                     {ANSI.default_color(), row_chars ++ [prefix, ANSI.default_color(), char]}
+                   else
+                     {current_color, row_chars ++ [prefix, char]}
+                   end
+               end
+
+             %{
+               row_state
+               | current_color: color,
+                 row_chars: row_chars
+             }
+           end
+         )
+
+       curr_num =
+         Utils.ascii_chars()["numbers"][
+           Integer.to_string(if flipped, do: curr_y + 1, else: @chess_board_height - curr_y)
+         ]
+
+       curr_num_line_no = rem(row, @tile_height)
+
+       Enum.join(
+         [
+           String.pad_trailing(
+             if(curr_num_line_no < length(curr_num),
+               do: Enum.at(curr_num, curr_num_line_no),
+               else: ""
+             ),
+             @tile_width
+           )
+         ] ++ row_chars,
+         ""
+       )
+     end) ++ column_coords(flipped))
+    |> Enum.map(fn row_line -> "#{ANSI.default_background()}#{row_line}" end)
+  end
+
+  defp column_coords(flipped) do
+    Enum.map(0..(@tile_height - 1), fn row ->
+      String.duplicate(" ", @tile_width) <>
+        (Enum.map(
+           if(!flipped, do: 0..(@chess_board_width - 1), else: (@chess_board_width - 1)..0),
+           fn col ->
+             curr_letter = Utils.ascii_chars()["letters"][List.to_string([?a + col])]
+             curr_letter_line_no = rem(row, @tile_height)
+
+             curr_line =
+               if(curr_letter_line_no < length(curr_letter),
+                 do: Enum.at(curr_letter, curr_letter_line_no),
+                 else: ""
+               )
+
+             center_prefix_len = div(@tile_width - String.length(curr_line), 2)
+
+             String.pad_trailing(
+               String.duplicate(" ", center_prefix_len) <> curr_line,
+               @tile_width
+             )
+           end
+         )
+         |> Enum.join(""))
+    end)
+  end
+
+  defp make_board({tile_width, tile_height}) do
+    rows =
+      Enum.map(0..(@chess_board_height - 1), fn row ->
+        Enum.map(0..(@chess_board_width - 1), fn col ->
+          if(tileIsLight(row, col), do: '▊', else: ' ')
+          |> List.duplicate(tile_width)
+        end)
+        |> Enum.join("")
+      end)
+
+    Enum.flat_map(rows, fn row -> Enum.map(1..tile_height, fn _ -> row end) end)
+  end
+end

lib/chessh/ssh/client/board/server.ex

@@ -0,0 +1,19 @@
+# defmodule Chessh.SSH.Client.Board.Server do
+#  use GenServer
+#
+#  defmodule State do
+#    defstruct game_id: nil,
+#              binbo_pid: nil
+#  end
+#
+#  def init([%State{game_id: game_id} = state]) do
+#    {:ok, binbo_pid} = GenServer.start_link(:binbo, [])
+#
+#    :syn.join(:games, {:game, game_id})
+#    {:ok, state}
+#  end
+#
+#  def handle_cast({:new_move, attempted_move}, %State{game_id: game_id} = state) do
+#    {:no_reply, state}
+#  end
+# end

lib/chessh/ssh/client/client.ex

@@ -0,0 +1,147 @@
+defmodule Chessh.SSH.Client do
+  alias IO.ANSI
+  require Logger
+
+  use GenServer
+
+  @clear_codes [
+    ANSI.clear(),
+    ANSI.home()
+  ]
+
+  @min_terminal_width 64
+  @min_terminal_height 38
+  @max_terminal_width 220
+  @max_terminal_height 100
+
+  defmodule State do
+    defstruct tui_pid: nil,
+              width: 0,
+              height: 0,
+              player_session: nil,
+              screen_processes: []
+  end
+
+  @impl true
+  def init([%State{} = state]) do
+    {:ok, screen_pid} =
+      GenServer.start_link(Chessh.SSH.Client.Board, [
+        %Chessh.SSH.Client.Board.State{client_pid: self()}
+      ])
+
+    {:ok, %{state | screen_processes: [screen_pid]}}
+  end
+
+  @impl true
+  def handle_info(:quit, %State{} = state) do
+    {:stop, :normal, state}
+  end
+
+  @impl true
+  def handle_info(msg, state) do
+    [burst_ms, burst_rate] =
+      Application.get_env(:chessh, RateLimits)
+      |> Keyword.take([:player_session_message_burst_ms, :player_session_message_burst_rate])
+      |> Keyword.values()
+
+    case Hammer.check_rate_inc(
+           "player-session-#{state.player_session.id}-burst-message-rate",
+           burst_ms,
+           burst_rate,
+           1
+         ) do
+      {:allow, _count} ->
+        handle(msg, state)
+
+      {:deny, _limit} ->
+        {:noreply, state}
+    end
+  end
+
+  def handle(
+        {:data, data},
+        %State{width: width, height: height, screen_processes: [screen_pid | _]} = state
+      ) do
+    action = keymap(data)
+
+    if action == :quit do
+      {:stop, :normal, state}
+    else
+      send(screen_pid, {:input, width, height, action})
+      {:noreply, state}
+    end
+  end
+
+  def handle(
+        :refresh,
+        %State{} = state
+      ) do
+    render(state)
+    {:noreply, state}
+  end
+
+  def handle(
+        {:send_to_ssh, data},
+        %State{width: width, height: height, tui_pid: tui_pid} = state
+      ) do
+    case get_terminal_dim_msg(width, height) do
+      {true, msg} -> send(tui_pid, {:send_data, msg})
+      {false, _} -> send(tui_pid, {:send_data, data})
+    end
+
+    {:noreply, state}
+  end
+
+  def handle(
+        {:resize, {width, height}},
+        %State{tui_pid: tui_pid, screen_processes: [screen_pid | _]} = state
+      ) do
+    case get_terminal_dim_msg(width, height) do
+      {true, msg} -> send(tui_pid, {:send_data, msg})
+      {false, _} -> send(screen_pid, {:render, width, height})
+    end
+
+    {:noreply, %State{state | width: width, height: height}}
+  end
+
+  def keymap(key) do
+    case key do
+      # Exit keys - C-c and C-d
+      <<3>> -> :quit
+      <<4>> -> :quit
+      # Arrow keys
+      "\e[A" -> :up
+      "\e[B" -> :down
+      "\e[D" -> :left
+      "\e[C" -> :right
+      "\r" -> :return
+      x -> x
+    end
+  end
+
+  defp get_terminal_dim_msg(width, height) do
+    case {height > @max_terminal_height, height < @min_terminal_height,
+          width > @max_terminal_width, width < @min_terminal_width} do
+      {true, _, _, _} -> {true, @clear_codes ++ ["The terminal height is too large."]}
+      {_, true, _, _} -> {true, @clear_codes ++ ["The terminal height is too small."]}
+      {_, _, true, _} -> {true, @clear_codes ++ ["The terminal width is too large"]}
+      {_, _, _, true} -> {true, @clear_codes ++ ["The terminal width is too small."]}
+      {false, false, false, false} -> {false, nil}
+    end
+  end
+
+  defp render(%State{
+         tui_pid: tui_pid,
+         width: width,
+         height: height,
+         screen_processes: [screen_pid | _]
+       }) do
+    {out_of_range, msg} = get_terminal_dim_msg(width, height)
+
+    if out_of_range && msg do
+      send(tui_pid, {:send_data, msg})
+    else
+      send(screen_pid, {:render, width, height})
+    end
+  end
+end

lib/chessh/ssh/client/menu.ex

@@ -0,0 +1,90 @@
+defmodule Chessh.SSH.Client.Menu do
+  alias Chessh.Utils
+  alias IO.ANSI
+
+  require Logger
+
+  defmodule State do
+    defstruct client_pid: nil,
+              selected: 0
+  end
+
+  @logo "                            Simponic's                           
+         dP                MP\"\"\"\"\"\"`MM MP\"\"\"\"\"\"`MM M\"\"MMMMM\"\"MM 
+         88                M  mmmmm..M M  mmmmm..M M  MMMMM  MM 
+.d8888b. 88d888b. .d8888b. M.      `YM M.      `YM M         `M 
+88'  `\"\" 88'  `88 88ooood8 MMMMMMM.  M MMMMMMM.  M M  MMMMM  MM 
+88.  ... 88    88 88.  ... M. .MMM'  M M. .MMM'  M M  MMMMM  MM 
+`88888P' dP    dP `88888P' Mb.     .dM Mb.     .dM M  MMMMM  MM 
+                           MMMMMMMMMMM MMMMMMMMMMM MMMMMMMMMMMM"
+  use Chessh.SSH.Client.Screen
+
+  def init([%State{} = state | _]) do
+    {:ok, state}
+  end
+
+  @options [
+    {"Option 1", {}},
+    {"Option 2", {}},
+    {"Option 3", {}}
+  ]
+
+  def input(width, height, action, %State{client_pid: client_pid, selected: selected} = state) do
+    new_state =
+      case(action) do
+        :up ->
+          %State{
+            state
+            | selected: Utils.wrap_around(selected, -1, length(@options))
+          }
+
+        :down ->
+          %State{state | selected: Utils.wrap_around(selected, 1, length(@options))}
+
+        #      :return ->
+        #        {_, new_state} = Enum.at(@options, selected)
+        #        new_state
+
+        _ ->
+          state
+      end
+
+    send(client_pid, {:send_to_ssh, render_state(width, height, new_state)})
+    new_state
+  end
+
+  def render(width, height, %State{client_pid: client_pid} = state) do
+    send(client_pid, {:send_to_ssh, render_state(width, height, state)})
+    state
+  end
+
+  defp render_state(
+         width,
+         height,
+         %State{selected: selected}
+       ) do
+    logo_lines = String.split(@logo, "\n")
+    {logo_width, logo_height} = Utils.text_dim(@logo)
+    {y, x} = Utils.center_rect({logo_width, logo_height + length(logo_lines)}, {width, height})
+
+    [ANSI.clear()] ++
+      Enum.flat_map(
+        Enum.zip(1..length(logo_lines), logo_lines),
+        fn {i, line} ->
+          [
+            ANSI.cursor(y + i, x),
+            line
+          ]
+        end
+      ) ++
+      Enum.flat_map(
+        Enum.zip(0..(length(@options) - 1), @options),
+        fn {i, {option, _}} ->
+          [
+            ANSI.cursor(y + length(logo_lines) + i + 1, x),
+            if(i == selected, do: ANSI.format([:bright, :light_cyan, "+ #{option}"]), else: option)
+          ]
+        end
+      ) ++ [ANSI.home()]
+  end
+end

lib/chessh/ssh/client/screen.ex

@@ -0,0 +1,18 @@
+defmodule Chessh.SSH.Client.Screen do
+  @callback render(width :: integer(), height :: integer(), state :: any()) :: any()
+  @callback input(width :: integer(), height :: integer(), action :: any(), state :: any()) ::
+              any()
+
+  defmacro __using__(_) do
+    quote do
+      @behaviour Chessh.SSH.Client.Screen
+      use GenServer
+
+      def handle_info({:render, width, height}, state),
+        do: {:noreply, render(width, height, state)}
+
+      def handle_info({:input, width, height, action}, state),
+        do: {:noreply, input(width, height, action, state)}
+    end
+  end
+end

lib/chessh/ssh/screens/board.ex

@@ -1,31 +0,0 @@
-defmodule Chessh.SSH.Client.Board do
-  alias Chessh.SSH.Client
-  alias IO.ANSI
-
-  require Logger
-
-  defmodule State do
-    defstruct cursor_x: 0,
-              cursor_y: 0
-  end
-
-  use Chessh.SSH.Client.Screen
-
-  def render(%Client.State{} = _state) do
-    knight = @ascii_chars["pieces"]["white"]["knight"]
-
-    [ANSI.home()] ++
-      Enum.map(
-        Enum.zip(0..(length(knight) - 1), knight),
-        fn {i, line} ->
-          [ANSI.cursor(i, 0), line]
-        end
-      )
-  end
-
-  def handle_input(action, %Client.State{} = state) do
-    case action do
-      _ -> state
-    end
-  end
-end

lib/chessh/ssh/screens/menu.ex

@@ -1,105 +0,0 @@
-defmodule Chessh.SSH.Client.Menu do
-  alias Chessh.SSH.Client
-  alias Chessh.Utils
-  alias IO.ANSI
-
-  require Logger
-
-  defmodule State do
-    defstruct y: 0,
-              x: 0,
-              selected: 0
-  end
-
-  use Chessh.SSH.Client.Screen
-
-  @logo "                            Simponic's                           
-         dP                MP\"\"\"\"\"\"`MM MP\"\"\"\"\"\"`MM M\"\"MMMMM\"\"MM 
-         88                M  mmmmm..M M  mmmmm..M M  MMMMM  MM 
-.d8888b. 88d888b. .d8888b. M.      `YM M.      `YM M         `M 
-88'  `\"\" 88'  `88 88ooood8 MMMMMMM.  M MMMMMMM.  M M  MMMMM  MM 
-88.  ... 88    88 88.  ... M. .MMM'  M M. .MMM'  M M  MMMMM  MM 
-`88888P' dP    dP `88888P' Mb.     .dM Mb.     .dM M  MMMMM  MM 
-                           MMMMMMMMMMM MMMMMMMMMMM MMMMMMMMMMMM"
-
-  @options [
-    {"Option 1", {Chessh.SSH.Client.Board, %{}}},
-    {"Option 2", {Chessh.SSH.Client.Board, %{}}},
-    {"Option 3", {Chessh.SSH.Client.Board, %{}}}
-  ]
-
-  def render(%Client.State{
-        width: width,
-        height: height,
-        state_stack: [{_this_module, %State{selected: selected, y: dy, x: dx}} | _tail]
-      }) do
-    text = String.split(@logo, "\n")
-    {logo_width, logo_height} = Utils.text_dim(@logo)
-    {y, x} = center_rect({logo_width, logo_height + length(text)}, {width, height})
-
-    Enum.flat_map(
-      Enum.zip(0..(length(text) - 1), text),
-      fn {i, line} ->
-        [
-          ANSI.cursor(y + i + dy, x + dx),
-          line
-        ]
-      end
-    ) ++
-      Enum.flat_map(
-        Enum.zip(0..(length(@options) - 1), @options),
-        fn {i, {option, _}} ->
-          [
-            ANSI.cursor(y + length(text) + i + dy, x + dx),
-            if(i == selected, do: ANSI.format([:light_cyan, "* #{option}"]), else: option)
-          ]
-        end
-      ) ++ [ANSI.home()]
-  end
-
-  def wrap_around(index, delta, length) do
-    calc = index + delta
-    if(calc < 0, do: length, else: 0) + rem(calc, length)
-  end
-
-  def handle_input(
-        data,
-        %Client.State{
-          state_stack:
-            [{this_module, %State{selected: selected} = screen_state} | tail] = state_stack
-        } = state
-      ) do
-    case(data) do
-      :up ->
-        %Client.State{
-          state
-          | state_stack: [
-              {this_module,
-               %State{screen_state | selected: wrap_around(selected, -1, length(@options))}}
-              | tail
-            ]
-        }
-
-      :down ->
-        %Client.State{
-          state
-          | state_stack: [
-              {this_module,
-               %State{screen_state | selected: wrap_around(selected, 1, length(@options))}}
-              | tail
-            ]
-        }
-
-      :return ->
-        {_, new_state} = Enum.at(@options, selected)
-
-        %Client.State{
-          state
-          | state_stack: [new_state] ++ state_stack
-        }
-
-      _ ->
-        state
-    end
-  end
-end

lib/chessh/ssh/screens/screen.ex

@@ -1,22 +0,0 @@
-defmodule Chessh.SSH.Client.Screen do
-  @callback render(state :: Chessh.SSH.Client.State.t() | any()) :: any()
-  @callback handle_input(action :: any(), state :: Chessh.SSH.Client.State.t()) ::
-              Chessh.SSH.Client.State.t()
-
-  defmacro __using__(_) do
-    quote do
-      @behaviour Chessh.SSH.Client.Screen
-
-      @ascii_chars Application.compile_env!(:chessh, :ascii_chars_json_file)
-                   |> File.read!()
-                   |> Jason.decode!()
-
-      def center_rect({rect_width, rect_height}, {parent_width, parent_height}) do
-        {
-          div(parent_height - rect_height, 2),
-          div(parent_width - rect_width, 2)
-        }
-      end
-    end
-  end
-end

lib/chessh/ssh/tui.ex

@@ -26,7 +26,7 @@ defmodule Chessh.SSH.Tui do
     {:ok, init_state}
   end
 
-  def handle_msg({:ssh_channel_up, channel_id, connection_ref}, state) do
+  def handle_msg({:ssh_channel_up, channel_id, connection_ref}, %State{} = state) do
     Logger.debug("SSH channel up #{inspect(:ssh.connection_info(connection_ref))}")
 
     connected_player =
@@ -54,7 +54,7 @@ defmodule Chessh.SSH.Tui do
             :syn.join(:player_sessions, {:session, session.id}, self())
 
             {:ok,
-             %{
+             %State{
                state
                | channel_id: channel_id,
                  connection_ref: connection_ref,
@@ -66,7 +66,7 @@ defmodule Chessh.SSH.Tui do
 
   def handle_msg(
         {:EXIT, client_pid, _reason},
-        %{client_pid: client_pid, channel_id: channel_id} = state
+        %State{client_pid: client_pid, channel_id: channel_id} = state
       ) do
     send(client_pid, :quit)
     {:stop, channel_id, state}
@@ -74,16 +74,15 @@ defmodule Chessh.SSH.Tui do
 
   def handle_msg(
         {:send_data, data},
-        %{connection_ref: connection_ref, channel_id: channel_id} = state
+        %State{connection_ref: connection_ref, channel_id: channel_id} = state
       ) do
-    Logger.debug("Data was sent to TUI process #{inspect(data)}")
     :ssh_connection.send(connection_ref, channel_id, data)
     {:ok, state}
   end
 
   def handle_msg(
         :session_closed,
-        %{connection_ref: connection_ref, channel_id: channel_id} = state
+        %State{connection_ref: connection_ref, channel_id: channel_id} = state
       ) do
     :ssh_connection.send(connection_ref, channel_id, @session_closed_message)
     {:stop, channel_id, state}
@@ -95,9 +94,8 @@ defmodule Chessh.SSH.Tui do
 
   def handle_ssh_msg(
         {:ssh_cm, _connection_handler, {:data, _channel_id, _type, data}},
-        state
+        %State{} = state
       ) do
-    Logger.debug("DATA #{inspect(data)}")
     send(state.client_pid, {:data, data})
     {:ok, state}
   end
@@ -105,7 +103,7 @@ defmodule Chessh.SSH.Tui do
   def handle_ssh_msg(
         {:ssh_cm, connection_handler,
          {:pty, channel_id, want_reply?, {_term, width, height, _pixwidth, _pixheight, _opts}}},
-        state
+        %State{} = state
       ) do
     Logger.debug("#{inspect(state.player_session)} has requested a PTY")
     :ssh_connection.reply_request(connection_handler, want_reply?, :success, channel_id)
@@ -130,13 +128,12 @@ defmodule Chessh.SSH.Tui do
   def handle_ssh_msg(
         {:ssh_cm, _connection_handler,
          {:window_change, _channel_id, width, height, _pixwidth, _pixheight}},
-        %{client_pid: client_pid} = state
+        %State{client_pid: client_pid} = state
       ) do
-    Logger.debug("WINDOW CHANGE")
     send(client_pid, {:resize, {width, height}})
 
     {:ok,
-     %{
+     %State{
        state
        | width: width,
          height: height
@@ -160,12 +157,13 @@ defmodule Chessh.SSH.Tui do
         }
       ])
 
-    {:ok, %{state | client_pid: client_pid}}
+    send(client_pid, :refresh)
+    {:ok, %State{state | client_pid: client_pid}}
   end
 
   def handle_ssh_msg(
         {:ssh_cm, connection_handler, {:exec, channel_id, want_reply?, cmd}},
-        state
+        %State{} = state
       ) do
     :ssh_connection.reply_request(connection_handler, want_reply?, :success, channel_id)
     Logger.debug("EXEC #{cmd}")
@@ -174,7 +172,7 @@ defmodule Chessh.SSH.Tui do
 
   def handle_ssh_msg(
         {:ssh_cm, _connection_handler, {:eof, _channel_id}},
-        state
+        %State{} = state
       ) do
     Logger.debug("EOF")
     {:ok, state}
@@ -182,7 +180,7 @@ defmodule Chessh.SSH.Tui do
 
   def handle_ssh_msg(
         {:ssh_cm, _connection_handler, {:signal, _channel_id, signal}},
-        state
+        %State{} = state
       ) do
     Logger.debug("SIGNAL #{signal}")
     {:ok, state}
@@ -190,7 +188,7 @@ defmodule Chessh.SSH.Tui do
 
   def handle_ssh_msg(
         {:ssh_cm, _connection_handler, {:exit_signal, channel_id, signal, err, lang}},
-        state
+        %State{} = state
       ) do
     Logger.debug("EXIT SIGNAL #{signal} #{err} #{lang}")
     {:stop, channel_id, state}
@@ -198,7 +196,7 @@ defmodule Chessh.SSH.Tui do
 
   def handle_ssh_msg(
         {:ssh_cm, _connection_handler, {:exit_STATUS, channel_id, status}},
-        state
+        %State{} = state
       ) do
     Logger.debug("EXIT STATUS #{status}")
     {:stop, channel_id, state}
@@ -206,7 +204,7 @@ defmodule Chessh.SSH.Tui do
 
   def handle_ssh_msg(
         msg,
-        %{channel_id: channel_id} = state
+        %State{channel_id: channel_id} = state
       ) do
     Logger.debug("UNKOWN MESSAGE #{inspect(msg)}")
     {:stop, channel_id, state}

lib/chessh/utils.ex

@@ -1,4 +1,23 @@
 defmodule Chessh.Utils do
+  @ascii_chars Application.compile_env!(:chessh, :ascii_chars_json_file)
+               |> File.read!()
+               |> Jason.decode!()
+
+  @clear_codes [
+    IO.ANSI.clear(),
+    IO.ANSI.home()
+  ]
+
+  def ascii_chars(), do: @ascii_chars
+  def clear_codes(), do: @clear_codes
+
+  def center_rect({rect_width, rect_height}, {parent_width, parent_height}) do
+    {
+      div(parent_height - rect_height, 2),
+      div(parent_width - rect_width, 2)
+    }
+  end
+
   def pid_to_str(pid) do
     pid
     |> :erlang.pid_to_list()
@@ -11,4 +30,9 @@ defmodule Chessh.Utils do
     split = String.split(text, "\n")
     {Enum.reduce(split, 0, fn x, acc -> max(acc, String.length(x)) end), length(split)}
   end
+
+  def wrap_around(index, delta, length) do
+    calc = index + delta
+    if(calc < 0, do: length, else: 0) + rem(calc, length)
+  end
 end

mix.exs

@@ -27,7 +27,7 @@ defmodule Chessh.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:chess, "~> 0.4.1"},
+      {:binbo, "~> 4.0.2"},
       {:ecto, "~> 3.9"},
       {:ecto_sql, "~> 3.9"},
       {:postgrex, "~> 0.16.5"},

mix.lock

@@ -1,5 +1,6 @@
 %{
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.0.1", "9be815469e6bfefec40fa74658ecbbe6897acfb57614df1416eeccd4903f602c", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "486bb95efb645d1efc6794c1ddd776a186a9a713abf06f45708a6ce324fb96cf"},
+  "binbo": {:hex, :binbo, "4.0.3", "f6d884e523504595f4445000c5520eb8532dafb94d34b7c572290795868a12e0", [:rebar3], [{:uef, "2.6.0", [hex: :uef, repo: "hexpm", optional: false]}], "hexpm", "3029775a3afaa3377a9ffac4973a3cfc7aa51c1f4b1ceebd2e546ad0161fe1bb"},
   "chess": {:hex, :chess, "0.4.1", "34c04abed2db81e0c56476c8e74fd85ef4e1bae23a4cd528e0ce8a052ada976f", [:mix], [], "hexpm", "692e0def99dc25af4af2413839a4605a2a0a713c2646f9afcf3a47c76a6de43d"},
   "comeonin": {:hex, :comeonin, "5.3.3", "2c564dac95a35650e9b6acfe6d2952083d8a08e4a89b93a481acb552b325892e", [:mix], [], "hexpm", "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
@@ -16,4 +17,5 @@
   "postgrex": {:hex, :postgrex, "0.16.5", "fcc4035cc90e23933c5d69a9cd686e329469446ef7abba2cf70f08e2c4b69810", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "edead639dc6e882618c01d8fc891214c481ab9a3788dfe38dd5e37fd1d5fb2e8"},
   "syn": {:hex, :syn, "3.3.0", "4684a909efdfea35ce75a9662fc523e4a8a4e8169a3df275e4de4fa63f99c486", [:rebar3], [], "hexpm", "e58ee447bc1094bdd21bf0acc102b1fbf99541a508cd48060bf783c245eaf7d6"},
   "telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
+  "uef": {:hex, :uef, "2.6.0", "0aa813d125c429e48c1d5abbab89837d8b7bd0499e6ee2f7dc9cc4287a475cfd", [:rebar3], [], "hexpm", "1585cba305dc7c0a3f75aeab15937b324184673d2922148b432edf9beba73d62"},
 }

priv/ascii_chars.json

@@ -1,184 +1,43 @@
 {
   "letters": {
-    "a": [
+    "a": ["    ", " /\\ ", "/--\\"],
-      "    ",
+    "b": [" __ ", "|__)", "|__)"],
-      " /\\ ",
+    "c": [" __ ", "/   ", "\\__ "],
-      "/--\\"
+    "d": [" __ ", "|  \\", "|__/"],
-    ],
+    "e": [" __ ", "|_  ", "|__ "],
-    "b": [
+    "f": [" __ ", "|_  ", "|   "],
-      " __ ",
+    "g": [" __ ", "/ _ ", "\\__\\"],
-      "|__)",
+    "h": [".  .", "|__|", "|  |"]
-      "|__)"
-    ],
-    "c": [
-      " __ ",
-      "/   ",
-      "\\__ "
-    ],
-    "d": [
-      " __ ",
-      "|  \\",
-      "|__/"
-    ],
-    "e": [
-      " __ ",
-      "|_  ",
-      "|__ "
-    ],
-    "f": [
-      " __ ",
-      "|_  ",
-      "|   "
-    ],
-    "g": [
-      " __ ",
-      "/ _ ",
-      "\\__\\"
-    ],
-    "h": [
-      "|  |",
-      "|__|",
-      "|  |"
-    ]
   },
   "numbers": {
-    "0": [
+    "0": [" _ ", "| |", "|_|"],
-      " _ ",
+    "1": ["   ", " /|", "  |"],
-      "| |",
+    "2": [" _ ", "  )", " /_"],
-      "|_|"
+    "3": [" _ ", " _)", " _)"],
-    ],
+    "4": ["  .", " /|", "'-|"],
-    "1": [
+    "5": [" _ ", "|_ ", " _)"],
-      "   ",
+    "6": ["   ", " / ", "(_)"],
-      " /|",
+    "7": [" __", "  /", " / "],
-      "  |"
+    "8": [" _ ", "(_)", "(_)"],
-    ],
+    "9": [" _ ", "(_)", "  )"]
-    "2": [
-      " _ ",
-      "  )",
-      " /_"
-    ],
-    "3": [
-      " _ ",
-      " _)",
-      " _)"
-    ],
-    "4": [
-      "  .",
-      " /|",
-      "'-|"
-    ],
-    "5": [
-      " _ ",
-      "|_ ",
-      " _)"
-    ],
-    "6": [
-      "   ",
-      " / ",
-      "(_)"
-    ],
-    "7": [
-      " __",
-      "  /",
-      " / "
-    ],
-    "8": [
-      " _ ",
-      "(_)",
-      "(_)"
-    ],
-    "9": [
-      " _ ",
-      "(_)",
-      "  )"
-    ]
   },
+
   "pieces": {
-    "white": {
+    "light": {
-      "rook": [
+      "rook": ["   ", "L_|", " U ", "[.]"],
-        "         ",
+      "knight": ["   ", "/`)", " U ", "[.]"],
-        "  [`'`'] ",
+      "bishop": [" . ", "(\\)", " U ", "[.]"],
-        "   |  |  ",
+      "queen": [" . ", ").(", ").(", "[.]"],
-        "   |__|  ",
+      "king": [" + ", ").(", "|.|", "[.]"],
-        "         "
+      "pawn": ["   ", " o ", " U ", "[.]"]
-      ],
-      "knight": [
-        "  _   _ ",
-        "  \\` '/ ",
-        "  (o o) ",
-        "   \\ / \\",
-        "    ^   "
-      ],
-      "queen": [
-        "  /\\+/\\  ",
-        " /(o o)\\ ",
-        "   (_)   ",
-        "         "
-      ],
-      "king": [
-        "         ",
-        "  |`+'|  ",
-        "  (o o)  ",
-        "   (_)   ",
-        "         "
-      ],
-      "bishop": [
-        "         ",
-        "   |v|  ",
-        "  (0 o) ",
-        "   (_)  ",
-        "        "
-      ],
-      "pawn": [
-        "    _    ",
-        "   ( )   ",
-        "   | |   ",
-        "   |_|   ",
-        "         "
-      ]
     },
-    "black": {
+    "dark": {
-      "rook": [
+      "rook": ["   ", "L-|", " U ", "[#]"],
-        "         ",
+      "knight": ["   ", "/`)", " U ", "[#]"],
-        "  [`'`'] ",
+      "bishop": [" . ", "(\\)", " U ", "[#]"],
-        "   |::|  ",
+      "king": [" + ", ")#(", "|#|", "[#]"],
-        "   |::|  ",
+      "queen": [" . ", ")#(", ")#(", "[#]"],
-        "         "
+      "pawn": ["   ", " o ", " U ", "[#]"]
-      ],
-      "knight": [
-        "  _   _ ",
-        "  \\`.'/ ",
-        "  (o:o) ",
-        "   \\:/:\\",
-        "    ^     "
-      ],
-      "queen": [
-        "  /\\+/\\  ",
-        " /(o:o)\\ ",
-        "   (:)   ",
-        "         "
-      ],
-      "king": [
-        "         ",
-        "  |`+'|  ",
-        "  (o:o)  ",
-        "   (:)   ",
-        "         "
-      ],
-      "bishop": [
-        "         ",
-        "   |v|   ",
-        "  (o:o)  ",
-        "   (:)   ",
-        "         "
-      ],
-      "pawn": [
-        "    _    ",
-        "   (:)   ",
-        "   |:|   ",
-        "   |_|   ",
-        "         "
-      ]
     }
   }
 }