bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories.

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories.

[Kenjiro NAKAYAMA]

New command and functions to list the eww browser histories. Since eww quits only "q" command, I think it becomes useful.

Signed-off-by: Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>

	* net/eww.el
      (eww-list-histories,eww-list-histories,eww-history-browse,eww-history-quit,eww-history-kill,eww-history-mode-map,eww-history-mode):
      New command and functions to list browser histories.

---
 lisp/net/eww.el | 107 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 95 insertions(+), 12 deletions(-)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 9d1c3a2..7a9c8e2 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -410,7 +410,8 @@ word(s) will be searched for via `eww-search-prefix'."
     (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 "H" 'eww-list-histories)
+    
     (define-key map "b" 'eww-add-bookmark)
     (define-key map "B" 'eww-list-bookmarks)
     (define-key map [(meta n)] 'eww-next-bookmark)
@@ -430,6 +431,7 @@ word(s) will be searched for via `eww-search-prefix'."
 	["Copy page URL" eww-copy-page-url t]
 	["Add bookmark" eww-add-bookmark t]
 	["List bookmarks" eww-copy-page-url t]
+	["List histories" eww-list-histories t]	
 	["List cookies" url-cookie-list t]))
     map))
 
@@ -443,21 +445,12 @@ word(s) will be searched for via `eww-search-prefix'."
   (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)
-  (set (make-local-variable 'eww-history-position) 0)
+;;  (set (make-local-variable 'eww-history) nil)
+;;  (set (make-local-variable 'eww-history-position) 0)
   (buffer-disable-undo)
   ;;(setq buffer-read-only t)
   )
 
-(defun eww-save-history ()
-  (push (list :url eww-current-url
-	      :title eww-current-title
-	      :point (point)
-              :dom eww-current-dom
-              :source eww-current-source
-	      :text (buffer-string))
-	eww-history))
-
 ;;;###autoload
 (defun eww-browse-url (url &optional _new-window)
   (when (and (equal major-mode 'eww-mode)
@@ -1229,6 +1222,96 @@ Differences in #targets are ignored."
   (setq buffer-read-only t
 	truncate-lines t))
 
+;;; History code
+
+(defun eww-save-history ()
+  (push (list :url eww-current-url
+	      :title eww-current-title
+	      :point (point)
+              :dom eww-current-dom
+              :source eww-current-source
+	      :text (buffer-string))
+	eww-history))
+
+(defun eww-list-histories ()
+  "List the eww-histories."
+  (interactive)
+  (when (null eww-history)
+    (error "No eww-histories are defined"))
+  (set-buffer (get-buffer-create "*eww history*"))    
+  (eww-history-mode)
+  (let ((inhibit-read-only t)
+	(domain-length 0)
+	(title-length 0)
+	url title format start)
+    (erase-buffer)
+    (dolist (history eww-history)
+      (setq start (point))            
+      (setq domain-length (max domain-length (length (plist-get history :url))))
+      (setq title-length (max title-length (length (plist-get history :title))))
+      )
+    (setq format (format "%%-%ds %%-%ds" title-length domain-length)
+	  header-line-format
+	  (concat " " (format format "Title" "URL")))
+
+    (dolist (history eww-history)
+      (setq url (plist-get history :url))
+      (setq title (plist-get history :title))
+      (insert (format format title url))
+      (insert "\n")
+      (put-text-property start (point) 'eww-history history)
+      )
+    (goto-char (point-min)))
+  (pop-to-buffer "*eww history*")  
+  )
+
+(defun eww-history-browse ()
+  "Browse the history under point in eww."
+  (interactive)
+  (let ((history (get-text-property (line-beginning-position) 'eww-history)))
+    (unless history
+      (error "No history on the current line"))
+    (eww-history-quit)
+    (pop-to-buffer "*eww*")
+    (eww-browse-url (plist-get history :url))))
+
+(defun eww-history-quit ()
+  "Kill the current buffer."
+  (interactive)
+  (kill-buffer (current-buffer)))
+
+(defvar eww-history-kill-ring nil)
+
+(defun eww-history-kill ()
+  "Kill the current history."
+  (interactive)
+  (let* ((start (line-beginning-position))
+	 (history (get-text-property start 'eww-history))
+	 (inhibit-read-only t))
+    (unless history
+      (error "No history on the current line"))
+    (forward-line 1)
+    (push (buffer-substring start (point)) eww-history-kill-ring)
+    (delete-region start (point))
+    (setq eww-history (delq history eww-history))
+    ))
+
+(defvar eww-history-mode-map
+  (let ((map (make-sparse-keymap)))
+    (suppress-keymap map)
+    (define-key map "q" 'eww-history-quit)
+    (define-key map [(control k)] 'eww-history-kill)
+    (define-key map "\r" 'eww-history-browse)
+    map))
+
+(define-derived-mode eww-history-mode nil "eww history"
+  "Mode for listing eww-histories.
+
+\\{eww-history-mode-map}"
+  (buffer-disable-undo)
+  (setq buffer-read-only t
+	truncate-lines t))
+
 (provide 'eww)
 
 ;;; eww.el ends here
-- 
1.8.3.1

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories.

[Ted Zlatanov]

On Sun, 08 Dec 2013 14:44:55 +0900 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> wrote: 

KN> New command and functions to list the eww browser histories. Since eww quits only "q" command, I think it becomes useful.
KN> Signed-off-by: Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>

KN> 	* net/eww.el
KN>       (eww-list-histories,eww-list-histories,eww-history-browse,eww-history-quit,eww-history-kill,eww-history-mode-map,eww-history-mode):
KN>       New command and functions to list browser histories.

KN> -
KN> +    (define-key map "H" 'eww-list-histories)
KN> +    

Trailing spaces here and elsewhere, can you please fix?

KN> -  (set (make-local-variable 'eww-history) nil)
KN> -  (set (make-local-variable 'eww-history-position) 0)
KN> +;;  (set (make-local-variable 'eww-history) nil)
KN> +;;  (set (make-local-variable 'eww-history-position) 0)

I'd rather see these removed, IIUC what you mean here.

KN> +\\{eww-history-mode-map}"
KN> +  (buffer-disable-undo)
KN> +  (setq buffer-read-only t
KN> +	truncate-lines t))

Could this also bind `next-error' and `previous-error'?  Actually a
generic "list of items" buffer mode would be useful and perhaps already
exists?

