xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
Ori Bernstein 2021-02-02 07:21:47 -08:00
commit 3c1022a3de
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sys/games/lib/fortunes
View file

@ -5253,3 +5253,4 @@ Open source may not be safe if it has no super excellent moderator.
On the Internet, we are all Poland. -- Michael Hayden On the Internet, we are all Poland. -- Michael Hayden
By the way, BBCNews site makes corrupt the browser. -- Kenji By the way, BBCNews site makes corrupt the browser. -- Kenji
As much as I'd love to I feel I have to let it go -- rminnich As much as I'd love to I feel I have to let it go -- rminnich
You need a UNIX system to run SATAN.

22
sys/src/cmd/winwatch.c
View file

@ -185,19 +185,21 @@ drawwin(int i)
int int
geometry(void) geometry(void)
{ {
int i, ncols, z; int i, nrows, ncols, z;
Rectangle r; Rectangle r;
z = 0; z = 0;
rows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD); nrows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD);
if(rows <= 0) if(nrows <= 0)
rows = 1; nrows = 1;
if(rows*cols < nwin || rows*cols >= nwin*2){ if(nrows != rows){
ncols = nwin <= 0 ? 1 : (nwin+rows-1)/rows; rows = nrows;
if(ncols != cols){ z = 1;
cols = ncols; }
z = 1; ncols = nwin <= 0 ? 1 : (nwin+rows-1)/rows;
} if(ncols != cols){
cols = ncols;
z = 1;
} }
r = Rect(0,0,(Dx(screen->r)-2*MARGIN+PAD)/cols-PAD, font->height); r = Rect(0,0,(Dx(screen->r)-2*MARGIN+PAD)/cols-PAD, font->height);