X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_ui.h;h=d4fb20bab148ddb058bbef6a1aa756d6255dfb3f;hb=fdc58fb6b2fddec9e179baaba53e059ae1e54a54;hp=56ece6b85d75fb7897e7b8cfbf593ec54a62c28b;hpb=499bcabb125cdf2618a6be89ccade08b007254f3;p=fishladder.git

diff --git a/vg/vg_ui.h b/vg/vg_ui.h
index 56ece6b..d4fb20b 100644
--- a/vg/vg_ui.h
+++ b/vg/vg_ui.h
@@ -4,18 +4,24 @@ SHADER_DEFINE( shader_ui,
 
 	// VERTEX
 	"layout (location=0) in vec2 a_co;"			// i16, i16, .. ?
-	"layout (location=1) in vec2 a_uv;"			// i8, i8
+	"layout (location=1) in vec2 a_uv;"			// i16, i16
 	"layout (location=2) in vec4 a_colour;"	// u32
+	"layout (location=3) in vec4 a_clip;"		// i16, i16, i16, i16
 	"uniform mat3 uPv;"
 	""
 	"out vec2 aTexCoords;"
 	"out vec4 aColour;"
+	"out vec2 aWsp;"
+	"out vec4 aClip;"
 	""
 	"void main()"
 	"{"
 		"gl_Position = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );"
-		"aTexCoords = a_uv * 0.01388888888;"
+		"aTexCoords = a_uv * 0.0078125;"
 		"aColour = a_colour;"
+		
+		"aWsp = a_co;"
+		"aClip = a_clip;"
 	"}",
 	
 	// FRAGMENT
@@ -25,10 +31,25 @@ SHADER_DEFINE( shader_ui,
 	"in vec2 aTexCoords;"
 	"in vec4 aColour;"
 	""
+	"in vec2 aWsp;"
+	"in vec4 aClip;"
+	""
 	"void main()"
 	"{"
-		"vec4 glyph = texture( uTexGlyphs, aTexCoords );"
-		"FragColor = aColour * vec4( 1.0, 1.0, 1.0, glyph.r );"
+		"float clip_blend = step( aWsp.x, aClip.z ) * step( aWsp.y, aClip.w ) * step( aClip.x, aWsp.x ) * step( aClip.y, aWsp.y );"
+		"vec4 glyph = vec4(1.0,1.0,1.0,1.0);"
+		
+		"if( aColour.a == 0.0 )"
+		"{"
+			"glyph = texture( uTexGlyphs, aTexCoords );"
+			"glyph.a = smoothstep( 0.47, 0.53, glyph.r );"
+		"}"
+		"else"
+		"{"
+			"glyph.a = aColour.a;"
+		"}"
+		
+		"FragColor = vec4( aColour.rgb, glyph.a*clip_blend );"
 	"}"
 	,
 	UNIFORMS({ "uPv", "uTexGlyphs" })
@@ -44,6 +65,26 @@ typedef i16 				ui_px;
 typedef u32 				ui_colour;
 typedef ui_px 				ui_rect[4];
 typedef struct ui_ctx 	ui_ctx;
+typedef struct ui_colourset ui_colourset;
+
+struct ui_colourset
+{
+	union
+	{
+		struct
+		{
+			ui_colour main;
+			ui_colour hover;
+			ui_colour active;
+		};
+		struct
+		{
+			ui_colour background;
+			ui_colour bar;
+			ui_colour bar_hover;
+		};
+	};
+};
 
 struct ui_ctx
 {
@@ -61,26 +102,46 @@ struct ui_ctx
 	#pragma pack(push,1)
 	struct ui_vert
 	{
-		ui_px co[2];
-		u8 uv[2];
-		u32 colour;
+		ui_px co[2];	//32 4
+		u8 uv[2];		//16 2
+		u32 colour;		//32 4
+		ui_rect clip;	//64 8
 	}
 	*verts;
 	#pragma pack(pop)
 	
+	u32 override_colour;
+	
 	u32 num_verts;
 	u16 *indices;
 	u32 num_indices;
 	
+	ui_rect clipping;
 	ui_rect cursor;
 	u32 stack_count;
 	u32 capture_mouse_id;
 	int capture_lock;
 	u32 id_base;
+	int glyph_base;
 	
 	// User input
 	ui_px mouse[2];
 	int click_state;	// 0: released, 1: on down, 2: pressed, 3: on release
+	
+	ui_colourset *colours_main;
+	ui_colourset *colours_current;
+	
+	GLuint vao;
+	GLuint vbo;
+	GLuint ebo;
+	
+	struct ui_image
+	{
+		ui_rect rc;
+		GLuint image;
+	}
+	images[16];
+	int image_count;
 };
 
 // Globals
@@ -88,21 +149,81 @@ struct ui_ctx
 
 // Opengl
 int ui_glyph_override = 0;
-ui_px ui_glyph_spacing_x = 6;
+ui_px ui_glyph_spacing_x = 9;
 GLuint ui_glyph_texture = 0;
-GLuint ui_vao;
-GLuint ui_vbo;
-GLuint ui_ebo;
 
-#define UI_BUFFER_SIZE 30000
-#define UI_INDEX_SIZE 20000
-
-ui_ctx ui_global_ctx = { .padding = 8 };
+ui_colourset ui_default_colours = {
+	.main = 0xff00ff00,
+	.hover = 0xffff00ff,
+	.active = 0xffff0000
+};
+ui_ctx ui_global_ctx = { 
+	.padding = 8, 
+	.colours_main = &ui_default_colours
+};
 
 
 // Initialization
 // ===========================================================================================================
 
+static void ui_reset_colours( ui_ctx *ctx );
+static void ui_init_context( ui_ctx *ctx, int index_buffer_size )
+{
+	ui_reset_colours( ctx );
+	
+	u32 vertex_buffer_size = (index_buffer_size+(index_buffer_size/2));
+	
+	// Generate the buffer we are gonna be drawing to
+	{
+		glGenVertexArrays(1, &ctx->vao);
+		glGenBuffers( 1, &ctx->vbo );
+		glGenBuffers( 1, &ctx->ebo );
+		glBindVertexArray( ctx->vao );
+		
+		glBindBuffer( GL_ARRAY_BUFFER, ctx->vbo );
+		
+		glBufferData( GL_ARRAY_BUFFER, vertex_buffer_size * sizeof( struct ui_vert ), NULL, GL_DYNAMIC_DRAW );
+		glBindVertexArray( ctx->vao );
+		
+		glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ctx->ebo );
+		glBufferData( GL_ELEMENT_ARRAY_BUFFER, index_buffer_size * sizeof( u16 ), NULL, GL_DYNAMIC_DRAW );
+		
+		u32 const stride = sizeof( struct ui_vert );
+		
+		// XY
+		glVertexAttribPointer( 0, 2, GL_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, co ) );
+		glEnableVertexAttribArray( 0 );
+		
+		// UV
+		glVertexAttribPointer( 1, 2, GL_UNSIGNED_BYTE, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) );
+		glEnableVertexAttribArray( 1 );
+		
+		// COLOUR
+		glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_TRUE, stride, (void *)offsetof( struct ui_vert, colour ) );
+		glEnableVertexAttribArray( 2 );
+		
+		// CLIPPING
+		glVertexAttribPointer( 3, 4, GL_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, clip ) );
+		glEnableVertexAttribArray( 3 );
+	}
+	
+	// Initialize default context
+	{
+		ctx->verts = (struct ui_vert *)malloc( vertex_buffer_size * sizeof(struct ui_vert) );
+		ctx->indices = (u16*)malloc( index_buffer_size * sizeof(u16) );
+	}
+}
+
+static void ui_context_free( ui_ctx *ctx )
+{
+	glDeleteVertexArrays( 1, &ctx->vao );
+	glDeleteBuffers( 1, &ctx->vbo );
+	glDeleteBuffers( 1, &ctx->ebo );
+	
+	free( ctx->verts );
+	free( ctx->indices );
+}
+
 static void ui_override_font( GLuint new_tex, ui_px space_x )
 {
 	if( ui_glyph_texture )
@@ -119,10 +240,10 @@ static void ui_default_init(void)
 	if( !ui_glyph_override )
 	{
 		u32 compressed[] = {
-			#include "fonts/weiholmir.h"
+			#include "vg/vg_pxfont.h"
 		};
 	
-		u32 pixels = 0, total = 72*72, data = 0;
+		u32 pixels = 0, total = 256*256, data = 0;
 		u8 *image = malloc( total );
 		
 		while( pixels < total )
@@ -143,7 +264,7 @@ static void ui_default_init(void)
 		glGenTextures( 1, &ui_glyph_texture );
 		glBindTexture( GL_TEXTURE_2D, ui_glyph_texture );
 		
-		glTexImage2D( GL_TEXTURE_2D, 0, GL_R8, 72, 72, 0, GL_RED, GL_UNSIGNED_BYTE, image );
+		glTexImage2D( GL_TEXTURE_2D, 0, GL_R8, 256, 256, 0, GL_RED, GL_UNSIGNED_BYTE, image );
 		
 		vg_tex2d_clamp();
 		vg_tex2d_nearest();
@@ -152,43 +273,8 @@ static void ui_default_init(void)
 	}
 	
 	// Setup OpenGL memory
-	{
-		SHADER_INIT( shader_ui );
-		
-		// Generate the buffer we are gonna be drawing to
-		glGenVertexArrays(1, &ui_vao);
-		glGenBuffers( 1, &ui_vbo );
-		glGenBuffers( 1, &ui_ebo );
-		glBindVertexArray( ui_vao );
-		
-		glBindBuffer( GL_ARRAY_BUFFER, ui_vbo );
-		
-		glBufferData( GL_ARRAY_BUFFER, UI_BUFFER_SIZE * sizeof( struct ui_vert ), NULL, GL_DYNAMIC_DRAW );
-		glBindVertexArray( ui_vao );
-		
-		glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ui_ebo );
-		glBufferData( GL_ELEMENT_ARRAY_BUFFER, UI_INDEX_SIZE * sizeof( u16 ), NULL, GL_DYNAMIC_DRAW );
-		
-		u32 const stride = sizeof( struct ui_vert );
-		
-		// XY
-		glVertexAttribPointer( 0, 2, GL_UNSIGNED_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, co ) );
-		glEnableVertexAttribArray( 0 );
-		
-		// UV
-		glVertexAttribPointer( 1, 2, GL_UNSIGNED_BYTE, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) );
-		glEnableVertexAttribArray( 1 );
-		
-		// COLOUR
-		glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_TRUE, stride, (void *)offsetof( struct ui_vert, colour ) );
-		glEnableVertexAttribArray( 2 );
-	}
-	
-	// Initialize default context
-	{
-		ui_global_ctx.verts = (struct ui_vert *)malloc( UI_BUFFER_SIZE * sizeof(struct ui_vert) );
-		ui_global_ctx.indices = (u16*)malloc( UI_INDEX_SIZE * sizeof(u16) );
-	}
+	SHADER_INIT( shader_ui );
+	ui_init_context( &ui_global_ctx, 20000 );
 }
 
 static void ui_default_free(void)