Thanks!
Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories.

[Ted Zlatanov]

On Tue, 10 Dec 2013 19:21:15 -0500 Ted Zlatanov <tzz@lifelogs.com> wrote: 

TZ> Actually a generic "list of items" buffer mode would be useful and
TZ> perhaps already exists?

(This need was also mentioned when we talked about ways to improve the
display of completion candidates.)

Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[nakayamakenjiro]

> Trailing spaces here and elsewhere, can you please fix?
Oh, I'm sorry. I fixed them.

> I'd rather see these removed, IIUC what you mean here.
I think so too. I removed.

> Could this also bind `next-error' and `previous-error'?  Actually a
> generic "list of items" buffer mode would be useful and perhaps already
> exists?

Ok, I will try to bind `next-error and `previous-error, but it may take
a while. So, before I do that, I resend the patch with fixed of the above.

Signed-off-by: Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>

        * net/eww.el
      (eww-list-histories,eww-list-histories,eww-history-browse,eww-history-quit,eww-history-kill,eww-history-mode-map,eww-history-mode):
      New command and functions to list browser histories.

---
 lisp/net/eww.el | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 94 insertions(+), 9 deletions(-)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 34c6728..cbae7d8 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -411,6 +411,7 @@ word(s) will be searched for via `eww-search-prefix'."
     (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 "H" 'eww-list-histories)
 
     (define-key map "b" 'eww-add-bookmark)
     (define-key map "B" 'eww-list-bookmarks)
@@ -430,6 +431,7 @@ word(s) will be searched for via `eww-search-prefix'."
 	["Download" eww-download t]
 	["View page source" eww-view-source]
 	["Copy page URL" eww-copy-page-url t]
+	["List histories" eww-list-histories t]
 	["Add bookmark" eww-add-bookmark t]
 	["List bookmarks" eww-list-bookmarks t]
 	["List cookies" url-cookie-list t]))
