From: Andre Noll Date: Wed, 23 Jul 2014 15:29:29 +0000 (+0200) Subject: Merge branch 't/sched_improvements' X-Git-Tag: v0.5.3~8 X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=8aa9d0cddfefb882cfd8e7cadbeea5cce31b731f;hp=4a8632cfff4c239f1ce285c2a8ffd021386da418;p=paraslash.git Merge branch 't/sched_improvements' Cooking for two months. This merge required to also patch gui.c due to semantic conflics against the changes introduced by the gui_sched branch which was merged to master in commit d15d8509 two weeks ago. Also a small fix for server.c is needed to squelch a compiler warning since the global "now" variable has become a const pointer. * t/sched_improvements: (36 commits) audiod: Fix use after free on exit. sched: Mark global now pointer as const. sched: Directly pass context pointer to pre/post_select(). sched: kill task->dead. sched: Do not shadow task_info in struct task. sched: Dont use fixed-size buffer for task names. sched: Rename task->error to tast->status. sched: Rename task->status to task->name. sched: Make struct task private to sched.c. sched: Introduce task_status(). sched: Remove ->owned_by_sched. sched: Remove register_task(). task_register() conversion: grab client task task_register() conversion: audiod status task task_register() conversion: audiod command task task_register() conversion: client task task_register() conversion: client supervisor task task_register() conversion: client exec task task_register() conversion: afs command task task_register() conversion: vss task ... --- diff --git a/Doxyfile b/Doxyfile index 00cb6cc9..239cd262 100644 --- a/Doxyfile +++ b/Doxyfile @@ -619,7 +619,6 @@ EXCLUDE_SYMLINKS = NO # for example use the pattern */test/* EXCLUDE_PATTERNS = *.cmdline.* \ - gui* \ gcc-compat.h \ fade.c \ *_command_list.h \ diff --git a/NEWS b/NEWS index 642c1fc4..311aca2b 100644 --- a/NEWS +++ b/NEWS @@ -5,11 +5,19 @@ NEWS 0.5.3 (to be released) "symbolic synchronization" ------------------------------------------------- +Not many new features, but lots of fixes and usability improvements. + + - para_gui has been converted to use the paraslash scheduler. - Various alsa-related fixes, mostly for the raspberry pi. + - Many scheduler improvements and cleanups. - The test suite has been extended to include sanity checks for the generated man pages. - ao_writer fixes. This writer was in a quite bad shape. Many serious bugs have been fixed. + - new audiod command: version. + - Minor improvements to the bitstream API. + - The cpsi command now prints a meaningful error message if + none of the given patterns matched any audio file. ---------------------------------------- 0.5.2 (2014-04-11) "orthogonal interior" diff --git a/aft.c b/aft.c index 179777ba..39f95ad2 100644 --- a/aft.c +++ b/aft.c @@ -2409,13 +2409,12 @@ static void com_cpsi_callback(int fd, const struct osl_object *query) out: if (ret < 0) para_printf(&cad.pb, "%s\n", para_strerror(-ret)); - else if (cad.flags & CPSI_FLAG_VERBOSE) { - if (pmd.num_matches > 0) + else if (pmd.num_matches > 0) { + if (cad.flags & CPSI_FLAG_VERBOSE) para_printf(&cad.pb, "copied requested afsi from %s " "to %u files\n", source_path, pmd.num_matches); - else - para_printf(&cad.pb, "nothing copied\n"); - } + } else + para_printf(&cad.pb, "no matches - nothing copied\n"); if (cad.pb.offset) pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset); free(cad.pb.buf); diff --git a/attribute.c b/attribute.c index ffe84102..7777a8dd 100644 --- a/attribute.c +++ b/attribute.c @@ -355,7 +355,7 @@ int com_mvatt(struct command_context *cc) struct remove_attribute_action_data { /** Message buffer. */ struct para_buffer pb; - /** Numver of attributes removed. */ + /** Number of attributes removed. */ int num_removed; /** Bitwise "or" of the removed attributes. */ uint64_t mask_of_removed_atts; @@ -438,7 +438,7 @@ int com_rmatt(struct command_context *cc) * used for unset attributes. * * In practice, not all 64 attributes are defined. In this case, the function - * only prints \a N + 1 charaters where \a N is the greatest id of a defined + * only prints \a N + 1 characters where \a N is the greatest id of a defined * attribute. */ void get_attribute_bitmap(const uint64_t *atts, char *buf) diff --git a/audioc.c b/audioc.c index e50267fd..83425a2e 100644 --- a/audioc.c +++ b/audioc.c @@ -97,6 +97,15 @@ static void help_completer(struct i9e_completion_info *ci, result->matches = i9e_complete_commands(ci->word, audiod_completers); } +static void version_completer(struct i9e_completion_info *ci, + struct i9e_completion_result *cr) +{ + char *opts[] = {"-v", NULL}; + + if (ci->word_num <= 2 && ci->word && ci->word[0] == '-') + i9e_complete_option(opts, ci, cr); +} + static void stat_completer(struct i9e_completion_info *ci, struct i9e_completion_result *cr) { diff --git a/audiod.cmd b/audiod.cmd index ad8f67d0..18c802de 100644 --- a/audiod.cmd +++ b/audiod.cmd @@ -66,9 +66,14 @@ H: parser-friendly mode. N: tasks D: list current tasks U: tasks -H: print the list of task ids together with the status of each task +H: Print the list of task ids together with the status of each task. --- N: term D: terminate audiod U: term H: Stop all decoders, shut down connection to para_server and exit. +--- +N: version +D: print the version of para_audiod +U: version [-v] +H: If the -v option is given, a more detailed version text is printed. diff --git a/audiod_command.c b/audiod_command.c index 4485d9e9..56d922e6 100644 --- a/audiod_command.c +++ b/audiod_command.c @@ -29,6 +29,7 @@ #include "string.h" #include "write.h" #include "fd.h" +#include "version.h" #include "audiod_command_list.h" extern struct sched sched; @@ -419,6 +420,22 @@ static int com_cycle(int fd, int argc, char **argv) return 1; } +static int com_version(int fd, int argc, char **argv) +{ + int ret; + char *msg; + + if (argc > 1 && strcmp(argv[1], "-v") == 0) + msg = make_message("%s", version_text("audiod")); + else + msg = make_message("%s\n", version_single_line("audiod")); + ret = client_write(fd, msg); + free(msg); + if (ret >= 0) + close(fd); + return ret; +} + static int check_perms(uid_t uid) { int i; diff --git a/bitstream.c b/bitstream.c index ddad67bb..fb638d0a 100644 --- a/bitstream.c +++ b/bitstream.c @@ -11,9 +11,7 @@ * For licencing details see COPYING.LIB. */ -/** - * \file bitstream.c Bitstream API. - */ +/** \file bitstream.c Bitstream API for the wma decoder. */ #include #include @@ -58,8 +56,7 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes, const void *bits, const void *codes, int codes_size, uint32_t code_prefix, int n_prefix) { - int i, j, k, n, table_size, table_index, nb, n1, idx, code_prefix2, - symbol; + int i, j, k, n, table_size, table_index, nb, n1, idx; uint32_t code; VLC_TYPE(*table)[2]; @@ -69,62 +66,57 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes, table = &vlc->table[table_index]; for (i = 0; i < table_size; i++) { - table[i][1] = 0; //bits - table[i][0] = -1; //codes + table[i][1] = 0; /* bits */ + table[i][0] = -1; /* codes */ } - /* map codes and compute auxillary table sizes */ + /* map codes and compute auxiliary table sizes */ for (i = 0; i < nb_codes; i++) { GET_DATA(n, bits, i, 1); - GET_DATA(code, codes, i, codes_size); /* we accept tables with holes */ + n -= n_prefix; if (n <= 0) continue; - symbol = i; + GET_DATA(code, codes, i, codes_size); /* if code matches the prefix, it is in the table */ - n -= n_prefix; - code_prefix2 = code >> n; - if (n <= 0 || code_prefix2 != code_prefix) + if ((code >> n) != code_prefix) continue; if (n <= table_nb_bits) { /* no need to add another table */ j = (code << (table_nb_bits - n)) & (table_size - 1); nb = 1 << (table_nb_bits - n); for (k = 0; k < nb; k++) { - if (table[j][1] /* bits */ != 0) { - PARA_EMERG_LOG("incorrect code\n"); - exit(EXIT_FAILURE); - } - table[j][1] = n; //bits - table[j][0] = symbol; + assert(table[j][1] == 0); /* incorrect code */ + table[j][1] = n; /* bits */ + table[j][0] = i; j++; } } else { n -= table_nb_bits; j = (code >> n) & ((1 << table_nb_bits) - 1); /* compute table size */ - n1 = -table[j][1]; //bits + n1 = -table[j][1]; /* bits */ if (n > n1) n1 = n; - table[j][1] = -n1; //bits + table[j][1] = -n1; /* bits */ } } - /* fill auxillary tables recursively */ + /* fill auxiliary tables recursively */ for (i = 0; i < table_size; i++) { - n = table[i][1]; //bits + n = table[i][1]; /* bits */ if (n < 0) { n = -n; if (n > table_nb_bits) { n = table_nb_bits; - table[i][1] = -n; //bits + table[i][1] = -n; /* bits */ } idx = build_table(vlc, n, nb_codes, bits, codes, codes_size, (code_prefix << table_nb_bits) | i, n_prefix + table_nb_bits); /* vlc->table might have changed */ table = &vlc->table[table_index]; - table[i][0] = idx; //code + table[i][0] = idx; /* code */ } } return table_index; @@ -134,19 +126,15 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes, * Build VLC decoding tables suitable for use with get_vlc(). * * \param vlc The structure to be initialized. - * - * \param nb_bits Set the decoding table size (2^nb_bits) entries. The bigger - * it is, the faster is the decoding. But it should not be too big to save - * memory and L1 cache. '9' is a good compromise. - * - * \param nb_codes Number of vlcs codes. - * + * \param nb_bits Set the decoding table size (2^nb_bits) entries. + * \param nb_codes Number of vlc codes. * \param bits Table which gives the size (in bits) of each vlc code. - * * \param codes Table which gives the bit pattern of of each vlc code. - * * \param codes_size The number of bytes of each entry of the \a codes tables. * + * The bigger \a nb_bits is, the faster is the decoding. But it should not be + * too big to save memory and L1 cache. '9' is a good compromise. + * * The wrap and size parameters allow to use any memory configuration and * types (byte/word/long) to store the bits and codes tables. */ @@ -178,15 +166,14 @@ void free_vlc(struct vlc *vlc) * Parse a vlc code. * * \param gbc The getbit context structure. - * * \param table The vlc tables to use. - * - * \param bits The number of bits which will be read at once, must be - * identical to nb_bits in init_vlc(). - * - * \param max_depth The number of times bits bits must be read to completely + * \param bits The number of bits which will be read at once. + * \param max_depth The number of times \a bits bits must be read to completely * read the longest vlc code = (max_vlc_length + bits - 1) / bits. * + * The \a bits parameter must be identical to the \a nb_bits value supplied to + * \ref init_vlc(). + * * \return The vlc code. */ int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits, diff --git a/bitstream.h b/bitstream.h index a3393380..5890d08c 100644 --- a/bitstream.h +++ b/bitstream.h @@ -69,11 +69,13 @@ static inline unsigned int get_bit(struct getbit_context *gbc) /** * Initialize a getbit_context structure. * - * \param buffer The bitstream buffer. It must be 4 bytes larger then the - * actual read bits because the bitstream reader might read 32 bits at once and - * could read over the end. + * \param gbc The structure to initialize. + * \param buffer The bitstream buffer. + * \param size The size of the buffer in bytes. * - * \param bit_size The size of the buffer in bytes. + * The bitstream buffer must be 4 bytes larger then the actual read bits + * because the bitstream reader might read 32 bits at once and could read over + * the end. */ static inline void init_get_bits(struct getbit_context *gbc, const uint8_t *buffer, int size) @@ -88,4 +90,3 @@ void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits, void free_vlc(struct vlc *vlc); int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits, int max_depth); - diff --git a/configure.ac b/configure.ac index 30bce8ee..639da81f 100644 --- a/configure.ac +++ b/configure.ac @@ -986,7 +986,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then fi if test "$have_core_audio" = "yes"; then audiod_errlist_objs="$audiod_errlist_objs osx_write ipc" - audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline" + audiod_cmdline_objs="$audiod_cmdline_objs osx_write" fi if test "$have_vorbis" = "yes"; then audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" @@ -1102,6 +1102,7 @@ if test "$have_curses" = "yes"; then gui gui_theme time + sched version ggo " @@ -1350,7 +1351,7 @@ play_cmdline_objs=" " if test "$have_core_audio" = "yes"; then play_errlist_objs="$play_errlist_objs osx_write ipc" - play_cmdline_objs="$play_cmdline_objs osx_write.cmdline" + play_cmdline_objs="$play_cmdline_objs osx_write" fi if test "$have_vorbis" = "yes" || \ test "$have_speex" = "yes" || \ @@ -1424,7 +1425,7 @@ default_writer="FILE_WRITE" if test "$have_core_audio" = "yes"; then write_errlist_objs="$write_errlist_objs osx_write ipc" - write_cmdline_objs="$write_cmdline_objs osx_write.cmdline" + write_cmdline_objs="$write_cmdline_objs osx_write" writers="$writers osx" default_writer="OSX_WRITE" fi diff --git a/crypt_common.c b/crypt_common.c index 71aabf53..fb6e1ef4 100644 --- a/crypt_common.c +++ b/crypt_common.c @@ -90,41 +90,31 @@ int base64_decode(char const *src, unsigned char *target, size_t targsize) switch (state) { case 0: - if (target) { - if (tarindex >= targsize) - return -E_BASE64; - target[tarindex] = (pos - Base64) << 2; - } + if (tarindex >= targsize) + return -E_BASE64; + target[tarindex] = (pos - Base64) << 2; state = 1; break; case 1: - if (target) { - if (tarindex + 1 >= targsize) - return -E_BASE64; - target[tarindex] |= (pos - Base64) >> 4; - target[tarindex+1] = ((pos - Base64) & 0x0f) - << 4 ; - } + if (tarindex + 1 >= targsize) + return -E_BASE64; + target[tarindex] |= (pos - Base64) >> 4; + target[tarindex + 1] = ((pos - Base64) & 0x0f) << 4; tarindex++; state = 2; break; case 2: - if (target) { - if (tarindex + 1 >= targsize) - return -E_BASE64; - target[tarindex] |= (pos - Base64) >> 2; - target[tarindex+1] = ((pos - Base64) & 0x03) - << 6; - } + if (tarindex + 1 >= targsize) + return -E_BASE64; + target[tarindex] |= (pos - Base64) >> 2; + target[tarindex + 1] = ((pos - Base64) & 0x03) << 6; tarindex++; state = 3; break; case 3: - if (target) { - if (tarindex >= targsize) - return -E_BASE64; - target[tarindex] |= (pos - Base64); - } + if (tarindex >= targsize) + return -E_BASE64; + target[tarindex] |= pos - Base64; tarindex++; state = 0; break; @@ -170,7 +160,7 @@ int base64_decode(char const *src, unsigned char *target, size_t targsize) * zeros. If we don't check them, they become a * subliminal channel. */ - if (target && target[tarindex] != 0) + if (target[tarindex] != 0) return -E_BASE64; } } else { diff --git a/error.h b/error.h index ba8409df..e91f49b4 100644 --- a/error.h +++ b/error.h @@ -16,11 +16,9 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS -#define GUI_ERRORS #define GUI_THEME_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS -#define RBTREE_ERRORS #define RECV_ERRORS #define IPC_ERRORS #define DCCP_SEND_ERRORS @@ -87,6 +85,8 @@ extern const char **para_errlist[]; PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \ PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \ +#define GUI_ERRORS \ + PARA_ERROR(GUI_SIGCHLD, "received SIGCHLD"), \ #define FLAC_AFH_ERRORS \ PARA_ERROR(FLAC_CHAIN_ALLOC, "could not create metadata chain"), \ diff --git a/gui.c b/gui.c index 5a2e659d..92b7f7cf 100644 --- a/gui.c +++ b/gui.c @@ -30,48 +30,52 @@ INIT_GUI_ERRLISTS; static char *stat_content[NUM_STAT_ITEMS]; -#define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)" - -static int signal_pipe; - -static struct win_data { +static struct gui_window { WINDOW *win; - size_t begx; - size_t begy; - size_t cols; - size_t lines; + bool needs_update; } top, bot, sb, in, sep; +/** How many lines of output to remember. */ #define RINGBUFFER_SIZE 512 + struct rb_entry { char *msg; size_t len; int color; }; static struct ringbuffer *bot_win_rb; -#define NUM_LINES(len) (1 + (len) / bot.cols) static unsigned scroll_position; -static int curses_active; -static pid_t cmd_pid; +static pid_t exec_pid; -static int command_fds[2]; -static int stat_pipe = -1; +static int exec_fds[2] = {-1, -1}; static struct gui_args_info conf; +static int loglevel; -enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE}; - +/** Type of the process currently being executed. */ +enum exec_status { + EXEC_IDLE, /**< No process running. */ + EXEC_DCMD, /**< para or display process running. */ + EXEC_XCMD, /**< External process running. */ +}; -#define COLOR_STATUSBAR 52 -#define COLOR_COMMAND 53 -#define COLOR_OUTPUT 54 -#define COLOR_MSG 55 -#define COLOR_ERRMSG 56 -#define COLOR_WELCOME 57 -#define COLOR_SEPARATOR 58 -#define COLOR_TOP 59 -#define COLOR_BOT 60 +/** + * Codes for various colors. + * + * Each status item has its own color pair. The ones defined here start at a + * higher number so that they do not overlap with these. + */ +enum gui_color_pair { + COLOR_STATUSBAR = NUM_STAT_ITEMS + 1, + COLOR_COMMAND, + COLOR_OUTPUT, + COLOR_MSG, + COLOR_ERRMSG, + COLOR_SEPARATOR, + COLOR_TOP, + COLOR_BOT, +}; struct gui_command { const char *key; @@ -80,130 +84,66 @@ struct gui_command { void (*handler)(void); }; -struct stat_item { - char name[MAXLINE]; - char prefix[MAXLINE]; - char postfix[MAXLINE]; - unsigned y; - unsigned x; - unsigned len; - int fg, bg; - int align; - char content[MAXLINE]; +static struct gui_theme theme; + +#define GUI_COMMANDS \ + GUI_COMMAND(help, "?", "print help") \ + GUI_COMMAND(enlarge_top_win, "+", "enlarge the top window") \ + GUI_COMMAND(shrink_top_win, "-", "shrink the top window") \ + GUI_COMMAND(reread_conf, "r", "reread configuration file") \ + GUI_COMMAND(quit, "q", "exit para_gui") \ + GUI_COMMAND(refresh, "^L", "redraw the screen") \ + GUI_COMMAND(next_theme, ".", "switch to next theme") \ + GUI_COMMAND(prev_theme, ",", "switch to previous theme") \ + GUI_COMMAND(ll_incr, ">", "increase loglevel (decreases verbosity)") \ + GUI_COMMAND(ll_decr, "<", "decrease loglevel (increases verbosity)") \ + GUI_COMMAND(version, "V", "show the para_gui version") \ + GUI_COMMAND(scroll_up, "", "scroll up one line") \ + GUI_COMMAND(scroll_down, "", "scroll_down") \ + GUI_COMMAND(page_up, "", "scroll up one page") \ + GUI_COMMAND(page_down, "", "scroll down one page") \ + GUI_COMMAND(scroll_top, "", "scroll to top of buffer") \ + GUI_COMMAND(cancel_scroll, "", "deactivate scroll mode") \ + +/* declare command handlers */ +#define GUI_COMMAND(_c, _k, _d) \ + static void com_ ## _c(void); +GUI_COMMANDS + +#undef GUI_COMMAND + +/* define command array */ +#define GUI_COMMAND(_c, _k, _d) \ + { \ + .key = _k, \ + .name = #_c, \ + .description = _d, \ + .handler = com_ ## _c \ + }, + +static struct gui_command command_list[] = {GUI_COMMANDS {.name = NULL}}; + +struct input_task { + struct task *task; }; -static struct gui_theme theme; +struct status_task { + struct task *task; + pid_t pid; + char *buf; + int bufsize, loaded; + struct timeval next_exec; + int fd; +}; -static int _argc; -static char **_argv; - -static void com_help(void); -static void com_reread_conf(void); -static void com_enlarge_top_win(void); -static void com_shrink_top_win(void); -static void com_version(void); -__noreturn static void com_quit(void); -static void com_refresh(void); -static void com_ll_incr(void); -static void com_ll_decr(void); -static void com_prev_theme(void); -static void com_next_theme(void); -static void com_scroll_up(void); -static void com_scroll_down(void); -static void com_page_up(void); -static void com_page_down(void); -static void com_cancel_scrolling(void); -static void com_scroll_top(void); - -static struct gui_command command_list[] = { - { - .key = "?", - .name = "help", - .description = "print help", - .handler = com_help - }, { - .key = "+", - .name = "enlarge_win", - .description = "enlarge the top window", - .handler = com_enlarge_top_win - }, { - .key = "-", - .name = "shrink_win", - .description = "shrink the top window", - .handler = com_shrink_top_win - }, { - .key = "r", - .name = "reread_conf", - .description = "reread configuration file", - .handler = com_reread_conf - }, { - .key = "q", - .name = "quit", - .description = "exit para_gui", - .handler = com_quit - }, { - .key = "^L", - .name = "refresh", - .description = "redraw the screen", - .handler = com_refresh - }, { - .key = ".", - .name = "next_theme", - .description = "switch to next theme", - .handler = com_next_theme - }, { - .key = ",", - .name = "prev_theme", - .description = "switch to previous stream", - .handler = com_prev_theme - }, { - .key = ">", - .name = "ll_incr", - .description = "increase loglevel (decreases verbosity)", - .handler = com_ll_incr - }, { - .key = "<", - .name = "ll_decr", - .description = "decrease loglevel (increases verbosity)", - .handler = com_ll_decr - }, { - .key = "V", - .name = "version", - .description = "show the para_gui version", - .handler = com_version - }, { - .key = "", - .name = "scroll_up", - .description = "scroll up one line", - .handler = com_scroll_up - }, { - .key = "", - .name = "scroll_down", - .description = "scroll down one line", - .handler = com_scroll_down - }, { - .key = "", - .name = "page_up", - .description = "scroll up one page", - .handler = com_page_up - }, { - .key = "", - .name = "page_down", - .description = "scroll down one page", - .handler = com_page_down - }, { - .key = "", - .name = "scroll_top", - .description = "scroll to top of buffer", - .handler = com_scroll_top - }, { - .key = "", - .name = "cancel_scroll", - .description = "deactivate scroll mode", - .handler = com_cancel_scrolling - }, { - .handler = NULL - } +/** Stdout/stderr of the executing process is read in chunks of this size. */ +#define COMMAND_BUF_SIZE 32768 + +struct exec_task { + struct task *task; + char command_buf[2][COMMAND_BUF_SIZE]; /* stdout/stderr of command */ + int cbo[2]; /* command buf offsets */ + unsigned flags[2]; /* passed to for_each_line() */ }; static int find_cmd_byname(char *name) @@ -216,6 +156,37 @@ static int find_cmd_byname(char *name) 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 top.win && !isendwin(); +} + /* taken from mutt */ static char *km_keyname(int c) { @@ -272,24 +243,6 @@ static char *km_keyname(int c) 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) { @@ -349,59 +302,64 @@ static int align_str(WINDOW* win, char *str, unsigned int len, return 1; } +static void refresh_window(struct gui_window *gw) +{ + gw->needs_update = true; +} + +static bool window_update_needed(void) +{ + return top.needs_update || bot.needs_update || sb.needs_update || + in.needs_update || sep.needs_update; +} + __printf_2_3 static void print_in_bar(int color, const char *fmt,...) { char *msg; va_list ap; - if (!curses_active) + if (!curses_active()) return; wattron(in.win, COLOR_PAIR(color)); va_start(ap, fmt); xvasprintf(&msg, fmt, ap); va_end(ap); wmove(in.win, 0, 0); - align_str(in.win, msg, sb.cols, LEFT); + align_str(in.win, msg, get_num_cols(&in), LEFT); free(msg); - wrefresh(in.win); + refresh_window(&in); } -/* - * update the status bar - */ static void print_status_bar(void) { char *tmp; - if (!curses_active) - return; - tmp = para_strdup(STANDARD_STATUS_BAR); + 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); - wrefresh(sb.win); } /* * get the number of the oldest rbe that is (partially) visible. On return, - * lines contains the sum of the number of lines of all visable entries. If the + * lines contains the sum of the number of lines of all visible entries. If the * first one is only partially visible, lines is greater than bot.lines. */ 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); int rbe_lines; if (!rbe) return i - 1; -// fprintf(stderr, "found: %s\n", rbe->msg); 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; @@ -412,7 +370,7 @@ returns number of first visible rbe, *lines is the number of lines drawn. */ 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; @@ -422,9 +380,10 @@ static int draw_top_rbe(unsigned *lines) 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; @@ -444,14 +403,14 @@ static int draw_top_rbe(unsigned *lines) 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++; @@ -464,7 +423,7 @@ static void redraw_bot_win(void) waddstr(bot.win, rbe->msg); } out: - wrefresh(bot.win); + refresh_window(&bot); } static void rb_add_entry(int color, char *msg) @@ -480,7 +439,6 @@ static void rb_add_entry(int color, char *msg) new->len = len; new->msg = msg; old = ringbuffer_add(bot_win_rb, new); -// fprintf(stderr, "added: %s\n", new->msg); if (old) { free(old->msg); free(old); @@ -506,196 +464,66 @@ __printf_2_3 static void outputf(int color, const char* fmt,...) char *msg; va_list ap; - if (!curses_active) + if (!curses_active()) return; va_start(ap, fmt); xvasprintf(&msg, fmt, ap); va_end(ap); rb_add_entry(color, msg); - wrefresh(bot.win); + refresh_window(&bot); } static int add_output_line(char *line, void *data) { int color = *(int *)data? COLOR_ERRMSG : COLOR_OUTPUT; - if (!curses_active) + + if (!curses_active()) return 1; rb_add_entry(color, para_strdup(line)); return 1; } -static int loglevel; - static __printf_2_3 void curses_log(int ll, const char *fmt,...) { - int color; - char *msg; va_list ap; - if (ll < loglevel || !curses_active) + if (ll < loglevel) return; - switch (ll) { - case LL_DEBUG: - case LL_INFO: - case LL_NOTICE: - color = COLOR_MSG; - break; - default: - color = COLOR_ERRMSG; - } va_start(ap, fmt); - xvasprintf(&msg, fmt, ap); + if (curses_active()) { + int color = ll <= LL_NOTICE? COLOR_MSG : COLOR_ERRMSG; + char *msg; + unsigned bytes = xvasprintf(&msg, fmt, ap); + if (bytes > 0 && msg[bytes - 1] == '\n') + msg[bytes - 1] = '\0'; /* cut trailing newline */ + rb_add_entry(color, msg); + refresh_window(&bot); + } else if (exec_pid <= 0) /* no external command running */ + vfprintf(stderr, fmt, ap); va_end(ap); - chop(msg); - rb_add_entry(color, msg); - wrefresh(bot.win); } +/** The log function of para_gui, always set to curses_log(). */ __printf_2_3 void (*para_log)(int, const char*, ...) = curses_log; -static void setup_signal_handling(void) -{ - signal_pipe = para_signal_init(); - para_install_sighandler(SIGINT); - para_install_sighandler(SIGTERM); - para_install_sighandler(SIGCHLD); - para_install_sighandler(SIGWINCH); - para_install_sighandler(SIGUSR1); -} - -/* kill every process in the process group and exit */ -__noreturn static void kill_pg_and_die(int ret) -{ - para_sigaction(SIGTERM, SIG_IGN); - kill(0, SIGTERM); - exit(ret); -} - static void shutdown_curses(void) { - if (!curses_active) - return; def_prog_mode(); - curses_active = 0; endwin(); } -__noreturn static void finish(int ret) -{ - shutdown_curses(); - kill_pg_and_die(ret); -} - -/* - * exit curses and print given message to stdout/stderr - */ -__noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...) +/* disable curses, print a message, kill running processes and exit */ +__noreturn __printf_2_3 static void die(int exit_code, const char* fmt, ...) { va_list argp; - FILE *outfd = ret? stderr: stdout; shutdown_curses(); va_start(argp, fmt); - vfprintf(outfd, fmt, argp); + vfprintf(stderr, fmt, argp); va_end(argp); - kill_pg_and_die(ret); -} - -static void print_welcome(void) -{ - if (loglevel > LL_NOTICE) - return; - outputf(COLOR_WELCOME, "Welcome to %s. Theme: %s", - version_single_line("gui"), theme.name); - wclrtoeol(bot.win); -} - -/* - * init all windows - */ -static void init_wins(int top_lines) -{ - int i; - - top.lines = top_lines; - top.cols = COLS; - top.begy = 0; - top.begx = 0; - - bot.lines = LINES - top.lines - 3; - bot.cols = COLS; - bot.begy = top.lines + 1; - bot.begx = 0; - - sb.lines = 1; - sb.cols = COLS; - sb.begy = LINES - 2; - sb.begx = 0; - - in.lines = 1; - in.cols = COLS; - in.begy = LINES - 1; - in.begx = 0; - - sep.lines = 1; - sep.cols = COLS; - sep.begy = top.lines; - sep.begx = 0; - - assume_default_colors(theme.default_fg, theme.default_bg); - if (top.win) { - mvwin(top.win, top.begy, top.begx); - wresize(top.win, top.lines, top.cols); - - mvwin(sb.win, sb.begy, sb.begx); - wresize(sb.win, sb.lines, sb.cols); - - mvwin(sep.win, sep.begy, sep.begx); - wresize(sep.win, sep.lines, sep.cols); - - mvwin(bot.win, bot.begy, bot.begx); - wresize(bot.win, bot.lines, bot.cols); - - mvwin(in.win, in.begy, in.begx); - wresize(in.win, in.lines, in.cols); - } else { - sep.win = newwin(sep.lines, sep.cols, sep.begy, sep.begx); - top.win = newwin(top.lines, top.cols, top.begy, top.begx); - bot.win = newwin(bot.lines, bot.cols, bot.begy, bot.begx); - sb.win = newwin(sb.lines, sb.cols, sb.begy, sb.begx); - in.win = newwin(in.lines, in.cols, in.begy, in.begx); - if (!top.win || !bot.win || !sb.win || !in.win || !sep.win) - msg_n_exit(1, "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); - print_status_bar(); - } - wmove(sep.win, 0, 0); - for (i = 1; i <= COLS; i++) - waddstr(sep.win, theme.sep_str); - wclear(top.win); - //wclear(bot.win); - wnoutrefresh(top.win); - wnoutrefresh(bot.win); - //wnoutrefresh(sb.win); - print_status_bar(); - wnoutrefresh(in.win); - wnoutrefresh(sep.win); - doupdate(); + /* kill every process in the process group and exit */ + para_sigaction(SIGTERM, SIG_IGN); + kill(0, SIGTERM); + exit(exit_code); } /* @@ -706,16 +534,16 @@ static void print_stat_item(int i) 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) + 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); - wrefresh(top.win); + wmove(top.win, d.y * top_lines / 100, d.x * COLS / 100); wattron(top.win, COLOR_PAIR(i + 1)); align_str(top.win, tmp, d.len * COLS / 100, d.align); free(tmp); - wrefresh(top.win); + refresh_window(&top); } static int update_item(int item_num, char *buf) @@ -749,44 +577,11 @@ print: return 1; } -static int read_stat_pipe(fd_set *rfds) -{ - static char *buf; - static int bufsize, loaded; - int ret, ret2; - size_t sz; - - if (stat_pipe < 0) - return 0; - if (loaded >= bufsize) { - if (bufsize > 1000 * 1000) { - loaded = 0; - return 0; - } - bufsize += bufsize + 1000; - buf = para_realloc(buf, bufsize); - } - assert(loaded < bufsize); - ret = read_nonblock(stat_pipe, buf + loaded, bufsize - loaded, - rfds, &sz); - loaded += sz; - ret2 = for_each_stat_item(buf, loaded, update_item); - if (ret < 0 || ret2 < 0) { - loaded = 0; - return ret2 < 0? ret2 : ret; - } - 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) { int i; - if (!curses_active) + if (!curses_active()) return; FOR_EACH_STATUS_ITEM(i) print_stat_item(i); @@ -802,10 +597,155 @@ static void clear_all_items(void) } } +static void status_pre_select(struct sched *s, void *context) +{ + struct status_task *st = context; + + if (st->fd >= 0) + para_fd_set(st->fd, &s->rfds, &s->max_fileno); + if (task_get_notification(st->task) < 0) + return sched_min_delay(s); + if (st->fd < 0) + sched_request_barrier_or_min_delay(&st->next_exec, s); +} + +static int status_post_select(struct sched *s, void *context) +{ + struct status_task *st = context; + size_t sz; + int ret, ret2; + + ret = task_get_notification(st->task); + if (ret == -E_GUI_SIGCHLD && st->pid > 0) { + int exit_status; + if (waitpid(st->pid, &exit_status, WNOHANG) == st->pid) { + st->pid = 0; + PARA_ERROR_LOG("stat command exit status: %d", + exit_status); + } + } + if (st->fd < 0) { + int fds[3] = {0, 1, 0}; + if (st->pid > 0) + return 0; + /* Avoid busy loop */ + if (tv_diff(&st->next_exec, now, NULL) > 0) + return 0; + st->next_exec.tv_sec = now->tv_sec + 2; + ret = para_exec_cmdline_pid(&st->pid, conf.stat_cmd_arg, fds); + if (ret < 0) + return 0; + ret = mark_fd_nonblocking(fds[1]); + if (ret < 0) { + close(fds[1]); + return 0; + } + st->fd = fds[1]; + return 0; + } + + if (st->loaded >= st->bufsize) { + if (st->bufsize > 1000 * 1000) { + st->loaded = 0; + return 0; + } + st->bufsize += st->bufsize + 1000; + st->buf = para_realloc(st->buf, st->bufsize); + } + assert(st->loaded < st->bufsize); + ret = read_nonblock(st->fd, st->buf + st->loaded, + st->bufsize - st->loaded, &s->rfds, &sz); + st->loaded += sz; + ret2 = for_each_stat_item(st->buf, st->loaded, update_item); + if (ret < 0 || ret2 < 0) { + st->loaded = 0; + PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret)); + close(st->fd); + st->fd = -1; + clear_all_items(); + free(stat_content[SI_BASENAME]); + stat_content[SI_BASENAME] = + para_strdup("stat command terminated!?"); + print_all_items(); + return 0; + } + sz = ret2; /* what is left */ + if (sz > 0 && sz < st->loaded) + memmove(st->buf, st->buf + st->loaded - sz, sz); + st->loaded = sz; + return 0; +} + +/* + * 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; + int bot_lines = LINES - top_lines - 3, sb_lines = 1, in_lines = 1, + sep_lines = 1; + + assume_default_colors(theme.dflt.fg, theme.dflt.bg); + if (top.win) { + wresize(top.win, top_lines, COLS); + mvwin(top.win, top_y, 0); + + wresize(sb.win, sb_lines, COLS); + mvwin(sb.win, sb_y, 0); + + 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) { if (init_pair(pair, f, b) == ERR) - msg_n_exit(EXIT_FAILURE, "fatal: init_pair() failed\n"); + die(EXIT_FAILURE, "fatal: init_pair() failed\n"); } static void init_colors_or_die(void) @@ -813,62 +753,48 @@ static void init_colors_or_die(void) int i; if (!has_colors()) - msg_n_exit(EXIT_FAILURE, "fatal: No color term\n"); + die(EXIT_FAILURE, "fatal: No color term\n"); if (start_color() == ERR) - msg_n_exit(EXIT_FAILURE, "fatal: failed to start colors\n"); + die(EXIT_FAILURE, "fatal: failed to start colors\n"); FOR_EACH_STATUS_ITEM(i) if (theme.data[i].len) - init_pair_or_die(i + 1, theme.data[i].fg, - theme.data[i].bg); - init_pair_or_die(COLOR_STATUSBAR, theme.sb_fg, theme.sb_bg); - init_pair_or_die(COLOR_COMMAND, theme.cmd_fg, theme.cmd_bg); - init_pair_or_die(COLOR_OUTPUT, theme.output_fg, theme.output_bg); - init_pair_or_die(COLOR_MSG, theme.msg_fg, theme.msg_bg); - init_pair_or_die(COLOR_ERRMSG, theme.err_msg_fg, theme.err_msg_bg); - init_pair_or_die(COLOR_WELCOME, theme.welcome_fg, theme.welcome_bg); - init_pair_or_die(COLOR_SEPARATOR, theme.sep_fg, theme.sep_bg); - init_pair_or_die(COLOR_TOP, theme.default_fg, theme.default_bg); - init_pair_or_die(COLOR_BOT, theme.default_fg, theme.default_bg); + init_pair_or_die(i + 1, theme.data[i].color.fg, + theme.data[i].color.bg); + init_pair_or_die(COLOR_STATUSBAR, theme.sb.fg, theme.sb.bg); + init_pair_or_die(COLOR_COMMAND, theme.cmd.fg, theme.cmd.bg); + init_pair_or_die(COLOR_OUTPUT, theme.output.fg, theme.output.bg); + init_pair_or_die(COLOR_MSG, theme.msg.fg, theme.msg.bg); + init_pair_or_die(COLOR_ERRMSG, theme.err_msg.fg, theme.err_msg.bg); + init_pair_or_die(COLOR_SEPARATOR, theme.sep.fg, theme.sep.bg); + init_pair_or_die(COLOR_TOP, theme.dflt.fg, theme.dflt.bg); + init_pair_or_die(COLOR_BOT, theme.dflt.fg, theme.dflt.bg); } /* (Re-)initialize the curses library. */ static void init_curses(void) { - curses_active = 1; - if (top.win && refresh() == ERR) /* refesh is really needed */ - msg_n_exit(EXIT_FAILURE, "refresh() failed\n"); + if (curses_active()) + return; + if (top.win && refresh() == ERR) /* refresh is really needed */ + die(EXIT_FAILURE, "refresh() failed\n"); if (LINES < theme.lines_min || COLS < theme.cols_min) - msg_n_exit(EXIT_FAILURE, "Error: Terminal (%dx%d) too small" + die(EXIT_FAILURE, "Terminal (%dx%d) too small" " (need at least %dx%d)\n", COLS, LINES, theme.cols_min, theme.lines_min); curs_set(0); /* make cursor invisible, ignore errors */ nonl(); /* do not NL->CR/NL on output, always returns OK */ /* don't echo input */ if (noecho() == ERR) - msg_n_exit(EXIT_FAILURE, "fatal: noecho() failed\n"); + die(EXIT_FAILURE, "fatal: noecho() failed\n"); /* take input chars one at a time, no wait for \n */ if (cbreak() == ERR) - msg_n_exit(EXIT_FAILURE, "fatal: cbreak() failed\n"); + die(EXIT_FAILURE, "fatal: cbreak() failed\n"); init_colors_or_die(); clear(); /* ignore non-fatal errors */ init_wins(theme.top_lines_default); - print_all_items(); // noecho(); /* don't echo input */ } -static void check_sigchld(void) -{ - int ret; - pid_t pid; -reap_next_child: - ret = para_reap_child(&pid); - if (ret <= 0) - return; - if (pid == cmd_pid) - cmd_pid = 0; - goto reap_next_child; -} - /* * This sucker modifies its first argument. *handler and *arg are * pointers to 0-terminated strings (inside line). Crap. @@ -888,313 +814,347 @@ err_out: 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 err_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 err_out; + break; if (strlen(handler) != 1) - goto err_out; - if (*handler != 'x' - && *handler != 'd' - && *handler != 'i' - && *handler != 'p') - goto err_out; + break; + if (*handler != 'x' && *handler != 'd' && *handler != 'i' + && *handler != 'p') + break; if (*handler != 'i') continue; if (find_cmd_byname(arg) < 0) - goto err_out; + break; } - ret = 0; -err_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(); + err = false; +out: + free(config_file); + if (err) + exit(EXIT_FAILURE); + theme_init(conf.theme_arg, &theme); +} + +/* 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"); } /* * React to various signal-related events */ -static void handle_signal(int sig) +static int signal_post_select(struct sched *s, __a_unused void *context) { - switch (sig) { + int ret = para_next_signal(&s->rfds); + + if (ret <= 0) + return 0; + switch (ret) { case SIGTERM: - msg_n_exit(EXIT_FAILURE, - "only the good die young (caught SIGTERM))\n"); - return; - case SIGWINCH: - if (curses_active) { - shutdown_curses(); - init_curses(); - redraw_bot_win(); - } - return; + die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n"); + return 1; case SIGINT: - PARA_WARNING_LOG("caught SIGINT, reset"); + PARA_WARNING_LOG("caught SIGINT, reset\n"); /* Nothing to do. SIGINT killed our child which gets noticed * by do_select and resets everything. */ - return; + return 1; case SIGUSR1: - PARA_NOTICE_LOG("got SIGUSR1, rereading configuration"); - com_reread_conf(); - return; + PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n"); + reread_conf(); + return 1; case SIGCHLD: - check_sigchld(); - return; + task_notify_all(s, E_GUI_SIGCHLD); + return 1; } + return 1; } -static void status_pre_select(fd_set *rfds, int *max_fileno, struct timeval *tv) +static enum exec_status exec_status(void) { - static struct timeval next_exec, atm, diff; - int ret, fds[3] = {0, 1, 0}; - pid_t pid; - - if (stat_pipe >= 0) - goto success; - /* Avoid busy loop */ - gettimeofday(&atm, NULL); - if (tv_diff(&next_exec, &atm, &diff) > 0) { - if (tv_diff(&diff, tv, NULL) < 0) - *tv = diff; - return; - } - next_exec.tv_sec = atm.tv_sec + 2; - ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds); - if (ret < 0) - return; - ret = mark_fd_nonblocking(fds[1]); - if (ret < 0) { - close(fds[1]); - return; - } - stat_pipe = fds[1]; -success: - para_fd_set(stat_pipe, rfds, max_fileno); + if (exec_fds[0] >= 0 || exec_fds[1] >= 0) + return EXEC_DCMD; + if (exec_pid > 0) + return EXEC_XCMD; + return EXEC_IDLE; } -#define COMMAND_BUF_SIZE 32768 +static void exec_pre_select(struct sched *s, void *context) +{ + struct exec_task *et = context; + if (exec_fds[0] >= 0) + para_fd_set(exec_fds[0], &s->rfds, &s->max_fileno); + if (exec_fds[1] >= 0) + para_fd_set(exec_fds[1], &s->rfds, &s->max_fileno); + if (task_get_notification(et->task) < 0) + sched_min_delay(s); +} -/* - * This is the core select loop. Besides the (internal) signal - * pipe, the following other fds are checked according to the mode: - * - * GETCH_MODE: check stdin, return when key is pressed - * - * COMMAND_MODE: check command fds and stdin. Return when peer has closed both - * stdout and stderr or when any key is pressed. - * - * EXTERNAL_MODE: Check only signal pipe. Used when an external command - * is running. During that time curses is disabled. Returns when - * cmd_pid == 0. - */ -static int do_select(int mode) -{ - fd_set rfds; - int ret, i, max_fileno; - char command_buf[2][COMMAND_BUF_SIZE] = {"", ""}; - int cbo[2] = {0, 0}; /* command buf offsets */ - struct timeval tv; - unsigned flags[2] = {0, 0}; /* for for_each_line() */ - -repeat: - tv.tv_sec = conf.timeout_arg / 1000; - tv.tv_usec = (conf.timeout_arg % 1000) * 1000; -// ret = refresh_status(); - FD_ZERO(&rfds); - max_fileno = 0; - status_pre_select(&rfds, &max_fileno, &tv); - /* signal pipe */ - para_fd_set(signal_pipe, &rfds, &max_fileno); - /* command pipe only for COMMAND_MODE */ - if (mode == COMMAND_MODE) { - if (command_fds[0] >= 0) - para_fd_set(command_fds[0], &rfds, &max_fileno); - if (command_fds[1] >= 0) - para_fd_set(command_fds[1], &rfds, &max_fileno); +static int exec_post_select(struct sched *s, void *context) +{ + struct exec_task *ct = context; + int i, ret; + + ret = task_get_notification(ct->task); + if (ret == -E_GUI_SIGCHLD && exec_pid > 0) { + int exit_status; + if (waitpid(exec_pid, &exit_status, WNOHANG) == exec_pid) { + exec_pid = 0; + init_curses(); + PARA_INFO_LOG("command exit status: %d", exit_status); + print_in_bar(COLOR_MSG, " "); + } } - if (mode == GETCH_MODE || mode == COMMAND_MODE) - para_fd_set(STDIN_FILENO, &rfds, &max_fileno); - ret = para_select(max_fileno + 1, &rfds, NULL, &tv); - if (ret <= 0) - goto check_return; /* skip fd checks */ - /* signals */ - ret = para_next_signal(&rfds); - if (ret > 0) - handle_signal(ret); - /* read command pipe if ready */ - if (mode == COMMAND_MODE) { - for (i = 0; i < 2; i++) { - size_t sz; - if (command_fds[i] < 0) - continue; - ret = read_nonblock(command_fds[i], - command_buf[i] + cbo[i], - COMMAND_BUF_SIZE - 1 - cbo[i], &rfds, &sz); - cbo[i] += sz; - sz = cbo[i]; - cbo[i] = for_each_line(flags[i], command_buf[i], cbo[i], - add_output_line, &i); - if (sz != cbo[i]) { /* at least one line found */ - wrefresh(bot.win); - flags[i] = 0; - } - if (ret < 0) { + for (i = 0; i < 2; i++) { + size_t sz; + if (exec_fds[i] < 0) + continue; + ret = read_nonblock(exec_fds[i], + ct->command_buf[i] + ct->cbo[i], + COMMAND_BUF_SIZE - 1 - ct->cbo[i], &s->rfds, &sz); + ct->cbo[i] += sz; + sz = ct->cbo[i]; + ct->cbo[i] = for_each_line(ct->flags[i], ct->command_buf[i], + ct->cbo[i], add_output_line, &i); + if (sz != ct->cbo[i]) { /* at least one line found */ + refresh_window(&bot); + ct->flags[i] = 0; + } + if (ret < 0 || exec_pid == 0) { + if (ret < 0) PARA_NOTICE_LOG("closing command fd %d: %s", i, para_strerror(-ret)); - close(command_fds[i]); - command_fds[i] = -1; - flags[i] = 0; - if (command_fds[!i] < 0) /* both fds closed */ - return 0; - } - if (cbo[i] == COMMAND_BUF_SIZE - 1) { - PARA_NOTICE_LOG("discarding overlong line"); - cbo[i] = 0; - flags[i] = FELF_DISCARD_FIRST; - } + close(exec_fds[i]); + exec_fds[i] = -1; + ct->flags[i] = 0; + ct->cbo[i] = 0; + if (exec_fds[!i] < 0) /* both fds closed */ + return 1; } - } - 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(); - } -check_return: - switch (mode) { - case COMMAND_MODE: - ret = wgetch(top.win); - if (ret != ERR && ret != KEY_RESIZE) { - if (command_fds[0] >= 0) { - close(command_fds[0]); - command_fds[0] = -1; - } - if (command_fds[1] >= 0) { - close(command_fds[1]); - command_fds[1] = -1; - } - if (cmd_pid) - kill(cmd_pid, SIGTERM); - return -1; + if (ct->cbo[i] == COMMAND_BUF_SIZE - 1) { + PARA_NOTICE_LOG("discarding overlong line"); + ct->cbo[i] = 0; + ct->flags[i] = FELF_DISCARD_FIRST; } - break; - case GETCH_MODE: - ret = wgetch(top.win); - if (ret != ERR && ret != KEY_RESIZE) - return ret; - break; - case EXTERNAL_MODE: - if (cmd_pid == 0) - return 0; } - goto repeat; + return 0; } -/* - * read from command pipe and print data to bot window - */ -static void send_output(void) +static void input_pre_select(struct sched *s, __a_unused void *context) { - int ret; + if (exec_status() != EXEC_XCMD) + para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno); + if (window_update_needed()) + sched_min_delay(s); +} + +/* read from command pipe and print data to bot window */ +static void exec_and_display(const char *file_and_args) +{ + int ret, fds[3] = {0, 1, 1}; - ret = mark_fd_nonblocking(command_fds[0]); + outputf(COLOR_COMMAND, "%s", file_and_args); + ret = para_exec_cmdline_pid(&exec_pid, file_and_args, fds); + if (ret < 0) + return; + ret = mark_fd_nonblocking(fds[1]); if (ret < 0) goto fail; - ret = mark_fd_nonblocking(command_fds[1]); + ret = mark_fd_nonblocking(fds[2]); if (ret < 0) goto fail; - if (do_select(COMMAND_MODE) >= 0) - PARA_INFO_LOG("command complete"); - else - PARA_NOTICE_LOG("command aborted"); - print_in_bar(COLOR_MSG, " "); + exec_fds[0] = fds[1]; + exec_fds[1] = fds[2]; + print_in_bar(COLOR_MSG, "hit any key to abort\n"); return; fail: PARA_ERROR_LOG("%s\n", para_strerror(-ret)); - close(command_fds[0]); - close(command_fds[1]); + close(exec_fds[0]); + close(exec_fds[1]); } -static void para_cmd(char *cmd) +static void exec_para(const char *args) { - int ret, fds[3] = {0, 1, 1}; - char *c = make_message(BINDIR "/para_client -- %s", cmd); + char *file_and_args; - outputf(COLOR_COMMAND, "%s", c); - print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n"); - ret = para_exec_cmdline_pid(&cmd_pid, c, fds); - free(c); - if (ret < 0) - return; - command_fds[0] = fds[1]; - command_fds[1] = fds[2]; - send_output(); + file_and_args = make_message(BINDIR "/para_client -- %s", args); + exec_and_display(file_and_args); + free(file_and_args); } /* - * exec command and print output to bot win + * shutdown curses and stat pipe before executing external commands */ -static void display_cmd(char *cmd) +static void exec_external(char *file_and_args) { - int fds[3] = {0, 1, 1}; + int fds[3] = {-1, -1, -1}; - print_in_bar(COLOR_MSG, "executing display command, hit any key to abort"); - outputf(COLOR_COMMAND, "%s", cmd); - if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0) + if (exec_pid) return; - command_fds[0] = fds[1]; - command_fds[1] = fds[2]; - send_output(); + shutdown_curses(); + para_exec_cmdline_pid(&exec_pid, file_and_args, fds); } -/* - * shutdown curses and stat pipe before executing external commands - */ -static void external_cmd(char *cmd) +static void handle_command(int c) { - int fds[3] = {-1, -1, -1}; + int i; - if (cmd_pid) - return; - shutdown_curses(); - if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0) + /* first check user-defined key bindings */ + for (i = 0; i < conf.key_map_given; ++i) { + char *tmp, *handler, *arg; + + tmp = para_strdup(conf.key_map_arg[i]); + if (!split_key_map(tmp, &handler, &arg)) { + free(tmp); + return; + } + if (strcmp(tmp, km_keyname(c))) { + free(tmp); + continue; + } + if (*handler == 'd') + exec_and_display(arg); + else if (*handler == 'x') + exec_external(arg); + else if (*handler == 'p') + exec_para(arg); + else if (*handler == 'i') { + int num = find_cmd_byname(arg); + if (num >= 0) + command_list[num].handler(); + } + free(tmp); return; - do_select(EXTERNAL_MODE); - init_curses(); + } + /* not found, check internal key bindings */ + for (i = 0; command_list[i].handler; i++) { + if (!strcmp(km_keyname(c), command_list[i].key)) { + command_list[i].handler(); + return; + } + } + print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help", + km_keyname(c)); +} + +static int input_post_select(__a_unused struct sched *s, __a_unused void *context) +{ + int ret; + enum exec_status exs = exec_status(); + + if (exs == EXEC_XCMD) + return 0; + if (window_update_needed()) { + if (top.needs_update) + assert(wnoutrefresh(top.win) == OK); + if (bot.needs_update) + assert(wnoutrefresh(bot.win) == OK); + if (sep.needs_update) + assert(wnoutrefresh(sep.win) == OK); + if (sb.needs_update) + assert(wnoutrefresh(sb.win) == OK); + if (in.needs_update) + assert(wnoutrefresh(in.win) == OK); + doupdate(); + top.needs_update = bot.needs_update = sb.needs_update = + in.needs_update = sep.needs_update = false; + } + ret = wgetch(top.win); + if (ret == ERR) + return 0; + if (ret == KEY_RESIZE) { + if (curses_active()) { + shutdown_curses(); + init_curses(); + redraw_bot_win(); + } + return 0; + } + if (exs == EXEC_IDLE) + handle_command(ret); + else if (exec_pid > 0) + kill(exec_pid, SIGTERM); + return 0; +} + +static void signal_pre_select(struct sched *s, void *context) +{ + struct signal_task *st = context; + para_fd_set(st->fd, &s->rfds, &s->max_fileno); } static void print_scroll_msg(void) { unsigned lines_total, filled = ringbuffer_filled(bot_win_rb); int first_rbe = first_visible_rbe(&lines_total); + print_in_bar(COLOR_MSG, "scrolled view: %d-%d/%d\n", filled - first_rbe, filled - scroll_position, ringbuffer_filled(bot_win_rb)); } 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; @@ -1210,7 +1170,7 @@ static void com_scroll_top(void) print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n"); } -static void com_cancel_scrolling(void) +static void com_cancel_scroll(void) { if (scroll_position == 0) { @@ -1224,8 +1184,9 @@ static void com_cancel_scrolling(void) static void com_page_down(void) { unsigned lines = 0; - int i = scroll_position; - while (lines < bot.lines && --i > 0) { + int i = scroll_position, bot_lines = get_num_lines(&bot); + + while (lines < bot_lines && --i > 0) { struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i); if (!rbe) break; @@ -1243,7 +1204,7 @@ static void com_page_down(void) 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"); @@ -1252,7 +1213,7 @@ static void com_page_up(void) 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(); @@ -1262,7 +1223,7 @@ static void com_page_up(void) 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"); @@ -1272,10 +1233,10 @@ static void com_scroll_down(void) 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); + refresh_window(&bot); print_scroll_msg(); } @@ -1305,7 +1266,6 @@ static void com_scroll_up(void) break; rbe_lines = NUM_LINES(rbe->len); lines += rbe_lines; -// fprintf(stderr, "msg: %s\n", rbe->msg); wattron(bot.win, COLOR_PAIR(rbe->color)); waddstr(bot.win, "\n"); waddstr(bot.win, rbe->msg); @@ -1313,7 +1273,7 @@ static void com_scroll_up(void) break; i--; } - wrefresh(bot.win); + refresh_window(&bot); print_scroll_msg(); return; err_out: @@ -1342,30 +1302,9 @@ static void com_ll_incr(void) 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"); - return; - } - PARA_INFO_LOG("rereading command line options and config file"); - gui_cmdline_parser_ext(_argc, _argv, &conf, ¶ms); - gui_cmdline_parser_config_file(cf, &conf, ¶ms); - PARA_NOTICE_LOG("config file reloaded"); - if (check_key_map_args() < 0) - finish(EXIT_FAILURE); + reread_conf(); } static void com_help(void) @@ -1407,25 +1346,25 @@ static void com_help(void) static void com_shrink_top_win(void) { - if (top.lines <= theme.top_lines_min) { - PARA_WARNING_LOG("can not decrease top window"); + 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); - wclear(top.win); - 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) { - PARA_WARNING_LOG("can not increase top window"); + 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); - wclear(top.win); - print_all_items(); + init_wins(top_lines + 1); print_in_bar(COLOR_MSG, "increased top window"); } @@ -1436,7 +1375,7 @@ static void com_version(void) __noreturn static void com_quit(void) { - finish(0); + die(EXIT_SUCCESS, "%s", ""); } static void com_refresh(void) @@ -1445,69 +1384,16 @@ static void com_refresh(void) init_curses(); } -static void change_theme(int next) -{ - if (next) - next_theme(&theme); - else - prev_theme(&theme); - /* This seems to be needed twice, why? */ - com_refresh(); - com_refresh(); - PARA_NOTICE_LOG("new theme: %s", theme.name); -} - static void com_next_theme(void) { - change_theme(1); + theme_next(&theme); + com_refresh(); } static void com_prev_theme(void) { - change_theme(0); -} - - -static void handle_command(int c) -{ - int i; - - /* first check user's key bindings */ - for (i = 0; i < conf.key_map_given; ++i) { - char *tmp, *handler, *arg; - - tmp = para_strdup(conf.key_map_arg[i]); - if (!split_key_map(tmp, &handler, &arg)) { - free(tmp); - return; - } - if (strcmp(tmp, km_keyname(c))) { - free(tmp); - continue; - } - if (*handler == 'd') - display_cmd(arg); - else if (*handler == 'x') - external_cmd(arg); - else if (*handler == 'p') - para_cmd(arg); - else if (*handler == 'i') { - int num = find_cmd_byname(arg); - if (num >= 0) - command_list[num].handler(); - } - free(tmp); - return; - } - /* not found, check internal key bindings */ - for (i = 0; command_list[i].handler; i++) { - if (!strcmp(km_keyname(c), command_list[i].key)) { - command_list[i].handler(); - return; - } - } - print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help", - km_keyname(c)); + theme_prev(&theme); + com_refresh(); } __noreturn static void print_help_and_die(void) @@ -1519,54 +1405,90 @@ __noreturn static void print_help_and_die(void) exit(0); } -int main(int argc, char *argv[]) +static int setup_tasks_and_schedule(void) { - int ret; - char *cf; + struct exec_task exec_task = {.task = NULL}; + struct status_task status_task = {.fd = -1}; + struct input_task input_task = {.task = NULL}; + struct signal_task signal_task = {.task = NULL}; + struct sched sched = { + .default_timeout = { + .tv_sec = conf.timeout_arg / 1000, + .tv_usec = (conf.timeout_arg % 1000) * 1000, + }, + }; - _argc = argc; - _argv = argv; + exec_task.task = task_register(&(struct task_info) { + .name = "exec", + .pre_select = exec_pre_select, + .post_select = exec_post_select, + .context = &exec_task, + }, &sched); + + status_task.task = task_register(&(struct task_info) { + .name = "status", + .pre_select = status_pre_select, + .post_select = status_post_select, + .context = &status_task, + }, &sched); + + input_task.task = task_register(&(struct task_info) { + .name = "input", + .pre_select = input_pre_select, + .post_select = input_post_select, + .context = &input_task, + }, &sched); + + signal_task.fd = para_signal_init(); + para_install_sighandler(SIGINT); + para_install_sighandler(SIGTERM); + para_install_sighandler(SIGCHLD); + para_install_sighandler(SIGUSR1); + signal_task.task = task_register(&(struct task_info) { + .name = "signal", + .pre_select = signal_pre_select, + .post_select = signal_post_select, + .context = &signal_task, + }, &sched); + return schedule(&sched); +} +/** + * The main function of para_gui. + * + * \param argc Usual argument count. + * \param argv Usual argument vector. + * + * After initialization para_gui registers the following tasks to the paraslash + * scheduler: status, exec, signal, input. + * + * The status task executes the para_audioc stat command to obtain the status + * of para_server and para_audiod, and displays this information in the top + * window of para_gui. + * + * The exec task is responsible for printing the output of the currently + * running executable to the bottom window. + * + * The signal task performs suitable actions according to any signals received. + * For example it refreshes all windows on terminal size changes and resets the + * terminal on \p SIGTERM. + * + * The input task reads single key strokes from stdin. For each key pressed, it + * executes the command handler associated with this key. + * + * \return \p EXIT_SUCCESS or \p EXIT_FAILURE. + */ +int main(int argc, char *argv[]) +{ 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) { - fprintf(stderr, "can not read config file %s\n", - conf.config_file_arg); - exit(EXIT_FAILURE); - } - 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) { - fprintf(stderr, "invalid key map\n"); - exit(EXIT_FAILURE); - } - init_theme_or_die(conf.theme_arg, &theme); - top.lines = theme.top_lines_default; - setup_signal_handling(); + parse_config_file_or_die(false /* override */); bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE); setlocale(LC_CTYPE, ""); initscr(); /* needed only once, always successful */ init_curses(); - print_welcome(); - for (;;) { - print_status_bar(); - ret = do_select(GETCH_MODE); - if (!ret) - continue; - print_in_bar(COLOR_MSG, " "); - handle_command(ret); - } + return setup_tasks_and_schedule() < 0? EXIT_FAILURE : EXIT_SUCCESS; } diff --git a/gui.h b/gui.h index 8f25c767..8a469346 100644 --- a/gui.h +++ b/gui.h @@ -6,33 +6,67 @@ /** \file gui.h symbols used by gui and gui_theme */ +/** + * The foreground and background color of each status item, the decorations and + * all messages can be customized through an instance of this structure. + */ +struct gui_color_spec { + int fg; /**< Foreground color. */ + int bg; /**< Background color. */ +}; + +/** How to display one status item. */ struct stat_item_data { - const char *prefix, *postfix; - unsigned x, y, len; - int fg, bg, align; + const char *prefix; /**< Text to print before the item content. */ + const char *postfix; /**< Text to print after item content. */ + unsigned x; /**< Horizontal start coordinate for this item. */ + unsigned y; /**< Vertical start coordinate for this item. */ + unsigned len; /**< Item width, including \a prefix and \a postfix. */ + struct gui_color_spec color; /**< Foreground and background color. */ + int align; /**< How to align this item. */ }; +/** Theme definition. */ struct gui_theme { + /** Printed at startup. */ const char *name; + /** Also printed at startup. */ const char *author; - int sb_fg, sb_bg; - int cmd_fg, cmd_bg; - int output_fg, output_bg; - int msg_fg, msg_bg; - int err_msg_fg, err_msg_bg; - int welcome_fg, welcome_bg; - int sep_fg, sep_bg; - const char *sep_str; - int default_fg, default_bg; - - int top_lines_default, top_lines_min; - int lines_min, cols_min; + /** The character for the separator line. */ + char sep_char; + /** Default color, see assume_default_colors(3). */ + struct gui_color_spec dflt; + /** Default number of lines of the top window. */ + int top_lines_default; + /** Minimal admissible number of lines to display the top window. */ + int top_lines_min; + /** Minimal admissible number of lines to display this theme. */ + int lines_min; + /** Minimal admissible number of columns to display this theme. */ + int cols_min; + /** Individual status item properties. */ struct stat_item_data data[NUM_STAT_ITEMS]; + /** Color of the status bar. */ + struct gui_color_spec sb; + /** Color of the name and args of the executing process. */ + struct gui_color_spec cmd; + /** Color for stdout of the executing process. */ + struct gui_color_spec output; + /** Color for log messages of moderate severity. */ + struct gui_color_spec msg; + /** Color for severe log messages. */ + struct gui_color_spec err_msg; + /** Color for the separator line. */ + struct gui_color_spec sep; }; -void init_theme_or_die(const char *name, struct gui_theme *t); -void next_theme(struct gui_theme *); -void prev_theme(struct gui_theme *); +void theme_init(const char *name, struct gui_theme *t); +void theme_prev(struct gui_theme *t); +void theme_next(struct gui_theme *t); + +/** Status item text should be left-aligned. */ #define LEFT 1 +/** Status item text should be right-aligned. */ #define RIGHT 2 +/** Status item text should be displayed centered. */ #define CENTER 3 diff --git a/gui_theme.c b/gui_theme.c index fa63e909..b860b359 100644 --- a/gui_theme.c +++ b/gui_theme.c @@ -4,6 +4,8 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ +/** \file gui_theme.c Theme definitions. */ + #include "para.h" #include "gui.h" #include @@ -16,28 +18,26 @@ static void init_theme_simple(struct gui_theme *t) t->top_lines_min = 2; t->cols_min = 40; t->top_lines_default = 2; - t->sb_bg = COLOR_CYAN; - t->sb_fg = COLOR_BLACK; - t->cmd_bg = COLOR_WHITE; - t->cmd_fg = COLOR_BLACK; - t->output_bg = COLOR_BLUE; - t->output_fg = COLOR_WHITE; - t->msg_bg = COLOR_BLUE; - t->msg_fg = COLOR_YELLOW; - t->err_msg_bg = COLOR_RED; - t->err_msg_fg = COLOR_WHITE; - t->welcome_bg = COLOR_BLUE; - t->welcome_fg = COLOR_WHITE; - t->sep_bg = COLOR_BLUE; - t->sep_fg = COLOR_CYAN; - t->default_fg = COLOR_WHITE; - t->default_bg = COLOR_BLUE; - t->sep_str = "*"; + t->sb.bg = COLOR_CYAN; + t->sb.fg = COLOR_BLACK; + t->cmd.bg = COLOR_WHITE; + t->cmd.fg = COLOR_BLACK; + t->output.bg = COLOR_BLUE; + t->output.fg = COLOR_WHITE; + t->msg.bg = COLOR_BLUE; + t->msg.fg = COLOR_YELLOW; + t->err_msg.bg = COLOR_RED; + t->err_msg.fg = COLOR_WHITE; + t->sep.bg = COLOR_BLUE; + t->sep.fg = COLOR_CYAN; + t->dflt.fg = COLOR_WHITE; + t->dflt.bg = COLOR_BLUE; + t->sep_char = '*'; d[SI_BASENAME].prefix = ""; d[SI_BASENAME].postfix = ""; - d[SI_BASENAME].fg = COLOR_WHITE; - d[SI_BASENAME].bg = COLOR_BLUE; + d[SI_BASENAME].color.fg = COLOR_WHITE; + d[SI_BASENAME].color.bg = COLOR_BLUE; d[SI_BASENAME].align = CENTER; d[SI_BASENAME].x = 0; d[SI_BASENAME].y = 7; @@ -45,8 +45,8 @@ static void init_theme_simple(struct gui_theme *t) d[SI_STATUS].prefix = "para_server: "; d[SI_STATUS].postfix = ""; - d[SI_STATUS].fg = COLOR_WHITE; - d[SI_STATUS].bg = COLOR_BLUE; + d[SI_STATUS].color.fg = COLOR_WHITE; + d[SI_STATUS].color.bg = COLOR_BLUE; d[SI_STATUS].align = CENTER; d[SI_STATUS].x = 0; d[SI_STATUS].y = 60; @@ -54,8 +54,8 @@ static void init_theme_simple(struct gui_theme *t) d[SI_AUDIOD_STATUS].prefix = "para_audiod: "; d[SI_AUDIOD_STATUS].postfix = ""; - d[SI_AUDIOD_STATUS].fg = COLOR_WHITE; - d[SI_AUDIOD_STATUS].bg = COLOR_BLUE; + d[SI_AUDIOD_STATUS].color.fg = COLOR_WHITE; + d[SI_AUDIOD_STATUS].color.bg = COLOR_BLUE; d[SI_AUDIOD_STATUS].align = CENTER; d[SI_AUDIOD_STATUS].x = 50; d[SI_AUDIOD_STATUS].y = 60; @@ -75,29 +75,27 @@ static void init_theme_colorful_blackness(struct gui_theme *t) t->top_lines_min = 9; t->top_lines_default = 11; /* default number of lines */ - t->sb_bg = COLOR_GREEN; /* status bar background */ - t->sb_fg = COLOR_BLACK; /* status bar foreground */ - t->cmd_bg = COLOR_BLACK; - t->cmd_fg = COLOR_YELLOW; - t->output_bg = COLOR_BLACK; - t->output_fg = COLOR_CYAN; - t->msg_bg = COLOR_BLACK; - t->msg_fg = COLOR_WHITE; - t->err_msg_bg = COLOR_RED; - t->err_msg_fg = COLOR_WHITE; - t->welcome_bg = COLOR_BLUE; - t->welcome_fg = COLOR_WHITE; - t->sep_bg = COLOR_BLACK; /* color of the separator */ - t->sep_fg = COLOR_BLUE; - t->sep_str = "-"; - t->default_bg = COLOR_BLACK; - t->default_fg = COLOR_MAGENTA; + t->sb.bg = COLOR_GREEN; /* status bar background */ + t->sb.fg = COLOR_BLACK; /* status bar foreground */ + t->cmd.bg = COLOR_BLACK; + t->cmd.fg = COLOR_YELLOW; + t->output.bg = COLOR_BLACK; + t->output.fg = COLOR_CYAN; + t->msg.bg = COLOR_BLACK; + t->msg.fg = COLOR_WHITE; + t->err_msg.bg = COLOR_RED; + t->err_msg.fg = COLOR_WHITE; + t->sep.bg = COLOR_BLACK; /* color of the separator */ + t->sep.fg = COLOR_BLUE; + t->sep_char = 0; /* default (ACS_HLINE) */ + t->dflt.bg = COLOR_BLACK; + t->dflt.fg = COLOR_MAGENTA; d[SI_PLAY_TIME].prefix = ""; d[SI_PLAY_TIME].postfix = ""; - d[SI_PLAY_TIME].fg = COLOR_CYAN; - d[SI_PLAY_TIME].bg = COLOR_BLACK; + d[SI_PLAY_TIME].color.fg = COLOR_CYAN; + d[SI_PLAY_TIME].color.bg = COLOR_BLACK; d[SI_PLAY_TIME].align = CENTER; d[SI_PLAY_TIME].x = 0; d[SI_PLAY_TIME].y = 7; @@ -105,8 +103,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_BASENAME].prefix = ""; d[SI_BASENAME].postfix = ""; - d[SI_BASENAME].fg = COLOR_CYAN; - d[SI_BASENAME].bg = COLOR_BLACK; + d[SI_BASENAME].color.fg = COLOR_CYAN; + d[SI_BASENAME].color.bg = COLOR_BLACK; d[SI_BASENAME].align = LEFT; d[SI_BASENAME].x = 35; d[SI_BASENAME].y = 7; @@ -114,8 +112,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_STATUS].prefix = ""; d[SI_STATUS].postfix = " "; - d[SI_STATUS].fg = COLOR_RED; - d[SI_STATUS].bg = COLOR_BLACK; + d[SI_STATUS].color.fg = COLOR_RED; + d[SI_STATUS].color.bg = COLOR_BLACK; d[SI_STATUS].align = RIGHT; d[SI_STATUS].x = 0; d[SI_STATUS].y = 17; @@ -123,8 +121,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_STATUS_FLAGS].prefix = "("; d[SI_STATUS_FLAGS].postfix = ")"; - d[SI_STATUS_FLAGS].fg = COLOR_RED; - d[SI_STATUS_FLAGS].bg = COLOR_BLACK; + d[SI_STATUS_FLAGS].color.fg = COLOR_RED; + d[SI_STATUS_FLAGS].color.bg = COLOR_BLACK; d[SI_STATUS_FLAGS].align = LEFT; d[SI_STATUS_FLAGS].x = 11; d[SI_STATUS_FLAGS].y = 17; @@ -132,8 +130,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_IMAGE_ID].prefix = "img: "; d[SI_IMAGE_ID].postfix = ""; - d[SI_IMAGE_ID].fg = COLOR_RED; - d[SI_IMAGE_ID].bg = COLOR_BLACK; + d[SI_IMAGE_ID].color.fg = COLOR_RED; + d[SI_IMAGE_ID].color.bg = COLOR_BLACK; d[SI_IMAGE_ID].align = CENTER; d[SI_IMAGE_ID].x = 21; d[SI_IMAGE_ID].y = 17; @@ -141,8 +139,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_LYRICS_ID].prefix = "lyr: "; d[SI_LYRICS_ID].postfix = ""; - d[SI_LYRICS_ID].fg = COLOR_RED; - d[SI_LYRICS_ID].bg = COLOR_BLACK; + d[SI_LYRICS_ID].color.fg = COLOR_RED; + d[SI_LYRICS_ID].color.bg = COLOR_BLACK; d[SI_LYRICS_ID].align = CENTER; d[SI_LYRICS_ID].x = 31; d[SI_LYRICS_ID].y = 17; @@ -150,8 +148,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_FORMAT].prefix = "format: "; d[SI_FORMAT].postfix = ""; - d[SI_FORMAT].fg = COLOR_RED; - d[SI_FORMAT].bg = COLOR_BLACK; + d[SI_FORMAT].color.fg = COLOR_RED; + d[SI_FORMAT].color.bg = COLOR_BLACK; d[SI_FORMAT].align = CENTER; d[SI_FORMAT].x = 42; d[SI_FORMAT].y = 17; @@ -159,8 +157,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_NUM_PLAYED].prefix = "#"; d[SI_NUM_PLAYED].postfix = ""; - d[SI_NUM_PLAYED].fg = COLOR_RED; - d[SI_NUM_PLAYED].bg = COLOR_BLACK; + d[SI_NUM_PLAYED].color.fg = COLOR_RED; + d[SI_NUM_PLAYED].color.bg = COLOR_BLACK; d[SI_NUM_PLAYED].align = LEFT; d[SI_NUM_PLAYED].x = 60; d[SI_NUM_PLAYED].y = 17; @@ -168,8 +166,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_BITRATE].prefix = ""; d[SI_BITRATE].postfix = ""; - d[SI_BITRATE].fg = COLOR_RED; - d[SI_BITRATE].bg = COLOR_BLACK; + d[SI_BITRATE].color.fg = COLOR_RED; + d[SI_BITRATE].color.bg = COLOR_BLACK; d[SI_BITRATE].align = CENTER; d[SI_BITRATE].x = 65; d[SI_BITRATE].y = 17; @@ -177,8 +175,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_FREQUENCY].prefix = ""; d[SI_FREQUENCY].postfix = ""; - d[SI_FREQUENCY].fg = COLOR_RED; - d[SI_FREQUENCY].bg = COLOR_BLACK; + d[SI_FREQUENCY].color.fg = COLOR_RED; + d[SI_FREQUENCY].color.bg = COLOR_BLACK; d[SI_FREQUENCY].align = CENTER; d[SI_FREQUENCY].x = 78; d[SI_FREQUENCY].y = 17; @@ -186,8 +184,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_SCORE].prefix = "sc: "; d[SI_SCORE].postfix = ""; - d[SI_SCORE].fg = COLOR_RED; - d[SI_SCORE].bg = COLOR_BLACK; + d[SI_SCORE].color.fg = COLOR_RED; + d[SI_SCORE].color.bg = COLOR_BLACK; d[SI_SCORE].align = CENTER; d[SI_SCORE].x = 88; d[SI_SCORE].y = 17; @@ -195,8 +193,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_AUDIOD_STATUS].prefix = ""; d[SI_AUDIOD_STATUS].postfix = ""; - d[SI_AUDIOD_STATUS].fg = COLOR_MAGENTA; - d[SI_AUDIOD_STATUS].bg = COLOR_BLACK; + d[SI_AUDIOD_STATUS].color.fg = COLOR_MAGENTA; + d[SI_AUDIOD_STATUS].color.bg = COLOR_BLACK; d[SI_AUDIOD_STATUS].align = CENTER; d[SI_AUDIOD_STATUS].x = 0; d[SI_AUDIOD_STATUS].y = 27; @@ -204,8 +202,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_DECODER_FLAGS].prefix = "["; d[SI_DECODER_FLAGS].postfix = "]"; - d[SI_DECODER_FLAGS].fg = COLOR_MAGENTA; - d[SI_DECODER_FLAGS].bg = COLOR_BLACK; + d[SI_DECODER_FLAGS].color.fg = COLOR_MAGENTA; + d[SI_DECODER_FLAGS].color.bg = COLOR_BLACK; d[SI_DECODER_FLAGS].align = CENTER; d[SI_DECODER_FLAGS].x = 5; d[SI_DECODER_FLAGS].y = 27; @@ -213,8 +211,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_MTIME].prefix = "mod: "; d[SI_MTIME].postfix = ""; - d[SI_MTIME].fg = COLOR_MAGENTA; - d[SI_MTIME].bg = COLOR_BLACK; + d[SI_MTIME].color.fg = COLOR_MAGENTA; + d[SI_MTIME].color.bg = COLOR_BLACK; d[SI_MTIME].align = CENTER; d[SI_MTIME].x = 15; d[SI_MTIME].y = 27; @@ -222,8 +220,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_FILE_SIZE].prefix = ""; d[SI_FILE_SIZE].postfix = "kb"; - d[SI_FILE_SIZE].fg = COLOR_MAGENTA; - d[SI_FILE_SIZE].bg = COLOR_BLACK; + d[SI_FILE_SIZE].color.fg = COLOR_MAGENTA; + d[SI_FILE_SIZE].color.bg = COLOR_BLACK; d[SI_FILE_SIZE].align = CENTER; d[SI_FILE_SIZE].x = 37; d[SI_FILE_SIZE].y = 27; @@ -231,8 +229,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_CHANNELS].prefix = ""; d[SI_CHANNELS].postfix = "ch"; - d[SI_CHANNELS].fg = COLOR_MAGENTA; - d[SI_CHANNELS].bg = COLOR_BLACK; + d[SI_CHANNELS].color.fg = COLOR_MAGENTA; + d[SI_CHANNELS].color.bg = COLOR_BLACK; d[SI_CHANNELS].align = CENTER; d[SI_CHANNELS].x = 47; d[SI_CHANNELS].y = 27; @@ -240,8 +238,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_LAST_PLAYED].prefix = "lp: "; d[SI_LAST_PLAYED].postfix = ""; - d[SI_LAST_PLAYED].fg = COLOR_MAGENTA; - d[SI_LAST_PLAYED].bg = COLOR_BLACK; + d[SI_LAST_PLAYED].color.fg = COLOR_MAGENTA; + d[SI_LAST_PLAYED].color.bg = COLOR_BLACK; d[SI_LAST_PLAYED].align = CENTER; d[SI_LAST_PLAYED].x = 52; d[SI_LAST_PLAYED].y = 27; @@ -249,8 +247,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_NUM_CHUNKS].prefix = ""; d[SI_NUM_CHUNKS].postfix = "x"; - d[SI_NUM_CHUNKS].fg = COLOR_MAGENTA; - d[SI_NUM_CHUNKS].bg = COLOR_BLACK; + d[SI_NUM_CHUNKS].color.fg = COLOR_MAGENTA; + d[SI_NUM_CHUNKS].color.bg = COLOR_BLACK; d[SI_NUM_CHUNKS].align = RIGHT; d[SI_NUM_CHUNKS].x = 73; d[SI_NUM_CHUNKS].y = 27; @@ -258,8 +256,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_CHUNK_TIME].prefix = ""; d[SI_CHUNK_TIME].postfix = "ms"; - d[SI_CHUNK_TIME].fg = COLOR_MAGENTA; - d[SI_CHUNK_TIME].bg = COLOR_BLACK; + d[SI_CHUNK_TIME].color.fg = COLOR_MAGENTA; + d[SI_CHUNK_TIME].color.bg = COLOR_BLACK; d[SI_CHUNK_TIME].align = LEFT; d[SI_CHUNK_TIME].x = 84; d[SI_CHUNK_TIME].y = 27; @@ -267,8 +265,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_AMPLIFICATION].prefix = "amp:"; d[SI_AMPLIFICATION].postfix = ""; - d[SI_AMPLIFICATION].fg = COLOR_MAGENTA; - d[SI_AMPLIFICATION].bg = COLOR_BLACK; + d[SI_AMPLIFICATION].color.fg = COLOR_MAGENTA; + d[SI_AMPLIFICATION].color.bg = COLOR_BLACK; d[SI_AMPLIFICATION].align = RIGHT; d[SI_AMPLIFICATION].x = 92; d[SI_AMPLIFICATION].y = 27; @@ -276,8 +274,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_TECHINFO].prefix = ""; d[SI_TECHINFO].postfix = ""; - d[SI_TECHINFO].fg = COLOR_GREEN; - d[SI_TECHINFO].bg = COLOR_BLACK; + d[SI_TECHINFO].color.fg = COLOR_GREEN; + d[SI_TECHINFO].color.bg = COLOR_BLACK; d[SI_TECHINFO].align = CENTER; d[SI_TECHINFO].x = 0; d[SI_TECHINFO].y = 43; @@ -285,8 +283,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_TITLE].prefix = ""; d[SI_TITLE].postfix = ","; - d[SI_TITLE].fg = COLOR_GREEN; - d[SI_TITLE].bg = COLOR_BLACK; + d[SI_TITLE].color.fg = COLOR_GREEN; + d[SI_TITLE].color.bg = COLOR_BLACK; d[SI_TITLE].align = RIGHT; d[SI_TITLE].x = 0; d[SI_TITLE].y = 53; @@ -294,8 +292,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_ARTIST].prefix = " by "; d[SI_ARTIST].postfix = ""; - d[SI_ARTIST].fg = COLOR_GREEN; - d[SI_ARTIST].bg = COLOR_BLACK; + d[SI_ARTIST].color.fg = COLOR_GREEN; + d[SI_ARTIST].color.bg = COLOR_BLACK; d[SI_ARTIST].align = LEFT; d[SI_ARTIST].x = 45; d[SI_ARTIST].y = 53; @@ -303,8 +301,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_YEAR].prefix = "("; d[SI_YEAR].postfix = ")"; - d[SI_YEAR].fg = COLOR_GREEN; - d[SI_YEAR].bg = COLOR_BLACK; + d[SI_YEAR].color.fg = COLOR_GREEN; + d[SI_YEAR].color.bg = COLOR_BLACK; d[SI_YEAR].align = RIGHT; d[SI_YEAR].x = 90; d[SI_YEAR].y = 53; @@ -312,8 +310,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_ALBUM].prefix = "A: "; d[SI_ALBUM].postfix = ","; - d[SI_ALBUM].fg = COLOR_GREEN; - d[SI_ALBUM].bg = COLOR_BLACK; + d[SI_ALBUM].color.fg = COLOR_GREEN; + d[SI_ALBUM].color.bg = COLOR_BLACK; d[SI_ALBUM].align = RIGHT; d[SI_ALBUM].x = 0; d[SI_ALBUM].y = 63; @@ -321,8 +319,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_COMMENT].prefix = " C: "; d[SI_COMMENT].postfix = ""; - d[SI_COMMENT].fg = COLOR_GREEN; - d[SI_COMMENT].bg = COLOR_BLACK; + d[SI_COMMENT].color.fg = COLOR_GREEN; + d[SI_COMMENT].color.bg = COLOR_BLACK; d[SI_COMMENT].align = LEFT; d[SI_COMMENT].x = 50; d[SI_COMMENT].y = 63; @@ -330,8 +328,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_AFS_MODE].prefix = ""; d[SI_AFS_MODE].postfix = ""; - d[SI_AFS_MODE].fg = COLOR_YELLOW; - d[SI_AFS_MODE].bg = COLOR_BLACK; + d[SI_AFS_MODE].color.fg = COLOR_YELLOW; + d[SI_AFS_MODE].color.bg = COLOR_BLACK; d[SI_AFS_MODE].align = CENTER; d[SI_AFS_MODE].x = 0; d[SI_AFS_MODE].y = 77; @@ -339,8 +337,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_ATTRIBUTES_TXT].prefix = ""; d[SI_ATTRIBUTES_TXT].postfix = ""; - d[SI_ATTRIBUTES_TXT].fg = COLOR_YELLOW; - d[SI_ATTRIBUTES_TXT].bg = COLOR_BLACK; + d[SI_ATTRIBUTES_TXT].color.fg = COLOR_YELLOW; + d[SI_ATTRIBUTES_TXT].color.bg = COLOR_BLACK; d[SI_ATTRIBUTES_TXT].align = CENTER; d[SI_ATTRIBUTES_TXT].x = 0; d[SI_ATTRIBUTES_TXT].y = 87; @@ -348,8 +346,8 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_DIRECTORY].prefix = "dir: "; d[SI_DIRECTORY].postfix = ""; - d[SI_DIRECTORY].fg = COLOR_YELLOW; - d[SI_DIRECTORY].bg = COLOR_BLACK; + d[SI_DIRECTORY].color.fg = COLOR_YELLOW; + d[SI_DIRECTORY].color.bg = COLOR_BLACK; d[SI_DIRECTORY].align = CENTER; d[SI_DIRECTORY].x = 0; d[SI_DIRECTORY].y = 97; @@ -372,6 +370,7 @@ static struct theme_description themes[] = { }, }; +/** Number of elements in the \a themes array. */ #define NUM_THEMES (ARRAY_SIZE(themes)) static int current_theme_num; @@ -385,9 +384,18 @@ static void set_theme(int num, struct gui_theme *t) t->name = themes[num].name; themes[num].init(t); current_theme_num = num; + PARA_NOTICE_LOG("theme: %s\n", t->name); } -void init_theme_or_die(const char *name, struct gui_theme *t) +/** + * Initialize a theme. + * + * \param name Name of the theme to be initialized. + * \param t The function fills out this structure. + * + * This function exits if there is no theme called \a name. + */ +void theme_init(const char *name, struct gui_theme *t) { int i; @@ -402,12 +410,30 @@ void init_theme_or_die(const char *name, struct gui_theme *t) exit(EXIT_FAILURE); } -void prev_theme(struct gui_theme *t) +/** + * Activate the previous available theme. + * + * \param t Theme definition is stored here. + * + * This picks the theme that comes before the currently active one, or the last + * availabe theme, if the current one is the first. + * + * \sa \ref theme_next(). + */ +void theme_prev(struct gui_theme *t) { return set_theme(++current_theme_num, t); } -void next_theme(struct gui_theme *t) +/** + * Activate the next available theme. + * + * \param t Theme definition is stored here. + * + * This works exacly as theme_prev() but cycles forwards through the list of + * available themes. + */ +void theme_next(struct gui_theme *t) { return set_theme(--current_theme_num, t); } diff --git a/net.c b/net.c index c11f67c4..8a190dda 100644 --- a/net.c +++ b/net.c @@ -963,16 +963,18 @@ int recv_cred_buffer(int fd, char *buf, size_t size) return recv_buffer(fd, buf, size) > 0? 1 : -E_RECVMSG; } #else /* HAVE_UCRED */ + /** - * Send \p NULL-terminated buffer and Unix credentials of the current process. + * Send a buffer and the credentials of the current process to a socket. * - * \param sock The socket file descriptor. - * \param buf The buffer to be sent. + * \param sock The file descriptor of the sending socket. + * \param buf The zero-terminated buffer to send. * - * \return On success, this call returns the number of characters sent. On - * error, \p -E_SENDMSG is returned. + * \return On success, this call returns the number of bytes sent. On errors, + * \p -E_SENDMSG is returned. * - * \sa sendmsg(2), okir's Black Hats Manual. + * \sa \ref recv_cred_buffer, sendmsg(2), socket(7), unix(7), okir's Black Hats + * Manual. */ ssize_t send_cred_buffer(int sock, char *buf) { @@ -985,7 +987,7 @@ ssize_t send_cred_buffer(int sock, char *buf) /* Response data */ iov.iov_base = buf; - iov.iov_len = strlen(buf); + iov.iov_len = strlen(buf); c.pid = getpid(); c.uid = getuid(); c.gid = getgid(); @@ -1003,7 +1005,7 @@ ssize_t send_cred_buffer(int sock, char *buf) *(struct ucred *)CMSG_DATA(cmsg) = c; msg.msg_controllen = cmsg->cmsg_len; ret = sendmsg(sock, &msg, 0); - if (ret < 0) + if (ret < 0) ret = -E_SENDMSG; return ret; } @@ -1019,13 +1021,13 @@ static void dispose_fds(int *fds, unsigned num) /** * Receive a buffer and the Unix credentials of the sending process. * - * \param fd the socket file descriptor. - * \param buf the buffer to store the message. - * \param size the size of \a buffer. + * \param fd The file descriptor of the receiving socket. + * \param buf The buffer to store the received message. + * \param size The length of \a buf in bytes. * - * \return negative on errors, the user id on success. + * \return Negative on errors, the user id of the sending process on success. * - * \sa recvmsg(2), okir's Black Hats Manual. + * \sa \ref send_cred_buffer and the references given there. */ int recv_cred_buffer(int fd, char *buf, size_t size) { @@ -1058,7 +1060,7 @@ int recv_cred_buffer(int fd, char *buf, size_t size) } else if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) { - dispose_fds((int *) CMSG_DATA(cmsg), + dispose_fds((int *)CMSG_DATA(cmsg), (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int)); } diff --git a/server.c b/server.c index bcbf2404..908e039b 100644 --- a/server.c +++ b/server.c @@ -488,9 +488,7 @@ static void server_init(int argc, char **argv) parse_config_or_die(0); log_welcome("para_server"); init_ipc_or_die(); /* init mmd struct and mmd->lock */ - /* make sure, the global now pointer is uptodate */ - clock_get_realtime(now); - set_server_start_time(now); + set_server_start_time(NULL); init_user_list(user_list_file); /* become daemon */ if (conf.daemon_given) diff --git a/string.c b/string.c index 8cc7d5d7..10b6073f 100644 --- a/string.c +++ b/string.c @@ -298,24 +298,6 @@ __must_check char *para_basename(const char *name) return ret; } -/** - * Cut trailing newline. - * - * \param buf The string to be chopped. - * - * Replace the last character in \p buf by zero if it is equal to - * the newline character. - */ -void chop(char *buf) -{ - int n = strlen(buf); - - if (!n) - return; - if (buf[n - 1] == '\n') - buf[n - 1] = '\0'; -} - /** * Get the logname of the current user. * diff --git a/string.h b/string.h index b13a0d86..11ba1283 100644 --- a/string.h +++ b/string.h @@ -84,7 +84,6 @@ __must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...); __must_check __malloc char *para_strcat(char *a, const char *b); __must_check __malloc char *para_dirname(const char *name); __must_check char *para_basename(const char *name); -void chop(char *buf); __must_check __malloc char *para_logname(void); __must_check __malloc char *para_homedir(void); __malloc char *para_hostname(void); diff --git a/version.c b/version.c index 3a190e63..d81da754 100644 --- a/version.c +++ b/version.c @@ -8,9 +8,6 @@ #include "para.h" #include "version.h" - -/** \file version.h Macros for printing the version string. */ - #include "git-version.h" /** diff --git a/web/manual.m4 b/web/manual.m4 index e809c8b2..1f1c7f2a 100644 --- a/web/manual.m4 +++ b/web/manual.m4 @@ -1245,8 +1245,9 @@ chunk table and reads the meta data. The audio format handler code is linked into para_server and executed via the _add_ command. The same code is also available as a stand-alone -tool, para_afh, which can be used to print the technical data, the -chunk table and the meta data of a file. +tool, para_afh, which prints the technical data, the chunk table +and the meta data of a file. Moreover, all audio format handlers are +combined in the afh receiver which is part of para_recv and para_play. ---------- Networking diff --git a/wma.h b/wma.h index f0ba7f63..15b9c5d4 100644 --- a/wma.h +++ b/wma.h @@ -20,8 +20,14 @@ struct asf_header_info { uint32_t bit_rate; /** Further decoding information (ignored). */ uint32_t flags1; - /** Whether to use exp_vlc, bit reservoir, variable block len. */ + /** Encodes exp_vlc, bit reservoir, vbl, number of block sizes. */ uint16_t flags2; + /** Whether exponents are coded with VLC codes. */ + bool use_exp_vlc; + /** If false, a frame is equal to a superframe. */ + bool use_bit_reservoir; + /** Whether blocks are of variable or of constant size. */ + bool use_variable_block_len; }; /* wma_common.c */ diff --git a/wma_afh.c b/wma_afh.c index c429020c..65795fd8 100644 --- a/wma_afh.c +++ b/wma_afh.c @@ -257,6 +257,15 @@ static int wma_get_file_info(char *map, size_t numbytes, __a_unused int fd, afhi->frequency = ahi.sample_rate; afhi->channels = ahi.channels; afhi->header_len = ahi.header_len; + + afhi->techinfo = make_message("%s%s%s%s%s", + ahi.use_exp_vlc? "exp vlc" : "", + (ahi.use_bit_reservoir && ahi.use_exp_vlc)? ", " : "", + ahi.use_bit_reservoir? "bit reservoir" : "", + (ahi.use_variable_block_len && + (ahi.use_exp_vlc || ahi.use_bit_reservoir)? ", " : ""), + ahi.use_variable_block_len? "vbl" : "" + ); wma_make_chunk_table(map + ahi.header_len, numbytes - ahi.header_len, ahi.block_align, afhi); read_asf_tags(map, ahi.header_len, &afhi->tags); diff --git a/wma_common.c b/wma_common.c index 97cdba0a..e53cdf5e 100644 --- a/wma_common.c +++ b/wma_common.c @@ -115,6 +115,9 @@ int read_asf_header(const char *buf, int loaded, struct asf_header_info *ahi) ahi->flags2 = read_u16(start + 60); PARA_INFO_LOG("read_asf_header: flags1: %d, flag2: %d\n", ahi->flags1, ahi->flags2); + ahi->use_exp_vlc = ahi->flags2 & 0x0001; + ahi->use_bit_reservoir = ahi->flags2 & 0x0002; + ahi->use_variable_block_len = ahi->flags2 & 0x0004; return 1; } diff --git a/wmadec_filter.c b/wmadec_filter.c index 562bc251..188b0a41 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -62,17 +62,11 @@ struct private_wmadec_data { /** Information contained in the audio file header. */ struct asf_header_info ahi; struct getbit_context gb; - /** Whether to use the bit reservoir. */ - int use_bit_reservoir; - /** Whether to use variable block length. */ - int use_variable_block_len; - /** Whether to use exponent coding. */ - int use_exp_vlc; /** Whether perceptual noise is added. */ int use_noise_coding; /** Depends on number of the bits per second and the frame length. */ int byte_offset_bits; - /** Only used if use_exp_vlc is true. */ + /** Only used if ahi->use_exp_vlc is true. */ struct vlc exp_vlc; uint16_t exponent_bands[BLOCK_NB_SIZES][25]; /** The index of the first coef in high band. */ @@ -96,7 +90,7 @@ struct private_wmadec_data { int frame_len; /** log2 of frame_len. */ int frame_len_bits; - /** Number of block sizes. */ + /** Number of block sizes, one if !ahi->use_variable_block_len. */ int nb_block_sizes; /* block info */ int reset_block_lengths; @@ -180,7 +174,7 @@ static void wmadec_cleanup(struct private_wmadec_data *pwd) for (i = 0; i < pwd->nb_block_sizes; i++) imdct_end(pwd->mdct_ctx[i]); - if (pwd->use_exp_vlc) + if (pwd->ahi.use_exp_vlc) free_vlc(&pwd->exp_vlc); if (pwd->use_noise_coding) free_vlc(&pwd->hgain_vlc); @@ -314,7 +308,7 @@ static int wma_init(struct private_wmadec_data *pwd) else pwd->frame_len_bits = 11; pwd->frame_len = 1 << pwd->frame_len_bits; - if (pwd->use_variable_block_len) { + if (pwd->ahi.use_variable_block_len) { int nb_max, nb; nb = ((flags2 >> 3) & 3) + 1; if ((ahi->bit_rate / ahi->channels) >= 32000) @@ -395,7 +389,7 @@ static int wma_init(struct private_wmadec_data *pwd) pwd->frame_len, bps, bps1, high_freq, pwd->byte_offset_bits); PARA_INFO_LOG("use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n", - pwd->use_noise_coding, pwd->use_exp_vlc, pwd->nb_block_sizes); + pwd->use_noise_coding, pwd->ahi.use_exp_vlc, pwd->nb_block_sizes); compute_scale_factor_band_sizes(pwd, high_freq); /* init MDCT windows : simple sinus window */ @@ -410,7 +404,7 @@ static int wma_init(struct private_wmadec_data *pwd) if (pwd->use_noise_coding) { /* init the noise generator */ - if (pwd->use_exp_vlc) + if (pwd->ahi.use_exp_vlc) pwd->noise_mult = 0.02; else pwd->noise_mult = 0.04; @@ -484,10 +478,6 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat return ret; } - pwd->use_exp_vlc = pwd->ahi.flags2 & 0x0001; - pwd->use_bit_reservoir = pwd->ahi.flags2 & 0x0002; - pwd->use_variable_block_len = pwd->ahi.flags2 & 0x0004; - ret = wma_init(pwd); if (ret < 0) return ret; @@ -504,7 +494,7 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat wma_hgain_huffcodes, 2); } - if (pwd->use_exp_vlc) { + if (pwd->ahi.use_exp_vlc) { PARA_INFO_LOG("using exp_vlc\n"); init_vlc(&pwd->exp_vlc, EXPVLCBITS, sizeof(wma_scale_huffbits), wma_scale_huffbits, wma_scale_huffcodes, 4); @@ -850,7 +840,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd) int nb_coefs[MAX_CHANNELS]; /* compute current block length */ - if (pwd->use_variable_block_len) { + if (pwd->ahi.use_variable_block_len) { n = wma_log2(pwd->nb_block_sizes - 1) + 1; if (pwd->reset_block_lengths) { @@ -927,7 +917,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd) if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bit(&pwd->gb)) { for (ch = 0; ch < pwd->ahi.channels; ch++) { if (pwd->channel_coded[ch]) { - if (pwd->use_exp_vlc) { + if (pwd->ahi.use_exp_vlc) { ret = decode_exp_vlc(pwd, ch); if (ret < 0) return ret; @@ -1096,7 +1086,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data, buf_size = pwd->ahi.block_align; samples = data; init_get_bits(&pwd->gb, buf, buf_size); - if (pwd->use_bit_reservoir) { + if (pwd->ahi.use_bit_reservoir) { int i, nb_frames, bit_offset, pos, len; uint8_t *q;