@@ -196,22 +282,24 @@ static void ui_default_free(void)
 	if( !ui_glyph_override )	
 		glDeleteTextures( 1, &ui_glyph_texture );
 	
-	glDeleteVertexArrays( 1, &ui_vao );
-	glDeleteBuffers( 1, &ui_vbo );
-	glDeleteBuffers( 1, &ui_ebo );
-	
-	free( ui_global_ctx.verts );
-	free( ui_global_ctx.indices );
+	ui_context_free( &ui_global_ctx );
 }
 
-static void ui_draw( ui_ctx *ctx )
+static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, ui_px uv[4] );
+static void ui_draw( ui_ctx *ctx, m3x3f view_override )
 {
-	glBindVertexArray( ui_vao );
+	u32 num_indices_normal = ctx->num_indices;
+	
+	// Append images to back of buffer
+	for( int i = 0; i < ctx->image_count; i ++ )
+		ui_fill_rect_uv( ctx, ctx->images[i].rc, 0xffffffff, (ui_px[4]){0,0,128,128} );
+
+	glBindVertexArray( ctx->vao );
 	
-	glBindBuffer( GL_ARRAY_BUFFER, ui_vbo );
+	glBindBuffer( GL_ARRAY_BUFFER, ctx->vbo );
 	glBufferSubData( GL_ARRAY_BUFFER, 0, ctx->num_verts * sizeof( struct ui_vert ), ctx->verts );
 	
-	glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ui_ebo );
+	glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ctx->ebo );
 	glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, 0, ctx->num_indices * sizeof( u16 ), ctx->indices );
 	
 	glEnable(GL_BLEND);
