#include <string.h>
#include <stdlib.h>
+#include <assert.h>
#include "abook_curses.h"
#include "ui.h"
#include "abook.h"
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
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);
}
}
+/*
+ * function: change_field
+ *
+ * parameters:
+ * (char *msg)
+ * message to display as a prompt
+ * (char **field)
+ * 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
+ */
+
static int
change_field(char *msg, char **field)
{
int max_len = MAX_FIELD_LEN;
char *old;
+ int ret = 0;
if( !strncmp("E-mail", msg, 6) )
max_len = MAX_EMAIL_LEN;
*field = ui_readline(msg, old, max_len - 1, 0);
- free(old);
+ if(*field) {
+ free(old);
+ if(!**field)
+ my_free(*field);
+ } else {
+ *field = old;
+ ret = 1;
+ }
clear_statusline();
refresh_statusline();
- return 0;
+ return ret;
}
static void
split_emailstr(item, emails);
field = strdup(emails[email_num]);
- if(change_field("E-mail: ", &field)) {
-#ifdef DEBUG
- fprintf(stderr, "change_field = TRUE\n");
-#endif
- return;
- }
+ if(change_field("E-mail: ", &field))
+ return; /* user cancelled ( C-g ) */
+
if(field) {
strncpy(emails[email_num], field, MAX_EMAIL_LEN);
fix_email_str(emails[email_num]);
my_free(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:
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;