X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhandlers.c;h=1bfcce562b9af13084889cb07be8cd5a138aeb3d;hb=625401d1628757a67a2ab4eeaa68be965683889c;hp=507fffcf96a7ac52d8eb668eea528c81ca7afb86;hpb=cc2fda92422e29a61c929ffde8d3199305b89946;p=i3%2Fi3 diff --git a/src/handlers.c b/src/handlers.c index 507fffcf..1bfcce56 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -1,8 +1,10 @@ +#undef I3__FILE__ +#define I3__FILE__ "handlers.c" /* * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) * * handlers.c: Small handlers for various events (keypresses, focus changes, * …). @@ -11,6 +13,7 @@ #include "all.h" #include +#include #include #include #define SN_API_NOT_YET_FROZEN 1 @@ -76,53 +79,6 @@ bool event_is_ignored(const int sequence, const int response_type) { return false; } - -/* - * There was a key press. We compare this key code with our bindings table and pass - * the bound action to parse_command(). - * - */ -static void handle_key_press(xcb_key_press_event_t *event) { - - last_timestamp = event->time; - - 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); - 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; - DLOG("(removed upper 8 bits, state = %d)\n", state_filtered); - - if (xkb_current_group == XkbGroup2Index) - state_filtered |= BIND_MODE_SWITCH; - - DLOG("(checked mode_switch, state %d)\n", state_filtered); - - /* Find the binding */ - 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; - } - } - - char *json_result = parse_cmd(bind->command); - FREE(json_result); - return; -} - /* * Called with coordinates of an enter_notify event or motion_notify event * to check if the user crossed virtual screen boundaries and adjust the @@ -233,6 +189,7 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) { if (ws != con_get_workspace(focused)) workspace_show(ws); + focused_id = XCB_NONE; con_focus(con_descend_focused(con)); tree_render(); @@ -256,6 +213,7 @@ static void handle_motion_notify(xcb_motion_notify_event_t *event) { Con *con; if ((con = con_by_frame_id(event->event)) == NULL) { + DLOG("MotionNotify for an unknown container, checking if it crosses screen boundaries.\n"); check_crossing_screen_boundary(event->root_x, event->root_y); return; } @@ -367,7 +325,19 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { } DLOG("Configure request!\n"); - if (con_is_floating(con) && con_is_leaf(con)) { + + Con *workspace = con_get_workspace(con), + *fullscreen = NULL; + + /* There might not be a corresponding workspace for dock cons, therefore we + * have to be careful here. */ + if (workspace) { + fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT); + if (!fullscreen) + fullscreen = con_get_fullscreen_con(workspace, CF_GLOBAL); + } + + if (fullscreen != con && con_is_floating(con) && con_is_leaf(con)) { /* find the height for the decorations */ int deco_height = config.font.height + 5; /* we actually need to apply the size/position changes to the *parent* @@ -379,6 +349,11 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { } Con *floatingcon = con->parent; + if (strcmp(con_get_workspace(floatingcon)->name, "__i3_scratch") == 0) { + DLOG("This is a scratchpad container, ignoring ConfigureRequest\n"); + return; + } + Rect newrect = floatingcon->rect; if (event->value_mask & XCB_CONFIG_WINDOW_X) { @@ -449,6 +424,8 @@ static void handle_screen_change(xcb_generic_event_t *e) { randr_query_outputs(); + scratchpad_fix_resolution(); + ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}"); return; @@ -667,12 +644,29 @@ static void handle_client_message(xcb_client_message_event_t *event) { } tree_render(); - x_push_changes(croot); + } else if (event->type == A__NET_ACTIVE_WINDOW) { + DLOG("_NET_ACTIVE_WINDOW: Window 0x%08x should be activated\n", event->window); + Con *con = con_by_window_id(event->window); + if (con == NULL) { + DLOG("Could not get window for client message\n"); + return; + } + + Con *ws = con_get_workspace(con); + if (!workspace_is_visible(ws)) { + DLOG("Workspace not visible, ignoring _NET_ACTIVE_WINDOW\n"); + return; + } + + if (ws != con_get_workspace(focused)) + workspace_show(ws); + + con_focus(con); + tree_render(); } else if (event->type == A_I3_SYNC) { - DLOG("i3 sync, yay\n"); xcb_window_t window = event->data.data32[0]; uint32_t rnd = event->data.data32[1]; - DLOG("Sending random value %d back to X11 window 0x%08x\n", rnd, window); + DLOG("[i3 sync protocol] Sending random value %d back to X11 window 0x%08x\n", rnd, window); void *reply = scalloc(32); xcb_client_message_event_t *ev = reply; @@ -841,12 +835,31 @@ static bool handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_ if (!con->urgent && focused == con) { DLOG("Ignoring urgency flag for current client\n"); + con->window->urgent.tv_sec = 0; + con->window->urgent.tv_usec = 0; goto end; } /* Update the flag on the client directly */ - con->urgent = (xcb_icccm_wm_hints_get_urgency(&hints) != 0); + bool hint_urgent = (xcb_icccm_wm_hints_get_urgency(&hints) != 0); + + if (con->urgency_timer == NULL) { + con->urgent = hint_urgent; + } else + DLOG("Discarding urgency WM_HINT because timer is running\n"); + //CLIENT_LOG(con); + if (con->window) { + if (con->urgent) { + gettimeofday(&con->window->urgent, NULL); + } else { + con->window->urgent.tv_sec = 0; + con->window->urgent.tv_usec = 0; + } + } + + con_update_parents_urgency(con); + LOG("Urgency flag changed to %d\n", con->urgent); Con *ws; @@ -992,7 +1005,7 @@ static struct property_handler_t property_handlers[] = { * received from X11 * */ -void property_handlers_init() { +void property_handlers_init(void) { sn_monitor_context_new(sndisplay, conn_screen, startup_monitor_event, NULL, NULL); @@ -1046,6 +1059,7 @@ void handle_event(int type, xcb_generic_event_t *event) { switch (type) { case XCB_KEY_PRESS: + case XCB_KEY_RELEASE: handle_key_press((xcb_key_press_event_t*)event); break;