X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=6147aeeadcd28fabb98d341222e614e397e0cf4a;hb=a99180ae57f15c923ac78be34df3acb432d8fce7;hp=db761df0062c6ec2a2f0121b8a1a4e9b0273a7e4;hpb=0d3c17d9ab127e5596c8fb97d65122b3b90f6b11;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index db761df..6147aee 100644
--- a/abook.c
+++ b/abook.c
@@ -1,8 +1,9 @@
 /*
- * abook.c
+ * $Id$
+ *
  * by JH <jheinonen@bigfoot.com>
  *
- * Copyright (C) 1999, 2000 Jaakko Heinonen
+ * Copyright (C) Jaakko Heinonen
  */
 
 #include <string.h>
@@ -11,108 +12,48 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <fcntl.h>
-#include "abook_curses.h"
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
 #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
 #	include <locale.h>
 #endif
-#ifdef HAVE_TERMIOS_H
-#	include <termios.h>
-#else
-#	ifdef HAVE_LINUX_TERMIOS_H
-#		include <linux/termios.h>
-#	endif
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-#	include <sys/ioctl.h>
-#endif
 #include "abook.h"
+#include "ui.h"
 #include "database.h"
 #include "list.h"
 #include "filter.h"
 #include "edit.h"
 #include "misc.h"
-#include "help.h"
 #include "options.h"
-#include "estr.h"
 
 static void             init_abook();
 static void             set_filenames();
 static void		free_filenames();
-static void		display_help(char **tbl);
-static void             get_commands();
 static void             parse_command_line(int argc, char **argv);
 static void             show_usage();
 static void             mutt_query(char *str);
 static void             init_mutt_query();
 static void             quit_mutt_query();
-static void             launch_mutt();
-static void		launch_lynx();
-static void		win_changed(int dummy);
-static void		open_datafile();
-#ifdef SIGWINCH
-static void		resize_abook();
-#endif
 static void		convert(char *srcformat, char *srcfile,
 				char *dstformat, char *dstfile);
 
-int should_resize = FALSE;
-int can_resize = FALSE;
-
 char *datafile = NULL;
 char *rcfile = NULL;
 
-WINDOW *top = NULL, *bottom = NULL;
-
-static void
-init_windows()
-{
-	top = newwin(LIST_TOP - 1, COLS, 0, 0);
-	
-	bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0);
-}
-
-static void
-free_windows()
-{
-	delwin(top);
-	delwin(bottom);
-}
-
 static void
 init_abook()
 {
 	set_filenames();
 	init_options();
 
-	initscr(); cbreak(); noecho();
-	nonl();
-	intrflush(stdscr, FALSE);
-	keypad(stdscr, TRUE);
-#ifdef DEBUG
-        fprintf(stderr, "init_abook():\n");
-        fprintf(stderr, "  COLS = %d, LINES = %d\n", COLS, LINES);
-#endif
-	if( LINES < MIN_LINES || COLS < MIN_COLS ) {
-		clear(); refresh(); endwin();
-		fprintf(stderr, "Your terminal size is %dx%d\n", COLS, LINES);
-		fprintf(stderr, "Terminal is too small. Minium terminal size "
-				"for abook is "
-				"%dx%d\n", MIN_COLS, MIN_LINES);
-		exit(1);
-	}
-	umask(DEFAULT_UMASK);
-#ifdef SIGWINCH
-	signal(SIGWINCH, win_changed);
-#endif
-	signal(SIGINT, quit_abook);
 	signal(SIGKILL, quit_abook);
 	signal(SIGTERM, quit_abook);
 	
-	init_list();
-	init_windows();
+	if( init_ui() )
+		exit(1);
+	
+	umask(DEFAULT_UMASK);
 
 	/*
 	 * this is very ugly for now
@@ -143,23 +84,14 @@ quit_abook()
 {
 	if( options_get_int("autosave") )
 		save_database();
-	else {
-		statusline_addstr("Save database (y/N)");
-		switch( getch() ) {
-			case 'y':
-			case 'Y':
-				save_database();
-			default: break;
-		}
-	}
+	else if( statusline_ask_boolean("Save database", TRUE) )
+		save_database();
+
 	close_config();
 	close_database();
-	close_list();
-	free_windows();
-	clear();
-	refresh();
-	endwin();
 
+	close_ui();
+	
 	exit(0);
 }
 
@@ -206,299 +138,6 @@ free_filenames()
 	my_free(datafile);
 }
 
-void
-headerline(char *str)
-{
-	werase(top);
-	
-	mvwhline(top, 1, 0, ACS_HLINE, COLS);
-	
-	mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str);
-
-	refresh();
-	wrefresh(top);
-}
-		
-
-void
-refresh_screen()
-{
-#ifdef SIGWINCH
-	if( should_resize ) {
-		resize_abook();
-		return;
-	}
-#endif
-	clear();
-	
-	refresh_statusline();
-	headerline(MAIN_HELPLINE);
-	list_headerline();
-
-	refresh_list();
-}
-
-#ifdef DEBUG
-extern int curitem;
-extern list_item *database;
-static void
-dump_item()
-{
-	int i;
-
-	fprintf(stderr,"sizeof(list_item) = %d\n", sizeof(list_item));
-	fprintf(stderr,"--- dumping item %d ---\n", curitem);
-	
-	for(i=0; i<ITEM_FIELDS; i++)
-		fprintf(stderr,"%d - %d\n",
-				i, (int)database[curitem][i]);
-
-	fprintf(stderr,"--- end of dump ---\n");
-				
-}
-#endif
-
-extern char *selected;
-extern int curitem;
-
-static void
-get_commands()
-{
-	int ch;
-
-	for(;;) {
-		can_resize = TRUE; /* it's safe to resize now */
-		hide_cursor();
-		if( should_resize )
-			refresh_screen();
-		ch = getch();
-		show_cursor();
-		can_resize = FALSE; /* it's not safe to resize anymore */
-		switch( ch ) {
-			case 'q': return;
-			case '?': display_help(mainhelp); break;
-			case 'a': add_item();		break;
-			case '\r': edit_item(-1);	break;
-			case KEY_DC:
-			case 'd':
-			case 'r': remove_items();	break;
-			case 12: refresh_screen();	break;
-
-			case 'k':
-			case KEY_UP: scroll_up();	break;
-			case 'j':
-			case KEY_DOWN: scroll_down();	break;
-			case 'K':
-			case KEY_PPAGE: page_up();	break;
-			case 'J':
-			case KEY_NPAGE: page_down();	break;
-
-			case 'H':
-			case KEY_HOME: goto_home();	break;
-			case 'E':
-			case KEY_END: goto_end();	break;
-
-			case 'w': save_database();
-				  break;
-			case 'l': read_database();	break;
-			case 'i': import_database();	break;
-			case 'e': export_database();	break;
-			case 'C': clear_database();	break;
-
-			case 'y': edit_options();	break;
-			case 'o': open_datafile();	break;
-
-			case 's': sort_database();	break;
-			case 'S': sort_surname();	break;
-
-			case '/': find(0);		break;
-			case '\\': find(1);		break;
-
-			case ' ': if(curitem >= 0) {
-				   selected[curitem] = !selected[curitem];
-				   print_number_of_items();
-				   refresh_list();
-				  }
-				break;
-			case '+': select_all();
-				  refresh_list();
-				break;
-			case '-': select_none();
-				  refresh_list();
-				break;
-			case '*': invert_selection();
-				  refresh_list();
-				 break;
-			case 'A': move_curitem(MOVE_ITEM_UP);
-				break;
-			case 'Z': move_curitem(MOVE_ITEM_DOWN);
-				break;
-
-			case 'm': launch_mutt(); break;
-
-			case 'p': print_database(); break;
-
-			case 'u': launch_lynx(); break;
-#ifdef DEBUG
-			case 'D': dump_item();
-#endif
-		}
-	}
-}
-
-
-static void
-display_help(char **tbl)
-{
-	int i, j = 3;
-
-	erase();
-	headerline("help");
-	refresh_statusline();
-	
-	for( i = 0; tbl[i] != NULL; i++) {
-		mvaddstr(j++, 0, tbl[i]);
-		if( ( !( (i+1) % (LINES-7) ) ) ||
-				(tbl[i+1] == NULL) ) {
-			refresh();
-			statusline_msg("Press any key to continue...");
-			erase();
-			refresh_statusline();
-			headerline("help");
-			j = 3;
-		}
-	}
-	refresh_screen();
-}
-
-void
-display_editor_help(WINDOW *w)
-{
-	int i;
-
-	werase(w);
-
-	headerline("editor help");
-
-	for( i = 0; editorhelp[i] != NULL; i++) {
-		waddstr(w, editorhelp[i]);
-		if( ( !( (i+1) % (LINES-8) ) ) ||
-			(editorhelp[i+1] == NULL) ) {
-			refresh();
-			wrefresh(w);
-			statusline_msg("Press any key to continue...");
-			wclear(w);
-		}
-	}
-}
-
-
-void
-statusline_msg(char *msg)
-{
-	clear_statusline();
-	statusline_addstr(msg);
-	getch();
-#ifdef DEBUG
-	fprintf(stderr, "statusline_msg(\"%s\")\n", msg);
-#endif
-	clear_statusline();
-}
-
-void
-statusline_addstr(char *str)
-{
-	mvwaddstr(bottom, 1, 0, str);
-	refresh();
-	wrefresh(bottom);
-}
-
-/*
- * function statusline_getnstr
- *
- * parameters:
- *  (char *str)
- *   if n >= 0 str is a pointer which points a place where to store
- *   the string, else str is ingnored
- *  (int n)
- *   the maximum length of the string
- *   If n < 0 function will allocate needed space for the string.
- *   Value 0 is not allowed for n.
- *  (int use_filesel)
- *   if this value is nonzero the fileselector is enabled
- *
- *  returns (char *)
- *   If n < 0 a pointer to a newly allocated string is returned.
- *   If n > 0 a nonzero value is returned if user has typed a valid
- *   string. If not NULL value is returned. Never really use the
- *   _pointer_ if n > 0.
- *
- */
-
-char *
-statusline_getnstr(char *str, int n, int use_filesel)
-{
-	char *buf;
-	int y, x;
-
-	getyx(bottom, y, x);
-	wmove(bottom, 1, x);
-	
-	buf = wenter_string(bottom, n,
-			(use_filesel ? ESTR_USE_FILESEL:0) | ESTR_DONT_WRAP);
-
-	if(n < 0)
-		return buf;
-	
-	if(buf == NULL)
-		str[0] = 0;
-	else
-		strncpy(str, buf, n);
-
-	str[n-1] = 0;
-
-	free(buf);
-
-	return buf;
-}
-
-void
-refresh_statusline()
-{
-	werase(bottom);
-
-	mvwhline(bottom, 0, 0, ACS_HLINE, COLS);
-	mvwhline(bottom, 2, 0, ACS_HLINE, COLS);
-
-	refresh();
-	wrefresh(bottom);
-}
-	
-
-char *
-ask_filename(char *prompt, int flags)
-{
-	char *buf = NULL;
-
-	clear_statusline();
-	
-	statusline_addstr(prompt);
-	buf = statusline_getnstr(NULL, -1, flags);
-
-	clear_statusline();
-
-	return buf;
-}
-
-void
-clear_statusline()
-{
-	wmove(bottom, 1, 0);
-	wclrtoeol(bottom);
-	wrefresh(bottom);
-	refresh();
-}
-
 static void
 parse_command_line(int argc, char **argv)
 {
@@ -565,7 +204,6 @@ show_usage()
 }
 
 extern list_item *database;
