X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=cb423264de2672be76fd123db6006c1e132ee2c8;hb=8e2d9de658662d5cad666626ee507755519459d8;hp=90cc07d763241195b57b322d7ed98cc993fec956;hpb=548845673bdbe52a3cb2d7c6c2818d3202fffcba;p=pkg%2Fabook.git diff --git a/edit.c b/edit.c index 90cc07d..cb42326 100644 --- a/edit.c +++ b/edit.c @@ -9,6 +9,7 @@ #include #include +#include #include "abook_curses.h" #include "ui.h" #include "abook.h" @@ -16,6 +17,7 @@ #include "list.h" #include "edit.h" #include "misc.h" +#include "xmalloc.h" #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -33,22 +35,35 @@ extern int items; 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); + 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 @@ -121,19 +136,19 @@ 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); 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); @@ -149,7 +164,7 @@ 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); @@ -167,7 +182,8 @@ 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; @@ -182,25 +198,48 @@ editor_print_data(int tab, int item) } } +/* + * 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) ) + if(!strncmp("E-mail", msg, 6)) max_len = MAX_EMAIL_LEN; old = *field; *field = ui_readline(msg, old, max_len - 1, 0); - free(old); + if(*field) { + xfree(old); + if(!**field) + xfree(*field); + } else { + *field = old; + ret = 1; + } clear_statusline(); refresh_statusline(); - return 0; + return ret; } static void @@ -211,18 +250,18 @@ change_name_field(char **field) tmp = strdup(*field); change_field("Name: ", field); - if( *field == NULL || ! **field ) { - my_free(*field); + if(*field == NULL || ! **field) { + xfree(*field); *field = strdup(tmp); } - my_free(tmp); + xfree(tmp); } static void fix_email_str(char *str) { - for(; *str; str++ ) + for(; *str; str++) *str = *str == ',' ? '_' : *str; } @@ -238,19 +277,16 @@ edit_emails(char c, int item) 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]); } else *emails[email_num] = 0; - my_free(database[item][EMAIL]); + xfree(database[item][EMAIL]); for(i = 0; i < MAX_EMAILS; i++) { if( *emails[i] ) { @@ -291,14 +327,14 @@ 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); @@ -319,15 +355,15 @@ edit_undo(int item, int mode) 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; @@ -335,9 +371,11 @@ edit_undo(int item, int mode) if(backup) { free_list_item(database[item]); itemcpy(database[item], backup[0]); - my_free(backup); + xfree(backup); } break; + default: + assert(0); } } @@ -358,19 +396,24 @@ 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; 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 '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; @@ -395,7 +438,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();