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