Merge pull request #11 from haraldg/multibyte

Allowing multibyte characters
This commit is contained in:
willfe
2016-08-14 09:15:31 -04:00
committed by GitHub
2 changed files with 2 additions and 7 deletions
+1
View File
@@ -7,6 +7,7 @@ v0.5dev (ongoing development)
- [fixed] Cleanup I2C handling (https://github.com/lcdproc/lcdproc/pull/8)
- [fixed] Add more patterns to .gitignore (https://github.com/lcdproc/lcdproc/pull/9)
- [added] New driver for Olimex MOD-LCD1x9
- [fixed] Allow multibyte characters (from string widget)
v0.5.7
- [fixed] Fix using the left key to change the ring and checkbox menu items
+1 -7
View File
@@ -310,9 +310,6 @@ render_string(Widget *w, int left, int top, int right, int bottom, int fy)
if ((w != NULL) && (w->text != NULL) &&
(w->x > 0) && (w->y > 0) && (w->y > fy) && (w->y <= bottom - top)) {
int length;
char str[BUFSIZE];
/*
* FIXME: Could be a bug here? w->x is recalculated (On first
* call only? Is it preserved between calls?) and first
@@ -320,10 +317,7 @@ render_string(Widget *w, int left, int top, int right, int bottom, int fy)
* strings totally off-screen. Is this on purpose? (M. Dolze)
*/
w->x = min(w->x, right - left);
length = min(right - left - w->x + 1, sizeof(str)-1);
strncpy(str, w->text, length);
str[length] = '\0';
drivers_string(w->x + left, w->y + top, str);
drivers_string(w->x + left, w->y + top, w->text);
}
return 0;
}