Mercurial > emacs
view lisp/nxml/nxml-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
;;; nxml-util.el --- utility functions for nxml-*.el ;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: XML ;; 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: (defconst nxml-debug nil "Enable nxml debugging. Effective only at compile time.") (defsubst nxml-debug (format &rest args) (when nxml-debug (apply #'message format args))) (defmacro nxml-debug-change (name start end) (when nxml-debug `(nxml-debug "%s: %S" ,name (buffer-substring-no-properties ,start ,end)))) (defmacro nxml-debug-set-inside (start end) (when nxml-debug `(let ((overlay (make-overlay ,start ,end))) (overlay-put overlay 'face '(:background "red")) (overlay-put overlay 'nxml-inside-debug t) (nxml-debug-change "nxml-set-inside" ,start ,end)))) (defmacro nxml-debug-clear-inside (start end) (when nxml-debug `(loop for overlay in (overlays-in ,start ,end) if (overlay-get overlay 'nxml-inside-debug) do (delete-overlay overlay) finally (nxml-debug-change "nxml-clear-inside" ,start ,end)))) (defun nxml-make-namespace (str) "Return a symbol for the namespace URI STR. STR must be a string. If STR is the empty string, return nil. Otherwise, return the symbol whose name is STR prefixed with a colon." (if (string-equal str "") nil (intern (concat ":" str)))) (defun nxml-namespace-name (ns) "Return the namespace URI corresponding to the symbol NS. This is the inverse of `nxml-make-namespace'." (and ns (substring (symbol-name ns) 1))) (defconst nxml-xml-namespace-uri (nxml-make-namespace "http://www.w3.org/XML/1998/namespace")) (defconst nxml-xmlns-namespace-uri (nxml-make-namespace "http://www.w3.org/2000/xmlns/")) (defmacro nxml-with-degradation-on-error (context &rest body) (if (not nxml-debug) (let ((error-symbol (make-symbol "err"))) `(condition-case ,error-symbol (progn ,@body) (error (nxml-degrade ,context ,error-symbol)))) `(progn ,@body))) (defmacro nxml-with-unmodifying-text-property-changes (&rest body) "Evaluate BODY without any text property changes modifying the buffer. Any text properties changes happen as usual but the changes are not treated as modifications to the buffer." (let ((modified (make-symbol "modified"))) `(let ((,modified (buffer-modified-p)) (inhibit-read-only t) (inhibit-modification-hooks t) (buffer-undo-list t) (deactivate-mark nil) ;; Apparently these avoid file locking problems. (buffer-file-name nil) (buffer-file-truename nil)) (unwind-protect (progn ,@body) (unless ,modified (restore-buffer-modified-p nil)))))) (put 'nxml-with-unmodifying-text-property-changes 'lisp-indent-function 0) (def-edebug-spec nxml-with-unmodifying-text-property-changes t) (defmacro nxml-with-invisible-motion (&rest body) "Evaluate body without calling any point motion hooks." `(let ((inhibit-point-motion-hooks t)) ,@body)) (put 'nxml-with-invisible-motion 'lisp-indent-function 0) (def-edebug-spec nxml-with-invisible-motion t) (defun nxml-display-file-parse-error (err) (let* ((filename (nth 1 err)) (buffer (find-file-noselect filename)) (pos (nth 2 err)) (message (nth 3 err))) (pop-to-buffer buffer) ;; What's the right thing to do if the buffer's modified? ;; The position in the saved file could be completely different. (goto-char (if (buffer-modified-p) 1 pos)) (error "%s" message))) (defun nxml-signal-file-parse-error (file pos message &optional error-symbol) (signal (or error-symbol 'nxml-file-parse-error) (list file pos message))) (put 'nxml-file-parse-error 'error-conditions '(error nxml-file-parse-error)) (put 'nxml-parse-file-error 'error-message "Error parsing file") (provide 'nxml-util) ;; arch-tag: 7d3b3af4-de2b-4410-bf67-94d64824324b ;;; nxml-util.el ends here