--- /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 7C408431FC2\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 13:03:34 -0700 (PDT)\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 l2WD0zRWcdGz for <notmuch@notmuchmail.org>;\r
+ Tue, 25 Mar 2014 13:03:28 -0700 (PDT)\r
+Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com\r
+ [209.85.212.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id C324F431FC0\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 13:03:24 -0700 (PDT)\r
+Received: by mail-wi0-f171.google.com with SMTP id hr14so2383025wib.16\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 13:03:23 -0700 (PDT)\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=VbXhcj1KD/Fx/viQT2LO3fUx6Wp7xDrCmlveWmD3TyY=;\r
+ b=IsAhFjdkcrcV6j9NjNLRfTK39TUKvOMRdz+j/7eBvzkNxDcsYbfli1/vD6dOzhjcD1\r
+ EtygqzyLb8NwPyGMHFQsCzT6TDY44kr7ZMaaeMjQwPinJZCGvdMRT9JxNamNEX6b4Faf\r
+ WVpF2KCMsbvbIb6GDZ6Vo/Dx+QbAVd3ipV0xUIIRfziutz7al+SF2V9ZUtfa0vsjmHmN\r
+ 7BVRWD8XFgTbzZzUIQ0OmMqZIKBgzyfPYgAoxzyDof/3Hww91JoJI7nuy8xdsZDyTm8O\r
+ jtp7fkZeN76QYJ8SBWw5pBtnWjouZJWh6eTqBvN7Wg83Q0Bm40SsE4uR8vObiabcV39r\r
+ 9x/w==\r
+X-Received: by 10.180.188.169 with SMTP id gb9mr24697346wic.17.1395777803721; \r
+ Tue, 25 Mar 2014 13:03:23 -0700 (PDT)\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
+ qg3sm53335450wic.10.2014.03.25.13.03.22 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Tue, 25 Mar 2014 13:03:23 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 3/3] emacs: show: make `seen' mean user viewed whole\r
+ message\r
+Date: Tue, 25 Mar 2014 20:03:13 +0000\r
+Message-Id: <1395777793-13297-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1395777793-13297-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1395777793-13297-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: Tue, 25 Mar 2014 20:03:34 -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 introduced in\r
+the previous patch.\r
+---\r
+ emacs/notmuch-show.el | 63 +++++++++++++++++++++++++++++++++++++++++++++++--\r
+ 1 file changed, 61 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 1a7de85..1abf24b 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -211,6 +211,20 @@ (defcustom notmuch-show-mark-read-tags '("-unread")\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.\r
++\r
++Enough means either the bottom of the message or a point in the\r
++message more than LINES-NEEDED lines into the message, where\r
++LINES-NEEDED is this variable if this variable is an integer and\r
++this variable times the current window height if it is a float."\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
+@@ -1532,9 +1546,54 @@ (defun notmuch-show-mark-read (&optional unread)\r
+ (apply 'notmuch-show-tag-message\r
+ (notmuch-tag-change-list notmuch-show-mark-read-tags unread))))\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)))\r
++ (unless (or (eq current 'both) (eq current top-or-bottom))\r
++ (if (not current)\r
++ (notmuch-show-set-prop :seen top-or-bottom)\r
++ (notmuch-show-set-prop :seen 'both)\r
++ (notmuch-show-mark-read)))))\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. See the\r
++`notmuch-show-seen-lines-needed' for the definition of `enough'."\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
+ (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
++We mark the top (bottom) of a message seen if the top (enough of\r
++the rest of the message) respectively have been visible in the\r
++buffer. See the `notmuch-show-seen-lines-needed' for the\r
++definition of `enough'. When both the top and bottom have been\r
++seen we mark the message read."\r
++ (save-excursion\r
++ (goto-char start)\r
++ (notmuch-show-do-message-seen start end)\r
++ (while (and (< (notmuch-show-message-bottom) end)\r
++ (notmuch-show-goto-message-next))\r
++ (notmuch-show-do-message-seen start end))\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.10.4\r
+\r
projects / notmuch-archives.git / commitdiff