From: a bellenir <a@bellenir.com>
Date: Tue, 5 Aug 2014 15:25:51 +0000 (+0000)
Subject: rename functions to 'redraw' instead of 'refresh'
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=6b81119da99cfbeef9306638babddb715e0c51d5;p=archive%2Fafm.git

rename functions to 'redraw' instead of 'refresh'
---

diff --git a/source/frame.c b/source/frame.c
index 02dd9e1..a856656 100644
--- a/source/frame.c
+++ b/source/frame.c
@@ -135,7 +135,7 @@ void frame_draw_files(Frame_T* frame){
 }
 
 
-void frame_set_highlighting(Frame_T* frame, bool highlight, bool refresh_win){
+void frame_set_highlighting(Frame_T* frame, bool highlight, bool redraw_win){
     if(frame){
         int rows,cols;
         int line = FrameTopBuffer + count_double_lines_to_idx(frame, false) + frame->workdir->idx - frame->top_index;
@@ -147,14 +147,14 @@ 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(REDRAW_CURR_FRAME);
-        if(refresh_win) wrefresh(frame->p_win);
+        if(frame_scroll(frame)) state_set_redraw_state(REDRAW_CURR_FRAME);
+        if(redraw_win) wrefresh(frame->p_win);
     }
 }
 
 void frame_reload(Frame_T* frame){
 	workdir_ls(frame->workdir);
 	frame_draw_files(frame);
-	state_set_refresh_state(REDRAW_CURR_FRAME);
+	state_set_redraw_state(REDRAW_CURR_FRAME);
 }
 
diff --git a/source/input.c b/source/input.c
index b600369..24e7dd8 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(REDRAW_ALL_FRAMES);
+        state_set_redraw_state(REDRAW_ALL_FRAMES);
     }else{
         state_set_aardvark_mode(true);
-        state_set_refresh_state(REDRAW_AARDVARK);
+        state_set_redraw_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() != REDRAW_COMPLETE) screen_update();
+    if(state_get_redraw_state() != REDRAW_COMPLETE) screen_update();
 }
 
 static void print_status(void) {
diff --git a/source/main.c b/source/main.c
index 9fc222f..46178f5 100644
--- a/source/main.c
+++ b/source/main.c
@@ -6,12 +6,12 @@
 
 void handle_signal(int sig) {
     (void) sig;
-    state_set_refresh_state(REDRAW_ALL_FRAMES);
+    state_set_redraw_state(REDRAW_ALL_FRAMES);
 }
 
 void handle_alarm(int sig) {
     (void) sig;
-    state_set_refresh_state(REDRAW_AARDVARK);
+    state_set_redraw_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() != REDRAW_COMPLETE)
+        if(state_get_redraw_state() != REDRAW_COMPLETE)
             screen_update();
         input_handle_key(getch());
     }
diff --git a/source/screen.c b/source/screen.c
index 30455a9..96726d5 100644
--- a/source/screen.c
+++ b/source/screen.c
@@ -18,7 +18,7 @@
 #define STATUS_LINE_MARGIN (1u)
 
 static void screen_place_windows(void);
-static void screen_refresh_curr_frame(void);
+static void screen_redraw_curr_frame(void);
 
 static list_t* Frame_List;
 
@@ -53,22 +53,22 @@ void screen_deinit(void) {
 }
 
 void screen_update(void) {
-    /* Clear screen and update LINES and COLS */
-    if(state_get_refresh_state() == REDRAW_CURR_FRAME){
-        screen_refresh_curr_frame();
-    } else if (state_get_refresh_state() == REDRAW_ALL_FRAMES) {
+    /* redraw frames as needed */
+    if(state_get_redraw_state() == REDRAW_CURR_FRAME){
+        screen_redraw_curr_frame();
+    } else if (state_get_redraw_state() == REDRAW_ALL_FRAMES) {
         endwin();
         screen_place_windows();
     }
-    if(state_get_aardvark_mode() && state_get_refresh_state() != REDRAW_COMPLETE)
+    if(state_get_aardvark_mode() && state_get_redraw_state() != REDRAW_COMPLETE)
         aardvark_draw();
-    /* Refresh and mark complete */
-    state_set_refresh_state(REDRAW_COMPLETE);
+    /* mark complete */
+    state_set_redraw_state(REDRAW_COMPLETE);
 }
 
 void screen_open(void) {
     list_push_back(Frame_List, frame_new());
-    state_set_refresh_state(REDRAW_ALL_FRAMES);
+    state_set_redraw_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(REDRAW_ALL_FRAMES);
+        state_set_redraw_state(REDRAW_ALL_FRAMES);
         mem_release(doomed_node);
     } /* else only one window open. do nothing */
 }
