diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-17 08:21:23 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-17 08:21:23 +0000 |
| commit | 637fa9880877f485842b7aca18146a1f12c05b96 (patch) | |
| tree | f4994cdadaad980b7b28827eba6cd50421a7f892 /lisp/menu-bar.el | |
| parent | 77fd3e0c13b345cd4ff5c9ef5c89bd6b29054bc3 (diff) | |
| download | emacs-637fa9880877f485842b7aca18146a1f12c05b96.tar.gz | |
Handle system default font and changing font parameters.
* xterm.h (struct x_display_info): Add atoms and Window for xsettings.
* xterm.c (handle_one_xevent): Call xft_settings_event for
ClientMessage, PropertyNotify and DestroyNotify.
(x_term_init): If we have XFT, get DPI from Xft.dpi.
Call xsettings_initialize.
* xftfont.c (xftfont_fix_match): New function.
(xftfont_open): Call XftDefaultSubstitute before XftFontMatch.
Call xftfont_fix_match after XftFontMatch.
* xfont.c (xfont_driver): Initialize all members.
* xfns.c (x_default_font_parameter): Try font from Ffont_get_system_font.
Do not get font from x_default_parameter if we got one from
Ffont_get_system_font.
(Fx_select_font): Get the defaut font name from :name of FRAME_FONT (f).
* w32font.c (w32font_driver): Initialize all members.
* termhooks.h (enum event_kind): CONFIG_CHANGED_EVENT is new.
* lisp.h: Declare syms_of_xsettings.
* keyboard.c (kbd_buffer_get_event, make_lispy_event): Handle
CONFIG_CHANGED_EVENT.
* ftfont.c (ftfont_filter_properties): New function.
* frame.c (x_set_font): Remove unused variable lval.
* font.h (struct font_driver): filter_properties is new.
* font.c (font_put_extra): Don't return if val is nil, it means
boolean option is off.
(font_parse_fcname): Collect all extra properties in extra_props
and call filter_properties for all drivers with extra_props and
font as parameter.
(font_open_entity): Do not use cache, it does not pick up new fontconfig
settings like hinting.
(font_load_for_lface): If spec had a name in it, store it in entity.
* emacs.c (main): Call syms_of_xsettings
* config.in: HAVE_GCONF is new.
* Makefile.in (GCONF_CFLAGS, GCONF_LIBS): New variables for HAVE_GCONF.
xsettings.o is new.
* menu-bar.el: Put "Use system font" in Option-menu.
* loadup.el: If feature system-font-setting or font-render-setting is
there, load font-setting.
* Makefile.in (ELCFILES): font-settings.el is new.
* font-setting.el: New file.
* NEWS: Mention dynamic font changes (font-use-system-font).
* configure.in: New option: --with(out)-gconf.
Set HAVE_GCONF if we find gconf.
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 21495b32f5d..13319f41269 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -660,6 +660,8 @@ by \"Save Options\" in Custom buffers.") (custom-push-theme 'theme-face 'default 'user 'set spec) (put 'default 'face-modified nil)))) + + ;;; Assemble all the top-level items of the "Options" menu (define-key menu-bar-options-menu [customize] `(menu-item ,(purecopy "Customize Emacs") ,menu-bar-custom-menu)) @@ -713,6 +715,14 @@ by \"Save Options\" in Custom buffers.") :visible (display-multi-font-p) :help ,(purecopy "Select a default font"))) +(if (featurep 'system-font-setting) + (define-key menu-bar-options-menu [menu-system-font] + (menu-bar-make-toggle toggle-use-system-font font-use-system-font + "Use system font" + "Use system font: %s" + "Use the monospaced font defined by the system"))) + + ;; The "Show/Hide" submenu of menu "Options" (defvar menu-bar-showhide-menu (make-sparse-keymap "Show/Hide")) |