/*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
*
* src/floating.c: contains all functions for handling floating clients
*
*/
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
-
-#include "i3.h"
-#include "config.h"
-#include "data.h"
-#include "util.h"
-#include "xcb.h"
-#include "debug.h"
-#include "layout.h"
-#include "client.h"
-#include "floating.h"
-#include "workspace.h"
-#include "log.h"
+
+
+#include "all.h"
+
+extern xcb_connection_t *conn;
+
+void floating_enable(Con *con, bool automatic) {
+ if (con_is_floating(con)) {
+ LOG("Container is already in floating mode, not doing anything.\n");
+ return;
+ }
+
+ /* 1: detach the container from its parent */
+ /* TODO: refactor this with tree_close() */
+ TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
+ TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
+
+ con_fix_percent(con->parent, WINDOW_REMOVE);
+
+ /* 2: create a new container to render the decoration on, add
+ * it as a floating window to the workspace */
+ Con *nc = con_new(NULL);
+ nc->parent = con_get_workspace(con);
+ nc->rect = con->rect;
+ nc->orientation = NO_ORIENTATION;
+ nc->type = CT_FLOATING_CON;
+ TAILQ_INSERT_TAIL(&(nc->parent->floating_head), nc, floating_windows);
+ TAILQ_INSERT_TAIL(&(nc->parent->focus_head), nc, focused);
+
+ /* 3: attach the child to the new parent container */
+ con->old_parent = con->parent;
+ con->parent = nc;
+ con->floating = FLOATING_USER_ON;
+ nc->rect.x = 400;
+ nc->rect.y = 400;
+ TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
+ TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
+}
+
+void floating_disable(Con *con, bool automatic) {
+ if (!con_is_floating(con)) {
+ LOG("Container isn't floating, not doing anything.\n");
+ return;
+ }
+
+ assert(con->old_parent != NULL);
+
+ /* 1: detach from parent container */
+ TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
+ TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
+
+ /* 2: kill parent container */
+ TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
+ TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
+ tree_close(con->parent, false);
+
+ /* 3: re-attach to previous parent */
+ con->parent = con->old_parent;
+ TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
+ TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);
+
+ con->floating = FLOATING_USER_OFF;
+
+ con_fix_percent(con->parent, WINDOW_ADD);
+}
+
/*
- * Toggles floating mode for the given client.
- * Correctly takes care of the position/size (separately stored for tiling/floating mode)
- * and repositions/resizes/redecorates the client.
+ * Toggles floating mode for the given container.
*
* If the automatic flag is set to true, this was an automatic update by a change of the
* window class from the application which can be overwritten by the user.
*
*/
-void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic) {
- Container *con = client->container;
- i3Font *font = load_font(conn, config.font);
+void toggle_floating_mode(Con *con, bool automatic) {
+ //i3Font *font = load_font(conn, config.font);
+
+ /* see if the client is already floating */
+ if (con_is_floating(con)) {
+ LOG("already floating, re-setting to tiling\n");
+ floating_disable(con, automatic);
+ return;
+ }
+
+ floating_enable(con, automatic);
+
+
+#if 0
if (client->dock) {
DLOG("Not putting dock client into floating mode\n");
return;
/* 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
return 1;
}
+#endif
DRAGGING_CB(drag_window_callback) {
struct xcb_button_press_event_t *event = extra;
/* Reposition the client correctly while moving */
- client->rect.x = old_rect->x + (new_x - event->root_x);
- client->rect.y = old_rect->y + (new_y - event->root_y);
- reposition_client(conn, client);
- /* Because reposition_client does not send a faked configure event (only resize does),
- * we need to initiate that on our own */
- fake_absolute_configure_notify(conn, client);
- /* fake_absolute_configure_notify flushes */
+ con->rect.x = old_rect->x + (new_x - event->root_x);
+ con->rect.y = old_rect->y + (new_y - event->root_y);
+ /* TODO: don’t re-render the whole tree just because we change
+ * coordinates of a floating window */
+ tree_render();
+ x_push_changes(croot);
}
/*
* Calls the drag_pointer function with the drag_window callback
*
*/
-void floating_drag_window(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) {
+void floating_drag_window(Con *con, xcb_button_press_event_t *event) {
DLOG("floating_drag_window\n");
- drag_pointer(conn, client, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event);
+ drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event);
+ tree_render();
}
/*
*
*/
struct resize_window_callback_params {
- border_t corner;
- bool proportional;
- xcb_button_press_event_t *event;
+ border_t corner;
+ bool proportional;
+ xcb_button_press_event_t *event;
};
DRAGGING_CB(resize_window_callback) {
- struct resize_window_callback_params *params = extra;
- xcb_button_press_event_t *event = params->event;
- border_t corner = params->corner;
-
- int32_t dest_x = client->rect.x;
- int32_t dest_y = client->rect.y;
- uint32_t dest_width;
- uint32_t dest_height;
-
- double ratio = (double) old_rect->width / old_rect->height;
-
- /* First guess: We resize by exactly the amount the mouse moved,
- * taking into account in which corner the client was grabbed */
- if (corner & BORDER_LEFT)
- dest_width = old_rect->width - (new_x - event->root_x);
- else dest_width = old_rect->width + (new_x - event->root_x);
-
- if (corner & BORDER_TOP)
- dest_height = old_rect->height - (new_y - event->root_y);
- else dest_height = old_rect->height + (new_y - event->root_y);
-
- /* Obey minimum window size */
- dest_width = max(dest_width, client_min_width(client));
- dest_height = max(dest_height, client_min_height(client));
-
- /* User wants to keep proportions, so we may have to adjust our values */
- if (params->proportional) {
- dest_width = max(dest_width, (int) (dest_height * ratio));
- dest_height = max(dest_height, (int) (dest_width / ratio));
- }
-
- /* If not the lower right corner is grabbed, we must also reposition
- * the client by exactly the amount we resized it */
- if (corner & BORDER_LEFT)
- dest_x = old_rect->x + (old_rect->width - dest_width);
-
- if (corner & BORDER_TOP)
- dest_y = old_rect->y + (old_rect->height - dest_height);
-
- client->rect = (Rect) { dest_x, dest_y, dest_width, dest_height };
-
- /* resize_client flushes */
- resize_client(conn, client);
+ struct resize_window_callback_params *params = extra;
+ xcb_button_press_event_t *event = params->event;
+ border_t corner = params->corner;
+
+ int32_t dest_x = con->rect.x;
+ int32_t dest_y = con->rect.y;
+ uint32_t dest_width;
+ uint32_t dest_height;
+
+ double ratio = (double) old_rect->width / old_rect->height;
+
+ /* First guess: We resize by exactly the amount the mouse moved,
+ * taking into account in which corner the client was grabbed */
+ if (corner & BORDER_LEFT)
+ dest_width = old_rect->width - (new_x - event->root_x);
+ else dest_width = old_rect->width + (new_x - event->root_x);
+
+ if (corner & BORDER_TOP)
+ dest_height = old_rect->height - (new_y - event->root_y);
+ else dest_height = old_rect->height + (new_y - event->root_y);
+
+ /* TODO: minimum window size */
+#if 0
+ /* Obey minimum window size */
+ dest_width = max(dest_width, client_min_width(client));
+ dest_height = max(dest_height, client_min_height(client));
+#endif
+
+ /* User wants to keep proportions, so we may have to adjust our values */
+ if (params->proportional) {
+ dest_width = max(dest_width, (int) (dest_height * ratio));
+ dest_height = max(dest_height, (int) (dest_width / ratio));
+ }
+
+ /* If not the lower right corner is grabbed, we must also reposition
+ * the client by exactly the amount we resized it */
+ if (corner & BORDER_LEFT)
+ dest_x = old_rect->x + (old_rect->width - dest_width);
+
+ if (corner & BORDER_TOP)
+ dest_y = old_rect->y + (old_rect->height - dest_height);
+
+ con->rect = (Rect) { dest_x, dest_y, dest_width, dest_height };
+
+ /* TODO: don’t re-render the whole tree just because we change
+ * coordinates of a floating window */
+ tree_render();
+ x_push_changes(croot);
}
/*
* Calls the drag_pointer function with the resize_window callback
*
*/
-void floating_resize_window(xcb_connection_t *conn, Client *client,
- bool proportional, xcb_button_press_event_t *event) {
- DLOG("floating_resize_window\n");
+void floating_resize_window(Con *con, bool proportional,
+ xcb_button_press_event_t *event) {
+ DLOG("floating_resize_window\n");
- /* corner saves the nearest corner to the original click. It contains
- * a bitmask of the nearest borders (BORDER_LEFT, BORDER_RIGHT, …) */
- border_t corner = 0;
+ /* corner saves the nearest corner to the original click. It contains
+ * a bitmask of the nearest borders (BORDER_LEFT, BORDER_RIGHT, …) */
+ border_t corner = 0;
- if (event->event_x <= (client->rect.width / 2))
- corner |= BORDER_LEFT;
- else corner |= BORDER_RIGHT;
+ if (event->event_x <= (con->rect.width / 2))
+ corner |= BORDER_LEFT;
+ else corner |= BORDER_RIGHT;
- if (event->event_y <= (client->rect.height / 2))
- corner |= BORDER_TOP;
- else corner |= BORDER_RIGHT;
+ if (event->event_y <= (con->rect.height / 2))
+ corner |= BORDER_TOP;
+ else corner |= BORDER_RIGHT;
- struct resize_window_callback_params params = { corner, proportional, event };
+ struct resize_window_callback_params params = { corner, proportional, event };
- drag_pointer(conn, client, event, XCB_NONE, BORDER_TOP /* irrelevant */, resize_window_callback, ¶ms);
+ drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, resize_window_callback, ¶ms);
}
-
/*
* This function grabs your pointer and lets you drag stuff around (borders).
* Every time you move your mouse, an XCB_MOTION_NOTIFY event will be received
* the event and the new coordinates (x, y).
*
*/
-void drag_pointer(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event,
- xcb_window_t confine_to, border_t border, callback_t callback, void *extra) {
+void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
+ confine_to, border_t border, callback_t callback, void *extra)
+{
xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
uint32_t new_x, new_y;
Rect old_rect;
- if (client != NULL)
- memcpy(&old_rect, &(client->rect), sizeof(Rect));
+ if (con != NULL)
+ memcpy(&old_rect, &(con->rect), sizeof(Rect));
/* Grab the pointer */
/* TODO: returncode */
int nr = inside_event->response_type;
if (nr == 0) {
/* An error occured */
- handle_event(NULL, conn, inside_event);
+ //handle_event(NULL, conn, inside_event);
free(inside_event);
continue;
}
new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x;
new_y = ((xcb_motion_notify_event_t*)last_motion_notify)->root_y;
- callback(conn, client, &old_rect, new_x, new_y, extra);
+ callback(con, &old_rect, new_x, new_y, extra);
FREE(last_motion_notify);
}
done:
xcb_flush(conn);
}
+#if 0
/*
* Changes focus in the given direction for floating clients.
*
xcb_flush(conn);
}
+#endif
projects / i3 / i3 / blobdiff