Mercurial > emacs
view lisp/minibuf-eldef.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
;;; minibuf-eldef.el --- Only show defaults in prompts when applicable ;; ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: convenience ;; 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: ;; ;; Defines the mode `minibuffer-electric-default-mode'. ;; ;; When active, minibuffer prompts that show a default value only show ;; the default when it's applicable -- that is, when hitting RET would ;; yield the default value. If the user modifies the input such that ;; hitting RET would enter a non-default value, the prompt is modified ;; to remove the default indication (which is restored if the input is ;; ever restore to the match the initial input). ;;; Code: (defvar minibuffer-default-in-prompt-regexps '(("\\( (default\\>.*)\\):? \\'" . 1) ("\\( \\[.*\\]\\):? *\\'" . 1)) "*A list of regexps matching the parts of minibuffer prompts showing defaults. When `minibuffer-electric-default-mode' is active, these regexps are used to identify the portions of prompts to elide. Each entry is either a string, which should be a regexp matching the default portion of the prompt, or a cons cell, who's car is a regexp matching the default part of the prompt, and who's cdr indicates the regexp subexpression that matched.") ;;; Internal variables ;; A list of minibuffers to which we've added a post-command-hook. (defvar minibuf-eldef-frobbed-minibufs nil) ;;; The following are all local variables in the minibuffer ;; Input pre-inserted into the minibuffer before the user can edit it. (defvar minibuf-eldef-initial-input) (make-variable-buffer-local 'minibuf-eldef-initial-input) ;; and the length of the buffer with it inserted. (defvar minibuf-eldef-initial-buffer-length) (make-variable-buffer-local 'minibuf-eldef-initial-buffer-length) ;; True if the current minibuffer prompt contains the default spec. (defvar minibuf-eldef-showing-default-in-prompt) (make-variable-buffer-local 'minibuf-eldef-showing-default-in-prompt) ;; An overlay covering the default portion of the prompt (defvar minibuf-eldef-overlay) (make-variable-buffer-local 'minibuf-eldef-overlay) ;;; Hook functions ;; This function goes on minibuffer-setup-hook (defun minibuf-eldef-setup-minibuffer () "Set up a minibuffer for `minibuffer-electric-default-mode'. The prompt and initial input should already have been inserted." (let ((regexps minibuffer-default-in-prompt-regexps) (match nil) (inhibit-point-motion-hooks t)) (save-excursion (save-restriction ;; Narrow to only the prompt (goto-char (point-min)) (narrow-to-region (point) (minibuffer-prompt-end)) ;; See the prompt contains a default input indicator (while regexps (setq match (pop regexps)) (if (re-search-forward (if (stringp match) match (car match)) nil t) (setq regexps nil) (setq match nil))))) (if (not match) ;; Nope, so just make sure our post-command-hook isn't left around. (remove-hook 'post-command-hook #'minibuf-eldef-update-minibuffer t) ;; Yup; set things up so we can frob the prompt as the state of ;; the input string changes. (setq match (if (consp match) (cdr match) 0)) (setq minibuf-eldef-overlay (make-overlay (match-beginning match) (match-end match))) (setq minibuf-eldef-showing-default-in-prompt t) (setq minibuf-eldef-initial-input (minibuffer-contents-no-properties)) (setq minibuf-eldef-initial-buffer-length (point-max)) (add-to-list 'minibuf-eldef-frobbed-minibufs (current-buffer)) (add-hook 'post-command-hook #'minibuf-eldef-update-minibuffer nil t)))) ;; post-command-hook to swap prompts when necessary (defun minibuf-eldef-update-minibuffer () "Update a minibuffer's prompt to include a default only when applicable. This is intended to be used as a minibuffer post-command-hook for `minibuffer-electric-default-mode'; the minibuffer should have already been set up by `minibuf-eldef-setup-minibuffer'." (unless (eq minibuf-eldef-showing-default-in-prompt (and (= (point-max) minibuf-eldef-initial-buffer-length) (string-equal (minibuffer-contents-no-properties) minibuf-eldef-initial-input))) ;; swap state (setq minibuf-eldef-showing-default-in-prompt (not minibuf-eldef-showing-default-in-prompt)) (cond (minibuf-eldef-showing-default-in-prompt (overlay-put minibuf-eldef-overlay 'invisible nil) (overlay-put minibuf-eldef-overlay 'intangible nil)) (t (overlay-put minibuf-eldef-overlay 'invisible t) (overlay-put minibuf-eldef-overlay 'intangible t))))) ;;; Note this definition must be at the end of the file, because ;;; `define-minor-mode' actually calls the mode-function if the ;;; associated variable is non-nil, which requires that all needed ;;; functions be already defined. [This is arguably a bug in d-m-m] ;;;###autoload (define-minor-mode minibuffer-electric-default-mode "Toggle Minibuffer Electric Default mode. When active, minibuffer prompts that show a default value only show the default when it's applicable -- that is, when hitting RET would yield the default value. If the user modifies the input such that hitting RET would enter a non-default value, the prompt is modified to remove the default indication. With prefix argument ARG, turn on if positive, otherwise off. Returns non-nil if the new state is enabled." :global t :group 'minibuffer (if minibuffer-electric-default-mode ;; Enable the mode (add-hook 'minibuffer-setup-hook 'minibuf-eldef-setup-minibuffer) ;; Disable the mode (remove-hook 'minibuffer-setup-hook 'minibuf-eldef-setup-minibuffer) ;; Remove our entry from any post-command-hook variable's it's still in (dolist (minibuf minibuf-eldef-frobbed-minibufs) (with-current-buffer minibuf (remove-hook 'post-command-hook #'minibuf-eldef-update-minibuffer t))) (setq minibuf-eldef-frobbed-minibufs nil))) (provide 'minibuf-eldef) ;; arch-tag: 7e421fae-c275-4729-b0da-7836af377d3d ;;; minibuf-eldef.el ends here