Mercurial > emacs
view lisp/erc/erc-ring.el @ 108027:2ba5d029fd5e
Gtk tool bars can be text, icons with text or just icons
* frames.texi (Tool Bars): Add tool-bar-style.
* vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
* tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
* loadup.el: Load dynamic-setting.el if feature dynamic-setting
is present.
* info.el (info-tool-bar-map): Add labels.
* cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
* cus-edit.el (custom-commands): Add labels for tool bar.
(custom-buffer-create-internal, Custom-mode): Adjust for
labels in custom-commands.
* dynamic-setting.el: Renamed from font-setting.el.
* xsettings.c: Qmonospace_font_name, Qtool_bar_style and
current_tool_bar_style are new.
(store_config_changed_event): Rename from store_font_changed_event.
(XSETTINGS_TOOL_BAR_STYLE): New define.
(SEEN_FONT, SEEN_TB_STYLE): New enum values.
(struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
HAVE_XFT.
(something_changedCB): store_font_changed_event is now
store_config_changed_event
(parse_settings): Rename from parse_xft_settings. Read
non-xft xsettings outside #ifdef HAVE_XFT.
(read_settings): Renamed from read_xft_settings.
(apply_xft_settings): Take current settings as parameter. Do not
call read_(xft)_settings.
(read_and_apply_settings): New function.
(xft_settings_event): Do non-xft stuff out of HAVE_XFT. Call
read_and_apply_settings if there are settings to be read.
(init_xsettings): Renamed from init_xfd_settings.
Call read_and_apply_settings unconditionally.
(xsettings_initialize): Call init_xsettings.
(Ftool_bar_get_system_style): New function.
(syms_of_xsettings): Define Qmonospace_font_name and
Qtool_bar_style. Initialize current_tool_bar_style to nil.
defsubr Stool_bar_get_system_style. Fprovide on
dynamic-setting.
* xsettings.h (Ftool_bar_get_system_style): Declare.
* xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
Qtext, Qboth, Qboth_horiz are new.
(syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
Vtool_bar_style, tool_bar_max_label_size.
* lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
* keyboard.c: QClabel is new.
(parse_tool_bar_item): Take out QClabel from tool bar items.
Try to construct a label if ther is no QClabel.
(syms_of_keyboard): Intern :label as QClabel.
* dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
(Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
New.
* Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
dynamic-setting.el.
* gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
(xg_make_tool_item, xg_show_toolbar_item): New function.
(update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
Call xg_make_tool_item to make a tool bar item.
Call xg_show_toolbar_item. Use wtoolbar instead of x->toolbar_widget.
* xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
into account for toolbars.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 21 Apr 2010 18:26:09 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;; erc-ring.el -- Command history handling for erc using ring.el ;; Copyright (C) 2001, 2002, 2003, 2004, 2006, ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Keywords: comm ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; This file implements an input ring -- a history of the stuff you ;; wrote. To activate: ;; ;; (require 'erc-auto) or (require 'erc-ring) ;; (erc-ring-mode 1) ;; ;; Use M-n and M-p to navigate the ring ;;; Code: (require 'erc) (require 'comint) (require 'ring) ;;;###autoload (autoload 'erc-ring-mode "erc-ring" nil t) (define-erc-module ring nil "Stores input in a ring so that previous commands and messages can be recalled using M-p and M-n." ((add-hook 'erc-send-pre-hook 'erc-add-to-input-ring) (define-key erc-mode-map "\M-p" 'erc-previous-command) (define-key erc-mode-map "\M-n" 'erc-next-command)) ((remove-hook 'erc-send-pre-hook 'erc-add-to-input-ring) (define-key erc-mode-map "\M-p" 'undefined) (define-key erc-mode-map "\M-n" 'undefined))) (defvar erc-input-ring nil "Input ring for erc.") (make-variable-buffer-local 'erc-input-ring) (defvar erc-input-ring-index nil "Position in the input ring for erc. If nil, the input line is blank and the user is conceptually 'after' the most recently added item in the ring. If an integer, the input line is non-blank and displays the item from the ring indexed by this variable.") (make-variable-buffer-local 'erc-input-ring-index) (defun erc-input-ring-setup () "Do the setup required so that we can use comint style input rings. Call this function when setting up the mode." (setq erc-input-ring (make-ring comint-input-ring-size)) (setq erc-input-ring-index nil)) (defun erc-add-to-input-ring (s) "Add string S to the input ring and reset history position." (unless erc-input-ring (erc-input-ring-setup)) (ring-insert erc-input-ring s) (setq erc-input-ring-index nil)) (defun erc-clear-input-ring () "Remove all entries from the input ring, then call garbage-collect. You might use this for security purposes if you have typed a command containing a password." (interactive) (setq erc-input-ring (make-ring comint-input-ring-size) erc-input-ring-index nil) (garbage-collect) (message "ERC input ring cleared.")) (defun erc-previous-command () "Replace current command with the previous one from the history." (interactive) (unless erc-input-ring (erc-input-ring-setup)) ;; if the ring isn't empty (when (> (ring-length erc-input-ring) 0) (if (and erc-input-ring-index (= (ring-length erc-input-ring) (1+ erc-input-ring-index))) (progn (erc-replace-current-command "") (setq erc-input-ring-index nil)) ;; If we are not viewing old input and there's text in the input ;; area, push it on the history ring before moving back through ;; the input history, so it will be there when we return to the ;; front. (if (null erc-input-ring-index) (when (> (point-max) erc-input-marker) (erc-add-to-input-ring (buffer-substring erc-input-marker (point-max))) (setq erc-input-ring-index 0))) (setq erc-input-ring-index (if erc-input-ring-index (ring-plus1 erc-input-ring-index (ring-length erc-input-ring)) 0)) (erc-replace-current-command (ring-ref erc-input-ring erc-input-ring-index))))) (defun erc-next-command () "Replace current command with the next one from the history." (interactive) (unless erc-input-ring (erc-input-ring-setup)) ;; if the ring isn't empty (when (> (ring-length erc-input-ring) 0) (if (and erc-input-ring-index (= 0 erc-input-ring-index)) (progn (erc-replace-current-command "") (setq erc-input-ring-index nil)) (setq erc-input-ring-index (ring-minus1 (or erc-input-ring-index 0) (ring-length erc-input-ring))) (erc-replace-current-command (ring-ref erc-input-ring erc-input-ring-index))))) (defun erc-replace-current-command (s) "Replace current command with string S." ;; delete line (let ((inhibit-read-only t)) (delete-region (progn (goto-char erc-insert-marker) (erc-bol)) (goto-char (point-max))) (insert s))) (provide 'erc-ring) ;;; erc-ring.el ends here ;; Local Variables: ;; indent-tabs-mode: nil ;; End: ;; arch-tag: b77924a8-a80e-489d-84cd-b351761ea5c8