From 2ce03d4796ad54f332c70ff88f0a9f3a164bbc4a Mon Sep 17 00:00:00 2001 From: Simponic Date: Wed, 11 Jan 2023 09:54:05 -0700 Subject: Checkpoint\? --- lib/chessh/ssh/client/board/server.ex | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 lib/chessh/ssh/client/board/server.ex (limited to 'lib/chessh/ssh/client/board') diff --git a/lib/chessh/ssh/client/board/server.ex b/lib/chessh/ssh/client/board/server.ex new file mode 100644 index 0000000..2e480e7 --- /dev/null +++ b/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 -- cgit v1.2.3-70-g09d2 From aa2ff6e1374e8a6a546aa04ee3430d1152c58553 Mon Sep 17 00:00:00 2001 From: Simponic Date: Wed, 11 Jan 2023 19:14:47 -0700 Subject: Checkpoint --- lib/chessh/ssh/client/board/board.ex | 113 +++++++++++++++++++++++++++++++++++ lib/chessh/ssh/client/client.ex | 4 +- lib/chessh/ssh/client/menu.ex | 4 -- 3 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 lib/chessh/ssh/client/board/board.ex (limited to 'lib/chessh/ssh/client/board') diff --git a/lib/chessh/ssh/client/board/board.ex b/lib/chessh/ssh/client/board/board.ex new file mode 100644 index 0000000..600917f --- /dev/null +++ b/lib/chessh/ssh/client/board/board.ex @@ -0,0 +1,113 @@ +defmodule Chessh.SSH.Client.Board do + alias IO.ANSI + require Logger + + @chess_board_height 8 + @chess_board_width 8 + @tile_width 7 + @tile_height 4 + + @dark_piece_color ANSI.magenta() + @light_piece_color ANSI.red() + @from_select_background ANSI.green_background() + @to_select_background ANSI.blue_background() + + defmodule State do + defstruct cursor: %{x: 0, y: 0}, + highlighted: %{}, + move_from: nil, + game_id: nil, + client_pid: nil + end + + use Chessh.SSH.Client.Screen + + def init([%State{game_id: game_id} = state | _]) do + :syn.add_node_to_scopes([:games]) + :ok = :syn.join(:games, {:game, game_id}, self()) + + {:ok, state} + end + + def handle_info({:attempted_move, move}, %State{client_pid: client_pid} = state) do + send(client_pid, {:send_to_ssh, ["hello, world!"]}) + {: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 + } = state + ) do + new_cursor = + case action do + :left -> %{y: cursor_y, x: cursor_x - 1} + :right -> %{y: cursor_y, x: cursor_x + 1} + :down -> %{y: cursor_y + 1, x: cursor_x} + :up -> %{y: cursor_y - 1, 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 + + if move_from && move_to do + attempted_move = "#{to_chess_coord(move_from)}#{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_move_from => @from_select_background, + {new_cursor.y, new_cursor.x} => @to_select_background + } + } + + 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{} = _state) do + [ANSI.clear(), "#{width}#{height}"] + end + + defp 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])}#{y + 1}" + 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 +end diff --git a/lib/chessh/ssh/client/client.ex b/lib/chessh/ssh/client/client.ex index 216af71..eff22b8 100644 --- a/lib/chessh/ssh/client/client.ex +++ b/lib/chessh/ssh/client/client.ex @@ -25,8 +25,8 @@ defmodule Chessh.SSH.Client do @impl true def init([%State{} = state]) do {:ok, screen_pid} = - GenServer.start_link(Chessh.SSH.Client.Menu, [ - %Chessh.SSH.Client.Menu.State{client_pid: self()} + GenServer.start_link(Chessh.SSH.Client.Board, [ + %Chessh.SSH.Client.Board.State{client_pid: self()} ]) {:ok, %{state | screen_processes: [screen_pid]}} diff --git a/lib/chessh/ssh/client/menu.ex b/lib/chessh/ssh/client/menu.ex index 7e2ffbc..70cbcce 100644 --- a/lib/chessh/ssh/client/menu.ex +++ b/lib/chessh/ssh/client/menu.ex @@ -23,10 +23,6 @@ defmodule Chessh.SSH.Client.Menu do {:ok, state} end - # @options [ - # {"Option 1", {Chessh.SSH.Client.Board, [%Chessh.SSH.Client.Board.State{}]}}, - # {"Option 2", {Chessh.SSH.Client.Board, [%Chessh.SSH.Client.Board.State{}]}} - # ] @options [ {"Option 1", {}}, {"Option 2", {}}, -- cgit v1.2.3-70-g09d2 From a93119b25033248decda7477575e214a1b254fbd Mon Sep 17 00:00:00 2001 From: Simponic Date: Fri, 13 Jan 2023 10:00:58 -0700 Subject: Binbo start link --- lib/chessh/ssh/client/board.ex | 276 ----------------------------------- lib/chessh/ssh/client/board/board.ex | 219 +++++++++++++++++++++++++-- lib/chessh/ssh/client/client.ex | 2 +- lib/chessh/ssh/client/menu.ex | 9 +- lib/chessh/utils.ex | 5 + 5 files changed, 211 insertions(+), 300 deletions(-) delete mode 100644 lib/chessh/ssh/client/board.ex (limited to 'lib/chessh/ssh/client/board') diff --git a/lib/chessh/ssh/client/board.ex b/lib/chessh/ssh/client/board.ex deleted file mode 100644 index b192cfe..0000000 --- a/lib/chessh/ssh/client/board.ex +++ /dev/null @@ -1,276 +0,0 @@ -# defmodule Chessh.SSH.Client.Board do -# alias Chessh.SSH.Client -# alias IO.ANSI -# -# require Logger -# -# defmodule State do -# defstruct cursor: %{x: 0, y: 0}, -# highlighted: %{}, -# move_from: nil -# end -# -# use GenServer -# use Chessh.SSH.Client.Screen -# -# @chess_board_height 8 -# @chess_board_width 8 -# @tile_width 7 -# @tile_height 4 -# -# @dark_piece_color ANSI.magenta() -# @light_piece_color ANSI.red() -# -# def tileIsLight(row, col) do -# rem(row, 2) == rem(col, 2) -# end -# -# def piece_type(char) do -# case String.capitalize(char) do -# "P" -> "pawn" -# "N" -> "knight" -# "R" -> "rook" -# "B" -> "bishop" -# "K" -> "king" -# "Q" -> "queen" -# _ -> nil -# end -# end -# -# def 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 -# -# 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 -# -# def draw_board( -# fen, -# {tile_width, tile_height} = tile_dims, -# highlights -# ) 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 [rowStr, row] -> -# curr_y = div(row, tile_height) -# -# %{row_chars: row_chars} = -# Enum.reduce( -# Enum.zip(String.graphemes(rowStr), 0..(String.length(rowStr) - 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 = "#{curr_y}, #{curr_x}" -# 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 -# -# case Map.fetch(coordinate_to_piece, key) do -# {:ok, {shade, type}} -> -# piece = @ascii_chars["pieces"][shade][type] -# piece_line = Enum.at(piece, row - curr_y * tile_height) -# -# piece_line_len = String.length(piece_line) -# pad_left_right = div(tile_width - piece_line_len, 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 -# %{ -# row_state -# | current_color: color, -# row_chars: row_chars ++ [prefix, color, new_char] -# } -# else -# %{ -# row_state -# | current_color: current_color, -# row_chars: row_chars ++ [prefix, new_char] -# } -# end -# else -# %{ -# row_state -# | current_color: ANSI.default_color(), -# row_chars: row_chars ++ [prefix, ANSI.default_color(), char] -# } -# end -# -# _ -> -# if ANSI.white() != current_color do -# %{ -# row_state -# | current_color: ANSI.default_color(), -# row_chars: row_chars ++ [prefix, ANSI.default_color(), char] -# } -# else -# %{ -# row_state -# | row_chars: row_chars ++ [prefix, char] -# } -# end -# end -# end -# ) -# -# row_chars -# |> Enum.join("") -# end) -# end -# -# def render(%Client.State{ -# state_stack: [{_this_module, %State{highlighted: highlighted}} | _] -# }) do -# board = -# draw_board( -# "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1", -# {@tile_width, @tile_height}, -# highlighted -# ) -# -# [ANSI.home()] ++ -# Enum.map( -# Enum.zip(1..length(board), board), -# fn {i, line} -> -# [ANSI.cursor(i, 0), line] -# end -# ) -# end -# -# def handle_input( -# action, -# %Client.State{ -# binbo_pid: binbo_pid, -# state_stack: [ -# {this_module, -# %State{ -# move_from: move_from, -# cursor: %{x: cursor_x, y: cursor_y} = cursor -# } = screen_state} -# | rest_stack -# ] -# } = state -# ) do -# new_cursor = -# case action do -# :left -> %{y: cursor_y, x: cursor_x - 1} -# :right -> %{y: cursor_y, x: cursor_x + 1} -# :down -> %{y: cursor_y + 1, x: cursor_x} -# :up -> %{y: cursor_y - 1, 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 -# -# if move_from && move_to do -# # Logger.debug(inspect(attempt_move(%Chess.Game{}, move_from, move_to))) -# attempted_move = "#{to_chess_coord(move_from)}#{to_chess_coord(move_to)}" -# -# case :binbo.move(binbo_pid, attempted_move) do -# # state.game_id}, {:new_move, :attempted_move}) -# {:ok, _} -> :syn.publish(:games, {:game, "asdf"}, {:new_move, attempted_move}) -# end -# end -# -# %Client.State{ -# state -# | state_stack: [ -# {this_module, -# %State{ -# screen_state -# | cursor: new_cursor, -# move_from: new_move_from, -# highlighted: %{ -# new_move_from => ANSI.green_background(), -# {new_cursor.y, new_cursor.x} => ANSI.green_background() -# } -# }} -# | rest_stack -# ] -# } -# end -# -# defp 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])}#{y + 1}" -# end -# end diff --git a/lib/chessh/ssh/client/board/board.ex b/lib/chessh/ssh/client/board/board.ex index 600917f..b7f6da6 100644 --- a/lib/chessh/ssh/client/board/board.ex +++ b/lib/chessh/ssh/client/board/board.ex @@ -1,6 +1,7 @@ defmodule Chessh.SSH.Client.Board do alias IO.ANSI require Logger + alias Chessh.Utils @chess_board_height 8 @chess_board_width 8 @@ -13,11 +14,14 @@ defmodule Chessh.SSH.Client.Board do @to_select_background ANSI.blue_background() defmodule State do - defstruct cursor: %{x: 0, y: 0}, + defstruct cursor: %{x: 7, y: 7}, highlighted: %{}, move_from: nil, game_id: nil, - client_pid: nil + client_pid: nil, + binbo_pid: nil, + width: 0, + height: 0 end use Chessh.SSH.Client.Screen @@ -26,11 +30,17 @@ defmodule Chessh.SSH.Client.Board do :syn.add_node_to_scopes([:games]) :ok = :syn.join(:games, {:game, game_id}, self()) - {:ok, state} + :binbo.start() + {:ok, binbo_pid} = :binbo.new_server() + :binbo.new_game(binbo_pid) + + {:ok, %State{state | binbo_pid: binbo_pid}} end - def handle_info({:attempted_move, move}, %State{client_pid: client_pid} = state) do - send(client_pid, {:send_to_ssh, ["hello, world!"]}) + def handle_info({:new_move, move}, %State{binbo_pid: binbo_pid, client_pid: client_pid} = state) do + :binbo.move(binbo_pid, move) + + send(client_pid, {:send_to_ssh, render_state(state)}) {:noreply, state} end @@ -47,10 +57,10 @@ defmodule Chessh.SSH.Client.Board do ) do new_cursor = case action do - :left -> %{y: cursor_y, x: cursor_x - 1} - :right -> %{y: cursor_y, x: cursor_x + 1} - :down -> %{y: cursor_y + 1, x: cursor_x} - :up -> %{y: cursor_y - 1, x: cursor_x} + :left -> %{y: cursor_y, x: Utils.wrap_around(cursor_x, -1, @chess_board_width)} + :right -> %{y: cursor_y, x: Utils.wrap_around(cursor_x, 1, @chess_board_width)} + :down -> %{y: Utils.wrap_around(cursor_y, 1, @chess_board_height), x: cursor_x} + :up -> %{y: Utils.wrap_around(cursor_y, -1, @chess_board_height), x: cursor_x} _ -> cursor end @@ -68,6 +78,7 @@ defmodule Chessh.SSH.Client.Board do if move_from && move_to do attempted_move = "#{to_chess_coord(move_from)}#{to_chess_coord(move_to)}" + Logger.debug("New move #{attempted_move}") :syn.publish(:games, {:game, game_id}, {:new_move, attempted_move}) end @@ -78,25 +89,201 @@ defmodule Chessh.SSH.Client.Board do highlighted: %{ new_move_from => @from_select_background, {new_cursor.y, new_cursor.x} => @to_select_background - } + }, + width: width, + height: height } - send(client_pid, {:send_to_ssh, render_state(width, height, new_state)}) + 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(width, height, state)}) - state + send(client_pid, {:send_to_ssh, render_state(state)}) + %State{state | width: width, height: height} end - defp render_state(width, height, %State{} = _state) do - [ANSI.clear(), "#{width}#{height}"] + defp render_state(%State{ + width: _width, + height: _height, + binbo_pid: binbo_pid, + highlighted: highlighted + }) do + {:ok, fen} = :binbo.get_fen(binbo_pid) + + board = + draw_board( + fen, + {@tile_width, @tile_height}, + highlighted + ) + + [ANSI.home()] ++ + Enum.map( + Enum.zip(1..length(board), board), + fn {i, line} -> + [ANSI.cursor(i, 0), line] + 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 defp 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])}#{y + 1}" + "#{List.to_string([?a + x])}#{@chess_board_height - y}" + end + + defp tileIsLight(row, col) do + rem(row, 2) == rem(col, 2) + 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 + ) 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 [rowStr, row] -> + curr_y = div(row, tile_height) + + %{row_chars: row_chars} = + Enum.reduce( + Enum.zip(String.graphemes(rowStr), 0..(String.length(rowStr) - 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 = "#{curr_y}, #{curr_x}" + 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 + + case Map.fetch(coordinate_to_piece, key) do + {:ok, {shade, type}} -> + piece = @ascii_chars["pieces"][shade][type] + piece_line = Enum.at(piece, row - curr_y * tile_height) + + piece_line_len = String.length(piece_line) + pad_left_right = div(tile_width - piece_line_len, 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 + %{ + row_state + | current_color: color, + row_chars: row_chars ++ [prefix, color, new_char] + } + else + %{ + row_state + | current_color: current_color, + row_chars: row_chars ++ [prefix, new_char] + } + end + else + %{ + row_state + | current_color: ANSI.default_color(), + row_chars: row_chars ++ [prefix, ANSI.default_color(), char] + } + end + + _ -> + if ANSI.white() != current_color do + %{ + row_state + | current_color: ANSI.default_color(), + row_chars: row_chars ++ [prefix, ANSI.default_color(), char] + } + else + %{ + row_state + | row_chars: row_chars ++ [prefix, char] + } + end + end + end + ) + + row_chars + |> Enum.join("") + end) end defp piece_type(char) do diff --git a/lib/chessh/ssh/client/client.ex b/lib/chessh/ssh/client/client.ex index eff22b8..0560ce0 100644 --- a/lib/chessh/ssh/client/client.ex +++ b/lib/chessh/ssh/client/client.ex @@ -11,7 +11,7 @@ defmodule Chessh.SSH.Client do @min_terminal_width 64 @min_terminal_height 31 - @max_terminal_width 200 + @max_terminal_width 220 @max_terminal_height 100 defmodule State do diff --git a/lib/chessh/ssh/client/menu.ex b/lib/chessh/ssh/client/menu.ex index 70cbcce..6eb2bdd 100644 --- a/lib/chessh/ssh/client/menu.ex +++ b/lib/chessh/ssh/client/menu.ex @@ -35,11 +35,11 @@ defmodule Chessh.SSH.Client.Menu do :up -> %State{ state - | selected: wrap_around(selected, -1, length(@options)) + | selected: Utils.wrap_around(selected, -1, length(@options)) } :down -> - %State{state | selected: wrap_around(selected, 1, length(@options))} + %State{state | selected: Utils.wrap_around(selected, 1, length(@options))} # :return -> # {_, new_state} = Enum.at(@options, selected) @@ -87,9 +87,4 @@ defmodule Chessh.SSH.Client.Menu do end ) ++ [ANSI.home()] end - - defp wrap_around(index, delta, length) do - calc = index + delta - if(calc < 0, do: length, else: 0) + rem(calc, length) - end end diff --git a/lib/chessh/utils.ex b/lib/chessh/utils.ex index 3e83d5e..d1acf44 100644 --- a/lib/chessh/utils.ex +++ b/lib/chessh/utils.ex @@ -11,4 +11,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 -- cgit v1.2.3-70-g09d2 From 07eaad9b8ded7a719183eec84faaf5b168744f01 Mon Sep 17 00:00:00 2001 From: Logan Hunt Date: Fri, 13 Jan 2023 12:20:01 -0700 Subject: Move renderer to its own module --- lib/chessh/ssh/client/board/board.ex | 239 ++++-------------------------- lib/chessh/ssh/client/board/renderer.ex | 248 ++++++++++++++++++++++++++++++++ lib/chessh/ssh/client/client.ex | 2 +- lib/chessh/ssh/client/menu.ex | 2 +- lib/chessh/ssh/client/screen.ex | 16 --- lib/chessh/utils.ex | 19 +++ 6 files changed, 296 insertions(+), 230 deletions(-) create mode 100644 lib/chessh/ssh/client/board/renderer.ex (limited to 'lib/chessh/ssh/client/board') diff --git a/lib/chessh/ssh/client/board/board.ex b/lib/chessh/ssh/client/board/board.ex index b7f6da6..4c57e07 100644 --- a/lib/chessh/ssh/client/board/board.ex +++ b/lib/chessh/ssh/client/board/board.ex @@ -1,17 +1,7 @@ defmodule Chessh.SSH.Client.Board do - alias IO.ANSI require Logger alias Chessh.Utils - - @chess_board_height 8 - @chess_board_width 8 - @tile_width 7 - @tile_height 4 - - @dark_piece_color ANSI.magenta() - @light_piece_color ANSI.red() - @from_select_background ANSI.green_background() - @to_select_background ANSI.blue_background() + alias Chessh.SSH.Client.Board.Renderer defmodule State do defstruct cursor: %{x: 7, y: 7}, @@ -22,6 +12,8 @@ defmodule Chessh.SSH.Client.Board do binbo_pid: nil, width: 0, height: 0 + + # flipped: false end use Chessh.SSH.Client.Screen @@ -38,9 +30,14 @@ defmodule Chessh.SSH.Client.Board do end def handle_info({:new_move, move}, %State{binbo_pid: binbo_pid, client_pid: client_pid} = state) do - :binbo.move(binbo_pid, move) + case :binbo.move(binbo_pid, move) do + {:ok, :continue} -> + send(client_pid, {:send_to_ssh, render_state(state)}) + + _ -> + nil + end - send(client_pid, {:send_to_ssh, render_state(state)}) {:noreply, state} end @@ -53,14 +50,15 @@ defmodule Chessh.SSH.Client.Board do 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, @chess_board_width)} - :right -> %{y: cursor_y, x: Utils.wrap_around(cursor_x, 1, @chess_board_width)} - :down -> %{y: Utils.wrap_around(cursor_y, 1, @chess_board_height), x: cursor_x} - :up -> %{y: Utils.wrap_around(cursor_y, -1, @chess_board_height), x: cursor_x} + :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 @@ -76,9 +74,10 @@ defmodule Chessh.SSH.Client.Board do {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 = "#{to_chess_coord(move_from)}#{to_chess_coord(move_to)}" - Logger.debug("New move #{attempted_move}") + attempted_move = "#{Renderer.to_chess_coord(move_from)}#{Renderer.to_chess_coord(move_to)}" + :syn.publish(:games, {:game, game_id}, {:new_move, attempted_move}) end @@ -87,11 +86,12 @@ defmodule Chessh.SSH.Client.Board do | cursor: new_cursor, move_from: new_move_from, highlighted: %{ - new_move_from => @from_select_background, - {new_cursor.y, new_cursor.x} => @to_select_background + {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)}) @@ -103,198 +103,13 @@ defmodule Chessh.SSH.Client.Board do %State{state | width: width, height: height} end - defp render_state(%State{ - width: _width, - height: _height, - binbo_pid: binbo_pid, - highlighted: highlighted - }) do - {:ok, fen} = :binbo.get_fen(binbo_pid) - - board = - draw_board( - fen, - {@tile_width, @tile_height}, - highlighted - ) - - [ANSI.home()] ++ - Enum.map( - Enum.zip(1..length(board), board), - fn {i, line} -> - [ANSI.cursor(i, 0), line] - 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 - - defp 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 - - defp tileIsLight(row, col) do - rem(row, 2) == rem(col, 2) - 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 + defp render_state( + %State{ + binbo_pid: binbo_pid + } = state ) 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 [rowStr, row] -> - curr_y = div(row, tile_height) - - %{row_chars: row_chars} = - Enum.reduce( - Enum.zip(String.graphemes(rowStr), 0..(String.length(rowStr) - 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 = "#{curr_y}, #{curr_x}" - 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 - - case Map.fetch(coordinate_to_piece, key) do - {:ok, {shade, type}} -> - piece = @ascii_chars["pieces"][shade][type] - piece_line = Enum.at(piece, row - curr_y * tile_height) - - piece_line_len = String.length(piece_line) - pad_left_right = div(tile_width - piece_line_len, 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 - %{ - row_state - | current_color: color, - row_chars: row_chars ++ [prefix, color, new_char] - } - else - %{ - row_state - | current_color: current_color, - row_chars: row_chars ++ [prefix, new_char] - } - end - else - %{ - row_state - | current_color: ANSI.default_color(), - row_chars: row_chars ++ [prefix, ANSI.default_color(), char] - } - end - - _ -> - if ANSI.white() != current_color do - %{ - row_state - | current_color: ANSI.default_color(), - row_chars: row_chars ++ [prefix, ANSI.default_color(), char] - } - else - %{ - row_state - | row_chars: row_chars ++ [prefix, char] - } - end - end - end - ) - - row_chars - |> Enum.join("") - end) - end + {:ok, fen} = :binbo.get_fen(binbo_pid) - defp piece_type(char) do - case String.capitalize(char) do - "P" -> "pawn" - "N" -> "knight" - "R" -> "rook" - "B" -> "bishop" - "K" -> "king" - "Q" -> "queen" - _ -> nil - end + Renderer.render_board_state(fen, state) end end diff --git a/lib/chessh/ssh/client/board/renderer.ex b/lib/chessh/ssh/client/board/renderer.ex new file mode 100644 index 0000000..16987c7 --- /dev/null +++ b/lib/chessh/ssh/client/board/renderer.ex @@ -0,0 +1,248 @@ +defmodule Chessh.SSH.Client.Board.Renderer do + alias IO.ANSI + alias Chessh.Utils + alias Chessh.SSH.Client.Board + + @chess_board_height 8 + @chess_board_width 8 + + @tile_width 7 + @tile_height 4 + + @from_select_background ANSI.green_background() + @to_select_background ANSI.blue_background() + @dark_piece_color ANSI.red() + @light_piece_color ANSI.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 + }) do + board = + draw_board( + fen, + {@tile_width, @tile_height}, + highlighted + ) + + [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 + ) 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 = "#{curr_y}, #{curr_x}" + 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 + + 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) + + piece_line_len = String.length(piece_line) + pad_left_right = div(tile_width - piece_line_len, 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 + %{ + row_state + | current_color: color, + row_chars: row_chars ++ [prefix, color, new_char] + } + else + %{ + row_state + | current_color: current_color, + row_chars: row_chars ++ [prefix, new_char] + } + end + else + %{ + row_state + | current_color: ANSI.default_color(), + row_chars: row_chars ++ [prefix, ANSI.default_color(), char] + } + end + + _ -> + if ANSI.white() != current_color do + %{ + row_state + | current_color: ANSI.default_color(), + row_chars: row_chars ++ [prefix, ANSI.default_color(), char] + } + else + %{ + row_state + | row_chars: row_chars ++ [prefix, char] + } + end + end + end + ) + + curr_num = Utils.ascii_chars()["numbers"][Integer.to_string(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) ++ + Enum.map(0..(@tile_height - 1), fn row -> + String.duplicate(" ", @tile_width) <> + (Enum.map(0..(@chess_board_width - 1), 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)) + |> Enum.map(fn row_line -> "#{ANSI.default_background()}#{row_line}" 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 diff --git a/lib/chessh/ssh/client/client.ex b/lib/chessh/ssh/client/client.ex index 0560ce0..10dd3b2 100644 --- a/lib/chessh/ssh/client/client.ex +++ b/lib/chessh/ssh/client/client.ex @@ -10,7 +10,7 @@ defmodule Chessh.SSH.Client do ] @min_terminal_width 64 - @min_terminal_height 31 + @min_terminal_height 38 @max_terminal_width 220 @max_terminal_height 100 diff --git a/lib/chessh/ssh/client/menu.ex b/lib/chessh/ssh/client/menu.ex index 6eb2bdd..c207872 100644 --- a/lib/chessh/ssh/client/menu.ex +++ b/lib/chessh/ssh/client/menu.ex @@ -65,7 +65,7 @@ defmodule Chessh.SSH.Client.Menu do ) do logo_lines = String.split(@logo, "\n") {logo_width, logo_height} = Utils.text_dim(@logo) - {y, x} = center_rect({logo_width, logo_height + length(logo_lines)}, {width, height}) + {y, x} = Utils.center_rect({logo_width, logo_height + length(logo_lines)}, {width, height}) [ANSI.clear()] ++ Enum.flat_map( diff --git a/lib/chessh/ssh/client/screen.ex b/lib/chessh/ssh/client/screen.ex index 8eb9f21..0437b23 100644 --- a/lib/chessh/ssh/client/screen.ex +++ b/lib/chessh/ssh/client/screen.ex @@ -8,22 +8,6 @@ defmodule Chessh.SSH.Client.Screen do @behaviour Chessh.SSH.Client.Screen use GenServer - @clear_codes [ - IO.ANSI.clear(), - IO.ANSI.home() - ] - - @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 - def handle_info({:render, width, height}, state), do: {:noreply, render(width, height, state)} diff --git a/lib/chessh/utils.ex b/lib/chessh/utils.ex index d1acf44..20a8b96 100644 --- a/lib/chessh/utils.ex +++ b/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() -- cgit v1.2.3-70-g09d2 From b072f8421ce3caf4e00b3d6881259f595f57c045 Mon Sep 17 00:00:00 2001 From: Simponic Date: Fri, 13 Jan 2023 13:49:24 -0700 Subject: Add flipped --- lib/chessh/ssh/client/board/board.ex | 26 +++-- lib/chessh/ssh/client/board/renderer.ex | 166 +++++++++++++++++--------------- 2 files changed, 106 insertions(+), 86 deletions(-) (limited to 'lib/chessh/ssh/client/board') diff --git a/lib/chessh/ssh/client/board/board.ex b/lib/chessh/ssh/client/board/board.ex index 4c57e07..cbbade5 100644 --- a/lib/chessh/ssh/client/board/board.ex +++ b/lib/chessh/ssh/client/board/board.ex @@ -11,14 +11,13 @@ defmodule Chessh.SSH.Client.Board do client_pid: nil, binbo_pid: nil, width: 0, - height: 0 - - # flipped: false + height: 0, + flipped: false end use Chessh.SSH.Client.Screen - def init([%State{game_id: game_id} = state | _]) do + 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()) @@ -26,6 +25,8 @@ defmodule Chessh.SSH.Client.Board do {: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 @@ -49,8 +50,8 @@ defmodule Chessh.SSH.Client.Board do move_from: move_from, game_id: game_id, cursor: %{x: cursor_x, y: cursor_y} = cursor, - client_pid: client_pid - # flipped: flipped + client_pid: client_pid, + flipped: flipped } = state ) do new_cursor = @@ -76,7 +77,11 @@ defmodule Chessh.SSH.Client.Board do # TODO: Check move here, then publish new move, subscribers get from DB instead if move_from && move_to do - attempted_move = "#{Renderer.to_chess_coord(move_from)}#{Renderer.to_chess_coord(move_to)}" + 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 @@ -90,8 +95,8 @@ defmodule Chessh.SSH.Client.Board do new_move_from => Renderer.from_select_background() }, width: width, - height: height - # flipped: if(action == "f", do: !flipped, else: flipped) + height: height, + flipped: if(action == "f", do: !flipped, else: flipped) } send(client_pid, {:send_to_ssh, render_state(new_state)}) @@ -103,6 +108,9 @@ defmodule Chessh.SSH.Client.Board do %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 diff --git a/lib/chessh/ssh/client/board/renderer.ex b/lib/chessh/ssh/client/board/renderer.ex index 16987c7..8c0267c 100644 --- a/lib/chessh/ssh/client/board/renderer.ex +++ b/lib/chessh/ssh/client/board/renderer.ex @@ -2,6 +2,7 @@ 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 @@ -27,13 +28,15 @@ defmodule Chessh.SSH.Client.Board.Renderer do def render_board_state(fen, %Board.State{ width: _width, height: _height, - highlighted: highlighted + highlighted: highlighted, + flipped: flipped }) do board = draw_board( fen, {@tile_width, @tile_height}, - highlighted + highlighted, + flipped ) [ANSI.home()] ++ @@ -109,7 +112,8 @@ defmodule Chessh.SSH.Client.Board.Renderer do defp draw_board( fen, {tile_width, tile_height} = tile_dims, - highlights + highlights, + flipped ) do coordinate_to_piece = make_coordinate_to_piece_art_map(fen) board = make_board(tile_dims) @@ -123,7 +127,10 @@ defmodule Chessh.SSH.Client.Board.Renderer do %{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 = "#{curr_y}, #{curr_x}" + + 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 = @@ -137,63 +144,54 @@ defmodule Chessh.SSH.Client.Board.Renderer do end end - 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) - - piece_line_len = String.length(piece_line) - pad_left_right = div(tile_width - piece_line_len, 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 - %{ - row_state - | current_color: color, - row_chars: row_chars ++ [prefix, color, new_char] - } + {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 - %{ - row_state - | current_color: current_color, - row_chars: row_chars ++ [prefix, new_char] - } + {ANSI.default_color(), row_chars ++ [prefix, ANSI.default_color(), char]} end - else - %{ - row_state - | current_color: ANSI.default_color(), - row_chars: row_chars ++ [prefix, ANSI.default_color(), char] - } - end - _ -> - if ANSI.white() != current_color do - %{ - row_state - | current_color: ANSI.default_color(), - row_chars: row_chars ++ [prefix, ANSI.default_color(), char] - } - else - %{ - row_state - | row_chars: row_chars ++ [prefix, char] - } - end - 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(curr_y)] + 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( @@ -208,31 +206,45 @@ defmodule Chessh.SSH.Client.Board.Renderer do ] ++ row_chars, "" ) - end) ++ - Enum.map(0..(@tile_height - 1), fn row -> - String.duplicate(" ", @tile_width) <> - (Enum.map(0..(@chess_board_width - 1), 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) ++ 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 render_flipped(rows, flipped) do + if !flipped do + rows + else + rows + end + end + defp make_board({tile_width, tile_height}) do rows = Enum.map(0..(@chess_board_height - 1), fn row -> -- cgit v1.2.3-70-g09d2 From 80843947e05cc464f54df7ad6838f5a16d9e7133 Mon Sep 17 00:00:00 2001 From: Logan Hunt Date: Fri, 13 Jan 2023 16:44:45 -0700 Subject: Remove warnings --- lib/chessh/ssh/client/board/renderer.ex | 8 -------- lib/chessh/ssh/tui.ex | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'lib/chessh/ssh/client/board') diff --git a/lib/chessh/ssh/client/board/renderer.ex b/lib/chessh/ssh/client/board/renderer.ex index 8c0267c..845e538 100644 --- a/lib/chessh/ssh/client/board/renderer.ex +++ b/lib/chessh/ssh/client/board/renderer.ex @@ -237,14 +237,6 @@ defmodule Chessh.SSH.Client.Board.Renderer do end) end - defp render_flipped(rows, flipped) do - if !flipped do - rows - else - rows - end - end - defp make_board({tile_width, tile_height}) do rows = Enum.map(0..(@chess_board_height - 1), fn row -> diff --git a/lib/chessh/ssh/tui.ex b/lib/chessh/ssh/tui.ex index c1c763b..1838fb8 100644 --- a/lib/chessh/ssh/tui.ex +++ b/lib/chessh/ssh/tui.ex @@ -103,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{client_pid: client_pid} = 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) -- cgit v1.2.3-70-g09d2 From 3a6c603b0b12964d8a04ae4f78fb61bc094adf12 Mon Sep 17 00:00:00 2001 From: Logan Hunt Date: Fri, 13 Jan 2023 17:02:11 -0700 Subject: Change some colors around --- lib/chessh/ssh/client/board/renderer.ex | 6 +++--- priv/ascii_chars.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/chessh/ssh/client/board') diff --git a/lib/chessh/ssh/client/board/renderer.ex b/lib/chessh/ssh/client/board/renderer.ex index 845e538..fa8648f 100644 --- a/lib/chessh/ssh/client/board/renderer.ex +++ b/lib/chessh/ssh/client/board/renderer.ex @@ -10,10 +10,10 @@ defmodule Chessh.SSH.Client.Board.Renderer do @tile_width 7 @tile_height 4 - @from_select_background ANSI.green_background() + @from_select_background ANSI.light_blue_background() @to_select_background ANSI.blue_background() - @dark_piece_color ANSI.red() - @light_piece_color ANSI.magenta() + @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 diff --git a/priv/ascii_chars.json b/priv/ascii_chars.json index 1be31f8..fe7d12e 100644 --- a/priv/ascii_chars.json +++ b/priv/ascii_chars.json @@ -7,7 +7,7 @@ "e": [" __ ", "|_ ", "|__ "], "f": [" __ ", "|_ ", "| "], "g": [" __ ", "/ _ ", "\\__\\"], - "h": ["| |", "|__|", "| |"] + "h": [". .", "|__|", "| |"] }, "numbers": { "0": [" _ ", "| |", "|_|"], -- cgit v1.2.3-70-g09d2