para_server: New command line option: --autoplay_delay
[paraslash.git] / sdl_gui.c
index d0b83f0..97d0573 100644 (file)
--- a/sdl_gui.c
+++ b/sdl_gui.c
@@ -43,7 +43,7 @@ static int width = 0;
 static int height = 0;
 
 extern const char *status_item_list[NUM_STAT_ITEMS];
-struct gengetopt_args_info args_info;
+struct sdl_gui_args_info args_info;
 
 #define FRAME_WIDTH 10
 #define FONT_HEIGHT 36
@@ -119,7 +119,7 @@ struct font fonts[] = {
 
 static struct stat_item stat_items[NUM_STAT_ITEMS];
 
-void para_log(__unused int ll, __unused const char* fmt,...) /* no logging */
+void para_log(__a_unused int ll, __a_unused const char* fmt,...) /* no logging */
 {
 }
 
@@ -356,7 +356,7 @@ static void init_SDL(void)
        SDL_EventState(SDL_MOUSEBUTTONUP, SDL_IGNORE);
        /* Set the window manager title bar */
        SDL_WM_SetCaption("The Gui of death that makes you blind (paraslash "
-               VERSION ")", "SFont");
+               PACKAGE_VERSION ")", "SFont");
 }
 
 /*
@@ -505,7 +505,7 @@ static SDLKey hit_key(const char *msg)
  */
 static int command_handler(void)
 {
-       FILE *pipe;
+       FILE *f;
        unsigned count = 0;
        char text[MAXLINE]="";
        char buf[MAXLINE]="";
@@ -521,15 +521,15 @@ static int command_handler(void)
        if (text[0] == '!') {
                if (text[1] == '\0')
                        return 1;
-               pipe = popen(text + 1, "r");
+               f = popen(text + 1, "r");
        } else {
                sprintf(buf, BINDIR "/para_client %s 2>&1", text);
-               pipe = popen(buf, "r");
+               f = popen(buf, "r");
        }
-       if (!pipe)
+       if (!f)
                return 0;
        fill_output_rect();
-       while(fgets(text, MAXLINE - 1, pipe)) {
+       while(fgets(text, MAXLINE - 1, f)) {
                int len;
 
                tab2space(text);
@@ -554,7 +554,7 @@ static int command_handler(void)
        update_all();
        hit_key("Hit any key to return");
 out:   fill_output_rect();
-       pclose(pipe);
+       pclose(f);
        return 1;
 }
 
@@ -585,14 +585,14 @@ SDL_Surface *load_jpg(void)
        SDL_RWops *rwop;
        int fds[3] = {0, 1, 0};
        pid_t pid;
-       FILE *pipe;
+       FILE *f;
 
        if (para_exec_cmdline_pid(&pid, args_info.pic_cmd_arg, fds) < 0)
                return NULL;
-       pipe = fdopen(fds[1], "r");
-       if (!pipe)
+       f = fdopen(fds[1], "r");
+       if (!f)
                return NULL;
-       if (!(rwop = SDL_RWFromFP(pipe, 0)))
+       if (!(rwop = SDL_RWFromFP(f, 0)))
                return NULL;
        return IMG_LoadJPG_RW(rwop);
 }
@@ -689,7 +689,7 @@ void update_status(char *buf)
  * Read stat line from pipe if pipe is ready, call update_status to
  * display information.
  */
-static int draw_status(int pipe)
+static int draw_status(int fd)
 {
        fd_set rfds;
        int ret;
@@ -698,14 +698,12 @@ static int draw_status(int pipe)
        tv.tv_sec = 0;
        tv.tv_usec = 3000000;
        FD_ZERO(&rfds);
-       FD_SET(pipe, &rfds);
-       ret = select(pipe + 1, &rfds, NULL, NULL, &tv);
-//     printf("select returned %d\n", ret);
+       FD_SET(fd, &rfds);
+       ret = para_select(fd + 1, &rfds, NULL, &tv);
        if (ret <= 0)
                return 0;
-       if (read_audiod_pipe(pipe, update_status) > 0)
+       if (read_audiod_pipe(fd, update_status) > 0)
                return 1;
-//     clear_all_items();
        free(stat_items[SI_STATUS_BAR].content);
        stat_items[SI_STATUS_BAR].content =
                para_strdup("audiod not running!?\n");
@@ -741,10 +739,10 @@ static int configfile_exists(void)
  */
 int main(int argc, char *argv[])
 {
-       int i, ret, pipe;
+       int i, ret, fd = -1;
        SDLKey sym;
 
-       cmdline_parser(argc, argv, &args_info);
+       sdl_gui_cmdline_parser(argc, argv, &args_info);
        ret = configfile_exists();
 //     printf("w=%i,h=%i,ret=%i, cf=%s\n", width, height, ret, args_info.config_file_arg);
 
@@ -754,14 +752,13 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
        if (ret)
-               cmdline_parser_configfile(args_info.config_file_arg,
+               sdl_gui_cmdline_parser_configfile(args_info.config_file_arg,
                        &args_info, 0, 0, 0);
        signal(SIGCHLD, SIG_IGN);
        width = args_info.width_arg;
        height = args_info.height_arg;
 //     printf("w=%i,h=%i,ret=%i, cf=%s\n", width, height, ret, args_info.config_file_arg);
        init_stat_items();
-       pipe = para_open_audiod_pipe(args_info.stat_cmd_arg);
        init_SDL();
        for (i = 0; fonts[i].name[0]; i++) {
                char buf[MAXLINE];
@@ -777,10 +774,15 @@ int main(int argc, char *argv[])
                update_input();
        }
        for (;;) {
-               ret = draw_status(pipe);
+               if (fd < 0) {
+                       fd = para_open_audiod_pipe(args_info.stat_cmd_arg);
+                       if (fd < 0)
+                               clean_exit(EXIT_FAILURE);
+               }
+               ret = draw_status(fd);
                if (ret < 0) {
-                       close(pipe);
-                       pipe = -1;
+                       close(fd);
+                       fd = -1;
                }
                if (SDL_QuitRequested())
                        clean_exit(0);
@@ -804,12 +806,6 @@ int main(int argc, char *argv[])
                                || sym == SDLK_COMPOSE
                                )
                                continue;
-                       if (pipe < 0) {
-//                             printf("closing pipe\n");
-                               kill(0, SIGINT);
-                               close(pipe);
-//                             printf("pipe closed\n");
-                       }
                        fill_input_rect();
                        update_input();
                        if (!command_handler())
@@ -818,7 +814,6 @@ int main(int argc, char *argv[])
                        print_help();
                        update_pic();
                        SDL_UpdateRect(screen, 0, 0, 0, 0);
-                       pipe = para_open_audiod_pipe(args_info.stat_cmd_arg);
                        break;
                }
        }