diff options
Diffstat (limited to 'sources/main.c')
| -rw-r--r-- | sources/main.c | 148 |
1 files changed, 115 insertions, 33 deletions
diff --git a/sources/main.c b/sources/main.c index 791cf43..4049a30 100644 --- a/sources/main.c +++ b/sources/main.c @@ -38,6 +38,26 @@ typedef struct { + enum + { + IUI_ILL, + IUI_BOX, + IUI_FILL, + IUI_LINE, + IUI_TEXT, + + } type; + + u32 color; + u16 x, y, w, h; + u16 size; + char* text; + +} iui_cmd; + +#define IUI_CMDBUF_LEN 512 +typedef struct +{ void* usr; usize hot; @@ -51,8 +71,12 @@ typedef struct u8 pbtns; u8 btns; + usize ncmds; + iui_cmd cmds[IUI_CMDBUF_LEN]; /* TODO: arena? */ + } iui; + void iui_start(iui* ui, void* usr) { assert(ui); @@ -96,44 +120,34 @@ int iui_button(iui* ui, u16 x, u16 y, int w, int h, char* label) imactive = ui->active == id; { - XGCValues gcvals = {0}; + iui_cmd cmd = {0}; + cmd.type = IUI_FILL; - if(imhot) gcvals.line_width = 2; - else gcvals.line_width = 1; + cmd.x = x; + cmd.y = y; + cmd.w = w; + cmd.h = h; - if(imactive) gcvals.foreground = x11->cols.as.fg; - else gcvals.foreground = x11->cols.as.bg; - - XChangeGC(x11->disp, x11->gc, GCForeground | GCLineWidth, &gcvals); - XFillRectangle(x11->disp, x11->wnd, x11->gc, x, y, w, h); + if(imhot) cmd.size = 2; + else cmd.size = 1; - XSetForeground(x11->disp, x11->gc, x11->cols.as.fg); - XDrawLine(x11->disp, x11->wnd, x11->gc, x, y, x, y + h); - XDrawLine(x11->disp, x11->wnd, x11->gc, x + w, y, x, y); + if(imactive) cmd.color = x11->cols.as.fg; + else cmd.color = x11->cols.as.bg; - XSetForeground(x11->disp, x11->gc, x11->cols.as.fg); - XDrawLine(x11->disp, x11->wnd, x11->gc, x, y + h, x + w, y + h); - XDrawLine(x11->disp, x11->wnd, x11->gc, x + w, y + h, x + w, y); - } + ui->cmds[ui->ncmds++] = cmd; - { - usize len; - int xx, yy; - int di, fa, fd; - int width, height; - XCharStruct chs = {0}; + cmd.type = IUI_BOX; + cmd.color = x11->cols.as.fg; + ui->cmds[ui->ncmds++] = cmd; - len = strlen(label); - XTextExtents(x11->xfs, label, len, &di, &fa, &fd, &chs); - width = chs.rbearing - chs.lbearing; - height = chs.ascent + chs.descent; + cmd.type = IUI_TEXT; + cmd.size = 14; + cmd.text = label; - xx = x + w / 2 - width / 2; - yy = y + h / 2 + height / 2; + if(imactive) cmd.color = x11->cols.as.bg; + else cmd.color = x11->cols.as.fg; - if(imactive) XSetForeground(x11->disp, x11->gc, x11->cols.as.bg); - else XSetForeground(x11->disp, x11->gc, x11->cols.as.fg); - XDrawString(x11->disp, x11->wnd, x11->gc, xx, yy, label, len); + ui->cmds[ui->ncmds++] = cmd; } return imhot && imactive && !(ui->btns & bit(1)); @@ -172,8 +186,6 @@ int iui_textbox(iui* ui, u16 x, u16 y, int w, int h, char* buf, usize buflen) XSetForeground(x11->disp, x11->gc, x11->cols.as.fg); XDrawLine(x11->disp, x11->wnd, x11->gc, x, y, x, y + h); XDrawLine(x11->disp, x11->wnd, x11->gc, x + w, y, x, y); - - XSetForeground(x11->disp, x11->gc, x11->cols.as.fg); XDrawLine(x11->disp, x11->wnd, x11->gc, x, y + h, x + w, y + h); XDrawLine(x11->disp, x11->wnd, x11->gc, x + w, y + h, x + w, y); } @@ -219,6 +231,75 @@ int iui_textbox(iui* ui, u16 x, u16 y, int w, int h, char* buf, usize buflen) return imhot && imactive && !(ui->btns & bit(1)); } +void iui_draw(iui* ui) +{ + usize i; + xctx* x11 = NULL; + + assert(ui); + x11 = (xctx*)ui->usr; + + for(i = 0; i < ui->ncmds; i++) + { + iui_cmd* cmd = ui->cmds + i; + switch(cmd->type) + { + case IUI_FILL: + { + XGCValues gcvals = {0}; + + gcvals.line_width = cmd->size; + gcvals.foreground = cmd->color; + + XChangeGC(x11->disp, x11->gc, GCForeground | GCLineWidth, &gcvals); + XFillRectangle(x11->disp, x11->wnd, x11->gc, cmd->x, cmd->y, + cmd->w, cmd->h); + } + break; + + case IUI_BOX: + { + XGCValues gcvals = {0}; + + gcvals.line_width = cmd->size; + gcvals.foreground = cmd->color; + + XChangeGC(x11->disp, x11->gc, GCForeground | GCLineWidth, &gcvals); + XDrawRectangle(x11->disp, x11->wnd, x11->gc, cmd->x, cmd->y, + cmd->w, cmd->h); + } + break; + + case IUI_TEXT: + { + int xx, yy; + int di, fa, fd; + int width, height; + int len; + XCharStruct chs = {0}; + + len = strlen(cmd->text); + XTextExtents(x11->xfs, cmd->text, len, &di, &fa, &fd, &chs); + width = chs.rbearing - chs.lbearing; + height = chs.ascent + chs.descent; + + xx = cmd->x + cmd->w / 2 - width / 2; + yy = cmd->y + cmd->h / 2 + height / 2; + + XSetForeground(x11->disp, x11->gc, cmd->color); + XDrawString(x11->disp, x11->wnd, x11->gc, xx, yy, cmd->text, len); + } + break; + + default: + report(WARN, "IUI: Unknown draw command %u\n", cmd->type); + break; + } + } + + ui->ncmds = 0; +} + int main(int argc, char** argv) { @@ -333,6 +414,8 @@ int main(int argc, char** argv) len = snprintf(buf, lengthof(buf), "cur: %dx%d", ui.x, ui.y); XDrawString(x11.disp, x11.wnd, x11.gc, 650, 65, buf, len); + iui_draw(&ui); + len = snprintf(buf, lengthof(buf), "btn: %d%d%d", ui.btns & bit(1) ? 1 : 0, ui.btns & bit(2) ? 2 : 0, @@ -433,7 +516,6 @@ int main2(int argc, char** argv) { char buf[512] = {0}; - c8_disasm(c8.RAM, c8.pc, buf); printf("%04X: %s\n", c8.pc, buf); |