X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_lyrics.c;h=a195fd7dd62312139be2d3edba6419c179c0563b;hb=cdcbfd8abeb0d29942ab0aab4538c879d56d5142;hp=604a051579ed87a982f8c15443396b92fddb011c;hpb=abf74f74fc864c9dc2a928d72d9172eb9742e6aa;p=ncmpc.git

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 604a051..a195fd7 100644
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -45,6 +45,8 @@ static struct screen_text text;
 
 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;
@@ -115,10 +117,9 @@ static bool
 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);
 }
 
@@ -126,7 +127,6 @@ static FILE *
 create_lyr_file(const char *artist, const char *title)
 {
 	char path[1024];
-
 	snprintf(path, 1024, "%s/.lyrics",
 		 getenv("HOME"));
 	mkdir(path, S_IRWXU);
@@ -139,14 +139,11 @@ create_lyr_file(const char *artist, const char *title)
 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));
 
@@ -157,11 +154,10 @@ store_lyr_hd(void)
 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;
@@ -172,7 +168,19 @@ delete_lyr_hd(void)
 static void
 screen_lyrics_set(const GString *str)
 {
-	screen_text_set(&text, str->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 */
 
@@ -181,7 +189,7 @@ screen_lyrics_set(const GString *str)
 
 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);
 
@@ -210,7 +218,7 @@ screen_lyrics_callback(const GString *result, const bool success,
 }
 
 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;
@@ -225,15 +233,13 @@ screen_lyrics_timeout_callback(gpointer G_GNUC_UNUSED data)
 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);
@@ -255,6 +261,7 @@ screen_lyrics_reload(void)
 {
 	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);
@@ -350,8 +357,6 @@ static void
 lyrics_edit(void)
 {
 	char *editor = options.text_editor;
-	int status;
-
 	if (editor == NULL) {
 		screen_status_message(_("Editor not configured"));
 		return;
@@ -376,9 +381,12 @@ lyrics_edit(void)
 
 	/* 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);