e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add argb option to EPictureCreateBuffer().

This commit is contained in:
Kim Woelders 2014-08-17 13:27:53 +02:00
parent 9bdfa8dcbb
commit 83e1e6e88f
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ecompmgr.c
View File

@ -1990,7 +1990,7 @@ static void
ECompMgrRootBufferCreate(unsigned int w, unsigned int h)
{
/* Root buffer picture and pixmap */
rootBuffer = EPictureCreateBuffer(VROOT, w, h, &Mode_compmgr.pmap);
rootBuffer = EPictureCreateBuffer(VROOT, w, h, 0, &Mode_compmgr.pmap);
/* Screen region */
Mode_compmgr.rgn_screen = ERegionCreateRect(0, 0, w, h);

14
src/x.c
View File

@ -2063,7 +2063,7 @@ EPictureCreate(Win win, EX_Drawable draw)
if (!win)
win = VROOT;
pictfmt = XRenderFindVisualFormat(disp, WinGetVisual(win));
pict = XRenderCreatePicture(disp, draw, pictfmt, 0, 0);
pict = XRenderCreatePicture(disp, draw, pictfmt, 0, NULL);
return pict;
}
@ -2097,15 +2097,19 @@ EPictureCreateSolid(EX_Window xwin, int argb, unsigned int a, unsigned int rgb)
}
EX_Picture
EPictureCreateBuffer(Win win, int w, int h, EX_Pixmap * ppmap)
EPictureCreateBuffer(Win win, int w, int h, int argb, EX_Pixmap * ppmap)
{
EX_Picture pict;
EX_Pixmap pmap;
XRenderPictFormat *pictfmt;
int depth;
pmap = XCreatePixmap(disp, WinGetXwin(win), w, h, WinGetDepth(win));
pictfmt = XRenderFindVisualFormat(disp, WinGetVisual(win));
pict = XRenderCreatePicture(disp, pmap, pictfmt, 0, 0);
depth = argb ? 32 : WinGetDepth(win);
pictfmt = argb ?
XRenderFindStandardFormat(disp, PictStandardARGB32) :
XRenderFindVisualFormat(disp, WinGetVisual(win));
pmap = XCreatePixmap(disp, WinGetXwin(win), w, h, depth);
pict = XRenderCreatePicture(disp, pmap, pictfmt, 0, NULL);
if (ppmap)
*ppmap = pmap;
else

2
src/xwin.h
View File

@ -309,7 +309,7 @@ void PmapMaskFree(PmapMask * pmm);
EX_Picture EPictureCreate(Win win, EX_Drawable draw);
EX_Picture EPictureCreateSolid(EX_Window xwin, int argb,
unsigned int a, unsigned int rgb);
EX_Picture EPictureCreateBuffer(Win win, int w, int h,
EX_Picture EPictureCreateBuffer(Win win, int w, int h, int argb,
EX_Pixmap * ppmap);
void EPictureDestroy(EX_Picture pict);