X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=edit.c;h=e6ba4342494912c9a455b58cf8c80d677718e5c3;hb=d4cd6aada86c2d1c3e046b91a271184e659716fa;hp=50363f3e4ea5898dba0435ef839d49c0254b9d96;hpb=0d3c17d9ab127e5596c8fb97d65122b3b90f6b11;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 50363f3..e6ba434 100644
--- a/edit.c
+++ b/edit.c
@@ -1,7 +1,8 @@
 
 /*
- * edit.c
- * by JH <jheinonen@bigfoot.com>
+ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -9,6 +10,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "abook_curses.h"
+#include "ui.h"
 #include "abook.h"
 #include "database.h"
 #include "list.h"
@@ -41,7 +43,7 @@ editor_tab(int tab)
 		"/  OTHER  \\"
 	};
 
-	mvwhline(editw, TABLINE+1, 0, ACS_HLINE, EDITW_COLS);
+	mvwhline(editw, TABLINE+1, 0, UI_HLINE_CHAR, EDITW_COLS);
 
 	for(i=0; i < TABS; i++)
 		mvwaddstr(editw, TABLINE, 16 * i + 3, tab_names[i]);
@@ -125,26 +127,26 @@ 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;
 	mvwaddstr(editw, 0, x, header);
 	for(i = x; i < x + len; i++)
-		mvwaddch(editw,1, i, '^');
+		mvwaddch(editw, 1, i, '^');
 	free(header);
 }
 
 static void
 editor_print_data(int tab, int item)
 {
-	const int pos_x = EDITW_COLS > 70 ? 8:4;
 	int i, j;
+	int y, x;
 
 	for(i = 0, j = 1; i < ITEM_FIELDS; i++) {
 		if(abook_fields[i].tab != tab)
@@ -154,18 +156,30 @@ 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:");
-			for(k=0; k < MAX_EMAILS; k++)
-				mvwprintw(editw, (LINES > 21 ? 9:7)+k*2, pos_x,
-				"%c -\t\t%s", '2' + k, emails[k] );
+			getyx(editw, y, x);
+			mvwaddstr(editw, y+1, TAB_START_X, "E-mail addresses:");
+			for(k = 0; k < MAX_EMAILS; k++) {
+				getyx(editw, y, x);
+				mvwprintw(editw, y+1, TAB_START_X,
+				"%c -", '2' + k);
+				mvwprintw(editw, y +1, TAB_COLON_POS,
+						": %s", emails[k]);
+			}
 			continue;
 		}
 				
-		mvwprintw(editw, 3+j*2, pos_x, "%d - %s",
+		if(j > 1) {
+			getyx(editw, y, x); y++;
+		} else
+			y = TAB_START_Y;
+
+		mvwprintw(editw, y, TAB_START_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, y, TAB_COLON_POS, ':');
+		mvwaddstr(editw, y, TAB_COLON_POS + 2,
+				safe_str(database[item][i]));
+
 		j++;
 	}
 }
@@ -235,14 +249,16 @@ 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;
 
 	split_emailstr(item, emails);
 
 	if(change_field("E-mail: ", &field)) {
+#ifdef DEBUG
 		fprintf(stderr, "change_field = TRUE\n");
+#endif
 		return; /* user cancelled ( C-g ) */
 	}
 	if(field) {
@@ -253,7 +269,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, ",");
@@ -274,7 +290,7 @@ edit_field(int tab, char c, int item)
 	int n = c - '1' + 1;
 	char *str;
 
-	if(n < 1 || n > 6)
+	if(n < 1 || n > MAX_TAB_LINES)
 		return 0;
 
 	edit_undo(item, BACKUP_ITEM);
@@ -350,6 +366,7 @@ edit_loop(int item)
 	
 	werase(editw);
 	headerline(EDITOR_HELPLINE);
+	refresh_statusline();
 	print_editor_header(item);
 	editor_tab(tab);
 	editor_print_data(tab, item);
@@ -367,13 +384,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_editor_help(editw); break;
+		case '?': display_help(HELP_EDITOR); break;
 		case 'u': edit_undo(item, RESTORE_ITEM); break;
-		default:  return edit_field(tab, c, 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) ? item : -1;
 	}
 
-	return 1;
+	return item;
 }
 
 void
@@ -387,8 +411,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();
 }