summaryrefslogtreecommitdiff
path: root/gfx/gfx.c
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/gfx.c')
-rw-r--r--gfx/gfx.c95
1 files changed, 57 insertions, 38 deletions
diff --git a/gfx/gfx.c b/gfx/gfx.c
index 6236888..0324cfd 100644
--- a/gfx/gfx.c
+++ b/gfx/gfx.c
@@ -12,36 +12,40 @@
#include <stdbool.h>
+#include <stdlib.h>
+#include "misc/util.h"
#include "gfx/style.h"
#include "gfx/text.h"
#include "gfx/gfx.h"
-void *gfx_ctx;
+struct gfx {
+ const struct gfx_ops *ops;
+ void *user;
+};
-static const struct gfx_ops *gfx_ops;
-
-void gfx_line(int sx, int sy, int ex, int ey, int color, unsigned layer)
+void gfx_line(struct gfx *gfx,
+ int sx, int sy, int ex, int ey, int color, unsigned layer)
{
- if (gfx_ops->line) {
- gfx_ops->line(gfx_ctx, sx, sy, ex, ey, color, layer);
+ if (gfx->ops->line) {
+ gfx->ops->line(gfx->user, sx, sy, ex, ey, color, layer);
return;
}
int vx[] = { sx, ex };
int vy[] = { sy, ey };
- gfx_poly(2, vx, vy, color, COLOR_NONE, layer);
+ gfx_poly(gfx, 2, vx, vy, color, COLOR_NONE, layer);
}
-void gfx_rect(int sx, int sy, int ex, int ey,
+void gfx_rect(struct gfx *gfx, int sx, int sy, int ex, int ey,
int color, int fill_color, unsigned layer)
{
- if (gfx_ops->rect) {
- gfx_ops->rect(gfx_ctx, sx, sy, ex, ey,
+ if (gfx->ops->rect) {
+ gfx->ops->rect(gfx->user, sx, sy, ex, ey,
color, fill_color, layer);
return;
}
@@ -49,79 +53,94 @@ void gfx_rect(int sx, int sy, int ex, int ey,
int vx[] = { sx, ex, ex, sx, sx };
int vy[] = { sy, sy, ey, ey, sy };
- gfx_poly(5, vx, vy, color, fill_color, layer);
+ gfx_poly(gfx, 5, vx, vy, color, fill_color, layer);
}
-void gfx_poly(int points, const int x[points], const int y[points],
+void gfx_poly(struct gfx *gfx,
+ int points, const int x[points], const int y[points],
int color, int fill_color, unsigned layer)
{
- gfx_ops->poly(gfx_ctx, points, x, y, color, fill_color, layer);
+ gfx->ops->poly(gfx->user, points, x, y, color, fill_color, layer);
}
-void gfx_circ(int x, int y, int r, int color, int fill_color, unsigned layer)
+void gfx_circ(struct gfx *gfx,
+ int x, int y, int r, int color, int fill_color, unsigned layer)
{
- gfx_ops->circ(gfx_ctx, x, y, r, color, fill_color, layer);
+ gfx->ops->circ(gfx->user, x, y, r, color, fill_color, layer);
}
-void gfx_arc(int x, int y, int r, int sa, int ea,
+void gfx_arc(struct gfx *gfx, int x, int y, int r, int sa, int ea,
int color, int fill_color, unsigned layer)
{
- gfx_ops->arc(gfx_ctx, x, y, r, sa, ea, color, fill_color, layer);
+ gfx->ops->arc(gfx->user, x, y, r, sa, ea, color, fill_color, layer);
}
-void gfx_text(int x, int y, const char *s, unsigned size,
+void gfx_text(struct gfx *gfx, int x, int y, const char *s, unsigned size,
enum text_align align, int rot, unsigned color, unsigned layer)
{
- gfx_ops->text(gfx_ctx, x, y, s, size, align, rot, color, layer);
+ gfx->ops->text(gfx->user, x, y, s, size, align, rot, color, layer);
}
-void gfx_tag(const char *s,
+void gfx_tag(struct gfx *gfx, const char *s,
unsigned points, const int x[points], int const y[points])
{
- if (gfx_ops->tag)
- gfx_ops->tag(gfx_ctx, s, points, x, y);
+ if (gfx->ops->tag)
+ gfx->ops->tag(gfx->user, s, points, x, y);
}
-unsigned gfx_text_width(const char *s, unsigned size)
+unsigned gfx_text_width(struct gfx *gfx, const char *s, unsigned size)
{
- return gfx_ops->text_width(gfx_ctx, s, size);
+ return gfx->ops->text_width(gfx->user, s, size);
}
-void gfx_init(const struct gfx_ops *ops, int argc, char *const *argv)
+struct gfx *gfx_init(const struct gfx_ops *ops,
+ int argc, char *const *argv)
{
- gfx_ctx = ops->init(argc, argv);
- gfx_ops = ops;
+ struct gfx *new;
+
+ new = alloc_type(struct gfx);
+ new->user = ops->init(argc, argv);
+ new->ops = ops;
+ return new;
}
-void gfx_sheet_name(const char *name)
+void gfx_sheet_name(struct gfx *gfx, const char *name)
{
- if (gfx_ops->sheet_name)
- gfx_ops->sheet_name(gfx_ctx, name);
+ if (gfx->ops->sheet_name)
+ gfx->ops->sheet_name(gfx->user, name);
}
-void gfx_new_sheet(void)
+void gfx_new_sheet(struct gfx *gfx)
{
- if (gfx_ops->new_sheet)
- gfx_ops->new_sheet(gfx_ctx);
+ if (gfx->ops->new_sheet)
+ gfx->ops->new_sheet(gfx->user);
}
-bool gfx_multi_sheet(void)
+bool gfx_multi_sheet(struct gfx *gfx)
{
- return !!gfx_ops->new_sheet;
+ return !!gfx->ops->new_sheet;
}
-void gfx_end(void)
+
+void *gfx_user(struct gfx *gfx)
+{
+ return gfx->user;
+}
+
+
+void gfx_end(struct gfx *gfx)
{
- if (gfx_ops->end)
- gfx_ops->end(gfx_ctx);
+ if (gfx->ops->end)
+ gfx->ops->end(gfx->user);
+ free(gfx);
}