aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2000-10-23 22:14:57 +0000
committerJason Rumney2000-10-23 22:14:57 +0000
commit3090a5a5bc8b9b6bd1a33128a93fe341b40de0d5 (patch)
treec0fc8a29396e9f199d8d65d67947a6f8342ce830 /src
parentd98c0337b36605ee3cbf226bb91919d88b75f0b0 (diff)
downloademacs-3090a5a5bc8b9b6bd1a33128a93fe341b40de0d5.tar.gz
emacs-3090a5a5bc8b9b6bd1a33128a93fe341b40de0d5.zip
(VCENTER_BASELINE_OFFSET): Bias division (see xterm.c comment below).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog10
-rw-r--r--src/w32term.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8286648aca1..40d4b1f57c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
12000-10-23 Jason Rumney <jasonr@gnu.org>
2
3 * fontset.c (syms_of_fontset) [WINDOWSNT]: Special case for
4 ASCII font of default fontset on Windows.
5
6 * w32term.c (VCENTER_BASELINE_OFFSET): Bias division (see
7 xterm.c comment below).
8
9 * w32fns.c (x_to_w32_font): Initialize dpi from dpyinfo->resy.
10
12000-10-23 Gerd Moellmann <gerd@gnu.org> 112000-10-23 Gerd Moellmann <gerd@gnu.org>
2 12
3 * xterm.c (x_connection_closed): Reset handling_signal. 13 * xterm.c (x_connection_closed): Reset handling_signal.
diff --git a/src/w32term.c b/src/w32term.c
index d6bff6e32e4..23cde3c0522 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1915,7 +1915,7 @@ x_produce_stretch_glyph (it)
1915 1915
1916#define VCENTER_BASELINE_OFFSET(FONT, F) \ 1916#define VCENTER_BASELINE_OFFSET(FONT, F) \
1917 (FONT_DESCENT (FONT) \ 1917 (FONT_DESCENT (FONT) \
1918 + (FRAME_LINE_HEIGHT ((F)) - FONT_HEIGHT ((FONT))) / 2 \ 1918 + (FRAME_LINE_HEIGHT ((F)) + 1 - FONT_HEIGHT ((FONT))) / 2 \
1919 - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F))) 1919 - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F)))
1920 1920
1921/* Produce glyphs/get display metrics for the display element IT is 1921/* Produce glyphs/get display metrics for the display element IT is