From: Mark Walters Date: Sat, 1 Jun 2013 08:15:47 +0000 (+0100) Subject: [PATCH v4 5/5] emacs: show: implement lazy hidden part handling X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=535dc6ee75c816ec11e963d8090f6e12170558c0;p=notmuch-archives.git [PATCH v4 5/5] emacs: show: implement lazy hidden part handling --- diff --git a/5f/d67f39055e7501495c7e8d9cb8bcac268d84c8 b/5f/d67f39055e7501495c7e8d9cb8bcac268d84c8 new file mode 100644 index 000000000..ff0e8be8a --- /dev/null +++ b/5f/d67f39055e7501495c7e8d9cb8bcac268d84c8 @@ -0,0 +1,176 @@ +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 E9EC342116D + for ; Sat, 1 Jun 2013 01:16:53 -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 NWBljEH5EoLP for ; + Sat, 1 Jun 2013 01:16:49 -0700 (PDT) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 15AD4429E5E + for ; Sat, 1 Jun 2013 01:16:33 -0700 (PDT) +Received: by mail-wi0-f181.google.com with SMTP id hi5so1312198wib.2 + for ; Sat, 01 Jun 2013 01:16:32 -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=Rq5NklWAD0VVhzpV/+U8P4T4nd4wtNuNte8P76DGJH8=; + b=GhAQT/nRH70leGopmj8htAOztMB/K5pj3u51q8qTLYCKdW0CHFFnAZgvlUF+dH78EO + lKUP4m+aAsNKQzHeHfH8dZWL0LvBpcRSmKvpbhY0r7QV9Qo1oiV+ruaV2s457uKoCUcH + +ycNCXeVPAJlLXwAzKw4Sh67/MDHlOICLBxggeNRNvgo26xeP0/wF36ufnzBgakS5lE5 + xLcRLCImQd8gP5E+N/6WT7fQc1+WmK/3U3brfJn3xwxuLfIOzFBp2yq+ebb1dewGtCrJ + CBYwDIRBS2nmzdk8hBnHp3TkKjk+e7Qx2sWI8nZATJvvLA4rcT/vdTDwckngs9UJKvcN + S2wA== +X-Received: by 10.180.149.171 with SMTP id ub11mr6103987wib.40.1370074592887; + Sat, 01 Jun 2013 01:16:32 -0700 (PDT) +Received: from localhost (94.197.247.227.threembb.co.uk. [94.197.247.227]) + by mx.google.com with ESMTPSA id m3sm8618664wij.5.2013.06.01.01.16.29 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 01 Jun 2013 01:16:32 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, Austin Clements , + Adam Wolfe Gordon +Subject: [PATCH v4 5/5] emacs: show: implement lazy hidden part handling +Date: Sat, 1 Jun 2013 09:15:47 +0100 +Message-Id: <1370074547-24677-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1370074547-24677-1-git-send-email-markwalters1009@gmail.com> +References: <1370074547-24677-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: Sat, 01 Jun 2013 08:16:54 -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 | 52 ++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 45 insertions(+), 7 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 49f85ba..92f481b 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -488,12 +488,14 @@ message at DEPTH in the current thread." + ;; return button + button)) + +-;; 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)) +@@ -509,7 +511,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))))) + + ;; MIME part renderers + +@@ -807,6 +817,28 @@ 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. + +@@ -825,7 +857,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)))) + (content-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)) +@@ -2009,8 +2045,10 @@ is destroyed when FN returns." + (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) + (call-interactively notmuch-show-part-button-default-action)))) + + (defun notmuch-show-save-part () +-- +1.7.10.4 +