diff options
| author | Bor Grošelj Simić <bor.groseljsimic@telemach.net> | 2018-07-04 12:19:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 12:19:13 +0200 |
| commit | ffc61e5f3fbe479ec2651ea73ec3df0c57ed83db (patch) | |
| tree | 4b81a611432492cfd1bd0c0f360c387f2c495428 | |
| parent | 484042efd8a7f3dd85a763f9ecdda01e5a798693 (diff) | |
| parent | 4afa18a0c03b37d92557ce9a1b6822d2acac13f7 (diff) | |
Merge branch 'master' into fix_transparency
| -rw-r--r-- | sway/input/seat.c | 2 | ||||
| -rw-r--r-- | sway/main.c | 1 | ||||
| -rw-r--r-- | sway/server.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index a934d4a8..6c5abcd8 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -663,7 +663,7 @@ void seat_set_focus_warp(struct sway_seat *seat, } seat_send_focus(container, seat); - container_damage_whole(container); + container_damage_whole(container->parent); } // clean up unfocused empty workspace on new output diff --git a/sway/main.c b/sway/main.c index 124f9fbb..8b0b8612 100644 --- a/sway/main.c +++ b/sway/main.c @@ -416,6 +416,7 @@ int main(int argc, char **argv) { security_sanity_check(); config->active = true; + setenv("WAYLAND_DISPLAY", server.socket, true); // Execute commands until there are none left while (config->cmd_queue->length) { char *line = config->cmd_queue->items[0]; diff --git a/sway/server.c b/sway/server.c index 8106f3c8..cd15f454 100644 --- a/sway/server.c +++ b/sway/server.c @@ -143,7 +143,6 @@ void server_fini(struct sway_server *server) { void server_run(struct sway_server *server) { wlr_log(L_INFO, "Running compositor on wayland display '%s'", server->socket); - setenv("WAYLAND_DISPLAY", server->socket, true); if (!wlr_backend_start(server->backend)) { wlr_log(L_ERROR, "Failed to start backend"); wlr_backend_destroy(server->backend); |