Don't handle extra_column/extra_alternative as numbers in abookrc

[pkg/abook.git] / edit.c

diff --git a/edit.c b/edit.c
index ae7643ea95ef12f060fd15003fbc11f22a9521b8..e6ba4342494912c9a455b58cf8c80d677718e5c3 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
  */
@@ -127,27 +127,26 @@ print_editor_header(int item)
 
        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;
-       }
+       if( *database[item][EMAIL] )
+               snprintf(header, EDITW_COLS, "%s <%s>",
+                               database[item][NAME],
+                               email);
+       else
+               snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
 
        len = strlen(header);
        x = (EDITW_COLS - len) / 2;
        mvwaddstr(editw, 0, x, header);
        for(i = x; i < x + len; i++)
-               mvwaddch(editw,1, i, '^');
+               mvwaddch(editw, 1, i, '^');
        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 +156,29 @@ 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, TAB_START_X, "E-mail addresses:");
+                       for(k = 0; k < MAX_EMAILS; k++) {
+                               getyx(editw, y, x);
+                               mvwprintw(editw, y+1, TAB_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 = TAB_START_Y;
+
+               mvwprintw(editw, y, TAB_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++;
        }
@@ -239,7 +249,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;
 
@@ -259,7 +269,7 @@ edit_emails(char c, int item)
        
        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 +290,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_LINES)
                return 0;
 
        edit_undo(item, BACKUP_ITEM);
@@ -374,16 +384,20 @@ edit_loop(int item)
                               break;
                case KEY_RIGHT: tab = tab == MAX_TAB ? 0 : tab + 1;
                                break;
+               case '<':
+               case 'k': if(is_valid_item(item-1)) item--; break;
+               case '>':
+               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;
-               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);
+               default:  return edit_field(tab, c, item) ? item : -1;
        }
 
-       return 1;
+       return item;
 }
 
 void
@@ -397,8 +411,9 @@ edit_item(int item)
        }
 
        init_editor();
-       while( edit_loop(item) )
-               ;
+
+       while( (item = edit_loop(item)) >= 0 )
+               curitem = item; /* hmm, this is not very clean way to go */
 
        close_editor();
 }