Mercurial > emacs
view lisp/dynamic-setting.el @ 108024:4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
* 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.
* 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.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Tue, 20 Apr 2010 20:52:07 +0200 |
parents | lisp/font-setting.el@1d1d5d9bd884 |
children | 2ba5d029fd5e |
line wrap: on
line source
;;; dynamic-setting.el --- Support dynamic changes ;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;; Author: Jan Djärv <jan.h.d@swipnet.se> ;; Maintainer: FSF ;; Keywords: font, system-font, tool-bar-style ;; 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 provides the lisp part of the GConf and XSetting code in ;; xsetting.c. But it is nothing that prevents it from being used by ;; other configuration schemes. ;;; Code: ;;; Customizable variables (declare-function font-get-system-font "xsettings.c" ()) (defvar font-use-system-font) (defun font-setting-change-default-font (display-or-frame set-font) "Change font and/or font settings for frames on display DISPLAY-OR-FRAME. If DISPLAY-OR-FRAME is a frame, the display is the one for that frame. If SET-FONT is non-nil, change the font for frames. Otherwise re-apply the current form for the frame (i.e. hinting or somesuch changed)." (let ((new-font (and (fboundp 'font-get-system-font) (font-get-system-font)))) (when new-font ;; Be careful here: when set-face-attribute is called for the ;; :font attribute, Emacs tries to guess the best matching font ;; by examining the other face attributes (Bug#2476). (clear-font-cache) ;; Set for current frames. Only change font for those that have ;; the old font now. If they don't have the old font, the user ;; probably changed it. (dolist (f (frames-on-display-list display-or-frame)) (if (display-graphic-p f) (let* ((frame-font (or (font-get (face-attribute 'default :font f 'default) :user-spec) (frame-parameter f 'font-parameter))) (font-to-set (if set-font new-font ;; else set font again, hinting etc. may have changed. frame-font))) (if font-to-set (progn (message "setting %s" font-to-set) (set-frame-parameter f 'font-parameter font-to-set) (set-face-attribute 'default f :width 'normal :weight 'normal :slant 'normal :font font-to-set)))))) ;; Set for future frames. (set-face-attribute 'default t :font new-font) (let ((spec (list (list t (face-attr-construct 'default))))) (progn (put 'default 'customized-face spec) (custom-push-theme 'theme-face 'default 'user 'set spec) (put 'default 'face-modified nil)))))) (defun dynamic-setting-handle-config-changed-event (event) "Handle config-changed-event on the display in EVENT. Changes can be The monospace font. If `font-use-system-font' is nil, the font is not changed. Xft parameters, like DPI and hinting. The tool bar style." (interactive "e") (let ((type (nth 1 event)) (display-name (nth 2 event))) (cond ((and (eq type 'monospace-font-name) font-use-system-font) (font-setting-change-default-font display-name t)) ((eq type 'font-render) (font-setting-change-default-font display-name nil)) ((eq type 'tool-bar-style) (force-mode-line-update t))))) (define-key special-event-map [config-changed-event] 'dynamic-setting-handle-config-changed-event) ;; arch-tag: 3a57e78f-1cd6-48b6-ab75-98f160dcc017