From 9cbff272cbb776defe8f45fd7d909be618c0ce22 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 17 Jul 2018 10:27:03 +1000 Subject: [PATCH 1/2] Remove superfluous IPC urgent events When an xwayland view is mapped, the IPC urgent event was being sent on every surface commit. I had intentionally ommitted the check because I figured an urgent surface could update its urgent timestamp by sending urgent a second time. But that's not how it works in xwayland's case, and it makes for more complicated code. --- sway/tree/view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sway/tree/view.c b/sway/tree/view.c index 76e0f42c..8d8d213a 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -1080,6 +1080,9 @@ bool view_is_visible(struct sway_view *view) { } void view_set_urgent(struct sway_view *view, bool enable) { + if (view_is_urgent(view) == enable) { + return; + } if (enable) { struct sway_seat *seat = input_manager_current_seat(input_manager); if (seat_get_focus(seat) == view->swayc) { From db3a36373435a34b8d0a5fc4e90eacaa2b1dae6b Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 16 Jul 2018 21:00:57 -0400 Subject: [PATCH 2/2] Revert "config: free include path on successful load" This reverts commit 92450883d7b148d408b42c3553a60340a14771f6. --- sway/config.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sway/config.c b/sway/config.c index f63835bf..2c051146 100644 --- a/sway/config.c +++ b/sway/config.c @@ -474,7 +474,6 @@ static bool load_include_config(const char *path, const char *parent_dir, list_del(config->config_chain, index); return false; } - free(real_path); // restore current_config_path config->current_config_path = parent_config;