Mirrors/rofi
2
0
Fork 0
mirror of https://github.com/lbonn/rofi synced 2024-11-26 13:50:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Run] Don't re-quote history items.

Browse source
This commit is contained in:
Dave Davenport 2024-03-11 12:04:08 +01:00
parent 9cae4a9b61
commit 04f16052a9
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/modes/run.c
View file

@ -66,6 +66,7 @@ typedef struct {
char *entry; char *entry;
uint32_t icon_fetch_uid; uint32_t icon_fetch_uid;
uint32_t icon_fetch_size; uint32_t icon_fetch_size;
gboolean from_history;
/* Surface holding the icon. */ /* Surface holding the icon. */
cairo_surface_t *icon; cairo_surface_t *icon;
} RunEntry; } RunEntry;
@ -205,6 +206,7 @@ static RunEntry *get_apps_external(RunEntry *retv, unsigned int *length,
// No duplicate, add it. // No duplicate, add it.
retv = g_realloc(retv, ((*length) + 2) * sizeof(RunEntry)); retv = g_realloc(retv, ((*length) + 2) * sizeof(RunEntry));
retv[(*length)].entry = g_strdup(buffer); retv[(*length)].entry = g_strdup(buffer);
retv[(*length)].from_history = FALSE;
retv[(*length)].icon = NULL; retv[(*length)].icon = NULL;
retv[(*length)].icon_fetch_uid = 0; retv[(*length)].icon_fetch_uid = 0;
retv[(*length)].icon_fetch_size = 0; retv[(*length)].icon_fetch_size = 0;
@ -221,6 +223,7 @@ static RunEntry *get_apps_external(RunEntry *retv, unsigned int *length,
} }
} }
retv[(*length)].entry = NULL; retv[(*length)].entry = NULL;
retv[(*length)].from_history = FALSE;
retv[(*length)].icon = NULL; retv[(*length)].icon = NULL;
retv[(*length)].icon_fetch_uid = 0; retv[(*length)].icon_fetch_uid = 0;
retv[(*length)].icon_fetch_size = 0; retv[(*length)].icon_fetch_size = 0;
@ -245,6 +248,7 @@ static RunEntry *get_apps(unsigned int *length) {
retv = (RunEntry *)g_malloc0((*length + 1) * sizeof(RunEntry)); retv = (RunEntry *)g_malloc0((*length + 1) * sizeof(RunEntry));
for (unsigned int i = 0; i < *length; i++) { for (unsigned int i = 0; i < *length; i++) {
retv[i].entry = hretv[i]; retv[i].entry = hretv[i];
retv[i].from_history = TRUE;
} }
g_free(hretv); g_free(hretv);
g_free(path); g_free(path);
@ -332,10 +336,12 @@ static RunEntry *get_apps(unsigned int *length) {
retv = g_realloc(retv, ((*length) + 2) * sizeof(RunEntry)); retv = g_realloc(retv, ((*length) + 2) * sizeof(RunEntry));
retv[(*length)].entry = name; retv[(*length)].entry = name;
retv[(*length)].from_history = FALSE;
retv[(*length)].icon = NULL; retv[(*length)].icon = NULL;
retv[(*length)].icon_fetch_uid = 0; retv[(*length)].icon_fetch_uid = 0;
retv[(*length)].icon_fetch_size = 0; retv[(*length)].icon_fetch_size = 0;
retv[(*length) + 1].entry = NULL; retv[(*length) + 1].entry = NULL;
retv[(*length) + 1].from_history = FALSE;
retv[(*length) + 1].icon = NULL; retv[(*length) + 1].icon = NULL;
retv[(*length) + 1].icon_fetch_uid = 0; retv[(*length) + 1].icon_fetch_uid = 0;
retv[(*length) + 1].icon_fetch_size = 0; retv[(*length) + 1].icon_fetch_size = 0;
@ -447,7 +453,12 @@ static ModeMode run_mode_result(Mode *sw, int mretv, char **input,
&path); &path);
if (retv == MODE_EXIT) { if (retv == MODE_EXIT) {
if (path == NULL) { if (path == NULL) {
char *arg = g_shell_quote(rmpd->cmd_list[rmpd->selected_line].entry); char *arg;
if (rmpd->cmd_list[rmpd->selected_line].from_history) {
arg = g_strdup(rmpd->cmd_list[rmpd->selected_line].entry);
} else {
arg = g_shell_quote(rmpd->cmd_list[rmpd->selected_line].entry);
}
exec_cmd(arg, run_in_term, rmpd->cmd_list[rmpd->selected_line].entry); exec_cmd(arg, run_in_term, rmpd->cmd_list[rmpd->selected_line].entry);
g_free(arg); g_free(arg);
} else { } else {
@ -466,7 +477,12 @@ static ModeMode run_mode_result(Mode *sw, int mretv, char **input,
} }
if ((mretv & MENU_OK) && rmpd->cmd_list[selected_line].entry != NULL) { if ((mretv & MENU_OK) && rmpd->cmd_list[selected_line].entry != NULL) {
char *earg = g_shell_quote(rmpd->cmd_list[selected_line].entry); char *earg = NULL;
if (rmpd->cmd_list[selected_line].from_history) {
earg = g_strdup(rmpd->cmd_list[selected_line].entry);
} else {
earg = g_shell_quote(rmpd->cmd_list[selected_line].entry);
}
if (!exec_cmd(earg, run_in_term, rmpd->cmd_list[selected_line].entry)) { if (!exec_cmd(earg, run_in_term, rmpd->cmd_list[selected_line].entry)) {
retv = RELOAD_DIALOG; retv = RELOAD_DIALOG;
} }