From 11b858533e6aad18e1417f1d28980f86527c656b Mon Sep 17 00:00:00 2001 From: Zack Buhman Date: Mon, 20 May 2024 04:44:31 -0500 Subject: [PATCH] gap_buffer: the cursor can jump vertically to adjacent lines --- maple/maple_bus_ft6_key_scan_codes.hpp | 12 +- regs/maple_bus_ft6_key_scan_codes.csv | 168 +++++++-------- regs/maple_bus_ft6_key_scan_codes.ods | Bin 17241 -> 17292 bytes text_editor/gap_buffer.cpp | 58 ++++- text_editor/gap_buffer.hpp | 2 + text_editor/text_editor.cpp | 287 +++++++++++++++++++++---- 6 files changed, 397 insertions(+), 130 deletions(-) diff --git a/maple/maple_bus_ft6_key_scan_codes.hpp b/maple/maple_bus_ft6_key_scan_codes.hpp index 3ce6bbc..43f2067 100644 --- a/maple/maple_bus_ft6_key_scan_codes.hpp +++ b/maple/maple_bus_ft6_key_scan_codes.hpp @@ -42,7 +42,7 @@ namespace ft6 { constexpr uint32_t _8_asterisk = 0x25; constexpr uint32_t _9_parenleft = 0x26; constexpr uint32_t _0_parenright = 0x27; - constexpr uint32_t return = 0x28; + constexpr uint32_t _return = 0x28; constexpr uint32_t esc = 0x29; constexpr uint32_t backspace = 0x2a; constexpr uint32_t tab = 0x2b; @@ -78,13 +78,13 @@ namespace ft6 { constexpr uint32_t insert = 0x49; constexpr uint32_t home = 0x4a; constexpr uint32_t page_up = 0x4b; - constexpr uint32_t delete = 0x4c; + constexpr uint32_t _delete = 0x4c; constexpr uint32_t end = 0x4d; constexpr uint32_t page_down = 0x4e; - constexpr uint32_t left = 0x4f; - constexpr uint32_t right = 0x50; - constexpr uint32_t down = 0x51; - constexpr uint32_t up = 0x52; + constexpr uint32_t right_arrow = 0x4f; + constexpr uint32_t left_arrow = 0x50; + constexpr uint32_t down_arrow = 0x51; + constexpr uint32_t up_arrow = 0x52; } } diff --git a/regs/maple_bus_ft6_key_scan_codes.csv b/regs/maple_bus_ft6_key_scan_codes.csv index ba9eae7..e31bc99 100644 --- a/regs/maple_bus_ft6_key_scan_codes.csv +++ b/regs/maple_bus_ft6_key_scan_codes.csv @@ -1,84 +1,84 @@ -"code","usage" -"0x00","no_operation" -"0x01","rollover_error" -"0x02","post_fail" -"0x03","undefined_error" -"0x04","a_A" -"0x05","b_B" -"0x06","c_C" -"0x07","d_D" -"0x08","e_E" -"0x09","f_F" -"0x0a","g_G" -"0x0b","h_H" -"0x0c","i_I" -"0x0d","j_J" -"0x0e","k_K" -"0x0f","l_L" -"0x10","m_M" -"0x11","n_N" -"0x12","o_O" -"0x13","p_P" -"0x14","q_Q" -"0x15","r_R" -"0x16","s_S" -"0x17","t_T" -"0x18","u_U" -"0x19","v_V" -"0x1a","w_W" -"0x1b","x_X" -"0x1c","y_Y" -"0x1d","z_Z" -"0x1e","_1_exclam" -"0x1f","_2_at" -"0x20","_3_numbersign" -"0x21","_4_dollar" -"0x22","_5_percent" -"0x23","_6_asciicircum" -"0x24","_7_ampersand" -"0x25","_8_asterisk" -"0x26","_9_parenleft" -"0x27","_0_parenright" -"0x28","return" -"0x29","esc" -"0x2a","backspace" -"0x2b","tab" -"0x2c","spacebar" -"0x2d","minus_underscore" -"0x2e","equal_plus" -"0x2f","bracketleft_braceleft" -"0x30","bracketright_braceright" -"0x31","backslash_bar" -"0x32","_unknown_" -"0x33","semicolon_colon" -"0x34","apostrophe_quotedbl" -"0x35","grave_asciitilde" -"0x36","comma_less" -"0x37","period_greater" -"0x38","slash_question" -"0x39","caps_lock" -"0x3a","F1" -"0x3b","F2" -"0x3c","F3" -"0x3d","F4" -"0x3e","F5" -"0x3f","F6" -"0x40","F7" -"0x41","F8" -"0x42","F9" -"0x43","F10" -"0x44","F11" -"0x45","F12" -"0x46","print_screen" -"0x47","scroll_lock" -"0x48","pause" -"0x49","insert" -"0x4a","home" -"0x4b","page_up" -"0x4c","delete" -"0x4d","end" -"0x4e","page_down" -"0x4f","left" -"0x50","right" -"0x51","down" -"0x52","up" +"code","usage", +"0x00","no_operation", +"0x01","rollover_error", +"0x02","post_fail", +"0x03","undefined_error", +"0x04","a_A", +"0x05","b_B", +"0x06","c_C", +"0x07","d_D", +"0x08","e_E", +"0x09","f_F", +"0x0a","g_G", +"0x0b","h_H", +"0x0c","i_I", +"0x0d","j_J", +"0x0e","k_K", +"0x0f","l_L", +"0x10","m_M", +"0x11","n_N", +"0x12","o_O", +"0x13","p_P", +"0x14","q_Q", +"0x15","r_R", +"0x16","s_S", +"0x17","t_T", +"0x18","u_U", +"0x19","v_V", +"0x1a","w_W", +"0x1b","x_X", +"0x1c","y_Y", +"0x1d","z_Z", +"0x1e","_1_exclam", +"0x1f","_2_at", +"0x20","_3_numbersign", +"0x21","_4_dollar", +"0x22","_5_percent", +"0x23","_6_asciicircum", +"0x24","_7_ampersand", +"0x25","_8_asterisk", +"0x26","_9_parenleft", +"0x27","_0_parenright", +"0x28","_return", +"0x29","esc", +"0x2a","backspace", +"0x2b","tab", +"0x2c","spacebar", +"0x2d","minus_underscore", +"0x2e","equal_plus","underscore carot" +"0x2f","bracketleft_braceleft","at" +"0x30","bracketright_braceright","braceleft" +"0x31","backslash_bar", +"0x32","_unknown_", +"0x33","semicolon_colon", +"0x34","apostrophe_quotedbl", +"0x35","grave_asciitilde", +"0x36","comma_less", +"0x37","period_greater", +"0x38","slash_question", +"0x39","caps_lock", +"0x3a","F1", +"0x3b","F2", +"0x3c","F3", +"0x3d","F4", +"0x3e","F5", +"0x3f","F6", +"0x40","F7", +"0x41","F8", +"0x42","F9", +"0x43","F10", +"0x44","F11", +"0x45","F12", +"0x46","print_screen", +"0x47","scroll_lock", +"0x48","pause", +"0x49","insert", +"0x4a","home", +"0x4b","page_up", +"0x4c","_delete", +"0x4d","end", +"0x4e","page_down", +"0x4f","right_arrow", +"0x50","left_arrow", +"0x51","down_arrow", +"0x52","up_arrow", diff --git a/regs/maple_bus_ft6_key_scan_codes.ods b/regs/maple_bus_ft6_key_scan_codes.ods index 2a7c6ab861556a9105cdb36bfec308241589fc83..6d4333de77c17f388ad4a98b710717841b23436c 100644 GIT binary patch delta 4686 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 if (gb.buf[i] == '\n') { gb.line.offsets[gb.line.length++] = i; } @@ -77,6 +75,13 @@ void gap_append(struct gap_buffer& gb, char_type c) void gap_pop(struct gap_buffer& gb) { gb.gap_start--; + if (gb.buf[gb.gap_start] == '\n') { + for (int32_t i = gb.line.gap; i < gb.line.length; i++) { + gb.line.offsets[i - 1] = gb.line.offsets[i]; + } + gb.line.gap -= 1; + gb.line.length -= 1; + } } /* @@ -114,3 +119,52 @@ void gap_cursor_pos(struct gap_buffer& gb, int32_t delta) } } } + +void gap_cursor_pos_abs(struct gap_buffer& gb, int32_t pos) +{ + if (pos > gb.gap_start) { + pos -= (gb.gap_end - gb.gap_start); + } + gap_cursor_pos(gb, pos - gb.gap_start); +} + +int32_t gap_column_number(struct gap_buffer& gb) +{ + int32_t line_start = 0; + if (gb.line.gap > 0) + line_start = gb.line.offsets[gb.line.gap - 1] + 1; + return gb.gap_start - line_start; +} + +constexpr inline int32_t min(int32_t a, int32_t b) +{ + return (a < b) ? a : b; +} + +constexpr inline int32_t max(int32_t a, int32_t b) +{ + return (a > b) ? a : b; +} + +void gap_cursor_pos_line(struct gap_buffer& gb, int32_t delta) +{ + if (delta > 0) { + int32_t max_pos_delta = gb.line.length - gb.line.gap; + delta = min(max_pos_delta, delta); + } else { + int32_t min_pos_delta = (-gb.line.gap) - 1; + delta = max(min_pos_delta, delta); + } + if (delta == 0) + return; + int32_t column = gap_column_number(gb); + int32_t offset_ix = (gb.line.gap - 1) + delta; + int32_t buf_ix = 0; + if (offset_ix >= 0) + buf_ix = gb.line.offsets[offset_ix] + 1; + while (buf_ix < gb.size && column > 0 && gb.buf[buf_ix] != '\n') { + buf_ix += 1; + column -= 1; + } + gap_cursor_pos_abs(gb, buf_ix); +} diff --git a/text_editor/gap_buffer.hpp b/text_editor/gap_buffer.hpp index 5211ee8..17e12d9 100644 --- a/text_editor/gap_buffer.hpp +++ b/text_editor/gap_buffer.hpp @@ -32,3 +32,5 @@ void gap_resize(struct gap_buffer& gb); void gap_append(struct gap_buffer& gb, char_type c); void gap_pop(struct gap_buffer& gb); void gap_cursor_pos(struct gap_buffer& gb, int32_t delta); +int32_t gap_column_number(struct gap_buffer& gb); +void gap_cursor_pos_line(struct gap_buffer& gb, int32_t delta); diff --git a/text_editor/text_editor.cpp b/text_editor/text_editor.cpp index 4adeee1..6b4912f 100644 --- a/text_editor/text_editor.cpp +++ b/text_editor/text_editor.cpp @@ -19,6 +19,7 @@ #include "holly/region_array.hpp" #include "twiddle.hpp" #include "palette.hpp" +#include "string.hpp" #include "sh7091/serial.hpp" @@ -27,6 +28,8 @@ #include "maple/maple_bus_bits.hpp" #include "maple/maple_bus_commands.hpp" #include "maple/maple_bus_ft0.hpp" +#include "maple/maple_bus_ft6.hpp" +#include "maple/maple_bus_ft6_key_scan_codes.hpp" #include "font/font.hpp" #include "ter_u20n.hpp" @@ -61,27 +64,36 @@ void transform(ta_parameter_writer& parameter, const uint32_t texture_width, uint32_t texture_height, const glyph& glyph, const float origin_x, - const float origin_y) + const float origin_y, + const bool invert = false) { const uint32_t parameter_control_word = para_control::para_type::sprite - | para_control::list_type::opaque + | (invert ? para_control::list_type::translucent : para_control::list_type::opaque) | obj_control::col_type::packed_color | obj_control::texture | obj_control::_16bit_uv; - const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::depth_compare_mode::greater + const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::depth_compare_mode::always | isp_tsp_instruction_word::culling_mode::no_culling; - const uint32_t tsp_instruction_word = tsp_instruction_word::src_alpha_instr::src_alpha - | tsp_instruction_word::dst_alpha_instr::one - | tsp_instruction_word::fog_control::no_fog - | tsp_instruction_word::use_alpha - | tsp_instruction_word::texture_u_size::from_int(texture_width) - | tsp_instruction_word::texture_v_size::from_int(texture_height); + + uint32_t tsp_instruction_word = tsp_instruction_word::fog_control::no_fog + | tsp_instruction_word::texture_u_size::from_int(texture_width) + | tsp_instruction_word::texture_v_size::from_int(texture_height); + if (invert) { + tsp_instruction_word |= tsp_instruction_word::src_alpha_instr::inverse_other_color + | tsp_instruction_word::dst_alpha_instr::inverse_other_color + ; + } else { + tsp_instruction_word |= tsp_instruction_word::src_alpha_instr::one + | tsp_instruction_word::dst_alpha_instr::zero + ; + } const uint32_t texture_address = texture_memory_alloc::texture.start; const uint32_t texture_control_word = texture_control_word::pixel_format::_4bpp_palette | texture_control_word::scan_order::twiddled + | texture_control_word::palette_selector(invert) | texture_control_word::texture_address(texture_address / 8); parameter.append() = @@ -180,9 +192,9 @@ struct button_state { } }; -void do_get_condition(uint32_t * command_buf, - uint32_t * receive_buf, - button_state& buttons) +void do_get_condition_controller(uint32_t * command_buf, + uint32_t * receive_buf, + button_state& buttons) { using command_type = get_condition; using response_type = data_transfer; @@ -191,8 +203,7 @@ void do_get_condition(uint32_t * command_buf, .function_type = std::byteswap(function_type::controller) }; - const uint32_t command_size = maple::init_host_command_all_ports(command_buf, receive_buf, - data_fields); + const uint32_t command_size = maple::init_host_command_all_ports(command_buf, receive_buf, data_fields); using host_response_type = struct maple::command_response; auto host_response = reinterpret_cast(receive_buf); @@ -204,11 +215,11 @@ void do_get_condition(uint32_t * command_buf, for (uint8_t port = 0; port < 4; port++) { auto& bus_data = host_response[port].bus_data; if (bus_data.command_code != response_type::command_code) { - return; + continue; } auto& data_fields = bus_data.data_fields; if ((data_fields.function_type & std::byteswap(function_type::controller)) == 0) { - return; + continue; } buttons.ra |= ft0::data_transfer::digital_button::ra(data_fields.data.digital_button) == 0; @@ -225,29 +236,72 @@ void do_get_condition(uint32_t * command_buf, } } +void do_get_condition_keyboard(uint32_t * command_buf, + uint32_t * receive_buf, + ft6::data_transfer::data_format& data) +{ + using command_type = get_condition; + using response_type = data_transfer; + + get_condition::data_fields data_fields = { + .function_type = std::byteswap(function_type::keyboard) + }; + + const uint32_t command_size = maple::init_host_command_all_ports(command_buf, receive_buf, data_fields); + using host_response_type = struct maple::command_response; + auto host_response = reinterpret_cast(receive_buf); + + maple::dma_start(command_buf, command_size, + receive_buf, maple::sizeof_command(host_response)); + + for (uint8_t port = 0; port < 4; port++) { + auto& bus_data = host_response[port].bus_data; + if (bus_data.command_code != response_type::command_code) { + continue; + } + auto& data_fields = bus_data.data_fields; + if ((data_fields.function_type & std::byteswap(function_type::keyboard)) == 0) { + continue; + } + + data.modifier_key = data_fields.data.modifier_key; + data.led_state = data_fields.data.led_state; + data.scan_code_array[0] = data_fields.data.scan_code_array[0]; + data.scan_code_array[1] = data_fields.data.scan_code_array[1]; + data.scan_code_array[2] = data_fields.data.scan_code_array[2]; + data.scan_code_array[3] = data_fields.data.scan_code_array[3]; + data.scan_code_array[4] = data_fields.data.scan_code_array[4]; + data.scan_code_array[5] = data_fields.data.scan_code_array[5]; + + return; + } +} + uint32_t _ta_parameter_buf[((32 * 10 * 17) + 32) / 4]; struct editor_state { - struct gap_buffer gb; + gap_buffer gb; }; void render_gap_buffer(ta_parameter_writer& parameter, const struct font * font, const struct glyph * glyphs, - struct gap_buffer& gb) + gap_buffer& gb) { int32_t advance = 0; int32_t cursor = 0; - for (int32_t i = 0; i < gb.size; i++) { - char_type c; + for (int32_t i = 0; i <= gb.size; i++) { + if (i == gb.gap_start) + cursor = advance; + if (i == gb.size) + break; + char_type c; if (i < gb.gap_start || i >= gb.gap_end) { c = gb.buf[i]; } else { c = '_'; } - if (i == gb.gap_start) - cursor = advance; uint32_t ix; if (c >= font->first_char_code && c <= font->last_char_code) { @@ -261,7 +315,7 @@ void render_gap_buffer(ta_parameter_writer& parameter, font->texture_width, font->texture_height, glyph, - 50.f + float_26_6(advance), // x + 10.f + float_26_6(advance), // x 100.f // y ); @@ -276,7 +330,7 @@ void render_gap_buffer(ta_parameter_writer& parameter, font->texture_width, font->texture_height, glyph, - 50.f + 10.f * j, // x + 10.f + 10.f * j, // x 100.f - float_26_6(font->glyph_height) // y ); } @@ -285,7 +339,7 @@ void render_gap_buffer(ta_parameter_writer& parameter, transform(parameter, font->texture_width, font->texture_height, glyph, - 50.f + float_26_6(cursor), // x + 10.f + float_26_6(cursor), // x 100.f + float_26_6(font->glyph_height) // y ); @@ -300,16 +354,24 @@ void render_gap_buffer(ta_parameter_writer& parameter, transform(parameter, font->texture_width, font->texture_height, glyph, - 50.f + 10.f * j, // x + 10.f + 10.f * j, // x 100.f + float_26_6(font->glyph_height) * 2 // y ); } + int32_t h_cursor = 0; + int32_t v_cursor = 0; int32_t h_advance = 0; int32_t v_advance = 0; - for (int32_t i = 0; i < gb.size; i++) { - char_type c; + for (int32_t i = 0; i <= gb.size; i++) { + if (i == gb.gap_start) { + h_cursor = h_advance; + v_cursor = v_advance; + } + if (i == gb.size) + break; + char_type c; if (i < gb.gap_start || i >= gb.gap_end) { c = gb.buf[i]; } else { @@ -339,6 +401,46 @@ void render_gap_buffer(ta_parameter_writer& parameter, h_advance += glyph.metrics.horiAdvance; } } + + { + int32_t advance = 0; + char buf[10]; + string::dec(buf, 10, gap_column_number(gb)); + int j; + for (j = 0; j < 9; j++) { if (buf[j] != '0') break; } + for (int i = j; i < 10; i++) { + uint8_t c = buf[i]; + int32_t ix; + if (c >= font->first_char_code && c <= font->last_char_code) { + ix = c - font->first_char_code; + } else { + ix = '#' - font->first_char_code; + } + auto& glyph = glyphs[ix]; + transform(parameter, + font->texture_width, + font->texture_height, + glyph, + 50.f + float_26_6(advance), // x + 400.f // y + ); + advance += glyph.metrics.horiAdvance; + } + } + + parameter.append() = ta_global_parameter::end_of_list(para_control::para_type::end_of_list); + + { + auto& glyph = glyphs[' ' - font->first_char_code]; + transform(parameter, + font->texture_width, font->texture_height, + glyph, + 350.f + float_26_6(h_cursor), // x + 100.f + float_26_6(v_cursor), // y + true); // invert + } + + parameter.append() = ta_global_parameter::end_of_list(para_control::para_type::end_of_list); } void update_state(button_state& prev, button_state& next, editor_state& state) @@ -351,6 +453,103 @@ void update_state(button_state& prev, button_state& next, editor_state& state) } } +void debug_keyboard(ft6::data_transfer::data_format * keyboards, uint32_t frame_ix) +{ + uint32_t this_frame = (frame_ix + 0) & 1; + bool difference = false; + for (int i = 0; i < 6; i++) { + if (keyboards[0].scan_code_array[i] != keyboards[1].scan_code_array[i]) { + difference = true; + break; + } + } + if (difference) { + for (int i = 0; i < 6; i++) { + serial::integer(keyboards[this_frame].scan_code_array[i], ' '); + } + serial::string("\n"); + } +} + +void update_keyboard(ft6::data_transfer::data_format * keyboards, uint32_t frame_ix, gap_buffer& gb) +{ + uint32_t this_frame = (frame_ix + 0) & 1; + uint32_t next_frame = (frame_ix + 1) & 1; + for (int i = 0; i < 6; i++) { + if (i < 5 && keyboards[this_frame].scan_code_array[i + 1] != ft6::scan_codes::no_operation) + continue; + bool make = true; + for (int j = 0; j < 6; j++) { + if (keyboards[next_frame].scan_code_array[j] == keyboards[this_frame].scan_code_array[i]) { + make = false; + break; + } + } + if (make) { + // make + uint8_t scan_code = keyboards[this_frame].scan_code_array[i]; + switch (scan_code) { + case ft6::scan_codes::a_A: [[fallthrough]]; + case ft6::scan_codes::b_B: [[fallthrough]]; + case ft6::scan_codes::c_C: [[fallthrough]]; + case ft6::scan_codes::d_D: [[fallthrough]]; + case ft6::scan_codes::e_E: [[fallthrough]]; + case ft6::scan_codes::f_F: [[fallthrough]]; + case ft6::scan_codes::g_G: [[fallthrough]]; + case ft6::scan_codes::h_H: [[fallthrough]]; + case ft6::scan_codes::i_I: [[fallthrough]]; + case ft6::scan_codes::j_J: [[fallthrough]]; + case ft6::scan_codes::k_K: [[fallthrough]]; + case ft6::scan_codes::l_L: [[fallthrough]]; + case ft6::scan_codes::m_M: [[fallthrough]]; + case ft6::scan_codes::n_N: [[fallthrough]]; + case ft6::scan_codes::o_O: [[fallthrough]]; + case ft6::scan_codes::p_P: [[fallthrough]]; + case ft6::scan_codes::q_Q: [[fallthrough]]; + case ft6::scan_codes::r_R: [[fallthrough]]; + case ft6::scan_codes::s_S: [[fallthrough]]; + case ft6::scan_codes::t_T: [[fallthrough]]; + case ft6::scan_codes::u_U: [[fallthrough]]; + case ft6::scan_codes::v_V: [[fallthrough]]; + case ft6::scan_codes::w_W: [[fallthrough]]; + case ft6::scan_codes::x_X: [[fallthrough]]; + case ft6::scan_codes::y_Y: [[fallthrough]]; + case ft6::scan_codes::z_Z: + { + char_type code_point = (scan_code - ft6::scan_codes::a_A) + 'a'; + gap_append(gb, code_point); + } + break; + case ft6::scan_codes::_1_exclam: [[fallthrough]]; + case ft6::scan_codes::_2_at: [[fallthrough]]; + case ft6::scan_codes::_3_numbersign: [[fallthrough]]; + case ft6::scan_codes::_4_dollar: [[fallthrough]]; + case ft6::scan_codes::_5_percent: [[fallthrough]]; + case ft6::scan_codes::_6_asciicircum: [[fallthrough]]; + case ft6::scan_codes::_7_ampersand: [[fallthrough]]; + case ft6::scan_codes::_8_asterisk: [[fallthrough]]; + case ft6::scan_codes::_9_parenleft: + { + char_type code_point = (scan_code - ft6::scan_codes::_1_exclam) + '1'; + gap_append(gb, code_point); + } + break; + case ft6::scan_codes::_0_parenright: gap_append(gb, '0'); break; + case ft6::scan_codes::_return: gap_append(gb, '\n'); break; + case ft6::scan_codes::backspace: gap_pop(gb); break; + case ft6::scan_codes::spacebar: gap_append(gb, ' '); break; + + case ft6::scan_codes::left_arrow: gap_cursor_pos(gb, -1); break; + case ft6::scan_codes::right_arrow: gap_cursor_pos(gb, 1); break; + case ft6::scan_codes::up_arrow: gap_cursor_pos_line(gb, -1); break; + case ft6::scan_codes::down_arrow: gap_cursor_pos_line(gb, 1); break; + default: + break; + } + } + } +} + void main() { video_output::set_mode_vga(); @@ -362,7 +561,12 @@ void main() inflate_font(texture, font->texture_stride, font->max_z_curve_ix); - palette_data<2>(); + + holly.PAL_RAM_CTRL = pal_ram_ctrl::pixel_format::argb1555; + holly.PALETTE_RAM[0] = 0x8000; + holly.PALETTE_RAM[1] = 0xffff; + holly.PALETTE_RAM[16] = 0xffff; + holly.PALETTE_RAM[17] = 0x8000; // The address of `ta_parameter_buf` must be a multiple of 32 bytes. // This is mandatory for ch2-dma to the ta fifo polygon converter. @@ -370,13 +574,13 @@ void main() constexpr uint32_t ta_alloc = ta_alloc_ctrl::pt_opb::no_list | ta_alloc_ctrl::tm_opb::no_list - | ta_alloc_ctrl::t_opb::no_list + | ta_alloc_ctrl::t_opb::_16x4byte | ta_alloc_ctrl::om_opb::no_list | ta_alloc_ctrl::o_opb::_16x4byte; constexpr struct opb_size opb_size = { .opaque = 16 * 4 , .opaque_modifier = 0 - , .translucent = 0 + , .translucent = 16 * 4 , .translucent_modifier = 0 , .punch_through = 0 }; @@ -397,14 +601,22 @@ void main() // 01234567 char_type buf[64] = "abqb\neggs1\nbarley"; int32_t offsets[64]; - gap_init_from_buf(state.gb, buf, 24, 17); + gap_init_from_buf(state.gb, buf, 30, 17); line_init_from_buf(state.gb, offsets, 64); - gap_cursor_pos(state.gb, (-state.gb.gap_start) + 6); - gap_append(state.gb, '\n'); + //gap_cursor_pos(state.gb, (-state.gb.gap_start) + 6); + //gap_append(state.gb, '\n'); + + ft6::data_transfer::data_format keyboards[2] = { 0 }; while (true) { - do_get_condition(command_buf, receive_buf, buttons[frame_ix & 1]); - update_state(buttons[(frame_ix + 1) & 1], buttons[frame_ix & 1], state); + (void)buttons; + //do_get_condition(command_buf, receive_buf, buttons[frame_ix & 1]); + //update_state(buttons[(frame_ix + 1) & 1], buttons[frame_ix & 1], state); + do_get_condition_keyboard(command_buf, receive_buf, keyboards[frame_ix & 1]); + debug_keyboard(keyboards, frame_ix); + + + update_keyboard(keyboards, frame_ix, state.gb); ta_polygon_converter_init(opb_size.total(), ta_alloc, @@ -413,9 +625,8 @@ void main() auto parameter = ta_parameter_writer(ta_parameter_buf); render_gap_buffer(parameter, font, glyphs, state.gb); - parameter.append() = ta_global_parameter::end_of_list(para_control::para_type::end_of_list); - ta_polygon_converter_transfer(ta_parameter_buf, parameter.offset); + ta_polygon_converter_transfer(parameter.buf, parameter.offset); ta_wait_opaque_list(); core_start_render(frame_ix);