rename constants

diff --git a/source/frame.c b/source/frame.c
index 65b81abd04a2810a4570ba612e8c716e4cc4bbb8..02dd9e1d4b55b738b41eec8db24ad20382ff4ada 100644 (file)
--- 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 908ea5a6cac5935fa3be6ec0d1d341a6287ae06b..b6003695c3b57498c429ab9dbab1bb28b3c5481a 100644 (file)
--- 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 c037385461875e634c7043233469a4120989f663..9fc222f86a8e37d6fec84780bfca59a4f8a5794f 100644 (file)
--- 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 b39d7ecca72bd43b2978b56ff04bc155c28f0a0a..30455a9ab2ebacd7fc01f49b289793bc8bde975e 100644 (file)
--- 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 4a5b0ba5b2fdd16f2a0c585e706857d6ae20ad8a..32fa956554bb4693bb65143bb6e32ea9ed846f1e 100644 (file)
--- 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 e83e4841d8f62b502a18642000f5b225e324c350..f4bdd81b500dc263af73be0d64d67e7c8a4bbeb1 100644 (file)
--- 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 c47b8a70893e1bad88616578f3205c25654ddf88..a95df5df1fc8fa1d9433da85daad088913a92137 100644 (file)
--- 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);
 }