diff options
| author | Kalle Wallin <kaw@linux.se> | 2004-06-06 16:40:16 +0000 |
|---|---|---|
| committer | Kalle Wallin <kaw@linux.se> | 2004-06-06 16:40:16 +0000 |
| commit | e76e311607a7893b3ffc6e1907e8c28d8983d2d1 (patch) | |
| tree | 3bce2f613e475df11f12e2de1dd73022dd6f9033 /src/screen.c | |
| parent | ab7b4998b156a959c21b8d277f5ae114f48427c9 (diff) | |
| download | mpd-e76e311607a7893b3ffc6e1907e8c28d8983d2d1.tar.gz mpd-e76e311607a7893b3ffc6e1907e8c28d8983d2d1.tar.xz mpd-e76e311607a7893b3ffc6e1907e8c28d8983d2d1.zip | |
Added wreadln.c, wreadln.h a simple line editor
git-svn-id: https://svn.musicpd.org/ncmpc/trunk@1351 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/src/screen.c b/src/screen.c index 4eac178b7..7522ad227 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1,5 +1,7 @@ /* - * (c) 2004 by Kalle Wallin (kaw@linux.se) + * $Id$ + * + * (c) 2004 by Kalle Wallin <kaw@linux.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +34,7 @@ #include "command.h" #include "options.h" #include "colors.h" +#include "wreadln.h" #include "screen.h" #include "screen_play.h" #include "screen_file.h" @@ -39,7 +42,7 @@ #include "screen_search.h" #include "screen_utils.h" -#undef ENABLE_STATUS_LINE_CLOCK +#define ENABLE_STATUS_LINE_CLOCK #define ENABLE_SCROLLING #define DEFAULT_CROSSFADE_TIME 10 @@ -294,15 +297,17 @@ paint_status_window(mpd_client_t *c) snprintf(screen->buf, screen->buf_size, " [%d kbps]", status->bitRate ); } } +#ifdef ENABLE_STATUS_LINE_CLOCK else { time_t timep; time(&timep); /* Note: setlocale(LC_TIME,"") should be used first */ - //strftime(screen->buf, screen->buf_size, "%X ", localtime(&timep)); - strftime(screen->buf, screen->buf_size, " %k:%M", localtime(&timep)); + //strftime(screen->buf, screen->buf_size, "%x - %X ",localtime(&timep)); + strftime(screen->buf, screen->buf_size, "%X ",localtime(&timep)); } +#endif /* display song */ if( (IS_PLAYING(status->state) || IS_PAUSED(status->state)) && song ) @@ -333,7 +338,20 @@ paint_status_window(mpd_client_t *c) wnoutrefresh(w); } - +GList * +screen_free_string_list(GList *list) +{ + GList *l = g_list_first(list); + + while(l) + { + g_free(l->data); + l->data = NULL; + l=l->next; + } + g_list_free(list); + return NULL; +} int screen_exit(void) @@ -356,9 +374,10 @@ screen_exit(void) list=list->next; } g_list_free(screen->screen_list); - + screen_free_string_list(screen->find_history); g_free(screen->buf); g_free(screen->findbuf); + g_free(screen); screen = NULL; } @@ -472,9 +491,9 @@ screen_init(void) noecho(); /* set cursor invisible */ curs_set(0); - /* return from getch() without blocking */ - // nodelay(stdscr, TRUE); + /* enable extra keys */ keypad(stdscr, TRUE); + /* return from getch() without blocking */ timeout(SCREEN_TIMEOUT); if( COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS ) @@ -575,6 +594,9 @@ screen_init(void) mode_fn = get_screen_playlist(); + /* initialize wreadln */ + wrln_resize_callback = screen_resize; + return 0; } |