mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cellwidth calculation and some off-by-one errors (thanks to T. Jarosch).

Browse Source
This commit is contained in:
mmdolze
2010-10-28 20:50:16 +00:00
parent 152b68d5fe
commit 49cd060374
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers.c
+1 -1
View File
@@ -111,7 +111,7 @@ drivers_load_driver(const char *name)
display_props->width = driver->width(driver); display_props->width = driver->width(driver);
display_props->height = driver->height(driver); display_props->height = driver->height(driver);
if (driver->cellwidth != NULL && display_props->cellwidth > 0) if (driver->cellwidth != NULL && driver->cellwidth(driver) > 0)
display_props->cellwidth = driver->cellwidth(driver); display_props->cellwidth = driver->cellwidth(driver);
else else
display_props->cellwidth = LCD_DEFAULT_CELLWIDTH; display_props->cellwidth = LCD_DEFAULT_CELLWIDTH;
server/render.c
+4 -4
View File
@@ -282,7 +282,7 @@ render_string(Widget *w, int left, int top, int right, int bottom, int fy)
char str[BUFSIZE]; char str[BUFSIZE];
w->x = min(w->x, right - left); w->x = min(w->x, right - left);
length = min(right - left - w->x + 1, sizeof(str)); length = min(right - left - w->x + 1, sizeof(str)-1);
strncpy(str, w->text, length); strncpy(str, w->text, length);
str[length] = '\0'; str[length] = '\0';
drivers_string(w->x + left, w->y + top, str); drivers_string(w->x + left, w->y + top, str);
@@ -367,7 +367,7 @@ render_title(Widget *w, int left, int top, int right, int bottom, long timer)
drivers_icon(w->x + left, w->y + top, ICON_BLOCK_FILLED); drivers_icon(w->x + left, w->y + top, ICON_BLOCK_FILLED);
drivers_icon(w->x + left + 1, w->y + top, ICON_BLOCK_FILLED); drivers_icon(w->x + left + 1, w->y + top, ICON_BLOCK_FILLED);
length = min(length, sizeof(str)); length = min(length, sizeof(str)-1);
if ((length <= width) || (delay == 0)) { if ((length <= width) || (delay == 0)) {
/* copy test starting from the beginning */ /* copy test starting from the beginning */
@@ -405,7 +405,7 @@ render_title(Widget *w, int left, int top, int right, int bottom, long timer)
offset = (length - width) - offset; offset = (length - width) - offset;
/* copy test starting from offset */ /* copy test starting from offset */
length = min(width, sizeof(str)); length = min(width, sizeof(str)-1);
strncpy(str, w->text + offset, length); strncpy(str, w->text + offset, length);
str[length] = '\0'; str[length] = '\0';
@@ -439,7 +439,7 @@ render_scroller(Widget *w, int left, int top, int right, int bottom, long timer)
/*debug(RPT_DEBUG, "%s: %s %d",__FUNCTION__,w->text,timer);*/ /*debug(RPT_DEBUG, "%s: %s %d",__FUNCTION__,w->text,timer);*/
screen_width = abs(w->right - w->left + 1); screen_width = abs(w->right - w->left + 1);
screen_width = min(screen_width, sizeof(str)); screen_width = min(screen_width, sizeof(str)-1);
switch (w->length) { /* actually, direction... */ switch (w->length) { /* actually, direction... */
case 'm': // Marquee case 'm': // Marquee