@@ -221,17 +309,31 @@ static void ui_draw( ui_ctx *ctx )
 	SHADER_USE( shader_ui );
 	
 	m3x3f view = M3X3_IDENTITY;
-	m3x3_translate( view, (v3f){ -1.0f, 1.0f, 0.0f } );
-	m3x3_scale( view, (v3f){ 1.0f/((float)vg_window_x*0.5f), -1.0f/((float)vg_window_y*0.5f), 1.0f } );
-	glUniformMatrix3fv( SHADER_UNIFORM( shader_ui, "uPv" ), 1, GL_FALSE, (float *)view );
+	
+	if( !view_override )
+	{
+		view_override = view;
+	
+		m3x3_translate( view, (v3f){ -1.0f, 1.0f, 0.0f } );
+		m3x3_scale( view, (v3f){ 1.0f/((float)vg_window_x*0.5f), -1.0f/((float)vg_window_y*0.5f), 1.0f } );
+	}
+	
+	glUniformMatrix3fv( SHADER_UNIFORM( shader_ui, "uPv" ), 1, GL_FALSE, (float *)view_override );
 	
 	glActiveTexture( GL_TEXTURE0 );
 	glBindTexture( GL_TEXTURE_2D, ui_glyph_texture );
 	glUniform1i( SHADER_UNIFORM( shader_ui, "uTexGlyphs" ), 0 );
 	
