Changeset 369707ed232a584a6b9f06c3e2c84ce4eb9f281e

Timestamp:

10/27/09 20:51:52 (4 weeks ago)

Author:

Nelson Elhage <nelhage@mit.edu>

git-author:

Nelson Elhage <nelhage@mit.edu> / 2009-10-07T23:16:48Z-0400

Parents:

da0bfb7e0400c87413670a4a305849165e63181a

Children:

2447a1ba09d4f7cff926232db18cfe3ac3c96ea6

git-committer:

Nelson Elhage <nelhage@mit.edu> / 2009-10-27T20:51:52Z-0400

Message:

Remove explicit sepbar() calls.

Files:

• cmd.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• global.c (modified) (1 diff)
• mainwin.c (modified) (2 diffs)
• owl.c (modified) (2 diffs)
• util.c (modified) (1 diff)

cmd.c

@@ -88 +88 @@
   if (argc < 0) {
     owl_free(tmpbuff);
-    sepbar(NULL);
     owl_function_makemsg("Unbalanced quotes");
     return NULL;
@@ -99 +98 @@
   owl_parsefree(argv, argc);
   owl_free(tmpbuff);
-  sepbar(NULL);
   return retval;
 }

functions.c

@@ -1054 +1054 @@
   }
   
-  sepbar("");
   owl_function_makemsg("");
 

global.c

@@ -440 +440 @@
   /* refresh stuff */
   owl_mainwin_redisplay(&(g->mw));
-  sepbar(NULL);
   owl_editwin_redisplay(g->tw, 0);
   owl_function_full_redisplay();

mainwin.c

@@ -196 +196 @@
     reframe_normal(mw);
   }
+}
+
+void sepbar(void) /* noproto */
+{
+  char buff[1024];
+  WINDOW *sepwin;
+  const owl_messagelist *ml;
+  const owl_view *v;
+  owl_view_iterator *iter;
+  int x, y;
+  const char *foo, *appendtosepbar;
+
+  iter = owl_view_iterator_free_later(owl_view_iterator_new());
+
+  sepwin=owl_global_get_curs_sepwin(&g);
+  ml=owl_global_get_msglist(&g);
+  v=owl_global_get_current_view(&g);
+
+  werase(sepwin);
+  wattron(sepwin, A_REVERSE);
+  if (owl_global_is_fancylines(&g)) {
+    whline(sepwin, ACS_HLINE, owl_global_get_cols(&g));
+  } else {
+    whline(sepwin, '-', owl_global_get_cols(&g));
+  }
+
+  if (owl_global_is_sepbar_disable(&g)) {
+    getyx(sepwin, y, x);
+    wmove(sepwin, y, owl_global_get_cols(&g)-1);
+    return;
+  }
+
+  wmove(sepwin, 0, 2);  
+
+  if (owl_messagelist_get_size(ml)==0) {
+    strcpy(buff, " (-) ");
+  } else {
+    snprintf(buff, 1024, " (%i) ", owl_messagelist_get_size(ml));
+  }
+  waddstr(sepwin, buff);
+
+  foo=owl_view_get_filtname(v);
+  if (strcmp(foo, owl_global_get_view_home(&g))) wattroff(sepwin, A_REVERSE);
+  waddstr(sepwin, " ");
+  waddstr(sepwin, owl_view_get_filtname(v));
+  waddstr(sepwin, " ");
+  if (strcmp(foo, owl_global_get_view_home(&g))) wattron(sepwin, A_REVERSE);
+
+  if (owl_mainwin_is_curmsg_truncated(owl_global_get_mainwin(&g))) {
+    getyx(sepwin, y, x);
+    wmove(sepwin, y, x+2);
+    wattron(sepwin, A_BOLD);
+    waddstr(sepwin, " <truncated> ");
+    wattroff(sepwin, A_BOLD);
+  }
+
+  owl_view_iterator_clone(iter, owl_global_get_mainwin(&g)->end);
+  if (owl_view_iterator_is_valid(iter)
+      && !owl_view_iterator_is_at_end(iter)) {
+    getyx(sepwin, y, x);
+    wmove(sepwin, y, x+2);
+    wattron(sepwin, A_BOLD);
+    waddstr(sepwin, " <more> ");
+    wattroff(sepwin, A_BOLD);
+  }
+
+  if (owl_global_get_rightshift(&g)>0) {
+    getyx(sepwin, y, x);
+    wmove(sepwin, y, x+2);
+    snprintf(buff, 1024, " right: %i ", owl_global_get_rightshift(&g));
+    waddstr(sepwin, buff);
+  }
+
+  if (owl_global_is_zaway(&g) || owl_global_is_aaway(&g)) {
+    getyx(sepwin, y, x);
+    wmove(sepwin, y, x+2);
+    wattron(sepwin, A_BOLD);
+    wattroff(sepwin, A_REVERSE);
+    if (owl_global_is_zaway(&g) && owl_global_is_aaway(&g)) {
+      waddstr(sepwin, " AWAY ");
+    } else if (owl_global_is_zaway(&g)) {
+      waddstr(sepwin, " Z-AWAY ");
+    } else if (owl_global_is_aaway(&g)) {
+      waddstr(sepwin, " A-AWAY ");
+    }
+    wattron(sepwin, A_REVERSE);
+    wattroff(sepwin, A_BOLD);
+  }
+
+  if (owl_global_get_curmsg_vert_offset(&g)) {
+    getyx(sepwin, y, x);
+    wmove(sepwin, y, x+2);
+    wattron(sepwin, A_BOLD);
+    wattroff(sepwin, A_REVERSE);
+    waddstr(sepwin, " SCROLL ");
+    wattron(sepwin, A_REVERSE);
+    wattroff(sepwin, A_BOLD);
+  }
+
+  appendtosepbar = owl_global_get_appendtosepbar(&g);
+  if (appendtosepbar && *appendtosepbar) {
+    getyx(sepwin, y, x);
+    wmove(sepwin, y, x+2);
+    waddstr(sepwin, " ");
+    waddstr(sepwin, owl_global_get_appendtosepbar(&g));
+    waddstr(sepwin, " ");
+  }
+
+  getyx(sepwin, y, x);
+  wmove(sepwin, y, owl_global_get_cols(&g)-1);
+
+  wattroff(sepwin, A_BOLD);
+  wattroff(sepwin, A_REVERSE);
+  wnoutrefresh(sepwin);
 }
 
