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

fix prev commit: correctly check on left side too

Browse Source
This commit is contained in:
marschap
2006-04-07 16:40:13 +00:00
parent 0ff8c4e032
commit 7c0590b37b
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/debug.c
+4 -5
View File
@@ -145,13 +145,12 @@ debug_string (Driver *drvthis, int x, int y, char string[])
y --; x --; // Convert 1-based coords to 0-based... y --; x --; // Convert 1-based coords to 0-based...
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) if ((y < 0) || (y >= height))
return; return;
for (i = 0; string[i] != '\0'; i++) { for (i = 0; (string[i] != '\0') && (x < width); i++, x++) {
if (x + i >= width) if (x >= 0) // no write left of left border
break; framebuf[(y * width) + x] = string[i];
framebuf[(y * width) + x + i] = string[i];
} }
} }
server/drivers/text.c
+6 -6
View File
@@ -174,13 +174,12 @@ text_string (Driver *drvthis, int x, int y, char string[])
x--; y--; // Convert 1-based coords to 0-based... x--; y--; // Convert 1-based coords to 0-based...
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) if ((y < 0) || (y >= height))
return; return;
for (i = 0; string[i] != '\0'; i++) { for (i = 0; (string[i] != '\0') && (x < width); i++, x++) {
if (x + i >= width) // no write over right border if (x >= 0) // no write left of left border
break; framebuf[(y * width) + x] = string[i];
framebuf[(y * width) + x + i] = string[i];
} }
} }
@@ -193,7 +192,8 @@ text_chr (Driver *drvthis, int x, int y, char c)
{ {
y--; x--; y--; x--;
framebuf[(y * width) + x] = c; if ((x >= 0) && (y >= 0) && (x < width) && (y < height))
framebuf[(y * width) + x] = c;
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////