X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhandlers.c;h=4f2d870eb00a9e3ee84503a1f9e6bd0178307e45;hb=fcdfab4d280cf469f339ce7168082658b9b76c8c;hp=e2fa205ca02535098d70c30be82ac970175f30d2;hpb=9798e5cae613bfb62bbcef2a89409f3f0db517f3;p=i3%2Fi3 diff --git a/src/handlers.c b/src/handlers.c index e2fa205c..4f2d870e 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 int 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 1; - } - } - - char *json_result = parse_cmd(bind->command); - FREE(json_result); - 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 @@ -163,7 +119,7 @@ static void check_crossing_screen_boundary(uint32_t x, uint32_t y) { * When the user moves the mouse pointer onto a window, this callback gets called. * */ -static int handle_enter_notify(xcb_enter_notify_event_t *event) { +static void handle_enter_notify(xcb_enter_notify_event_t *event) { Con *con; last_timestamp = event->time; @@ -173,13 +129,13 @@ static int handle_enter_notify(xcb_enter_notify_event_t *event) { DLOG("coordinates %d, %d\n", event->event_x, event->event_y); if (event->mode != XCB_NOTIFY_MODE_NORMAL) { DLOG("This was not a normal notify, ignoring\n"); - return 1; + return; } /* Some events are not interesting, because they were not generated * actively by the user, but by reconfiguration of windows */ if (event_is_ignored(event->sequence, XCB_ENTER_NOTIFY)) { DLOG("Event ignored\n"); - return 1; + return; } bool enter_child = false; @@ -193,12 +149,12 @@ static int handle_enter_notify(xcb_enter_notify_event_t *event) { if (con == NULL) { 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; + return; } if (con->parent->type == CT_DOCKAREA) { DLOG("Ignoring, this is a dock client\n"); - return 1; + return; } /* see if the user entered the window on a certain window decoration */ @@ -224,7 +180,7 @@ static int handle_enter_notify(xcb_enter_notify_event_t *event) { #endif if (config.disable_focus_follows_mouse) - return 1; + return; /* Get the currently focused workspace to check if the focus change also * involves changing workspaces. If so, we need to call workspace_show() to @@ -233,10 +189,11 @@ static int 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(); - return 1; + return; } /* @@ -245,26 +202,27 @@ static int handle_enter_notify(xcb_enter_notify_event_t *event) { * and crossing virtual screen boundaries), this callback gets called. * */ -static int handle_motion_notify(xcb_motion_notify_event_t *event) { +static void handle_motion_notify(xcb_motion_notify_event_t *event) { last_timestamp = event->time; /* 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; 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 1; + return; } if (config.disable_focus_follows_mouse) - return 1; + return; if (con->layout != L_DEFAULT) - return 1; + return; /* see over which rect the user is */ Con *current; @@ -274,14 +232,14 @@ static int handle_motion_notify(xcb_motion_notify_event_t *event) { /* We found the rect, let’s see if this window is focused */ if (TAILQ_FIRST(&(con->focus_head)) == current) - return 1; + return; con_focus(current); x_push_changes(croot); - return 1; + return; } - return 1; + return; } /* @@ -289,10 +247,10 @@ static int handle_motion_notify(xcb_motion_notify_event_t *event) { * we need to update our key bindings then (re-translate symbols). * */ -static int handle_mapping_notify(xcb_mapping_notify_event_t *event) { +static void handle_mapping_notify(xcb_mapping_notify_event_t *event) { if (event->request != XCB_MAPPING_KEYBOARD && event->request != XCB_MAPPING_MODIFIER) - return 0; + return; DLOG("Received mapping_notify for keyboard or modifier mapping, re-grabbing keys\n"); xcb_refresh_keyboard_mapping(keysyms, event); @@ -303,14 +261,14 @@ static int handle_mapping_notify(xcb_mapping_notify_event_t *event) { translate_keysyms(); grab_all_keys(conn, false); - return 0; + return; } /* * A new window appeared on the screen (=was mapped), so let’s manage it. * */ -static int handle_map_request(xcb_map_request_event_t *event) { +static void handle_map_request(xcb_map_request_event_t *event) { xcb_get_window_attributes_cookie_t cookie; cookie = xcb_get_window_attributes_unchecked(conn, event->window); @@ -320,16 +278,18 @@ static int handle_map_request(xcb_map_request_event_t *event) { manage_window(event->window, cookie, false); x_push_changes(croot); - return 1; + return; } /* - * Configure requests are received when the application wants to resize windows on their own. + * Configure requests are received when the application wants to resize windows + * on their own. * - * We generate a synthethic configure notify event to signalize the client its "new" position. + * We generate a synthethic configure notify event to signalize the client its + * "new" position. * */ -static int handle_configure_request(xcb_configure_request_event_t *event) { +static void handle_configure_request(xcb_configure_request_event_t *event) { Con *con; DLOG("window 0x%08x wants to be at %dx%d with %dx%d\n", @@ -361,13 +321,25 @@ static int handle_configure_request(xcb_configure_request_event_t *event) { xcb_configure_window(conn, event->window, mask, values); xcb_flush(conn); - return 1; + return; } 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; + int deco_height = con->deco_rect.height; /* we actually need to apply the size/position changes to the *parent* * container */ Rect bsr = con_border_style_rect(con); @@ -377,6 +349,11 @@ static int 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) { @@ -402,7 +379,7 @@ static int handle_configure_request(xcb_configure_request_event_t *event) { DLOG("Container is a floating leaf node, will do that.\n"); floating_reposition(floatingcon, newrect); - return 1; + return; } /* Dock windows can be reconfigured in their height */ @@ -418,7 +395,7 @@ static int handle_configure_request(xcb_configure_request_event_t *event) { fake_absolute_configure_notify(con); - return 1; + return; } #if 0 @@ -442,14 +419,16 @@ int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_n * changes the screen configuration in any way (mode, position, …) * */ -static int handle_screen_change(xcb_generic_event_t *e) { +static void handle_screen_change(xcb_generic_event_t *e) { DLOG("RandR screen change\n"); randr_query_outputs(); + scratchpad_fix_resolution(); + ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}"); - return 1; + return; } /* @@ -606,26 +585,26 @@ static int handle_windowclass_change(void *data, xcb_connection_t *conn, uint8_t * Expose event means we should redraw our windows (= title bar) * */ -static int handle_expose_event(xcb_expose_event_t *event) { +static void handle_expose_event(xcb_expose_event_t *event) { Con *parent; - /* event->count is the number of minimum remaining expose events for this - * window, so we skip all events but the last one */ - if (event->count != 0) - return 1; - DLOG("window = %08x\n", event->window); if ((parent = con_by_frame_id(event->window)) == NULL) { LOG("expose event for unknown window, ignoring\n"); - return 1; + return; } - /* re-render the parent (recursively, if it’s a split con) */ - x_deco_recurse(parent); + /* Since we render to our pixmap on every change anyways, expose events + * only tell us that the X server lost (parts of) the window contents. We + * can handle that by copying the appropriate part from our pixmap to the + * window. */ + xcb_copy_area(conn, parent->pixmap, parent->frame, parent->pm_gc, + event->x, event->y, event->x, event->y, + event->width, event->height); xcb_flush(conn); - return 1; + return; } /* @@ -665,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; @@ -839,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; @@ -887,14 +902,6 @@ static bool handle_transient_for(void *data, xcb_connection_t *conn, uint8_t sta window_update_transient_for(con->window, prop); - // TODO: put window in floating mode if con->window->transient_for != XCB_NONE: -#if 0 - if (client->floating == FLOATING_AUTO_OFF) { - DLOG("This is a popup window, putting into floating\n"); - toggle_floating_mode(conn, client, true); - } -#endif - return true; } @@ -927,33 +934,33 @@ static bool handle_clientleader_change(void *data, xcb_connection_t *conn, uint8 * decorations accordingly. * */ -static int handle_focus_in(xcb_focus_in_event_t *event) { +static void handle_focus_in(xcb_focus_in_event_t *event) { DLOG("focus change in, for window 0x%08x\n", event->event); Con *con; if ((con = con_by_window_id(event->event)) == NULL || con->window == NULL) - return 1; + return; DLOG("That is con %p / %s\n", con, con->name); if (event->mode == XCB_NOTIFY_MODE_GRAB || event->mode == XCB_NOTIFY_MODE_UNGRAB) { DLOG("FocusIn event for grab/ungrab, ignoring\n"); - return 1; + return; } if (event->detail == XCB_NOTIFY_DETAIL_POINTER) { DLOG("notify detail is pointer, ignoring this event\n"); - return 1; + return; } if (focused_id == event->event) { DLOG("focus matches the currently focused window, not doing anything\n"); - return 1; + return; } /* Skip dock clients, they cannot get the i3 focus. */ if (con->parent->type == CT_DOCKAREA) { DLOG("This is a dock client, not focusing.\n"); - return 1; + return; } DLOG("focus is different, updating decorations\n"); @@ -969,7 +976,7 @@ static int handle_focus_in(xcb_focus_in_event_t *event) { /* We update focused_id because we don’t need to set focus again */ focused_id = event->event; x_push_changes(croot); - return 1; + return; } /* Returns false if the event could not be processed (e.g. the window could not @@ -998,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); @@ -1052,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;