@@ -1,6 +1,6 @@

 CC=gcc

-CFLAGS=-Wall -g

-LDFLAGS=

+CFLAGS=-Wall -g -I/usr/include/SDL2

+LDFLAGS=-lSDL2 -lSDL2_image -lSDL2_ttf

 all: widgetlib.o

@@ -14,6 +14,17 @@

 #include <stdarg.h>

+#include "SDL.h"

+#include "SDL_rwops.h"

+#include "SDL_image.h"

+#include "SDL_ttf.h"

+

+/* widget names */

+#define WI_LABEL "label"

+#define WI_FRAME "frame"

+#define WI_IMAGE "image"

+

+/* structs */

 typedef struct xywh_t {

         int x;

         int y;

@@ -86,6 +97,9 @@ typedef struct widget_t {

         int sizeconfs;

         int usedconfs;

         wiconf_t **confs;

+        SDL_Surface *surface;

+        SDL_Texture *texture;

+        int dirty;

 } widget_t;

 typedef struct witoplevel_t {

@@ -100,6 +114,9 @@ typedef struct witoplevel_t {

         int sizeconfs;

         int usedconfs;

         wiconf_t **confs;

+        SDL_Window *win;

+        SDL_Renderer *renderer;

+        int dirty;

 } witoplevel_t;

 typedef struct wialias_t {

@@ -135,6 +152,21 @@ typedef struct wiclass_t {

         void (*classcallback)(void *wi, struct wiclass_t *cl, widget_t *widget, wiclassop_t *op);

 } wiclass_t;

+typedef struct wifontinstance_t {

+        int size;

+        TTF_Font *font;

+} wifontinstance_t;

+

+typedef struct wifont_t {

+        char *name;

+        int sizedata;

+        char *data;

+        SDL_RWops *rwops;

+        int sizefontinstances;

+        int usedfontinstances;

+        wifontinstance_t *fontinstances;

+} wifont_t;

+

 typedef struct wi_t {

         int sizeclasses;

         int usedclasses;

@@ -149,6 +181,9 @@ typedef struct wi_t {

         int sizevars;

         int usedvars;

         wivar_t **vars;

+        int sizefonts;

+        int usedfonts;

+        wifont_t *fonts;

 } wi_t;

 wi_t wi_init(void);

@@ -173,5 +208,11 @@ int wi_tree_move(wi_t *wi, char *path, char *newparent);

 int wi_var_updated(wi_t *wi, char *vardata, int sizevardata);

 int wi_var_destroy(wi_t *wi, char *vardata, int sizevardata);

+int wi_font_load(wi_t *wi, char *filename, char *fontname);

+

+/* default widgets */

+void wi_classcallback_frame(void *wi, wiclass_t *cl, widget_t *widget, wiclassop_t *op);

+void wi_classcallback_label(void *wi, wiclass_t *cl, widget_t *widget, wiclassop_t *op);

+void wi_classcallback_image(void *wi, wiclass_t *cl, widget_t *widget, wiclassop_t *op);

 #endif