]> git.sur5r.net Git - i3/i3/commitdiff
remove unused code from manage.c
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 25 May 2011 18:47:47 +0000 (20:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 25 May 2011 18:47:47 +0000 (20:47 +0200)
src/manage.c

index 9ccdc19a9519f839177f06a4ec6bd6a3653beabd..80bfbc5283f132cc0b9aea880230cbbe828477b5 100644 (file)
@@ -2,7 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * manage.c: Contains all functions for initially managing new windows
  *           (or existing ones on restart).
@@ -342,222 +342,3 @@ out:
     free(attr);
     return;
 }
-
-#if 0
-void reparent_window(xcb_connection_t *conn, xcb_window_t child,
-                     xcb_visualid_t visual, xcb_window_t root, uint8_t depth,
-                     int16_t x, int16_t y, uint16_t width, uint16_t height,
-                     uint32_t border_width) {
-
-       /* Minimum useful size for managed windows is 75x50 (primarily affects floating) */
-        width = max(width, 75);
-        height = max(height, 50);
-
-        if (config.default_border != NULL)
-                client_init_border(conn, new, config.default_border[1]);
-
-        /* We need to grab the mouse buttons for click to focus */
-        xcb_grab_button(conn, false, child, XCB_EVENT_MASK_BUTTON_PRESS,
-                        XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, root, XCB_NONE,
-                        1 /* left mouse button */,
-                        XCB_BUTTON_MASK_ANY /* don’t filter for any modifiers */);
-
-        xcb_grab_button(conn, false, child, XCB_EVENT_MASK_BUTTON_PRESS,
-                        XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, root, XCB_NONE,
-                        3 /* right mouse button */,
-                        XCB_BUTTON_MASK_ANY /* don’t filter for any modifiers */);
-
-        if (dock) {
-            DLOG("Window is a dock.\n");
-            Output *t_out = get_output_containing(x, y);
-            if (t_out != c_ws->output) {
-                    DLOG("Dock client requested to be on output %s by geometry (%d, %d)\n",
-                                    t_out->name, x, y);
-                    new->workspace = t_out->current_workspace;
-            }
-            new->dock = true;
-            new->borderless = true;
-            new->titlebar_position = TITLEBAR_OFF;
-            new->force_reconfigure = true;
-            new->container = NULL;
-            SLIST_INSERT_HEAD(&(t_out->dock_clients), new, dock_clients);
-            /* If it’s a dock we can’t make it float, so we break */
-            new->floating = FLOATING_AUTO_OFF;
-        }
-
-        /* All clients which have a leader should be floating */
-        if (!new->dock && !client_is_floating(new) && new->leader != 0) {
-                DLOG("Client has WM_CLIENT_LEADER hint set, setting floating\n");
-                new->floating = FLOATING_AUTO_ON;
-        }
-
-        if (new->workspace->auto_float) {
-                new->floating = FLOATING_AUTO_ON;
-                DLOG("workspace is in autofloat mode, setting floating\n");
-        }
-
-        if (new->dock) {
-                /* Get _NET_WM_STRUT_PARTIAL to determine the client’s requested height */
-                uint32_t *strut;
-                preply = xcb_get_property_reply(conn, strut_cookie, NULL);
-                if (preply != NULL && preply->value_len > 0 && (strut = xcb_get_property_value(preply))) {
-                        /* We only use a subset of the provided values, namely the reserved space at the top/bottom
-                           of the screen. This is because the only possibility for bars is at to be at the top/bottom
-                           with maximum horizontal size.
-                           TODO: bars at the top */
-                        new->desired_height = strut[3];
-                        if (new->desired_height == 0) {
-                                DLOG("Client wanted to be 0 pixels high, using the window's height (%d)\n", original_height);
-                                new->desired_height = original_height;
-                        }
-                        DLOG("the client wants to be %d pixels high\n", new->desired_height);
-                } else {
-                        DLOG("The client didn't specify space to reserve at the screen edge, using its height (%d)\n", original_height);
-                        new->desired_height = original_height;
-                }
-        } else {
-                /* If it’s not a dock, we can check on which workspace we should put it. */
-
-                /* Firstly, we need to get the window’s class / title. We asked for the properties at the
-                 * top of this function, get them now and pass them to our callback function for window class / title
-                 * changes. It is important that the client was already inserted into the by_child table,
-                 * because the callbacks won’t work otherwise. */
-                preply = xcb_get_property_reply(conn, utf8_title_cookie, NULL);
-                handle_windowname_change(NULL, conn, 0, new->child, atoms[_NET_WM_NAME], preply);
-
-                preply = xcb_get_property_reply(conn, title_cookie, NULL);
-                handle_windowname_change_legacy(NULL, conn, 0, new->child, WM_NAME, preply);
-
-                preply = xcb_get_property_reply(conn, class_cookie, NULL);
-                handle_windowclass_change(NULL, conn, 0, new->child, WM_CLASS, preply);
-
-                /* if WM_CLIENT_LEADER is set, we put the new window on the
-                 * same window as its leader. This might be overwritten by
-                 * assignments afterwards. */
-                if (new->leader != XCB_NONE) {
-                        DLOG("client->leader is set (to 0x%08x)\n", new->leader);
-                        Client *parent = table_get(&by_child, new->leader);
-                        if (parent != NULL && parent->container != NULL) {
-                                Workspace *t_ws = parent->workspace;
-                                new->container = t_ws->table[parent->container->col][parent->container->row];
-                                new->workspace = t_ws;
-                                old_focused = new->container->currently_focused;
-                                map_frame = workspace_is_visible(t_ws);
-                                new->urgent = true;
-                                /* This is a little tricky: we cannot use
-                                 * workspace_update_urgent_flag() because the
-                                 * new window was not yet inserted into the
-                                 * focus stack on t_ws. */
-                                t_ws->urgent = true;
-                        } else {
-                                DLOG("parent is not usable\n");
-                        }
-                }
-
-                struct Assignment *assign;
-                TAILQ_FOREACH(assign, &assignments, assignments) {
-                        if (get_matching_client(conn, assign->windowclass_title, new) == NULL)
-                                continue;
-
-                        if (assign->floating == ASSIGN_FLOATING_ONLY ||
-                            assign->floating == ASSIGN_FLOATING) {
-                                new->floating = FLOATING_AUTO_ON;
-                                LOG("Assignment matches, putting client into floating mode\n");
-                                if (assign->floating == ASSIGN_FLOATING_ONLY)
-                                        break;
-                        }
-
-                        LOG("Assignment \"%s\" matches, so putting it on workspace %d\n",
-                            assign->windowclass_title, assign->workspace);
-
-                        if (c_ws->output->current_workspace->num == (assign->workspace-1)) {
-                                DLOG("We are already there, no need to do anything\n");
-                                break;
-                        }
-
-                        DLOG("Changing container/workspace and unmapping the client\n");
-                        Workspace *t_ws = workspace_get(assign->workspace-1, NULL);
-                        workspace_initialize(t_ws, c_ws->output, false);
-
-                        new->container = t_ws->table[t_ws->current_col][t_ws->current_row];
-                        new->workspace = t_ws;
-                        old_focused = new->container->currently_focused;
-
-                        map_frame = workspace_is_visible(t_ws);
-                        break;
-                }
-        }
-
-
-        if (client_is_floating(new)) {
-                SLIST_INSERT_HEAD(&(new->workspace->focus_stack), new, focus_clients);
-
-                /* Add the client to the list of floating clients for its workspace */
-                TAILQ_INSERT_TAIL(&(new->workspace->floating_clients), new, floating_clients);
-
-                new->container = NULL;
-
-                new->rect.width = new->floating_rect.width + 2 + 2;
-                new->rect.height = new->floating_rect.height + (font->height + 2 + 2) + 2;
-
-                /* Some clients (like GIMP’s color picker window) get mapped
-                 * to (0, 0), so we push them to a reasonable position
-                 * (centered over their leader) */
-                if (new->leader != 0 && x == 0 && y == 0) {
-                        DLOG("Floating client wants to (0x0), moving it over its leader instead\n");
-                        Client *leader = table_get(&by_child, new->leader);
-                        if (leader == NULL) {
-                                DLOG("leader is NULL, centering it over current workspace\n");
-
-                                x = c_ws->rect.x + (c_ws->rect.width / 2) - (new->rect.width / 2);
-                                y = c_ws->rect.y + (c_ws->rect.height / 2) - (new->rect.height / 2);
-                        } else {
-                                x = leader->rect.x + (leader->rect.width / 2) - (new->rect.width / 2);
-                                y = leader->rect.y + (leader->rect.height / 2) - (new->rect.height / 2);
-                        }
-                }
-                new->floating_rect.x = new->rect.x = x;
-                new->floating_rect.y = new->rect.y = y;
-                DLOG("copying floating_rect from tiling (%d, %d) size (%d, %d)\n",
-                                new->floating_rect.x, new->floating_rect.y,
-                                new->floating_rect.width, new->floating_rect.height);
-                DLOG("outer rect (%d, %d) size (%d, %d)\n",
-                                new->rect.x, new->rect.y, new->rect.width, new->rect.height);
-
-                /* Make sure it is on top of the other windows */
-                xcb_raise_window(conn, new->frame);
-                reposition_client(conn, new);
-                resize_client(conn, new);
-                /* redecorate_window flushes */
-                redecorate_window(conn, new);
-        }
-
-        new->initialized = true;
-
-
-        render_layout(conn);
-
-map:
-        /* Map the window first to avoid flickering */
-        xcb_map_window(conn, child);
-        if (map_frame)
-                client_map(conn, new);
-
-        if ((CUR_CELL->workspace->fullscreen_client == NULL || new->fullscreen) && !new->dock) {
-                /* Focus the new window if we’re not in fullscreen mode and if it is not a dock window */
-                if ((new->workspace->fullscreen_client == NULL) || new->fullscreen) {
-                        if (!client_is_floating(new)) {
-                                new->container->currently_focused = new;
-                                if (map_frame)
-                                        render_container(conn, new->container);
-                        }
-                        if (new->container == CUR_CELL || client_is_floating(new)) {
-                                xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, new->child, XCB_CURRENT_TIME);
-                                ewmh_update_active_window(new->child);
-                        }
-                }
-        }
-
-        xcb_flush(conn);
-}
-#endif