pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 3 Pull requests Projects Releases 10 Packages Wiki Activity Actions

fix strange segfault

Browse source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@100 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
Nishi 2025-10-01 07:00:28 +00:00
commit db71376805
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/Mw/X11.h
View file

@ -40,8 +40,9 @@ struct _MwLLColor {
}; };
struct _MwLLPixmap { struct _MwLLPixmap {
int width; int width;
int height; int height;
unsigned char* data;
int use_shm; int use_shm;
XShmSegmentInfo shm; XShmSegmentInfo shm;

5
src/x11.c
View file

@ -192,6 +192,7 @@ MwLLPixmap MwLLCreatePixmap(MwLL handle, unsigned char* data, int width, int hei
r->height = height; r->height = height;
r->display = handle->display; r->display = handle->display;
r->use_shm = XShmQueryExtension(handle->display) ? 1 : 0; r->use_shm = XShmQueryExtension(handle->display) ? 1 : 0;
r->data = malloc(width * height * 4);
if(!XRenderQueryExtension(handle->display, &evbase, &erbase)) { if(!XRenderQueryExtension(handle->display, &evbase, &erbase)) {
fprintf(stderr, "XRender missing - cannot proceed pixmap creation\n"); fprintf(stderr, "XRender missing - cannot proceed pixmap creation\n");
@ -224,6 +225,7 @@ MwLLPixmap MwLLCreatePixmap(MwLL handle, unsigned char* data, int width, int hei
p <<= 8; p <<= 8;
p |= px[2]; p |= px[2];
XPutPixel(r->image, x, y, p); XPutPixel(r->image, x, y, p);
*(unsigned long*)(&r->data[(x + y * width) * 4]) = p;
} }
} }
@ -240,6 +242,7 @@ void MwLLDestroyPixmap(MwLLPixmap pixmap) {
shmdt(pixmap->shm.shmaddr); shmdt(pixmap->shm.shmaddr);
shmctl(pixmap->shm.shmid, IPC_RMID, 0); shmctl(pixmap->shm.shmid, IPC_RMID, 0);
} }
free(pixmap->data);
} }
free(pixmap); free(pixmap);
@ -297,7 +300,7 @@ void MwLLSetIcon(MwLL handle, MwLLPixmap pixmap) {
icon[1] = pixmap->height; icon[1] = pixmap->height;
for(i = 0; i < pixmap->width * pixmap->height; i++) { for(i = 0; i < pixmap->width * pixmap->height; i++) {
icon[2 + i] = *(unsigned long*)(&pixmap->image->data[i * 4]); icon[2 + i] = *(unsigned long*)(&pixmap->data[i * 4]);
} }
XChangeProperty(handle->display, handle->window, atom, 6, 32, PropModeReplace, (unsigned char*)icon, 2 + pixmap->width * pixmap->height); XChangeProperty(handle->display, handle->window, atom, 6, 32, PropModeReplace, (unsigned char*)icon, 2 + pixmap->width * pixmap->height);