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

Revert 43d471b9ab and apply correct bugfix: 

Before, all clients were reconfigured to just raise them, when focus should
be set. However, this generated lots of notify events, which in turn lead
to an endless loop of setting focus, reconfiguring, setting focus, …
This commit is contained in:
Michael Stapelberg 2009-02-28 02:36:40 +01:00
parent 74c973e8c6
commit d8d4d0182d
3 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/handlers.c
View File

@ -110,11 +110,6 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_
return 1;
}
/* When in stacking, enter notifications on the parent are ignored. Focus will be changed via keyboard only. */
if (client->container->mode == MODE_STACK &&
client == table_get(byParent, event->event))
return 1;
set_focus(conn, client);
return 1;

38
src/layout.c
View File

@ -232,27 +232,31 @@ void render_container(xcb_connection_t *connection, Container *container) {
xcb_configure_window(connection, stack_win->window,
XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, &(stack_win->width));
/* All clients are repositioned */
CIRCLEQ_FOREACH(client, &(container->clients), clients) {
/* Check if we changed client->x or client->y by updating it.
* Note the bitwise OR instead of logical OR to force evaluation of both statements */
if (client->force_reconfigure |
(client->rect.x != (client->rect.x = container->x)) |
(client->rect.y != (client->rect.y = container->y + (decoration_height * num_clients))))
reposition_client(connection, client);
/* Reconfigure the currently focused client, if necessary. It is the only visible one */
client = container->currently_focused;
if (client->force_reconfigure |
(client->rect.width != (client->rect.width = container->width)) |
(client->rect.height !=
(client->rect.height = container->height - (decoration_height * num_clients))))
resize_client(connection, client);
/* Check if we changed client->x or client->y by updating it.
* Note the bitwise OR instead of logical OR to force evaluation of both statements */
if (client->force_reconfigure |
(client->rect.x != (client->rect.x = container->x)) |
(client->rect.y != (client->rect.y = container->y + (decoration_height * num_clients))))
reposition_client(connection, client);
client->force_reconfigure = false;
if (client->force_reconfigure |
(client->rect.width != (client->rect.width = container->width)) |
(client->rect.height !=
(client->rect.height = container->height - (decoration_height * num_clients))))
resize_client(connection, client);
client->force_reconfigure = false;
uint32_t values[] = { XCB_STACK_MODE_ABOVE };
xcb_configure_window(connection, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values);
/* Render the decorations of all clients */
CIRCLEQ_FOREACH(client, &(container->clients), clients)
decorate_window(connection, client, stack_win->window, stack_win->gc,
current_client * decoration_height);
current_client++;
}
current_client++ * decoration_height);
}
}

13
src/util.c
View File

@ -149,13 +149,9 @@ void set_focus(xcb_connection_t *conn, Client *client) {
decorate_window(conn, client, client->frame, client->titlegc, 0);
/* If we’re in stacking mode, we render the container to update changes in the title
bars and raise the focused client */
if (client->container->mode == MODE_STACK) {
bars and to raise the focused client */
if (client->container->mode == MODE_STACK)
render_container(conn, client->container);
uint32_t values[] = { XCB_STACK_MODE_ABOVE };
xcb_configure_window(conn, client->frame,
XCB_CONFIG_WINDOW_STACK_MODE, values);
}
xcb_flush(conn);
}
@ -193,11 +189,6 @@ void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode)
stack_win->container = container;
SLIST_INSERT_HEAD(&stack_wins, stack_win, stack_windows);
/* Raise the focused window */
values[0] = XCB_STACK_MODE_ABOVE;
xcb_configure_window(conn, container->currently_focused->frame,
XCB_CONFIG_WINDOW_STACK_MODE, values);
} else {
if (container->mode == MODE_STACK) {
/* When going out of stacking mode, we need to close the window */