widget: use PIXMAP atom directly

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-06-17 21:23:38 +02:00
parent b9e1ec69d0
commit 3bee2302bf
1 changed files with 4 additions and 7 deletions

View File

@ -24,6 +24,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xcb_aux.h> #include <xcb/xcb_aux.h>
#include <xcb/xcb_atom.h>
#include "widget.h" #include "widget.h"
#include "statusbar.h" #include "statusbar.h"
@ -139,15 +140,12 @@ widget_render(widget_node_t *wnode, draw_context_t *ctx, xcb_gcontext_t gc, xcb_
xcb_get_property_reply_t *prop_r; xcb_get_property_reply_t *prop_r;
xcb_get_property_cookie_t prop_c; xcb_get_property_cookie_t prop_c;
area_t rectangle = { 0, 0, 0, 0, NULL, NULL }; area_t rectangle = { 0, 0, 0, 0, NULL, NULL };
xcb_atom_t rootpix_atom, pixmap_atom; xcb_atom_t rootpix_atom;
xutil_intern_atom_request_t rootpix_atom_req, pixmap_atom_req; xutil_intern_atom_request_t rootpix_atom_req;
/* Send requests needed for transparency */ /* Send requests needed for transparency */
if(ctx->bg.alpha != 0xffff) if(ctx->bg.alpha != 0xffff)
{
pixmap_atom_req = xutil_intern_atom(globalconf.connection, &globalconf.atoms, "PIXMAP");
rootpix_atom_req = xutil_intern_atom(globalconf.connection, &globalconf.atoms, "_XROOTPMAP_ID"); rootpix_atom_req = xutil_intern_atom(globalconf.connection, &globalconf.atoms, "_XROOTPMAP_ID");
}
rectangle.width = ctx->width; rectangle.width = ctx->width;
rectangle.height = ctx->height; rectangle.height = ctx->height;
@ -155,10 +153,9 @@ widget_render(widget_node_t *wnode, draw_context_t *ctx, xcb_gcontext_t gc, xcb_
if(ctx->bg.alpha != 0xffff) if(ctx->bg.alpha != 0xffff)
{ {
s = xutil_screen_get(globalconf.connection, ctx->phys_screen); s = xutil_screen_get(globalconf.connection, ctx->phys_screen);
pixmap_atom = xutil_intern_atom_reply(globalconf.connection, &globalconf.atoms, pixmap_atom_req);
rootpix_atom = xutil_intern_atom_reply(globalconf.connection, &globalconf.atoms, rootpix_atom_req); rootpix_atom = xutil_intern_atom_reply(globalconf.connection, &globalconf.atoms, rootpix_atom_req);
prop_c = xcb_get_property_unchecked(globalconf.connection, false, s->root, rootpix_atom, prop_c = xcb_get_property_unchecked(globalconf.connection, false, s->root, rootpix_atom,
pixmap_atom, 0, 1); PIXMAP, 0, 1);
if((prop_r = xcb_get_property_reply(globalconf.connection, prop_c, NULL))) if((prop_r = xcb_get_property_reply(globalconf.connection, prop_c, NULL)))
{ {
if((data = xcb_get_property_value(prop_r)) if((data = xcb_get_property_value(prop_r))