new configuration system

[pkg/abook.git] / list.c

diff --git a/list.c b/list.c
index c192b255cd61be2f6474864d42521df87f544cb0..d349209582f31f44df74ccae33045a623b8d8dfc 100644 (file)
--- a/list.c
+++ b/list.c
@@ -9,8 +9,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include "abook.h"
+#include <assert.h>
 #include "ui.h"
 #include "database.h"
 #include "edit.h"
@@ -35,14 +35,14 @@ extern struct abook_field abook_fields[];
 WINDOW *list = NULL;
 
 static int
-init_extra_field(char *option_name)
+init_extra_field(enum str_opts option)
 {
        int i, ret = -1;
        char *option_str;
 
        assert(option_name != NULL);
        
-       option_str = options_get_str(option_name);
+       option_str = opt_get_str(option);
 
        if(option_str && *option_str) {
                for(i = 0; i < ITEM_FIELDS; i++) {
@@ -69,8 +69,8 @@ init_list()
         * init extra_column and extra alternative
         */
 
-       extra_column = init_extra_field("extra_column");
-       extra_alternative = init_extra_field("extra_alternative");
+       extra_column = init_extra_field(STR_EXTRA_COLUMN);
+       extra_alternative = init_extra_field(STR_EXTRA_ALTERNATIVE);
 }
 
 void
@@ -131,7 +131,7 @@ print_list_line(int i, int line, int highlight)
                mvwaddch(list, line, 0, '*' );
        
        mvwaddnstr(list, line, NAMEPOS, database[i][NAME], NAMELEN);
-       if( options_get_int( "show_all_emails"  ) )
+       if( opt_get_bool(BOOL_SHOW_ALL_EMAILS) )
                mvwaddnstr(list, line, EMAILPOS, database[i][EMAIL],
                                real_emaillen);
        else {
@@ -147,7 +147,7 @@ print_list_line(int i, int line, int highlight)
                                EXTRALEN);
 
        scrollok(list, TRUE);
-       if(highlight_line)
+       if(highlight)
                wstandend(list);
 }
        
@@ -155,13 +155,19 @@ print_list_line(int i, int line, int highlight)
 void
 list_headerline()
 {
+#ifdef A_BOLD
        attrset(A_BOLD);
+#else
+       /* hmm, maybe something here */
+#endif
        mvaddstr(2, NAMEPOS, abook_fields[NAME].name);
        mvaddstr(2, EMAILPOS, abook_fields[EMAIL].name);
        if(extra_column > 0)
                mvaddnstr(2, EXTRAPOS, abook_fields[extra_column].name,
                                COLS-EXTRAPOS);
+#ifdef A_BOLD
        attrset(A_NORMAL);
+#endif
 }
 
 void
@@ -277,8 +283,12 @@ void
 highlight_line(WINDOW *win, int line)
 {
        wstandout(win);
-       
-#ifdef mvwchgat
+
+       /*
+        * this is a tricky one
+        */
+#if 0
+/*#ifdef mvwchgat*/
        mvwchgat(win, line, 0, -1,  A_STANDOUT, 0, NULL);
 #else
        /*