mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-17 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wlroots' into view-redesign

Browse source
This commit is contained in:
emersion 2018-04-02 15:30:58 -04:00
commit a4a241697a
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
35 changed files with 1055 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sway/desktop/output.c
View file

@ -245,10 +245,13 @@ static void render_output(struct sway_output *output, struct timespec *when,
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus =
sway_seat_get_focus_inactive(seat, output->swayc);
struct sway_container *workspace = (focus->type == C_WORKSPACE ?
focus :
container_parent(focus, C_WORKSPACE));
seat_get_focus_inactive(seat, output->swayc);
if (!focus) {
// We've never been to this output before
focus = output->swayc->children->items[0];
}
struct sway_container *workspace = focus->type == C_WORKSPACE ?
focus : container_parent(focus, C_WORKSPACE);
struct render_data rdata = {
.output = output,
@ -393,7 +396,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wl_list_init(&output->layers[i]);
}
sway_input_manager_configure_xcursor(input_manager);
input_manager_configure_xcursor(input_manager);
wl_signal_add(&wlr_output->events.destroy, &output->destroy);
output->destroy.notify = handle_destroy;