-	glDrawElements( GL_TRIANGLES, ctx->num_indices, GL_UNSIGNED_SHORT, (void*)(0) );
+	glDrawElements( GL_TRIANGLES, num_indices_normal, GL_UNSIGNED_SHORT, (void*)(0) );
 	
-	//vg_info( "Verts: %u, Indices: %u\n", ctx->num_verts, ctx->num_indices );
+	// Draw image elements
+	for( int i = 0; i < ctx->image_count; i ++ )
+	{
+		struct ui_image *img = &ctx->images[i];
+		
+		glBindTexture( GL_TEXTURE_2D, img->image );
+		glDrawElements( GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, (void*)( (num_indices_normal + 6*i)*sizeof(u16) ) );
+	}
 	
 	glDisable(GL_BLEND);
 }
@@ -292,8 +394,8 @@ static void ui_new_node( ui_ctx *ctx )
 	
 	if( parent->mouse_over )
 	{
-		if( ctx->mouse[0] >= node->rect[0] && ctx->mouse[0] <= node->rect[0]+node->rect[2] &&
-			 ctx->mouse[1] >= node->rect[1] && ctx->mouse[1] <= node->rect[1]+node->rect[3] )
+		if( ctx->mouse[0] >= node->rect[0] && ctx->mouse[0] < node->rect[0]+node->rect[2] &&
+			 ctx->mouse[1] >= node->rect[1] && ctx->mouse[1] < node->rect[1]+node->rect[3] )
 			node->mouse_over = 1;
 		else
 			node->mouse_over = 0;
@@ -394,6 +496,27 @@ static void ui_capture_mouse( ui_ctx *ctx, u32 id )
 	}
 }
 
+static int ui_want_mouse( ui_ctx *ctx )
+{
+	return ctx->capture_mouse_id == 0? 0: 1;
+}
+
+static void ui_set_clip( ui_ctx *ctx, ui_rect clip )
+{
+	ctx->clipping[0] = clip[0];
+	ctx->clipping[1] = clip[1];
+	ctx->clipping[2] = clip[0] + clip[2];
+	ctx->clipping[3] = clip[1] + clip[3];
+}
+
+static void ui_release_clip( ui_ctx *ctx )
+{
+	ctx->clipping[0] = -32000;
+	ctx->clipping[1] = -32000;
+	ctx->clipping[2] =  32000;
+	ctx->clipping[3] =  32000;
+}
+
 // Drawing
 // ===========================================================================================================
 
@@ -423,6 +546,11 @@ static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, u
 	u16 ind_start = ctx->num_verts;
 	u16 *indices = &ctx->indices[ ctx->num_indices ];
 	
+	ui_rect_copy( ctx->clipping, vertices[0].clip );
+	ui_rect_copy( ctx->clipping, vertices[1].clip );
+	ui_rect_copy( ctx->clipping, vertices[2].clip );
+	ui_rect_copy( ctx->clipping, vertices[3].clip );
+	
 	indices[0] = ind_start+0;
 	indices[1] = ind_start+2;
 	indices[2] = ind_start+1;
@@ -439,19 +567,19 @@ static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, u
 
 static struct ui_vert *ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour )
 {
-	return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 66, 72-66, 66, 72-66 } );
+	return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 4,4, 4,4 } );
 }
 
-static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment )
+static void ui_text( ui_ctx *ctx, const char *str, ui_px scale )
 {
 	ui_rect text_cursor;
 
 	text_cursor[0] = ctx->cursor[0];
 	text_cursor[1] = ctx->cursor[1];
-	text_cursor[2] = 7*scale;
-	text_cursor[3] = 7*scale;
+	text_cursor[2] = 8*scale;
+	text_cursor[3] = 14*scale;
 
-	u32 current_colour = 0xffffffff;
+	u32 current_colour = 0x00ffffff;
 
 	const char *_c = str;
 	char c;
@@ -459,21 +587,21 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment )
 	{
 		if( c == '\n' )
 		{
-			text_cursor[1] += 10*scale;
+			text_cursor[1] += 14*scale;
 			text_cursor[0] = ctx->cursor[0];
 			continue;
 		}
 		else if( c >= 33 && c <= 126 )
 		{
 			u8 glyph_base[2];
-			u8 glyph_index = c - 32;
-			glyph_base[0] = glyph_index%10;
-			glyph_base[1] = (glyph_index-glyph_base[0])/10;
+			u8 glyph_index = c;
+			glyph_base[0] = glyph_index & 0xf;
+			glyph_base[1] = (glyph_index-glyph_base[0])>>4;
 			
-			glyph_base[0] *= 7;
-			glyph_base[1] *= 7;
+			glyph_base[0] *= 8;
+			glyph_base[1] *= 8;
 			
-			ui_fill_rect_uv( ctx, text_cursor, current_colour, (ui_px[4]){glyph_base[0],72-glyph_base[1],glyph_base[0]+7,72-(glyph_base[1]+7)} );
+			ui_fill_rect_uv( ctx, text_cursor, current_colour, (ui_px[4]){glyph_base[0]+2,glyph_base[1]+1,glyph_base[0]+6,glyph_base[1]+8} );
 		}
 		else if( c == '\x1B' )
 		{
@@ -489,14 +617,14 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment )
 						
 						switch( colour_id )
 						{
-							case '0': current_colour = 0xffffffff; break;
-							case '3'|'1'<<8: current_colour = 0xff201fee; break;
-							case '3'|'2'<<8: current_colour = 0xff37e420; break;
-							case '3'|'3'<<8: current_colour = 0xff0ed8e2; break;
-							case '3'|'4'<<8: current_colour = 0xfff15010; break;
-							case '3'|'5'<<8: current_colour = 0xffee20ee; break;
-							case '3'|'6'<<8: current_colour = 0xffeeee20; break;
-							case '3'|'7'<<8: current_colour = 0xffffffff; break;
+							case '0': current_colour = 0x00ffffff; break;
+							case '3'|'1'<<8: current_colour = 0x00201fee; break;
+							case '3'|'2'<<8: current_colour = 0x0037e420; break;
+							case '3'|'3'<<8: current_colour = 0x000ed8e2; break;
+							case '3'|'4'<<8: current_colour = 0x00f15010; break;
+							case '3'|'5'<<8: current_colour = 0x00ee20ee; break;
+							case '3'|'6'<<8: current_colour = 0x00eeee20; break;
+							case '3'|'7'<<8: current_colour = 0x00ffffff; break;
 						}
 						
 						break;
@@ -512,7 +640,7 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment )
 			}
 		}
 		
