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

Lock notifications while executing dmenu

Browse Source 
When executing dmenu, the current notifications get "locked", by setting
their timeout temporarily to 0 and referencing them. So the notification
won't get closed (exept forcefully) and won't get freed while dmenu is
opened.

This is currently pointless, but as the dmenu call will become threaded,
it's necessary later.
This commit is contained in:
Benedikt Heine 2018-07-06 20:47:42 +02:00
parent 974bcb776e
commit 958aa2bc96
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/menu.c
View File

@ -23,6 +23,11 @@
static bool is_initialized = false; static bool is_initialized = false;
static regex_t cregex; static regex_t cregex;
struct notification_lock {
struct notification *n;
gint64 timeout;
};
static int regex_init(void) static int regex_init(void)
{ {
if (is_initialized) if (is_initialized)
@ -199,10 +204,27 @@ void context_menu(void)
} }
char *dmenu_input = NULL; char *dmenu_input = NULL;
GList *locked_notifications = NULL;
for (const GList *iter = queues_get_displayed(); iter; for (const GList *iter = queues_get_displayed(); iter;
iter = iter->next) { iter = iter->next) {
struct notification *n = iter->data; struct notification *n = iter->data;
// Reference and lock the notification if we need it
if (n->urls || n->actions) {
notification_ref(n);
struct notification_lock *nl =
g_malloc(sizeof(struct notification_lock));
nl->n = n;
nl->timeout = n->timeout;
n->timeout = 0;
locked_notifications = g_list_prepend(locked_notifications, nl);
}
if (n->urls) if (n->urls)
dmenu_input = string_append(dmenu_input, n->urls, "\n"); dmenu_input = string_append(dmenu_input, n->urls, "\n");
@ -272,5 +294,20 @@ void context_menu(void)
dispatch_menu_result(buf); dispatch_menu_result(buf);
g_free(dmenu_input); g_free(dmenu_input);
// unref all notifications
for (GList *iter = locked_notifications;
iter;
iter = iter->next) {
struct notification_lock *nl = iter->data;
struct notification *n = nl->n;
n->timeout = nl->timeout;
g_free(nl);
notification_unref(n);
}
g_list_free(locked_notifications);
} }
/* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */ /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */