alema/ugui
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: alema:167676f4785016957f35a11c5bd483fd4fc53b3d
Branches Tags
alema:c3
alema:correct-padding
alema:font_atlas
alema:rewrite2
alema:master
..
compare: alema:32a57d52937ecd1d6d0f48c679a543d5ecfca9b2
Branches Tags
alema:c3
alema:correct-padding
alema:font_atlas
alema:rewrite2
alema:master

No commits in common. "167676f4785016957f35a11c5bd483fd4fc53b3d" and "32a57d52937ecd1d6d0f48c679a543d5ecfca9b2" have entirely different histories.
167676f478 ... 32a57d5293

11 changed files with 53 additions and 54 deletions
Show Stats Expand all files Collapse all files

35
lib/ugui.c3l/src/core.c3
View File

@ -7,7 +7,6 @@ import fifo;
import std::io;
import std::core::string;
import std::core::mem::allocator;
import std::collections::pair;
macro println(...)
@ -69,9 +68,6 @@ struct Elem {
}
}
// Tuple of Element pointers, used when it is useful to get both parent and child
alias PElemTuple = pair::Pair{Elem*, Elem*};
// relationships between elements are stored in a tree, it stores just the ids
alias IdTree = mtree::MTree{Id};
@ -134,8 +130,10 @@ struct Ctx {
// return a pointer to the parent of the current active div
fn Elem*? Ctx.get_parent(&ctx)
{
Id parent_id = ctx.tree[ctx.active_div]!;
Elem* parent = ctx.cache.search(parent_id)!;
Id parent_id = ctx.tree.get(ctx.active_div);
Elem*? parent = ctx.cache.search(parent_id);
if (catch parent) return parent;
if (parent.type != ETYPE_DIV) return WRONG_ELEMENT_TYPE?;
return parent;
}
@ -148,7 +146,7 @@ const uint GOLDEN_RATIO = 0x9E3779B9;
fn Id? Ctx.gen_id(&ctx, Id id2)
{
// FIXME: this is SHIT
Id id1 = ctx.tree.get(ctx.active_div)!;
Id id1 = ctx.tree.get(ctx.active_div);
// Mix the two IDs non-linearly
Id mixed = id1 ^ id2.rotate_left(13);
mixed ^= id1.rotate_left(7);
@ -168,13 +166,10 @@ macro Id @compute_id(...)
// get or push an element from the cache, return a pointer to it
// resets all flags except is_new which is set accordingly
fn PElemTuple? Ctx.get_elem(&ctx, Id id, ElemType type)
fn Elem*? Ctx.get_elem(&ctx, Id id, ElemType type)
{
bool is_new;
Elem* parent;
Elem* elem;
parent = ctx.get_parent() ?? &&(Elem){};
elem = ctx.cache.get_or_insert(&&(Elem){}, id, &is_new)!;
elem.flags = (ElemFlags)0;
elem.flags.is_new = is_new;
@ -185,9 +180,13 @@ fn PElemTuple? Ctx.get_elem(&ctx, Id id, ElemType type)
} else {
elem.type = type;
}
elem.z_index = parent.z_index;
// FIXME: this is crap
if (ctx.tree.is_used(ctx.active_div)) {
elem.z_index = ctx.get_active_div()!.z_index;
}
elem.tree_idx = ctx.tree.add(ctx.active_div, id);
return {elem, parent};
return elem;
}
// find an element, does not allocate a new one in cache
@ -204,7 +203,7 @@ macro Elem* Ctx.find_elem(&ctx, Id id)
fn Elem*? Ctx.get_active_div(&ctx)
{
Id id = ctx.tree.get(ctx.active_div)!;
Id id = ctx.tree.get(ctx.active_div);
return ctx.cache.search(id);
}
@ -241,7 +240,7 @@ fn void? Ctx.frame_begin(&ctx)
// 1. Reset the active div
// 2. Get the root element from the cache and update it
ctx.active_div = 0;
Elem* elem = ctx.get_elem(ROOT_ID, ETYPE_DIV)!.first;
Elem* elem = ctx.get_elem(ROOT_ID, ETYPE_DIV)!;
ctx.active_div = elem.tree_idx;
// The root should have the updated flag only if the size of the window
// was changed between frasmes, this propagates an element size recalculation
@ -268,6 +267,8 @@ fn void? Ctx.frame_begin(&ctx)
// TODO: add a background color taken from a theme or config
}
const int DEBUG = 1;
fn void? Ctx.frame_end(&ctx)
{
// FIXME: this is not guaranteed to be root. the user might forget to close a div or some other element
@ -278,7 +279,7 @@ fn void? Ctx.frame_end(&ctx)
}
// DO THE LAYOUT
ctx.layout_element_tree()!;
ctx.layout_element_tree();
// 1. clear the tree
ctx.tree.nuke();
@ -298,7 +299,7 @@ fn void? Ctx.frame_end(&ctx)
}
// debug
$if $feature(DEBUG_POINTER):
$if DEBUG == 1:
// draw mouse position
Cmd cmd = {
.type = CMD_RECT,

10
lib/ugui.c3l/src/layout.c3
View File

@ -297,17 +297,17 @@ fn void resolve_placement(Elem* c, Elem* p)
}
}
fn void? Ctx.layout_element_tree(&ctx)
fn void Ctx.layout_element_tree(&ctx)
{
int current;
for (int n; (current = ctx.tree.level_order_it(0, n)) >= 0; n++) {
Elem* p = ctx.find_elem(ctx.tree.get(current))!;
Elem* p = ctx.find_elem(ctx.tree.get(current));
p.layout.origin = -p.layout.scroll_offset;
int ch;
// RESOLVE KNOWN DIMENSIONS
for (int i; (ch = ctx.tree.children_it(current, i)) >= 0; i++) {
Elem* c = ctx.find_elem(ctx.tree.get(ch))!;
Elem* c = ctx.find_elem(ctx.tree.get(ch));
if (ctx.tree.is_root(ch)) {
resolve_dimensions(p, &&{});
} else {
@ -317,7 +317,7 @@ fn void? Ctx.layout_element_tree(&ctx)
// RESOLVE GROW CHILDREN
for (int i; (ch = ctx.tree.children_it(current, i)) >= 0; i++) {
Elem* c = ctx.find_elem(ctx.tree.get(ch))!;
Elem* c = ctx.find_elem(ctx.tree.get(ch));
if (ctx.tree.is_root(ch)) {
resolve_grow_elements(p, &&{});
} else {
@ -327,7 +327,7 @@ fn void? Ctx.layout_element_tree(&ctx)
// RESOLVE CHILDREN PLACEMENT
for (int i; (ch = ctx.tree.children_it(current, i)) >= 0; i++) {
Elem* c = ctx.find_elem(ctx.tree.get(ch))!;
Elem* c = ctx.find_elem(ctx.tree.get(ch));
if (ctx.tree.is_root(ch)) {
resolve_placement(p, &&{});
update_children_bounds(p, &&{});

8
lib/ugui.c3l/src/mtree.c3
View File

@ -312,12 +312,8 @@ fn void MTree.prune(&tree, int parent)
}
<* @require ref >= 0 , ref < tree.elem_vec.len *>
fn Type? MTree.get(&tree, int ref) @operator([])
{
if (tree.is_used(ref)) return tree.elem_vec[ref];
return NOT_FOUND?;
}
<* @require tree.is_used(ref) *>
fn Type MTree.get(&tree, int ref) => tree.elem_vec[ref];
<* @require tree.is_used(ref) *>
fn Type MTree.parentof(&tree, int ref) => tree.refs_vec[ref].parent;

12
lib/ugui.c3l/src/widgets/button.c3
View File

@ -13,8 +13,8 @@ macro Ctx.button(&ctx, String label = "", String icon = "", ...)
fn ElemEvents? Ctx.button_id(&ctx, Id id, String label, String icon)
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_BUTTON)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_BUTTON)!;
Style* style = ctx.styles.get_style(@str_hash("button"));
Sprite* sprite = icon != "" ? ctx.sprite_atlas.get(icon)! : &&(Sprite){};
@ -89,8 +89,8 @@ macro Ctx.checkbox(&ctx, String desc, bool* active, String tick_sprite = "", ...
fn void? Ctx.checkbox_id(&ctx, Id id, String description, bool* active, String tick_sprite)
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_BUTTON)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_BUTTON)!;
Style* style = ctx.styles.get_style(@str_hash("checkbox"));
short inner_pad = description != "" ? style.size/2 : 0;
@ -163,8 +163,8 @@ fn void? Ctx.toggle_id(&ctx, Id id, String description, bool* active)
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_BUTTON)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_BUTTON)!;
Style* style = ctx.styles.get_style(@str_hash("toggle"));
short inner_pad = description != "" ? style.size/2 : 0;

8
lib/ugui.c3l/src/widgets/div.c3
View File

@ -72,8 +72,8 @@ fn void? Ctx.div_begin_id(&ctx,
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_DIV)!.unpack(&elem, &parent);
Elem* elem = ctx.get_elem(id, ETYPE_DIV)!;
Elem* parent = ctx.get_parent()!;
ctx.active_div = elem.tree_idx;
Style* style = ctx.styles.get_style(@str_hash("div"));
@ -183,8 +183,8 @@ fn bool? Ctx.popup_begin_id(&ctx,
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_DIV)!.unpack(&elem, &parent);
Elem* elem = ctx.get_elem(id, ETYPE_DIV)!;
Elem* parent = ctx.find_elem(ctx.active_div); // pop-up parent is always root
ctx.active_div = elem.tree_idx;
Style* style = ctx.styles.get_style(@str_hash("popup"));

4
lib/ugui.c3l/src/widgets/separator.c3
View File

@ -6,8 +6,8 @@ macro Ctx.separator(&ctx, int width, int height, ...)
fn void? Ctx.separator_id(&ctx, Id id, int width, int height)
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_NONE)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_NONE)!;
elem.layout.w = @exact((short)width);
elem.layout.h = @exact((short)height);

