X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=edit.c;h=aed24c6da6e2a606723510f90fe13ce8abc7f375;hb=e79a445f83989ef1f8ae564dd7c3be7e5d134d00;hp=44c76f83edf42a875e21e15024c686a0161a755f;hpb=9d82930091c8cce4fc56c6f9e3cf46e68ca0bcb3;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 44c76f8..aed24c6 100644
--- a/edit.c
+++ b/edit.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: edit.c,v 1.32 2004/04/03 16:05:41 jheinonen Exp $
+ * $Id: edit.c,v 1.43 2005/10/20 13:59:30 cduval Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -14,9 +14,11 @@
 #include "ui.h"
 #include "abook.h"
 #include "database.h"
+#include "gettext.h"
 #include "list.h"
 #include "edit.h"
 #include "misc.h"
+#include "xmalloc.h"
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
@@ -36,33 +38,45 @@ WINDOW *editw;
 static void
 editor_tab(const int tab)
 {
-	int i;
-	const int spacing = 12;
+	int i, j;
+	int x_pos = 2; /* current x pos */
 	static char *tab_names[] = {
-		"CONTACT",
-		"ADDRESS",
-		" PHONE ",
-		" OTHER ",
-		"CUSTOM "
+		N_("CONTACT"),
+		N_("ADDRESS"),
+		N_(" PHONE "),
+		N_(" OTHER "),
+		N_("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);
-	}
+	mvwhline(editw, TABLINE + 1, 0, UI_HLINE_CHAR, EDITW_COLS);
 
-	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);
-	}
+	for(i = 0; i < TABS; i++) {
+		int width = strwidth(gettext(tab_names[i])) + 5;
 
-	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);
+		if(x_pos + width + 1 > EDITW_COLS) {
+			statusline_msg(_("Tab name too wide for screen"));
+			break;
+		}
+
+		mvwaddch(editw,  TABLINE + 1, x_pos,  UI_TEE_CHAR);
+		mvwaddch(editw,  TABLINE + 1, x_pos + width - 2, UI_TEE_CHAR);
+
+		mvwaddch(editw,  TABLINE, x_pos,  UI_ULCORNER_CHAR);
+		mvwaddch(editw,  TABLINE, x_pos + 1,  UI_LBOXLINE_CHAR);
+		mvwaddstr(editw, TABLINE, x_pos + 2,  gettext(tab_names[i]));
+		mvwaddch(editw,  TABLINE, x_pos + width - 3, UI_RBOXLINE_CHAR);
+		mvwaddch(editw,  TABLINE, x_pos + width - 2, UI_URCORNER_CHAR);
+
+		if(i == tab) {
+			mvwaddch(editw,  TABLINE + 1, x_pos, UI_LRCORNER_CHAR);
+			for(j = 0; j < width - 3; j++)
+				mvwaddstr(editw,
+					TABLINE + 1, x_pos + j + 1, " ");
+			mvwaddch(editw,  TABLINE + 1, x_pos + width - 2,
+				UI_LLCORNER_CHAR);
+		}
+		x_pos += width;
+	}
 }
 
 void
@@ -77,7 +91,7 @@ get_first_email(char *str, int item)
 
 	strncpy(str, database[item][EMAIL], MAX_EMAIL_LEN);
 	if( (tmp = strchr(str, ',')) )
-		*tmp=0;
+		*tmp = 0;
 	else
 		str[MAX_EMAIL_LEN-1] = 0;
 }
@@ -93,11 +107,11 @@ roll_emails(int item)
 	if( !(p = strchr(tmp, ',')) )
 		return;
 	else
-		*p=0;
+		*p = 0;
 
 	strcpy(database[item][EMAIL], p+1);
 	strcat(database[item][EMAIL], ",");
-	strcat(database[item][EMAIL], tmp);	
+	strcat(database[item][EMAIL], tmp);
 }
 
 static void
@@ -109,17 +123,55 @@ init_editor()
 	refresh_statusline();
 }
 
-/*
- * we have to introduce edit_undo here
- */
-static void edit_undo(int item, int mode);
-
 enum {
 	BACKUP_ITEM,
 	RESTORE_ITEM,
 	CLEAR_UNDO
 };
 
