Merge pull request #273 from jan-schreib/master
rxvt-unicode: added patches to set space between letters
This commit is contained in:
commit
272af1a8dd
3 changed files with 52 additions and 1 deletions
26
srcpkgs/rxvt-unicode/patches/font-width-fix.patch
Normal file
26
srcpkgs/rxvt-unicode/patches/font-width-fix.patch
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
--- src/rxvtfont.C.bukind 2007-11-30 14:36:33.000000000 +0600
|
||||||
|
+++ src/rxvtfont.C 2007-11-30 14:39:29.000000000 +0600
|
||||||
|
@@ -1171,12 +1171,21 @@
|
||||||
|
XGlyphInfo g;
|
||||||
|
XftTextExtents16 (disp, f, &ch, 1, &g);
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * bukind: don't use g.width as a width of a character!
|
||||||
|
+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
|
||||||
|
+
|
||||||
|
g.width -= g.x;
|
||||||
|
|
||||||
|
int wcw = WCWIDTH (ch);
|
||||||
|
if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
|
||||||
|
|
||||||
|
if (width < g.width ) width = g.width;
|
||||||
|
+ */
|
||||||
|
+ int wcw = WCWIDTH (ch);
|
||||||
|
+ if (wcw > 1) g.xOff = g.xOff / wcw;
|
||||||
|
+ if (width < g.xOff) width = g.xOff;
|
||||||
|
+
|
||||||
|
if (height < g.height ) height = g.height;
|
||||||
|
if (glheight < g.height - g.y) glheight = g.height - g.y;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
25
srcpkgs/rxvt-unicode/patches/line-spacing-fix.patch
Normal file
25
srcpkgs/rxvt-unicode/patches/line-spacing-fix.patch
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
--- src/rxvtfont.C.orig 2011-07-20 22:19:29.878012201 -0300
|
||||||
|
+++ src/rxvtfont.C 2011-07-20 22:19:33.634671723 -0300
|
||||||
|
@@ -1237,11 +1237,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);
|
|
@ -1,7 +1,7 @@
|
||||||
# Template build file for 'rxvt-unicode'.
|
# Template build file for 'rxvt-unicode'.
|
||||||
pkgname=rxvt-unicode
|
pkgname=rxvt-unicode
|
||||||
version=9.19
|
version=9.19
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="
|
configure_args="
|
||||||
--with-terminfo=/usr/share/terminfo --enable-256-color
|
--with-terminfo=/usr/share/terminfo --enable-256-color
|
||||||
|
|
Loading…
Reference in a new issue