*** empty log message ***

[pkg/abook.git] / edit.c

diff --git a/edit.c b/edit.c
index e41d707d1d5d22e6f87a75cbdd4a80031d541635..5edebec4d2fb2f01e1a6afcd47063d4fb55d5507 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -120,34 +120,30 @@ print_editor_header(int item)
 {
        char *header;
        char email[MAX_EMAIL_LEN];
-       int i, x, len;
-       
+
        if( (header = (char *)malloc(EDITW_COLS)) == NULL )
                return;
 
        get_first_email(email, item);
-       
-       if( snprintf(header, EDITW_COLS, "%s <%s>", database[item][NAME],
-                               email ) ==  -1 || !*database[item][EMAIL] )
-       if( snprintf(header, EDITW_COLS, "%s", database[item][NAME]) == -1) {
-               free(header);
-               return;
-       }
 
-       len = strlen(header);
-       x = (EDITW_COLS - len) / 2;
-       mvwaddstr(editw, 0, x, header);
-       for(i = x; i < x + len; i++)
-               mvwaddch(editw,1, i, '^');
+       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,
+                       header);
+
        free(header);
 }
 
 static void
 editor_print_data(int tab, int item)
 {
-       const int pos_x = EDITW_COLS > 70 ? 8:4;
-       const int start_y = 4;
        int i, j;
+       int y, x;
 
        for(i = 0, j = 1; i < ITEM_FIELDS; i++) {
                if(abook_fields[i].tab != tab)
@@ -157,18 +153,30 @@ editor_print_data(int tab, int item)
                        int k;
                        char emails[MAX_EMAILS][MAX_EMAIL_LEN];
                        split_emailstr(item, emails);
-                       mvwaddstr(editw, 6, pos_x, "E-mail addresses:");
-                       for(k=0; k < MAX_EMAILS; k++)
-                               mvwprintw(editw, 7 + k, pos_x,
-                               "%c -\t\t%s", '2' + k, emails[k] );
+                       getyx(editw, y, x);
+                       mvwaddstr(editw, y+1, FIELDS_START_X,
+                                       "E-mail addresses:");
+                       for(k = 0; k < MAX_EMAILS; k++) {
+                               getyx(editw, y, x);
+                               mvwprintw(editw, y+1, FIELDS_START_X,
+                               "%c -", '2' + k);
+                               mvwprintw(editw, y +1, TAB_COLON_POS,
+                                               ": %s", emails[k]);
+                       }
                        continue;
                }
-                               
-               mvwprintw(editw, start_y + j, pos_x, "%d - %s",
+
+               if(j > 1) {
+                       getyx(editw, y, x); y++;
+               } else
+                       y = FIELDS_START_Y;
+
+               mvwprintw(editw, y, FIELDS_START_X, "%d - %s",
                                j,
                                abook_fields[i].name);
-               mvwaddch(editw, start_y + j, 28, ':');
-               mvwaddstr(editw, start_y + j, 30, safe_str(database[item][i]));
+               mvwaddch(editw, y, TAB_COLON_POS, ':');
+               mvwaddstr(editw, y, TAB_COLON_POS + 2,
+                               safe_str(database[item][i]));
 
                j++;
        }
@@ -195,10 +203,10 @@ change_field(char *msg, char **field)
        char tmp[MAX_FIELD_LEN];
        int max_len = MAX_FIELD_LEN;
        int ret;
-       
+
        if( !strncmp("E-mail", msg, 6) )
                max_len = MAX_EMAIL_LEN;
-       
+
        statusline_addstr(msg);
        if( (ret = statusline_getnstr( tmp, max_len - 1, 0 ) ? 1:0 ) ) {
                my_free(*field);
@@ -239,7 +247,7 @@ static void
 edit_emails(char c, int item)
 {
        char *field = NULL;
-       char emails[4][MAX_EMAIL_LEN];
+       char emails[MAX_EMAILS][MAX_EMAIL_LEN];
        char tmp[MAX_EMAILSTR_LEN] = "";
        int i, len;
 
@@ -256,10 +264,10 @@ edit_emails(char c, int item)
                fix_email_str(emails[c - '2']);
        } else
                *emails[c - '2'] = 0;
-       
+
        my_free(database[item][EMAIL]);
 
-       for(i=0; i<4; i++) {
+       for(i = 0; i < MAX_EMAILS; i++) {
                if( *emails[i] ) {
                        strcat(tmp, emails[i]);
                        strcat(tmp, ",");
@@ -280,7 +288,7 @@ edit_field(int tab, char c, int item)
        int n = c - '1' + 1;
        char *str;
 
-       if(n < 1 || n > 6)
+       if(n < 1 || n > MAX_TAB_FIELDS)
                return 0;
 
        edit_undo(item, BACKUP_ITEM);
@@ -334,7 +342,7 @@ edit_undo(int item, int mode)
                                free_list_item(backup[0]);
                                my_free(backup);
                        }
-                       backup = abook_malloc(sizeof(list_item));
+                       backup = (list_item *)abook_malloc(sizeof(list_item));
                        for(i = 0; i < ITEM_FIELDS; i++)
                                backup[0][i] = safe_strdup(database[item][i]);
                        break;
@@ -353,7 +361,7 @@ edit_loop(int item)
 {
        static int tab = 0; /* first tab */
        int c;
-       
+
        werase(editw);
        headerline(EDITOR_HELPLINE);
        refresh_statusline();
@@ -381,8 +389,8 @@ edit_loop(int item)
                case 'r': roll_emails(item); break;
                case '?': display_help(HELP_EDITOR); break;
                case 'u': edit_undo(item, RESTORE_ITEM); break;
-               case 'm': launch_mutt(item);
-               case 'v': launch_wwwbrowser(item);
+               case 'm': launch_mutt(item); clearok(stdscr, 1); break;
+               case 'v': launch_wwwbrowser(item); clearok(stdscr, 1); break;
                case 12 : clearok(stdscr, 1); break; /* ^L (refresh screen) */
                default:  return edit_field(tab, c, item) ? item : -1;
        }