#include <string.h>
#include <stdlib.h>
+#include <assert.h>
#include "abook_curses.h"
#include "ui.h"
#include "abook.h"
#include "list.h"
#include "edit.h"
#include "misc.h"
+#include "xmalloc.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
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, 16 * i + 2, UI_TEE_CHAR);
- mvwaddch(editw, TABLINE+1, 16 * i + 14, UI_TEE_CHAR);
+ 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, 16 * i + 2, UI_ULCORNER_CHAR);
- mvwaddch(editw, TABLINE, 16 * i + 3, UI_LBOXLINE_CHAR);
- mvwaddstr(editw, TABLINE, 16 * i + 4, tab_names[i]);
- mvwaddch(editw, TABLINE, 16 * i + 13, UI_RBOXLINE_CHAR);
- mvwaddch(editw, TABLINE, 16 * i + 14, UI_URCORNER_CHAR);
+ 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);
}
- mvwaddch(editw, TABLINE+1, 16 * tab + 2, UI_LRCORNER_CHAR);
- mvwaddstr(editw, TABLINE+1, 16 * tab + 3, " ");
- mvwaddch(editw, TABLINE+1, 16 * tab + 14, UI_LLCORNER_CHAR);
+ 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
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);
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);
*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;
change_field("Name: ", field);
if( *field == NULL || ! **field ) {
- my_free(*field);
+ xfree(*field);
*field = strdup(tmp);
}
- my_free(tmp);
+ xfree(tmp);
}
static void
} else
*emails[email_num] = 0;
- my_free(database[item][EMAIL]);
+ xfree(database[item][EMAIL]);
for(i = 0; i < MAX_EMAILS; i++) {
if( *emails[i] ) {
case CLEAR_UNDO:
if(backup) {
free_list_item(backup[0]);
- my_free(backup);
+ xfree(backup);
}
break;
case BACKUP_ITEM:
if(backup) {
free_list_item(backup[0]);
- my_free(backup);
+ xfree(backup);
}
- backup = (list_item *)abook_malloc(sizeof(list_item));
+ backup = xmalloc(sizeof(list_item));
for(i = 0; i < ITEM_FIELDS; i++)
backup[0][i] = safe_strdup(database[item][i]);
break;
if(backup) {
free_list_item(database[item]);
itemcpy(database[item], backup[0]);
- my_free(backup);
+ xfree(backup);
}
break;
+ default:
+ assert(0);
}
}
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: