Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*fix* image rendering in real_transparency mode fixed (imlib_render_image does not work correctly)

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@318 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-01-04 16:25:17 +00:00
parent 404d84afd3
commit 6cdf27ddfd
5 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/area.c
View File

@@ -20,6 +20,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/Xrender.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -252,12 +253,7 @@ void draw_rect(cairo_t *c, double x, double y, double w, double h, double r)
void clear_pixmap(Pixmap p, int x, int y, int w, int h)
{
cairo_surface_t *tmp = cairo_xlib_surface_create (server.dsp, p, server.visual, w, h);
cairo_t *cr = cairo_create(tmp);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_rectangle(cr, x, y, w, h);
cairo_set_source_rgba(cr, 1, 1, 1, 0);
cairo_fill(cr);
cairo_destroy(cr);
cairo_surface_destroy (tmp);
Picture pict = XRenderCreatePicture(server.dsp, p, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
XRenderColor col = { .red=0, .green=0, .blue=0, .alpha=0 };
XRenderFillRectangle(server.dsp, PictOpSrc, pict, &col, x, y, w, h);
}

22
src/util/common.c
View File

@@ -21,12 +21,14 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/Xrender.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "common.h"
#include "server.h"
@@ -249,3 +251,23 @@ void createHeuristicMask(DATA32* data, int w, int h)
udata += 4;
}
}
void render_image(Drawable d, int x, int y, int w, int h)
{
// in real_transparency mode imlib_render_image_on_drawable does not the right thing, because
// the operation is IMLIB_OP_COPY, but we would need IMLIB_OP_OVER (which does not exist)
// Therefore we have to do it with the XRender extension (i.e. copy what imlib is doing internally)
// But first we need to render the image onto itself with PictOpIn to adjust the colors to the alpha channel
Pixmap pmap_tmp = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
imlib_context_set_drawable(pmap_tmp);
imlib_context_set_blend(0);
imlib_render_image_on_drawable(0, 0);
Picture pict_image = XRenderCreatePicture(server.dsp, pmap_tmp, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
Picture pict_drawable = XRenderCreatePicture(server.dsp, d, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
XRenderComposite(server.dsp, PictOpIn, pict_image, None, pict_image, 0, 0, 0, 0, 0, 0, w, h);
XRenderComposite(server.dsp, PictOpOver, pict_image, None, pict_drawable, 0, 0, 0, 0, x, y, w, h);
XFreePixmap(server.dsp, pmap_tmp);
XRenderFreePicture(server.dsp, pict_image);
XRenderFreePicture(server.dsp, pict_drawable);
}

2
src/util/common.h
View File

@@ -65,5 +65,7 @@ void get_color (char *hex, double *rgb);
// alpha from 0 to 100, satur from 0 to 1, bright from 0 to 1.
void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright);
void createHeuristicMask(DATA32* data, int w, int h);
void render_image(Drawable d, int x, int y, int w, int h);
#endif