mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix_transparency

Browse source
This commit is contained in:
Bor Grošelj Simić 2018-07-04 12:19:13 +02:00 • committed by GitHub
commit ffc61e5f3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/input/seat.c
View file

@ -663,7 +663,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
} }
seat_send_focus(container, seat); seat_send_focus(container, seat);
container_damage_whole(container); container_damage_whole(container->parent);
} }
// clean up unfocused empty workspace on new output // clean up unfocused empty workspace on new output

1
sway/main.c
View file

@ -416,6 +416,7 @@ int main(int argc, char **argv) {
security_sanity_check(); security_sanity_check();
config->active = true; config->active = true;
setenv("WAYLAND_DISPLAY", server.socket, true);
// Execute commands until there are none left // Execute commands until there are none left
while (config->cmd_queue->length) { while (config->cmd_queue->length) {
char *line = config->cmd_queue->items[0]; char *line = config->cmd_queue->items[0];

1
sway/server.c
View file

@ -143,7 +143,6 @@ void server_fini(struct sway_server *server) {
void server_run(struct sway_server *server) { void server_run(struct sway_server *server) {
wlr_log(L_INFO, "Running compositor on wayland display '%s'", wlr_log(L_INFO, "Running compositor on wayland display '%s'",
server->socket); server->socket);
setenv("WAYLAND_DISPLAY", server->socket, true);
if (!wlr_backend_start(server->backend)) { if (!wlr_backend_start(server->backend)) {
wlr_log(L_ERROR, "Failed to start backend"); wlr_log(L_ERROR, "Failed to start backend");
wlr_backend_destroy(server->backend); wlr_backend_destroy(server->backend);