Mercurial > emacs
view lisp/nxml/rng-util.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
;;; rng-util.el --- utility functions for RELAX NG library ;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: XML, RelaxNG ;; 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: ;;; Code: (defun rng-make-datatypes-uri (uri) (if (string-equal uri "") ;; The spec doesn't say to do this, but it's perfectly conformant ;; and better than using nil, I think. 'http://relaxng.org/ns/structure/1.0 (intern uri))) (defconst rng-xsd-datatypes-uri (rng-make-datatypes-uri "http://www.w3.org/2001/XMLSchema-datatypes")) (defconst rng-builtin-datatypes-uri (rng-make-datatypes-uri "")) (defun rng-uniquify-eq (list) "Destructively remove `eq' duplicates from LIST." (and list (let ((head list)) (while (cdr head) (if (eq (car head) (cadr head)) (setcdr head (cddr head))) (setq head (cdr head))) list))) (defun rng-uniquify-equal (list) "Destructively remove `equal' duplicates from LIST." (and list (let ((head list)) (while (cdr head) (if (equal (car head) (cadr head)) (setcdr head (cddr head))) (setq head (cdr head))) list))) (defun rng-blank-p (str) (string-match "\\`[ \t\n\r]*\\'" str)) (defun rng-substq (new old list) "Replace first member of LIST (if any) that is `eq' to OLD by NEW. LIST is not modified." (cond ((null list) nil) ((eq (car list) old) (cons new (cdr list))) (t (let ((tail (cons (car list) nil)) (rest (cdr list))) (setq list tail) (while rest (let ((item (car rest))) (setq rest (cdr rest)) (cond ((eq item old) (setcdr tail (cons new rest)) (setq rest nil)) (t (setq tail (setcdr tail (cons item nil)))))))) list))) (defun rng-complete-before-point (start table prompt &optional predicate hist) "Complete text between START and point. Replaces the text between START and point with a string chosen using a completion table and, when needed, input read from the user with the minibuffer. Returns the new string if either a complete and unique completion was determined automatically or input was read from the user. Otherwise, returns nil. TABLE is an alist, a symbol bound to a function or an obarray as with the function `completing-read'. PROMPT is the string to prompt with if user input is needed. PREDICATE is nil or a function as with `completing-read'. HIST, if non-nil, specifies a history list as with `completing-read'." (let* ((orig (buffer-substring-no-properties start (point))) (completion (try-completion orig table predicate))) (cond ((not completion) (if (string= orig "") (message "No completions available") (message "No completion for %s" (rng-quote-string orig))) (ding) nil) ((eq completion t) orig) ((not (string= completion orig)) (delete-region start (point)) (insert completion) (cond ((not (rng-completion-exact-p completion table predicate)) (message "Incomplete") nil) ((eq (try-completion completion table predicate) t) completion) (t (message "Complete but not unique") nil))) (t (setq completion (let ((saved-minibuffer-setup-hook (default-value 'minibuffer-setup-hook))) (add-hook 'minibuffer-setup-hook 'minibuffer-completion-help t) (unwind-protect (completing-read prompt table predicate nil orig hist) (setq-default minibuffer-setup-hook saved-minibuffer-setup-hook)))) (delete-region start (point)) (insert completion) completion)))) (defun rng-completion-exact-p (string table predicate) (cond ((symbolp table) (funcall table string predicate 'lambda)) ((vectorp table) (intern-soft string table)) (t (assoc string table)))) (defun rng-quote-string (s) (concat "\"" s "\"")) (defun rng-escape-string (s) (replace-regexp-in-string "[&\"<>]" (lambda (match) (cdr (assoc match '(("&" . "&") ("\"" . """) (">" . ">") ("<" . "<"))))) s t)) (defun rng-collapse-space (string) (setq string (replace-regexp-in-string "[ \t\r\n]+" " " string t t)) (when (string-match "\\` " string) (setq string (substring string 1))) (when (string-match " \\'" string) (setq string (substring string 0 -1))) string) (provide 'rng-util) ;; arch-tag: 2dc233e0-5e7a-488f-bfc4-5909512dbaf0 ;;; rng-util.el ends here