patrick
/
odin_editor
mirror of https://github.com/pcleavelin/odin_editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow appending to end of line

plugins
Patrick Cleavelin 2024-01-01 17:25:10 -06:00
parent 6af75f364d
commit ff020fd059
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/file_buffer.odin
View File

@ -489,10 +489,10 @@ move_cursor_left :: proc(buffer: ^FileBuffer) {
} }
} }
move_cursor_right :: proc(buffer: ^FileBuffer) { move_cursor_right :: proc(buffer: ^FileBuffer, stop_at_end: bool = true) {
line_length := file_buffer_line_length(buffer, buffer.cursor.index); line_length := file_buffer_line_length(buffer, buffer.cursor.index);
if line_length > 0 && buffer.cursor.col < line_length-1 { if !stop_at_end || (line_length > 0 && buffer.cursor.col < line_length-1) {
buffer.cursor.col += 1; buffer.cursor.col += 1;
update_file_buffer_index_from_cursor(buffer); update_file_buffer_index_from_cursor(buffer);
} }

16
src/main.odin
View File

@ -160,7 +160,7 @@ register_default_input_actions :: proc(input_map: ^core.InputMap) {
state.mode = .Insert; state.mode = .Insert;
}, "enter insert mode"); }, "enter insert mode");
core.register_key_action(input_map, .A, proc(state: ^State) { core.register_key_action(input_map, .A, proc(state: ^State) {
core.move_cursor_right(&state.buffers[state.current_buffer]); core.move_cursor_right(&state.buffers[state.current_buffer], false);
state.mode = .Insert; state.mode = .Insert;
}, "enter insert mode after character (append)"); }, "enter insert mode after character (append)");
@ -234,7 +234,7 @@ main :: proc() {
raylib.SetTargetFPS(60); raylib.SetTargetFPS(60);
raylib.SetExitKey(.KEY_NULL); raylib.SetExitKey(.KEY_NULL);
state.font = raylib.LoadFont("../c_editor/Mx437_ToshibaSat_8x16.ttf"); state.font = raylib.LoadFontEx("/System/Library/Fonts/Supplemental/Andale Mono.ttf", i32(state.source_font_height*2), nil, 0);
raylib.SetTextureFilter(state.font.texture, .BILINEAR); raylib.SetTextureFilter(state.font.texture, .BILINEAR);
menu_bar_state := ui.MenuBarState{ menu_bar_state := ui.MenuBarState{
items = []ui.MenuBarItem { items = []ui.MenuBarItem {
@ -266,12 +266,14 @@ main :: proc() {
raylib.DrawRectangle(0, i32(state.screen_height - state.source_font_height), i32(state.screen_width), i32(state.source_font_height), theme.get_palette_raylib_color(.Background2)); raylib.DrawRectangle(0, i32(state.screen_height - state.source_font_height), i32(state.screen_width), i32(state.source_font_height), theme.get_palette_raylib_color(.Background2));
line_info_text := raylib.TextFormat( line_info_text := raylib.TextFormat(
"Line: %d, Col: %d, Len: %d --- Slice Index: %d, Content Index: %d", // "Line: %d, Col: %d, Len: %d --- Slice Index: %d, Content Index: %d",
"Line: %d, Col: %d",
buffer.cursor.line + 1, buffer.cursor.line + 1,
buffer.cursor.col + 1, buffer.cursor.col + 1,
core.file_buffer_line_length(buffer, buffer.cursor.index), // core.file_buffer_line_length(buffer, buffer.cursor.index),
buffer.cursor.index.slice_index, // buffer.cursor.index.slice_index,
buffer.cursor.index.content_index); // buffer.cursor.index.content_index
);
line_info_width := raylib.MeasureTextEx(state.font, line_info_text, f32(state.source_font_height), 0).x; line_info_width := raylib.MeasureTextEx(state.font, line_info_text, f32(state.source_font_height), 0).x;
switch state.mode { switch state.mode {
@ -325,7 +327,7 @@ main :: proc() {
ui.draw_buffer_list_window(&state); ui.draw_buffer_list_window(&state);
} }
if true || state.current_input_map != &state.input_map { if state.current_input_map != &state.input_map {
longest_description := 0; longest_description := 0;
for key, action in state.current_input_map.key_actions { for key, action in state.current_input_map.key_actions {
if len(action.description) > longest_description { if len(action.description) > longest_description {