X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=list.c;h=1c250850402f7399d78a5f1a9abf26e2bd1819f9;hb=491bfdf54277f53841f85b6f2dc98f909ec57742;hp=6bd1793eb968735c9f26a061988d1e331285380c;hpb=9d82930091c8cce4fc56c6f9e3cf46e68ca0bcb3;p=pkg%2Fabook.git

diff --git a/list.c b/list.c
index 6bd1793..1c25085 100644
--- a/list.c
+++ b/list.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: list.c,v 1.21 2004/06/30 19:47:43 jheinonen Exp $
+ * $Id: list.c,v 1.27 2005/09/17 10:10:26 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -14,9 +14,11 @@
 #include "ui.h"
 #include "database.h"
 #include "edit.h"
+#include "gettext.h"
 #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 +34,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 +84,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 +112,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,7 +134,7 @@ print_list_line(int i, int line, int highlight)
 
 	if(selected[i])
 		mvwaddch(list, line, 0, '*' );
-	
+
 	mvwaddnstr(list, line, NAMEPOS, database[i][NAME],
 		bytes2width(database[i][NAME], NAMELEN));
 	if(opt_get_bool(BOOL_SHOW_ALL_EMAILS))
@@ -150,7 +157,7 @@ print_list_line(int i, int line, int highlight)
 	if(highlight)
 		wstandend(list);
 }
-	
+
 
 void
 list_headerline()
@@ -158,10 +165,10 @@ list_headerline()
 #if defined(A_BOLD) && defined(A_NORMAL)
 	attrset(A_BOLD);
 #endif
-	mvaddstr(2, NAMEPOS, abook_fields[NAME].name);
-	mvaddstr(2, EMAILPOS, abook_fields[EMAIL].name);
+	mvaddstr(2, NAMEPOS, gettext(abook_fields[NAME].name));
+	mvaddstr(2, EMAILPOS, gettext(abook_fields[EMAIL].name));
 	if(extra_column > 0)
-		mvaddnstr(2, EXTRAPOS, abook_fields[extra_column].name,
+		mvaddnstr(2, EXTRAPOS, gettext(abook_fields[extra_column].name),
 				COLS-EXTRAPOS);
 #if defined(A_BOLD) && defined(A_NORMAL)
 	attrset(A_NORMAL);
@@ -196,10 +203,10 @@ page_up()
 {
 	if(curitem < 1)
 		return;
-	
+
 	curitem = curitem == first_list_item ?
 		((curitem -= LIST_LINES) < 0 ? 0 : curitem) : first_list_item;
-	
+
 	refresh_list();
 }
 
@@ -262,7 +269,7 @@ goto_home()
 {
 	if(items > 0)
 		curitem = 0;
-	
+
 	refresh_list();
 }
 
@@ -349,7 +356,7 @@ duplicate_item()
 		return 1;
 
 	for(i = 0; i < ITEM_FIELDS; i++)
-		item[i] = database[curitem][i] ? strdup(database[curitem][i]) :
+		item[i] = database[curitem][i] ? xstrdup(database[curitem][i]) :
 			NULL;
 
 	if(add_item2database(item))