import upstream bugfixes from chyvonomys, jxy, and knieriem; v9001-a05
Iris Lightshard nilix@nilfm.cc
PGP Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmI/OVsACgkQO3+8IhRO Y5jLSxAAg5cKqifmZQJXpYoaBikkr0VdWxQrjayP5XQAgFLQNzJCK2exbbwiO9+6 pIZa5EKyofqA8qc6UCnpvSJGbLxQJEokb+SlIk+DF4Nl/wdWdzMLi7vrXlBbiNqE CnD4CWKyyIveySB+dD5R+OO1V3LWJEyysXPKfUItJdeFpuYyeV4BqEo87PjNM6p7 HmuIqlc34N6F0wZPnELy6EA3GIhFYaQCM74luxLziz5hhb6OTb6Dr4WIJXcQqba2 UA5yW3pS/ifFH1z+RZVpNF/KQgIffs0Mq0teQWHgGaVEq+HBrTWEM1Zrf5Q5Cyb1 NIPQCQ/0fQZGwhfpguEQxSMKLGpab90FHik44egnCX7zajC07XwoQMYVyGEd23AA BctgL5j2s2R8n54o2VDqetN4Lul3+oBRfDIbs4uUmcBkRssC/YauNspDZGd99Fzn 2SynxdlXbdLFXPWBJ2BsVQb9OpWsBvwknOX8V+4fduPxOU3JYDrRfQwSioZcD5E4 obu2x8pX4c1125i0C3QspyTfQTHBs5aAmA5ogGHx+bGQCOphSjqhgTvgumC856du tgUtDt6ThSRuT4Y6MEeh5zvZkr7d/WfuEV7P8r0jpKSShhTSTDFN3RRGkqKweO1/ ITUi4FHH8YKU/9f3G8xpRfbrRKXD0BhwdJmHZE1jPAPVz+MMZJY= =VUpf -----END PGP SIGNATURE-----
7 files changed,
34 insertions(+),
10 deletions(-)
M
Toolbox
→
Toolbox
@@ -3,6 +3,6 @@
[ Edit 1,$-1d ] # clear win [ Edit x/^[ ]*/ a/# / ] # comment (replace # with comment prefix) [ Edit x/^[ ]*# ?/ x/# ?/d ] # uncomment (replace # with comment prefix) -[ Edit s/^[ ]//g ] # unindent +[ Edit s/^[ ][ ]//g ] # unindent [ Edit s/^/ /g ] # indent [ Edit x/[^\n]\n[^\n]/ s/\n/ / ] # join lines
M
cols.c
→
cols.c
@@ -240,7 +240,7 @@ moveto(mousectl, divpt(addpt(c->tag.scrollr.min, c->tag.scrollr.max), 2));
} void colresize(Column* c, Rectangle r) { - int i; + int i, old, new; Rectangle r1, r2; Window* w;@@ -258,6 +258,8 @@ allocimage(display, Rect(0, 0, 1, 1), screen->chan, 1, COLOR_EMPTY),
nil, ZP); r1.max.y = r.max.y; + new = Dy(r) - c->nw*(Border + font->height); + old = Dy(c->r) - c->nw * (Border + font->height); for (i = 0; i < c->nw; i++) { w = c->w[i]; w->maxlines = 0;@@ -265,8 +267,9 @@ if (i == c->nw - 1)
r1.max.y = r.max.y; else { r1.max.y = r1.min.y; - if (Dy(c->r) != 0) { - r1.max.y += (Dy(w->r) + Border) * Dy(r) / Dy(c->r); + if (new > 0 && old > 0 && Dy(w->r) > font->height) { + r1.max.y += + (Dy(w->r) - font->height) * new / old + Border + font->height; } } r1.max.y = max(r1.max.y, r1.min.y + Border + font->height);@@ -428,7 +431,7 @@ r.max.y = y1 + Dy(v->tagtop);
if (nl[j]) r.max.y += 1 + nl[j] * v->body.fr.font->height; r.min.y = winresize(v, r, c->safe, FALSE); - r.max.y += Border; + r.max.y += r.min.y + Border; draw( screen, r,
M
libframe/frselect.c
→
libframe/frselect.c
@@ -38,7 +38,7 @@ (*f->scroll)(f, -(f->r.min.y - mp.y) / (int)f->font->height - 1);
p0 = f->p1; p1 = f->p0; scrled = 1; - } else if (mp.y > f->r.max.y) { + } else if (mp.y >= f->r.max.y - 1) { (*f->scroll)(f, (mp.y - f->r.max.y) / (int)f->font->height + 1); p0 = f->p0; p1 = f->p1;
M
scripts/acls
→
scripts/acls
@@ -1,3 +1,7 @@
#!/bin/sh -export CFLAGS="-I${PLAN9}/include" -exec acme-lsp -server '(\.c)|(\.h)|(\.cc)|(\.hh)|(\.cpp)|(\.hpp)$:clangd -log=error --background-index --limit-results=500 --completion-style=bundled'+ +if [ ! -z "$1" ]; then + workspaces="-workspaces $1" +fi + +exec acme-lsp -server '(\.c)|(\.h)|(\.cc)|(\.hh)|(\.cpp)|(\.hpp)$:clangd -log=error --background-index --limit-results=500 --completion-style=bundled' ${workspaces}
A
scripts/acsls
@@ -0,0 +1,12 @@
+#!/bin/sh + +if [ -z "$1" ]; then + : +elif [ -z "$2" ]; then + workspaces="-workspaces $1" +else + workspaces="-workspaces $2" + sln="--solution $1" +fi + +exec acme-lsp --server "(\.cs)|(\.sln)|(\.csproj)$:csharp-ls ${sln}" ${workspaces}
M
scripts/agols
→
scripts/agols
@@ -1,2 +1,7 @@
#!/bin/sh -exec acme-lsp -server '([/\\]go\.mod)|([/\\]go\.sum)|(\.go)$:gopls serve' -workspaces $@+ +if [ ! -z "$1" ]; then + workspaces="-workspaces $1" +fi + +exec acme-lsp -server '([/\\]go\.mod)|([/\\]go\.sum)|(\.go)$:gopls serve' ${workspaces}