Implement more moving

This commit is contained in:
Michael Stapelberg 2009-02-10 02:03:58 +01:00
parent b58c24d655
commit 586647965c
1 changed files with 8 additions and 12 deletions

18
mainx.c
View File

@ -667,8 +667,7 @@ static void move_current_window(xcb_connection_t *connection, direction_t direct
if (current_col == 0) if (current_col == 0)
return; return;
new = table[current_col-1][current_row]; new = table[--new_current_col][current_row];
new_current_col--;
break; break;
case D_RIGHT: case D_RIGHT:
printf("ok, moving right\n"); printf("ok, moving right\n");
@ -677,11 +676,9 @@ static void move_current_window(xcb_connection_t *connection, direction_t direct
expand_table_cols(); expand_table_cols();
} }
new = table[current_col+1][current_row]; new = table[++new_current_col][current_row];
new_current_col++;
break; break;
case D_UP: case D_UP:
/* TODO: impl */
printf("moving up\n"); printf("moving up\n");
Client *prev = CIRCLEQ_PREV(current_client, clients); Client *prev = CIRCLEQ_PREV(current_client, clients);
if (prev != CIRCLEQ_END(&(container->clients))) { if (prev != CIRCLEQ_END(&(container->clients))) {
@ -693,8 +690,11 @@ static void move_current_window(xcb_connection_t *connection, direction_t direct
return; return;
} }
/* TODO: push the client into the container above */ if (current_row == 0)
return; return;
new = table[current_col][--new_current_row];
break;
case D_DOWN: case D_DOWN:
printf("moving down\n"); printf("moving down\n");
Client *next = CIRCLEQ_NEXT(current_client, clients); Client *next = CIRCLEQ_NEXT(current_client, clients);
@ -712,13 +712,9 @@ static void move_current_window(xcb_connection_t *connection, direction_t direct
if (current_row == (table_dims.y-1)) { if (current_row == (table_dims.y-1)) {
printf("creating a new container\n"); printf("creating a new container\n");
expand_table_rows(); expand_table_rows();
new = table[current_col][current_row+1];
new_current_row++;
} }
/* TODO: check if there is another container below and move
it there */
new = table[current_col][++new_current_row];
break; break;
} }