X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=edit.c;h=44c76f83edf42a875e21e15024c686a0161a755f;hb=c5d8ef5198f2bfd02f678b7a709b6538ef83cd44;hp=7738c5c56b3618987025d08e82e571ad7baf418c;hpb=7dca83329bb3ce545d6d03e10754999b9a82ca01;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 7738c5c..44c76f8 100644
--- a/edit.c
+++ b/edit.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: edit.c,v 1.18 2001/10/12 09:32:51 jheinonen Exp $
+ * $Id: edit.c,v 1.32 2004/04/03 16:05:41 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -9,6 +9,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <assert.h>
 #include "abook_curses.h"
 #include "ui.h"
 #include "abook.h"
@@ -33,22 +34,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;
+	static 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
@@ -120,12 +134,12 @@ print_editor_header(int item)
 {
 	char *header;
 	char email[MAX_EMAIL_LEN];
-	
+
 	if( (header = (char *)malloc(EDITW_COLS)) == NULL )
 		return;
 
 	get_first_email(email, item);
-	
+
 	if( *database[item][EMAIL] )
 		snprintf(header, EDITW_COLS, "%s <%s>",
 				database[item][NAME],
@@ -133,7 +147,7 @@ print_editor_header(int item)
 	else
 		snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
 
-	mvwaddstr(editw, 0, (EDITW_COLS - strlen(header)) / 2,
+	mvwaddstr(editw, 0, (EDITW_COLS - strwidth(header)) / 2,
 			header);
 
 	free(header);
@@ -165,7 +179,7 @@ editor_print_data(int tab, int item)
 			}
 			continue;
 		}
-				
+
 		if(j > 1) {
 			getyx(editw, y, x); y++;
 		} else
@@ -184,14 +198,14 @@ editor_print_data(int tab, int item)
 
 /*
  * function: change_field
- * 
+ *
  * parameters:
  *  (char *msg)
  *   message to display as a prompt
  *  (char **field)
- *   a pointer to pointer which will point a new string. if the latter
+ *   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
@@ -200,24 +214,30 @@ editor_print_data(int tab, int item)
 static int
 change_field(char *msg, char **field)
 {
-	char tmp[MAX_FIELD_LEN];
 	int max_len = MAX_FIELD_LEN;
-	int ret;
-	
+	char *old;
+	int ret = 0;
+
 	if( !strncmp("E-mail", msg, 6) )
 		max_len = MAX_EMAIL_LEN;
-	
-	statusline_addstr(msg);
-	if( (ret = statusline_getnstr( tmp, max_len - 1, 0 ) ? 1:0 ) ) {
-		my_free(*field);
-		if( *tmp )
-			*field = strdup(tmp);
+
+	old = *field;
+
+	*field = ui_readline(msg, old, max_len - 1, 0);
+
+	if(*field) {
+		free(old);
+		if(!**field)
+			my_free(*field);
+	} else {
+		*field = old;
+		ret = 1;
 	}
 
 	clear_statusline();
 	refresh_statusline();
 
-	return !ret;
+	return ret;
 }
 
 static void
@@ -246,25 +266,24 @@ fix_email_str(char *str)
 static void
 edit_emails(char c, int item)
 {
-	char *field = NULL;
+	char *field;
 	char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 	char tmp[MAX_EMAILSTR_LEN] = "";
 	int i, len;
+	int email_num = c - '2';
 
 	split_emailstr(item, emails);
+	field = strdup(emails[email_num]);
 
-	if(change_field("E-mail: ", &field)) {
-#ifdef DEBUG
-		fprintf(stderr, "change_field = TRUE\n");
-#endif
+	if(change_field("E-mail: ", &field))
 		return; /* user cancelled ( C-g ) */
-	}
+
 	if(field) {
-		strncpy(emails[c - '2'], field, MAX_EMAIL_LEN);
-		fix_email_str(emails[c - '2']);
+		strncpy(emails[email_num], field, MAX_EMAIL_LEN);
+		fix_email_str(emails[email_num]);
 	} else
-		*emails[c - '2'] = 0;
-	
+		*emails[email_num] = 0;
+
 	my_free(database[item][EMAIL]);
 
 	for(i = 0; i < MAX_EMAILS; i++) {
@@ -342,7 +361,7 @@ edit_undo(int item, int mode)
 				free_list_item(backup[0]);
 				my_free(backup);
 			}
-			backup = abook_malloc(sizeof(list_item));
+			backup = (list_item *)abook_malloc(sizeof(list_item));
 			for(i = 0; i < ITEM_FIELDS; i++)
 				backup[0][i] = safe_strdup(database[item][i]);
 			break;
@@ -353,6 +372,8 @@ edit_undo(int item, int mode)
 				my_free(backup);
 			}
 			break;
+		default:
+			assert(0);
 	}
 }
 
@@ -361,7 +382,7 @@ edit_loop(int item)
 {
 	static int tab = 0; /* first tab */
 	int c;
-	
+
 	werase(editw);
 	headerline(EDITOR_HELPLINE);
 	refresh_statusline();
@@ -378,12 +399,17 @@ edit_loop(int item)
 		case 'a': tab = TAB_ADDRESS; break;
 		case 'p': tab = TAB_PHONE; break;
 		case 'o': tab = TAB_OTHER; break;
+		case 'C': tab = TAB_CUSTOM; 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;