From 82f1f39d432ab74a93ff430673257d7993ddce2c Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 1 Dec 2013 10:02:27 +0000 Subject: [PATCH] [PATCH WIP v2 6/6] emacs: show: make `seen' mean user viewed whole message --- 33/7621df15f62f433ae03a57cd71acef5cba50ae | 173 ++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 33/7621df15f62f433ae03a57cd71acef5cba50ae diff --git a/33/7621df15f62f433ae03a57cd71acef5cba50ae b/33/7621df15f62f433ae03a57cd71acef5cba50ae new file mode 100644 index 000000000..1ed60c2fb --- /dev/null +++ b/33/7621df15f62f433ae03a57cd71acef5cba50ae @@ -0,0 +1,173 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 12651431FAF + for ; Sun, 1 Dec 2013 02:02:53 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id gs-8y-QDBryb for ; + Sun, 1 Dec 2013 02:02:46 -0800 (PST) +Received: from mail-we0-f171.google.com (mail-we0-f171.google.com + [74.125.82.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 6F64D431FDC + for ; Sun, 1 Dec 2013 02:02:44 -0800 (PST) +Received: by mail-we0-f171.google.com with SMTP id q58so10715515wes.16 + for ; Sun, 01 Dec 2013 02:02:43 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=esAf5rtXuTzLfl/s+hyi6Yc+VwaaY0aMQpAEshwP/rE=; + b=v9zZMJzUjfAvDtWmsumEPo9BcukVQpXeYeXlGCOsP4V4XAjDBCjUKgNbXsCU1zcYGb + Q7rytRbI1xBPHlrOJj/uvrUOt6B9OMpfAhbPC3Y3y8PGNty8ibKtm66+njnASQOlISsx + CR0g5GXfenddyA86eg/BFQhJoAIe6R0k3VRTvRKHiAHfEYhB+E1XzYzc/BNpPpU88o0f + fYNSHhotgWK86xHMBlCstlmLtboXyLY+3qAGd4Wbo3ZC7XN/ZXYhIgX2xu4f/miH09zA + oi0NCTzz7bpCvMKWKQ3vikVb4dC8LZk92CGHts6et2JAjkL/0HDZnJeZBzOCoPhAag6l + QwDA== +X-Received: by 10.194.237.99 with SMTP id vb3mr49165279wjc.28.1385892163410; + Sun, 01 Dec 2013 02:02:43 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id + dn2sm110289612wid.1.2013.12.01.02.02.42 for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 01 Dec 2013 02:02:42 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH WIP v2 6/6] emacs: show: make `seen' mean user viewed whole + message +Date: Sun, 1 Dec 2013 10:02:27 +0000 +Message-Id: <1385892147-16994-7-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1385892147-16994-1-git-send-email-markwalters1009@gmail.com> +References: <1385892147-16994-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 01 Dec 2013 10:02:53 -0000 + +This changes `seen' to mean that the user viewed `enough' of the whole +message: more precisely, a message is deemed seen if the top of the +message and either the bottom of the message or a point at least some +customisable number of lines into the message have each been visible +in the buffer at some point. + +This is placed into the post-command-hook infrastructure introudced in +the previous patch. +--- + emacs/notmuch-show.el | 75 +++++++++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 73 insertions(+), 2 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 6b6e94a..a57d8fb 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -211,6 +211,19 @@ For example, if you wanted to remove an \"unread\" tag and add a + :type '(repeat string) + :group 'notmuch-show) + ++(defcustom notmuch-show-seen-lines-needed 0.75 ++ "Control which messages get marked seen. ++ ++A message is marked seen if both the top of the message and a ++point far \"enough\" down in the message have each been visible ++in the buffer at some point. This parameter controls the ++definition of enough. Seeing the bottom of message is always ++deemed enough, but additionally...it an integer n then at least n ++lines of message must be visible in the window. If it is a float ++x then at least that proportion of the window must contain the ++message." ++ :type 'number ++ :group 'notmuch-show) + + (defmacro with-current-notmuch-show-message (&rest body) + "Evaluate body with current buffer set to the text of current message" +@@ -1587,9 +1600,67 @@ we are not marking them." + (notmuch-show-mark-all-seen-read not-mark) + (notmuch-kill-this-buffer)) + ++(defun notmuch-show-update-seen (top-or-bottom) ++ "Update seen status of current message ++ ++Mark that we have seen the TOP-OR-BOTTOM of current message." ++ (let* ((current (notmuch-show-get-prop :seen-local)) ++ new) ++ (unless (eq current 'both) ++ (if (eq top-or-bottom 'top) ++ (if (eq current 'bottom) ++ (setq new 'both) ++ (setq new 'top)) ++ (if (eq current 'top) ++ (setq new 'both) ++ (setq new 'bottom))) ++ (unless (eq current new) ++ (notmuch-show-set-prop :seen-local new)) ++ (when (eq new 'both) ++ (notmuch-show-mark-seen) ++ (message "marking seen %s" (current-time)))))) ++ ++(defun notmuch-show-do-message-seen (start end) ++ "Update seen status for the current message. ++ ++A message is seen if both the top and enough of the rest of the ++message have been visible in the buffer. Enough means either the ++bottom of the message or a point in the message more than ++LINES-NEEDED lines into the message. LINES-NEEDED is ++`notmuch-show-seen-lines-needed` if that is an integer and that ++times the current window height if it is a float." ++ (let* ((lines-needed (if (integerp notmuch-show-seen-lines-needed) ++ notmuch-show-seen-lines-needed ++ (truncate (* notmuch-show-seen-lines-needed (window-body-height))))) ++ (top (notmuch-show-message-top)) ++ (bottom (notmuch-show-message-bottom))) ++ (when (notmuch-show-message-visible-p) ++ (when (>= top start) ++ (notmuch-show-update-seen 'top)) ++ (when (or (<= bottom end) ++ (> (count-screen-lines top end) lines-needed)) ++ (notmuch-show-update-seen 'bottom))))) ++ ++ + (defun notmuch-show-do-seen (start end) +- "Update seen status for all messages between start and end." +- ) ++ "Update seen status for all messages between start and end. ++ ++A message is seen if both the top and enough of the rest of the ++message have been visible in the buffer. See ++`notmuch-show-do-message-seen` for the definition of enough. Seen ++is a buffer local property. The unread status is removed from all ++seen messages when the user quits the show buffer." ++ (save-excursion ++ (goto-char start) ++ (while (and (or (notmuch-show-do-message-seen start end) t) ++ (< (notmuch-show-message-bottom) end) ++ (notmuch-show-goto-message-next))) ++ ++ ;; This is a work around because emacs gives weird answers for ++ ;; window-end if the buffer ends with invisible text. ++ (when (and (pos-visible-in-window-p (point-max)) ++ (notmuch-show-message-visible-p)) ++ (notmuch-show-update-seen 'bottom)))) + + (defun notmuch-show-command-hook () + (when (eq major-mode 'notmuch-show-mode) +-- +1.7.9.1 + -- 2.26.2