X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhandlers.c;h=d1b3a73cd0cb42a3e1e6d5cc3c631a553bd6ff4a;hb=ede954128afca118025db6a04d4d9d259473c70f;hp=e02a1ee5457b166bf029533a4b99303b7b3dafec;hpb=14eea7fce571ed6b1592af382aa4440b87c62b56;p=i3%2Fi3 diff --git a/src/handlers.c b/src/handlers.c index e02a1ee5..d1b3a73c 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -184,8 +184,6 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) { focused_id = XCB_NONE; con_focus(con_descend_focused(con)); tree_render(); - - return; } /* @@ -249,8 +247,6 @@ static void handle_mapping_notify(xcb_mapping_notify_event_t *event) { ungrab_all_keys(conn); translate_keysyms(); grab_all_keys(conn); - - return; } /* @@ -266,7 +262,6 @@ static void handle_map_request(xcb_map_request_event_t *event) { add_ignore_event(event->sequence, -1); manage_window(event->window, cookie, false); - return; } /* @@ -315,16 +310,12 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { DLOG("Configure request!\n"); - 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); + Con *workspace = con_get_workspace(con); + if (workspace && (strcmp(workspace->name, "__i3_scratch") == 0)) { + DLOG("This is a scratchpad container, ignoring ConfigureRequest\n"); + goto out; } + Con *fullscreen = con_get_fullscreen_covering_ws(workspace); if (fullscreen != con && con_is_floating(con) && con_is_leaf(con)) { /* find the height for the decorations */ @@ -337,12 +328,6 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { bsr.height -= deco_height; } 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) { @@ -388,7 +373,7 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { Con *current_output = con_get_output(con); Output *target = get_output_containing(x, y); if (target != NULL && current_output != target->con) { - DLOG("Dock client is requested to be moved to output %s, moving it there.\n", target->name); + DLOG("Dock client is requested to be moved to output %s, moving it there.\n", output_primary_name(target)); Match *match; Con *nc = con_for_window(target->con, con->window, &match); DLOG("Dock client will be moved to container %p.\n", nc); @@ -400,11 +385,45 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { DLOG("Dock client will not be moved, we only support moving it to another output.\n"); } } + goto out; } - fake_absolute_configure_notify(con); + if (event->value_mask & XCB_CONFIG_WINDOW_STACK_MODE) { + DLOG("window 0x%08x wants to be stacked %d\n", event->window, event->stack_mode); + + /* Emacs and IntelliJ Idea “request focus” by stacking their window + * above all others. */ + if (event->stack_mode != XCB_STACK_MODE_ABOVE) { + DLOG("stack_mode != XCB_STACK_MODE_ABOVE, ignoring ConfigureRequest\n"); + goto out; + } + + if (fullscreen || !con_is_leaf(con)) { + DLOG("fullscreen or not a leaf, ignoring ConfigureRequest\n"); + goto out; + } + + if (workspace == NULL) { + DLOG("Window is not being managed, ignoring ConfigureRequest\n"); + goto out; + } + + if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(workspace))) { + DLOG("Focusing con = %p\n", con); + workspace_show(workspace); + con_activate(con); + tree_render(); + } else if (config.focus_on_window_activation == FOWA_URGENT || (config.focus_on_window_activation == FOWA_SMART && !workspace_is_visible(workspace))) { + DLOG("Marking con = %p urgent\n", con); + con_set_urgency(con, true); + tree_render(); + } else { + DLOG("Ignoring request for con = %p.\n", con); + } + } - return; +out: + fake_absolute_configure_notify(con); } /* @@ -433,8 +452,6 @@ static void handle_screen_change(xcb_generic_event_t *e) { scratchpad_fix_resolution(); ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}"); - - return; } /* @@ -477,7 +494,7 @@ static void handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { xcb_delete_property(conn, event->window, A__NET_WM_DESKTOP); xcb_delete_property(conn, event->window, A__NET_WM_STATE); - tree_close_internal(con, DONT_KILL_WINDOW, false, false); + tree_close_internal(con, DONT_KILL_WINDOW, false); tree_render(); ignore_end: @@ -614,14 +631,10 @@ static void handle_expose_event(xcb_expose_event_t *event) { } /* Since we render to our surface 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 surface to the - * window. */ - draw_util_copy_surface(conn, &(parent->frame_buffer), &(parent->frame), - event->x, event->y, event->x, event->y, - event->width, event->height); + * only tell us that the X server lost (parts of) the window contents. */ + draw_util_copy_surface(&(parent->frame_buffer), &(parent->frame), + 0, 0, 0, 0, parent->rect.width, parent->rect.height); xcb_flush(conn); - return; } #define _NET_WM_MOVERESIZE_SIZE_TOPLEFT 0 @@ -736,7 +749,9 @@ static void handle_client_message(xcb_client_message_event_t *event) { scratchpad_show(con); } else { workspace_show(ws); - con_focus(con); + /* Re-set focus, even if unchanged from i3’s perspective. */ + focused_id = XCB_NONE; + con_activate(con); } } else { /* Request is from an application. */ @@ -748,7 +763,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(ws))) { DLOG("Focusing con = %p\n", con); workspace_show(ws); - con_focus(con); + con_activate(con); } else if (config.focus_on_window_activation == FOWA_URGENT || (config.focus_on_window_activation == FOWA_SMART && !workspace_is_visible(ws))) { DLOG("Marking con = %p urgent\n", con); con_set_urgency(con, true); @@ -760,21 +775,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { } else if (event->type == A_I3_SYNC) { xcb_window_t window = event->data.data32[0]; uint32_t rnd = event->data.data32[1]; - DLOG("[i3 sync protocol] Sending random value %d back to X11 window 0x%08x\n", rnd, window); - - void *reply = scalloc(32, 1); - xcb_client_message_event_t *ev = reply; - - ev->response_type = XCB_CLIENT_MESSAGE; - ev->window = window; - ev->type = A_I3_SYNC; - ev->format = 32; - ev->data.data32[0] = window; - ev->data.data32[1] = rnd; - - xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char *)ev); - xcb_flush(conn); - free(reply); + sync_respond(window, rnd); } else if (event->type == A__NET_REQUEST_FRAME_EXTENTS) { /* * A client can request an estimate for the frame size which the window @@ -794,7 +795,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { Rect r = { config.default_border_width, /* left */ config.default_border_width, /* right */ - config.font.height + 5, /* top */ + render_deco_height(), /* top */ config.default_border_width /* bottom */ }; xcb_change_property( @@ -809,7 +810,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { /* This request is used by pagers and bars to change the current * desktop likely as a result of some user action. We interpret this as * a request to focus the given workspace. See - * http://standards.freedesktop.org/wm-spec/latest/ar01s03.html#idm140251368135008 + * https://standards.freedesktop.org/wm-spec/latest/ar01s03.html#idm140251368135008 * */ DLOG("Request to change current desktop to index %d\n", event->data.data32[0]); Con *ws = ewmh_get_workspace_by_index(event->data.data32[0]); @@ -857,7 +858,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { /* * Pagers wanting to close a window MUST send a _NET_CLOSE_WINDOW * client message request to the root window. - * http://standards.freedesktop.org/wm-spec/wm-spec-latest.html#idm140200472668896 + * https://standards.freedesktop.org/wm-spec/wm-spec-latest.html#idm140200472668896 */ Con *con = con_by_window_id(event->window); if (con) { @@ -866,7 +867,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { if (event->data.data32[0]) last_timestamp = event->data.data32[0]; - tree_close_internal(con, KILL_WINDOW, false, false); + tree_close_internal(con, KILL_WINDOW, false); tree_render(); } else { DLOG("Couldn't find con for _NET_CLOSE_WINDOW request. (window = %d)\n", event->window); @@ -1123,8 +1124,7 @@ static bool handle_transient_for(void *data, xcb_connection_t *conn, uint8_t sta } if (prop == NULL) { - prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, - false, window, XCB_ATOM_WM_TRANSIENT_FOR, XCB_ATOM_WINDOW, 0, 32), + prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, false, window, XCB_ATOM_WM_TRANSIENT_FOR, XCB_ATOM_WINDOW, 0, 32), NULL); if (prop == NULL) return false; @@ -1147,8 +1147,7 @@ static bool handle_clientleader_change(void *data, xcb_connection_t *conn, uint8 return false; if (prop == NULL) { - prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, - false, window, A_WM_CLIENT_LEADER, XCB_ATOM_WINDOW, 0, 32), + prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, false, window, A_WM_CLIENT_LEADER, XCB_ATOM_WINDOW, 0, 32), NULL); if (prop == NULL) return false; @@ -1167,6 +1166,14 @@ static bool handle_clientleader_change(void *data, xcb_connection_t *conn, uint8 */ static void handle_focus_in(xcb_focus_in_event_t *event) { DLOG("focus change in, for window 0x%08x\n", event->event); + + if (event->event == root) { + DLOG("Received focus in for root window, refocusing the focused window.\n"); + con_focus(focused); + focused_id = XCB_NONE; + x_push_changes(croot); + } + Con *con; if ((con = con_by_window_id(event->event)) == NULL || con->window == NULL) return; @@ -1183,7 +1190,9 @@ static void handle_focus_in(xcb_focus_in_event_t *event) { return; } - if (focused_id == event->event) { + /* Floating windows should be refocused to ensure that they are on top of + * other windows. */ + if (focused_id == event->event && !con_inside_floating(con)) { DLOG("focus matches the currently focused window, not doing anything\n"); return; } @@ -1194,7 +1203,7 @@ static void handle_focus_in(xcb_focus_in_event_t *event) { return; } - DLOG("focus is different, updating decorations\n"); + DLOG("focus is different / refocusing floating window: updating decorations\n"); /* Get the currently focused workspace to check if the focus change also * involves changing workspaces. If so, we need to call workspace_show() to @@ -1203,11 +1212,10 @@ static void handle_focus_in(xcb_focus_in_event_t *event) { if (ws != con_get_workspace(focused)) workspace_show(ws); - con_focus(con); + con_activate(con); /* We update focused_id because we don’t need to set focus again */ focused_id = event->event; - x_push_changes(croot); - return; + tree_render(); } /* @@ -1222,6 +1230,9 @@ static void handle_configure_notify(xcb_configure_notify_event_t *event) { } DLOG("ConfigureNotify for root window 0x%08x\n", event->event); + if (force_xinerama) { + return; + } randr_query_outputs(); } @@ -1236,8 +1247,7 @@ static bool handle_class_change(void *data, xcb_connection_t *conn, uint8_t stat return false; if (prop == NULL) { - prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, - false, window, XCB_ATOM_WM_CLASS, XCB_ATOM_STRING, 0, 32), + prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, false, window, XCB_ATOM_WM_CLASS, XCB_ATOM_STRING, 0, 32), NULL); if (prop == NULL) @@ -1260,8 +1270,7 @@ static bool handle_motif_hints_change(void *data, xcb_connection_t *conn, uint8_ return false; if (prop == NULL) { - prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, - false, window, A__MOTIF_WM_HINTS, XCB_GET_PROPERTY_TYPE_ANY, 0, 5 * sizeof(uint64_t)), + prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn, false, window, A__MOTIF_WM_HINTS, XCB_GET_PROPERTY_TYPE_ANY, 0, 5 * sizeof(uint64_t)), NULL); if (prop == NULL) @@ -1411,7 +1420,7 @@ static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) struct property_handler_t *handler = NULL; xcb_get_property_reply_t *propr = NULL; - for (size_t c = 0; c < sizeof(property_handlers) / sizeof(struct property_handler_t); c++) { + for (size_t c = 0; c < NUM_HANDLERS; c++) { if (property_handlers[c].atom != atom) continue; @@ -1511,7 +1520,10 @@ void handle_event(int type, xcb_generic_event_t *event) { break; case XCB_EXPOSE: - handle_expose_event((xcb_expose_event_t *)event); + if (((xcb_expose_event_t *)event)->count == 0) { + handle_expose_event((xcb_expose_event_t *)event); + } + break; case XCB_MOTION_NOTIFY: