X-Git-Url: https://git.danieliu.xyz/?p=taskasaur.git;a=blobdiff_plain;f=taskasaur.c;h=dbc3d31229212f74b7ce37df0b30c9903b5b1880;hp=87326787fce1dee1195c9cce1ac0b45cec79d0e9;hb=6eb3a028f4d79ee91e9d94e9c02932f280cd0ac8;hpb=72509aeb4746b7ea2bd9cc84cfd45dfb87042e07 diff --git a/taskasaur.c b/taskasaur.c index 8732678..dbc3d31 100644 --- a/taskasaur.c +++ b/taskasaur.c @@ -5,28 +5,18 @@ #include "headers/utils.h" #include "config.h" -// this is temp -#define MENU_WIDTH 40 - -typedef struct BoardMenu { - Menu** menu_list; - int menu_count; - int selected; -} BoardMenu; - -BoardMenu* create_board_menu(Board* board); -int set_selected_menu(BoardMenu* boardmenu, int index); - -MenuItem** todolist_to_menuitem(TodoItem** item_list, int list_length); -Menu** make_menus(Board* board, int todolist_length); -int swap_menu(BoardMenu* boardmenu, int src_index, int dest_index); +void render_step(BoardMenu* boardmenu); +void save_to_file(char* filepath, BoardMenu* boardmenu); int main(int argc, char** argv) { + char* boardfile_name = "test_board.md"; + printf("%c]0;%s - %s%c", '\033', "taskasaur", boardfile_name, '\007'); // need to reset after program exits + /* read from todo file */ Board* board; - board = begin_parse("test_board.md"); + board = begin_parse(boardfile_name); /* log_todo(board); */ /* init curses */ @@ -35,12 +25,10 @@ main(int argc, char** argv) BoardMenu* boardmenu; boardmenu = create_board_menu(board); - // this is temp - for (int i = 0; i < boardmenu->menu_count; i++) { - render_menu(boardmenu->menu_list[i]); - } + /* need to render before user presses anything */ + render_step(boardmenu); - char ch; + int ch; while ((ch = getch()) != BINDING_QUIT) { Menu* active_menu; @@ -80,8 +68,8 @@ main(int argc, char** argv) Menu* from_menu; Menu* to_menu; - from_menu = boardmenu->menu_list[boardmenu->selected], - to_menu = boardmenu->menu_list[boardmenu->selected-1], + from_menu = boardmenu->menu_list[boardmenu->selected]; + to_menu = boardmenu->menu_list[boardmenu->selected-1]; insert_item( to_menu, @@ -109,8 +97,8 @@ main(int argc, char** argv) Menu* from_menu; Menu* to_menu; - from_menu = boardmenu->menu_list[boardmenu->selected], - to_menu = boardmenu->menu_list[boardmenu->selected+1], + from_menu = boardmenu->menu_list[boardmenu->selected]; + to_menu = boardmenu->menu_list[boardmenu->selected+1]; insert_item( to_menu, @@ -150,136 +138,67 @@ main(int argc, char** argv) /* boardmenu->selected -= 1; */ /* set_selected_menu(boardmenu, boardmenu->selected); */ -/* break; */ -/* case BINDING_MOVE_MENU_RIGHT: */ -/* if (boardmenu->selected >= boardmenu->menu_count-1) break; */ -/* swap_menu(boardmenu, boardmenu->selected, boardmenu->selected+1); */ + /* break; */ + /* case BINDING_MOVE_MENU_RIGHT: */ + /* if (boardmenu->selected >= boardmenu->menu_count-1) break; */ + /* swap_menu(boardmenu, boardmenu->selected, boardmenu->selected+1); */ /* boardmenu->selected += 1; */ /* set_selected_menu(boardmenu, boardmenu->selected); */ - break; + /* break; */ case BINDING_EDIT_ITEM: menu_driver(active_menu, MENU_EDIT); break; - } + case BINDING_SELECT: + break; + case BINDING_WRITE: + save_to_file(boardfile_name, boardmenu); + break; + case KEY_RESIZE: + /* ; */ + /* int y, x; */ + /* char out[10]; */ + /* getmaxyx(stdscr, y, x); */ + /* sprintf(out, "%d,%d", y, x); */ - for (int i = 0; i < boardmenu->menu_count; i++) { - render_menu(boardmenu->menu_list[i]); + /* mvprintw(20, 20, out); */ + /* resize_term(y, x); */ + break; } + render_step(boardmenu); } + + /* save on exit - this causes weird stuff to happen, maybe it's not given enough time to write before program exits? */ + /* save_to_file(boardfile_name, boardmenu); */ exit_tscurses(); return 0; } -BoardMenu* -create_board_menu(Board* board) -{ - BoardMenu* new_boardmenu; - - new_boardmenu = malloc(sizeof(BoardMenu)); - - new_boardmenu->menu_list = make_menus(board, board->todolist_count); - new_boardmenu->menu_count = board->todolist_count; - new_boardmenu->selected = 0; - - return new_boardmenu; -} - -int -set_selected_menu(BoardMenu* boardmenu, int index) -{ - Menu* old_menu; - Menu* new_menu; - int new_pos; - - old_menu = boardmenu->menu_list[boardmenu->selected]; - new_menu = boardmenu->menu_list[index]; - - set_menu_focus(old_menu, false); - set_menu_focus(new_menu, true); - - /* also try to jump to a similar position if possible */ - /* rn theres a bug if old menu is empty */ - new_pos = min(get_selected_item(old_menu), get_menu_length(new_menu)-1); - set_selected_item(new_menu, new_pos); - - boardmenu->selected = index; - - return 0; -} - -MenuItem** -todolist_to_menuitem(TodoItem** item_list, int list_length) -{ - MenuItem** items; - - items = malloc((list_length+1)*sizeof(MenuItem*)); - for (int i = 0; i < list_length; i++) { - items[i] = create_menuitem(item_list[i]->item_name); - } - - items[list_length] = 0; //null terminate - return items; -} - -Menu** -make_menus(Board* board, int todolist_length) +void +render_step(BoardMenu* boardmenu) { + for (int i = 0; i < boardmenu->menu_count; i++) { - Menu** menu_list; - - menu_list = malloc(todolist_length*sizeof(Menu*)); - - for (int i = 0; i < todolist_length; i++) { - - /* read from parsed */ - TodoList* todo_list = board->todolist_list[i]; - MenuItem** item_list = todolist_to_menuitem(todo_list->item_list, todo_list->item_count); - - Menu* new_menu = create_menu(todo_list->list_name, item_list); - - /* make window */ - WINDOW* win = newwin(20, MENU_WIDTH, 1, 1+MENU_WIDTH*i); - box(win, 0, 0); - - /* some menu settings */ - set_menu_win(new_menu, win); - set_menu_focus(new_menu, i == 0); // make first win focused + Menu* curmenu = boardmenu->menu_list[i]; - /* refresh */ - refresh(); - wrefresh(win); + /* update the descriptions - maybe not do this here */ + for (int j = 0; j < get_menu_length(curmenu); j++) { + update_menuitem_descrip(get_menu_item(curmenu, j)); + } - menu_list[i] = new_menu; - } - - return menu_list; + render_menu(curmenu); + } } -int -swap_menu(BoardMenu* boardmenu, int src_index, int dest_index) +void +save_to_file(char* filepath, BoardMenu* boardmenu) { - /* reposition menus */ - mvwin(get_menu_win(boardmenu->menu_list[src_index]), - 1, 1+MENU_WIDTH*dest_index - ); - mvwin(get_menu_win(boardmenu->menu_list[dest_index]), - 1, 1+MENU_WIDTH*src_index - ); - wrefresh(get_menu_win(boardmenu->menu_list[src_index])); - wrefresh(get_menu_win(boardmenu->menu_list[dest_index])); - /* wclear(get_menu_win(boardmenu->menu_list[src_index])); */ - /* wclear(get_menu_win(boardmenu->menu_list[dest_index])); */ - /* touchwin(get_menu_win(boardmenu->menu_list[src_index])); */ - /* touchwin(get_menu_win(boardmenu->menu_list[dest_index])); */ - clear(); + Board* writeboard; + writeboard = boardmenu_to_board(boardmenu); - /* swap in array */ - ar_swap_item(boardmenu->menu_list, src_index, dest_index); - - return 0; + begin_write(filepath, writeboard); + free_board(writeboard); } -