diff options
| author |  Tony Crisci <tony@dubstepdish.com> | 2018-04-02 13:23:43 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 13:23:43 -0400 |
| commit | 5e024278a62e6fb00a0521240244c428d2382984 (patch) | |
| tree | d9010d33d4d576297cc5e40d41bed4bb7bf5631a /sway/desktop | |
| parent | dont copy input config (diff) | |
| parent | Merge pull request #1697 from RedSoxFan/back-and-forth (diff) | |
| download | sway-5e024278a62e6fb00a0521240244c428d2382984.tar.gz sway-5e024278a62e6fb00a0521240244c428d2382984.tar.zst sway-5e024278a62e6fb00a0521240244c428d2382984.zip | |
Merge branch 'wlroots' into seat-fixes
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/output.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ea3938a4..5e8a081c 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
| @@ -229,9 +229,12 @@ static void render_output(struct sway_output *output, struct timespec *when, | |||
| 229 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 229 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
| 230 | struct sway_container *focus = | 230 | struct sway_container *focus = |
| 231 | seat_get_focus_inactive(seat, output->swayc); | 231 | seat_get_focus_inactive(seat, output->swayc); |
| 232 | struct sway_container *workspace = (focus->type == C_WORKSPACE ? | 232 | if (!focus) { |
| 233 | focus : | 233 | // We've never been to this output before |
| 234 | container_parent(focus, C_WORKSPACE)); | 234 | focus = output->swayc->children->items[0]; |
| 235 | } | ||
| 236 | struct sway_container *workspace = focus->type == C_WORKSPACE ? | ||
| 237 | focus : container_parent(focus, C_WORKSPACE); | ||
| 235 | 238 | ||
| 236 | struct render_data rdata = { | 239 | struct render_data rdata = { |
| 237 | .output = output, | 240 | .output = output, |