[gentoo-commits] gentoo-x86 commit in x11-terms/rxvt-unicode/files: rxvt-unicode-9.06-font-width.patch

[Jeroen Roovers (jer)]

jer         10/02/03 05:07:46

  Added:                rxvt-unicode-9.06-font-width.patch
  Log:
  Add character width patch thanks to Slava Gorbunov (bug #277830). Do not evaluate USE flags in subshell. Die when emake fails.
  (Portage version: 2.2_rc62/cvs/Linux i686)

Revision  Changes    Path
1.1                  x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch?rev=1.1&content-type=text/plain

Index: rxvt-unicode-9.06-font-width.patch
===================================================================
--- src/rxvtfont.C.orig	2008-07-09 12:21:45.000000000 +0400
+++ src/rxvtfont.C	2009-10-30 14:32:53.000000000 +0300
@@ -1195,12 +1195,14 @@
           XGlyphInfo g;
           XftTextExtents16 (disp, f, &ch, 1, &g);
 
-          g.width -= g.x;
-
+/*  
+ * 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
+ */
           int wcw = WCWIDTH (ch);
-          if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
+          if (wcw > 1) g.xOff = g.xOff / wcw;
+          if (width < g.xOff) width = g.xOff;
 
-          if (width    < g.width       ) width    = g.width;
           if (height   < g.height      ) height   = g.height;
           if (glheight < g.height - g.y) glheight = g.height - g.y;
         }