-extern int items;
 
 static void
 muttq_print_item(int item)
@@ -585,73 +223,28 @@ muttq_print_item(int item)
 				);
 }
 
-static int
-mutt_query_name(char *str)
-{
-	int i, j;
-	char *tmp;
-
-	for(i = 0, j = 0 ; i < items; i++) {
-		tmp = strdup(database[i][NAME]);
-		if( strstr( strupper(tmp), strupper(str) ) != NULL ) {
-			if( !j )
-				putchar('\n');
-			muttq_print_item(i);
-			j++;
-		}
-		free(tmp);
-	}
-
-	return j;
-}
-
-static int
-mutt_query_email(char *str)
-{
-	int i, j, k;
-	char *tmp, emails[MAX_EMAILS][MAX_EMAIL_LEN];
-
-	for(i = 0, j = 0; i < items; i++) {
-		split_emailstr(i, emails);
-		for(k = 0; k < MAX_EMAILS; k++) {
-			if( *emails[k] ) {
-				tmp = strdup( emails[k] );
-				if( strstr( strupper(tmp), strupper(str) ) != NULL ) {
-					if( !j )
-						putchar('\n');
-					j++;
-					if( options_get_int("mutt_return_all_emails") ) {
-						muttq_print_item(i);
-						free(tmp);
-						break;
-					} else
-						printf("%s\t%s\n", emails[k],
-							database[i][NAME]);
-				}
-				free(tmp);
-			}
-		}
-	}
-
-	return j;
-}
-
 static void
 mutt_query(char *str)
 {
-	int i;
-	
 	init_mutt_query();
 
 	if( str == NULL || !strcasecmp(str, "all") ) {
+		struct db_enumerator e = init_db_enumerator(ENUM_ALL);
 		printf("All items\n");
-		for(i = 0; i < items; i++)
-			muttq_print_item(i);
+		db_enumerate_items(e)
+			muttq_print_item(e.item);
 	} else {
-		if( !mutt_query_name(str) && !mutt_query_email(str) ) {
+		int search_fields[] = {NAME, EMAIL, NICK, -1};
+		int i;
+		if( (i = find_item(str, 0, search_fields)) < 0 ) {
 			printf("Not found\n");
 			quit_mutt_query(1);
 		}
+		putchar('\n');
+		while(i >= 0) {
+			muttq_print_item(i);
+			i = find_item(str, i+1, search_fields);
+		}
 	}
 
 	quit_mutt_query(0);
@@ -680,26 +273,26 @@ quit_mutt_query(int status)
 }
 
 
-static void
-launch_mutt()
+void
+launch_mutt(int item)
 {
-	int i;
+	/*
+	 * This is _broken_
+	 */
+#if 0
+	struct db_enumerator e = init_db_enumerator(ENUM_ALL);
 	char email[MAX_EMAIL_LEN];
 	char *cmd;
 	char *tmp = options_get_str("mutt_command");
 
-	if(curitem < 0)
-		return;
-
 	cmd = strconcat(tmp, " '", NULL );
 
-	for(i=0; i < items; i++) {
-		if( ! selected[i] && i != curitem )
-			continue;
-		get_first_email(email, i);
-		tmp = mkstr("%s \"%s\"", cmd, database[i][NAME]);
+	db_enumerate_items(e) {
+		if( e.item != item );
+		get_first_email(email, e.item);
+		tmp = mkstr("%s, \"%s\"", cmd, database[e.item][NAME]);
 		my_free(cmd);
-		if( *database[i][EMAIL] ) {
+		if( *database[e.item][EMAIL] ) {
 			cmd = mkstr("%s <%s>", tmp, email);
 			free(tmp);
 			tmp = cmd;
@@ -708,7 +301,7 @@ launch_mutt()
 		free(tmp);
 	}
 
-	tmp = mkstr("%s%c", cmd, '\'');
+	tmp = strconcat(cmd, "\'", NULL);
 	free(cmd);
 	cmd = tmp;
 #ifdef DEBUG
@@ -717,21 +310,21 @@ launch_mutt()
 	system(cmd);	
 
 	free(cmd);
-	refresh_screen();
+#endif
 }
 
-static void
-launch_lynx()
+void
+launch_wwwbrowser(int item)
 {
 	char *cmd = NULL;
 
-	if(curitem < 0)
+	if( !is_valid_item(item) )
 		return;
 
-	if( database[curitem][URL] )
+	if( database[item][URL] )
 		cmd = mkstr("%s '%s'",
 				options_get_str("www_command"),
-				safe_str(database[curitem][URL]));
+				safe_str(database[item][URL]));
 	else
 		return;
 
@@ -739,7 +332,6 @@ launch_lynx()
 		system(cmd);
 
 	free(cmd);
-	refresh_screen();
 }
 
 void *
@@ -748,7 +340,7 @@ abook_malloc(size_t size)
 	void *ptr;
 
 	if ( (ptr = malloc(size)) == NULL ) {
-		if(top) /* determinate if init_abook has been called */
+		if( is_ui_initialized() )
 			quit_abook();
 		perror("malloc() failed");
 		exit(1);
@@ -766,7 +358,7 @@ abook_realloc(void *ptr, size_t size)
 		return NULL;
 
 	if( ptr == NULL ) {
-		if(top) /* determinate if init_abook has been called */
+		if( is_ui_initialized() )
 			quit_abook();
 		perror("realloc() failed");
 		exit(1);
@@ -790,49 +382,6 @@ abook_fopen (const char *path, const char *mode)
 }
 
 
-static void
-win_changed(int i)
-{
-	if( can_resize )
-		resize_abook();
-	else
-		should_resize = TRUE;	
-}
-
-#ifdef SIGWINCH
-static void
-resize_abook()
-{
-#ifdef TIOCGWINSZ
-	struct winsize winsz;
-
-	ioctl (0, TIOCGWINSZ, &winsz);
-#ifdef DEBUG
-	if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
-		fprintf(stderr, "Warning: COLS=%d, LINES=%d\n", winsz.ws_col, winsz.ws_row);
-	}
-#endif
-		
-	if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
-#ifdef HAVE_RESIZETERM
-		resizeterm(winsz.ws_row, winsz.ws_col);
-#else
-		COLS = winsz.ws_col;
-		LINES = winsz.ws_row;
-#endif
-	}
-
-	should_resize = FALSE;
-	close_list(); /* we need to recreate windows */
-	init_list();
-	free_windows();
-	init_windows();
-	refresh_screen();
-	refresh();
-#endif /* TIOCGWINSZ */
-}
-#endif /* SIGWINCH */
-
 
 static void
 convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
@@ -884,42 +433,3 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 }
 
 
-static void
-open_datafile()
-{
-	char *filename;
-
-	filename = ask_filename("File to open: ", 1);
-
-	if( !filename ) {
-		refresh_screen();
-		return;
-	}
-
-	if( options_get_int("autosave") )
-		save_database();
-	else {
-		statusline_addstr("Save current database (y/N)");
-		switch( getch() ) {
-			case 'y':
-			case 'Y':
-				save_database();
-			default: break;
-		}
-	}
-
-	close_database();
-
-	load_database(filename);
-
-	if( items == 0 ) {
-		statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook");
-		load_database(datafile);
-	} else {
-		free(datafile);
-		datafile = strdup(filename);
-	}
-
-	refresh_screen();
-	free(filename);
-}