Re: [9front] patch: faces -c remove faces on click

["Sigrid Solveig Haflínudóttir" <ftrvxmtrx@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 16 bytes --]

Merged, thanks!

[-- Attachment #2: Type: text/plain, Size: 5183 bytes --]

Delivered-To: ftrvxmtrx@gmail.com
Received: by 2002:ab0:548c:0:0:0:0:0 with SMTP id p12csp344552uaa;
        Fri, 4 Dec 2020 00:28:56 -0800 (PST)
X-Google-Smtp-Source: ABdhPJwSK/I+OKON0NVUK5PSaL42xvQWqWpbMj/Wv/6bSnYlNldocny6s9fOqpEPZr18LlgWII0F
X-Received: by 2002:a63:c43:: with SMTP id 3mr6657598pgm.222.1607070536036;
        Fri, 04 Dec 2020 00:28:56 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1607070536; cv=none;
        d=google.com; s=arc-20160816;
        b=ZaXlkYewZ7C8r6izRybyuv3fs47WH4SHvhrCJMcq8BLQZ0NOwrMYJMViTKKuyHtIjY
         RkAjan1sO6ku9vwY+BuaJbJ4nxx2Ef7boaNTz0Tqtas4tUMEFmuCk0oUSoGrkCIje8zW
         schJq52CHx2sQe7aYwaoBxNcPey4TRso4lhbtIisVyvtz2TsTbbR6l1enRt+gb+uy7/q
         wjmbXpvLu7Fz0o1NtDdIf/hF/ZZpBJIgHYxHO01pQz+uXxqHhGWGzh/S1JaeJ5KovQ89
         UKWAV2Rg8bwUG5wNGoCxRIDOY3RwoQpAQQmWCKB2dC7bS64HbOE+jw2Q+oIdUuST0RHM
         MKCg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=precedence:reply-to:subject:list-help:list-id:mime-version
         :in-reply-to:from:date:to:message-id;
        bh=xgyzxMPD0K/3Oga5nxMlVlei8YDk84bAuI+5ZgMxML0=;
        b=WG1HmcGTs9juAj272Mk1mkTGA3MVGIWz8zIbtw3EsrNT/xA3Bp5rSMScuckrrAPY+T
         BnubmTd50jKes7naysut00KAvrGZ1H4FhsWgcexnPTVMbHCgVSPjTLuThI5zJMl5dfHa
         rttj0sMjF9rcoUi9mp0pm7YXEHuLib0CTZYl/rlhB3e7oULahxGHSpeGhRqvV6/UDMPj
         k6mW/1X6mA516a8Ypu2JHcFINfKKKXPeSL/VSo4flaN0E2STJvG21Ay9BsQAezGRAZoh
         MhJCfaM2ZSkC2gn5JoC+Hiz8/lBuSC3mtt8IoBSG+w+8XdU+7uX53d0ocYvby56K6831
         Xy0Q==
ARC-Authentication-Results: i=1; mx.google.com;
       spf=pass (google.com: domain of 9front-bounces@ewsd.inri.net designates 107.191.116.128 as permitted sender) smtp.mailfrom=9front-bounces@ewsd.inri.net;
       dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sirjofri.de
Return-Path: <9front-bounces@ewsd.inri.net>
Received: from ewsd.inri.net (ewsd.inri.net. [107.191.116.128])
        by mx.google.com with ESMTP id x12si1531143plb.237.2020.12.04.00.28.52;
        Fri, 04 Dec 2020 00:28:56 -0800 (PST)
Received-SPF: pass (google.com: domain of 9front-bounces@ewsd.inri.net designates 107.191.116.128 as permitted sender) client-ip=107.191.116.128;
Authentication-Results: mx.google.com;
       spf=pass (google.com: domain of 9front-bounces@ewsd.inri.net designates 107.191.116.128 as permitted sender) smtp.mailfrom=9front-bounces@ewsd.inri.net;
       dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sirjofri.de
Received: from oat.nine.sirjofri.de ([5.45.105.127]) by ewsd; Fri Dec  4 03:28:47 -0500 2020
Message-ID: <986B00BF344BEA5138FCE87D1E515963@sirjofri.de>
To: 9front@9front.org
Date: Fri, 04 Dec 2020 09:28:34 +0100
From: sirjofri+ml-9front@sirjofri.de
In-Reply-To: <609D21C8EF9760D5791F1710BBF1CA12@sirjofri.de>
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="upas-ddndvuuvikhujjnyzbhwqzliqo"
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: managed social NoSQL-based service 
Subject: Re: [9front] patch: faces -c remove faces on click
Reply-To: 9front@9front.org
Precedence: bulk

This is a multi-part message in MIME format.
--upas-ddndvuuvikhujjnyzbhwqzliqo
Content-Disposition: inline
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit

hello again,

I guess this is the final patch version, this time with an updated
'usage' message.

So in total we have:

- The change itself.
- Notes in the man page.
- Updated 'usage' message.

sirjofri
.


--upas-ddndvuuvikhujjnyzbhwqzliqo
Content-Disposition: inline
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit

diff -r 73caf2698436 sys/man/1/faces
--- a/sys/man/1/faces	Tue Dec 01 09:23:16 2020 +0100
+++ b/sys/man/1/faces	Fri Dec 04 09:24:34 2020 +0100
@@ -4,7 +4,7 @@
 .SH SYNOPSIS
 .B faces
 [
-.B -ih
+.B -ihc
 ] [
 .B -m
 .I maildir
@@ -86,6 +86,12 @@
 .B -m
 flags may be used to watch multiple mailboxes.
 .PP
+Starting
+.I faces
+with the
+.B -c
+flag allows the user to remove faces with a click with button 1.
+.PP
 The
 .B -h
 flag causes a different, venerable behavior in which
diff -r 73caf2698436 sys/src/cmd/faces/main.c
--- a/sys/src/cmd/faces/main.c	Tue Dec 01 09:23:16 2020 +0100
+++ b/sys/src/cmd/faces/main.c	Fri Dec 04 09:24:34 2020 +0100
@@ -9,6 +9,7 @@
 
 int	history = 0;	/* use old interface, showing history of mailbox rather than current state */
 int	initload = 0;	/* initialize program with contents of mail box */
+int	clickrm = 0;	/* allows removing mail faces by left clicking */
 
 enum
 {
@@ -600,7 +601,7 @@
 		}else{
 			for(i=first; i<last; i++)	/* clear vwhois faces */
 				if(ptinrect(p, facerect(i-first)) 
-				&& strstr(faces[i]->str[Sshow], "/XXXvwhois")){
+				&& (clickrm || strstr(faces[i]->str[Sshow], "/XXXvwhois"))){
 					delface(i);
 					flushimage(display, 1);
 				}
@@ -675,7 +676,7 @@
 void
 usage(void)
 {
-	fprint(2, "usage: faces [-hi] [-m maildir]\n");
+	fprint(2, "usage: faces [-chi] [-m maildir]\n");
 	exits("usage");
 }
 
@@ -695,6 +696,9 @@
 		addmaildir(EARGF(usage()));
 		maildir = nil;
 		break;
+	case 'c':
+		clickrm++;
+		break;
 	default:
 		usage();
 	}ARGEND
--upas-ddndvuuvikhujjnyzbhwqzliqo--