Skip to content

Implement public custom widget API #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
Merged

Implement public custom widget API #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 42 additions & 28 deletions apps/animation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,25 @@

#include <stdlib.h>

#include "twin_private.h"
#include <twin.h>

#include "apps_animation.h"

#define _apps_animation_pixmap(animation) ((animation)->widget.window->pixmap)
static inline twin_pixmap_t *_apps_animation_pixmap(
twin_custom_widget_t *animation)
{
return twin_custom_widget_pixmap(animation);
}

typedef struct {
twin_widget_t widget;
twin_pixmap_t *pix;
twin_timeout_t *timeout;
} apps_animation_t;
} apps_animation_data_t;

static void _apps_animation_paint(apps_animation_t *anim)
static void _apps_animation_paint(twin_custom_widget_t *custom)
{
apps_animation_data_t *anim =
(apps_animation_data_t *) twin_custom_widget_data(custom);
twin_pixmap_t *current_frame = NULL;

if (twin_pixmap_is_animated(anim->pix)) {
Expand All @@ -34,15 +39,17 @@ static void _apps_animation_paint(apps_animation_t *anim)
.source_kind = TWIN_PIXMAP,
.u.pixmap = current_frame,
};
twin_composite(_apps_animation_pixmap(anim), 0, 0, &srcop, 0, 0, NULL, 0, 0,
TWIN_SOURCE, current_frame->width, current_frame->height);
twin_composite(_apps_animation_pixmap(custom), 0, 0, &srcop, 0, 0, NULL, 0,
0, TWIN_SOURCE, current_frame->width, current_frame->height);
}

