X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=edit.c;h=8d39660156e90ca5ce884e8ba7b1080019e9f6ce;hb=35c85955699b227956e399a76b4a78ab48aa0c18;hp=9403975263bc1520a48031cc81eb0f1b2e943d9b;hpb=4128f78f5543bebc7cd1868736855207019f1f71;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 9403975..8d39660 100644
--- a/edit.c
+++ b/edit.c
@@ -33,22 +33,35 @@ extern int items;
 WINDOW *editw;
 
 static void
-editor_tab(int tab)
+editor_tab(const int tab)
 {
 	int i;
-	char *tab_names[] = {
-		"/ CONTACT \\",
-		"/ ADDRESS \\",
-		"/  PHONE  \\",
-		"/  OTHER  \\"
+	const int spacing = 12;
+	const char *tab_names[] = {
+		"CONTACT",
+		"ADDRESS",
+		" PHONE ",
+		" OTHER ",
+		"CUSTOM "
 	};
 
 	mvwhline(editw, TABLINE+1, 0, UI_HLINE_CHAR, EDITW_COLS);
+	for(i=0; i < TABS; i++) {
+		mvwaddch(editw,  TABLINE+1, spacing * i + 2,  UI_TEE_CHAR);
+		mvwaddch(editw,  TABLINE+1, spacing * i + 12, 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, spacing * i + 2,  UI_ULCORNER_CHAR);
+		mvwaddch(editw,  TABLINE, spacing * i + 3,  UI_LBOXLINE_CHAR);
+		mvwaddstr(editw, TABLINE, spacing * i + 4,  tab_names[i]);
+		mvwaddch(editw,  TABLINE, spacing * i + 11, UI_RBOXLINE_CHAR);
+		mvwaddch(editw,  TABLINE, spacing * i + 12, UI_URCORNER_CHAR);
+	}
 
-	mvwaddstr(editw, TABLINE+1, 16 * tab + 2, "/           \\");
+	mvwaddch(editw,  TABLINE+1, spacing * tab + 2, UI_LRCORNER_CHAR);
+	mvwaddstr(editw, TABLINE+1, spacing * tab + 3, "         ");
+	mvwaddch(editw,  TABLINE+1, spacing * tab + 12, UI_LLCORNER_CHAR);
 }
 
 void
@@ -182,6 +195,21 @@ 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)
 {
@@ -246,12 +274,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]);
@@ -346,6 +371,8 @@ edit_undo(int item, int mode)
 				my_free(backup);
 			}
 			break;
+		default:
+			assert(0);
 	}
 }
 
@@ -371,12 +398,16 @@ edit_loop(int item)
 		case 'a': tab = TAB_ADDRESS; break;
 		case 'p': tab = TAB_PHONE; break;
 		case 'o': tab = TAB_OTHER; break;
+		case 'h':
 		case KEY_LEFT: tab = tab == 0 ? MAX_TAB : tab - 1;
 			       break;
+		case 'l':
 		case KEY_RIGHT: tab = tab == MAX_TAB ? 0 : tab + 1;
 				break;
+		case KEY_UP:
 		case '<':
 		case 'k': if(is_valid_item(item-1)) item--; break;
+		case KEY_DOWN:
 		case '>':
 		case 'j': if(is_valid_item(item+1)) item++; break;
 		case 'r': roll_emails(item); break;