-		text_cursor[0] += ui_glyph_spacing_x*scale;
+		text_cursor[0] += 9*scale;
 	}
 }
 
@@ -533,6 +661,13 @@ static void ui_begin( ui_ctx *ctx, ui_px res_x, ui_px res_y )
 	
 	ctx->num_verts = 0;
 	ctx->num_indices = 0;
+	
+	ui_release_clip( ctx );
+	
+	if( ctx->click_state == 0 )
+		ctx->capture_mouse_id = 0;
+	
+	ctx->image_count = 0;
 }
 
 static void ui_resolve( ui_ctx *ctx )
@@ -569,6 +704,14 @@ struct ui_window
 	ui_px drag_offset[2];
 };
 
+enum button_state
+{
+	k_button_released = 0,
+	k_button_start_click,
+	k_button_click,
+	k_button_hold
+};
+
 static int ui_button( ui_ctx *ctx, u32 id )
 {
 	ui_new_node( ctx );
@@ -577,20 +720,23 @@ static int ui_button( ui_ctx *ctx, u32 id )
 		
 		if( ui_hasmouse(ctx) )
 		{
-			ui_fill_rect( ctx, ctx->cursor, 0xffcccccc );
-		
+			ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->hover );
+			
 			if( ctx->click_state == 1 )
-				ctx->capture_lock = 1;
-			else if( ctx->capture_lock && ctx->click_state == 3 )
 			{
-				return 1;
+				ctx->capture_lock = 1;
+				return k_button_start_click;
 			}
+			else if( ctx->capture_lock && ctx->click_state == 3 )
+				return k_button_click;
+			else if( ctx->capture_lock && ctx->click_state == 2 )
+				return k_button_hold;
 		}
 		else
-			ui_fill_rect( ctx, ctx->cursor, 0xff999999 );
+			ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->main );
 	}
 	
-	return 0;
+	return k_button_released;
 }
 
 static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group )
@@ -627,7 +773,7 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group )
 			// title..
 			ctx->cursor[0] += 2;
 			ctx->cursor[1] += 2;
-			ui_text( ctx, window->title, 2, 0 );
+			ui_text( ctx, window->title, 2 );
 			
 			// Close button
 			ctx->cursor[3] = 25;
@@ -641,7 +787,7 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group )
 				vg_info( "Click clacked\n" );
 			}
 			ctx->cursor[0] += 2;
-			ui_text( ctx, "x", 2, 0 );
+			ui_text( ctx, "x", 2 );
 			ui_end( ctx );
 			
 			if( ui_hasmouse( ctx ) )
@@ -665,3 +811,119 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group )
 	
 	return 1;
 }
