* are children of the workspace. */
if (con->type == CT_WORKSPACE) {
LOG("This is a workspace, creating new container around content\n");
+ if (con_num_children(con) == 0) {
+ LOG("Workspace is empty, aborting\n");
+ return;
+ }
/* TODO: refactor this with src/con.c:con_set_layout */
Con *new = con_new(NULL);
new->parent = con;
free(name);
/* find the height for the decorations */
- i3Font *font = load_font(conn, config.font);
- int deco_height = font->height + 5;
+ int deco_height = config.font.height + 5;
DLOG("Original rect: (%d, %d) with %d x %d\n", con->rect.x, con->rect.y, con->rect.width, con->rect.height);
- nc->rect = con->rect;
+ Rect zero = { 0, 0, 0, 0 };
+ nc->rect = con->geometry;
+ /* If the geometry was not set (split containers), we need to determine a
+ * sensible one by combining the geometry of all children */
+ if (memcmp(&(nc->rect), &zero, sizeof(Rect)) == 0) {
+ DLOG("Geometry not set, combining children\n");
+ Con *child;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ DLOG("child geometry: %d x %d\n", child->geometry.width, child->geometry.height);
+ nc->rect.width += child->geometry.width;
+ nc->rect.height = max(nc->rect.height, child->geometry.height);
+ }
+ }
+ /* Raise the width/height to at least 75x50 (minimum size for windows) */
+ nc->rect.width = max(nc->rect.width, 75);
+ nc->rect.height = max(nc->rect.height, 50);
/* add pixels for the decoration */
/* TODO: don’t add them when the user automatically puts new windows into
* 1pixel/borderless mode */
/* 3: re-attach to the parent of the currently focused con on the workspace
* this floating con was on */
- Con *focused = con_descend_focused(con_get_workspace(con));
+ Con *focused = con_descend_tiling_focused(con_get_workspace(con));
+
/* if there is no other container on this workspace, focused will be the
* workspace itself */
if (focused->type == CT_WORKSPACE)
con->parent = focused;
else con->parent = focused->parent;
- /* XXX: We adjust the percentage value to start with a fair value. Floating
- * cons always have 1.0 as percent which doesn’t work so well when
- * re-inserting (the formerly floating con would get 50% of the target
- * con). */
- con->percent = (1.0 / con_num_children(con->parent));
+ /* con_fix_percent will adjust the percent value */
+ con->percent = 0.0;
TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);
/* Reposition the client correctly while moving */
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);
+
+ render_con(con, false);
+ x_push_node(con, true);
+ xcb_flush(conn);
}
/*
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
+ Rect minimum = con_minimum_size(con);
+ dest_width = max(dest_width, minimum.width);
+ dest_height = max(dest_height, minimum.height);
/* User wants to keep proportions, so we may have to adjust our values */
if (params->proportional) {
while ((inside_event = xcb_wait_for_event(conn))) {
/* We now handle all events we can get using xcb_poll_for_event */
do {
- /* Same as get_event_handler in xcb */
- int nr = inside_event->response_type;
- if (nr == 0) {
- /* An error occured */
- //handle_event(NULL, conn, inside_event);
+ /* skip x11 errors */
+ if (inside_event->response_type == 0) {
free(inside_event);
continue;
}
- assert(nr < 256);
- nr &= XCB_EVENT_RESPONSE_TYPE_MASK;
- assert(nr >= 2);
+ /* Strip off the highest bit (set if the event is generated) */
+ int type = (inside_event->response_type & 0x7F);
- switch (nr) {
+ switch (type) {
case XCB_BUTTON_RELEASE:
goto done;
case XCB_UNMAP_NOTIFY:
DLOG("Unmap-notify, aborting\n");
- xcb_event_handle(&evenths, inside_event);
+ handle_event(type, inside_event);
goto done;
default:
DLOG("Passing to original handler\n");
/* Use original handler */
- xcb_event_handle(&evenths, inside_event);
+ handle_event(type, inside_event);
break;
}
if (last_motion_notify != inside_event)