TnSb/wofi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parsing image escapes and markup will only occur if their respective options are enabled

Browse Source
This commit is contained in:
Scoopta 2019-12-16 19:38:12 -08:00
parent c248461260
commit 8594fc52a3
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/wofi.h
View File

@ -54,6 +54,8 @@ void wofi_insert_widget(char* mode, char** text, char* search_text, char** actio
bool wofi_allow_images(); bool wofi_allow_images();
bool wofi_allow_markup();
uint64_t wofi_get_image_size(); uint64_t wofi_get_image_size();
bool wofi_mod_shift(); bool wofi_mod_shift();

16
modes/dmenu.c
View File

@ -59,12 +59,16 @@ void wofi_dmenu_init(struct map* config) {
void wofi_dmenu_exec(const gchar* cmd) { void wofi_dmenu_exec(const gchar* cmd) {
char* action = strdup(cmd); char* action = strdup(cmd);
if(parse_action) { if(parse_action) {
free(action); if(wofi_allow_images()) {
action = wofi_parse_image_escapes(cmd); free(action);
char* out; action = wofi_parse_image_escapes(cmd);
pango_parse_markup(action, -1, 0, NULL, &out, NULL, NULL); }
free(action); if(wofi_allow_markup()) {
action = out; char* out;
pango_parse_markup(action, -1, 0, NULL, &out, NULL, NULL);
free(action);
action = out;
}
} }
wofi_write_cache(MODE, cmd); wofi_write_cache(MODE, cmd);
printf("%s\n", action); printf("%s\n", action);

21
src/wofi.c
View File

@ -235,11 +235,18 @@ static GtkWidget* create_label(char* mode, char* text, char* search_text, char*
gtk_container_add(GTK_CONTAINER(box), label); gtk_container_add(GTK_CONTAINER(box), label);
} }
if(parse_search) { if(parse_search) {
search_text = parse_images(WOFI_PROPERTY_BOX(box), search_text, false); search_text = strdup(search_text);
char* out; if(allow_images) {
pango_parse_markup(search_text, -1, 0, NULL, &out, NULL, NULL); char* tmp = search_text;
free(search_text); search_text = parse_images(WOFI_PROPERTY_BOX(box), search_text, false);
search_text = out; free(tmp);
}
if(allow_markup) {
char* out;
pango_parse_markup(search_text, -1, 0, NULL, &out, NULL, NULL);
free(search_text);
search_text = out;
}
} }
wofi_property_box_add_property(WOFI_PROPERTY_BOX(box), "filter", search_text); wofi_property_box_add_property(WOFI_PROPERTY_BOX(box), "filter", search_text);
if(parse_search) { if(parse_search) {
@ -433,6 +440,10 @@ bool wofi_allow_images() {
return allow_images; return allow_images;
} }
bool wofi_allow_markup() {
return allow_markup;
}
uint64_t wofi_get_image_size() { uint64_t wofi_get_image_size() {
return image_size; return image_size;
} }