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

Implement ws (with screen) to focus the next screen (wsl for example)

This commit is contained in:
Michael Stapelberg 2009-08-05 19:24:21 +02:00
parent 9222bea3b2
commit 22e4f03553
1 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/commands.c
View File

@ -28,6 +28,7 @@
#include "xcb.h" #include "xcb.h"
#include "config.h" #include "config.h"
#include "workspace.h" #include "workspace.h"
#include "commands.h"
bool focus_window_in_container(xcb_connection_t *conn, Container *container, direction_t direction) { bool focus_window_in_container(xcb_connection_t *conn, Container *container, direction_t direction) {
/* If this container is empty, we’re done */ /* If this container is empty, we’re done */
@ -55,7 +56,7 @@ bool focus_window_in_container(xcb_connection_t *conn, Container *container, dir
return true; return true;
} }
typedef enum { THING_WINDOW, THING_CONTAINER } thing_t; typedef enum { THING_WINDOW, THING_CONTAINER, THING_SCREEN } thing_t;
static void focus_thing(xcb_connection_t *conn, direction_t direction, thing_t thing) { static void focus_thing(xcb_connection_t *conn, direction_t direction, thing_t thing) {
LOG("focusing direction %d\n", direction); LOG("focusing direction %d\n", direction);
@ -81,6 +82,41 @@ static void focus_thing(xcb_connection_t *conn, direction_t direction, thing_t t
return; return;
} }
/* For focusing screens, situation is different: we get the rect
* of the current screen, then get the screen which is on its
* right/left/bottom/top and just switch to the workspace on
* the target screen. */
if (thing == THING_SCREEN) {
i3Screen *cs = c_ws->screen;
assert(cs != NULL);
Rect bounds = cs->rect;
if (direction == D_RIGHT)
bounds.x += bounds.width;
else if (direction == D_LEFT)
bounds.x -= bounds.width;
else if (direction == D_UP)
bounds.y -= bounds.height;
else bounds.y += bounds.height;
i3Screen *target = get_screen_containing(bounds.x, bounds.y);
if (target == NULL) {
LOG("Target screen NULL\n");
/* Wrap around if the target screen is out of bounds */
if (direction == D_RIGHT)
target = get_screen_most(D_LEFT);
else if (direction == D_LEFT)
target = get_screen_most(D_RIGHT);
else if (direction == D_UP)
target = get_screen_most(D_DOWN);
else target = get_screen_most(D_UP);
}
LOG("Switching to ws %d\n", target->current_workspace + 1);
show_workspace(conn, target->current_workspace + 1);
return;
}
/* TODO: for horizontal default layout, this has to be expanded to LEFT/RIGHT */ /* TODO: for horizontal default layout, this has to be expanded to LEFT/RIGHT */
if (direction == D_UP || direction == D_DOWN) { if (direction == D_UP || direction == D_DOWN) {
if (thing == THING_WINDOW) if (thing == THING_WINDOW)
@ -983,7 +1019,7 @@ void parse_command(xcb_connection_t *conn, const char *command) {
return; return;
} }
enum { WITH_WINDOW, WITH_CONTAINER, WITH_WORKSPACE } with = WITH_WINDOW; enum { WITH_WINDOW, WITH_CONTAINER, WITH_WORKSPACE, WITH_SCREEN } with = WITH_WINDOW;
/* Is it a <with>? */ /* Is it a <with>? */
if (command[0] == 'w') { if (command[0] == 'w') {
@ -995,6 +1031,9 @@ void parse_command(xcb_connection_t *conn, const char *command) {
} else if (command[0] == 'w') { } else if (command[0] == 'w') {
with = WITH_WORKSPACE; with = WITH_WORKSPACE;
command++; command++;
} else if (command[0] == 's') {
with = WITH_SCREEN;
command++;
} else { } else {
LOG("not yet implemented.\n"); LOG("not yet implemented.\n");
return; return;
@ -1030,12 +1069,7 @@ void parse_command(xcb_connection_t *conn, const char *command) {
} }
/* Is it 'n' or 'p' for next/previous workspace? (nw) */ /* Is it 'n' or 'p' for next/previous workspace? (nw) */
if (command[0] == 'n' && command[1] == 'w') { if ((command[0] == 'n' || command[0] == 'p') && command[1] == 'w') {
next_previous_workspace(conn, command[0]);
return;
}
if (command[0] == 'p' && command[1] == 'w') {
next_previous_workspace(conn, command[0]); next_previous_workspace(conn, command[0]);
return; return;
} }
@ -1103,6 +1137,10 @@ void parse_command(xcb_connection_t *conn, const char *command) {
rest++; rest++;
if (action == ACTION_FOCUS) { if (action == ACTION_FOCUS) {
if (with == WITH_SCREEN) {
focus_thing(conn, direction, THING_SCREEN);
continue;
}
if (client_is_floating(last_focused)) { if (client_is_floating(last_focused)) {
floating_focus_direction(conn, last_focused, direction); floating_focus_direction(conn, last_focused, direction);
continue; continue;
@ -1112,6 +1150,13 @@ void parse_command(xcb_connection_t *conn, const char *command) {
} }
if (action == ACTION_MOVE) { if (action == ACTION_MOVE) {
if (with == WITH_SCREEN) {
/* TODO: this should swap the screen’s contents
* (e.g. all workspaces) with the next/previous/…
* screen */
LOG("Not yet implemented\n");
continue;
}
if (client_is_floating(last_focused)) { if (client_is_floating(last_focused)) {
floating_move(conn, last_focused, direction); floating_move(conn, last_focused, direction);
continue; continue;
@ -1123,6 +1168,10 @@ void parse_command(xcb_connection_t *conn, const char *command) {
} }
if (action == ACTION_SNAP) { if (action == ACTION_SNAP) {
if (with == WITH_SCREEN) {
LOG("You cannot snap a screen (it makes no sense).\n");
continue;
}
snap_current_container(conn, direction); snap_current_container(conn, direction);
continue; continue;
} }