X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=edit.c;h=67a8e2d7bd88e59a319a1656169b462dfee9e80e;hb=9db7ae25d79b4deeac62b3a757be789ad9dad12b;hp=90cc07d763241195b57b322d7ed98cc993fec956;hpb=548845673bdbe52a3cb2d7c6c2818d3202fffcba;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 90cc07d..67a8e2d 100644
--- a/edit.c
+++ b/edit.c
@@ -37,18 +37,29 @@ editor_tab(int tab)
 {
 	int i;
 	char *tab_names[] = {
-		"/ CONTACT \\",
-		"/ ADDRESS \\",
-		"/  PHONE  \\",
-		"/  OTHER  \\"
+		" CONTACT ",
+		" ADDRESS ",
+		"  PHONE  ",
+		"  OTHER  "
 	};
 
 	mvwhline(editw, TABLINE+1, 0, UI_HLINE_CHAR, EDITW_COLS);
+	for(i=0; i < TABS; i++) {
+		mvwaddch(editw,  TABLINE+1, 16 * i + 2,  UI_TEE_CHAR);
+		mvwaddch(editw,  TABLINE+1, 16 * i + 14, UI_TEE_CHAR);
+	}
 
-	for(i=0; i < TABS; i++)
-		mvwaddstr(editw, TABLINE, 16 * i + 3, tab_names[i]);
+	for(i=0; i < TABS; i++) {
+		mvwaddch(editw,  TABLINE, 16 * i + 2,  UI_ULCORNER_CHAR);
+		mvwaddch(editw,  TABLINE, 16 * i + 3,  UI_LBOXLINE_CHAR);
+		mvwaddstr(editw, TABLINE, 16 * i + 4,  tab_names[i]);
+		mvwaddch(editw,  TABLINE, 16 * i + 13, UI_RBOXLINE_CHAR);
+		mvwaddch(editw,  TABLINE, 16 * i + 14, UI_URCORNER_CHAR);
+	}
 
-	mvwaddstr(editw, TABLINE+1, 16 * tab + 2, "/           \\");
+	mvwaddch(editw,  TABLINE+1, 16 * tab + 2, UI_LRCORNER_CHAR);
+	mvwaddstr(editw, TABLINE+1, 16 * tab + 3, "           ");
+	mvwaddch(editw,  TABLINE+1, 16 * tab + 14, UI_LLCORNER_CHAR);
 }
 
 void
@@ -182,11 +193,27 @@ editor_print_data(int tab, int item)
 	}
 }
 
+/*
+ * function: change_field
+ *
+ * parameters:
+ *  (char *msg)
+ *   message to display as a prompt
+ *  (char **field)
+ *   a pointer to a pointer which will point a new string. if the latter
+ *   pointer != NULL it will be freed (if user doesn't cancel)
+ *
+ * returns (int)
+ *  a nonzero value if user has cancelled and zero if user has typed a
+ *  valid string
+ */
+
 static int
 change_field(char *msg, char **field)
 {
 	int max_len = MAX_FIELD_LEN;
 	char *old;
+	int ret = 0;
 
 	if( !strncmp("E-mail", msg, 6) )
 		max_len = MAX_EMAIL_LEN;
@@ -195,12 +222,19 @@ change_field(char *msg, char **field)
 
 	*field = ui_readline(msg, old, max_len - 1, 0);
 
-	free(old);
+	if(*field) {
+		free(old);
+		if(!**field)
+			my_free(*field);
+	} else {
+		*field = old;
+		ret = 1;
+	}
 
 	clear_statusline();
 	refresh_statusline();
 
-	return 0;
+	return ret;
 }
 
 static void
@@ -238,12 +272,9 @@ edit_emails(char c, int item)
 	split_emailstr(item, emails);
 	field = strdup(emails[email_num]);
 
-	if(change_field("E-mail: ", &field)) {
-#ifdef DEBUG
-		fprintf(stderr, "change_field = TRUE\n");
-#endif
-		return;
-	}
+	if(change_field("E-mail: ", &field))
+		return; /* user cancelled ( C-g ) */
+
 	if(field) {
 		strncpy(emails[email_num], field, MAX_EMAIL_LEN);
 		fix_email_str(emails[email_num]);