input: fix calculation of render limit

diff --git a/input.c b/input.c
index 1014ef0efb5a45c2fc840a483b4b3712f31444ad..f21d2192c2869c3bc3cec7fb4d8f03a998e0f820 100644 (file)
--- a/input.c
+++ b/input.c
@@ -12,7 +12,7 @@
 
 #define NCF_FILE       "/var/tuxbox/config/neutrino.conf"
 #define BUFSIZE        1024
-#define I_VERSION      2.0
+#define I_VERSION      2.01
 
 
 char FONT[128]="/share/fonts/neutrino.ttf";

diff --git a/inputd.c b/inputd.c
index 3abf2d8061c2944a0141b16cb8a87f73db36b4d3..5aea37256a4e9fc6e7e1c5743eb6cf8885908088 100644 (file)
--- a/inputd.c
+++ b/inputd.c
@@ -421,7 +421,7 @@ const char kalp[12][6]={"+-*/","abc
                        RenderBox(exs+xp*exsz+1, eys+5+yp*eysz+1, exs+(xp+1)*exsz-1, eys+(yp+1)*eysz-1, 0/*radius*/, (epos==i)?CMCS:CMC);
 
                        *trnd=(mask && format[i]==NUM && IsNum(estr[i]))?'*':estr[i];
-                       RenderString(trnd, exs+xp*exsz+2, eys+yp*eysz+tys+7, exsz-2, CENTER, MED, (epos==i)?CMCST:(IsInput(format[i]))?CMCT:CMCIT);
+                       RenderString(trnd, exs+xp*exsz, eys+yp*eysz+tys+7, exsz, CENTER, MED, (epos==i)?CMCST:(IsInput(format[i]))?CMCT:CMCIT);
                }
                memcpy(lfb, lbb, var_screeninfo.xres*var_screeninfo.yres*sizeof(uint32_t));
                

diff --git a/text.c b/text.c
index 83dd3bd748b872be9e7c2293cb4bd8c41517da63..c66ee66dfda36837cd7392ff1e660b58275d9358 100644 (file)
--- a/text.c
+++ b/text.c
@@ -147,7 +147,7 @@ int RenderChar(FT_ULong currentchar, int _sx, int _sy, int _ex, int color)
 
        if(color != -1) /* don't render char, return charwidth only */
        {
-               if (_sx + sbit->xadvance >= _ex)
+               if (_sx + sbit->xadvance > _ex + 5)
                        return -1; /* limit to maxwidth */
                uint32_t bgcolor = *(lbb + (sy + _sy - sbit->top) * stride + (sx + _sx));
                uint32_t fgcolor = bgra[color];