femsci/toilet
femsci/toilet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Properly handle \r \n \t in the big and tiny renderers.

Browse source
This commit is contained in:
Sam Hocevar 2006-10-10 07:15:28 +00:00 committed by sam
parent 24156a3003
commit 56673021ed
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/render.c
View file

@ -48,6 +48,19 @@ int init_tiny(context_t *cx)
static int feed_tiny(context_t *cx, uint32_t ch)
{
switch(ch)
{
case (uint32_t)'\r':
return 0;
case (uint32_t)'\n':
cx->x = 0;
cx->y++;
return 0;
case (uint32_t)'\t':
cx->x = (cx->x & ~7) + 8;
return 0;
}
/* Check whether we reached the end of the screen */
if(cx->x && cx->x + 1 > cx->term_width)
{
@ -72,22 +85,8 @@ static int feed_tiny(context_t *cx, uint32_t ch)
cucul_set_canvas_size(cx->cv, cx->ew, cx->eh);
switch(ch)
{
case (uint32_t)'\r':
return 0;
case (uint32_t)'\n':
cx->x = 0;
cx->y++;
break;
case (uint32_t)'\t':
cx->x = (cx->x & ~7) + 8;
break;
default:
cucul_putchar(cx->cv, cx->x, cx->y, ch);
cx->x++;
break;
}
cucul_putchar(cx->cv, cx->x, cx->y, ch);
cx->x++;
return 0;
}
@ -126,6 +125,19 @@ static int feed_big(context_t *cx, uint32_t ch)
unsigned int h = cucul_get_font_height(cx->f);
unsigned int x, y;
switch(ch)
{
case (uint32_t)'\r':
return 0;
case (uint32_t)'\n':
cx->x = 0;
cx->y += h;
return 0;
case (uint32_t)'\t':
cx->x = (((cx->x / w) & ~7) + 8) * w;
return 0;
}
/* Check whether we reached the end of the screen */
if(cx->x && cx->x + w > cx->term_width)
{