From 3ee1b3cbd427f50f1d08e696d8165ba0469a5167 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 8 Jun 2020 21:40:22 +0200 Subject: [PATCH] LibC: Add ws_xpixel and ws_ypixel members to struct winsize This matches what other systems have, although we don't use them. Gets rid of one dropbear patch. :^) --- Libraries/LibC/sys/ioctl_numbers.h | 2 ++ .../patches/winsize-remove-pixels.patch | 30 ------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 Ports/dropbear/patches/winsize-remove-pixels.patch diff --git a/Libraries/LibC/sys/ioctl_numbers.h b/Libraries/LibC/sys/ioctl_numbers.h index e853b9af62..8b9491a207 100644 --- a/Libraries/LibC/sys/ioctl_numbers.h +++ b/Libraries/LibC/sys/ioctl_numbers.h @@ -33,6 +33,8 @@ __BEGIN_DECLS struct winsize { unsigned short ws_row; unsigned short ws_col; + unsigned short ws_xpixel; + unsigned short ws_ypixel; }; struct FBResolution { diff --git a/Ports/dropbear/patches/winsize-remove-pixels.patch b/Ports/dropbear/patches/winsize-remove-pixels.patch deleted file mode 100644 index 97212e1c4d..0000000000 --- a/Ports/dropbear/patches/winsize-remove-pixels.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/sshpty.c.orig -+++ b/sshpty.c -@@ -347,8 +347,6 @@ - - w.ws_row = row; - w.ws_col = col; -- w.ws_xpixel = xpixel; -- w.ws_ypixel = ypixel; - (void) ioctl(ptyfd, TIOCSWINSZ, &w); - } - ---- a/cli-chansession.c.orig -+++ b/cli-chansession.c -@@ -234,14 +234,12 @@ - /* Some sane defaults */ - ws.ws_row = 25; - ws.ws_col = 80; -- ws.ws_xpixel = 0; -- ws.ws_ypixel = 0; - } - - buf_putint(ses.writepayload, ws.ws_col); /* Cols */ - buf_putint(ses.writepayload, ws.ws_row); /* Rows */ -- buf_putint(ses.writepayload, ws.ws_xpixel); /* Width */ -- buf_putint(ses.writepayload, ws.ws_ypixel); /* Height */ -+ buf_putint(ses.writepayload, 0); /* Width */ -+ buf_putint(ses.writepayload, 0); /* Height */ - - } -