+static int
+edit_undo(int item, int mode)
+{
+	int i;
+	static list_item *backup = NULL;
+	static int backed_up_item = -1;
+
+	switch(mode) {
+		case CLEAR_UNDO:
+			if(backup) {
+				free_list_item(backup[0]);
+				xfree(backup);
+			}
+			break;
+		case BACKUP_ITEM:
+			if(backup) {
+				free_list_item(backup[0]);
+				xfree(backup);
+			}
+			backup = xmalloc(sizeof(list_item));
+			for(i = 0; i < ITEM_FIELDS; i++)
+				if(database[item][i] == NULL)
+					backup[0][i] = NULL;
+				else
+					backup[0][i] =
+						xstrdup(database[item][i]);
+			backed_up_item = item;
+			break;
+		case RESTORE_ITEM:
+			if(backup) {
+				free_list_item(database[backed_up_item]);
+				itemcpy(database[backed_up_item], backup[0]);
+				xfree(backup);
+				return backed_up_item;
+			}
+			break;
+		default:
+			assert(0);
+	}
+
+	return item;
+}
+
 
 static void
 close_editor()
@@ -135,12 +187,12 @@ print_editor_header(int item)
 	char *header;
 	char email[MAX_EMAIL_LEN];
 
-	if( (header = (char *)malloc(EDITW_COLS)) == NULL )
+	if((header = xmalloc(EDITW_COLS)) == NULL)
 		return;
 
 	get_first_email(email, item);
 
-	if( *database[item][EMAIL] )
+	if(*database[item][EMAIL])
 		snprintf(header, EDITW_COLS, "%s <%s>",
 				database[item][NAME],
 				email);
@@ -163,13 +215,13 @@ editor_print_data(int tab, int item)
 		if(abook_fields[i].tab != tab)
 			continue;
 