@@ -462,15 +464,6 @@ word(s) will be searched for via `eww-search-prefix'."
   (interactive)
   (quit-window))
 
-(defun eww-save-history ()
-  (push (list :url eww-current-url
-	      :title eww-current-title
-	      :point (point)
-              :dom eww-current-dom
-              :source eww-current-source
-	      :text (buffer-string))
-	eww-history))
-
 ;;;###autoload
 (defun eww-browse-url (url &optional _new-window)
   (when (and (equal major-mode 'eww-mode)
@@ -1242,6 +1235,98 @@ Differences in #targets are ignored."
   (setq buffer-read-only t
 	truncate-lines t))
 
+;;; History code
+
+(defun eww-save-history ()
+  (push (list :url eww-current-url
+	      :title eww-current-title
+	      :point (point)
+              :dom eww-current-dom
+              :source eww-current-source
+	      :text (buffer-string))
+	eww-history))
+
+(defun eww-list-histories ()
+  "List the eww-histories."
+  (interactive)
+  (when (null eww-history)
+    (error "No eww-histories are defined"))
+  (set-buffer (get-buffer-create "*eww history*"))
+  (eww-history-mode)
+  (let ((inhibit-read-only t)
+	(domain-length 0)
+	(title-length 0)
+	url title format start)
+    (erase-buffer)
+    (dolist (history eww-history)
+      (setq start (point))
+      (setq domain-length (max domain-length (length (plist-get history :url))))
p+      (setq title-length (max title-length (length (plist-get history :title))))
+      )
+    (setq format (format "%%-%ds %%-%ds" title-length domain-length)
+	  header-line-format
+	  (concat " " (format format "Title" "URL")))
+
+    (dolist (history eww-history)
+      (setq url (plist-get history :url))
+      (setq title (plist-get history :title))
+      (insert (format format title url))
+      (insert "\n")
+      (put-text-property start (point) 'eww-history history)
+      )
+    (goto-char (point-min)))
+  (pop-to-buffer "*eww history*")
+  )
+
+(defun eww-history-browse ()
+  "Browse the history under point in eww."
+  (interactive)
+  (let ((history (get-text-property (line-beginning-position) 'eww-history)))
+    (unless history
+      (error "No history on the current line"))
+    (eww-history-quit)
+    (pop-to-buffer "*eww*")
+    (eww-browse-url (plist-get history :url))))
+
+(defun eww-history-quit ()
+  "Kill the current buffer."
+  (interactive)
+  (kill-buffer (current-buffer)))
+
+(defvar eww-history-kill-ring nil)
+
+(defun eww-history-kill ()
+  "Kill the current history."
+  (interactive)
+  (let* ((start (line-beginning-position))
+	 (history (get-text-property start 'eww-history))
+	 (inhibit-read-only t))
+    (unless history
+      (error "No history on the current line"))
+    (forward-line 1)
+    (push (buffer-substring start (point)) eww-history-kill-ring)
+    (delete-region start (point))
+    (setq eww-history (delq history eww-history))
+    ))
+
+(defvar eww-history-mode-map
+  (let ((map (make-sparse-keymap)))
+    (suppress-keymap map)
+    (define-key map "q" 'eww-history-quit)
+    (define-key map [(control k)] 'eww-history-kill)
+    (define-key map "\r" 'eww-history-browse)
+                (define-key map "n" 'next-error-no-select)
+                (define-key map "p" 'previous-error-no-select)
+    map))
+
+(define-derived-mode eww-history-mode nil "eww history"
+  "Mode for listing eww-histories.
+
+\\{eww-history-mode-map}"
+  (buffer-disable-undo)
+  (setq buffer-read-only t
+	truncate-lines t))
+
 (provide 'eww)
 
 ;;; eww.el ends here
-- 
1.8.3.1


tzz@lifelogs.com writes:

> On Tue, 10 Dec 2013 19:21:15 -0500 Ted Zlatanov <tzz@lifelogs.com> wrote: 
>
> TZ> Actually a generic "list of items" buffer mode would be useful and
> TZ> perhaps already exists?
>
> (This need was also mentioned when we talked about ways to improve the
> display of completion candidates.)
>
> Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[Ted Zlatanov]

On Thu, 12 Dec 2013 12:20:18 +0900 <nakayamakenjiro@gmail.com> wrote: 

>> Trailing spaces here and elsewhere, can you please fix?
> Oh, I'm sorry. I fixed them.
>> I'd rather see these removed, IIUC what you mean here.
> I think so too. I removed.

Cool, thanks.

>> Could this also bind `next-error' and `previous-error'?  Actually a
>> generic "list of items" buffer mode would be useful and perhaps already
>> exists?

> Ok, I will try to bind `next-error and `previous-error, but it may take
> a while.

It's very easy, in your case it's just moving up and down 1 line IIUC.
But it's not critical and you can even choose to leave it to me :)

I want to implement it for eww (to go back and forth between links) so I
thought it made sense.

> So, before I do that, I resend the patch with fixed of the above.

The patch looks OK, but please remind me, do we have contributor papers
from you?  It's a large patch.

(Lars, if you want to review the patch and commit it yourself, please
let me know.)

Thanks
Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[Kenjiro NAKAYAMA]

> It's very easy, in your case it's just moving up and down 1 line IIUC.
> But it's not critical and you can even choose to leave it to me :)

I misunderstood. I thought binding `next-error' and `previous-error'
means it shows the page view with command "n" and "p". (Like the
result of emacs grep-mode or compilation-mode.) 

> The patch looks OK, but please remind me, do we have contributor papers
> from you?  It's a large patch.

Yes, I have already signed and sent the paper.

Thanks,

Kenjiro Nakayama

tzz@lifelogs.com writes:

> On Thu, 12 Dec 2013 12:20:18 +0900 <nakayamakenjiro@gmail.com> wrote: 
>
>>> Trailing spaces here and elsewhere, can you please fix?
>> Oh, I'm sorry. I fixed them.
>>> I'd rather see these removed, IIUC what you mean here.
>> I think so too. I removed.
>
> Cool, thanks.
>
>>> Could this also bind `next-error' and `previous-error'?  Actually a
>>> generic "list of items" buffer mode would be useful and perhaps already
>>> exists?
>
>> Ok, I will try to bind `next-error and `previous-error, but it may take
>> a while.
>
> It's very easy, in your case it's just moving up and down 1 line IIUC.
> But it's not critical and you can even choose to leave it to me :)
>
> I want to implement it for eww (to go back and forth between links) so I
> thought it made sense.
>
>> So, before I do that, I resend the patch with fixed of the above.
>
> The patch looks OK, but please remind me, do we have contributor papers
> from you?  It's a large patch.
>
> (Lars, if you want to review the patch and commit it yourself, please
> let me know.)
>
> Thanks
> Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[Ted Zlatanov]

On Fri, 13 Dec 2013 08:54:16 +0900 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> wrote: 

>> It's very easy, in your case it's just moving up and down 1 line IIUC.
>> But it's not critical and you can even choose to leave it to me :)

KN> I misunderstood. I thought binding `next-error' and `previous-error'
KN> means it shows the page view with command "n" and "p". (Like the
KN> result of emacs grep-mode or compilation-mode.)

Right, yes.  The chief advantage is that I don't have to remember the
"next" and "previous" keys for every mode that supports this :)

>> The patch looks OK, but please remind me, do we have contributor papers
>> from you?  It's a large patch.

KN> Yes, I have already signed and sent the paper.

Recently?  It needs to be on file.  Usually you'll get an acknowledgment
from the FSF clerk.  We can contact them if you haven't heard back yet
and it's been a long time.

Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories...

[Kenjiro NAKAYAMA]

> Recently?  It needs to be on file.  Usually you'll get an acknowledgment
> from the FSF clerk.  We can contact them if you haven't heard back yet
> and it's been a long time.

I sent the paper twelve days ago. But it may take a little while, since I
sent it from Japan.
Yesterday, I e-mailed the FSF clerk about this. Altough I have heard
nothing from them yet, I will tell you soon if I get the
acknowledgement.

Kenjiro


tzz@lifelogs.com writes:

> On Fri, 13 Dec 2013 08:54:16 +0900 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> wrote: 
>
>>> It's very easy, in your case it's just moving up and down 1 line IIUC.
>>> But it's not critical and you can even choose to leave it to me :)
>
> KN> I misunderstood. I thought binding `next-error' and `previous-error'
> KN> means it shows the page view with command "n" and "p". (Like the
> KN> result of emacs grep-mode or compilation-mode.)
>
> Right, yes.  The chief advantage is that I don't have to remember the
> "next" and "previous" keys for every mode that supports this :)
>
>>> The patch looks OK, but please remind me, do we have contributor papers
>>> from you?  It's a large patch.
>
> KN> Yes, I have already signed and sent the paper.
>
> Recently?  It needs to be on file.  Usually you'll get an acknowledgment
> from the FSF clerk.  We can contact them if you haven't heard back yet
> and it's been a long time.
>
> Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories...

[Stefan Monnier]

> I sent the paper twelve days ago. But it may take a little while, since I
> sent it from Japan.
> Yesterday, I e-mailed the FSF clerk about this. Altough I have heard
> nothing from them yet, I will tell you soon if I get the
> acknowledgement.

Good, Thanks,


        Stefan

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[Lars Magne Ingebrigtsen]

Ted Zlatanov <tzz@lifelogs.com> writes:

> (Lars, if you want to review the patch and commit it yourself, please
> let me know.)

The patch looks good to me -- this seems like useful functionality.  But:

Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> writes:

>> The patch looks OK, but please remind me, do we have contributor papers
>> from you?  It's a large patch.
>
> Yes, I have already signed and sent the paper.

It should probably not be applied until the assignment is listed in that
file that lists the assignments.  Which I've never found myself.  >"?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[Kenjiro NAKAYAMA]

> It should probably not be applied until the assignment is listed in that
> file that lists the assignments.  Which I've never found myself.  >"?

Now, my contributor papers were accepted.
Can you please apply my patches if it is applicable?

Thanks,

Kenjiro Nakayama

larsi@gnus.org writes:

> Ted Zlatanov <tzz@lifelogs.com> writes:
>
>> (Lars, if you want to review the patch and commit it yourself, please
>> let me know.)
>
> The patch looks good to me -- this seems like useful functionality.  But:
>
> Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> writes:
>
>>> The patch looks OK, but please remind me, do we have contributor papers
>>> from you?  It's a large patch.
>>
>> Yes, I have already signed and sent the paper.
>
> It should probably not be applied until the assignment is listed in that
> file that lists the assignments.  Which I've never found myself.  >"?

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[Ted Zlatanov]

On Fri, 20 Dec 2013 09:53:13 +0900 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> wrote: 

>> It should probably not be applied until the assignment is listed in that
>> file that lists the assignments.  Which I've never found myself.  >"?

KN> Now, my contributor papers were accepted.
KN> Can you please apply my patches if it is applicable?

Thank you; applied.

Ted

bug#16086: 24.3.50; [PATCH] eww: New command and functions to list the browser histories..

[Ted Zlatanov]

On Fri, 20 Dec 2013 09:53:13 +0900 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> wrote: 

>> It should probably not be applied until the assignment is listed in that
>> file that lists the assignments.  Which I've never found myself.  >"?

KN> Now, my contributor papers were accepted.
KN> Can you please apply my patches if it is applicable?

KN> Thanks,

KN> Kenjiro Nakayama

KN> larsi@gnus.org writes:

>> Ted Zlatanov <tzz@lifelogs.com> writes:
>> 
>>> (Lars, if you want to review the patch and commit it yourself, please
>>> let me know.)
>> 
>> The patch looks good to me -- this seems like useful functionality.  But:
>> 
>> Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> writes:
>> 
>>>> The patch looks OK, but please remind me, do we have contributor papers
>>>> from you?  It's a large patch.
>>> 
>>> Yes, I have already signed and sent the paper.
>> 
>> It should probably not be applied until the assignment is listed in that
>> file that lists the assignments.  Which I've never found myself.  >"?

-- 
Teodor Zlatanov <tzz@lifelogs.com>
"Brevis oratio penetrat caelos et longa potatio evacuat scyphos." -Rabelais