+
+struct ui_scrollbar
+{
+	int 	drag;
+	ui_px drag_offset;
+	
+	ui_px py;
+	ui_px bar_height;
+	ui_px view_height;
+};
+
+static void ui_scrollbar( ui_ctx *ctx, struct ui_scrollbar *scrollbar, u32 id )
+{
+	scrollbar->view_height = ctx->cursor[3];
+
+	if( scrollbar->drag )
+	{
+		scrollbar->py = ctx->mouse[1]+scrollbar->drag_offset;
+		scrollbar->py = VG_MAX( scrollbar->py, 0 );
+		scrollbar->py = VG_MIN( scrollbar->py, ctx->cursor[3] - scrollbar->bar_height );
+		
+		if( ctx->click_state == 0 || ctx->click_state == 3 )
+			scrollbar->drag = 0;
+	}
+	
+	ui_new_node( ctx );
+	{
+		ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->background );
+		ui_capture_mouse( ctx, id );
+		
+		ctx->cursor[1] += scrollbar->py;
+		ctx->cursor[3] = scrollbar->bar_height;
+		
+		ui_new_node( ctx );
+		{
+			ui_capture_mouse( ctx, __COUNTER__ );
+			struct ui_vert *drag_bar = ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->bar );
+
+			if( ui_hasmouse( ctx ) || scrollbar->drag )
+			{
+				drag_bar[0].colour = ctx->colours_current->bar_hover;
+				drag_bar[1].colour = ctx->colours_current->bar_hover;
+				drag_bar[2].colour = ctx->colours_current->bar_hover;
+				drag_bar[3].colour = ctx->colours_current->bar_hover;
+			
+				// start drag
+				if( ctx->click_state == 1 )
+				{
+					scrollbar->drag = 1;
+					scrollbar->drag_offset = scrollbar->py - ctx->mouse[1];
+				}
+			}
+		}
+		ui_end_down( ctx );
+	}
+	ui_end( ctx );
+}
+
+static ui_px ui_calculate_content_scroll( struct ui_scrollbar *scrollbar, ui_px content )
+{
+	float overlap = vg_maxf( 0.0f, (float)(content - scrollbar->view_height) );
+	
+	float range = scrollbar->view_height - scrollbar->bar_height;
+	return ((float)scrollbar->py / range) * overlap;
+}
+
+static void ui_override_colours( ui_ctx *ctx, ui_colourset *set )
+{
+	ctx->colours_current = set;
+}
+
+static void ui_reset_colours( ui_ctx *ctx )
+{
+	ctx->colours_current = ctx->colours_main;
+	ctx->override_colour = 0xffffffff;
+}
+
+static void ui_push_image( ui_ctx *ctx, ui_rect rc, GLuint image )
+{
+	struct ui_image *img = &ctx->images[ ctx->image_count ++ ];
+	ui_rect_copy( rc, img->rc );
+	img->image = image;
+}
+
+// Shortnames
+#define gui_draw(...) ui_draw( &ui_global_ctx, __VA_ARGS__)
+#define gui_current(...) ui_current( &ui_global_ctx, __VA_ARGS__)
+#define gui_new_node() ui_new_node( &ui_global_ctx )
+#define gui_hasmouse(...) ui_hasmouse( &ui_global_ctx, __VA_ARGS__)
+#define gui_end() ui_end( &ui_global_ctx )
+#define gui_end_down() ui_end_down( &ui_global_ctx )
+#define gui_end_right() ui_end_right( &ui_global_ctx )
+#define gui_fill_y() ui_fill_y( &ui_global_ctx)
+#define gui_fill_x() ui_fill_x( &ui_global_ctx)
+#define gui_align_bottom() ui_align_bottom( &ui_global_ctx )
+#define gui_align_right() ui_align_right( &ui_global_ctx )
+#define gui_align_top() ui_align_top( &ui_global_ctx )
+#define gui_align_left() ui_align_left( &ui_global_ctx )
+#define gui_clamp_rect(...) ui_clamp_rect( &ui_global_ctx, __VA_ARGS__)
+#define gui_group_id(...) ui_group_id( &ui_global_ctx, __VA_ARGS__)
+#define gui_capture_mouse(...) ui_capture_mouse( &ui_global_ctx, __VA_ARGS__)
+#define gui_set_clip(...) ui_set_clip( &ui_global_ctx, __VA_ARGS__)
+#define gui_release_clip() ui_release_clip( &ui_global_ctx )
+#define gui_fill_rect_uv(...) ui_fill_rect_uv( &ui_global_ctx, __VA_ARGS__)
+#define gui_fill_rect(...) ui_fill_rect( &ui_global_ctx, __VA_ARGS__)
+#define gui_text(...) ui_text( &ui_global_ctx, __VA_ARGS__)
+#define gui_begin(...) ui_begin( &ui_global_ctx, __VA_ARGS__)
+#define gui_resolve(...) ui_resolve( &ui_global_ctx, __VA_ARGS__)
+#define gui_set_mouse(...) ui_set_mouse( &ui_global_ctx, __VA_ARGS__)
+#define gui_button(...) ui_button( &ui_global_ctx, __VA_ARGS__)
+#define gui_window(...) ui_window( &ui_global_ctx, __VA_ARGS__)
+#define gui_want_mouse() ui_want_mouse( &ui_global_ctx )
+#define gui_push_image(...) ui_push_image( &ui_global_ctx, __VA_ARGS__ )
+#define gui_scrollbar(...) ui_scrollbar( &ui_global_ctx, __VA_ARGS__)
+#define gui_override_colours(...) ui_override_colours( &ui_global_ctx, __VA_ARGS__)
+#define gui_reset_colours(...) ui_reset_colours( &ui_global_ctx )