diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-05 10:21:38 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-05 10:21:38 +0200 |
| commit | 869795d6b510972d846183141885569ebf0c44f4 (patch) | |
| tree | 3e5ab0cd0a628b49b2ff99e479d5c5d71b849f31 /lisp/dynamic-setting.el | |
| parent | 3ca5c03fb15d2c83112f2b5997dc06b418450a3d (diff) | |
| download | emacs-869795d6b510972d846183141885569ebf0c44f4.tar.gz | |
Use GConf and GSettings both, check GConf/GSettings toolbar style and font name.
* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.
* lisp/dynamic-setting.el (dynamic-setting-handle-config-changed-event):
Update doc string.
* src/xsettings.c: Use both GConf and GSettings if both are available.
(store_config_changed_event): Add comment.
(dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
(store_tool_bar_style_changed): New functions.
(store_monospaced_changed): Add comment. Call dpyinfo_valid.
(struct xsettings): Move font inside HAVE_XFT.
(GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
(GSETTINGS_MONO_FONT): Renamed from SYSTEM_MONO_FONT.
Move inside HAVE_XFT.
(something_changed_gsettingsCB): Renamed from something_changedCB.
Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
also.
(GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
(GCONF_MONO_FONT): Renamed from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
(something_changed_gconfCB): Renamed from something_changedCB.
Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
(parse_settings): Move check for font inside HAVE_XFT.
(read_settings, apply_xft_settings): Add comment.
(read_and_apply_settings): Add comment. Call map_tool_bar_style and
store_tool_bar_style_changed. Move check for font inside HAVE_XFT and
call store_font_name_changed.
(xft_settings_event): Add comment.
(init_gsettings): Add comment. Get values for GSETTINGS_TOOL_BAR_STYLE
and GSETTINGS_FONT_NAME. Move check for fonts within HAVE_XFT.
(init_gconf): Add comment. Get values for GCONF_TOOL_BAR_STYLE
and GCONF_FONT_NAME. Move check for fonts within HAVE_XFT.
(xsettings_initialize): Call init_gsettings last.
(xsettings_get_system_font, xsettings_get_system_normal_font): Add
comment.
Diffstat (limited to 'lisp/dynamic-setting.el')
| -rw-r--r-- | lisp/dynamic-setting.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el index 81531c4a21f..167da69d1ca 100644 --- a/lisp/dynamic-setting.el +++ b/lisp/dynamic-setting.el @@ -86,7 +86,9 @@ current form for the frame (i.e. hinting or somesuch changed)." Changes can be The monospace font. If `font-use-system-font' is nil, the font is not changed. + The normal font. Xft parameters, like DPI and hinting. + The Gtk+ theme name. The tool bar style." (interactive "e") (let ((type (nth 1 event)) |