X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=9dfdd82d2ca672bd47e513de97844618b113f79a;hb=2f1c42673b37d0545b37ae63506f49eade90d02e;hp=9a19df7d9bc036261efa032d857adbe430346272;hpb=a79562b49189a27165ca9ffb38c08aa9e687f97e;p=pkg%2Fabook.git diff --git a/ui.c b/ui.c index 9a19df7..9dfdd82 100644 --- a/ui.c +++ b/ui.c @@ -2,7 +2,7 @@ /* * $Id$ * - * by JH + * by JH * * Copyright (C) Jaakko Heinonen */ @@ -237,7 +237,7 @@ statusline_addstr(char *str) * parameters: * (char *str) * if n >= 0 str is a pointer which points a place where to store - * the string, else str is ingnored + * the string, else str is ignored * (int n) * the maximum length of the string * If n < 0 function will allocate needed space for the string. @@ -345,12 +345,10 @@ clear_statusline() refresh(); } - /* - * help - need to rewrite + * help */ - #include "help.h" void @@ -390,7 +388,6 @@ display_help(int help) delwin(helpw); } - /* * end of help */ @@ -413,6 +410,9 @@ get_commands() can_resize = FALSE; /* it's not safe to resize anymore */ switch( ch ) { case 'q': return; + case 'Q': print_stderr(selected_items() ? + -1 : list_current_item()); + return; case '?': display_help(HELP_MAIN); refresh_screen(); @@ -433,9 +433,9 @@ get_commands() case 'J': case KEY_NPAGE: page_down(); break; - case 'H': + case 'g': case KEY_HOME: goto_home(); break; - case 'E': + case 'G': case KEY_END: goto_end(); break; case 'w': save_database(); @@ -514,7 +514,7 @@ void ui_find(int next) { int item; - static char findstr[81]; + static char findstr[MAX_FIELD_LEN]; int search_fields[] = {NAME, EMAIL, NICK, -1}; if(next) { @@ -523,11 +523,11 @@ ui_find(int next) } else { clear_statusline(); statusline_addstr("/"); - statusline_getnstr(findstr, 67, 0); + statusline_getnstr(findstr, MAX_FIELD_LEN - 1, 0); clear_statusline(); } - if( (item = find_item(findstr, next ? curitem+1 : curitem, + if( (item = find_item(findstr, curitem + !!next, search_fields )) >= 0 ) { curitem = item; refresh_list();