X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=e41d707d1d5d22e6f87a75cbdd4a80031d541635;hb=6d0e6b25e1a9c8fdbee209e948f23d9893c0fa15;hp=83f4beb993ba2bc2f0fc3cfa64e3c49c5279265d;hpb=3212da92838c056bcc1cafa57beaf26086e2ac96;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 83f4beb..e41d707 100644
--- a/edit.c
+++ b/edit.c
@@ -146,6 +146,7 @@ static void
 editor_print_data(int tab, int item)
 {
 	const int pos_x = EDITW_COLS > 70 ? 8:4;
+	const int start_y = 4;
 	int i, j;
 
 	for(i = 0, j = 1; i < ITEM_FIELDS; i++) {
@@ -156,18 +157,19 @@ editor_print_data(int tab, int item)
 			int k;
 			char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 			split_emailstr(item, emails);
-			mvwaddstr(editw, (LINES > 21 ? 7:6), pos_x, "E-mail addresses:");
+			mvwaddstr(editw, 6, pos_x, "E-mail addresses:");
 			for(k=0; k < MAX_EMAILS; k++)
-				mvwprintw(editw, (LINES > 21 ? 9:7)+k*2, pos_x,
+				mvwprintw(editw, 7 + k, pos_x,
 				"%c -\t\t%s", '2' + k, emails[k] );
 			continue;
 		}
 				
-		mvwprintw(editw, 3+j*2, pos_x, "%d - %s",
+		mvwprintw(editw, start_y + j, pos_x, "%d - %s",
 				j,
 				abook_fields[i].name);
-		mvwaddch(editw, 3+j*2, 28, ':');
-		mvwaddstr(editw, 3+j*2, 30, safe_str(database[item][i]));
+		mvwaddch(editw, start_y + j, 28, ':');
+		mvwaddstr(editw, start_y + j, 30, safe_str(database[item][i]));
+
 		j++;
 	}
 }
@@ -354,6 +356,7 @@ edit_loop(int item)
 	
 	werase(editw);
 	headerline(EDITOR_HELPLINE);
+	refresh_statusline();
 	print_editor_header(item);
 	editor_tab(tab);
 	editor_print_data(tab, item);
@@ -371,14 +374,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 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
@@ -392,8 +401,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();
 }