12
lib/ugui.c3l/src/widgets/slider.c3
View File

@ -22,8 +22,8 @@ fn ElemEvents? Ctx.slider_hor_id(&ctx, Id id, Size w, Size h, float* value, floa
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_SLIDER)!.unpack(&elem, &parent);
Elem* parent = ctx.get_parent()!;
Elem* elem = ctx.get_elem(id, ETYPE_SLIDER)!;
Style* style = ctx.styles.get_style(@str_hash("slider"));
elem.layout.w = w;
@ -85,8 +85,8 @@ fn ElemEvents? Ctx.slider_ver_id(&ctx, Id id, Size w, Size h, float* value, floa
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_SLIDER)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_SLIDER)!;
Style* style = ctx.styles.get_style(@str_hash("slider"));
elem.layout.w = w;
@ -135,8 +135,8 @@ fn void? Ctx.scrollbar(&ctx, Id id, float *value, float handle_percent, bool ver
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_SLIDER)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_SLIDER)!;
Style* style = ctx.styles.get_style(@str_hash("scrollbar"));
Rect pb = parent.bounds.pad(parent.layout.content_offset);

4
lib/ugui.c3l/src/widgets/sprite.c3
View File

@ -9,8 +9,8 @@ macro Ctx.sprite(&ctx, String name, ...)
fn void? Ctx.sprite_id(&ctx, Id id, String name)
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_SPRITE)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_SPRITE)!;
Style* style = ctx.styles.get_style(@str_hash("sprite"));
Sprite* sprite = ctx.sprite_atlas.get(name)!;

