From: Szymon Lukasz <[email protected]>
Update the terminal size upon SIGWINCH delivery.
[Filip: use DECLARE_INSTANCE_CHECKER,
qemu_chr_resize_stdio -> stdio_chr_resize,
remove notifier in char_stdio_finalize]
Signed-off-by: Szymon Lukasz <[email protected]>
Signed-off-by: Filip Hejsek <[email protected]>
Reviewed-by: Marc-André Lureau <[email protected]>
Message-ID: <[email protected]>
---
chardev/char-stdio.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index fe1cbb2d880f..f63bf413c741 100644
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -34,7 +34,9 @@
#include "chardev/char-win-stdio.h"
#else
#include <termios.h>
+#include <sys/ioctl.h>
#include "chardev/char-fd.h"
+#include "qemu/main-loop.h"
#endif
#ifndef _WIN32
@@ -46,6 +48,14 @@ static bool stdio_in_use;
static bool stdio_allow_signal;
static bool stdio_echo_state;
+typedef struct {
+ FDChardev parent;
+ Notifier resize_notifier;
+} StdioChardev;
+
+DECLARE_INSTANCE_CHECKER(StdioChardev, STDIO_CHARDEV,
+ TYPE_CHARDEV_STDIO)
+
static void term_exit(void)
{
if (stdio_in_use) {
@@ -85,8 +95,23 @@ static void term_stdio_handler(int sig)
stdio_chr_set_echo(NULL, stdio_echo_state);
}
+static void stdio_chr_resize(Chardev *chr)
+{
+ struct winsize ws;
+ if (ioctl(1, TIOCGWINSZ, &ws) != -1) {
+ qemu_chr_resize(chr, ws.ws_col, ws.ws_row);
+ }
+}
+
+static void term_resize_notify(Notifier *n, void *data)
+{
+ StdioChardev *s = container_of(n, StdioChardev, resize_notifier);
+ stdio_chr_resize(CHARDEV(s));
+}
+
static bool stdio_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
+ StdioChardev *s = STDIO_CHARDEV(chr);
ChardevStdio *opts = backend->u.stdio.data;
struct sigaction act;
@@ -121,6 +146,10 @@ static bool stdio_chr_open(Chardev *chr, ChardevBackend
*backend, Error **errp)
stdio_allow_signal = !opts->has_signal || opts->signal;
stdio_chr_set_echo(chr, false);
+ s->resize_notifier.notify = term_resize_notify;
+ sigwinch_add_notifier(&s->resize_notifier);
+ stdio_chr_resize(chr);
+
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
return true;
}
@@ -152,6 +181,9 @@ static void char_stdio_class_init(ObjectClass *oc, const
void *data)
static void char_stdio_finalize(Object *obj)
{
#ifndef _WIN32
+ StdioChardev *s = STDIO_CHARDEV(obj);
+
+ sigwinch_remove_notifier(&s->resize_notifier);
term_exit();
#endif
}
@@ -162,6 +194,7 @@ static const TypeInfo char_stdio_type_info = {
.parent = TYPE_CHARDEV_WIN_STDIO,
#else
.parent = TYPE_CHARDEV_FD,
+ .instance_size = sizeof(StdioChardev),
#endif
.instance_finalize = char_stdio_finalize,
.class_init = char_stdio_class_init,
--
2.56.0.116.g6de20f6092dc