X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhandlers.c;h=624c34305d5bd78caa9bcdbe89ab6291ad0e5095;hb=ffa388f1946ad2555b62cea5bc2460c546e36fd0;hp=9c9f16f0836bb92b821603a9648c8eb50f35df03;hpb=8d648b4e371cd7959a332d80aa288a3fa390cc7e;p=i3%2Fi3 diff --git a/src/handlers.c b/src/handlers.c index 9c9f16f0..624c3430 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -39,6 +39,7 @@ #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 @@ -81,17 +82,6 @@ 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) { - 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(). @@ -108,52 +98,29 @@ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_ state_filtered &= 0xFF; DLOG("(removed upper 8 bits, state = %d)\n", state_filtered); - if (xkb_supported) { - /* 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) - state_filtered |= BIND_MODE_SWITCH; - } + if (xkb_current_group == XkbGroup2Index) + state_filtered |= BIND_MODE_SWITCH; DLOG("(checked mode_switch, state %d)\n", state_filtered); /* Find the binding */ - Binding *bind; - TAILQ_FOREACH(bind, bindings, bindings) { - /* First compare the modifiers */ - if (bind->mods != state_filtered) - continue; - - /* If a symbol was specified by the user, we need to look in - * the array of translated keycodes for the event’s keycode */ - if (bind->symbol != NULL) { - if (memmem(bind->translated_to, - bind->number_keycodes * sizeof(xcb_keycode_t), - &(event->detail), sizeof(xcb_keycode_t)) != NULL) - break; - } else { - /* This case is easier: The user specified a keycode */ - if (bind->keycode == event->detail) - break; + 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; } } - /* 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; - } - parse_command(conn, bind->command); - if (state_filtered & BIND_MODE_SWITCH) { - DLOG("Mode_switch -> allow_events(SyncKeyboard)\n"); - xcb_allow_events(conn, SyncKeyboard, event->time); - xcb_flush(conn); - } return 1; } @@ -294,7 +261,8 @@ int handle_mapping_notify(void *ignored, xcb_connection_t *conn, xcb_mapping_not xcb_get_numlock_mask(conn); ungrab_all_keys(conn); - grab_all_keys(conn); + translate_keysyms(); + grab_all_keys(conn, false); return 0; } @@ -365,11 +333,31 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure 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) - 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_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; @@ -459,6 +447,8 @@ int handle_screen_change(void *prophs, xcb_connection_t *conn, randr_query_outputs(conn); + ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}"); + return 1; } @@ -541,20 +531,17 @@ 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 */ - Output *screen; - TAILQ_FOREACH(screen, &outputs, outputs) - if (screen->current_workspace == client->workspace) { - 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) + if (workspace_empty) { client->workspace->output = NULL; + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}"); + } /* Remove the urgency flag if set */ client->urgent = false; @@ -571,7 +558,7 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti * 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_active) { + if (workspace_focused) { if (to_focus != NULL) set_focus(conn, to_focus, true); else { @@ -584,6 +571,26 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti 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 * @@ -1060,7 +1067,7 @@ int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state return 1; xcb_window_t *leader = xcb_get_property_value(prop); - if (leader == NULL || *leader == 0) + if (leader == NULL) return 1; DLOG("Client leader changed to %08x\n", *leader);