X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=69a9243da25245d5a4a67c1bf98deaef222dc593;hp=5bad7e14616f505eddb0545f51658f70759fe996;hb=98dc2e1f173732411953da7300460cc419efd2bb;hpb=10a62b85c43319d9cdefd7d04823aaed47b3817e;ds=sidebyside

diff --git a/gui.c b/gui.c
index 5bad7e14..69a9243d 100644
--- a/gui.c
+++ b/gui.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1998 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1998 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file gui.c Curses-based interface for paraslash. */
 
@@ -569,19 +565,19 @@ static int update_item(int item_num, char *buf)
 	if (buf && buf[0])
 		goto dup;
 	switch (item_num) {
-	case SI_ARTIST:
+	case SI_artist:
 		*c = para_strdup("(artist tag not set)");
 		goto print;
-	case SI_TITLE:
+	case SI_title:
 		*c = para_strdup("(title tag not set)");
 		goto print;
-	case SI_YEAR:
+	case SI_year:
 		*c = para_strdup("????");
 		goto print;
-	case SI_ALBUM:
+	case SI_album:
 		*c = para_strdup("(album tag not set)");
 		goto print;
-	case SI_COMMENT:
+	case SI_comment:
 		*c = para_strdup("(comment tag not set)");
 		goto print;
 	}
@@ -680,8 +676,8 @@ static int status_post_select(struct sched *s, void *context)
 		close(st->fd);
 		st->fd = -1;
 		clear_all_items();
-		free(stat_content[SI_BASENAME]);
-		stat_content[SI_BASENAME] =
+		free(stat_content[SI_basename]);
+		stat_content[SI_basename] =
 			para_strdup("stat command terminated!?");
 		print_all_items();
 		return 0;
@@ -945,6 +941,14 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 	switch (ret) {
 	case SIGTERM:
 		die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
+	case SIGWINCH:
+		PARA_NOTICE_LOG("got SIGWINCH\n");
+		if (curses_active()) {
+			shutdown_curses();
+			init_curses();
+			redraw_bot_win();
+		}
+		return 1;
 	case SIGINT:
 		return 1;
 	case SIGUSR1:
@@ -1150,14 +1154,8 @@ static int input_post_select(__a_unused struct sched *s,
 	ret = wgetch(top.win);
 	if (ret == ERR)
 		return 0;
-	if (ret == KEY_RESIZE) {
-		if (curses_active()) {
-			shutdown_curses();
-			init_curses();
-			redraw_bot_win();
-		}
+	if (ret == KEY_RESIZE) /* already handled in signal_post_select() */
 		return 0;
-	}
 	if (exs == EXEC_IDLE)
 		handle_command(ret);
 	else if (exec_pid > 0)
@@ -1460,6 +1458,7 @@ static int setup_tasks_and_schedule(void)
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGUSR1);
+	para_install_sighandler(SIGWINCH);
 	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
 		.pre_select = signal_pre_select,