X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=list.c;h=de47d6b419246c5df21ebf85837bd9312e5514ac;hb=781c0d657fffe80e45d0fda6ed5ddbf5f796fefb;hp=25c53826130c6ba5fcc40c97e8c2aff297480cf4;hpb=e0e2b1ebd0bbc1728e7117ff88e5046f2870cfaa;p=pkg%2Fabook.git

diff --git a/list.c b/list.c
index 25c5382..de47d6b 100644
--- a/list.c
+++ b/list.c
@@ -17,6 +17,7 @@
 #include "list.h"
 #include "misc.h"
 #include "options.h"
+#include "xmalloc.h"
 
 #define MIN_EXTRA_COLUMN	ADDRESS /* 2 */
 #define MAX_EXTRA_COLUMN	LAST_FIELD
@@ -32,7 +33,7 @@ extern int items;
 extern list_item *database;
 extern struct abook_field abook_fields[];
 
-WINDOW *list = NULL;
+static WINDOW *list = NULL;
 
 static int
 init_extra_field(enum str_opts option)
@@ -82,17 +83,17 @@ void
 refresh_list()
 {
 	int i, line;
-	
+
 	werase(list);
 
 	ui_print_number_of_items();
-	
-	if(items < 1) {
+
+	if(list_is_empty()) {
 		refresh();
 		wrefresh(list);
 		return;
 	}
-	
+
 	if(curitem < 0)
 		curitem = 0;
 
@@ -110,6 +111,11 @@ refresh_list()
 		print_list_line(i, line, i == curitem);
         }
 
+	if(opt_get_bool(BOOL_SHOW_CURSOR)) {
+		wmove(list, curitem - first_list_item, 0);
+		/* need to call refresh() to update the cursor positions */
+		refresh();
+	}
         wrefresh(list);
 }
 
@@ -127,43 +133,43 @@ print_list_line(int i, int line, int highlight)
 
 	if(selected[i])
 		mvwaddch(list, line, 0, '*' );
-	
-	mvwaddnstr(list, line, NAMEPOS, database[i][NAME], NAMELEN);
+
+	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
+#if defined(A_BOLD) && defined(A_NORMAL)
 	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
+#if defined(A_BOLD) && defined(A_NORMAL)
 	attrset(A_NORMAL);
 #endif
 }
@@ -196,10 +202,10 @@ page_up()
 {
 	if(curitem < 1)
 		return;
-	
+
 	curitem = curitem == first_list_item ?
 		((curitem -= LIST_LINES) < 0 ? 0 : curitem) : first_list_item;
-	
+
 	refresh_list();
 }
 
@@ -216,7 +222,6 @@ page_down()
 	refresh_list();
 }
 
-
 void
 select_none()
 {
@@ -263,7 +268,7 @@ goto_home()
 {
 	if(items > 0)
 		curitem = 0;
-	
+
 	refresh_list();
 }
 
@@ -340,3 +345,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] ? xstrdup(database[curitem][i]) :
+			NULL;
+
+	if(add_item2database(item))
+		return 1;
+
+	curitem = LAST_ITEM;
+	refresh_list();
+
+	return 0;
+}
+