alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Wrap to fartherest output when running focus output

Browse source 
Also moves the `opposite_direction` function into `util.c` as it's used
in two places now.
This commit is contained in:
Ryan Dwyer 2018-11-01 08:29:45 +10:00
parent f841d2ed74
commit bf19f63a79
4 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/util.c
View file

@ -1,4 +1,5 @@
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
#include <assert.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
@ -138,3 +139,18 @@ bool parse_boolean(const char *boolean, bool current) {
// All other values are false to match i3 // All other values are false to match i3
return false; return false;
} }
enum wlr_direction opposite_direction(enum wlr_direction d) {
switch (d) {
case WLR_DIRECTION_UP:
return WLR_DIRECTION_DOWN;
case WLR_DIRECTION_DOWN:
return WLR_DIRECTION_UP;
case WLR_DIRECTION_RIGHT:
return WLR_DIRECTION_LEFT;
case WLR_DIRECTION_LEFT:
return WLR_DIRECTION_RIGHT;
}
assert(false);
return 0;
}

2
include/util.h
View file

@ -59,4 +59,6 @@ uint32_t parse_color(const char *color);
*/ */
bool parse_boolean(const char *boolean, bool current); bool parse_boolean(const char *boolean, bool current);
enum wlr_direction opposite_direction(enum wlr_direction d);
#endif #endif

11
sway/commands/focus.c
View file

@ -196,6 +196,17 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
} }
struct sway_workspace *ws = seat_get_focused_workspace(seat); struct sway_workspace *ws = seat_get_focused_workspace(seat);
output = output_get_in_direction(ws->output, direction); output = output_get_in_direction(ws->output, direction);
if (!output) {
int center_lx = ws->output->lx + ws->output->width / 2;
int center_ly = ws->output->ly + ws->output->height / 2;
struct wlr_output *target = wlr_output_layout_farthest_output(
root->output_layout, opposite_direction(direction),
ws->output->wlr_output, center_lx, center_ly);
if (target) {
output = output_from_wlr_output(target);
}
}
} }
free(identifier); free(identifier);

13
sway/commands/move.c
View file

@ -27,19 +27,6 @@ static const char *expected_syntax =
"'move <container|window|workspace> [to] output <name|direction>' or " "'move <container|window|workspace> [to] output <name|direction>' or "
"'move <container|window> [to] mark <mark>'"; "'move <container|window> [to] mark <mark>'";
enum wlr_direction opposite_direction(enum wlr_direction d) {
switch (d) {
case WLR_DIRECTION_UP:
return WLR_DIRECTION_DOWN;
case WLR_DIRECTION_DOWN:
return WLR_DIRECTION_UP;
case WLR_DIRECTION_RIGHT:
return WLR_DIRECTION_LEFT;
default:
return WLR_DIRECTION_RIGHT;
}
}
static struct sway_output *output_in_direction(const char *direction_string, static struct sway_output *output_in_direction(const char *direction_string,
struct sway_output *reference, int ref_lx, int ref_ly) { struct sway_output *reference, int ref_lx, int ref_ly) {
struct { struct {