static twin_time_t _apps_animation_timeout(twin_time_t maybe_unused now,
void *closure)
static twin_time_t _apps_animation_timeout(twin_time_t now, void *closure)
{
apps_animation_t *anim = closure;
_twin_widget_queue_paint(&anim->widget);
(void) now; /* unused parameter */
twin_custom_widget_t *custom = closure;
apps_animation_data_t *anim =
(apps_animation_data_t *) twin_custom_widget_data(custom);
twin_custom_widget_queue_paint(custom);
twin_animation_t *a = anim->pix->animation;
twin_time_t delay = twin_animation_get_current_delay(a);
return delay;
Expand All @@ -51,42 +58,49 @@ static twin_time_t _apps_animation_timeout(twin_time_t maybe_unused now,
static twin_dispatch_result_t _apps_animation_dispatch(twin_widget_t *widget,
twin_event_t *event)
{
apps_animation_t *anim = (apps_animation_t *) widget;
if (_twin_widget_dispatch(widget, event) == TwinDispatchDone)
return TwinDispatchDone;
twin_custom_widget_t *custom = twin_widget_get_custom(widget);
if (!custom)
return TwinDispatchContinue;

switch (event->kind) {
case TwinEventPaint:
_apps_animation_paint(anim);
_apps_animation_paint(custom);
break;
default:
break;
}
return TwinDispatchContinue;
}

static void _apps_animation_init(apps_animation_t *anim,
twin_box_t *parent,
twin_dispatch_proc_t dispatch)
static twin_custom_widget_t *_apps_animation_init(twin_box_t *parent,
twin_pixmap_t *pix)
{
static const twin_widget_layout_t preferred = {0, 0, 1, 1};
_twin_widget_init(&anim->widget, parent, 0, preferred, dispatch);
twin_custom_widget_t *custom = twin_custom_widget_create(
parent, 0, 0, 0, 1, 1, _apps_animation_dispatch,
sizeof(apps_animation_data_t));
if (!custom)
return NULL;

apps_animation_data_t *anim =
(apps_animation_data_t *) twin_custom_widget_data(custom);
anim->pix = pix;

if (twin_pixmap_is_animated(anim->pix)) {
twin_animation_t *a = anim->pix->animation;
twin_time_t delay = twin_animation_get_current_delay(a);
anim->timeout = twin_set_timeout(_apps_animation_timeout, delay, anim);
anim->timeout =
twin_set_timeout(_apps_animation_timeout, delay, custom);
} else {
anim->timeout = NULL;
}

return custom;
}

static apps_animation_t *apps_animation_create(twin_box_t *parent,
twin_pixmap_t *pix)
static twin_custom_widget_t *apps_animation_create(twin_box_t *parent,
twin_pixmap_t *pix)
{
apps_animation_t *anim = malloc(sizeof(apps_animation_t));
anim->pix = pix;
_apps_animation_init(anim, parent, _apps_animation_dispatch);
return anim;
return _apps_animation_init(parent, pix);
}

void apps_animation_start(twin_screen_t *screen,
Expand All @@ -99,7 +113,7 @@ void apps_animation_start(twin_screen_t *screen,
twin_toplevel_t *toplevel =
twin_toplevel_create(screen, TWIN_ARGB32, TwinWindowApplication, x, y,
pix->width, pix->height, name);
apps_animation_t *anim = apps_animation_create(&toplevel->box, pix);
twin_custom_widget_t *anim = apps_animation_create(&toplevel->box, pix);
(void) anim;
twin_toplevel_show(toplevel);
}
69 changes: 37 additions & 32 deletions apps/clock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <sys/time.h>
#include <time.h>

#include "twin_private.h"
#include <twin.h>

#include "apps_clock.h"

Expand All @@ -30,28 +30,31 @@
#define APPS_CLOCK_BORDER 0xffbababa
#define APPS_CLOCK_BORDER_WIDTH D(0.01)

#define _apps_clock_pixmap(clock) ((clock)->widget.window->pixmap)
static inline twin_pixmap_t *_apps_clock_pixmap(twin_custom_widget_t *clock)
{
return twin_custom_widget_pixmap(clock);
}

typedef struct {
twin_widget_t widget;
twin_timeout_t *timeout;
} apps_clock_t;
} apps_clock_data_t;

static void apps_clock_set_transform(apps_clock_t *clock, twin_path_t *path)
static void apps_clock_set_transform(twin_custom_widget_t *clock,
twin_path_t *path)
{
twin_fixed_t scale;

scale = (TWIN_FIXED_ONE - APPS_CLOCK_BORDER_WIDTH * 3) / 2;
twin_path_scale(path, _twin_widget_width(clock) * scale,
_twin_widget_height(clock) * scale);
twin_path_scale(path, twin_custom_widget_width(clock) * scale,
twin_custom_widget_height(clock) * scale);

twin_path_translate(path, TWIN_FIXED_ONE + APPS_CLOCK_BORDER_WIDTH * 3,
TWIN_FIXED_ONE + APPS_CLOCK_BORDER_WIDTH * 3);

twin_path_rotate(path, -TWIN_ANGLE_90);
}

static void apps_clock_hand(apps_clock_t *clock,
static void apps_clock_hand(twin_custom_widget_t *clock,
twin_angle_t angle,
twin_fixed_t len,
twin_fixed_t fill_width,
Expand Down Expand Up @@ -87,7 +90,7 @@ static void apps_clock_hand(apps_clock_t *clock,
twin_path_destroy(stroke);
}

static void _apps_clock_date(apps_clock_t *clock, struct tm *t)
static void _apps_clock_date(twin_custom_widget_t *clock, struct tm *t)
{
char text[7];
twin_text_metrics_t metrics;
Expand Down Expand Up @@ -118,7 +121,7 @@ static twin_angle_t apps_clock_minute_angle(int min)
return min * TWIN_ANGLE_360 / 60;
}

static void _apps_clock_face(apps_clock_t *clock)
static void _apps_clock_face(twin_custom_widget_t *clock)
{
twin_path_t *path = twin_path_create();
int m;
Expand Down Expand Up @@ -173,7 +176,7 @@ static twin_time_t _apps_clock_interval(void)
return 1000 - (tv.tv_usec / 1000);
}

static void _apps_clock_paint(apps_clock_t *clock)
static void _apps_clock_paint(twin_custom_widget_t *clock)
{
struct timeval tv;
twin_angle_t second_angle, minute_angle, hour_angle;
Expand All @@ -199,47 +202,49 @@ static void _apps_clock_paint(apps_clock_t *clock)
APPS_CLOCK_SECOND, APPS_CLOCK_SECOND_OUT);
}

static twin_time_t _apps_clock_timeout(twin_time_t maybe_unused now,
void *closure)
static twin_time_t _apps_clock_timeout(twin_time_t now, void *closure)
{
apps_clock_t *clock = closure;
_twin_widget_queue_paint(&clock->widget);
(void) now; /* unused parameter */
twin_custom_widget_t *clock = closure;
twin_custom_widget_queue_paint(clock);
return _apps_clock_interval();
}

static twin_dispatch_result_t _apps_clock_dispatch(twin_widget_t *widget,
twin_event_t *event)
{
apps_clock_t *clock = (apps_clock_t *) widget;
twin_custom_widget_t *custom = twin_widget_get_custom(widget);
if (!custom)
return TwinDispatchContinue;

if (_twin_widget_dispatch(widget, event) == TwinDispatchDone)
return TwinDispatchDone;
switch (event->kind) {
case TwinEventPaint:
_apps_clock_paint(clock);
_apps_clock_paint(custom);
break;
default:
break;
}
return TwinDispatchContinue;
}

static void _apps_clock_init(apps_clock_t *clock,
twin_box_t *parent,
twin_dispatch_proc_t dispatch)
static twin_custom_widget_t *_apps_clock_init(twin_box_t *parent)
{
static const twin_widget_layout_t preferred = {0, 0, 1, 1};
_twin_widget_init(&clock->widget, parent, 0, preferred, dispatch);
clock->timeout =
twin_set_timeout(_apps_clock_timeout, _apps_clock_interval(), clock);
twin_custom_widget_t *custom = twin_custom_widget_create(
parent, 0, 0, 0, 1, 1, _apps_clock_dispatch, sizeof(apps_clock_data_t));
if (!custom)
return NULL;

apps_clock_data_t *data =
(apps_clock_data_t *) twin_custom_widget_data(custom);
data->timeout =
twin_set_timeout(_apps_clock_timeout, _apps_clock_interval(), custom);

return custom;
}

static apps_clock_t *apps_clock_create(twin_box_t *parent)
static twin_custom_widget_t *apps_clock_create(twin_box_t *parent)
{
apps_clock_t *clock = malloc(sizeof(apps_clock_t));

_apps_clock_init(clock, parent, _apps_clock_dispatch);
return clock;
return _apps_clock_init(parent);
}

void apps_clock_start(twin_screen_t *screen,
Expand All @@ -251,7 +256,7 @@ void apps_clock_start(twin_screen_t *screen,
{
twin_toplevel_t *toplevel = twin_toplevel_create(
screen, TWIN_ARGB32, TwinWindowApplication, x, y, w, h, name);
apps_clock_t *clock = apps_clock_create(&toplevel->box);
twin_custom_widget_t *clock = apps_clock_create(&toplevel->box);
(void) clock;
twin_toplevel_show(toplevel);
}
Loading