From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 23502 invoked from network); 10 Apr 2021 16:03:55 -0000 Received: from 1ess.inri.net (216.126.196.35) by inbox.vuxu.org with ESMTPUTF8; 10 Apr 2021 16:03:55 -0000 Received: from mail-il1-f181.google.com ([209.85.166.181]) by 1ess; Fri Apr 9 01:18:47 -0400 2021 Received: by mail-il1-f181.google.com with SMTP id x12so898614ilm.2 for <9front@9front.org>; Thu, 08 Apr 2021 22:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=fKFCRsPQWExdNut3m6JmcnOu++1fuHNWu1sMdiCXwj8=; b=MOWFHEX7b2rT1SpSxaOcyOtAlc0f8vYoIYheH+HVsMrt7dyqkd8QWlJNZwXq5Zq87u EK3bvcCYIQ+Ziu6KeZBM7C25H6TOFgx8oP3KJwDl/eybMRr2jCU63+oMf1rwEbqbeec4 ApCEUyopDcA1VGjCWEb4jb7lKPwA1GhTKaU4nSAZNqivA7YWL4qvLau5Ty02iHwEUbJT gGV09ftPLvvL9bpnVCiTWSxtvAz9Cl64g1Dp9YWV2iAI9XyOb9JHn7bFLhl3fUmW1kyG xQIF6otJ9FYMgGiB4+7gi8oQHp63YlgT38cynD+ZxP3XgETdSWXXC+yGYUivBF9AEJAk +iZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=fKFCRsPQWExdNut3m6JmcnOu++1fuHNWu1sMdiCXwj8=; b=W8c4iqZOsQQ4k7/uLT0EPXEJjkfHd/OC/ApTMKrHCNUwnMZIQA5hKr0kTzFII0DUcB cgb6U/olfFvokrhnozjfcQsWNRKd9ZvdZ0a9htYT1dZh12U5odayL553NFtQ0LvAecvT q5N76vlBU4WcbUD5wc3cXwrG3UWpe7HWZHWu4SIiw3rDY5wgYSMBrx3S0Y8YSaht4HUt XL73M0K015WbCFRQADmJ+rdTKPmFo0+SYzu3b+q5Erc6CQolUi+wCAVJl8t2E+YUuTVI lFcf0/CWYtksPXyyGV9OREFWGVc0jpKhvS1xWjnuYhy7PgqAZ8C6MCNPK+DrKOq+aj87 90wQ== X-Gm-Message-State: AOAM5301GM66y7BGOFMKIM0pkUzIN0t9jhCA/hmm3ckgTXUaAGgJ/LTL mOBxFl9G9Y/JsbFMOLgEWjHE0Qihg0I= X-Google-Smtp-Source: ABdhPJyPNlTNnC50LIWP2Q8sh1DE7LX5K1Q3MmT3cNGARg21DwkDmyREjTkBhTsQWKi2R1a6hoyLCQ== X-Received: by 2002:a05:6e02:1285:: with SMTP id y5mr10206372ilq.4.1617945517635; Thu, 08 Apr 2021 22:18:37 -0700 (PDT) Return-Path: Received: from [10.0.1.7] (c-67-184-39-205.hsd1.il.comcast.net. [67.184.39.205]) by smtp.gmail.com with ESMTPSA id d2sm775277ilm.7.2021.04.08.22.18.37 for <9front@9front.org> (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Apr 2021 22:18:37 -0700 (PDT) From: Xiao-Yong Jin Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Message-Id: <954A7C66-39DC-4AA1-B51F-C9E575723FD0@gmail.com> Date: Fri, 9 Apr 2021 00:18:36 -0500 To: 9front@9front.org X-Mailer: Apple Mail (2.3654.60.0.2.21) List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: full-stack out-scaling module storage injection backend Subject: [9front] three small changes in acme from plan9port Reply-To: 9front@9front.org Precedence: bulk origin: https://github.com/9fans/plan9port/pull/493 https://github.com/9fans/plan9port/pull/489 https://github.com/9fans/plan9port/pull/461 hg diff follows: diff -r 303fbe43c06d sys/src/cmd/acme/cols.c --- a/sys/src/cmd/acme/cols.c Fri Apr 09 03:18:53 2021 +0200 +++ b/sys/src/cmd/acme/cols.c Thu Apr 08 23:50:06 2021 -0500 @@ -208,8 +208,8 @@ r1.max.y =3D r.max.y; else { r1.max.y =3D r1.min.y; - if(new > 0 && old > 0 && Dy(w->r) > = Border+font->height) - r1.max.y +=3D = (Dy(w->r)-Border-font->height)*new/old + Border + font->height; + if(new > 0 && old > 0 && Dy(w->r) > = font->height) + r1.max.y +=3D = (Dy(w->r)-font->height)*new/old + Border + font->height; } r2 =3D r1; r2.max.y =3D r2.min.y+Border; @@ -422,7 +422,7 @@ } if(j < c->nw-1){ /* no border on last window */ r.min.y =3D v->r.max.y; - r.max.y +=3D Border; + r.max.y =3D r.min.y + Border; draw(screen, r, display->black, nil, ZP); } y1 =3D r.max.y; diff -r 303fbe43c06d sys/src/cmd/acme/text.c --- a/sys/src/cmd/acme/text.c Fri Apr 09 03:18:53 2021 +0200 +++ b/sys/src/cmd/acme/text.c Thu Apr 08 23:50:06 2021 -0500 @@ -664,6 +664,7 @@ uint q0, q1; int nnb, nb, n, i; int nr; + Rune rr; Rune *rp; Text *u; =20 @@ -818,10 +819,10 @@ nr =3D 0; rp[nr++] =3D r; for(i=3D0; iq0-nnb+i); - if(r !=3D ' ' && r !=3D '\t') + rr =3D textreadc(t, t->q0-nnb+i); + if(rr !=3D ' ' && rr !=3D '\t') break; - rp[nr++] =3D r; + rp[nr++] =3D rr; } } break; /* fall through to normal code */