X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=538555a353a4a1b5b82a05923285d0a7230f3252;hb=4b8f9231090ada43f7e16987ec46ac7f45a914ec;hp=a32121ed9f058c5a8af9ce710b79999caae22827;hpb=ef379a20d142cb95ba08c7887c8e3245269b3fdd;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index a32121e..538555a 100644
--- a/edit.c
+++ b/edit.c
@@ -14,8 +14,10 @@
 #include "ui.h"
 #include "abook.h"
 #include "database.h"
+#include "gettext.h"
 #include "list.h"
 #include "edit.h"
+#include <mbswidth.h>
 #include "misc.h"
 #include "xmalloc.h"
 #ifdef HAVE_CONFIG_H
@@ -37,33 +39,44 @@ WINDOW *editw;
 static void
 editor_tab(const int tab)
 {
-	int i;
-	const int spacing = 12;
+	int i, j;
+	int sum = 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);
-	}
 
 	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);
+		int width = mbswidth(gettext(tab_names[i]), 0) + 5;
+
+		if(sum + width + 1> EDITW_COLS) {
+			statusline_msg(_("Tab name too wide for screen"));
+			break;
+		}
+
+		mvwaddch(editw,  TABLINE+1, sum,  UI_TEE_CHAR);
+		mvwaddch(editw,  TABLINE+1, sum + width - 2, UI_TEE_CHAR);
+
+		mvwaddch(editw,  TABLINE, sum,  UI_ULCORNER_CHAR);
+		mvwaddch(editw,  TABLINE, sum + 1,  UI_LBOXLINE_CHAR);
+		mvwaddstr(editw, TABLINE, sum + 2,  gettext(tab_names[i]));
+		mvwaddch(editw,  TABLINE, sum + width - 3, UI_RBOXLINE_CHAR);
+		mvwaddch(editw,  TABLINE, sum + width - 2, UI_URCORNER_CHAR);
+
+		if(i == tab) {
+			mvwaddch(editw,  TABLINE+1, sum, UI_LRCORNER_CHAR);
+			for(j = 0; j < width - 3; j++)
+				mvwaddstr(editw,  TABLINE+1, sum + j + 1, " ");
+			mvwaddch(editw,  TABLINE+1, sum + width - 2, UI_LLCORNER_CHAR);
+		}
+		sum += width;
 	}
 
-	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
@@ -110,17 +123,50 @@ 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 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]);
+				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]);
+			break;
+		case RESTORE_ITEM:
+			if(backup) {
+				free_list_item(database[item]);
+				itemcpy(database[item], backup[0]);
+				xfree(backup);
+			}
+			break;
+		default:
+			assert(0);
+	}
+}
+
 
 static void
 close_editor()
@@ -170,7 +216,7 @@ editor_print_data(int tab, int item)
 			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,
@@ -189,7 +235,7 @@ editor_print_data(int tab, int item)
 
 		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]));
@@ -247,12 +293,12 @@ change_name_field(char **field)
 {
 	char *tmp;
 
-	tmp = strdup(*field);
+	tmp = xstrdup(*field);
 	change_field("Name: ", field);
 
 	if(*field == NULL || ! **field) {
 		xfree(*field);
-		*field = strdup(tmp);
+		*field = xstrdup(tmp);
 	}
 
 	xfree(tmp);
@@ -275,7 +321,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 ) */
@@ -299,7 +345,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
@@ -337,7 +383,7 @@ edit_field(int tab, char c, int item)
 	if(j != n)
 		return 0;
 
-	str = mkstr("%s: ", abook_fields[i].name);
+	str = mkstr("%s: ", gettext(abook_fields[i].name));
 	change_field(str, &database[item][i]);
 
 	free(str);
@@ -345,40 +391,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]);
-				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++)
-				backup[0][i] = safe_strdup(database[item][i]);
-			break;
-		case RESTORE_ITEM:
-			if(backup) {
-				free_list_item(database[item]);
-				itemcpy(database[item], backup[0]);
-				xfree(backup);
-			}
-			break;
-		default:
-			assert(0);
-	}
-}
-
 static int
 edit_loop(int item)
 {
@@ -386,7 +398,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);