nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify window showing and hiding

Browse Source 
As suggested by @bebehei make x_win_{show,hide} callable at any time and
avoid double checking the queue length.
This commit is contained in:
Nikos Tsipinakis 2018-09-20 10:40:29 +03:00
parent 69100790a1
commit 7ac054b3cc
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dunst.c
View File

@ -51,20 +51,17 @@ static gboolean run(void *data)
static gint64 next_timeout = 0; static gint64 next_timeout = 0;
bool active = queues_length_displayed() > 0;
if (active) {
// Call draw before showing the window to avoid flickering // Call draw before showing the window to avoid flickering
if (queues_length_displayed() > 0) {
draw(); draw();
}
if (!x_win_visible(win) && queues_length_displayed() > 0) {
x_win_show(win); x_win_show(win);
} } else {
if (x_win_visible(win) && queues_length_displayed() == 0) {
x_win_hide(win); x_win_hide(win);
} }
if (x_win_visible(win)) { if (active) {
gint64 now = time_monotonic_now(); gint64 now = time_monotonic_now();
gint64 sleep = queues_get_next_datachange(now); gint64 sleep = queues_get_next_datachange(now);
gint64 timeout_at = now + sleep; gint64 timeout_at = now + sleep;

6
src/x11/x.c
View File

@ -674,9 +674,8 @@ void x_win_destroy(window_x11 *win)
void x_win_show(window_x11 *win) void x_win_show(window_x11 *win)
{ {
/* window is already mapped or there's nothing to show */ /* window is already mapped or there's nothing to show */
if (win->visible || queues_length_displayed() == 0) { if (win->visible)
return; return;
}
x_shortcut_grab(&settings.close_ks); x_shortcut_grab(&settings.close_ks);
x_shortcut_grab(&settings.close_all_ks); x_shortcut_grab(&settings.close_all_ks);
@ -706,6 +705,9 @@ void x_win_show(window_x11 *win)
*/ */
void x_win_hide(window_x11 *win) void x_win_hide(window_x11 *win)
{ {
if (!win->visible)
return;
x_shortcut_ungrab(&settings.close_ks); x_shortcut_ungrab(&settings.close_ks);
x_shortcut_ungrab(&settings.close_all_ks); x_shortcut_ungrab(&settings.close_all_ks);
x_shortcut_ungrab(&settings.context_ks); x_shortcut_ungrab(&settings.context_ks);