RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

LibC: Add ws_xpixel and ws_ypixel members to struct winsize

Browse source 
This matches what other systems have, although we don't use them.
Gets rid of one dropbear patch. :^)
This commit is contained in:
Andreas Kling 2020-06-08 21:40:22 +02:00
parent 53d4c7e207
commit 3ee1b3cbd4
2 changed files with 2 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibC/sys/ioctl_numbers.h
View file

@ -33,6 +33,8 @@ __BEGIN_DECLS
struct winsize { struct winsize {
unsigned short ws_row; unsigned short ws_row;
unsigned short ws_col; unsigned short ws_col;
unsigned short ws_xpixel;
unsigned short ws_ypixel;
}; };
struct FBResolution { struct FBResolution {

30
Ports/dropbear/patches/winsize-remove-pixels.patch
View file

@ -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 */
}