floating.c: remove obsolete code, fix indenting
This commit is contained in:
Michael Stapelberg
parent
371ec037b8
commit
529bdf833f
223
src/floating.c
223
src/floating.c
|
|
@ -115,7 +115,6 @@ void floating_disable(Con *con, bool automatic) {
|
||||||
con_focus(con);
|
con_focus(con);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Toggles floating mode for the given container.
|
* Toggles floating mode for the given container.
|
||||||
*
|
*
|
||||||
|
|
@ -124,8 +123,6 @@ void floating_disable(Con *con, bool automatic) {
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void toggle_floating_mode(Con *con, bool automatic) {
|
void toggle_floating_mode(Con *con, bool automatic) {
|
||||||
//i3Font *font = load_font(conn, config.font);
|
|
||||||
|
|
||||||
/* see if the client is already floating */
|
/* see if the client is already floating */
|
||||||
if (con_is_floating(con)) {
|
if (con_is_floating(con)) {
|
||||||
LOG("already floating, re-setting to tiling\n");
|
LOG("already floating, re-setting to tiling\n");
|
||||||
|
|
@ -135,228 +132,8 @@ void toggle_floating_mode(Con *con, bool automatic) {
|
||||||
}
|
}
|
||||||
|
|
||||||
floating_enable(con, automatic);
|
floating_enable(con, automatic);
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
if (client->dock) {
|
|
||||||
DLOG("Not putting dock client into floating mode\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (con == NULL) {
|
|
||||||
DLOG("This client is already in floating (container == NULL), re-inserting\n");
|
|
||||||
Client *next_tiling;
|
|
||||||
Workspace *ws = client->workspace;
|
|
||||||
SLIST_FOREACH(next_tiling, &(ws->focus_stack), focus_clients)
|
|
||||||
if (!client_is_floating(next_tiling))
|
|
||||||
break;
|
|
||||||
/* If there are no tiling clients on this workspace, there can only be one
|
|
||||||
* container: the first one */
|
|
||||||
if (next_tiling == TAILQ_END(&(ws->focus_stack)))
|
|
||||||
con = ws->table[0][0];
|
|
||||||
else con = next_tiling->container;
|
|
||||||
|
|
||||||
/* Remove the client from the list of floating clients */
|
|
||||||
TAILQ_REMOVE(&(ws->floating_clients), client, floating_clients);
|
|
||||||
|
|
||||||
DLOG("destination container = %p\n", con);
|
|
||||||
Client *old_focused = con->currently_focused;
|
|
||||||
/* Preserve position/size */
|
|
||||||
memcpy(&(client->floating_rect), &(client->rect), sizeof(Rect));
|
|
||||||
|
|
||||||
client->floating = FLOATING_USER_OFF;
|
|
||||||
client->container = con;
|
|
||||||
|
|
||||||
if (old_focused != NULL && !old_focused->dock)
|
|
||||||
CIRCLEQ_INSERT_AFTER(&(con->clients), old_focused, client, clients);
|
|
||||||
else CIRCLEQ_INSERT_TAIL(&(con->clients), client, clients);
|
|
||||||
|
|
||||||
DLOG("Re-inserted the window.\n");
|
|
||||||
con->currently_focused = client;
|
|
||||||
|
|
||||||
client_set_below_floating(conn, client);
|
|
||||||
|
|
||||||
render_container(conn, con);
|
|
||||||
xcb_flush(conn);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DLOG("Entering floating for client %08x\n", client->child);
|
|
||||||
|
|
||||||
/* Remove the client of its container */
|
|
||||||
client_remove_from_container(conn, client, con, false);
|
|
||||||
client->container = NULL;
|
|
||||||
|
|
||||||
/* Add the client to the list of floating clients for its workspace */
|
|
||||||
TAILQ_INSERT_TAIL(&(client->workspace->floating_clients), client, floating_clients);
|
|
||||||
|
|
||||||
if (con->currently_focused == client) {
|
|
||||||
DLOG("Need to re-adjust currently_focused\n");
|
|
||||||
/* Get the next client in the focus stack for this particular container */
|
|
||||||
con->currently_focused = get_last_focused_client(conn, con, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (automatic)
|
|
||||||
client->floating = FLOATING_AUTO_ON;
|
|
||||||
else client->floating = FLOATING_USER_ON;
|
|
||||||
|
|
||||||
/* Initialize the floating position from the position in tiling mode, if this
|
|
||||||
* client never was floating (x == -1) */
|
|
||||||
if (client->floating_rect.x == -1) {
|
|
||||||
/* Copy over the position */
|
|
||||||
client->floating_rect.x = client->rect.x;
|
|
||||||
client->floating_rect.y = client->rect.y;
|
|
||||||
|
|
||||||
/* Copy size the other direction */
|
|
||||||
client->child_rect.width = client->floating_rect.width;
|
|
||||||
client->child_rect.height = client->floating_rect.height;
|
|
||||||
|
|
||||||
client->rect.width = client->child_rect.width + 2 + 2;
|
|
||||||
client->rect.height = client->child_rect.height + (font->height + 2 + 2) + 2;
|
|
||||||
|
|
||||||
DLOG("copying size from tiling (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
|
|
||||||
client->floating_rect.width, client->floating_rect.height);
|
|
||||||
} else {
|
|
||||||
/* If the client was already in floating before we restore the old position / size */
|
|
||||||
DLOG("using: (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
|
|
||||||
client->floating_rect.width, client->floating_rect.height);
|
|
||||||
memcpy(&(client->rect), &(client->floating_rect), sizeof(Rect));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Raise the client */
|
|
||||||
xcb_raise_window(conn, client->frame);
|
|
||||||
reposition_client(conn, client);
|
|
||||||
resize_client(conn, client);
|
|
||||||
/* redecorate_window flushes */
|
|
||||||
redecorate_window(conn, client);
|
|
||||||
|
|
||||||
/* Re-render the tiling layout of this container */
|
|
||||||
render_container(conn, con);
|
|
||||||
xcb_flush(conn);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
/*
|
|
||||||
* Removes the floating client from its workspace and attaches it to the new workspace.
|
|
||||||
* This is centralized here because it may happen if you move it via keyboard and
|
|
||||||
* if you move it using your mouse.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void floating_assign_to_workspace(Client *client, Workspace *new_workspace) {
|
|
||||||
/* Remove from focus stack and list of floating clients */
|
|
||||||
SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients);
|
|
||||||
TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients);
|
|
||||||
|
|
||||||
if (client->workspace->fullscreen_client == client)
|
|
||||||
client->workspace->fullscreen_client = NULL;
|
|
||||||
|
|
||||||
/* Insert into destination focus stack and list of floating clients */
|
|
||||||
client->workspace = new_workspace;
|
|
||||||
SLIST_INSERT_HEAD(&(client->workspace->focus_stack), client, focus_clients);
|
|
||||||
TAILQ_INSERT_TAIL(&(client->workspace->floating_clients), client, floating_clients);
|
|
||||||
if (client->fullscreen)
|
|
||||||
client->workspace->fullscreen_client = client;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is an ugly data structure which we need because there is no standard
|
|
||||||
* way of having nested functions (only available as a gcc extension at the
|
|
||||||
* moment, clang doesn’t support it) or blocks (only available as a clang
|
|
||||||
* extension and only on Mac OS X systems at the moment).
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
struct resize_callback_params {
|
|
||||||
border_t border;
|
|
||||||
xcb_button_press_event_t *event;
|
|
||||||
};
|
|
||||||
|
|
||||||
DRAGGING_CB(resize_callback) {
|
|
||||||
struct resize_callback_params *params = extra;
|
|
||||||
xcb_button_press_event_t *event = params->event;
|
|
||||||
switch (params->border) {
|
|
||||||
case BORDER_RIGHT: {
|
|
||||||
int new_width = old_rect->width + (new_x - event->root_x);
|
|
||||||
if ((new_width < 0) ||
|
|
||||||
(new_width < client_min_width(client) && client->rect.width >= new_width))
|
|
||||||
return;
|
|
||||||
client->rect.width = new_width;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case BORDER_BOTTOM: {
|
|
||||||
int new_height = old_rect->height + (new_y - event->root_y);
|
|
||||||
if ((new_height < 0) ||
|
|
||||||
(new_height < client_min_height(client) && client->rect.height >= new_height))
|
|
||||||
return;
|
|
||||||
client->rect.height = old_rect->height + (new_y - event->root_y);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case BORDER_TOP: {
|
|
||||||
int new_height = old_rect->height + (event->root_y - new_y);
|
|
||||||
if ((new_height < 0) ||
|
|
||||||
(new_height < client_min_height(client) && client->rect.height >= new_height))
|
|
||||||
return;
|
|
||||||
|
|
||||||
client->rect.y = old_rect->y + (new_y - event->root_y);
|
|
||||||
client->rect.height = new_height;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case BORDER_LEFT: {
|
|
||||||
int new_width = old_rect->width + (event->root_x - new_x);
|
|
||||||
if ((new_width < 0) ||
|
|
||||||
(new_width < client_min_width(client) && client->rect.width >= new_width))
|
|
||||||
return;
|
|
||||||
client->rect.x = old_rect->x + (new_x - event->root_x);
|
|
||||||
client->rect.width = new_width;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Push the new position/size to X11 */
|
|
||||||
reposition_client(conn, client);
|
|
||||||
resize_client(conn, client);
|
|
||||||
xcb_flush(conn);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Called whenever the user clicks on a border (not the titlebar!) of a floating window.
|
|
||||||
* Determines on which border the user clicked and launches the drag_pointer function
|
|
||||||
* with the resize_callback.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
int floating_border_click(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) {
|
|
||||||
DLOG("floating border click\n");
|
|
||||||
|
|
||||||
border_t border;
|
|
||||||
|
|
||||||
if (event->event_y < 2)
|
|
||||||
border = BORDER_TOP;
|
|
||||||
else if (event->event_y >= (client->rect.height - 2))
|
|
||||||
border = BORDER_BOTTOM;
|
|
||||||
else if (event->event_x <= 2)
|
|
||||||
border = BORDER_LEFT;
|
|
||||||
else if (event->event_x >= (client->rect.width - 2))
|
|
||||||
border = BORDER_RIGHT;
|
|
||||||
else {
|
|
||||||
DLOG("Not on any border, not doing anything.\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
DLOG("border = %d\n", border);
|
|
||||||
|
|
||||||
struct resize_callback_params params = { border, event };
|
|
||||||
|
|
||||||
drag_pointer(conn, client, event, XCB_NONE, border, resize_callback, ¶ms);
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
DRAGGING_CB(drag_window_callback) {
|
DRAGGING_CB(drag_window_callback) {
|
||||||
struct xcb_button_press_event_t *event = extra;
|
struct xcb_button_press_event_t *event = extra;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue