nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-08 18:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

draw button

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@32 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-09-28 22:10:42 +00:00
parent 0bc58045ae
commit 4597519598
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Milsko/LowLevel.h
View File

@@ -28,8 +28,8 @@ typedef void* MilskoLLColor;
struct _MilskoLLCallback { struct _MilskoLLCallback {
void (*draw)(MilskoLL handle); void (*draw)(MilskoLL handle);
void (*down)(MilskoLL handle);
void (*up)(MilskoLL handle); void (*up)(MilskoLL handle);
void (*down)(MilskoLL handle);
}; };
/* lowlevel.c, common part */ /* lowlevel.c, common part */

6
include/Milsko/TypeDefs.h
View File

@@ -10,7 +10,7 @@ typedef struct _MilskoRect MilskoRect;
typedef struct _MilskoTextKeyValue MilskoTextKeyValue; typedef struct _MilskoTextKeyValue MilskoTextKeyValue;
typedef struct _MilskoIntegerKeyValue MilskoIntegerKeyValue; typedef struct _MilskoIntegerKeyValue MilskoIntegerKeyValue;
#ifdef _MILSKO #ifdef _MILSKO
typedef struct _Milsko *MilskoWidget, MilskoWidgetRec; typedef struct _MilskoWidget *MilskoWidget, MilskoWidgetRec;
#else #else
typedef void* MilskoWidget; typedef void* MilskoWidget;
#endif #endif
@@ -46,7 +46,7 @@ struct _MilskoIntegerKeyValue {
}; };
#ifdef _MILSKO #ifdef _MILSKO
struct _Milsko { struct _MilskoWidget {
char* name; char* name;
MilskoLL lowlevel; MilskoLL lowlevel;
@@ -54,6 +54,8 @@ struct _Milsko {
MilskoWidget* children; MilskoWidget* children;
MilskoClass class; MilskoClass class;
int pressed;
MilskoTextKeyValue* text; MilskoTextKeyValue* text;
MilskoIntegerKeyValue* integer; MilskoIntegerKeyValue* integer;
}; };

2
src/button.c
View File

@@ -13,7 +13,7 @@ static void draw(MilskoWidget handle) {
r.width = MilskoGetInteger(handle, MilskoNwidth); r.width = MilskoGetInteger(handle, MilskoNwidth);
r.height = MilskoGetInteger(handle, MilskoNheight); r.height = MilskoGetInteger(handle, MilskoNheight);
MilskoDrawFrame(handle, &r, MilskoParseColor(handle, MilskoGetText(handle, MilskoNbackground)), 0); MilskoDrawFrame(handle, &r, MilskoParseColor(handle, MilskoGetText(handle, MilskoNbackground)), handle->pressed);
MilskoDrawRect(handle, &r, MilskoParseColor(handle, MilskoGetText(handle, MilskoNbackground))); MilskoDrawRect(handle, &r, MilskoParseColor(handle, MilskoGetText(handle, MilskoNbackground)));
} }

19
src/core.c
View File

@@ -3,11 +3,23 @@
#include "stb_ds.h" #include "stb_ds.h"
static void llhandler(MilskoLL handle) { static void lldrawhandler(MilskoLL handle) {
MilskoWidget h = (MilskoWidget)handle->user; MilskoWidget h = (MilskoWidget)handle->user;
MilskoDispatch(h, draw); MilskoDispatch(h, draw);
} }
static void lluphandler(MilskoLL handle) {
MilskoWidget h = (MilskoWidget)handle->user;
h->pressed = 0;
MilskoDispatch(h, click);
}
static void lldownhandler(MilskoLL handle) {
MilskoWidget h = (MilskoWidget)handle->user;
h->pressed = 1;
}
MilskoWidget MilskoCreateWidget(MilskoClass class, const char* name, MilskoWidget parent, int x, int y, unsigned int width, unsigned int height) { MilskoWidget MilskoCreateWidget(MilskoClass class, const char* name, MilskoWidget parent, int x, int y, unsigned int width, unsigned int height) {
MilskoWidget h = malloc(sizeof(*h)); MilskoWidget h = malloc(sizeof(*h));
@@ -18,9 +30,12 @@ MilskoWidget MilskoCreateWidget(MilskoClass class, const char* name, MilskoWidge
h->children = NULL; h->children = NULL;
h->lowlevel = MilskoLLCreate(parent == NULL ? NULL : parent->lowlevel, x, y, width, height); h->lowlevel = MilskoLLCreate(parent == NULL ? NULL : parent->lowlevel, x, y, width, height);
h->class = class; h->class = class;
h->pressed = 0;
h->lowlevel->user = h; h->lowlevel->user = h;
h->lowlevel->callback->draw = llhandler; h->lowlevel->callback->draw = lldrawhandler;
h->lowlevel->callback->up = lluphandler;
h->lowlevel->callback->down = lldownhandler;
if(parent != NULL) arrput(parent->children, h); if(parent != NULL) arrput(parent->children, h);

10
src/x11.c
View File

@@ -110,6 +110,16 @@ void MilskoLLNextEvent(MilskoLL handle) {
if(XCheckWindowEvent(handle->display, handle->window, mask, &ev)) { if(XCheckWindowEvent(handle->display, handle->window, mask, &ev)) {
if(ev.type == Expose) { if(ev.type == Expose) {
MilskoLLDispatch(handle, draw); MilskoLLDispatch(handle, draw);
} else if(ev.type == ButtonPress) {
if(ev.xbutton.button == Button1) {
MilskoLLDispatch(handle, down);
MilskoLLDispatch(handle, draw);
}
} else if(ev.type == ButtonRelease) {
if(ev.xbutton.button == Button1) {
MilskoLLDispatch(handle, up);
MilskoLLDispatch(handle, draw);
}
} }
} }
} }