From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: eww: display page source (was: eww.el: Patch to cache the parse tree) Date: Wed, 04 Dec 2013 11:46:54 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87siu81s3l.fsf_-_@flea.lifelogs.com> References: Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1386175581 20348 80.91.229.3 (4 Dec 2013 16:46:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Dec 2013 16:46:21 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 04 17:46:25 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VoFaj-0001dc-4P for ged-emacs-devel@m.gmane.org; Wed, 04 Dec 2013 17:46:25 +0100 Original-Received: from localhost ([::1]:49241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoFai-0000tL-P8 for ged-emacs-devel@m.gmane.org; Wed, 04 Dec 2013 11:46:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoFaZ-0000s2-7y for emacs-devel@gnu.org; Wed, 04 Dec 2013 11:46:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoFaR-0003rm-SP for emacs-devel@gnu.org; Wed, 04 Dec 2013 11:46:15 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:47063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoFaR-0003qp-KY for emacs-devel@gnu.org; Wed, 04 Dec 2013 11:46:07 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VoFaL-0001N2-9L for emacs-devel@gnu.org; Wed, 04 Dec 2013 17:46:01 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 04 Dec 2013 17:46:01 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 04 Dec 2013 17:46:01 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 94 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:bKE8YOTvbzewrsSKocOwfLg4xoA= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:166084 Archived-At: --=-=-= Content-Type: text/plain Lars, since you're in a generous mood ;) Here's a patch to display the current page's HTML source. Can you see if it's acceptable? I used the `eww-current-dom' code as a guide to where to put the stateful data. Thanks Ted --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=eww-display-source.patch === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2013-12-03 04:54:17 +0000 +++ lisp/net/eww.el 2013-12-04 16:43:02 +0000 @@ -117,6 +117,7 @@ (defvar eww-current-url nil) (defvar eww-current-dom nil) +(defvar eww-current-source nil) (defvar eww-current-title "" "Title of current page.") (defvar eww-history nil) @@ -247,6 +248,7 @@ (list 'base (list (cons 'href url)) (libxml-parse-html-region (point) (point-max)))))) + (setq eww-current-source (buffer-substring (point) (point-max))) (eww-setup-buffer) (setq eww-current-dom document) (let ((inhibit-read-only t) @@ -375,6 +377,14 @@ (unless (eq major-mode 'eww-mode) (eww-mode))) +(defun eww-view-source () + (let ((buf (get-buffer-create "*eww-source*")) + (source eww-current-source)) + (with-current-buffer buf + (delete-region (point-min) (point-max)) + (insert (or eww-current-source "no source"))) + (view-buffer buf))) + (defvar eww-mode-map (let ((map (make-sparse-keymap))) (suppress-keymap map) @@ -395,6 +405,7 @@ (define-key map "d" 'eww-download) (define-key map "w" 'eww-copy-page-url) (define-key map "C" 'url-cookie-list) + (define-key map "v" 'eww-view-source) (define-key map "b" 'eww-add-bookmark) (define-key map "B" 'eww-list-bookmarks) @@ -411,6 +422,7 @@ :active (not (zerop eww-history-position))] ["Browse with external browser" eww-browse-with-external-browser t] ["Download" eww-download t] + ["View page source" eww-view-source] ["Copy page URL" eww-copy-page-url t] ["Add bookmark" eww-add-bookmark t] ["List bookmarks" eww-copy-page-url t] @@ -424,6 +436,7 @@ ;; FIXME? This seems a strange default. (set (make-local-variable 'eww-current-url) 'author) (set (make-local-variable 'eww-current-dom) nil) + (set (make-local-variable 'eww-current-source) nil) (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url) (set (make-local-variable 'after-change-functions) 'eww-process-text-input) (set (make-local-variable 'eww-history) nil) @@ -437,6 +450,7 @@ :title eww-current-title :point (point) :dom eww-current-dom + :source eww-current-source :text (buffer-string)) eww-history)) @@ -468,6 +482,7 @@ (let ((inhibit-read-only t)) (erase-buffer) (insert (plist-get elem :text)) + (setq eww-current-source (plist-get elem :source)) (setq eww-current-dom (plist-get elem :dom)) (goto-char (plist-get elem :point)) (setq eww-current-url (plist-get elem :url) --=-=-=--