terminal: Make -f (fullscreen) option work again

diff --git a/clients/terminal.c b/clients/terminal.c
index 523358a..cee832b 100644 (file)
--- a/clients/terminal.c
+++ b/clients/terminal.c
@@ -2372,7 +2372,10 @@ terminal_run(struct terminal *terminal, const char *path)
        g_io_add_watch(terminal->channel, G_IO_IN, io_handler, terminal);
         g_io_add_watch(terminal->channel, G_IO_HUP, io_handler, terminal);
 
-       terminal_resize(terminal, 80, 24);
+       window_set_fullscreen(terminal->window, terminal->fullscreen);
+       if (!terminal->fullscreen)
+               terminal_resize(terminal, 80, 24);
+
        terminal_draw(terminal);
 
        return 0;

diff --git a/clients/window.c b/clients/window.c
index 177637e..4b712f8 100644 (file)
--- a/clients/window.c
+++ b/clients/window.c
@@ -1420,7 +1420,7 @@ window_set_fullscreen(struct window *window, int fullscreen)
 {
        int32_t width, height;
 
-       if (window->type == TYPE_FULLSCREEN)
+       if ((window->type == TYPE_FULLSCREEN) == fullscreen)
                return;
 
        if (fullscreen) {