nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Set pixmap_recreated before rendering the decoration

This commit is contained in:
Michael Stapelberg 2011-05-29 12:20:09 +02:00
parent f680c8841f
commit 446c9b7313
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/x.c
View File

@ -507,7 +507,7 @@ void x_push_node(Con *con) {
} }
rect.height = max_y + max_height; rect.height = max_y + max_height;
if (rect.height == 0) { if (rect.height == 0) {
DLOG("Unmapping container because it does not contain anything atm.\n"); DLOG("Unmapping container %p because it does not contain anything.\n", con);
con->mapped = false; con->mapped = false;
} }
} }
@ -553,7 +553,9 @@ void x_push_node(Con *con) {
if (rect.height > 0 && if (rect.height > 0 &&
(state->rect.width != rect.width || (state->rect.width != rect.width ||
state->rect.height != rect.height)) { state->rect.height != rect.height)) {
DLOG("CACHE: creating new pixmap\n"); DLOG("CACHE: creating new pixmap for con %p (old: %d x %d, new: %d x %d)\n",
con, state->rect.width, state->rect.height,
rect.width, rect.height);
if (con->pixmap == 0) { if (con->pixmap == 0) {
con->pixmap = xcb_generate_id(conn); con->pixmap = xcb_generate_id(conn);
con->pm_gc = xcb_generate_id(conn); con->pm_gc = xcb_generate_id(conn);
@ -564,6 +566,8 @@ void x_push_node(Con *con) {
xcb_create_pixmap(conn, root_depth, con->pixmap, con->frame, rect.width, rect.height); xcb_create_pixmap(conn, root_depth, con->pixmap, con->frame, rect.width, rect.height);
xcb_create_gc(conn, con->pm_gc, con->pixmap, 0, 0); xcb_create_gc(conn, con->pm_gc, con->pixmap, 0, 0);
con->pixmap_recreated = true;
/* Render the decoration now to make the correct decoration visible /* Render the decoration now to make the correct decoration visible
* from the very first moment. Later calls will be cached, so this * from the very first moment. Later calls will be cached, so this
* doesn’t hurt performance. */ * doesn’t hurt performance. */
@ -571,7 +575,6 @@ void x_push_node(Con *con) {
uint32_t values[] = { con->pixmap }; uint32_t values[] = { con->pixmap };
xcb_change_window_attributes(conn, con->frame, XCB_CW_BACK_PIXMAP, values); xcb_change_window_attributes(conn, con->frame, XCB_CW_BACK_PIXMAP, values);
con->pixmap_recreated = true;
} }
DLOG("setting rect (%d, %d, %d, %d)\n", rect.x, rect.y, rect.width, rect.height); DLOG("setting rect (%d, %d, %d, %d)\n", rect.x, rect.y, rect.width, rect.height);