From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Newsgroups: gmane.emacs.devel Subject: [PATCH 4/5] eww: Add tool bar support. Date: Fri, 20 Dec 2013 00:44:49 +0100 Message-ID: <3856770.xyGxovK1mL@descartes> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit X-Trace: ger.gmane.org 1387496704 13429 80.91.229.3 (19 Dec 2013 23:45:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Dec 2013 23:45:04 +0000 (UTC) Cc: Lars Magne Ingebrigtsen , Ted Zlatanov To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 20 00:45:14 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 1VtnHF-0002Kt-L2 for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 00:45:13 +0100 Original-Received: from localhost ([::1]:46911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtnHF-0001e3-7w for ged-emacs-devel@m.gmane.org; Thu, 19 Dec 2013 18:45:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtnH5-0001QX-Af for emacs-devel@gnu.org; Thu, 19 Dec 2013 18:45:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtnGy-0002cr-SR for emacs-devel@gnu.org; Thu, 19 Dec 2013 18:45:03 -0500 Original-Received: from ptmx.org ([178.63.28.110]:33855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtnGy-0002cg-MS for emacs-devel@gnu.org; Thu, 19 Dec 2013 18:44:56 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id 21A3122ACB; Fri, 20 Dec 2013 00:44:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ptmx.org Original-Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iXr5eF-pPMgD; Fri, 20 Dec 2013 00:44:54 +0100 (CET) Original-Received: from descartes.localnet (chello080108246092.7.14.vie.surfer.at [80.108.246.92]) by ptmx.org (Postfix) with ESMTPSA id 73BE02130B; Fri, 20 Dec 2013 00:44:54 +0100 (CET) User-Agent: KMail/4.11.2 (Linux/3.11.0-14-generic; KDE/4.11.2; x86_64; ; ) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 178.63.28.110 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:166632 Archived-At: * lisp/net/eww.el (eww-tool-bar-map): New variable. (eww-mode): Set `tool-bar-map'. --- lisp/ChangeLog | 2 ++ lisp/net/eww.el | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 54f6c77..14d539d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,6 +7,8 @@ Use `user-error'. (eww-bookmark-mode-map): Add menu. (eww-render, eww-mode): Use `setq-local'. + (eww-tool-bar-map): New variable. + (eww-mode): Set `tool-bar-map'. 2013-12-19 Teodor Zlatanov diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a58b7ed..cae5cfd 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -438,6 +438,21 @@ (defvar eww-mode-map ["List cookies" url-cookie-list t])) map)) +(defvar eww-tool-bar-map + (let ((map (make-sparse-keymap))) + (dolist (tool-bar-item + '((eww-quit . "close") + (eww-reload . "refresh") + (eww-back-url . "left-arrow") + (eww-forward-url . "right-arrow") + (eww-view-source . "show") + (eww-copy-page-url . "copy") + (eww-add-bookmark . "bookmark_add"))) ;; ... + (tool-bar-local-item-from-menu + (car tool-bar-item) (cdr tool-bar-item) map eww-mode-map)) + map) + "Tool bar for `eww-mode'.") + (define-derived-mode eww-mode nil "eww" "Mode for browsing the web. @@ -450,6 +465,8 @@ (define-derived-mode eww-mode nil "eww" (setq-local after-change-functions 'eww-process-text-input) (setq-local eww-history nil) (setq-local eww-history-position 0) + (when (boundp 'tool-bar-map) + (setq-local tool-bar-map eww-tool-bar-map)) (buffer-disable-undo) ;;(setq buffer-read-only t) ) -- 1.8.5