X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=a4f1717c2a996568d2fe36cc3a010f165ff1bcd9;hp=5bad7e14616f505eddb0545f51658f70759fe996;hb=04c16387cc13317ded03ce478b131d94558f585f;hpb=80541d0f045e1ed57332800eff9832e0a5b72ddf

diff --git a/gui.c b/gui.c
index 5bad7e14..a4f1717c 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. */
 
@@ -17,6 +13,7 @@
 #include "gui.lsg.h"
 #include "para.h"
 #include "gui.h"
+#include "lsu.h"
 #include "string.h"
 #include "ringbuffer.h"
 #include "fd.h"
@@ -569,19 +566,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 +677,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;
@@ -861,64 +858,23 @@ static void check_key_map_args_or_die(void)
 static void parse_config_file_or_die(bool reload)
 {
 	int ret;
-	char *cf = NULL, *errctx = NULL;
-	void *map;
-	size_t sz;
-	int cf_argc;
-	char **cf_argv;
-	struct lls_parse_result *cf_lpr, *merged_lpr;
-
-	if (OPT_GIVEN(CONFIG_FILE))
-		cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
-	else {
-		char *home = para_homedir();
-		cf = make_message("%s/.paraslash/gui.conf", home);
-		free(home);
-	}
-	ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL);
-	if (ret < 0) {
-		if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT))
-			goto free_cf;
-		if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
-			goto free_cf;
-		ret = 0;
-		lpr = cmdline_lpr;
-		goto success;
-	}
-	ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx));
-	para_munmap(map, sz);
-	if (ret < 0)
-		goto free_cf;
-	cf_argc = ret;
-	ret = lls(lls_parse(cf_argc, cf_argv, CMD_PTR, &cf_lpr, &errctx));
-	lls_free_argv(cf_argv);
-	if (ret < 0)
-		goto free_cf;
-	if (reload) /* config file overrides command line */
-		ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
-			&errctx));
-	else /* command line options override config file options */
-		ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
-			&errctx));
-	lls_free_parse_result(cf_lpr, CMD_PTR);
-	if (ret < 0)
-		goto free_cf;
+	unsigned flags = MCF_DONT_FREE;
+
 	if (lpr != cmdline_lpr)
 		lls_free_parse_result(lpr, CMD_PTR);
-	lpr = merged_lpr;
-success:
-	loglevel = OPT_UINT32_VAL(LOGLEVEL);
-	check_key_map_args_or_die();
-	theme_init(OPT_STRING_VAL(THEME), &theme);
-free_cf:
-	free(cf);
+	lpr = cmdline_lpr;
+	if (reload)
+		flags |= MCF_OVERRIDE;
+	ret = lsu_merge_config_file_options(OPT_STRING_VAL(CONFIG_FILE),
+		"gui.conf", &lpr, CMD_PTR, gui_suite, flags);
 	if (ret < 0) {
-		if (errctx)
-			PARA_ERROR_LOG("%s\n", errctx);
-		free(errctx);
-		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		PARA_EMERG_LOG("failed to parse config file: %s\n",
+			para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
+	loglevel = OPT_UINT32_VAL(LOGLEVEL);
+	check_key_map_args_or_die();
+	theme_init(OPT_STRING_VAL(THEME), &theme);
 }
 
 /* Reread configuration, terminate on errors. */
@@ -945,6 +901,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 +1114,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 +1418,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,