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

format

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@6 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-09-28 04:07:41 +00:00
parent a14d3e9f58
commit 4800c9822f
4 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
GNUmakefile
View File

@@ -27,11 +27,14 @@ L_OBJS += src/x11.o
L_LIBS += -lX11 L_LIBS += -lX11
endif endif
.PHONY: all clean .PHONY: all format clean
.SUFFIXES: .c .o .SUFFIXES: .c .o
all: $(LIB)milsko$(SO) all: $(LIB)milsko$(SO)
format:
clang-format --verbose -i $(shell find src include -name "*.c" -or -name "*.h")
$(LIB)milsko$(SO): $(L_OBJS) $(LIB)milsko$(SO): $(L_OBJS)
$(CC) $(LDFLAGS) -shared -o $@ $(L_OBJS) $(L_LIBS) $(CC) $(LDFLAGS) -shared -o $@ $(L_OBJS) $(L_LIBS)

10
include/Milsko/LowLevel.h
View File

@@ -20,11 +20,11 @@ typedef void* HMILSKO;
typedef void* HMILSKOCOLOR; typedef void* HMILSKOCOLOR;
#endif #endif
HMILSKO MilskoLLCreate(HMILSKO parent, int x, int y, int width, int height); HMILSKO MilskoLLCreate(HMILSKO parent, int x, int y, int width, int height);
void MilskoLLDestroy(HMILSKO handle); void MilskoLLDestroy(HMILSKO handle);
void MilskoLLPolygon(HMILSKO handle, MilskoPoint* points, int points_count, HMILSKOCOLOR color); void MilskoLLPolygon(HMILSKO handle, MilskoPoint* points, int points_count, HMILSKOCOLOR color);
HMILSKOCOLOR MilskoLLAllocColor(HMILSKO handle, int r, int g, int b); HMILSKOCOLOR MilskoLLAllocColor(HMILSKO handle, int r, int g, int b);
void MilskoLLGetXYWH(HMILSKO handle, int* x, int* y, unsigned int* w, unsigned int* h); void MilskoLLGetXYWH(HMILSKO handle, int* x, int* y, unsigned int* w, unsigned int* h);
int MilskoLLPending(HMILSKO handle); int MilskoLLPending(HMILSKO handle);
#endif #endif

12
include/Milsko/X11.h
View File

@@ -6,12 +6,12 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
typedef struct __Milsko { typedef struct __Milsko {
Display* display; Display* display;
Window window; Window window;
GC gc; GC gc;
Colormap colormap; Colormap colormap;
int x; int x;
int y; int y;
unsigned int width; unsigned int width;
unsigned int height; unsigned int height;
}* HMILSKO; }* HMILSKO;

48
src/x11.c
View File

