terminal: Make -f (fullscreen) option work again

13 years ago · 547da5afc9
parent 37f27d59cd
commit 547da5afc9
2 changed files with 5 additions and 2 deletions
--- 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;
--- 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) {