diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-20 13:56:19 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-20 13:56:19 +0400 |
| commit | 42143acda9a3993f383cf1c9688831cba8200d10 (patch) | |
| tree | 0bb5855507dcf8b8d1741bee75117f0fa14ec450 /src/xsettings.c | |
| parent | 47077837aff40030430e3d1d0522fee5db62ee1e (diff) | |
| download | emacs-42143acda9a3993f383cf1c9688831cba8200d10.tar.gz | |
* frame.h (struct frame): Drop resx and resy because the same data is
available from window system-specific output context. Adjust users.
(default_pixesls_per_inch_x, default_pixesls_per_inch_y): New
functions to provide defaults when no window system available.
(FRAME_RES_X, FRAME_RES_Y): New macros.
(NUMVAL): Moved from xdisp.c.
* font.c (font_pixel_size, font_find_for_lface, font_open_for_lface)
(Ffont_face_attributes, Fopen_font):
* image.c (gs_load):
* w32font.c (fill_in_logfont):
* xdisp.c (calc_pixel_width_or_height):
* xfaces.c (Fx_family_fonts, set_lface_from_font): Use them.
* xsettings.c (apply_xft_settings): Drop frame loop and adjust comment.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index 576a5032eac..f48c49dbafe 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -673,19 +673,14 @@ apply_xft_settings (struct x_display_info *dpyinfo, if ((settings->seen & SEEN_DPI) != 0 && oldsettings.dpi != settings->dpi && settings->dpi > 0) { - Lisp_Object frame, tail; - FcPatternDel (pat, FC_DPI); FcPatternAddDouble (pat, FC_DPI, settings->dpi); ++changed; oldsettings.dpi = settings->dpi; - /* Change the DPI on this display and all frames on the display. */ + /* Changing the DPI on this display affects all frames on it. + Check FRAME_RES_X and FRAME_RES_Y in frame.h to see how. */ dpyinfo->resy = dpyinfo->resx = settings->dpi; - FOR_EACH_FRAME (tail, frame) - if (FRAME_X_P (XFRAME (frame)) - && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) - XFRAME (frame)->resy = XFRAME (frame)->resx = settings->dpi; } if (changed) |