diff options
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index d23070791d8..f48c49dbafe 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Functions for handling font and other changes dynamically. | 1 | /* Functions for handling font and other changes dynamically. |
| 2 | 2 | ||
| 3 | Copyright (C) 2009-2012 Free Software Foundation, Inc. | 3 | Copyright (C) 2009-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -673,19 +673,14 @@ apply_xft_settings (struct x_display_info *dpyinfo, | |||
| 673 | if ((settings->seen & SEEN_DPI) != 0 && oldsettings.dpi != settings->dpi | 673 | if ((settings->seen & SEEN_DPI) != 0 && oldsettings.dpi != settings->dpi |
| 674 | && settings->dpi > 0) | 674 | && settings->dpi > 0) |
| 675 | { | 675 | { |
| 676 | Lisp_Object frame, tail; | ||
| 677 | |||
| 678 | FcPatternDel (pat, FC_DPI); | 676 | FcPatternDel (pat, FC_DPI); |
| 679 | FcPatternAddDouble (pat, FC_DPI, settings->dpi); | 677 | FcPatternAddDouble (pat, FC_DPI, settings->dpi); |
| 680 | ++changed; | 678 | ++changed; |
| 681 | oldsettings.dpi = settings->dpi; | 679 | oldsettings.dpi = settings->dpi; |
| 682 | 680 | ||
| 683 | /* Change the DPI on this display and all frames on the display. */ | 681 | /* Changing the DPI on this display affects all frames on it. |
| 682 | Check FRAME_RES_X and FRAME_RES_Y in frame.h to see how. */ | ||
| 684 | dpyinfo->resy = dpyinfo->resx = settings->dpi; | 683 | dpyinfo->resy = dpyinfo->resx = settings->dpi; |
| 685 | FOR_EACH_FRAME (tail, frame) | ||
| 686 | if (FRAME_X_P (XFRAME (frame)) | ||
| 687 | && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) | ||
| 688 | XFRAME (frame)->resy = XFRAME (frame)->resx = settings->dpi; | ||
| 689 | } | 684 | } |
| 690 | 685 | ||
| 691 | if (changed) | 686 | if (changed) |