From 58c58c712864d3c2208ce58f2574ed40896cfa59 Mon Sep 17 00:00:00 2001 From: a bellenir Date: Tue, 5 Aug 2014 15:09:26 +0000 Subject: [PATCH] rename constants --- source/frame.c | 4 ++-- source/input.c | 6 +++--- source/main.c | 6 +++--- source/screen.c | 24 ++++++++++++------------ source/state.c | 4 ++-- source/state.h | 8 ++++---- source/workdir.c | 6 +++--- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/source/frame.c b/source/frame.c index 65b81ab..02dd9e1 100644 --- a/source/frame.c +++ b/source/frame.c @@ -147,7 +147,7 @@ void frame_set_highlighting(Frame_T* frame, bool highlight, bool refresh_win){ mvwchgat(frame->p_win, line, 1, cols-2, newattr, color, NULL); if(file && file->expanded) mvwchgat(frame->p_win, line+1, 1, cols-2, newattr, color, NULL); wmove(frame->p_win, 0, 0); //move the cursor out of the way - if(frame_scroll(frame)) state_set_refresh_state(REFRESH_CURR_WIN); + if(frame_scroll(frame)) state_set_refresh_state(REDRAW_CURR_FRAME); if(refresh_win) wrefresh(frame->p_win); } } @@ -155,6 +155,6 @@ void frame_set_highlighting(Frame_T* frame, bool highlight, bool refresh_win){ void frame_reload(Frame_T* frame){ workdir_ls(frame->workdir); frame_draw_files(frame); - state_set_refresh_state(REFRESH_CURR_WIN); + state_set_refresh_state(REDRAW_CURR_FRAME); } diff --git a/source/input.c b/source/input.c index 908ea5a..b600369 100644 --- a/source/input.c +++ b/source/input.c @@ -27,10 +27,10 @@ typedef struct { static void handle_aardvark(void) { if(state_get_aardvark_mode()){ state_set_aardvark_mode(false); - state_set_refresh_state(REFRESH_ALL_WINS); + state_set_refresh_state(REDRAW_ALL_FRAMES); }else{ state_set_aardvark_mode(true); - state_set_refresh_state(REFRESH_AARDVARK); + state_set_refresh_state(REDRAW_AARDVARK); } } @@ -189,7 +189,7 @@ static void search_mode(void) { } else { workdir_seek(state_get_focused_workdir(), Key_Buffer); } - if(state_get_refresh_state() != REFRESH_COMPLETE) screen_update(); + if(state_get_refresh_state() != REDRAW_COMPLETE) screen_update(); } static void print_status(void) { diff --git a/source/main.c b/source/main.c index c037385..9fc222f 100644 --- a/source/main.c +++ b/source/main.c @@ -6,12 +6,12 @@ void handle_signal(int sig) { (void) sig; - state_set_refresh_state(REFRESH_ALL_WINS); + state_set_refresh_state(REDRAW_ALL_FRAMES); } void handle_alarm(int sig) { (void) sig; - state_set_refresh_state(REFRESH_AARDVARK); + state_set_refresh_state(REDRAW_AARDVARK); alarm(1); } @@ -24,7 +24,7 @@ int main() { state_set_mode(MODE_NORMAL); /* main loop */ while(state_get_running()) { - if(state_get_refresh_state() != REFRESH_COMPLETE) + if(state_get_refresh_state() != REDRAW_COMPLETE) screen_update(); input_handle_key(getch()); } diff --git a/source/screen.c b/source/screen.c index b39d7ec..30455a9 100644 --- a/source/screen.c +++ b/source/screen.c @@ -54,21 +54,21 @@ void screen_deinit(void) { void screen_update(void) { /* Clear screen and update LINES and COLS */ - if(state_get_refresh_state() == REFRESH_CURR_WIN){ + if(state_get_refresh_state() == REDRAW_CURR_FRAME){ screen_refresh_curr_frame(); - } else if (state_get_refresh_state() == REFRESH_ALL_WINS) { + } else if (state_get_refresh_state() == REDRAW_ALL_FRAMES) { endwin(); screen_place_windows(); } - if(state_get_aardvark_mode() && state_get_refresh_state() != REFRESH_COMPLETE) + if(state_get_aardvark_mode() && state_get_refresh_state() != REDRAW_COMPLETE) aardvark_draw(); /* Refresh and mark complete */ - state_set_refresh_state(REFRESH_COMPLETE); + state_set_refresh_state(REDRAW_COMPLETE); } void screen_open(void) { list_push_back(Frame_List, frame_new()); - state_set_refresh_state(REFRESH_ALL_WINS); + state_set_refresh_state(REDRAW_ALL_FRAMES); } void screen_close(void) { @@ -79,7 +79,7 @@ void screen_close(void) { mem_retain(doomed_node); list_delete_node(Frame_List, doomed_node); state_set_focused_node(new_focus); - state_set_refresh_state(REFRESH_ALL_WINS); + state_set_refresh_state(REDRAW_ALL_FRAMES); mem_release(doomed_node); } /* else only one window open. do nothing */ } @@ -125,30 +125,30 @@ static void screen_refresh_curr_frame(void) { void screen_focus_next(void){ list_node_t* focused = state_get_focused_node(); state_set_focused_node(focused->next ? focused->next : Frame_List->head); - state_set_refresh_state(REFRESH_CURR_WIN); + state_set_refresh_state(REDRAW_CURR_FRAME); } void screen_focus_prev(void){ list_node_t* prev = list_prev(Frame_List, state_get_focused_node()); if(!prev) prev = Frame_List->tail; state_set_focused_node(prev); - state_set_refresh_state(REFRESH_CURR_WIN); + state_set_refresh_state(REDRAW_CURR_FRAME); } void screen_focus_master(void){ state_set_focused_node(Frame_List->head); - state_set_refresh_state(REFRESH_CURR_WIN); + state_set_refresh_state(REDRAW_CURR_FRAME); } //for when force refresh (R) fixes the screen, -//but setting screen REFRESH_ALL_WINS doesnt +//but setting screen REDRAW_ALL_FRAMES doesnt //necessary when moving frames around static void stoopid_redraw(Frame_T* a, Frame_T* b){ frame_resize(a, 1, 1); frame_move(a, 0, 0); frame_resize(b, 1, 1); frame_move(b, 1, 1); - state_set_refresh_state(REFRESH_ALL_WINS); + state_set_refresh_state(REDRAW_ALL_FRAMES); } void screen_swap_with_master(void){ @@ -220,6 +220,6 @@ void screen_reload_all_frames(void){ frame_reload((Frame_T*)node->contents); node = node->next; } - state_set_refresh_state(REFRESH_ALL_WINS); + state_set_refresh_state(REDRAW_ALL_FRAMES); } diff --git a/source/state.c b/source/state.c index 4a5b0ba..32fa956 100644 --- a/source/state.c +++ b/source/state.c @@ -17,7 +17,7 @@ static bool AardvarkOn = false; static list_node_t* Focused_Node = NULL; /** Current refresh state */ -static RefreshState_T RefreshState = REFRESH_ALL_WINS; +static RefreshState_T RefreshState = REDRAW_ALL_FRAMES; /** Current operational mode */ static Mode_T CurrentMode = MODE_NORMAL; @@ -64,7 +64,7 @@ RefreshState_T state_get_refresh_state(void) void state_set_refresh_state(RefreshState_T state) { - if ((state == REFRESH_COMPLETE) || (RefreshState < state)) { + if ((state == REDRAW_COMPLETE) || (RefreshState < state)) { RefreshState = state; } } diff --git a/source/state.h b/source/state.h index e83e484..f4bdd81 100644 --- a/source/state.h +++ b/source/state.h @@ -23,10 +23,10 @@ Frame_T* state_get_focused_frame(void); WorkDir_T* state_get_focused_workdir(void); typedef enum { - REFRESH_COMPLETE = 0, - REFRESH_AARDVARK, - REFRESH_CURR_WIN, - REFRESH_ALL_WINS, + REDRAW_COMPLETE = 0, + REDRAW_AARDVARK, + REDRAW_CURR_FRAME, + REDRAW_ALL_FRAMES, } RefreshState_T; RefreshState_T state_get_refresh_state(void); diff --git a/source/workdir.c b/source/workdir.c index c47b8a7..a95df5d 100644 --- a/source/workdir.c +++ b/source/workdir.c @@ -86,7 +86,7 @@ void workdir_cd(WorkDir_T* wd) { wd->idx = 0; } workdir_ls(wd); - state_set_refresh_state(REFRESH_CURR_WIN); + state_set_refresh_state(REDRAW_CURR_FRAME); } File_T* make_dotdot(char* path){ @@ -165,10 +165,10 @@ void workdir_seek(WorkDir_T* wd, char* search){ void workdir_expand_selected(WorkDir_T* wd){ ((File_T*)vec_at(wd->vfiles, wd->idx))->expanded = true; - state_set_refresh_state(REFRESH_CURR_WIN); + state_set_refresh_state(REDRAW_CURR_FRAME); } void workdir_collapse_selected(WorkDir_T* wd){ ((File_T*)vec_at(wd->vfiles, wd->idx))->expanded = false; - state_set_refresh_state(REFRESH_CURR_WIN); + state_set_refresh_state(REDRAW_CURR_FRAME); } -- 2.52.0