working again

test/Makefile

@@ -1,5 +1,5 @@
 CFLAGS  = -Wall -Wextra -Wpedantic -std=c11 -g
-LDFLAGS = -lSDL2
+LDFLAGS = -lSDL2 -lm
 
 test: main.c ../ugui.c ../ugui.h
 	gcc ${CFLAGS} -c ../ugui.c -o ugui.o

test/main.c

@@ -3,6 +3,13 @@
 
 #include "../ugui.h"
 
+
+SDL_Window *w;
+SDL_Renderer *r;
+ug_ctx_t *ctx;
+
+void cleanup(void);
+
 int main(void)
 {
 	SDL_DisplayMode dm;
@@ -22,7 +29,6 @@ int main(void)
 	SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1");
 #endif
 
-	SDL_Window *w;
 	w = SDL_CreateWindow("test", 
 	                     SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
 	                     dm.w*0.8, dm.h*0.8, 
@@ -31,7 +37,6 @@ int main(void)
 
 	//SDL_Surface *s;
 	//s = SDL_GetWindowSurface(w);
-	SDL_Renderer *r;
 	r = SDL_CreateRenderer(w, -1, SDL_RENDERER_ACCELERATED);
 
 
@@ -47,11 +52,13 @@ int main(void)
 	SDL_GetDisplayDPI(idx, &dpi, NULL, NULL);
 
 
-	ug_ctx_t *ctx = ug_ctx_new();
+	ctx = ug_ctx_new();
 	ug_ctx_set_displayinfo(ctx, scale, dpi);
 	ug_ctx_set_drawableregion(ctx, dsize);
 
 
+//	atexit(cleanup);
+
 	SDL_Event event;
 
 	char button_map[] = {
@@ -168,10 +175,11 @@ int main(void)
 
 		ug_frame_begin(ctx);
 
+		ug_ctx_set_unit(ctx, UG_UNIT_MM);
 		ug_container_floating(ctx, "stupid name", 
-		                      (ug_rect_t){.x = 0, .y = 0, .w = 100, .h = 300});
+		                      (ug_rect_t){.fx = 0, .fy = 0, .fw = 50, .fh = 50});
 		ug_container_floating(ctx, "better name", 
-		                      (ug_rect_t){.x = -20, .y = -10, .w = 100, .h = 200});
+		                      (ug_rect_t){.fx = -20, .fy = -10, .fw = 100, .fh = 30});
 
 		ug_frame_end(ctx);
 
@@ -187,8 +195,8 @@ int main(void)
 				.w = cmd.rect.w,
 				.h = cmd.rect.h,
 			};
-			printf("DRAWING: x=%d, y=%d, w=%d, h=%d\n", sr.x, sr.y, sr.w, sr.h);
+			//printf("DRAWING: x=%d, y=%d, w=%d, h=%d\n", sr.x, sr.y, sr.w, sr.h);
-			printf("COLOR: #%.8X\n", *((unsigned int *)&col));
+			//printf("COLOR: #%.8X\n", *((unsigned int *)&col));
 			SDL_SetRenderDrawColor(r, col.r, col.g, col.b, col.a);
 			SDL_RenderFillRect(r, &sr);
 		}
@@ -198,11 +206,15 @@ int main(void)
 
 	} while (event.type != SDL_QUIT);
 
+	cleanup();
 
+	return 0;
+}
+
+void cleanup(void)
+{
 	ug_ctx_free(ctx);
-
 	SDL_DestroyRenderer(r);
 	SDL_DestroyWindow(w);
 	SDL_Quit();
-	return 0;
+}
-}

ugui.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <errno.h>
 #include <err.h>
+#include <math.h>
 
 #include "ugui.h"
 
@@ -17,7 +18,8 @@
 #define IS_VALID_UNIT(u)     (u==UG_UNIT_PX||u==UG_UNIT_MM||u==UG_UNIT_PT)
 #define UG_ERR(...)          err(errno, "__FUNCTION__: " __VA_ARGS__)
 #define BETWEEN(x, min, max) (x <= max && x >= min)
