static struct gui_window {
WINDOW *win;
- size_t cols;
- size_t lines;
} top, bot, sb, in, sep;
#define RINGBUFFER_SIZE 512
int color;
};
static struct ringbuffer *bot_win_rb;
-#define NUM_LINES(len) (1 + (len) / bot.cols)
static unsigned scroll_position;
static int command_fds[2] = {-1, -1};
static int stat_pipe = -1;
static struct gui_args_info conf;
+static int loglevel;
enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
return -1;
}
+/*
+ * Even though ncurses provides getmaxx and getmaxy, these functions/macros are
+ * not described in the XSI Curses standard.
+ */
+static int get_num_lines(struct gui_window *w)
+{
+ int lines;
+ __a_unused int cols; /* avoid "set but not used" warnings */
+
+ getmaxyx(w->win, lines, cols);
+ return lines;
+}
+
+static int get_num_cols(struct gui_window *w)
+{
+ __a_unused int lines; /* avoid "set but not used" warnings */
+ int cols;
+
+ getmaxyx(w->win, lines, cols);
+ return cols;
+}
+
+/** Number of lines of the window are occupied by an output line. */
+#define NUM_LINES(len) (1 + (len) / get_num_cols(&bot))
+
/* isendwin() returns false before initscr() was called */
static bool curses_active(void)
{
return buf;
}
-static char *configfile_exists(void)
-{
- static char *config_file;
- char *tmp;
-
- if (!conf.config_file_given) {
- if (!config_file) {
- char *home = para_homedir();
- config_file = make_message("%s/.paraslash/gui.conf",
- home);
- free(home);
- }
- tmp = config_file;
- } else
- tmp = conf.config_file_arg;
- return file_exists(tmp)? tmp: NULL;
-}
-
/* Print given number of spaces to curses window. */
static void add_spaces(WINDOW* win, unsigned int num)
{
xvasprintf(&msg, fmt, ap);
va_end(ap);
wmove(in.win, 0, 0);
- align_str(in.win, msg, in.cols, LEFT);
+ align_str(in.win, msg, get_num_cols(&in), LEFT);
free(msg);
wrefresh(in.win);
}
tmp = para_strdup("para_gui " PACKAGE_VERSION " (hit ? for help)");
wmove(sb.win, 0, 0);
- align_str(sb.win, tmp, sb.cols, CENTER);
+ align_str(sb.win, tmp, get_num_cols(&sb), CENTER);
free(tmp);
}
*/
static int first_visible_rbe(unsigned *lines)
{
- int i;
+ int i, bot_lines = get_num_lines(&bot);
+
*lines = 0;
for (i = scroll_position; i < RINGBUFFER_SIZE; i++) {
struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
if (!rbe)
return i - 1;
rbe_lines = NUM_LINES(rbe->len);
- if (rbe_lines > bot.lines)
+ if (rbe_lines > bot_lines)
return -1;
*lines += rbe_lines;
- if (*lines >= bot.lines)
+ if (*lines >= bot_lines)
return i;
}
return RINGBUFFER_SIZE - 1;
*/
static int draw_top_rbe(unsigned *lines)
{
- int ret, fvr = first_visible_rbe(lines);
+ int bot_cols, bot_lines, ret, fvr = first_visible_rbe(lines);
struct rb_entry *rbe;
size_t bytes_to_skip, cells_to_skip, width;
rbe = ringbuffer_get(bot_win_rb, fvr);
if (!rbe)
return -1;
- if (*lines > bot.lines) {
+ getmaxyx(bot.win, bot_lines, bot_cols);
+ if (*lines > bot_lines) {
/* rbe is partially visible multi-line */
- cells_to_skip = (*lines - bot.lines) * bot.cols;
+ cells_to_skip = (*lines - bot_lines) * bot_cols;
ret = skip_cells(rbe->msg, cells_to_skip, &bytes_to_skip);
if (ret < 0)
return ret;
static void redraw_bot_win(void)
{
unsigned lines;
- int i;
+ int i, bot_lines = get_num_lines(&bot);
wmove(bot.win, 0, 0);
wclear(bot.win);
i = draw_top_rbe(&lines);
if (i <= 0)
goto out;
- while (i > 0 && lines < bot.lines) {
+ while (i > 0 && lines < bot_lines) {
struct rb_entry *rbe = ringbuffer_get(bot_win_rb, --i);
if (!rbe) {
lines++;
return 1;
}
-static int loglevel;
-
static __printf_2_3 void curses_log(int ll, const char *fmt,...)
{
va_list ap;
exit(exit_code);
}
-/*
- * init all windows
- */
-static void init_wins(int top_lines)
-{
- int top_y = 0, bot_y = top_lines + 1, sb_y = LINES - 2,
- in_y = LINES - 1, sep_y = top_lines;
-
- top.lines = top_lines;
- bot.lines = LINES - top.lines - 3;
- sb.lines = in.lines = sep.lines = 1;
-
- top.cols = bot.cols = sb.cols = in.cols = sep.cols = COLS;
-
- assume_default_colors(theme.default_fg, theme.default_bg);
- if (top.win) {
- wresize(top.win, top.lines, top.cols);
- mvwin(top.win, top_y, 0);
-
- wresize(sb.win, sb.lines, sb.cols);
- mvwin(sb.win, sb_y, 0);
-
- wresize(sep.win, sep.lines, sep.cols);
- mvwin(sep.win, sep_y, 0);
-
- wresize(bot.win, bot.lines, bot.cols);
- mvwin(bot.win, bot_y, 0);
-
- wresize(in.win, in.lines, in.cols);
- mvwin(in.win, in_y, 0);
- } else {
- sep.win = newwin(sep.lines, sep.cols, sep_y, 0);
- top.win = newwin(top.lines, top.cols, top_y, 0);
- bot.win = newwin(bot.lines, bot.cols, bot_y, 0);
- sb.win = newwin(sb.lines, sb.cols, sb_y, 0);
- in.win = newwin(in.lines, in.cols, in_y, 0);
- if (!top.win || !bot.win || !sb.win || !in.win || !sep.win)
- die(EXIT_FAILURE, "Error: Cannot create curses windows\n");
- wclear(bot.win);
- wclear(sb.win);
- wclear(in.win);
- scrollok(bot.win, 1);
- wattron(sb.win, COLOR_PAIR(COLOR_STATUSBAR));
- wattron(sep.win, COLOR_PAIR(COLOR_SEPARATOR));
- wattron(bot.win, COLOR_PAIR(COLOR_BOT));
- wattron(top.win, COLOR_PAIR(COLOR_TOP));
- nodelay(top.win, 1);
- nodelay(bot.win, 1);
- nodelay(sb.win, 1);
- nodelay(in.win, 0);
-
- keypad(top.win, 1);
- keypad(bot.win, 1);
- keypad(sb.win, 1);
- keypad(in.win, 1);
- }
- wmove(sep.win, 0, 0);
- whline(sep.win, theme.sep_char, COLS);
- wclear(top.win);
- //wclear(bot.win);
- wnoutrefresh(top.win);
- wnoutrefresh(bot.win);
- print_status_bar();
- wnoutrefresh(sb.win);
- wnoutrefresh(in.win);
- wnoutrefresh(sep.win);
- doupdate();
-}
-
/*
* Print stat item #i to curses window
*/
char *tmp;
struct stat_item_data d = theme.data[i];
char *c = stat_content[i];
+ int top_lines = get_num_lines(&top);
if (!curses_active() || !d.len || !c)
return;
tmp = make_message("%s%s%s", d.prefix, c, d.postfix);
- wmove(top.win, d.y * top.lines / 100, d.x * COLS / 100);
+ wmove(top.win, d.y * top_lines / 100, d.x * COLS / 100);
wrefresh(top.win);
wattron(top.win, COLOR_PAIR(i + 1));
align_str(top.win, tmp, d.len * COLS / 100, d.align);
return 1;
}
-static int read_stat_pipe(fd_set *rfds)
+static void print_all_items(void)
+{
+ int i;
+
+ if (!curses_active())
+ return;
+ FOR_EACH_STATUS_ITEM(i)
+ print_stat_item(i);
+}
+
+static void clear_all_items(void)
+{
+ int i;
+
+ FOR_EACH_STATUS_ITEM(i) {
+ free(stat_content[i]);
+ stat_content[i] = para_strdup("");
+ }
+}
+
+static void status_post_select(fd_set *rfds)
{
static char *buf;
static int bufsize, loaded;
size_t sz;
if (stat_pipe < 0)
- return 0;
+ return;
if (loaded >= bufsize) {
if (bufsize > 1000 * 1000) {
loaded = 0;
- return 0;
+ return;
}
bufsize += bufsize + 1000;
buf = para_realloc(buf, bufsize);
ret2 = for_each_stat_item(buf, loaded, update_item);
if (ret < 0 || ret2 < 0) {
loaded = 0;
- return ret2 < 0? ret2 : ret;
+ PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret));
+ close(stat_pipe);
+ stat_pipe = -1;
+ clear_all_items();
+ free(stat_content[SI_BASENAME]);
+ stat_content[SI_BASENAME] =
+ para_strdup("stat command terminated!?");
+ print_all_items();
+ return;
}
sz = ret2; /* what is left */
if (sz > 0 && sz < loaded)
memmove(buf, buf + loaded - sz, sz);
loaded = sz;
- return 1;
}
-static void print_all_items(void)
+/*
+ * init all windows
+ */
+static void init_wins(int top_lines)
{
- int i;
+ int top_y = 0, bot_y = top_lines + 1, sb_y = LINES - 2,
+ in_y = LINES - 1, sep_y = top_lines;
+ int bot_lines = LINES - top_lines - 3, sb_lines = 1, in_lines = 1,
+ sep_lines = 1;
- if (!curses_active())
- return;
- FOR_EACH_STATUS_ITEM(i)
- print_stat_item(i);
-}
+ assume_default_colors(theme.default_fg, theme.default_bg);
+ if (top.win) {
+ wresize(top.win, top_lines, COLS);
+ mvwin(top.win, top_y, 0);
-static void clear_all_items(void)
-{
- int i;
+ wresize(sb.win, sb_lines, COLS);
+ mvwin(sb.win, sb_y, 0);
- FOR_EACH_STATUS_ITEM(i) {
- free(stat_content[i]);
- stat_content[i] = para_strdup("");
+ wresize(sep.win, sep_lines, COLS);
+ mvwin(sep.win, sep_y, 0);
+
+ wresize(bot.win, bot_lines, COLS);
+ mvwin(bot.win, bot_y, 0);
+
+ wresize(in.win, in_lines, COLS);
+ mvwin(in.win, in_y, 0);
+ } else {
+ sep.win = newwin(sep_lines, COLS, sep_y, 0);
+ top.win = newwin(top_lines, COLS, top_y, 0);
+ bot.win = newwin(bot_lines, COLS, bot_y, 0);
+ sb.win = newwin(sb_lines, COLS, sb_y, 0);
+ in.win = newwin(in_lines, COLS, in_y, 0);
+ if (!top.win || !bot.win || !sb.win || !in.win || !sep.win)
+ die(EXIT_FAILURE, "Error: Cannot create curses windows\n");
+ wclear(bot.win);
+ wclear(sb.win);
+ wclear(in.win);
+ scrollok(bot.win, 1);
+ wattron(sb.win, COLOR_PAIR(COLOR_STATUSBAR));
+ wattron(sep.win, COLOR_PAIR(COLOR_SEPARATOR));
+ wattron(bot.win, COLOR_PAIR(COLOR_BOT));
+ wattron(top.win, COLOR_PAIR(COLOR_TOP));
+ nodelay(top.win, 1);
+ nodelay(bot.win, 1);
+ nodelay(sb.win, 1);
+ nodelay(in.win, 0);
+
+ keypad(top.win, 1);
+ keypad(bot.win, 1);
+ keypad(sb.win, 1);
+ keypad(in.win, 1);
}
+ wmove(sep.win, 0, 0);
+ whline(sep.win, theme.sep_char, COLS);
+ wclear(top.win);
+ print_all_items();
+ //wclear(bot.win);
+ wnoutrefresh(top.win);
+ wnoutrefresh(bot.win);
+ print_status_bar();
+ wnoutrefresh(sb.win);
+ wnoutrefresh(in.win);
+ wnoutrefresh(sep.win);
+ doupdate();
}
static void init_pair_or_die(short pair, short f, short b)
init_colors_or_die();
clear(); /* ignore non-fatal errors */
init_wins(theme.top_lines_default);
- print_all_items();
// noecho(); /* don't echo input */
}
return 0;
}
-static int check_key_map_args(void)
+static void check_key_map_args_or_die(void)
{
- char *s;
- int i, ret = -1;
- char *tmp = NULL, *handler, *arg;
+ int i;
+ char *tmp = NULL;
for (i = 0; i < conf.key_map_given; ++i) {
- s = conf.key_map_arg[i];
- if (!(*s))
- goto out;
+ char *handler, *arg;
+
free(tmp);
- tmp = para_strdup(s);
+ tmp = para_strdup(conf.key_map_arg[i]);
if (!split_key_map(tmp, &handler, &arg))
- goto out;
+ break;
if (strlen(handler) != 1)
- goto out;
- if (*handler != 'x'
- && *handler != 'd'
- && *handler != 'i'
- && *handler != 'p')
- goto out;
+ break;
+ if (*handler != 'x' && *handler != 'd' && *handler != 'i'
+ && *handler != 'p')
+ break;
if (*handler != 'i')
continue;
if (find_cmd_byname(arg) < 0)
- goto out;
+ break;
}
- ret = 0;
-out:
+ if (i != conf.key_map_given)
+ die(EXIT_FAILURE, "invalid key map: %s\n", conf.key_map_arg[i]);
free(tmp);
- return ret;
+}
+
+static void parse_config_file_or_die(bool override)
+{
+ bool err;
+ char *config_file;
+ struct gui_cmdline_parser_params params = {
+ .override = override,
+ .initialize = 0,
+ .check_required = !override,
+ .check_ambiguity = 0,
+ .print_errors = 1,
+ };
+
+ if (conf.config_file_given)
+ config_file = para_strdup(conf.config_file_arg);
+ else {
+ char *home = para_homedir();
+ config_file = make_message("%s/.paraslash/gui.conf", home);
+ free(home);
+ }
+ if (!file_exists(config_file)) {
+ if (!conf.config_file_given)
+ err = false;
+ else {
+ PARA_EMERG_LOG("config file %s does not exist\n",
+ config_file);
+ err = true;
+ }
+ goto out;
+ }
+ gui_cmdline_parser_config_file(config_file, &conf, ¶ms);
+ loglevel = get_loglevel_by_name(conf.loglevel_arg);
+ check_key_map_args_or_die();
+ theme_init(conf.theme_arg, &theme);
+ err = false;
+out:
+ free(config_file);
+ if (err)
+ exit(EXIT_FAILURE);
+}
+
+/* reread configuration, terminate on errors */
+static void reread_conf(void)
+{
+ /*
+ * gengetopt might print to stderr and exit on errors. So we have to
+ * shutdown curses first.
+ */
+ shutdown_curses();
+ parse_config_file_or_die(true /* override */);
+ init_curses();
+ print_in_bar(COLOR_MSG, "config file reloaded\n");
}
/*
return;
case SIGUSR1:
PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n");
- com_reread_conf();
+ reread_conf();
return;
case SIGCHLD:
check_sigchld();
}
}
}
- ret = read_stat_pipe(&rfds);
- if (ret < 0) {
- PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret));
- close(stat_pipe);
- stat_pipe = -1;
- clear_all_items();
- free(stat_content[SI_BASENAME]);
- stat_content[SI_BASENAME] =
- para_strdup("stat command terminated!?");
- print_all_items();
- }
+ status_post_select(&rfds);
check_return:
switch (mode) {
case COMMAND_MODE:
static void com_scroll_top(void)
{
- int i = RINGBUFFER_SIZE - 1;
+ int i = RINGBUFFER_SIZE - 1, bot_lines = get_num_lines(&bot);
unsigned lines = 0;
while (i > 0 && !ringbuffer_get(bot_win_rb, i))
i--;
/* i is oldest entry */
- for (; lines < bot.lines && i >= 0; i--) {
+ for (; lines < bot_lines && i >= 0; i--) {
struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
if (!rbe)
break;
static void com_page_down(void)
{
unsigned lines = 0;
- int i = scroll_position;
+ int i = scroll_position, bot_lines = get_num_lines(&bot);
- while (lines < bot.lines && --i > 0) {
+ while (lines < bot_lines && --i > 0) {
struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
if (!rbe)
break;
static void com_page_up(void)
{
unsigned lines;
- int fvr = first_visible_rbe(&lines);
+ int fvr = first_visible_rbe(&lines), bot_lines = get_num_lines(&bot);
if (fvr < 0 || fvr + 1 >= ringbuffer_filled(bot_win_rb)) {
print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
scroll_position = fvr + 1;
for (; scroll_position > 0; scroll_position--) {
first_visible_rbe(&lines);
- if (lines == bot.lines)
+ if (lines == bot_lines)
break;
}
redraw_bot_win();
static void com_scroll_down(void)
{
struct rb_entry *rbe;
- int rbe_lines;
+ int rbe_lines, bot_lines = get_num_lines(&bot);
if (!scroll_position) {
print_in_bar(COLOR_ERRMSG, "bottom of buffer is shown\n");
rbe = ringbuffer_get(bot_win_rb, scroll_position);
rbe_lines = NUM_LINES(rbe->len);
wscrl(bot.win, rbe_lines);
- wmove(bot.win, bot.lines - rbe_lines, 0);
+ wmove(bot.win, bot_lines - rbe_lines, 0);
wattron(bot.win, COLOR_PAIR(rbe->color));
waddstr(bot.win, rbe->msg);
wrefresh(bot.win);
print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
}
-/*
- * reread configuration, terminate on errors
- */
static void com_reread_conf(void)
{
- char *cf = configfile_exists();
- struct gui_cmdline_parser_params params = {
- .override = 1,
- .initialize = 1,
- .check_required = 0,
- .check_ambiguity = 0,
- .print_errors = 0,
- };
-
- if (!cf) {
- PARA_WARNING_LOG("there is no configuration to read\n");
- return;
- }
- PARA_INFO_LOG("rereading command line options and config file\n");
- /*
- * Despite .print_errors is set to 0, gengetopt will print to stderr
- * anyway, and exit on errors. So we have to shutdown curses first.
- */
- shutdown_curses();
- gui_cmdline_parser_config_file(cf, &conf, ¶ms);
- init_curses();
- PARA_NOTICE_LOG("config file reloaded\n");
- if (check_key_map_args() < 0)
- die(EXIT_FAILURE, "invalid key map\n");
+ reread_conf();
}
static void com_help(void)
static void com_shrink_top_win(void)
{
- if (top.lines <= theme.top_lines_min) {
+ int top_lines = get_num_lines(&top);
+
+ if (top_lines <= theme.top_lines_min) {
PARA_WARNING_LOG("can not decrease top window\n");
return;
}
- init_wins(top.lines - 1);
- print_all_items();
+ init_wins(top_lines - 1);
print_in_bar(COLOR_MSG, "%s", "decreased top window");
}
static void com_enlarge_top_win(void)
{
- if (bot.lines < 3) {
+ int top_lines = get_num_lines(&top), bot_lines = get_num_lines(&bot);
+
+ if (bot_lines < 3) {
PARA_WARNING_LOG("can not increase top window\n");
return;
}
- init_wins(top.lines + 1);
- print_all_items();
+ init_wins(top_lines + 1);
print_in_bar(COLOR_MSG, "increased top window");
}
int main(int argc, char *argv[])
{
int ret;
- char *cf;
gui_cmdline_parser(argc, argv, &conf); /* exits on errors */
loglevel = get_loglevel_by_name(conf.loglevel_arg);
version_handle_flag("gui", conf.version_given);
if (conf.help_given || conf.detailed_help_given)
print_help_and_die();
- cf = configfile_exists();
- if (!cf && conf.config_file_given)
- die(EXIT_FAILURE, "can not read config file %s\n",
- conf.config_file_arg);
- if (cf) {
- struct gui_cmdline_parser_params params = {
- .override = 0,
- .initialize = 0,
- .check_required = 0,
- .check_ambiguity = 0,
- .print_errors = 1,
- };
- gui_cmdline_parser_config_file(cf, &conf, ¶ms);
- loglevel = get_loglevel_by_name(conf.loglevel_arg);
- }
- if (check_key_map_args() < 0)
- die(EXIT_FAILURE, "invalid key map\n");
- theme_init(conf.theme_arg, &theme);
+ parse_config_file_or_die(false /* override */);
setup_signal_handling();
bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
setlocale(LC_CTYPE, "");
projects / paraslash.git / blobdiff