added assert and consts

[pkg/abook.git] / edit.c

diff --git a/edit.c b/edit.c
index a2d5d2283388857c8a9148dd21ac7202ab136bc3..8d39660156e90ca5ce884e8ba7b1080019e9f6ce 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -33,33 +33,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;
+       const 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, 16 * i + 2,  UI_TEE_CHAR);
-               mvwaddch(editw,  TABLINE+1, 16 * i + 14, UI_TEE_CHAR);
+               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++) {
-               mvwaddch(editw,  TABLINE, 16 * i + 2,  UI_ULCORNER_CHAR);
-               mvwaddch(editw,  TABLINE, 16 * i + 3,  UI_LBOXLINE_CHAR);
-               mvwaddstr(editw, TABLINE, 16 * i + 4,  tab_names[i]);
-               mvwaddch(editw,  TABLINE, 16 * i + 13, UI_RBOXLINE_CHAR);
-               mvwaddch(editw,  TABLINE, 16 * i + 14, UI_URCORNER_CHAR);
+               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);
        }
 
-       mvwaddch(editw,  TABLINE+1, 16 * tab + 2, UI_LRCORNER_CHAR);
-       mvwaddstr(editw, TABLINE+1, 16 * tab + 3, "           ");
-       mvwaddch(editw,  TABLINE+1, 16 * tab + 14, UI_LLCORNER_CHAR);
+       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
@@ -369,6 +371,8 @@ edit_undo(int item, int mode)
                                my_free(backup);
                        }
                        break;
+               default:
+                       assert(0);
        }
 }
 
@@ -394,8 +398,10 @@ edit_loop(int item)
                case 'a': tab = TAB_ADDRESS; break;
                case 'p': tab = TAB_PHONE; break;
                case 'o': tab = TAB_OTHER; 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: