X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=list.c;h=b1c6ebabada1be5e94c9c31f7b911081352220c0;hb=4909ba20244f55ee7326a40d751cf6737c2bc2b6;hp=5bb6753a4d7be745bd82e6cc565427e629c68cd3;hpb=b8966ec4ee3c9d035850ff49aaf5485081fe0d20;p=pkg%2Fabook.git

diff --git a/list.c b/list.c
index 5bb6753..b1c6eba 100644
--- a/list.c
+++ b/list.c
@@ -14,12 +14,12 @@
 #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
 
 int curitem = -1;
 int first_list_item = -1;
@@ -29,31 +29,24 @@ int extra_column = -1;
 int extra_alternative = -1;
 
 extern int items;
-extern list_item *database;
-extern struct abook_field abook_fields[];
+extern abook_field_list *fields_list;
 
-WINDOW *list = NULL;
+static WINDOW *list = NULL;
 
-static int
-init_extra_field(char *option_name)
+
+int
+init_extra_field(enum str_opts option)
 {
-	int i, ret = -1;
+	int 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++) {
-			if(!strcasecmp(option_str, abook_fields[i].key)) {
-				ret = i;
-				break;
-			}
-		}
-		if(ret < MIN_EXTRA_COLUMN || ret > MAX_EXTRA_COLUMN) {
+		find_field_number(option_str, &ret);
+
+		if(!strcmp(option_str, "name") || !strcmp(option_str, "email"))
 			ret = -1;
-		}
 	}
 
 	return ret;
@@ -69,8 +62,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
@@ -84,17 +77,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;
 
@@ -112,6 +105,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,45 +125,51 @@ print_list_line(int i, int line, int highlight)
 	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, EMAILPOS, database[i][EMAIL],
-				real_emaillen);
+
+	mvwaddnstr(list, line, NAMEPOS, db_name_get(i),
+		bytes2width(db_name_get(i), NAMELEN));
+
+	if(opt_get_bool(BOOL_SHOW_ALL_EMAILS))
+		mvwaddnstr(list, line, EMAILPOS, db_email_get(i),
+				bytes2width(db_email_get(i), 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])
+	if(extra < 0 || !db_fget_byid(i, extra))
 		extra = extra_alternative;
 	if(extra >= 0)
 		mvwaddnstr(list, line, EXTRAPOS,
-				safe_str(database[i][extra]),
-				EXTRALEN);
+			safe_str(db_fget_byid(i, extra)),
+			bytes2width(safe_str(db_fget_byid(i, extra)),
+			EXTRALEN));
 
 	scrollok(list, TRUE);
 	if(highlight)
 		wstandend(list);
 }
-	
 
 void
 list_headerline()
 {
-#ifdef A_BOLD
+	char *str = NULL;
+
+#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
+
+	mvaddstr(2, NAMEPOS, find_field("name", NULL)->name);
+	mvaddstr(2, EMAILPOS, find_field("email", NULL)->name);
+	if(extra_column > 0) {
+		get_field_keyname(extra_column, NULL, &str);
+		mvaddnstr(2, EXTRAPOS, str, COLS - EXTRAPOS);
+	}
+
+#if defined(A_BOLD) && defined(A_NORMAL)
 	attrset(A_NORMAL);
 #endif
 }
@@ -173,7 +177,7 @@ list_headerline()
 void
 scroll_up()
 {
-	if( curitem < 1 )
+	if(curitem < 1)
 		return;
 
 	curitem--;
@@ -184,7 +188,7 @@ scroll_up()
 void
 scroll_down()
 {
-	if( curitem > items - 2 )
+	if(curitem > items - 2)
 		return;
 
 	curitem++;
@@ -196,19 +200,19 @@ scroll_down()
 void
 page_up()
 {
-	if( curitem < 1 )
+	if(curitem < 1)
 		return;
-	
+
 	curitem = curitem == first_list_item ?
 		((curitem -= LIST_LINES) < 0 ? 0 : curitem) : first_list_item;
-	
+
 	refresh_list();
 }
 
 void
 page_down()
 {
-	if( curitem > items - 2 )
+	if(curitem > items - 2)
 		return;
 
 	curitem = curitem == LAST_LIST_ITEM ?
@@ -218,17 +222,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
@@ -239,25 +242,31 @@ move_curitem(int direction)
         if( curitem < 0 || curitem > LAST_ITEM )
                 return;
 
-        itemcpy(tmp, database[curitem]);
-
-        switch(direction) {
-                case MOVE_ITEM_UP:
-                        if( curitem < 1 )
-                                return;
-                        itemcpy(database[curitem], database[curitem - 1]);
-                        itemcpy(database[curitem-1], tmp);
-                        scroll_up();
-                        break;
-
-                case MOVE_ITEM_DOWN:
-                        if( curitem >= LAST_ITEM )
-                                return;
-                        itemcpy(database[curitem], database[curitem + 1]);
-                        itemcpy(database[curitem+1], tmp);
-                        scroll_down();
-                        break;
-        }
+	tmp = item_create();
+	item_copy(tmp, db_item_get(curitem));
+
+	switch(direction) {
+		case MOVE_ITEM_UP:
+			if( curitem < 1 )
+				goto out_move;
+			item_copy(db_item_get(curitem),
+					db_item_get(curitem - 1));
+			item_copy(db_item_get(curitem-1), tmp);
+			scroll_up();
+			break;
+
+		case MOVE_ITEM_DOWN:
+			if( curitem >= LAST_ITEM )
+				goto out_move;
+			item_copy(db_item_get(curitem),
+					db_item_get(curitem + 1));
+			item_copy(db_item_get(curitem + 1), tmp);
+			scroll_down();
+			break;
+	}
+
+out_move:
+	item_free(&tmp);
 }
 
 void
@@ -265,7 +274,7 @@ goto_home()
 {
 	if(items > 0)
 		curitem = 0;
-	
+
 	refresh_list();
 }
 
@@ -278,7 +287,6 @@ goto_end()
 	refresh_list();
 }
 
-
 void
 highlight_line(WINDOW *win, int line)
 {
@@ -323,7 +331,7 @@ invert_selection()
 {
 	int i;
 
-	if( items < 1 )
+	if(items < 1)
 		return;
 
 	for(i = 0; i < items; i++)
@@ -342,4 +350,25 @@ list_is_empty()
 	return items < 1;
 }
 
+int
+duplicate_item()
+{
+	list_item item;
 	
+	if(curitem < 0)
+		return 1;
+
+	item = item_create();
+	item_duplicate(item, db_item_get(curitem));
+	if(add_item2database(item)) {
+		item_free(&item);
+		return 1;
+	}
+	item_free(&item);
+
+	curitem = LAST_ITEM;
+	refresh_list();
+
+	return 0;
+}
+