X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=4aea3c03719877ffaff4cc3d858a21f37052e81c;hb=222e22ada1c558d43a2dde71bc16c0475874a4a1;hp=ae7643ea95ef12f060fd15003fbc11f22a9521b8;hpb=3990095c4ac65c7f6e10b2fa074f763d048a92eb;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index ae7643e..4aea3c0 100644
--- a/edit.c
+++ b/edit.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -127,12 +127,12 @@ print_editor_header(int item)
 
 	get_first_email(email, item);
 	
-	if( snprintf(header, EDITW_COLS, "%s <%s>", database[item][NAME],
-				email ) ==  -1 || !*database[item][EMAIL] )
-	if( snprintf(header, EDITW_COLS, "%s", database[item][NAME]) == -1) {
-		free(header);
-		return;
-	}
+	if( *database[item][EMAIL] )
+		snprintf(header, EDITW_COLS, "%s <%s>",
+				database[item][NAME],
+				email);
+	else
+		snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
 
 	len = strlen(header);
 	x = (EDITW_COLS - len) / 2;
@@ -146,8 +146,9 @@ static void
 editor_print_data(int tab, int item)
 {
 	const int pos_x = EDITW_COLS > 70 ? 8:4;
-	const int start_y = 4;
+	const int start_y = 5;
 	int i, j;
+	int y, x;
 
 	for(i = 0, j = 1; i < ITEM_FIELDS; i++) {
 		if(abook_fields[i].tab != tab)
@@ -157,18 +158,26 @@ editor_print_data(int tab, int item)
 			int k;
 			char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 			split_emailstr(item, emails);
-			mvwaddstr(editw, 6, pos_x, "E-mail addresses:");
-			for(k=0; k < MAX_EMAILS; k++)
-				mvwprintw(editw, 7 + k, pos_x,
+			getyx(editw, y, x);
+			mvwaddstr(editw, y+1, pos_x, "E-mail addresses:");
+			for(k = 0; k < MAX_EMAILS; k++) {
+				getyx(editw, y, x);
+				mvwprintw(editw, y+1, pos_x,
 				"%c -\t\t%s", '2' + k, emails[k] );
+			}
 			continue;
 		}
 				
-		mvwprintw(editw, start_y + j, pos_x, "%d - %s",
+		if(j > 1) {
+			getyx(editw, y, x); y++;
+		} else
+			y = start_y;
+
+		mvwprintw(editw, y, pos_x, "%d - %s",
 				j,
 				abook_fields[i].name);
-		mvwaddch(editw, start_y + j, 28, ':');
-		mvwaddstr(editw, start_y + j, 30, safe_str(database[item][i]));
+		mvwaddch(editw, y, 28, ':');
+		mvwaddstr(editw, y, 30, safe_str(database[item][i]));
 
 		j++;
 	}
@@ -239,7 +248,7 @@ static void
 edit_emails(char c, int item)
 {
 	char *field = NULL;
-	char emails[4][MAX_EMAIL_LEN];
+	char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 	char tmp[MAX_EMAILSTR_LEN] = "";
 	int i, len;
 
@@ -259,7 +268,7 @@ edit_emails(char c, int item)
 	
 	my_free(database[item][EMAIL]);
 
-	for(i=0; i<4; i++) {
+	for(i=0; i<MAX_EMAILS; i++) {
 		if( *emails[i] ) {
 			strcat(tmp, emails[i]);
 			strcat(tmp, ",");
@@ -374,16 +383,20 @@ edit_loop(int item)
 			       break;
 		case KEY_RIGHT: tab = tab == MAX_TAB ? 0 : tab + 1;
 				break;
+		case '<':
+		case 'k': if(is_valid_item(item-1)) item--; break;
+		case '>':
+		case 'j': if(is_valid_item(item+1)) item++; break;
 		case 'r': roll_emails(item); break;
 		case '?': display_help(HELP_EDITOR); break;
 		case 'u': edit_undo(item, RESTORE_ITEM); break;
-		case 'm': launch_mutt(item);
-		case 'v': launch_wwwbrowser(item);
+		case 'm': launch_mutt(item); clearok(stdscr, 1); break;
+		case 'v': launch_wwwbrowser(item); clearok(stdscr, 1); break;
 		case 12 : clearok(stdscr, 1); break; /* ^L (refresh screen) */
-		default:  return edit_field(tab, c, item);
+		default:  return edit_field(tab, c, item) ? item : -1;
 	}
 
-	return 1;
+	return item;
 }
 
 void
@@ -397,8 +410,9 @@ edit_item(int item)
 	}
 
 	init_editor();
-	while( edit_loop(item) )
-		;
+
+	while( (item = edit_loop(item)) >= 0 )
+		curitem = item; /* hmm, this is not very clean way to go */
 
 	close_editor();
 }