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

i forgor sizeof(long) was 8 on x86_64 linux

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@319 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-14 09:14:56 +00:00
parent 2b0c1734f9
commit 740cae1384
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
examples/glclock.c
View File

@@ -18,6 +18,9 @@ void tick(MwWidget handle, void* user, void* call) {
time_t t = time(NULL);
int i;
double rad;
int render = 0;
int w = MwGetInteger(opengl, MwNwidth);
int h = MwGetInteger(opengl, MwNheight);
if(last != t) {
char* wday[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
char* mon[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
@@ -31,6 +34,8 @@ void tick(MwWidget handle, void* user, void* call) {
sprintf(buf, "%02d:%02d %s", tm->tm_hour % 12, tm->tm_min, tm->tm_hour >= 12 ? "PM" : "AM");
MwSetText(ltime, MwNtext, buf);
render = 1;
last = t;
}
@@ -68,6 +73,30 @@ void tick(MwWidget handle, void* user, void* call) {
glVertex2f(cos(rad) * 0.5, sin(rad) * 0.5);
glEnd();
if(render && w > 0 && h > 0){
unsigned char* buffer = malloc(w * h * 4);
MwLLPixmap px;
int j;
glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
for(i = 0; i < h / 2; i++){
for(j = 0; j < w * 4; j++){
unsigned char b = buffer[i * w * 4 + j];
buffer[i * w * 4 + j] = buffer[(h - i - 1) * w * 4 + j];
buffer[(h - i - 1) * w * 4 + j] = b;
}
}
px = MwLoadRaw(window, buffer, w, h);
MwVaApply(window,
MwNiconPixmap, px,
NULL);
MwLLDestroyPixmap(px);
free(buffer);
}
MwOpenGLSwapBuffer(opengl);
}

9
src/backend/x11.c
View File

@@ -320,10 +320,13 @@ MwLLPixmap MwLLCreatePixmap(MwLL handle, unsigned char* data, int width, int hei
r->height = height;
r->display = handle->display;
r->use_shm = XShmQueryExtension(handle->display) ? 1 : 0;
r->data = malloc(width * height * 4);
r->data = malloc(sizeof(unsigned long) * width * height);
r->use_render = XRenderQueryExtension(handle->display, &evbase, &erbase) ? 1 : 0;
/* FIXME */
r->use_shm = 0;
if(r->use_shm) {
r->image = XShmCreateImage(handle->display, DefaultVisual(handle->display, DefaultScreen(handle->display)), 24, ZPixmap, NULL, &r->shm, width, height);
@@ -355,7 +358,7 @@ MwLLPixmap MwLLCreatePixmap(MwLL handle, unsigned char* data, int width, int hei
p <<= 8;
p |= px[2];
XPutPixel(r->image, x, y, p);
*(unsigned long*)(&r->data[(x + y * width) * 4]) = p;
*(unsigned long*)(&r->data[(y * width + x) * sizeof(unsigned long)]) = p;
}
}
@@ -486,7 +489,7 @@ void MwLLSetIcon(MwLL handle, MwLLPixmap pixmap) {
icon[1] = pixmap->height;
for(i = 0; i < pixmap->width * pixmap->height; i++) {
icon[2 + i] = *(unsigned long*)(&pixmap->data[i * 4]);
icon[2 + i] = *(unsigned long*)(&pixmap->data[i * sizeof(unsigned long)]);
}
XChangeProperty(handle->display, handle->window, atom, 6, 32, PropModeReplace, (unsigned char*)icon, 2 + pixmap->width * pixmap->height);