@@ -5,26 +5,26 @@
static unsigned long mask = ExposureMask | StructureNotifyMask | ButtonPressMask | ButtonReleaseMask; static unsigned long mask = ExposureMask | StructureNotifyMask | ButtonPressMask | ButtonReleaseMask;
HMILSKO MilskoLLCreate(HMILSKO parent, int x, int y, int width, int height){ HMILSKO MilskoLLCreate(HMILSKO parent, int x, int y, int width, int height) {
HMILSKO r; HMILSKO r;
Window p; Window p;
r = malloc(sizeof(*r)); r = malloc(sizeof(*r));
r->x = x; r->x = x;
r->y = y; r->y = y;
r->width = width; r->width = width;
r->height = height; r->height = height;
if(parent == NULL){ if(parent == NULL) {
r->display = XOpenDisplay(NULL); r->display = XOpenDisplay(NULL);
p = XRootWindow(r->display, XDefaultScreen(r->display)); p = XRootWindow(r->display, XDefaultScreen(r->display));
}else{ } else {
r->display = parent->display; r->display = parent->display;
p = parent->window; p = parent->window;
} }
r->window = XCreateSimpleWindow(r->display, p, x, y, width, height, 0, 0, WhitePixel(r->display, XDefaultScreen(r->display))); r->window = XCreateSimpleWindow(r->display, p, x, y, width, height, 0, 0, WhitePixel(r->display, XDefaultScreen(r->display)));
r->colormap = DefaultColormap(r->display, XDefaultScreen(r->display)); r->colormap = DefaultColormap(r->display, XDefaultScreen(r->display));
r->gc = XCreateGC(r->display, r->window, 0, 0); r->gc = XCreateGC(r->display, r->window, 0, 0);
XSelectInput(r->display, r->window, mask); XSelectInput(r->display, r->window, mask);
XMapWindow(r->display, r->window); XMapWindow(r->display, r->window);
@@ -32,19 +32,19 @@ HMILSKO MilskoLLCreate(HMILSKO parent, int x, int y, int width, int height){
return r; return r;
} }
void MilskoLLDestroy(HMILSKO handle){ void MilskoLLDestroy(HMILSKO handle) {
XFreeGC(handle->display, handle->gc); XFreeGC(handle->display, handle->gc);
XDestroyWindow(handle->display, handle->window); XDestroyWindow(handle->display, handle->window);
free(handle); free(handle);
} }
void MilskoLLPolygon(HMILSKO handle, MilskoPoint* points, int points_count, HMILSKOCOLOR color){ void MilskoLLPolygon(HMILSKO handle, MilskoPoint* points, int points_count, HMILSKOCOLOR color) {
int i; int i;
XPoint* p = malloc(sizeof(*p) * points_count); XPoint* p = malloc(sizeof(*p) * points_count);
XSetForeground(handle->display, handle->gc, color->pixel); XSetForeground(handle->display, handle->gc, color->pixel);
for(i = 0; i < points_count; i++){ for(i = 0; i < points_count; i++) {
p[i].x = points[i].x; p[i].x = points[i].x;
p[i].y = points[i].y; p[i].y = points[i].y;
} }
@@ -53,32 +53,32 @@ void MilskoLLPolygon(HMILSKO handle, MilskoPoint* points, int points_count, HMIL
free(p); free(p);
} }
HMILSKOCOLOR MilskoLLAllocColor(HMILSKO handle, int r, int g, int b){ HMILSKOCOLOR MilskoLLAllocColor(HMILSKO handle, int r, int g, int b) {
HMILSKOCOLOR c = malloc(sizeof(*c)); HMILSKOCOLOR c = malloc(sizeof(*c));
XColor xc; XColor xc;
xc.red = 256 * r; xc.red = 256 * r;
xc.green = 256 * g; xc.green = 256 * g;
xc.blue = 256 * b; xc.blue = 256 * b;
XAllocColor(handle->display, handle->colormap, &xc); XAllocColor(handle->display, handle->colormap, &xc);
c->pixel = xc.pixel; c->pixel = xc.pixel;
return c; return c;
} }
void MilskoLLGetXYWH(HMILSKO handle, int* x, int* y, unsigned int* w, unsigned int* h){ void MilskoLLGetXYWH(HMILSKO handle, int* x, int* y, unsigned int* w, unsigned int* h) {
*x = handle->x; *x = handle->x;
*y = handle->y; *y = handle->y;
*w = handle->width; *w = handle->width;
*h = handle->height; *h = handle->height;
} }
void MilskoLLFreeColor(HMILSKOCOLOR color){ void MilskoLLFreeColor(HMILSKOCOLOR color) {
free(color); free(color);
} }
int MilskoLLPending(HMILSKO handle){ int MilskoLLPending(HMILSKO handle) {
XEvent ev; XEvent ev;
if(XCheckWindowEvent(handle->display, handle->window, mask, &ev)){ if(XCheckWindowEvent(handle->display, handle->window, mask, &ev)) {
XPutBackEvent(handle->display, &ev); XPutBackEvent(handle->display, &ev);
return 1; return 1;
} }