-#define INTERSECTS(v, r) (BETWEEN(v.x, r.x, r.x+r.w) && BETWEEN(v.y, r.y, r.y+r.h))
+#define INTERSECTS(v, r)     (BETWEEN(v.x, r.x, r.x+r.w) && BETWEEN(v.y, r.y, r.y+r.h))
+#define CAP(x, s)            { if (x < s) x = s; }
 
 
 // default style
@@ -111,30 +113,6 @@ static void update_style_cache(ug_ctx_t *ctx)
 }
 
 
-ug_rect_t rect_to_px(ug_ctx_t *ctx, ug_rect_t rect)
-{
-	float scale = 1.0;
-	
-	switch (ctx->unit) {
-	case UG_UNIT_PX:
-		return rect;
-	case UG_UNIT_MM:
-		scale = ctx->ppm;
-		break;
-	case UG_UNIT_PT:
-		scale = ctx->ppd;
-		break;
-	}
-
-	rect.x *= scale;
-	rect.y *= scale;
-	rect.w *= scale;
-	rect.h *= scale;
-
-	return rect;
-}
-
-
 void push_rect_command(ug_ctx_t *ctx, const ug_rect_t *rect, ug_color_t color)
 {
 	ug_cmd_t *c;
@@ -161,14 +139,10 @@ ug_ctx_t *ug_ctx_new(void)
 		err(errno, "__FUNCTION__:" "Could not allocate context: %s", strerror(errno));
 	memset(ctx, 0, sizeof(ug_ctx_t));
 
-	ctx->scale     = DEF_SCALE;
-	ctx->ppi       = DEF_PPI;
-	ctx->ppm       = PPI_PPM(DEF_SCALE, DEF_PPI);
-	ctx->ppd       = PPI_PPD(DEF_SCALE, DEF_PPI);
-	
 	ctx->unit      = UG_UNIT_PX;
 	ctx->style     = &default_style;
 	ctx->style_px  = &style_cache;
+	ug_ctx_set_displayinfo(ctx, DEF_SCALE, DEF_PPI);
 
 	// TODO: allocate stacks
 	return ctx;
@@ -200,9 +174,12 @@ int ug_ctx_set_displayinfo(ug_ctx_t *ctx, float scale, float ppi)
 	if (scale <= 0 || ppi < 20.0)
 		return -1;
 	
+	ctx->last_ppi = ctx->ppi;
+	ctx->last_ppm = ctx->ppd;
+	ctx->last_ppd = ctx->ppm;
+
 	ctx->ppm   = PPI_PPM(scale, ppi);
 	ctx->ppd   = PPI_PPM(scale, ppi);
-	ctx->scale = scale;
 	ctx->ppi   = ppi;
 	
 	update_style_cache(ctx);
@@ -280,26 +257,37 @@ static ug_container_t *get_container(ug_ctx_t *ctx, ug_id_t id)
 // also handle resizing, moving, ect. if allowed by the container
 static void update_container(ug_ctx_t *ctx, ug_container_t *cnt)
 {
-	// if the container was just initialized the unit might not be pixels, this
+	// if the container is new it has never been converted to pixels
-	// is a problem since all mouse events are in pixels and convering back
-	// and forth accumulates error and in heavy on the cpu
 	if (cnt->unit != UG_UNIT_PX) {
-		// FIXME: this takes the unit from the context but it should be fine
+		float scale = 1.0;
-		cnt->rect = rect_to_px(ctx, cnt->rect);
+		switch (ctx->unit) {
+		case UG_UNIT_MM: scale = ctx->ppm; break;
+		case UG_UNIT_PT: scale = ctx->ppd; break;
+		default: break;
+		}
+		cnt->rect.x = roundf(cnt->rect.fx * scale);
+		cnt->rect.y = roundf(cnt->rect.fy * scale);
+		cnt->rect.w = roundf(cnt->rect.fw * scale);
+		cnt->rect.h = roundf(cnt->rect.fh * scale);
+
 		cnt->unit = UG_UNIT_PX;
+	} else if (ctx->ppi != ctx->last_ppi) {
+		// if the scale has been updated than we need to scale the container
+		// as well
+		float scale = ctx->ppi / ctx->last_ppi;
+		cnt->rect.x = roundf(cnt->rect.x * scale);
+		cnt->rect.y = roundf(cnt->rect.y * scale);
+		cnt->rect.w = roundf(cnt->rect.w * scale);
+		cnt->rect.h = roundf(cnt->rect.h * scale);
 	}
 
-	// recalculate position
+	cnt->rca = cnt->rect;
-	// FIXME: this is the right place to do some optimization, what if the 
-	//        context didn't change?
-	// the absoulute position of the container
-	cnt->rect_abs = cnt->rect;
 
 	/*
 	 * Container style:
 	 * 
-	 * rect_abs(0,0)
+	 * rca
-	 * v
+	 * v 
 	 * +-----------------------------------------------+
 	 * |          Titlebar                             |
 	 * +-----------------------------------------------+
@@ -325,114 +313,121 @@ static void update_container(ug_ctx_t *ctx, ug_container_t *cnt)
 	 */
 	
 	const ug_style_t *s = ctx->style_px;
-	// 0 -> take all the space, <0 -> take absolute
+	int bl = s->cnt.border.l.size;
-	if (cnt->rect_abs.w < 0)  cnt->rect_abs.w = -cnt->rect_abs.w;
+	int br = s->cnt.border.r.size;
-	if (cnt->rect_abs.h < 0)  cnt->rect_abs.h = -cnt->rect_abs.h;
+	int bt = s->cnt.border.t.size;
+	int bb = s->cnt.border.b.size;
+	int hh = s->cnt.titlebar.height.size;
+	int cw = ctx->size.w;
+	int ch = ctx->size.h;
 
-	if (cnt->rect_abs.w == 0) cnt->rect_abs.w = ctx->size.w          - 
+	// 0 -> take all the space, <0 -> take absolute
-	                                  s->cnt.border.l.size -
+	if (cnt->rect.w < 0)  cnt->rca.w = -cnt->rect.w;
-					  s->cnt.border.r.size ;
+	if (cnt->rect.h < 0)  cnt->rca.h = -cnt->rect.h;
-	if (cnt->rect_abs.h == 0) cnt->rect_abs.h = ctx->size.h          -
+
-	                                  s->cnt.border.t.size -
+	// handle relative position
-					  s->cnt.border.b.size ;
+	// and move to fit borders
-        if (cnt->flags & UG_CNT_MOVABLE) 
+	if (cnt->rect.w == 0) cnt->rca.w = cw - br - bl;
-		cnt->rect_abs.h += s->cnt.titlebar.height.size;
+	else cnt->rca.w += bl + br;
+	if (cnt->rect.h == 0) cnt->rca.h = ch - bt - bb;
+	else if (cnt->flags & UG_CNT_MOVABLE) cnt->rca.h += hh + 2*bt + bb;
+	else cnt->rca.h += bt + bb;
+
+
+	// the window may have been resized so cap the position to the window size
+	// FIXME: is MAX(cw - bl, 0) better?
+	if (cnt->rect.x > cw) cnt->rca.x = cw;
+	if (cnt->rect.y > ch) cnt->rca.y = ch;
 
 	// <0 -> relative to the right margin
-	if (cnt->rect_abs.x < 0) 
+	if (cnt->rect.x < 0) cnt->rca.x = cw - cnt->rca.w + cnt->rca.x;
-		cnt->rect_abs.x = ctx->size.x - cnt->rect_abs.w + cnt->rect_abs.x;
+	if (cnt->rect.y < 0) cnt->rca.y = ch - cnt->rca.h + cnt->rca.y;
-	if (cnt->rect_abs.y < 0) 
-		cnt->rect_abs.y = ctx->size.y - cnt->rect_abs.h + cnt->rect_abs.y;
 
 	// if we had focus the frame before, then do shit
-	// FIXME: if this is a brand new container then do we need to handle user
+	if (ctx->hover.cnt_last != cnt->id)
-	//        inputs, since all inputs lag one frame, then it would make no sense
+		goto cnt_draw;
-	if (ctx->hover.cnt_last == cnt->id) {
-		// mouse pressed handle resize, for simplicity containers can only 
-		// be resized from the bottom and right border
 
-#define BIN_PATTERN "%c%c%c%c%c%c%c%c"
+	// mouse pressed handle resize, for simplicity containers can only 
-#define BYTE_TO_BINARY(byte)  \
+	// be resized from the bottom and right border
-  (byte & 0x80 ? '1' : '0'), \
+	// TODO: bring selected container to the top of the stack
-  (byte & 0x40 ? '1' : '0'), \
+	if (!(ctx->mouse.down_mask & UG_BTN_LEFT) ||
-  (byte & 0x20 ? '1' : '0'), \
+	    !(cnt->flags & (UG_CNT_RESIZABLE | UG_CNT_MOVABLE)))
-  (byte & 0x10 ? '1' : '0'), \
+		goto cnt_draw;
-  (byte & 0x08 ? '1' : '0'), \
+	
-  (byte & 0x04 ? '1' : '0'), \
+	ug_vec2_t mpos = ctx->mouse.pos;
-  (byte & 0x02 ? '1' : '0'), \
+	int minx, maxx, miny, maxy;
-  (byte & 0x01 ? '1' : '0') 
+	
-
+	// handle movable windows
-		printf("mousemask = "BIN_PATTERN"\n", BYTE_TO_BINARY(ctx->mouse.down_mask));
+	if (cnt->flags & UG_CNT_MOVABLE) {
-		if (ctx->mouse.down_mask & UG_BTN_LEFT) {
+		minx = cnt->rca.x;
-			printf("MOUSEDOWN\n");
+		maxx = cnt->rca.x + cnt->rca.w - br;
-			ug_vec2_t mpos = ctx->mouse.pos;
+		miny = cnt->rca.y;
-			int minx, maxx, miny, maxy;
+		maxy = cnt->rca.y + bt + hh;
-			
+		if (BETWEEN(mpos.x, minx, maxx) && BETWEEN(mpos.y, miny, maxy)) {
-			// handle movable windows
+			cnt->rect.x += ctx->mouse.delta.x;
-			minx = cnt->rect_abs.x;
+			cnt->rect.y += ctx->mouse.delta.y;
-			maxx = cnt->rect_abs.x + cnt->rect_abs.w - s->cnt.border.r.size;
+			cnt->rca.x += ctx->mouse.delta.x;
-			miny = cnt->rect_abs.y;
+			cnt->rca.y += ctx->mouse.delta.y;
-			maxy = cnt->rect_abs.y + s->cnt.titlebar.height.size;
-			if (cnt->flags & UG_CNT_MOVABLE &&
-			    BETWEEN(mpos.x, minx, maxx) &&
-			    BETWEEN(mpos.y, miny, maxy)) {
-				cnt->rect_abs.x  += ctx->mouse.delta.x;
-				cnt->rect_abs.y  += ctx->mouse.delta.y;
-				cnt->rect.x += ctx->mouse.delta.x;
-				cnt->rect.y += ctx->mouse.delta.y;
-			}
-
-			// right border resize
-			minx = cnt->rect_abs.x + cnt->rect_abs.w - s->cnt.border.r.size;
-			maxx = cnt->rect_abs.x + cnt->rect_abs.w;
-			miny = cnt->rect_abs.y;
-			maxy = cnt->rect_abs.y + cnt->rect_abs.h;
-			if (BETWEEN(mpos.x, minx, maxx) && BETWEEN(mpos.y, miny, maxy)) {
-				cnt->rect_abs.w  += ctx->mouse.delta.x;
-				cnt->rect.w += ctx->mouse.delta.x;
-			}		
-
-			// bottom border resize
-			minx = cnt->rect_abs.x;
-			maxx = cnt->rect_abs.x + cnt->rect_abs.w;
-			miny = cnt->rect_abs.y + cnt->rect_abs.h - s->cnt.border.b.size;
-			maxy = cnt->rect_abs.y + cnt->rect_abs.h;
-			if (BETWEEN(mpos.x, minx, maxx) && BETWEEN(mpos.y, miny, maxy)) {
-				cnt->rect_abs.h  += ctx->mouse.delta.y;
-				cnt->rect.h += ctx->mouse.delta.y;
-			}
 		}
-		// TODO: what if I want to close a floating container?
-		//       Maybe add a UG_CNT_CLOSABLE flag?
-
-		// TODO: what about scrolling? how do we know if we need to draw
-		//       a scroll bar? Maybe add that information inside the
-		//       container structure
 	}
 
+	if (cnt->flags & UG_CNT_RESIZABLE) {
+		// right border resize
+		minx = cnt->rca.x + cnt->rca.w - br;
+		maxx = cnt->rca.x + cnt->rca.w;
+		miny = cnt->rca.y;
+		maxy = cnt->rca.y + cnt->rca.h;
+		if (BETWEEN(mpos.x, minx, maxx) && BETWEEN(mpos.y, miny, maxy)) {
+			cnt->rect.w += ctx->mouse.delta.x;
+			cnt->rca.w += ctx->mouse.delta.x;
+		}
+
+		// bottom border resize
+		minx = cnt->rca.x;
+		maxx = cnt->rca.x + cnt->rca.w;
+		miny = cnt->rca.y + cnt->rca.h - bb;
+		maxy = cnt->rca.y + cnt->rca.h;
+		if (BETWEEN(mpos.x, minx, maxx) && BETWEEN(mpos.y, miny, maxy)) {
+			cnt->rect.h += ctx->mouse.delta.y;
+			cnt->rca.h += ctx->mouse.delta.y;
+		}
+	}
+
+	// TODO: what if I want to close a floating container?
+	//       Maybe add a UG_CNT_CLOSABLE flag?
+
+	// TODO: what about scrolling? how do we know if we need to draw
+	//       a scroll bar? Maybe add that information inside the
+	//       container structure
+
 	// push the appropriate rectangles to the drawing stack
+	ug_rect_t draw_rect;
+	cnt_draw:
+	
 	// push outline
-	push_rect_command(ctx, &cnt->rect_abs, s->cnt.border.color);
+	draw_rect = cnt->rca;
-	// push titlebar
+	push_rect_command(ctx, &draw_rect, s->cnt.border.color);
-	ug_rect_t titlebar = {
+	
-		.x = (cnt->rect_abs.x + s->cnt.border.l.size),
+	// titlebar
-		.y = (cnt->rect_abs.y + s->cnt.border.t.size),
-		.w = (cnt->rect_abs.w - s->cnt.border.r.size - s->cnt.border.l.size),
-		.h = s->cnt.titlebar.height.size,
-	};
-	push_rect_command(ctx, &titlebar, s->cnt.titlebar.bg_color);
-	// push main body
-	ug_rect_t body = {
-		.x = (cnt->rect_abs.x + s->cnt.border.l.size),
-		.y = (cnt->rect_abs.y + s->cnt.border.t.size),
-		.w = (cnt->rect_abs.w - s->cnt.border.l.size - s->cnt.border.r.size),
-		.h = (cnt->rect_abs.h - s->cnt.border.t.size - s->cnt.border.b.size),
-	};
 	if (cnt->flags & UG_CNT_MOVABLE) {
-		body.y += s->cnt.titlebar.height.size + s->cnt.border.t.size;
+		draw_rect.x += bl;
-		body.h -= s->cnt.titlebar.height.size + s->cnt.border.t.size;
+		draw_rect.y += bt;
+		draw_rect.w -= bl + br;
+		draw_rect.h  = hh;
+		push_rect_command(ctx, &draw_rect, s->cnt.titlebar.bg_color);
 	}
-	push_rect_command(ctx, &body, s->cnt.bg_color);
+	
+	// push main body
+	draw_rect = cnt->rca;
+	draw_rect.x += bl;
+	draw_rect.y += bt;
+	draw_rect.w -= bl + br;
+	draw_rect.h -= bt + bb;
+	if (cnt->flags & UG_CNT_MOVABLE) {
+		draw_rect.y += bt + hh;
+		draw_rect.h -= bt + hh;
+	}
+	push_rect_command(ctx, &draw_rect, s->cnt.bg_color);
 	// TODO: push other rects
 }
 
@@ -528,7 +523,7 @@ int ug_frame_begin(ug_ctx_t *ctx)
 	ug_vec2_t v = ctx->mouse.pos;
 //	printf("mouse: x=%d, y=%d\n", ctx->mouse.pos.x, ctx->mouse.pos.x);
 	for (int i = 0; i < ctx->cnt_stack.idx; i++) {
-		ug_rect_t r = ctx->cnt_stack.items[i].rect_abs;
+		ug_rect_t r = ctx->cnt_stack.items[i].rca;
 		if (INTERSECTS(v, r)) {
 			ctx->hover.cnt = ctx->cnt_stack.items[i].id;
 //			printf("intersects! %.8x\n", ctx->hover.cnt);
@@ -556,6 +551,12 @@ int ug_frame_end(ug_ctx_t *ctx)
 	ctx->hover.cnt       = 0;
 	ctx->hover.elem      = 0;
 
+	ctx->last_ppi = ctx->ppi;
+	ctx->last_ppm = ctx->ppm;
+	ctx->last_ppd = ctx->ppd;
+
+	ctx->frame++;
+
 	return 0;
 }
 

ugui.h

@@ -12,10 +12,16 @@
 // basic types
 typedef unsigned int                                     ug_id_t; 
 typedef struct { union {int x, w;}; union {int y, h;}; } ug_vec2_t;
-typedef struct { int x, y, w, h; }                       ug_rect_t;
 typedef struct { unsigned char a, b, g, r; }             ug_color_t;
 typedef struct { int size, unit; }                       ug_size_t;
 
+typedef struct { 
+	union {	int x; float fx; }; 
+	union {	int y; float fy; }; 
+	union {	int w; float fw; }; 
+	union {	int h; float fh; }; 
+} ug_rect_t;
+
 typedef enum { 
 	UG_UNIT_PX = 0,
 	UG_UNIT_MM,
@@ -29,7 +35,9 @@ typedef enum {
 typedef struct {
 	ug_id_t id;
 	ug_unit_t unit;
-	ug_rect_t rect, rect_abs;
+	ug_rect_t rect;
+	// absolute position rect
+	ug_rect_t rca;
 	ug_vec2_t max_size;
 	unsigned int flags;
 } ug_container_t;
@@ -126,8 +134,9 @@ typedef struct {
 	const ug_style_t *style_px;
 	// ppi: pixels per inch
 	// ppm: pixels per millimeter
-	// ppd: pixels per dot 
+	// ppd: pixels per dot
-	float scale, ppi, ppm, ppd;
+	float ppi, ppm, ppd;
+	float last_ppi, last_ppm, last_ppd;
 	// containers need to know how big the "main container" is so that all
 	// the relative positioning work
 	ug_vec2_t size;