From 09b469768be4e86bb0474d0947dcc90edff2f64a Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Fri, 31 May 2013 19:26:46 +0100 Subject: [PATCH] [PATCH v3 5/5] emacs: show: implement lazy hidden part handling --- 73/745aba963ba4039a2d249cfd8f7f0ede16750e | 175 ++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 73/745aba963ba4039a2d249cfd8f7f0ede16750e diff --git a/73/745aba963ba4039a2d249cfd8f7f0ede16750e b/73/745aba963ba4039a2d249cfd8f7f0ede16750e new file mode 100644 index 000000000..07c4dd70f --- /dev/null +++ b/73/745aba963ba4039a2d249cfd8f7f0ede16750e @@ -0,0 +1,175 @@ +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 3092D429E36 + for ; Fri, 31 May 2013 11:28:05 -0700 (PDT) +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 mci010VWFw0l for ; + Fri, 31 May 2013 11:27:59 -0700 (PDT) +Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com + [74.125.82.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 2E617429E3B for ; Fri, 31 May 2013 11:27:32 -0700 + (PDT) +Received: by mail-wg0-f53.google.com with SMTP id m15so1553304wgh.32 + for ; Fri, 31 May 2013 11:27:29 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=IuIe4mwfDyMwaQwCcWABdB9oL3+L73163B+Jf0Tp0GA=; + b=yLRwrocXfx5X+6G/DK2djvvtJUGRFwD2kQ8A6hgeFwrDbsjphG4PXNbvFbRc4M/KYW + aNqVJV0vtn93mfmYw8aPEITSTx/MvX1twm5GRFoB3eAhUTCR3icXZkvWrvs95tUpEFiS + IQA4G2d+Kjh07l/yaA/3NhE/6VjWkflDko8MaroeSYods65KBKEf9eMUt+Nvk/v+qxXm + SpRpxzBswt0zzywKACdTjnonJUE00osXH+bw738b4ffcToBrLO3NqTYGJVY5ZiDIOw99 + xcev6kkQDJdC2s35vGa/IMN9XiE3MtgX5o2KC/jxfvKo460oCJUxoUZshpJ/U5YfVj3E + DXAw== +X-Received: by 10.180.90.70 with SMTP id bu6mr4471531wib.34.1370024849570; + Fri, 31 May 2013 11:27:29 -0700 (PDT) +Received: from localhost (92.40.240.237.threembb.co.uk. [92.40.240.237]) + by mx.google.com with ESMTPSA id en3sm5745427wid.1.2013.05.31.11.27.27 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 31 May 2013 11:27:28 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, Austin Clements , + Adam Wolfe Gordon +Subject: [PATCH v3 5/5] emacs: show: implement lazy hidden part handling +Date: Fri, 31 May 2013 19:26:46 +0100 +Message-Id: <1370024806-6616-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1370024806-6616-1-git-send-email-markwalters1009@gmail.com> +References: <1370024806-6616-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: Fri, 31 May 2013 18:28:05 -0000 + +This adds the actual code to do the lazy insertion of hidden parts. + +We use a memory inefficient but simple method: when we come to insert +the part if it is hidden we just store all of the arguments to the +part insertion function as a button property. This means when we want +to show the part we can just resume where we left off. + +One thing is that we can't tell if a lazy part will produce text until +we try to render it so when unhiding a part we check to see if it +rendered; if not we invoke the default part handler (e.g. an external +viewer). +--- + emacs/notmuch-show.el | 51 ++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 44 insertions(+), 7 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 89199e8..4999b94 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -550,12 +550,14 @@ message at DEPTH in the current thread." + (let ((handle (mm-make-handle (current-buffer) (list content-type)))) + (mm-pipe-part handle)))) + +-;; This is taken from notmuch-wash: maybe it should be unified? + (defun notmuch-show-toggle-part-invisibility (&optional button) + (interactive) + (let* ((button (or button (button-at (point)))) +- (overlay (button-get button 'overlay))) +- (when overlay ++ (overlay (button-get button 'overlay)) ++ (lazy-part (button-get button :notmuch-lazy-part))) ++ ;; We have a part to toggle if there is an overlay or if there is a lazy part. ++ ;; If neither is present we cannot toggle the part so we just return nil. ++ (when (or overlay lazy-part) + (let* ((show (button-get button :notmuch-part-hidden)) + (new-start (button-start button)) + (button-label (button-get button :base-label)) +@@ -569,7 +571,15 @@ message at DEPTH in the current thread." + (move-overlay button new-start (point)) + (delete-region (point) old-end)) + (goto-char (min old-point (1- (button-end button)))) +- (overlay-put overlay 'invisible (not show)))))) ++ ;; Return nil if there is a lazy-part, it is empty, and we are ++ ;; trying to show it. In all other cases return t. ++ (if lazy-part ++ (when show ++ (button-put button :notmuch-lazy-part nil) ++ (notmuch-show-lazy-part lazy-part button)) ++ ;; else there must be an overlay. ++ (overlay-put overlay 'invisible (not show)) ++ t))))) + + (defun notmuch-show-multipart/*-to-list (part) + (mapcar (lambda (inner-part) (plist-get inner-part :content-type)) +@@ -865,6 +875,27 @@ message at DEPTH in the current thread." + ;; Return true if we created an overlay. + t)) + ++(defun notmuch-show-lazy-part (part-args button) ++ ;; Insert the lazy part after the button for the part. ++ (save-excursion ++ (goto-char (1+ (button-end button))) ++ (let* ((inhibit-read-only t) ++ ;; We need to use markers for the start and end of the part ++ ;; because the part insertion functions do not guarantee ++ ;; to leave point at the end of the part. ++ (part-beg (copy-marker (point) nil)) ++ (part-end (copy-marker (point) t)) ++ ;; We have to save the depth as we can't find the depth ++ ;; when narrowed. ++ (depth (notmuch-show-get-depth))) ++ (save-restriction ++ (narrow-to-region part-beg part-end) ++ (delete-region part-beg part-end) ++ (apply #'notmuch-show-insert-bodypart-internal part-args) ++ (indent-rigidly part-beg part-end depth)) ++ ;; Create the overlay. If the lazy-part turned out to be empty/not ++ ;; showable this returns nil. ++ (notmuch-show-create-part-overlays button part-beg part-end)))) + + (defun notmuch-show-insert-bodypart (msg part depth &optional hide) + "Insert the body part PART at depth DEPTH in the current thread. +@@ -883,7 +914,11 @@ If HIDE is non-nil then initially hide this part." + (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename)))) + (beg (point))) + +- (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button) ++ (if (not hide) ++ (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button) ++ (button-put button :notmuch-lazy-part ++ (list msg part mime-type nth depth button))) ++ + ;; Some of the body part handlers leave point somewhere up in the + ;; part, so we make sure that we're down at the end. + (goto-char (point-max)) +@@ -2002,8 +2037,10 @@ the user (see `notmuch-show-stash-mlarchive-link-alist')." + (defun notmuch-show-part-button-default (&optional button) + (interactive) + (let ((button (or button (button-at (point))))) +- (if (button-get button 'overlay) +- (notmuch-show-toggle-part-invisibility button) ++ ;; Try to toggle the part, if that fails then call the default ++ ;; action. The toggle fails if the part has no emacs renderable ++ ;; content. ++ (unless (notmuch-show-toggle-part-invisibility button) + (notmuch-show-part-button-internal button notmuch-show-part-button-default-action)))) + + (defun notmuch-show-part-button-save (&optional button) +-- +1.7.10.4 + -- 2.26.2