devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

get the renderer working more better! "handle" sublines correctly, dont "draw" in the first viewport if we are using viewports, get rid of the idea of a linear token array (i.e we are going to use the parse tree directly)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26831 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-06-13 13:54:34 +00:00
parent 93460f50ba
commit 21cbdac55f
5 changed files with 70 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

65
utils/newparser/skin_render.c
View file

@ -22,25 +22,37 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
#include <ctype.h>
#include <string.h>
#include "skin_parser.h"
#include "skin_debug.h"
#include "tag_table.h"
#include "symbols.h"
#include "skin_scan.h"
#include "skin_structs.h"
void skin_render_alternator(struct skin_element* alternator, int line_number);
#define MAX_LINE 1024
typedef void (*skin_render_func)(struct skin_element* alternator,
char* buf, size_t buf_size, int line_number);
void skin_render_alternator(struct skin_element* alternator,
char* buf, size_t buf_size, int line_number);
/* Draw a LINE element onto the display */
void skin_render_line(struct skin_element* line, int line_number)
void skin_render_line(struct skin_element* line,
char* buf, size_t buf_size, int line_number)
{
int i=0, value;
int value;
if (line->children_count == 0)
return; /* empty line, do nothing */
struct skin_element *child = line->children[0];
skin_render_func func = skin_render_line;
char tempbuf[128];
while (child)
{
tempbuf[0] = '\0';
switch (child->type)
{
case CONDITIONAL:
@ -48,41 +60,58 @@ void skin_render_line(struct skin_element* line, int line_number)
if (value >= child->children_count)
value = child->children_count-1;
if (child->children[value]->type == SUBLINES)
skin_render_alternator(child->children[value], line_number);
func = skin_render_alternator;
else if (child->children[value]->type == LINE)
skin_render_line(child->children[value], line_number);
func = skin_render_line;
func(child->children[value], buf, buf_size, line_number);
break;
case TAG:
printf("%%%s", child->tag->name);
snprintf(tempbuf, sizeof(tempbuf), "%%%s", child->tag->name);
break;
case TEXT:
printf("%s", (char*)(child->data));
snprintf(tempbuf, sizeof(tempbuf), "%s", (char*)(child->data));
break;
case COMMENT:
default:
break;
}
strcat(buf, tempbuf);
child = child->next;
}
}
void skin_render_alternator(struct skin_element* alternator, int line_number)
#define TIME_AFTER(a,b) 1
void skin_render_alternator(struct skin_element* alternator,
char* buf, size_t buf_size, int line_number)
{
/*TODO Choose which subline to draw */
skin_render_line(alternator->children[0], line_number);
struct subline *subline = (struct subline*)alternator->data;
if (TIME_AFTER(subline->last_change_tick + subline->timeout, 0/*FIXME*/))
{
subline->current_line++;
if (subline->current_line >= alternator->children_count)
subline->current_line = 0;
}
skin_render_line(alternator->children[subline->current_line],
buf, buf_size, line_number);
}
void skin_render_viewport(struct skin_element* viewport)
void skin_render_viewport(struct skin_element* line, bool draw_tags)
{
struct skin_element *line = viewport;
int line_number = 0;
char linebuf[MAX_LINE];
skin_render_func func = skin_render_line;
while (line)
{
printf("\n[%d]", line_number); /* might be incorrect */
linebuf[0] = '\0';
if (line->type == SUBLINES)
skin_render_alternator(line, line_number);
func = skin_render_alternator;
else if (line->type == LINE)
skin_render_line(line, line_number);
func = skin_render_line;
func (line, linebuf, sizeof(linebuf), line_number);
if (draw_tags)
{
printf("%s\n", linebuf);
}
line_number++;
line = line->next;
}
@ -91,9 +120,11 @@ void skin_render_viewport(struct skin_element* viewport)
void skin_render(struct skin_element* root)
{
struct skin_element* viewport = root;
bool draw_tags = viewport->next ? false : true;
while (viewport)
{
skin_render_viewport(viewport->children[0]);
skin_render_viewport(viewport->children[0], draw_tags);
draw_tags = true;
viewport = viewport->next;
}
}