mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 09:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix urgent timer logic and remove unnecessary header includes

Browse source
This commit is contained in:
Ryan Dwyer 2018-07-21 10:27:40 +10:00
parent c2ed3d8bd6
commit 37b33f92e8
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/commands/force_display_urgency_hint.c
View file

@ -1,10 +1,5 @@
#include "log.h"
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
#include "sway/tree/view.h"
#include "sway/tree/layout.h"
struct cmd_results *cmd_force_display_urgency_hint(int argc, char **argv) { struct cmd_results *cmd_force_display_urgency_hint(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;

16
sway/input/seat.c
View file

@ -677,16 +677,20 @@ void seat_set_focus_warp(struct sway_seat *seat,
} }
} }
// If urgent, start a timer to unset it // If urgent, either unset the urgency or start a timer to unset it
if (container && container->type == C_VIEW && if (container && container->type == C_VIEW &&
last_workspace && last_workspace != new_workspace &&
view_is_urgent(container->sway_view) && view_is_urgent(container->sway_view) &&
config->urgent_timeout > 0 &&
!container->sway_view->urgent_timer) { !container->sway_view->urgent_timer) {
struct sway_view *view = container->sway_view; struct sway_view *view = container->sway_view;
view->urgent_timer = wl_event_loop_add_timer(server.wl_event_loop, if (last_workspace && last_workspace != new_workspace &&
handle_urgent_timeout, view); config->urgent_timeout > 0) {
wl_event_source_timer_update(view->urgent_timer, config->urgent_timeout); view->urgent_timer = wl_event_loop_add_timer(server.wl_event_loop,
handle_urgent_timeout, view);
wl_event_source_timer_update(view->urgent_timer,
config->urgent_timeout);
} else {
view_set_urgent(view, false);
}
} }
// If we've focused a floating container, bring it to the front. // If we've focused a floating container, bring it to the front.