X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=list.c;h=d3a53c36f423c50b49e757145e8014a7727cbf8b;hb=b1b41dce461ab21ae9a2bd26d7a00a381a5f81f8;hp=6cb8ed791b8bd71065d62cd63657e7387cd50210;hpb=b6053007306a73fefe0ed952862ae71da9483d0e;p=pkg%2Fabook.git

diff --git a/list.c b/list.c
index 6cb8ed7..d3a53c3 100644
--- 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,12 @@ 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 +67,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
@@ -89,7 +87,7 @@ refresh_list()
 
 	ui_print_number_of_items();
 	
-	if( items < 1 ) {
+	if(items < 1) {
 		refresh();
 		wrefresh(list);
 		return;
@@ -109,19 +107,14 @@ refresh_list()
         for( line = 0, i = first_list_item ; i <= LAST_LIST_ITEM && i < items;
 			line++, i++ ) {
 
-		if(i == curitem)
-			highlight_line(list, line);
-		
-		print_list_line(i, line);
-
-		wstandend(list);
+		print_list_line(i, line, i == curitem);
         }
 
         wrefresh(list);
 }
 
 void
-print_list_line(int i, int line)
+print_list_line(int i, int line, int highlight)
 {
 	int extra = extra_column;
 	char tmp[MAX_EMAILSTR_LEN];
@@ -129,46 +122,58 @@ print_list_line(int i, int line)
 		EMAILLEN : COLS - EMAILPOS;
 
 	scrollok(list, FALSE);
+	if(highlight)
+		highlight_line(list, line);
 
-	if( selected[i] )
+	if(selected[i])
 		mvwaddch(list, line, 0, '*' );
 	
-	mvwaddnstr(list, line, NAMEPOS, database[i][NAME], NAMELEN);
-	if( options_get_int( "show_all_emails"  ) )
+	mvwaddnstr(list, line, NAMEPOS, database[i][NAME],
+		bytes2width(database[i][NAME], NAMELEN));
+	if(opt_get_bool(BOOL_SHOW_ALL_EMAILS))
 		mvwaddnstr(list, line, EMAILPOS, database[i][EMAIL],
-				real_emaillen);
+				bytes2width(database[i][EMAIL], real_emaillen));
 	else {
 		get_first_email(tmp, i);
-		mvwaddnstr(list, line, EMAILPOS, tmp, real_emaillen);
+		mvwaddnstr(list, line, EMAILPOS, tmp,
+			bytes2width(tmp, real_emaillen));
 	}
 
 	if(extra < 0 || !database[i][extra])
 		extra = extra_alternative;
 	if(extra >= 0)
 		mvwaddnstr(list, line, EXTRAPOS,
-				safe_str(database[i][extra]),
-				EXTRALEN);
+			safe_str(database[i][extra]),
+			bytes2width(safe_str(database[i][extra]), EXTRALEN));
 
 	scrollok(list, TRUE);
+	if(highlight)
+		wstandend(list);
 }
 	
 
 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
 scroll_up()
 {
-	if( curitem < 1 )
+	if(curitem < 1)
 		return;
 
 	curitem--;
@@ -179,7 +184,7 @@ scroll_up()
 void
 scroll_down()
 {
-	if( curitem > items - 2 )
+	if(curitem > items - 2)
 		return;
 
 	curitem++;
@@ -191,7 +196,7 @@ scroll_down()
 void
 page_up()
 {
-	if( curitem < 1 )
+	if(curitem < 1)
 		return;
 	
 	curitem = curitem == first_list_item ?
@@ -203,7 +208,7 @@ page_up()
 void
 page_down()
 {
-	if( curitem > items - 2 )
+	if(curitem > items - 2)
 		return;
 
 	curitem = curitem == LAST_LIST_ITEM ?
@@ -213,17 +218,16 @@ page_down()
 	refresh_list();
 }
 
-
 void
 select_none()
 {
-        memset( selected, 0, items );
+        memset(selected, 0, items);
 }
 
 void
 select_all()
 {
-        memset( selected, 1, items );
+        memset(selected, 1, items);
 }
 
 void
@@ -278,8 +282,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
 	/*
@@ -314,7 +322,7 @@ invert_selection()
 {
 	int i;
 
-	if( items < 1 )
+	if(items < 1)
 		return;
 
 	for(i = 0; i < items; i++)
@@ -333,4 +341,25 @@ list_is_empty()
 	return items < 1;
 }
 
-	
+int
+duplicate_item()
+{
+	int i;
+	list_item item;
+
+	if(curitem < 0)
+		return 1;
+
+	for(i = 0; i < ITEM_FIELDS; i++)
+		item[i] = database[curitem][i] ? strdup(database[curitem][i]) :
+			NULL;
+
+	if(add_item2database(item))
+		return 1;
+
+	curitem = LAST_ITEM;
+	refresh_list();
+
+	return 0;
+}
+