#include <string.h>
#include <stdlib.h>
+#include <assert.h>
#include "abook_curses.h"
#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
static void
editor_tab(const int tab)
{
- int i;
- const int spacing = 12;
- const char *tab_names[] = {
- "CONTACT",
- "ADDRESS",
- " PHONE ",
- " OTHER ",
- "CUSTOM "
+ int i, j;
+ int x_pos = 2; /* current x pos */
+ static char *tab_names[] = {
+ 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
strncpy(str, database[item][EMAIL], MAX_EMAIL_LEN);
if( (tmp = strchr(str, ',')) )
- *tmp=0;
+ *tmp = 0;
else
str[MAX_EMAIL_LEN-1] = 0;
}
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
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()
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);
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);
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,
}
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]));
char *old;
int ret = 0;
- if( !strncmp("E-mail", msg, 6) )
+ if(!strncmp("E-mail", msg, 6))
max_len = MAX_EMAIL_LEN;
old = *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;
{
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;
}
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 ) */
} else
*emails[email_num] = 0;
- my_free(database[item][EMAIL]);
+ xfree(database[item][EMAIL]);
for(i = 0; i < MAX_EMAILS; i++) {
if( *emails[i] ) {
if(tmp[len -1] == ',')
tmp[len-1] =0;
- database[item][EMAIL] = strdup(tmp);
+ database[item][EMAIL] = xstrdup(tmp);
}
static int
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);
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)
{
int c;
werase(editw);
- headerline(EDITOR_HELPLINE);
+ headerline(gettext(EDITOR_HELPLINE));
refresh_statusline();
print_editor_header(item);
editor_tab(tab);
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;
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 '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;
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();