Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-26 19:18:16 +02:00
commit 7d2978ead4
1 changed files with 3 additions and 2 deletions

View File

@ -813,6 +813,9 @@ void x_push_changes(Con *con) {
if (stacking_changed) if (stacking_changed)
ewmh_update_client_list_stacking(btt_stack, btt_stack_num); ewmh_update_client_list_stacking(btt_stack, btt_stack_num);
DLOG("\n\n PUSHING CHANGES\n\n");
x_push_node(con);
//DLOG("Re-enabling EnterNotify\n"); //DLOG("Re-enabling EnterNotify\n");
values[0] = FRAME_EVENT_MASK; values[0] = FRAME_EVENT_MASK;
CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) {
@ -821,8 +824,6 @@ void x_push_changes(Con *con) {
} }
//DLOG("Done, EnterNotify re-enabled\n"); //DLOG("Done, EnterNotify re-enabled\n");
DLOG("\n\n PUSHING CHANGES\n\n");
x_push_node(con);
x_deco_recurse(con); x_deco_recurse(con);
xcb_window_t to_focus = focused->frame; xcb_window_t to_focus = focused->frame;