8
lib/ugui.c3l/src/widgets/text.c3
View File

@ -18,8 +18,8 @@ fn void? Ctx.text_id(&ctx, Id id, String text)
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_TEXT)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_TEXT)!;
Style* style = ctx.styles.get_style(@str_hash("text"));
Id text_hash = text.hash();
@ -45,8 +45,8 @@ fn ElemEvents? Ctx.text_box_id(&ctx, Id id, Size w, Size h, TextEdit* te, Anchor
{
id = ctx.gen_id(id)!;
Elem* parent, elem;
ctx.get_elem(id, ETYPE_TEXT)!.unpack(&elem, &parent);
Elem *parent = ctx.get_parent()!;
Elem *elem = ctx.get_elem(id, ETYPE_TEXT)!;
Style* style = ctx.styles.get_style(@str_hash("text-box"));
elem.text.te = te;

3
project.json
View File

@ -3,7 +3,7 @@
"warnings": ["no-unused"],
"dependency-search-paths": ["lib", "lib/vendor/libraries"],
"dependencies": ["sdl3", "ugui"],
"features": ["DEBUG_POINTER"],
"features": [],
"authors": ["Alessandro Mauri <ale@shitposting.expert>"],
"version": "0.1.0",
"sources": ["src/**"],
@ -14,6 +14,7 @@
"type": "executable"
}
},
"cpu": "native",
"opt": "O0",
"debug-info": "full"
}

3
src/renderer.c3
View File

@ -36,6 +36,7 @@ import ugui;
// CONSTANTS //
// ============================================================================================== //
const int DEBUG = 1;
const bool CYCLE = true;
const int MAX_QUAD_BATCH = 2048;
@ -146,7 +147,7 @@ struct Renderer {
fn void Renderer.init(&self, ZString title, uint width, uint height, bool vsync)
{
// set wayland hint automagically
$if $feature(RENDER_DEBUG) == false && $feature(USE_WAYLAND) == true:
$if DEBUG == 0:
bool has_wayland = false;
for (int i = 0; i < sdl::get_num_video_drivers(); i++) {
ZString driver = sdl::get_video_driver(i);