@@ -341 +455 @@
 
   wnoutrefresh(mw->win.win);
+
+  sepbar();
 }
 

owl.c

@@ -591 +591 @@
         );
   }
-  sepbar(NULL);
 
   /* process the startup file */
@@ -674 +673 @@
       owl_function_do_newmsgproc();
     }
-    
+
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    if (newmsgs) 
-      sepbar(NULL);
 
     if (owl_popwin_is_active(owl_global_get_popwin(&g))) {

util.c

@@ -5 +5 @@
 #include <ctype.h>
 #include <pwd.h>
-
-void sepbar(const char *in)
-{
-  char buff[1024];
-  WINDOW *sepwin;
-  const owl_messagelist *ml;
-  const owl_view *v;
-  owl_view_iterator *iter;
-  int x, y;
-  const char *foo, *appendtosepbar;
-
-  iter = owl_view_iterator_free_later(owl_view_iterator_new());
-
-  sepwin=owl_global_get_curs_sepwin(&g);
-  ml=owl_global_get_msglist(&g);
-  v=owl_global_get_current_view(&g);
-
-  werase(sepwin);
-  wattron(sepwin, A_REVERSE);
-  if (owl_global_is_fancylines(&g)) {
-    whline(sepwin, ACS_HLINE, owl_global_get_cols(&g));
-  } else {
-    whline(sepwin, '-', owl_global_get_cols(&g));
-  }
-
-  if (owl_global_is_sepbar_disable(&g)) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, owl_global_get_cols(&g)-1);
-    return;
-  }
-
-  wmove(sepwin, 0, 2);  
-
-  if (owl_messagelist_get_size(ml)==0) {
-    strcpy(buff, " (-) ");
-  } else {
-    snprintf(buff, 1024, " (%i) ", owl_messagelist_get_size(ml));
-  }
-  waddstr(sepwin, buff);
-
-  foo=owl_view_get_filtname(v);
-  if (strcmp(foo, owl_global_get_view_home(&g))) wattroff(sepwin, A_REVERSE);
-  waddstr(sepwin, " ");
-  waddstr(sepwin, owl_view_get_filtname(v));
-  waddstr(sepwin, " ");
-  if (strcmp(foo, owl_global_get_view_home(&g))) wattron(sepwin, A_REVERSE);
-
-  if (owl_mainwin_is_curmsg_truncated(owl_global_get_mainwin(&g))) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    wattron(sepwin, A_BOLD);
-    waddstr(sepwin, " <truncated> ");
-    wattroff(sepwin, A_BOLD);
-  }
-
-  owl_view_iterator_clone(iter, owl_global_get_mainwin(&g)->end);
-  if (owl_view_iterator_is_valid(iter)
-      && !owl_view_iterator_is_at_end(iter)) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    wattron(sepwin, A_BOLD);
-    waddstr(sepwin, " <more> ");
-    wattroff(sepwin, A_BOLD);
-  }
-
-  if (owl_global_get_rightshift(&g)>0) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    snprintf(buff, 1024, " right: %i ", owl_global_get_rightshift(&g));
-    waddstr(sepwin, buff);
-  }
-
-  if (owl_global_is_zaway(&g) || owl_global_is_aaway(&g)) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    wattron(sepwin, A_BOLD);
-    wattroff(sepwin, A_REVERSE);
-    if (owl_global_is_zaway(&g) && owl_global_is_aaway(&g)) {
-      waddstr(sepwin, " AWAY ");
-    } else if (owl_global_is_zaway(&g)) {
-      waddstr(sepwin, " Z-AWAY ");
-    } else if (owl_global_is_aaway(&g)) {
-      waddstr(sepwin, " A-AWAY ");
-    }
-    wattron(sepwin, A_REVERSE);
-    wattroff(sepwin, A_BOLD);
-  }
-
-  if (owl_global_get_curmsg_vert_offset(&g)) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    wattron(sepwin, A_BOLD);
-    wattroff(sepwin, A_REVERSE);
-    waddstr(sepwin, " SCROLL ");
-    wattron(sepwin, A_REVERSE);
-    wattroff(sepwin, A_BOLD);
-  }
-  
-  if (in) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    waddstr(sepwin, in);
-  }
-
-  appendtosepbar = owl_global_get_appendtosepbar(&g);
-  if (appendtosepbar && *appendtosepbar) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    waddstr(sepwin, " ");
-    waddstr(sepwin, owl_global_get_appendtosepbar(&g));
-    waddstr(sepwin, " ");
-  }
-
-  getyx(sepwin, y, x);
-  wmove(sepwin, y, owl_global_get_cols(&g)-1);
-    
-  wattroff(sepwin, A_BOLD);
-  wattroff(sepwin, A_REVERSE);
-  wnoutrefresh(sepwin);
-}
 
 char **atokenize(const char *buffer, const char *sep, int *i)