@@ -117,7 +117,7 @@ static void screen_place_windows(void) {
     }
 }
 
-static void screen_refresh_curr_frame(void) {
+static void screen_redraw_curr_frame(void) {
     Frame_T* p_frame = state_get_focused_frame();
     frame_draw(p_frame);
 }
@@ -125,22 +125,22 @@ 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(REDRAW_CURR_FRAME);
+    state_set_redraw_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(REDRAW_CURR_FRAME);
+    state_set_redraw_state(REDRAW_CURR_FRAME);
 }
 
 void screen_focus_master(void){
     state_set_focused_node(Frame_List->head);
-    state_set_refresh_state(REDRAW_CURR_FRAME);
+    state_set_redraw_state(REDRAW_CURR_FRAME);
 }
 
-//for when force refresh (R) fixes the screen,
+//for when force redraw (R) fixes the screen,
 //but setting screen REDRAW_ALL_FRAMES doesnt
 //necessary when moving frames around
 static void stoopid_redraw(Frame_T* a, Frame_T* b){
@@ -148,7 +148,7 @@ static void stoopid_redraw(Frame_T* a, Frame_T* b){
     frame_move(a, 0, 0);
     frame_resize(b, 1, 1);
     frame_move(b, 1, 1);
-    state_set_refresh_state(REDRAW_ALL_FRAMES);
+    state_set_redraw_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(REDRAW_ALL_FRAMES);
+	state_set_redraw_state(REDRAW_ALL_FRAMES);
 }
 
diff --git a/source/state.c b/source/state.c
index 32fa956..e8d4e50 100644
--- a/source/state.c
+++ b/source/state.c
@@ -16,8 +16,8 @@ static bool AardvarkOn = false;
 /** A pointer to the currently focused node */
 static list_node_t* Focused_Node  = NULL;
 
-/** Current refresh state */
-static RefreshState_T RefreshState = REDRAW_ALL_FRAMES;
+/** Current redraw state */
+static RedrawState_T RedrawState = REDRAW_ALL_FRAMES;
 
 /** Current operational mode */
 static Mode_T CurrentMode = MODE_NORMAL;
@@ -57,15 +57,15 @@ void state_set_focused_node(list_node_t *p_node) {
     Focused_Node = p_node;
 }
 
-RefreshState_T state_get_refresh_state(void)
+RedrawState_T state_get_redraw_state(void)
 {
-    return RefreshState;
+    return RedrawState;
 }
 
-void state_set_refresh_state(RefreshState_T state)
+void state_set_redraw_state(RedrawState_T state)
 {
-    if ((state == REDRAW_COMPLETE) || (RefreshState < state)) {
-        RefreshState = state;
+    if ((state == REDRAW_COMPLETE) || (RedrawState < state)) {
+        RedrawState = state;
     }
 }
 
diff --git a/source/state.h b/source/state.h
index f4bdd81..bd5be27 100644
--- a/source/state.h
+++ b/source/state.h
@@ -27,10 +27,10 @@ typedef enum {
     REDRAW_AARDVARK,
     REDRAW_CURR_FRAME,
     REDRAW_ALL_FRAMES,
-} RefreshState_T;
+} RedrawState_T;
 
-RefreshState_T state_get_refresh_state(void);
-void state_set_refresh_state(RefreshState_T state);
+RedrawState_T state_get_redraw_state(void);
+void state_set_redraw_state(RedrawState_T state);
 
 typedef enum {
     MODE_NORMAL,
diff --git a/source/workdir.c b/source/workdir.c
index a95df5d..95a85e7 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(REDRAW_CURR_FRAME);
+    state_set_redraw_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(REDRAW_CURR_FRAME);
+    state_set_redraw_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(REDRAW_CURR_FRAME);
+    state_set_redraw_state(REDRAW_CURR_FRAME);
 }