-		if(i==EMAIL) { /* special field */
+		if(i == EMAIL) { /* special field */
 			int k;
 			char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 			split_emailstr(item, emails);
 			getyx(editw, y, x);
 			mvwaddstr(editw, y+1, FIELDS_START_X,
-					"E-mail addresses:");
+					_("E-mail addresses:"));
 			for(k = 0; k < MAX_EMAILS; k++) {
 				getyx(editw, y, x);
 				mvwprintw(editw, y+1, FIELDS_START_X,
@@ -181,13 +233,14 @@ editor_print_data(int tab, int item)
 		}
 
 		if(j > 1) {
-			getyx(editw, y, x); y++;
+			getyx(editw, y, x);
+			y++;
 		} else
 			y = FIELDS_START_Y;
 
 		mvwprintw(editw, y, FIELDS_START_X, "%d - %s",
 				j,
-				abook_fields[i].name);
+				gettext(abook_fields[i].name));
 		mvwaddch(editw, y, TAB_COLON_POS, ':');
 		mvwaddstr(editw, y, TAB_COLON_POS + 2,
 				safe_str(database[item][i]));
@@ -218,7 +271,7 @@ change_field(char *msg, char **field)
 	char *old;
 	int ret = 0;
 
-	if( !strncmp("E-mail", msg, 6) )
+	if(!strncmp("E-mail", msg, 6))
 		max_len = MAX_EMAIL_LEN;
 
 	old = *field;
@@ -226,9 +279,9 @@ change_field(char *msg, char **field)
 	*field = ui_readline(msg, old, max_len - 1, 0);
 
 	if(*field) {
-		free(old);
+		xfree(old);
 		if(!**field)
-			my_free(*field);
+			xfree(*field);
 	} else {
 		*field = old;
 		ret = 1;
@@ -245,21 +298,21 @@ change_name_field(char **field)
 {
 	char *tmp;
 
-	tmp = strdup(*field);
+	tmp = xstrdup(*field);
 	change_field("Name: ", field);
 
-	if( *field == NULL || ! **field ) {
-		my_free(*field);
-		*field = strdup(tmp);
+	if(*field == NULL || ! **field) {
+		xfree(*field);
+		*field = xstrdup(tmp);
 	}
 
-	my_free(tmp);
+	xfree(tmp);
 }
 
 static void
 fix_email_str(char *str)
 {
-	for(; *str; str++ )
+	for(; *str; str++)
 		*str = *str == ',' ? '_' : *str;
 }
 
@@ -273,7 +326,7 @@ edit_emails(char c, int item)
 	int email_num = c - '2';
 
 	split_emailstr(item, emails);
-	field = strdup(emails[email_num]);
+	field = xstrdup(emails[email_num]);
 
 	if(change_field("E-mail: ", &field))
 		return; /* user cancelled ( C-g ) */
@@ -284,7 +337,7 @@ edit_emails(char c, int item)
 	} else
 		*emails[email_num] = 0;
 
-	my_free(database[item][EMAIL]);
+	xfree(database[item][EMAIL]);
 
 	for(i = 0; i < MAX_EMAILS; i++) {
 		if( *emails[i] ) {
@@ -297,7 +350,7 @@ edit_emails(char c, int item)
 	if(tmp[len -1] == ',')
 		tmp[len-1] =0;
 
-	database[item][EMAIL] = strdup(tmp);
+	database[item][EMAIL] = xstrdup(tmp);
 }
 
 static int
@@ -325,17 +378,17 @@ edit_field(int tab, char c, int item)
 		return 1;
 	}
 
-	for(i=0, j=0; i< ITEM_FIELDS; i++) {
+	for(i = 0, j = 0; i< ITEM_FIELDS; i++) {
 		if(abook_fields[i].tab == tab)
 			j++;
 		if(j==n)
 			break;
 	}
 
-	if(j!=n)
+	if(j != n)
 		return 0;
 
-	str = mkstr("%s: ", abook_fields[i].name);
+	str = strdup_printf("%s: ", gettext(abook_fields[i].name));
 	change_field(str, &database[item][i]);
 
 	free(str);
@@ -343,40 +396,6 @@ edit_field(int tab, char c, int item)
 	return 1;
 }
 
-static void
-edit_undo(int item, int mode)
-{
-	int i;
-	static list_item *backup = NULL;
-
-	switch(mode) {
-		case CLEAR_UNDO:
-			if(backup) {
-				free_list_item(backup[0]);
-				my_free(backup);
-			}
-			break;
-		case BACKUP_ITEM:
-			if(backup) {
-				free_list_item(backup[0]);
-				my_free(backup);
-			}
-			backup = (list_item *)abook_malloc(sizeof(list_item));
-			for(i = 0; i < ITEM_FIELDS; i++)
-				backup[0][i] = safe_strdup(database[item][i]);
-			break;
-		case RESTORE_ITEM:
-			if(backup) {
-				free_list_item(database[item]);
-				itemcpy(database[item], backup[0]);
-				my_free(backup);
-			}
-			break;
-		default:
-			assert(0);
-	}
-}
-
 static int
 edit_loop(int item)
 {
@@ -384,7 +403,7 @@ edit_loop(int item)
 	int c;
 
 	werase(editw);
-	headerline(EDITOR_HELPLINE);
+	headerline(gettext(EDITOR_HELPLINE));
 	refresh_statusline();
 	print_editor_header(item);
 	editor_tab(tab);
@@ -394,7 +413,7 @@ edit_loop(int item)
 	refresh();
 	wrefresh(editw);
 
-	switch( (c = getch()) ) {
+	switch((c = getch())) {
 		case 'c': tab = TAB_CONTACT; break;
 		case 'a': tab = TAB_ADDRESS; break;
 		case 'p': tab = TAB_PHONE; break;
@@ -411,10 +430,10 @@ edit_loop(int item)
 		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 '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 'u': item = edit_undo(item, RESTORE_ITEM); break;
 		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) */
@@ -436,7 +455,7 @@ edit_item(int item)
 
 	init_editor();
 
-	while( (item = edit_loop(item)) >= 0 )
+	while((item = edit_loop(item)) >= 0)
 		curitem = item; /* hmm, this is not very clean way to go */
 
 	close_editor();