X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=src%2Fhandlers.c;h=d1b3a73cd0cb42a3e1e6d5cc3c631a553bd6ff4a;hp=3972659b8763c5045feed8d52656e17ece9edacb;hb=ede954128afca118025db6a04d4d9d259473c70f;hpb=f9084033765793b6ed04a75e8b3e5e425df6c783 diff --git a/src/handlers.c b/src/handlers.c index 3972659b..d1b3a73c 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -310,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 */ @@ -332,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) { @@ -395,15 +385,14 @@ 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"); } } - fake_absolute_configure_notify(con); - return; + goto out; } 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. */ + * above all others. */ if (event->stack_mode != XCB_STACK_MODE_ABOVE) { DLOG("stack_mode != XCB_STACK_MODE_ABOVE, ignoring ConfigureRequest\n"); goto out; @@ -414,23 +403,17 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { goto out; } - Con *ws = con_get_workspace(con); - if (ws == NULL) { + if (workspace == NULL) { DLOG("Window is not being managed, ignoring ConfigureRequest\n"); goto out; } - if (strcmp(ws->name, "__i3_scratch") == 0) { - DLOG("This is a scratchpad container, ignoring ConfigureRequest\n"); - goto out; - } - - if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(ws))) { + 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(ws); + 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(ws))) { + } 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(); @@ -1141,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; @@ -1165,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; @@ -1266,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) @@ -1290,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) @@ -1441,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;