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 30498 invoked from network); 2 Feb 2021 06:54:27 -0000
Received: from 1ess.inri.net (216.126.196.35)
  by inbox.vuxu.org with ESMTPUTF8; 2 Feb 2021 06:54:27 -0000
Received: from mail-wr1-f43.google.com ([209.85.221.43]) by 1ess; Mon Feb  1 14:06:10 -0500 2021
Received: by mail-wr1-f43.google.com with SMTP id a1so17847558wrq.6
        for <9front@9front.org>; Mon, 01 Feb 2021 11:06:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:message-id:to:subject:date:mime-version
         :content-transfer-encoding;
        bh=NWRAhz35pdQ+uFglwRaJqkqYQzv+1SSE1Lr1cWSVd1M=;
        b=lYn6n9ZNJz7dSOw+bmYRUvrA1eVoCpJgR6wbKPalfqFwqd8tmdDaa8/FrwXCCes/cV
         zsnFQd/9NfUXxsuITTseVE41dFOBnxIi9FL0gkQnRQno9NzmXHODAPAf/8c+dkCzvuVc
         Wpy55dUuACjU2uzVHKhzoDyXYB8din7kL4HsYRNF5V9U7RjTI+YXIRGeLn7VKHIpe9iz
         HHn10FI/rp3g33ZI+9JVN+Ty+0CvlAd2QiRxDN6QNQ1+zKs6ZboiAQTj4QmK70fphVcA
         MAxuxC87iqk82NyBEtizrwNsmP/+SXmqQ2KlCMjHmtH/xHiXPVWbJDQtIamAR6f1bJdR
         GKFw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:message-id:to:subject:date:mime-version
         :content-transfer-encoding;
        bh=NWRAhz35pdQ+uFglwRaJqkqYQzv+1SSE1Lr1cWSVd1M=;
        b=Ihnt8NnK+2KkjgyteJCU+Wy9upZYr7MgmrFPB2QjdAJnLPK5wr7Ko6HPDSXzEulYDk
         RRAEjg1y4nRullr983VIc4ufe2LFrCkpYpX3kKnLr2XEdPl44PrlgO2mq2VVw2OAfIuf
         tzsJnMdcuPvsQ5ZYzV46zECbVr0Doz2iOmmP7nmLEog5wSXbe4uEDsbX7IJjOT8BL1+D
         /WYkygGlHLTs9DfU7c7EReXklICUPUiG4h1PBJFtg+6U6YKpem170KmKZJOBtzSwjByL
         Iy9QrY76FJ3nGO8reDb872EwGCw84AXLmVkilQvgEZBA5jtxmmCszKePsFtP8CXFYtZ4
         +PfA==
X-Gm-Message-State: AOAM532FwAQqD1zjWcvorFSOgTDlR6pAjgAQjkUCgIh2ORDPpyxRAhIL
	OyCgqIndlwTPT9DwMcA2wP0=
X-Google-Smtp-Source: ABdhPJwwLdkRYB1EO3IL/Fc/1clHA7iLaZEbbDnf1LR7ndQgnU2FV+T/2kdPItua/k4FiuEtOvu67A==
X-Received: by 2002:adf:b64f:: with SMTP id i15mr19158996wre.279.1612206361008;
        Mon, 01 Feb 2021 11:06:01 -0800 (PST)
Return-Path: <telephil9@gmail.com>
Received: from hades (lfbn-idf1-1-101-190.w82-124.abo.wanadoo.fr. [82.124.189.190])
        by smtp.gmail.com with ESMTPSA id n4sm27758445wrt.47.2021.02.01.11.06.00
        (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256);
        Mon, 01 Feb 2021 11:06:00 -0800 (PST)
From: telephil9@gmail.com
X-Google-Original-From: pme@gmail.com
Message-ID: <EC4093E7F4DDFBEBFE5F79F6D7E91ADB@gmail.com>
To: 9front@9front.org
Date: Mon, 01 Feb 2021 20:05:58 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: open-source firewall grid software interface 
Subject: [9front] [PATCH] winwatch: always reflow when possible
Reply-To: 9front@9front.org
Precedence: bulk

Hi

Currently winwatch does not reflow its content unless there is the need to 
add a new row or column.
This leads to the rectangles not filling the window and leaving unused blank spaces.
The patch below changes this behaviour by reflowing as soon as the number of rows or
columns changes.

--phil


diff -r f020e57da8d6 sys/src/cmd/winwatch.c
--- a/sys/src/cmd/winwatch.c	Thu Dec 17 20:26:38 2020 -0800
+++ b/sys/src/cmd/winwatch.c	Mon Feb 01 20:01:23 2021 +0100
@@ -185,19 +185,21 @@
 int
 geometry(void)
 {
-	int i, ncols, z;
+	int i, nrows, ncols, z;
 	Rectangle r;
 
 	z = 0;
-	rows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD);
-	if(rows <= 0)
-		rows = 1;
-	if(rows*cols < nwin || rows*cols >= nwin*2){
-		ncols = nwin <= 0 ? 1 : (nwin+rows-1)/rows;
-		if(ncols != cols){
-			cols = ncols;
-			z = 1;
-		}
+	nrows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD);
+	if(nrows <= 0)
+		nrows = 1;
+	if(nrows != rows){
+		rows = nrows;
+		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);