X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=4502e106191571b1a1cd3d5946d2a11b371cb967;hb=1ce000762e496959ea5afa3830b171c73f0409c8;hp=8d39660156e90ca5ce884e8ba7b1080019e9f6ce;hpb=35c85955699b227956e399a76b4a78ab48aa0c18;p=pkg%2Fabook.git diff --git a/edit.c b/edit.c index 8d39660..4502e10 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 @@ -37,7 +39,7 @@ editor_tab(const int tab) { int i; const int spacing = 12; - const char *tab_names[] = { + static char *tab_names[] = { "CONTACT", "ADDRESS", " PHONE ", @@ -45,13 +47,13 @@ editor_tab(const int tab) "CUSTOM " }; - mvwhline(editw, TABLINE+1, 0, UI_HLINE_CHAR, EDITW_COLS); - for(i=0; i < TABS; i++) { + 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++) { + 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]); @@ -96,7 +98,7 @@ roll_emails(int item) strcpy(database[item][EMAIL], p+1); strcat(database[item][EMAIL], ","); - strcat(database[item][EMAIL], tmp); + strcat(database[item][EMAIL], tmp); } static void @@ -108,17 +110,46 @@ 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++) + 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 void close_editor() @@ -134,19 +165,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); @@ -162,7 +193,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); @@ -180,7 +211,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; @@ -217,7 +249,7 @@ change_field(char *msg, char **field) char *old; int ret = 0; - if( !strncmp("E-mail", msg, 6) ) + if(!strncmp("E-mail", msg, 6)) max_len = MAX_EMAIL_LEN; old = *field; @@ -225,9 +257,9 @@ change_field(char *msg, char **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; @@ -247,18 +279,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; } @@ -283,7 +315,7 @@ edit_emails(char c, int item) } else *emails[email_num] = 0; - my_free(database[item][EMAIL]); + xfree(database[item][EMAIL]); for(i = 0; i < MAX_EMAILS; i++) { if( *emails[i] ) { @@ -324,14 +356,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); @@ -342,40 +374,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]); - 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) { @@ -393,11 +391,12 @@ 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; @@ -409,7 +408,7 @@ edit_loop(int item) 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; @@ -434,7 +433,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();