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

Split plain dmenu call into separate function

Browse Source
This commit is contained in:
Benedikt Heine 2018-07-07 02:26:24 +02:00
parent 958aa2bc96
commit 38c788c367
1 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/menu.c
View File

@ -192,63 +192,31 @@ void dispatch_menu_result(const char *input)
g_free(in); g_free(in);
} }
/* /** Call dmenu with the specified input. Blocks until dmenu is finished.
* Open the context menu that let's the user *
* select urls/actions/etc * @param dmenu_input The input string to feed into dmenu
* @returns the selected string from dmenu
*/ */
void context_menu(void) char *invoke_dmenu(const char *dmenu_input)
{ {
if (!settings.dmenu_cmd) { if (!settings.dmenu_cmd) {
LOG_C("Unable to open dmenu: No dmenu command set."); LOG_C("Unable to open dmenu: No dmenu command set.");
return; return NULL;
}
char *dmenu_input = NULL;
GList *locked_notifications = NULL;
for (const GList *iter = queues_get_displayed(); iter;
iter = iter->next) {
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 (!dmenu_input || *dmenu_input == '\0')
dmenu_input = string_append(dmenu_input, n->urls, "\n"); return NULL;
if (n->actions)
dmenu_input =
string_append(dmenu_input, n->actions->dmenu_str,
"\n");
}
if (!dmenu_input)
return;
char buf[1024] = {0}; char buf[1024] = {0};
int child_io[2]; int child_io[2];
int parent_io[2]; int parent_io[2];
if (pipe(child_io) != 0) { if (pipe(child_io) != 0) {
LOG_W("pipe(): error in child: %s", strerror(errno)); LOG_W("pipe(): error in child: %s", strerror(errno));
g_free(dmenu_input); return NULL;
return;
} }
if (pipe(parent_io) != 0) { if (pipe(parent_io) != 0) {
LOG_W("pipe(): error in parent: %s", strerror(errno)); LOG_W("pipe(): error in parent: %s", strerror(errno));
g_free(dmenu_input); return NULL;
return;
} }
int pid = fork(); int pid = fork();
@ -284,16 +252,58 @@ void context_menu(void)
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);
if (len == 0) { if (len == 0) {
g_free(dmenu_input); return NULL;
return;
} }
} }
close(parent_io[0]); close(parent_io[0]);
dispatch_menu_result(buf); return g_strdup(buf);
}
/*
* Open the context menu that let's the user
* select urls/actions/etc
*/
void context_menu(void)
{
char *dmenu_input = NULL;
char *dmenu_output;
GList *locked_notifications = NULL;
for (const GList *iter = queues_get_displayed(); iter;
iter = iter->next) {
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)
dmenu_input = string_append(dmenu_input, n->urls, "\n");
if (n->actions)
dmenu_input =
string_append(dmenu_input, n->actions->dmenu_str,
"\n");
}
dmenu_output = invoke_dmenu(dmenu_input);
dispatch_menu_result(dmenu_output);
g_free(dmenu_input); g_free(dmenu_input);
g_free(dmenu_output);
// unref all notifications // unref all notifications
for (GList *iter = locked_notifications; for (GList *iter = locked_notifications;