1
0
mirror of https://github.com/gryf/gryf-overlay.git synced 2026-04-24 13:01:25 +02:00

Correct patches for urxvt.

This commit is contained in:
2021-01-26 17:02:05 +01:00
parent 58e3dd68df
commit 91ca898ef2
3 changed files with 1 additions and 55 deletions
@@ -176,32 +176,6 @@ diff -ur rxvt-unicode-9.22-a/src/rxvtfont.C rxvt-unicode-9.22-b/src/rxvtfont.C
ep->y = y_ + ascent;
if (extents.xOff == 0)
diff -ur rxvt-unicode-9.22-a/src/rxvtfont.C.orig rxvt-unicode-9.22-b/src/rxvtfont.C.orig
--- rxvt-unicode-9.22-a/src/rxvtfont.C.orig 2021-01-26 13:38:12.669879617 +0100
+++ rxvt-unicode-9.22-b/src/rxvtfont.C.orig 2021-01-26 13:39:13.257880354 +0100
@@ -1239,11 +1239,22 @@
FT_Face face = XftLockFace (f);
+/*
+ * use ascent, descent and height from XftFont *f instead of FT_Face face.
+ * this somehow reproduces the behaviour of the line height as seen on xterm.
+
ascent = (face->size->metrics.ascender + 63) >> 6;
descent = (-face->size->metrics.descender + 63) >> 6;
height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
width = 0;
+ */
+
+ ascent = f->ascent;
+ descent = f->descent;
+ height = max (ascent + descent, f->height);
+ width = 0;
+
bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
XftUnlockFace (f);
diff -ur rxvt-unicode-9.22-a/src/screen.C rxvt-unicode-9.22-b/src/screen.C
--- rxvt-unicode-9.22-a/src/screen.C 2016-01-18 20:35:08.000000000 +0100
+++ rxvt-unicode-9.22-b/src/screen.C 2021-01-26 13:41:32.889882053 +0100
@@ -295,6 +269,3 @@ diff -ur rxvt-unicode-9.22-a/src/xdefaults.C rxvt-unicode-9.22-b/src/xdefaults.C
#if ENABLE_COMBINING
"combining,"
#endif
Only in rxvt-unicode-9.22-b/src: xdefaults.C.orig
Only in rxvt-unicode-9.22-b: wide-glyphs-after.png
Only in rxvt-unicode-9.22-b: wide-glyphs-before.png