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

new function

Browse source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@347 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
Nishi 2025-10-16 04:58:12 +00:00
commit 3ca9b48958
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/Mw/Draw.h
View file

@ -145,6 +145,15 @@ MWDECL MwLLPixmap MwLoadRaw(MwWidget handle, unsigned char* rgb, int width, int
*/ */
MWDECL MwLLPixmap MwLoadXPM(MwWidget handle, char** data); MWDECL MwLLPixmap MwLoadXPM(MwWidget handle, char** data);
/*!
* %brief Creates a pixmap from XPM data with background
* %param handle Widget
* %param data Data
* %param bgcolor RGBA data for background
* %return Pixmap
*/
MWDECL MwLLPixmap MwLoadXPMEx(MwWidget handle, char** data, unsigned char* bgcolor);
/* color.c */ /* color.c */
/*! /*!

17
src/draw.c
View file

@ -642,7 +642,7 @@ typedef struct color {
int a; int a;
} color_t; } color_t;
MwLLPixmap MwLoadXPM(MwWidget handle, char** data) { MwLLPixmap MwLoadXPMEx(MwWidget handle, char** data, unsigned char* bgcolor) {
int col, row, colors, cpp; int col, row, colors, cpp;
unsigned char* rgb; unsigned char* rgb;
MwLLPixmap px; MwLLPixmap px;
@ -665,10 +665,10 @@ MwLLPixmap MwLoadXPM(MwWidget handle, char** data) {
shput(c, k, v); shput(c, k, v);
ind = shgeti(c, k); ind = shgeti(c, k);
c[ind].r = 0; c[ind].r = bgcolor[0];
c[ind].g = 0; c[ind].g = bgcolor[1];
c[ind].b = 0; c[ind].b = bgcolor[2];
c[ind].a = 0; c[ind].a = bgcolor[3];
} else { } else {
MwLLColor color = MwParseColor(handle, v); MwLLColor color = MwParseColor(handle, v);
@ -714,3 +714,10 @@ MwLLPixmap MwLoadXPM(MwWidget handle, char** data) {
return px; return px;
} }
MwLLPixmap MwLoadXPM(MwWidget handle, char** data){
unsigned char rgba[4];
memset(rgba, 0, 4);
return MwLoadXPMEx(handle, data, rgba);
}