diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index ef230c83a749d0ead633ed5daa19b17444205afb..d6d1a6c3cf4c4ad64eedb420f06a70975b33c156 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
static struct mpd_song *next_song;
static bool follow = false;
+/** Set if the cursor position shall be kept during the next lyrics update. */
+static bool reloading = false;
static struct {
struct mpd_song *song;
exists_lyr_file(const char *artist, const char *title)
{
char path[1024];
- struct stat result;
-
path_lyr_file(path, 1024, artist, title);
+ struct stat result;
return (stat(path, &result) == 0);
}
create_lyr_file(const char *artist, const char *title)
{
char path[1024];
-
snprintf(path, 1024, "%s/.lyrics",
getenv("HOME"));
mkdir(path, S_IRWXU);
static int
store_lyr_hd(void)
{
- FILE *lyr_file;
- unsigned i;
-
- lyr_file = create_lyr_file(current.artist, current.title);
+ FILE *lyr_file = create_lyr_file(current.artist, current.title);
if (lyr_file == NULL)
return -1;
- for (i = 0; i < text.lines->len; ++i)
+ for (unsigned i = 0; i < text.lines->len; ++i)
fprintf(lyr_file, "%s\n",
(const char*)g_ptr_array_index(text.lines, i));
static int
delete_lyr_hd(void)
{
- char path[1024];
-
if (!exists_lyr_file(current.artist, current.title))
return -1;
+ char path[1024];
path_lyr_file(path, 1024, current.artist, current.title);
if (unlink(path) != 0)
return -2;
static void
screen_lyrics_set(const GString *str)
{
- screen_text_set(&text, str);
+ if (reloading) {
+ unsigned saved_start = text.lw->start;
+
+ screen_text_set(&text, str->str);
+
+ /* restore the cursor and ensure that it's still valid */
+ text.lw->start = saved_start;
+ list_window_fetch_cursor(text.lw);
+ } else {
+ screen_text_set(&text, str->str);
+ }
+
+ reloading = false;
/* paint new data */
static void
screen_lyrics_callback(const GString *result, const bool success,
- const char *plugin_name, G_GNUC_UNUSED void *data)
+ const char *plugin_name, gcc_unused void *data)
{
assert(current.loader != NULL);
}
static gboolean
-screen_lyrics_timeout_callback(gpointer G_GNUC_UNUSED data)
+screen_lyrics_timeout_callback(gpointer gcc_unused data)
{
plugin_stop(current.loader);
current.loader = NULL;
static void
screen_lyrics_load(const struct mpd_song *song)
{
- const char *artist, *title;
-
assert(song != NULL);
screen_lyrics_abort();
screen_text_clear(&text);
- artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
- title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
+ const char *artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+ const char *title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
current.song = mpd_song_dup(song);
current.artist = g_strdup(artist);
{
if (current.loader == NULL && current.artist != NULL &&
current.title != NULL) {
+ reloading = true;
current.loader = lyrics_load(current.artist, current.title,
screen_lyrics_callback, NULL);
screen_text_repaint(&text);
lyrics_edit(void)
{
char *editor = options.text_editor;
- int status;
-
if (editor == NULL) {
screen_status_message(_("Editor not configured"));
return;
/* TODO: fork/exec/wait won't work on Windows, but building a command
string for system() is too tricky */
+ int status;
pid_t pid = fork();
if (pid == -1) {
screen_status_printf(("%s (%s)"), _("Can't start editor"), g_strerror(errno));
+ ncu_init();
+ return;
} else if (pid == 0) {
char path[1024];
path_lyr_file(path, sizeof(path), current.artist, current.title);