yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port ShowFPS Effect to XCB render

Browse source
This commit is contained in:
Martin Gräßlin 2013-01-29 09:18:06 +01:00
parent 79af33c136
commit c7e86b970c
1 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
effects/showfps/showfps.cpp
View file

@ -27,11 +27,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwinglutils.h> #include <kwinglutils.h>
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
#include <X11/Xlib.h>
#include <X11/extensions/Xrender.h>
#endif
#include <kwinxrenderutils.h> #include <kwinxrenderutils.h>
#include <xcb/render.h>
#endif
#include <math.h> #include <math.h>
#include <QPainter> #include <QPainter>
@ -242,29 +240,38 @@ void ShowFpsEffect::paintGL(int fps)
*/ */
void ShowFpsEffect::paintXrender(int fps) void ShowFpsEffect::paintXrender(int fps)
{ {
Pixmap pixmap = XCreatePixmap(display(), rootWindow(), FPS_WIDTH, MAX_TIME, 32); xcb_pixmap_t pixmap = xcb_generate_id(connection());
xcb_create_pixmap(connection(), 32, pixmap, rootWindow(), FPS_WIDTH, MAX_TIME);
XRenderPicture p(pixmap, 32); XRenderPicture p(pixmap, 32);
XFreePixmap(display(), pixmap); xcb_free_pixmap(connection(), pixmap);
XRenderColor col; xcb_render_color_t col;
col.alpha = int(alpha * 0xffff); col.alpha = int(alpha * 0xffff);
col.red = int(alpha * 0xffff); // white col.red = int(alpha * 0xffff); // white
col.green = int(alpha * 0xffff); col.green = int(alpha * 0xffff);
col.blue = int(alpha * 0xffff); col.blue = int(alpha * 0xffff);
XRenderFillRectangle(display(), PictOpSrc, p, &col, 0, 0, FPS_WIDTH, MAX_TIME); xcb_rectangle_t rect = {0, 0, FPS_WIDTH, MAX_TIME};
xcb_render_fill_rectangles(connection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
col.red = 0; // blue col.red = 0; // blue
col.green = 0; col.green = 0;
col.blue = int(alpha * 0xffff); col.blue = int(alpha * 0xffff);
XRenderFillRectangle(display(), PictOpSrc, p, &col, 0, MAX_TIME - fps, FPS_WIDTH, fps); rect.y = MAX_TIME - fps;
rect.width = FPS_WIDTH;
rect.height = fps;
xcb_render_fill_rectangles(connection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
col.red = 0; // black col.red = 0; // black
col.green = 0; col.green = 0;
col.blue = 0; col.blue = 0;
QVector<xcb_rectangle_t> rects;
for (int i = 10; for (int i = 10;
i < MAX_TIME; i < MAX_TIME;
i += 10) { i += 10) {
XRenderFillRectangle(display(), PictOpSrc, p, &col, 0, MAX_TIME - i, FPS_WIDTH, 1); xcb_rectangle_t rect = {0, int16_t(MAX_TIME - i), uint16_t(FPS_WIDTH), 1};
rects << rect;
} }
XRenderComposite(display(), alpha != 1.0 ? PictOpOver : PictOpSrc, p, None, xcb_render_fill_rectangles(connection(), XCB_RENDER_PICT_OP_SRC, p, col, rects.count(), rects.constData());
effects->xrenderBufferPicture(), 0, 0, 0, 0, x, y, FPS_WIDTH, MAX_TIME); xcb_render_composite(connection(), alpha != 1.0 ? XCB_RENDER_PICT_OP_OVER : XCB_RENDER_PICT_OP_SRC, p, XCB_RENDER_PICTURE_NONE,
effects->xrenderBufferPicture(), 0, 0, 0, 0, x, y, FPS_WIDTH, MAX_TIME);
// Paint FPS graph // Paint FPS graph
paintFPSGraph(x + FPS_WIDTH, y); paintFPSGraph(x + FPS_WIDTH, y);
@ -369,15 +376,17 @@ void ShowFpsEffect::paintGraph(int x, int y, QList<int> values, QList<int> lines
} }
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
if (effects->compositingType() == XRenderCompositing) { if (effects->compositingType() == XRenderCompositing) {
Pixmap pixmap = XCreatePixmap(display(), rootWindow(), values.count(), MAX_TIME, 32); xcb_pixmap_t pixmap = xcb_generate_id(connection());
xcb_create_pixmap(connection(), 32, pixmap, rootWindow(), values.count(), MAX_TIME);
XRenderPicture p(pixmap, 32); XRenderPicture p(pixmap, 32);
XFreePixmap(display(), pixmap); xcb_free_pixmap(connection(), pixmap);
XRenderColor col; xcb_render_color_t col;
col.alpha = int(alpha * 0xffff); col.alpha = int(alpha * 0xffff);
// Draw background // Draw background
col.red = col.green = col.blue = int(alpha * 0xffff); // white col.red = col.green = col.blue = int(alpha * 0xffff); // white
XRenderFillRectangle(display(), PictOpSrc, p, &col, 0, 0, values.count(), MAX_TIME); xcb_rectangle_t rect = {0, 0, uint16_t(values.count()), uint16_t(MAX_TIME)};
xcb_render_fill_rectangles(connection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
// Then the values // Then the values
col.red = col.green = col.blue = int(alpha * 0x8000); // grey col.red = col.green = col.blue = int(alpha * 0x8000); // grey
@ -406,18 +415,22 @@ void ShowFpsEffect::paintGraph(int x, int y, QList<int> values, QList<int> lines
col.blue = 0; col.blue = 0;
} }
} }
XRenderFillRectangle(display(), PictOpSrc, p, &col, xcb_rectangle_t rect = {int16_t(values.count() - i), int16_t(MAX_TIME - value), 1, uint16_t(value)};
values.count() - i, MAX_TIME - value, 1, value); xcb_render_fill_rectangles(connection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
} }
// Then the lines // Then the lines
col.red = col.green = col.blue = 0; // black col.red = col.green = col.blue = 0; // black
foreach (int h, lines) QVector<xcb_rectangle_t> rects;
XRenderFillRectangle(display(), PictOpSrc, p, &col, 0, MAX_TIME - h, values.count(), 1); foreach (int h, lines) {
xcb_rectangle_t rect = {0, int16_t(MAX_TIME - h), uint16_t(values.count()), 1};
rects << rect;
}
xcb_render_fill_rectangles(connection(), XCB_RENDER_PICT_OP_SRC, p, col, rects.count(), rects.constData());
// Finally render the pixmap onto screen // Finally render the pixmap onto screen
XRenderComposite(display(), alpha != 1.0 ? PictOpOver : PictOpSrc, p, None, xcb_render_composite(connection(), alpha != 1.0 ? XCB_RENDER_PICT_OP_OVER : XCB_RENDER_PICT_OP_SRC, p,
effects->xrenderBufferPicture(), 0, 0, 0, 0, x, y, values.count(), MAX_TIME); XCB_RENDER_PICTURE_NONE, effects->xrenderBufferPicture(), 0, 0, 0, 0, x, y, values.count(), MAX_TIME);
} }
#endif #endif
} }