nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-11-29 20:50:11 +00:00
parent 752b101916 40ad2f182b
commit df2236c5ee
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/click.c
View File

@ -26,7 +26,7 @@ typedef enum { CLICK_BORDER = 0, CLICK_DECORATION = 1, CLICK_INSIDE = 2 } click_
* *
*/ */
static bool tiling_resize_for_border(Con *con, border_t border, const xcb_button_press_event_t *event) { static bool tiling_resize_for_border(Con *con, border_t border, const xcb_button_press_event_t *event) {
DLOG("border = %d\n", border); DLOG("border = %d, con = %p\n", border, con);
char way = (border == BORDER_TOP || border == BORDER_LEFT ? 'p' : 'n'); char way = (border == BORDER_TOP || border == BORDER_LEFT ? 'p' : 'n');
orientation_t orientation = (border == BORDER_TOP || border == BORDER_BOTTOM ? VERT : HORIZ); orientation_t orientation = (border == BORDER_TOP || border == BORDER_BOTTOM ? VERT : HORIZ);
@ -38,6 +38,7 @@ static bool tiling_resize_for_border(Con *con, border_t border, const xcb_button
resize_con->parent->orientation != orientation) resize_con->parent->orientation != orientation)
resize_con = resize_con->parent; resize_con = resize_con->parent;
DLOG("resize_con = %p\n", resize_con);
if (resize_con->type != CT_WORKSPACE && if (resize_con->type != CT_WORKSPACE &&
resize_con->type != CT_FLOATING_CON && resize_con->type != CT_FLOATING_CON &&
resize_con->parent->orientation == orientation) { resize_con->parent->orientation == orientation) {
@ -51,6 +52,8 @@ static bool tiling_resize_for_border(Con *con, border_t border, const xcb_button
first = second; first = second;
second = tmp; second = tmp;
} }
DLOG("first = %p, second = %p, resize_con = %p\n",
first, second, resize_con);
} }
if (first == NULL || second == NULL) { if (first == NULL || second == NULL) {
@ -130,13 +133,14 @@ static bool tiling_resize(Con *con, const xcb_button_press_event_t *event, const
/* Since the container might either be the child *or* already a split /* Since the container might either be the child *or* already a split
* container (in the case of a nested split container), we need to make * container (in the case of a nested split container), we need to make
* sure that we are dealing with the split container here. */ * sure that we are dealing with the split container here. */
if (con_is_leaf(con) && con->parent->type == CT_CON) Con *check_con = con;
con = con->parent; if (con_is_leaf(check_con) && check_con->parent->type == CT_CON)
check_con = check_con->parent;
if ((con->layout == L_STACKED || if ((check_con->layout == L_STACKED ||
con->layout == L_TABBED || check_con->layout == L_TABBED ||
con->orientation == HORIZ) && check_con->orientation == HORIZ) &&
con_num_children(con) > 1) { con_num_children(check_con) > 1) {
DLOG("Not handling this resize, this container has > 1 child.\n"); DLOG("Not handling this resize, this container has > 1 child.\n");
return false; return false;
} }