gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Added WMCreateBlendedPixmapFromRImage()

Browse Source
This commit is contained in:
dan
2001-04-16 00:10:58 +00:00
parent 3300f79501
commit 79b17caa73
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WINGs/ChangeLog
View File

@@ -28,6 +28,7 @@ Changes since wmaker 0.64.0:
- replaced bags with arrays wherever appropriate. This will improve - replaced bags with arrays wherever appropriate. This will improve
performance a bit. performance a bit.
- replaced some recursive code with iterative code in selection.c - replaced some recursive code with iterative code in selection.c
- added WMCreateBlendedPixmapFromRImage()
changes since wmaker 0.63.1: changes since wmaker 0.63.1:

3
WINGs/WINGs/WINGs.h
View File

@@ -737,6 +737,9 @@ WMSize WMGetPixmapSize(WMPixmap *pixmap);
WMPixmap *WMCreatePixmapFromFile(WMScreen *scrPtr, char *fileName); WMPixmap *WMCreatePixmapFromFile(WMScreen *scrPtr, char *fileName);
WMPixmap* WMCreateBlendedPixmapFromRImage(WMScreen *scrPtr, RImage *image,
RColor *color);
WMPixmap *WMCreateBlendedPixmapFromFile(WMScreen *scrPtr, char *fileName, WMPixmap *WMCreateBlendedPixmapFromFile(WMScreen *scrPtr, char *fileName,
RColor *color); RColor *color);

19
WINGs/wpixmap.c
View File

@@ -49,8 +49,8 @@ WMCreatePixmap(WMScreen *scrPtr, int width, int height, int depth, Bool masked)
pixPtr->pixmap = XCreatePixmap(scrPtr->display, W_DRAWABLE(scrPtr), pixPtr->pixmap = XCreatePixmap(scrPtr->display, W_DRAWABLE(scrPtr),
width, height, depth); width, height, depth);
if (masked) { if (masked) {
pixPtr->mask = XCreatePixmap(scrPtr->display, W_DRAWABLE(scrPtr), pixPtr->mask = XCreatePixmap(scrPtr->display, W_DRAWABLE(scrPtr),
width, height, 1); width, height, 1);
} else { } else {
pixPtr->mask = None; pixPtr->mask = None;
} }
@@ -128,6 +128,21 @@ WMCreatePixmapFromRImage(WMScreen *scrPtr, RImage *image, int threshold)
} }
WMPixmap*
WMCreateBlendedPixmapFromRImage(WMScreen *scrPtr, RImage *image, RColor *color)
{
WMPixmap *pixPtr;
RImage *copy;
copy = RCloneImage(image);
RCombineImageWithColor(copy, color);
pixPtr = WMCreatePixmapFromRImage(scrPtr, copy, 0);
RDestroyImage(copy);
return pixPtr;
}
WMPixmap* WMPixmap*
WMCreateBlendedPixmapFromFile(WMScreen *scrPtr, char *fileName, RColor *color) WMCreateBlendedPixmapFromFile(WMScreen *scrPtr, char *fileName, RColor *color)
{ {