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 | Fix transparency in background images in swaylock (diff) | |
parent | Merge pull request #2202 from RyanDwyer/fix-focus-damage (diff) | |
download | sway-ffc61e5f3fbe479ec2651ea73ec3df0c57ed83db.tar.gz sway-ffc61e5f3fbe479ec2651ea73ec3df0c57ed83db.tar.zst sway-ffc61e5f3fbe479ec2651ea73ec3df0c57ed83db.zip |
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, | |||
663 | } | 663 | } |
664 | 664 | ||
665 | seat_send_focus(container, seat); | 665 | seat_send_focus(container, seat); |
666 | container_damage_whole(container); | 666 | container_damage_whole(container->parent); |
667 | } | 667 | } |
668 | 668 | ||
669 | // clean up unfocused empty workspace on new output | 669 | // 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) { | |||
416 | security_sanity_check(); | 416 | security_sanity_check(); |
417 | 417 | ||
418 | config->active = true; | 418 | config->active = true; |
419 | setenv("WAYLAND_DISPLAY", server.socket, true); | ||
419 | // Execute commands until there are none left | 420 | // Execute commands until there are none left |
420 | while (config->cmd_queue->length) { | 421 | while (config->cmd_queue->length) { |
421 | char *line = config->cmd_queue->items[0]; | 422 | 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) { | |||
143 | void server_run(struct sway_server *server) { | 143 | void server_run(struct sway_server *server) { |
144 | wlr_log(L_INFO, "Running compositor on wayland display '%s'", | 144 | wlr_log(L_INFO, "Running compositor on wayland display '%s'", |
145 | server->socket); | 145 | server->socket); |
146 | setenv("WAYLAND_DISPLAY", server->socket, true); | ||
147 | if (!wlr_backend_start(server->backend)) { | 146 | if (!wlr_backend_start(server->backend)) { |
148 | wlr_log(L_ERROR, "Failed to start backend"); | 147 | wlr_log(L_ERROR, "Failed to start backend"); |
149 | wlr_backend_destroy(server->backend); | 148 | wlr_backend_destroy(server->backend); |