X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhandlers.c;h=624c34305d5bd78caa9bcdbe89ab6291ad0e5095;hb=ffa388f1946ad2555b62cea5bc2460c546e36fd0;hp=ee47141acd97806dbba41bad299085e589f5fbbc;hpb=af3972aa9fd691a9723bb816a954704d50794ad6;p=i3%2Fi3 diff --git a/src/handlers.c b/src/handlers.c index ee47141a..624c3430 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -3,7 +3,7 @@ * * i3 - an improved dynamic tiling window manager * - * © 2009 Michael Stapelberg and contributors + * © 2009-2010 Michael Stapelberg and contributors * * See file LICENSE for license information. * @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -28,13 +29,17 @@ #include "data.h" #include "xcb.h" #include "util.h" -#include "xinerama.h" +#include "randr.h" #include "config.h" #include "queue.h" #include "resize.h" #include "client.h" #include "manage.h" #include "floating.h" +#include "workspace.h" +#include "log.h" +#include "container.h" +#include "ipc.h" /* After mapping/unmapping windows, a notify event is generated. However, we don’t want it, since it’d trigger an infinite loop of switching between the different windows when @@ -47,8 +52,6 @@ static void add_ignore_event(const int sequence) { event->sequence = sequence; event->added = time(NULL); - LOG("Adding sequence %d to ignorelist\n", sequence); - SLIST_INSERT_HEAD(&ignore_events, event, ignore_events); } @@ -70,7 +73,6 @@ static bool event_is_ignored(const int sequence) { SLIST_FOREACH(event, &ignore_events, ignore_events) { if (event->sequence == sequence) { - LOG("Ignoring event (sequence %d)\n", sequence); SLIST_REMOVE(&ignore_events, event, Ignore_Event, ignore_events); free(event); return true; @@ -80,75 +82,98 @@ static bool event_is_ignored(const int sequence) { return false; } -/* - * Due to bindings like Mode_switch + , we need to bind some keys in XCB_GRAB_MODE_SYNC. - * Therefore, we just replay all key presses. - * - */ -int handle_key_release(void *ignored, xcb_connection_t *conn, xcb_key_release_event_t *event) { - LOG("got key release, just passing\n"); - xcb_allow_events(conn, XCB_ALLOW_REPLAY_KEYBOARD, event->time); - xcb_flush(conn); - return 1; -} - /* * There was a key press. We compare this key code with our bindings table and pass * the bound action to parse_command(). * */ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_t *event) { - LOG("Keypress %d, state raw = %d\n", event->detail, event->state); + DLOG("Keypress %d, state raw = %d\n", event->detail, event->state); /* Remove the numlock bit, all other bits are modifiers we can bind to */ uint16_t state_filtered = event->state & ~(xcb_numlock_mask | XCB_MOD_MASK_LOCK); - LOG("(removed numlock, state = %d)\n", state_filtered); + DLOG("(removed numlock, state = %d)\n", state_filtered); /* Only use the lower 8 bits of the state (modifier masks) so that mouse * button masks are filtered out */ state_filtered &= 0xFF; - LOG("(removed upper 8 bits, state = %d)\n", state_filtered); + DLOG("(removed upper 8 bits, state = %d)\n", state_filtered); - /* We need to get the keysym group (There are group 1 to group 4, each holding - two keysyms (without shift and with shift) using Xkb because X fails to - provide them reliably (it works in Xephyr, it does not in real X) */ - XkbStateRec state; - if (XkbGetState(xkbdpy, XkbUseCoreKbd, &state) == Success && (state.group+1) == 2) + if (xkb_current_group == XkbGroup2Index) state_filtered |= BIND_MODE_SWITCH; - LOG("(checked mode_switch, state %d)\n", state_filtered); + DLOG("(checked mode_switch, state %d)\n", state_filtered); /* Find the binding */ - Binding *bind; - TAILQ_FOREACH(bind, &bindings, bindings) - if (bind->keycode == event->detail && bind->mods == state_filtered) - break; - - /* No match? Then it was an actively grabbed key, that is with Mode_switch, and - the user did not press Mode_switch, so just pass it… */ - if (bind == TAILQ_END(&bindings)) { - xcb_allow_events(conn, ReplayKeyboard, event->time); - xcb_flush(conn); - return 1; + Binding *bind = get_binding(state_filtered, event->detail); + + /* No match? Then the user has Mode_switch enabled but does not have a + * specific keybinding. Fall back to the default keybindings (without + * Mode_switch). Makes it much more convenient for users of a hybrid + * layout (like us, ru). */ + if (bind == NULL) { + state_filtered &= ~(BIND_MODE_SWITCH); + DLOG("no match, new state_filtered = %d\n", state_filtered); + if ((bind = get_binding(state_filtered, event->detail)) == NULL) { + ELOG("Could not lookup key binding (modifiers %d, keycode %d)\n", + state_filtered, event->detail); + return 1; + } } parse_command(conn, bind->command); - if (state_filtered & BIND_MODE_SWITCH) { - LOG("Mode_switch -> allow_events(SyncKeyboard)\n"); - xcb_allow_events(conn, SyncKeyboard, event->time); - xcb_flush(conn); - } return 1; } +/* + * Called with coordinates of an enter_notify event or motion_notify event + * to check if the user crossed virtual screen boundaries and adjust the + * current workspace, if so. + * + */ +static void check_crossing_screen_boundary(uint32_t x, uint32_t y) { + Output *output; + + if ((output = get_output_containing(x, y)) == NULL) { + ELOG("ERROR: No such screen\n"); + return; + } + if (output == c_ws->output) + return; + + c_ws->current_row = current_row; + c_ws->current_col = current_col; + c_ws = output->current_workspace; + current_row = c_ws->current_row; + current_col = c_ws->current_col; + DLOG("We're now on output %p\n", output); + + /* While usually this function is only called when the user switches + * to a different output using his mouse (and thus the output is + * empty), it may be that the following race condition occurs: + * 1) the user actives a new output (say VGA1). + * 2) the cursor is sent to the first pixel of the new VGA1, thus + * generating an enter_notify for the screen (the enter_notify + * is not yet received by i3). + * 3) i3 requeries screen configuration and maps a workspace onto the + * new output. + * 4) the enter_notify event arrives and c_ws is set to the new + * workspace but the existing windows on the new workspace are not + * focused. + * + * Therefore, we re-set the focus here to be sure it’s correct. */ + Client *first_client = SLIST_FIRST(&(c_ws->focus_stack)); + if (first_client != NULL) + set_focus(global_conn, first_client, true); +} /* * When the user moves the mouse pointer onto a window, this callback gets called. * */ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_event_t *event) { - LOG("enter_notify for %08x, mode = %d, detail %d, serial %d\n", event->event, event->mode, event->detail, event->sequence); + DLOG("enter_notify for %08x, mode = %d, detail %d, serial %d\n", event->event, event->mode, event->detail, event->sequence); if (event->mode != XCB_NOTIFY_MODE_NORMAL) { - LOG("This was not a normal notify, ignoring\n"); + DLOG("This was not a normal notify, ignoring\n"); return 1; } /* Some events are not interesting, because they were not generated actively by the @@ -175,18 +200,8 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_ /* If not, then the user moved his cursor to the root window. In that case, we adjust c_ws */ if (client == NULL) { - LOG("Getting screen at %d x %d\n", event->root_x, event->root_y); - i3Screen *screen = get_screen_containing(event->root_x, event->root_y); - if (screen == NULL) { - LOG("ERROR: No such screen\n"); - return 0; - } - c_ws->current_row = current_row; - c_ws->current_col = current_col; - c_ws = &workspaces[screen->current_workspace]; - current_row = c_ws->current_row; - current_col = c_ws->current_col; - LOG("We're now on virtual screen number %d\n", screen->num); + DLOG("Getting screen at %d x %d\n", event->root_x, event->root_y); + check_crossing_screen_boundary(event->root_x, event->root_y); return 1; } @@ -195,242 +210,61 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_ if (client->container != NULL && client->container->mode == MODE_STACK && client->container->currently_focused != client) { - LOG("Plausibility check says: no\n"); + DLOG("Plausibility check says: no\n"); return 1; } - if (client->workspace != c_ws && client->workspace->screen == c_ws->screen) { + if (client->workspace != c_ws && client->workspace->output == c_ws->output) { /* This can happen when a client gets assigned to a different workspace than * the current one (see src/mainx.c:reparent_window). Shortly after it was created, * an enter_notify will follow. */ - LOG("enter_notify for a client on a different workspace but the same screen, ignoring\n"); + DLOG("enter_notify for a client on a different workspace but the same screen, ignoring\n"); return 1; } - set_focus(conn, client, false); + if (!config.disable_focus_follows_mouse) + set_focus(conn, client, false); return 1; } /* - * Checks if the button press was on a stack window, handles focus setting and returns true - * if so, or false otherwise. + * When the user moves the mouse but does not change the active window + * (e.g. when having no windows opened but moving mouse on the root screen + * and crossing virtual screen boundaries), this callback gets called. * */ -static bool button_press_stackwin(xcb_connection_t *conn, xcb_button_press_event_t *event) { - struct Stack_Window *stack_win; - SLIST_FOREACH(stack_win, &stack_wins, stack_windows) { - if (stack_win->window != event->event) - continue; - - /* A stack window was clicked, we check if it was button4 or button5 - which are scroll up / scroll down. */ - if (event->detail == XCB_BUTTON_INDEX_4 || event->detail == XCB_BUTTON_INDEX_5) { - direction_t direction = (event->detail == XCB_BUTTON_INDEX_4 ? D_UP : D_DOWN); - focus_window_in_container(conn, CUR_CELL, direction); - return true; - } - - /* It was no scrolling, so we calculate the destination client by - dividing the Y position of the event through the height of a window - decoration and then set the focus to this client. */ - i3Font *font = load_font(conn, config.font); - int decoration_height = (font->height + 2 + 2); - int destination = (event->event_y / decoration_height), - c = 0; - Client *client; - - LOG("Click on stack_win for client %d\n", destination); - CIRCLEQ_FOREACH(client, &(stack_win->container->clients), clients) - if (c++ == destination) { - set_focus(conn, client, true); - return true; - } +int handle_motion_notify(void *ignored, xcb_connection_t *conn, xcb_motion_notify_event_t *event) { + /* Skip events where the pointer was over a child window, we are only + * interested in events on the root window. */ + if (event->child != 0) + return 1; - return true; - } + check_crossing_screen_boundary(event->root_x, event->root_y); - return false; + return 1; } /* - * Checks if the button press was on a bar, switches to the workspace and returns true - * if so, or false otherwise. + * Called when the keyboard mapping changes (for example by using Xmodmap), + * we need to update our key bindings then (re-translate symbols). * */ -static bool button_press_bar(xcb_connection_t *conn, xcb_button_press_event_t *event) { - i3Screen *screen; - TAILQ_FOREACH(screen, virtual_screens, screens) { - if (screen->bar != event->event) - continue; - - LOG("Click on a bar\n"); - - /* Check if the button was one of button4 or button5 (scroll up / scroll down) */ - if (event->detail == XCB_BUTTON_INDEX_4 || event->detail == XCB_BUTTON_INDEX_5) { - int add = (event->detail == XCB_BUTTON_INDEX_4 ? -1 : 1); - for (int i = c_ws->num + add; (i >= 0) && (i < 10); i += add) - if (workspaces[i].screen == screen) { - show_workspace(conn, i+1); - return true; - } - return true; - } - int drawn = 0; - /* Because workspaces can be on different screens, we need to loop - through all of them and decide to count it based on its ->screen */ - for (int i = 0; i < 10; i++) { - if (workspaces[i].screen != screen) - continue; - LOG("Checking if click was on workspace %d with drawn = %d, tw = %d\n", - i, drawn, workspaces[i].text_width); - if (event->event_x > (drawn + 1) && - event->event_x <= (drawn + 1 + workspaces[i].text_width + 5 + 5)) { - show_workspace(conn, i+1); - return true; - } - - drawn += workspaces[i].text_width + 5 + 5 + 2; - } - return true; - } - - return false; -} - -int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_event_t *event) { - LOG("button press!\n"); - LOG("state = %d\n", event->state); - /* This was either a focus for a client’s parent (= titlebar)… */ - Client *client = table_get(&by_child, event->event); - bool border_click = false; - if (client == NULL) { - client = table_get(&by_parent, event->event); - border_click = true; - } - /* See if this was a click with the configured modifier. If so, we need - * to move around the client if it was floating. if not, we just process - * as usual. */ - if (config.floating_modifier != 0 && - (event->state & config.floating_modifier) != 0) { - if (client == NULL) { - LOG("Not handling, floating_modifier was pressed and no client found\n"); - return 1; - } - if (client_is_floating(client)) { - floating_drag_window(conn, client, event); - return 1; - } - } - - if (client == NULL) { - /* The client was neither on a client’s titlebar nor on a client itself, maybe on a stack_window? */ - if (button_press_stackwin(conn, event)) - return 1; - - /* Or on a bar? */ - if (button_press_bar(conn, event)) - return 1; - - LOG("Could not handle this button press\n"); - return 1; - } - - /* Set focus in any case */ - set_focus(conn, client, true); - - /* Let’s see if this was on the borders (= resize). If not, we’re done */ - LOG("press button on x=%d, y=%d\n", event->event_x, event->event_y); - resize_orientation_t orientation = O_VERTICAL; - Container *con = client->container; - int first, second; - - if (client->dock) { - LOG("dock. done.\n"); - xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time); - xcb_flush(conn); - return 1; - } - - LOG("event->event_x = %d, client->rect.width = %d\n", event->event_x, client->rect.width); - - /* Some clients (xfontsel for example) seem to pass clicks on their - * window to the parent window, thus we receive an event here which in - * reality is a border_click. Check for the position and fix state. */ - if (border_click && - event->event_x >= client->child_rect.x && - event->event_x <= (client->child_rect.x + client->child_rect.width) && - event->event_y >= client->child_rect.y && - event->event_y <= (client->child_rect.y + client->child_rect.height)) { - LOG("Fixing border_click = false because of click in child\n"); - border_click = false; - } - - if (!border_click) { - LOG("client. done.\n"); - xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time); - /* Floating clients should be raised on click */ - if (client_is_floating(client)) - xcb_raise_window(conn, client->frame); - xcb_flush(conn); - return 1; - } - - /* Don’t handle events inside the titlebar, only borders are interesting */ - i3Font *font = load_font(conn, config.font); - if (event->event_y >= 2 && event->event_y <= (font->height + 2 + 2)) { - LOG("click on titlebar\n"); - - /* Floating clients can be dragged by grabbing their titlebar */ - if (client_is_floating(client)) { - /* Firstly, we raise it. Maybe the user just wanted to raise it without grabbing */ - xcb_raise_window(conn, client->frame); - xcb_flush(conn); - - floating_drag_window(conn, client, event); - } - return 1; - } - - if (client_is_floating(client)) - return floating_border_click(conn, client, event); - - if (event->event_y < 2) { - /* This was a press on the top border */ - if (con->row == 0) - return 1; - first = con->row - 1; - second = con->row; - orientation = O_HORIZONTAL; - } else if (event->event_y >= (client->rect.height - 2)) { - /* …bottom border */ - first = con->row + (con->rowspan - 1); - if (!cell_exists(con->col, first) || - (first == (con->workspace->rows-1))) - return 1; +int handle_mapping_notify(void *ignored, xcb_connection_t *conn, xcb_mapping_notify_event_t *event) { + if (event->request != XCB_MAPPING_KEYBOARD && + event->request != XCB_MAPPING_MODIFIER) + return 0; - second = first + 1; - orientation = O_HORIZONTAL; - } else if (event->event_x <= 2) { - /* …left border */ - if (con->col == 0) - return 1; + DLOG("Received mapping_notify for keyboard or modifier mapping, re-grabbing keys\n"); + xcb_refresh_keyboard_mapping(keysyms, event); - first = con->col - 1; - second = con->col; - } else if (event->event_x > 2) { - /* …right border */ - first = con->col + (con->colspan - 1); - LOG("column %d\n", first); + xcb_get_numlock_mask(conn); - if (!cell_exists(first, con->row) || - (first == (con->workspace->cols-1))) - return 1; + ungrab_all_keys(conn); + translate_keysyms(); + grab_all_keys(conn, false); - second = first + 1; - } - - return resize_graphical_handler(conn, con->workspace, first, second, orientation, event); + return 0; } /* @@ -442,7 +276,7 @@ int handle_map_request(void *prophs, xcb_connection_t *conn, xcb_map_request_eve cookie = xcb_get_window_attributes_unchecked(conn, event->window); - LOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence); + DLOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence); add_ignore_event(event->sequence); manage_window(prophs, conn, event->window, cookie, false); @@ -456,13 +290,11 @@ int handle_map_request(void *prophs, xcb_connection_t *conn, xcb_map_request_eve * */ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure_request_event_t *event) { - LOG("configure-request, serial %d\n", event->sequence); - LOG("event->window = %08x\n", event->window); - LOG("application wants to be at %dx%d with %dx%d\n", event->x, event->y, event->width, event->height); + DLOG("window 0x%08x wants to be at %dx%d with %dx%d\n", + event->window, event->x, event->y, event->width, event->height); Client *client = table_get(&by_child, event->window); if (client == NULL) { - LOG("This client is not mapped, so we don't care and just tell the client that he will get its size\n"); uint32_t mask = 0; uint32_t values[7]; int c = 0; @@ -488,7 +320,7 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure } if (client->fullscreen) { - LOG("Client is in fullscreen mode\n"); + DLOG("Client is in fullscreen mode\n"); Rect child_rect = client->workspace->rect; child_rect.x = child_rect.y = 0; @@ -500,17 +332,56 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure /* Floating clients can be reconfigured */ if (client_is_floating(client)) { i3Font *font = load_font(conn, config.font); + int mode = (client->container != NULL ? client->container->mode : MODE_DEFAULT); + /* TODO: refactor this code. we need a function to translate + * coordinates of child_rect/rect. */ + + if (event->value_mask & XCB_CONFIG_WINDOW_X) { + if (mode == MODE_STACK || mode == MODE_TABBED) { + client->rect.x = event->x - 2; + } else { + if (client->titlebar_position == TITLEBAR_OFF && client->borderless) + client->rect.x = event->x; + else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) + client->rect.x = event->x - 1; + else client->rect.x = event->x - 2; + } + } + if (event->value_mask & XCB_CONFIG_WINDOW_Y) { + if (mode == MODE_STACK || mode == MODE_TABBED) { + client->rect.y = event->y - 2; + } else { + if (client->titlebar_position == TITLEBAR_OFF && client->borderless) + client->rect.y = event->y; + else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) + client->rect.y = event->y - 1; + else client->rect.y = event->y - font->height - 2 - 2; + } + } + if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) { + if (mode == MODE_STACK || mode == MODE_TABBED) { + client->rect.width = event->width + 2 + 2; + } else { + if (client->titlebar_position == TITLEBAR_OFF && client->borderless) + client->rect.width = event->width; + else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) + client->rect.width = event->width + (1 + 1); + else client->rect.width = event->width + (2 + 2); + } + } + if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) { + if (mode == MODE_STACK || mode == MODE_TABBED) { + client->rect.height = event->height + 2; + } else { + if (client->titlebar_position == TITLEBAR_OFF && client->borderless) + client->rect.height = event->height; + else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) + client->rect.height = event->height + (1 + 1); + else client->rect.height = event->height + (font->height + 2 + 2) + 2; + } + } - if (event->value_mask & XCB_CONFIG_WINDOW_X) - client->rect.x = event->x; - if (event->value_mask & XCB_CONFIG_WINDOW_Y) - client->rect.y = event->y; - if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) - client->rect.width = event->width + 2 + 2; - if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) - client->rect.height = event->height + (font->height + 2 + 2) + 2; - - LOG("Accepted new position/size for floating client: (%d, %d) size %d x %d\n", + DLOG("Accepted new position/size for floating client: (%d, %d) size %d x %d\n", client->rect.x, client->rect.y, client->rect.width, client->rect.height); /* Push the new position/size to X11 */ @@ -521,8 +392,24 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure return 1; } + /* Dock clients can be reconfigured in their height */ + if (client->dock) { + DLOG("Reconfiguring height of this dock client\n"); + + if (!(event->value_mask & XCB_CONFIG_WINDOW_HEIGHT)) { + DLOG("Ignoring configure request, no height given\n"); + return 1; + } + + client->desired_height = event->height; + render_workspace(conn, c_ws->output, c_ws); + xcb_flush(conn); + + return 1; + } + if (client->fullscreen) { - LOG("Client is in fullscreen mode\n"); + DLOG("Client is in fullscreen mode\n"); Rect child_rect = client->container->workspace->rect; child_rect.x = child_rect.y = 0; @@ -537,29 +424,30 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure } /* - * Configuration notifies are only handled because we need to set up ignore for the following - * enter notify events + * Configuration notifies are only handled because we need to set up ignore for + * the following enter notify events. * */ int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_notify_event_t *event) { - xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root; - - LOG("handle_configure_event for window %08x\n", event->window); - LOG("event->type = %d, \n", event->response_type); - LOG("event->x = %d, ->y = %d, ->width = %d, ->height = %d\n", event->x, event->y, event->width, event->height); - /* We ignore this sequence twice because events for child and frame should be ignored */ add_ignore_event(event->sequence); add_ignore_event(event->sequence); - if (event->event == root) { - LOG("reconfigure of the root window, need to xinerama\n"); - /* FIXME: Somehow, this is occuring too often. Therefore, we check for 0/0, - but is there a better way? */ - if (event->x == 0 && event->y == 0) - xinerama_requery_screens(conn); - return 1; - } + return 1; +} + +/* + * Gets triggered upon a RandR screen change event, that is when the user + * changes the screen configuration in any way (mode, position, …) + * + */ +int handle_screen_change(void *prophs, xcb_connection_t *conn, + xcb_generic_event_t *e) { + DLOG("RandR screen change\n"); + + randr_query_outputs(conn); + + ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}"); return 1; } @@ -578,15 +466,14 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti /* First, we need to check if the client is awaiting an unmap-request which was generated by us reparenting the window. In that case, we just ignore it. */ if (client != NULL && client->awaiting_useless_unmap) { - LOG("Dropping this unmap request, it was generated by reparenting\n"); client->awaiting_useless_unmap = false; return 1; } - LOG("event->window = %08x, event->event = %08x\n", event->window, event->event); - LOG("UnmapNotify for 0x%08x (received from 0x%08x)\n", event->window, event->event); + DLOG("event->window = %08x, event->event = %08x\n", event->window, event->event); + DLOG("UnmapNotify for 0x%08x (received from 0x%08x)\n", event->window, event->event); if (client == NULL) { - LOG("not a managed window. Ignoring.\n"); + DLOG("not a managed window. Ignoring.\n"); /* This was most likely the destroyed frame of a client which is * currently being unmapped, so we add this sequence (again!) to @@ -617,18 +504,21 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti if ((con->currently_focused != NULL) && ((con == CUR_CELL) || client->fullscreen)) set_focus(conn, con->currently_focused, true); } else if (client_is_floating(client)) { - LOG("Removing from floating clients\n"); + DLOG("Removing from floating clients\n"); TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients); SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients); } if (client->dock) { - LOG("Removing from dock clients\n"); - SLIST_REMOVE(&(client->workspace->screen->dock_clients), client, Client, dock_clients); + DLOG("Removing from dock clients\n"); + SLIST_REMOVE(&(client->workspace->output->dock_clients), client, Client, dock_clients); } - LOG("child of 0x%08x.\n", client->frame); + DLOG("child of 0x%08x.\n", client->frame); xcb_reparent_window(conn, client->child, root, 0, 0); + + client_unmap(conn, client); + xcb_destroy_window(conn, client->frame); xcb_flush(conn); table_remove(&by_parent, client->frame); @@ -641,46 +531,74 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */ bool workspace_empty = SLIST_EMPTY(&(client->workspace->focus_stack)); - bool workspace_active = false; + bool workspace_focused = (c_ws == client->workspace); Client *to_focus = (!workspace_empty ? SLIST_FIRST(&(client->workspace->focus_stack)) : NULL); - /* If this workspace is currently active, we don’t delete it */ - i3Screen *screen; - TAILQ_FOREACH(screen, virtual_screens, screens) - if (screen->current_workspace == client->workspace->num) { - workspace_active = true; - workspace_empty = false; - break; - } + /* If this workspace is currently visible, we don’t delete it */ + if (workspace_is_visible(client->workspace)) + workspace_empty = false; if (workspace_empty) { - LOG("setting ws to NULL for workspace %d (%p)\n", client->workspace->num, - client->workspace); - client->workspace->screen = NULL; + client->workspace->output = NULL; + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}"); } - FREE(client->window_class); + /* Remove the urgency flag if set */ + client->urgent = false; + workspace_update_urgent_flag(client->workspace); + + FREE(client->window_class_instance); + FREE(client->window_class_class); FREE(client->name); free(client); render_layout(conn); - /* Ensure the focus is set to the next client in the focus stack */ - if (workspace_active && to_focus != NULL) - set_focus(conn, to_focus, true); + /* Ensure the focus is set to the next client in the focus stack or to + * the screen itself (if we do not focus the screen, it can happen that + * the focus is "nowhere" and thus keypress events will not be received + * by i3, thus the user cannot use any hotkeys). */ + if (workspace_focused) { + if (to_focus != NULL) + set_focus(conn, to_focus, true); + else { + DLOG("Restoring focus to root screen\n"); + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME); + xcb_flush(conn); + } + } return 1; } +/* + * A destroy notify event is sent when the window is not unmapped, but + * immediately destroyed (for example when starting a window and immediately + * killing the program which started it). + * + * We just pass on the event to the unmap notify handler (by copying the + * important fields in the event data structure). + * + */ +int handle_destroy_notify_event(void *data, xcb_connection_t *conn, xcb_destroy_notify_event_t *event) { + DLOG("destroy notify for 0x%08x, 0x%08x\n", event->event, event->window); + + xcb_unmap_notify_event_t unmap; + unmap.sequence = event->sequence; + unmap.event = event->event; + unmap.window = event->window; + + return handle_unmap_notify_event(NULL, conn, &unmap); +} + /* * Called when a window changes its title * */ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) { - LOG("window's name changed.\n"); if (prop == NULL || xcb_get_property_value_length(prop) == 0) { - LOG("_NET_WM_NAME not specified, not changing\n"); + DLOG("_NET_WM_NAME not specified, not changing\n"); return 1; } Client *client = table_get(&by_child, window); @@ -693,7 +611,7 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state, asprintf(&new_name, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)); /* Convert it to UCS-2 here for not having to convert it later every time we want to pass it to X */ char *ucs2_name = convert_utf8_to_ucs2(new_name, &new_len); - LOG("Name should change to \"%s\"\n", new_name); + LOG("_NET_WM_NAME changed to \"%s\"\n", new_name); free(new_name); /* Check if they are the same and don’t update if so. @@ -703,7 +621,6 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state, if ((new_len == client->name_len) && (client->name != NULL) && (memcmp(client->name, ucs2_name, new_len * 2) == 0)) { - LOG("Name did not change, not updating\n"); free(ucs2_name); return 1; } @@ -719,9 +636,10 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state, if (client->dock) return 1; - if (client->container != NULL && client->container->mode == MODE_STACK) + int mode = container_mode(client->container, true); + if (mode == MODE_STACK || mode == MODE_TABBED) render_container(conn, client->container); - else decorate_window(conn, client, client->frame, client->titlegc, 0); + else decorate_window(conn, client, client->frame, client->titlegc, 0, 0); xcb_flush(conn); return 1; @@ -740,40 +658,37 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state, */ int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) { - LOG("window's name changed (legacy).\n"); if (prop == NULL || xcb_get_property_value_length(prop) == 0) { - LOG("prop == NULL\n"); + DLOG("prop == NULL\n"); return 1; } Client *client = table_get(&by_child, window); if (client == NULL) return 1; - if (client->uses_net_wm_name) { - LOG("This client is capable of _NET_WM_NAME, ignoring legacy name\n"); + /* Client capable of _NET_WM_NAME, ignore legacy name changes */ + if (client->uses_net_wm_name) return 1; - } /* Save the old pointer to make the update atomic */ char *new_name; if (asprintf(&new_name, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)) == -1) { perror("Could not get old name"); - LOG("Could not get old name\n"); + DLOG("Could not get old name\n"); return 1; } /* Convert it to UCS-2 here for not having to convert it later every time we want to pass it to X */ - LOG("Name should change to \"%s\"\n", new_name); + LOG("WM_NAME changed to \"%s\"\n", new_name); /* Check if they are the same and don’t update if so. */ if (client->name != NULL && strlen(new_name) == strlen(client->name) && strcmp(client->name, new_name) == 0) { - LOG("Name did not change, not updating\n"); free(new_name); return 1; } - LOG("Using legacy window title. Note that in order to get Unicode window titles in i3," + LOG("Using legacy window title. Note that in order to get Unicode window titles in i3, " "the application has to set _NET_WM_NAME which is in UTF-8 encoding.\n"); char *old_name = client->name; @@ -787,9 +702,11 @@ int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t if (client->dock) return 1; - if (client->container != NULL && client->container->mode == MODE_STACK) + if (client->container != NULL && + (client->container->mode == MODE_STACK || + client->container->mode == MODE_TABBED)) render_container(conn, client->container); - else decorate_window(conn, client, client->frame, client->titlegc, 0); + else decorate_window(conn, client, client->frame, client->titlegc, 0, 0); xcb_flush(conn); return 1; @@ -801,38 +718,30 @@ int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t */ int handle_windowclass_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) { - LOG("window class changed\n"); if (prop == NULL || xcb_get_property_value_length(prop) == 0) { - LOG("prop == NULL\n"); + DLOG("prop == NULL\n"); return 1; } Client *client = table_get(&by_child, window); if (client == NULL) return 1; - char *new_class; - if (asprintf(&new_class, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)) == -1) { - perror("Could not get window class"); - LOG("Could not get window class\n"); - return 1; - } - LOG("changed to %s\n", new_class); - char *old_class = client->window_class; - client->window_class = new_class; - FREE(old_class); + /* We cannot use asprintf here since this property contains two + * null-terminated strings (for compatibility reasons). Instead, we + * use strdup() on both strings */ + char *new_class = xcb_get_property_value(prop); - if (!client->initialized) { - LOG("Client is not yet initialized, not putting it to floating\n"); - return 1; - } + FREE(client->window_class_instance); + FREE(client->window_class_class); - if (strcmp(new_class, "tools") == 0 || strcmp(new_class, "Dialog") == 0) { - LOG("tool/dialog window, should we put it floating?\n"); - if (client->floating == FLOATING_AUTO_OFF) - toggle_floating_mode(conn, client, true); - } + client->window_class_instance = strdup(new_class); + if ((strlen(new_class) + 1) < xcb_get_property_value_length(prop)) + client->window_class_class = strdup(new_class + strlen(new_class) + 1); + else client->window_class_class = NULL; + LOG("WM_CLASS changed to %s (instance), %s (class)\n", + client->window_class_instance, client->window_class_class); - return 1; + return 0; } /* @@ -844,7 +753,7 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t * skip all events but the last one */ if (event->count != 0) return 1; - LOG("window = %08x\n", event->window); + DLOG("window = %08x\n", event->window); Client *client = table_get(&by_parent, event->window); if (client == NULL) { @@ -858,25 +767,24 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t * } /* …or one of the bars? */ - i3Screen *screen; - TAILQ_FOREACH(screen, virtual_screens, screens) - if (screen->bar == event->window) + Output *output; + TAILQ_FOREACH(output, &outputs, outputs) + if (output->bar == event->window) render_layout(conn); return 1; } - LOG("got client %s\n", client->name); - if (client->dock) { - LOG("this is a dock\n"); + if (client->dock) return 1; - } - if (client->container == NULL || client->container->mode != MODE_STACK) - decorate_window(conn, client, client->frame, client->titlegc, 0); + if (container_mode(client->container, true) == MODE_DEFAULT) + decorate_window(conn, client, client->frame, client->titlegc, 0, 0); else { uint32_t background_color; + if (client->urgent) + background_color = config.client.urgent.background; /* Distinguish if the window is currently focused… */ - if (CUR_CELL->currently_focused == client) + else if (CUR_CELL != NULL && CUR_CELL->currently_focused == client) background_color = config.client.focused.background; /* …or if it is the focused window in a not focused container */ else background_color = config.client.focused_inactive.background; @@ -894,8 +802,13 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t * /* Draw a black background */ xcb_change_gc_single(conn, client->titlegc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000")); - xcb_rectangle_t crect = {2, 0, client->rect.width - (2 + 2), client->rect.height - 2}; - xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect); + if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) { + xcb_rectangle_t crect = {1, 0, client->rect.width - (1 + 1), client->rect.height - 1}; + xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect); + } else { + xcb_rectangle_t crect = {2, 0, client->rect.width - (2 + 2), client->rect.height - 2}; + xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect); + } } xcb_flush(conn); return 1; @@ -906,14 +819,10 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t * * */ int handle_client_message(void *data, xcb_connection_t *conn, xcb_client_message_event_t *event) { - LOG("client_message\n"); - if (event->type == atoms[_NET_WM_STATE]) { if (event->format != 32 || event->data.data32[1] != atoms[_NET_WM_STATE_FULLSCREEN]) return 0; - LOG("fullscreen\n"); - Client *client = table_get(&by_child, event->window); if (client == NULL) return 0; @@ -927,7 +836,7 @@ int handle_client_message(void *data, xcb_connection_t *conn, xcb_client_message event->data.data32[0] == _NET_WM_STATE_TOGGLE))) client_toggle_fullscreen(conn, client); } else { - LOG("unhandled clientmessage\n"); + ELOG("unhandled clientmessage\n"); return 0; } @@ -938,7 +847,7 @@ int handle_window_type(void *data, xcb_connection_t *conn, uint8_t state, xcb_wi xcb_atom_t atom, xcb_get_property_reply_t *property) { /* TODO: Implement this one. To do this, implement a little test program which sleep(1)s before changing this property. */ - LOG("_NET_WM_WINDOW_TYPE changed, this is not yet implemented.\n"); + ELOG("_NET_WM_WINDOW_TYPE changed, this is not yet implemented.\n"); return 0; } @@ -951,14 +860,14 @@ int handle_window_type(void *data, xcb_connection_t *conn, uint8_t state, xcb_wi */ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, xcb_atom_t name, xcb_get_property_reply_t *reply) { - LOG("handle_normal_hints\n"); Client *client = table_get(&by_child, window); if (client == NULL) { - LOG("No such client\n"); + DLOG("Received WM_SIZE_HINTS for unknown client\n"); return 1; } xcb_size_hints_t size_hints; - LOG("client is %08x / child %08x\n", client->frame, client->child); + + CLIENT_LOG(client); /* If the hints were already in this event, use them, if not, request them */ if (reply != NULL) @@ -967,41 +876,74 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w xcb_get_wm_normal_hints_reply(conn, xcb_get_wm_normal_hints_unchecked(conn, client->child), &size_hints, NULL); if ((size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)) { - LOG("min size set\n"); - LOG("gots min_width = %d, min_height = %d\n", size_hints.min_width, size_hints.min_height); + // TODO: Minimum size is not yet implemented + DLOG("Minimum size: %d (width) x %d (height)\n", size_hints.min_width, size_hints.min_height); } - /* If no aspect ratio was set or if it was invalid, we ignore the hints */ - if (!(size_hints.flags & XCB_SIZE_HINT_P_ASPECT) || - (size_hints.min_aspect_num <= 0) || - (size_hints.min_aspect_den <= 0)) { - LOG("No aspect ratio set, ignoring\n"); - return 1; - } + bool changed = false; + if ((size_hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)) { + if (size_hints.width_inc > 0 && size_hints.width_inc < 0xFFFF) + if (client->width_increment != size_hints.width_inc) { + client->width_increment = size_hints.width_inc; + changed = true; + } + if (size_hints.height_inc > 0 && size_hints.height_inc < 0xFFFF) + if (client->height_increment != size_hints.height_inc) { + client->height_increment = size_hints.height_inc; + changed = true; + } - LOG("window is %08x / %s\n", client->child, client->name); + if (changed) + DLOG("resize increments changed\n"); + } int base_width = 0, base_height = 0; /* base_width/height are the desired size of the window. We check if either the program-specified size or the program-specified min-size is available */ - if (size_hints.flags & XCB_SIZE_HINT_P_SIZE) { + if (size_hints.flags & XCB_SIZE_HINT_BASE_SIZE) { base_width = size_hints.base_width; base_height = size_hints.base_height; } else if (size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE) { + /* TODO: is this right? icccm says not */ base_width = size_hints.min_width; base_height = size_hints.min_height; } + if (base_width != client->base_width || + base_height != client->base_height) { + client->base_width = base_width; + client->base_height = base_height; + DLOG("client's base_height changed to %d\n", base_height); + DLOG("client's base_width changed to %d\n", base_width); + changed = true; + } + + if (changed) { + if (client->fullscreen) + DLOG("Not resizing client, it is in fullscreen mode\n"); + else { + resize_client(conn, client); + xcb_flush(conn); + } + } + + /* If no aspect ratio was set or if it was invalid, we ignore the hints */ + if (!(size_hints.flags & XCB_SIZE_HINT_P_ASPECT) || + (size_hints.min_aspect_num <= 0) || + (size_hints.min_aspect_den <= 0)) { + return 1; + } + double width = client->rect.width - base_width; double height = client->rect.height - base_height; /* Convert numerator/denominator to a double */ double min_aspect = (double)size_hints.min_aspect_num / size_hints.min_aspect_den; double max_aspect = (double)size_hints.max_aspect_num / size_hints.min_aspect_den; - LOG("min_aspect = %f, max_aspect = %f\n", min_aspect, max_aspect); - LOG("width = %f, height = %f\n", width, height); + DLOG("Aspect ratio set: minimum %f, maximum %f\n", min_aspect, max_aspect); + DLOG("width = %f, height = %f\n", width, height); /* Sanity checks, this is user-input, in a way */ if (max_aspect <= 0 || min_aspect <= 0 || height == 0 || (width / height) <= 0) @@ -1026,6 +968,52 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w return 1; } +/* + * Handles the WM_HINTS property for extracting the urgency state of the window. + * + */ +int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, + xcb_atom_t name, xcb_get_property_reply_t *reply) { + Client *client = table_get(&by_child, window); + if (client == NULL) { + DLOG("Received WM_HINTS for unknown client\n"); + return 1; + } + xcb_wm_hints_t hints; + + if (reply != NULL) { + if (!xcb_get_wm_hints_from_reply(&hints, reply)) + return 1; + } else { + if (!xcb_get_wm_hints_reply(conn, xcb_get_wm_hints_unchecked(conn, client->child), &hints, NULL)) + return 1; + } + + Client *last_focused = SLIST_FIRST(&(c_ws->focus_stack)); + if (!client->urgent && client == last_focused) { + DLOG("Ignoring urgency flag for current client\n"); + return 1; + } + + /* Update the flag on the client directly */ + client->urgent = (xcb_wm_hints_get_urgency(&hints) != 0); + CLIENT_LOG(client); + LOG("Urgency flag changed to %d\n", client->urgent); + + workspace_update_urgent_flag(client->workspace); + redecorate_window(conn, client); + + /* If the workspace this client is on is not visible, we need to redraw + * the workspace bar */ + if (!workspace_is_visible(client->workspace)) { + Output *output = client->workspace->output; + render_workspace(conn, output, output->current_workspace); + xcb_flush(conn); + } + + return 1; +} + /* * Handles the transient for hints set by a window, signalizing that this window is a popup window * for some other window. @@ -1035,32 +1023,56 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w */ int handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, xcb_atom_t name, xcb_get_property_reply_t *reply) { - LOG("Transient hint!\n"); Client *client = table_get(&by_child, window); if (client == NULL) { - LOG("No such client\n"); + DLOG("No such client\n"); return 1; } xcb_window_t transient_for; if (reply != NULL) { - if (!xcb_get_wm_transient_for_from_reply(&transient_for, reply)) { - LOG("Not transient for any window\n"); + if (!xcb_get_wm_transient_for_from_reply(&transient_for, reply)) return 1; - } } else { if (!xcb_get_wm_transient_for_reply(conn, xcb_get_wm_transient_for_unchecked(conn, window), - &transient_for, NULL)) { - LOG("Not transient for any window\n"); + &transient_for, NULL)) return 1; - } } if (client->floating == FLOATING_AUTO_OFF) { - LOG("This is a popup window, putting into floating\n"); + DLOG("This is a popup window, putting into floating\n"); toggle_floating_mode(conn, client, true); } return 1; } + +/* + * Handles changes of the WM_CLIENT_LEADER atom which specifies if this is a + * toolwindow (or similar) and to which window it belongs (logical parent). + * + */ +int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, + xcb_atom_t name, xcb_get_property_reply_t *prop) { + if (prop == NULL) { + prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, + false, window, WM_CLIENT_LEADER, WINDOW, 0, 32), NULL); + if (prop == NULL) + return 1; + } + + Client *client = table_get(&by_child, window); + if (client == NULL) + return 1; + + xcb_window_t *leader = xcb_get_property_value(prop); + if (leader == NULL) + return 1; + + DLOG("Client leader changed to %08x\n", *leader); + + client->leader = *leader; + + return 1; +}