Modularized modes and separated them into their own source files

Debug/makefile

@@ -10,6 +10,7 @@ RM := rm -rf
 -include sources.mk
 -include src/subdir.mk
 -include proto/subdir.mk
+-include modes/subdir.mk
 -include subdir.mk
 -include objects.mk
 
@@ -30,7 +31,7 @@ all: wofi
 wofi: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc -fsanitize=address -pthread -o "wofi" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc -fsanitize=address -rdynamic -pthread -o "wofi" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

Debug/modes/subdir.mk

@@ -0,0 +1,30 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../modes/dmenu.c \
+../modes/drun.c \
+../modes/run.c 
+
+OBJS += \
+./modes/dmenu.o \
+./modes/drun.o \
+./modes/run.o 
+
+C_DEPS += \
+./modes/dmenu.d \
+./modes/drun.d \
+./modes/run.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+modes/%.o: ../modes/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -D_GNU_SOURCE -I../inc -O0 -g3 -Wall -Wextra -c -fmessage-length=0 -fsanitize=address `pkg-config --cflags gtk+-3.0` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

Debug/objects.mk

@@ -4,5 +4,5 @@
 
 USER_OBJS :=
 
-LIBS := -lgtk-3 -lgdk-3 -lgio-2.0 -lglib-2.0 -lgobject-2.0 -lwayland-client -lgdk_pixbuf-2.0
+LIBS := -ldl -lgtk-3 -lgdk-3 -lgio-2.0 -lglib-2.0 -lgobject-2.0 -lwayland-client -lgdk_pixbuf-2.0
 

Debug/sources.mk

@@ -13,6 +13,7 @@ C_DEPS :=
 
 # Every subdirectory with source files must be described here
 SUBDIRS := \
+modes \
 proto \
 src \
 

Release/makefile

@@ -10,6 +10,7 @@ RM := rm -rf
 -include sources.mk
 -include src/subdir.mk
 -include proto/subdir.mk
+-include modes/subdir.mk
 -include subdir.mk
 -include objects.mk
 
@@ -30,7 +31,7 @@ all: wofi
 wofi: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc -pthread -o "wofi" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc -rdynamic -pthread -o "wofi" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

Release/modes/subdir.mk

@@ -0,0 +1,30 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../modes/dmenu.c \
+../modes/drun.c \
+../modes/run.c 
+
+OBJS += \
+./modes/dmenu.o \
+./modes/drun.o \
+./modes/run.o 
+
+C_DEPS += \
+./modes/dmenu.d \
+./modes/drun.d \
+./modes/run.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+modes/%.o: ../modes/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -D_GNU_SOURCE -I../inc -O3 -Wall -Wextra -c -fmessage-length=0 `pkg-config --cflags gtk+-3.0` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

Release/objects.mk

@@ -4,5 +4,5 @@
 
 USER_OBJS :=
 
-LIBS := -lgtk-3 -lgdk-3 -lgio-2.0 -lglib-2.0 -lgobject-2.0 -lwayland-client -lgdk_pixbuf-2.0
+LIBS := -ldl -lgtk-3 -lgdk-3 -lgio-2.0 -lglib-2.0 -lgobject-2.0 -lwayland-client -lgdk_pixbuf-2.0
 

Release/sources.mk

@@ -13,6 +13,7 @@ C_DEPS :=
 
 # Every subdirectory with source files must be described here
 SUBDIRS := \
+modes \
 proto \
 src \
 

inc/wofi.h

@@ -22,6 +22,7 @@
 #include <config.h>
 #include <property_box.h>
 
+#include <dlfcn.h>
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
@@ -35,5 +36,18 @@
 #include <wayland-client.h>
 #include <wlr-layer-shell-unstable-v1-client-protocol.h>
 
+struct cache_line {
+	char* line;
+	struct wl_list link;
+};
+
 void wofi_init(struct map* config);
+
+struct wl_list* wofi_read_cache(char* mode);
+
+void wofi_insert_widget(char* text, char* action);
+
+bool wofi_allow_images();
+
+uint64_t wofi_get_image_size();
 #endif

modes/dmenu.c

@@ -0,0 +1,58 @@
+/*
+ *  Copyright (C) 2019 Scoopta
+ *  This file is part of Wofi
+ *  Wofi is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Wofi is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Wofi.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <wofi.h>
+
+void dmenu_init() {
+	struct map* cached = map_init();
+	struct wl_list* cache = wofi_read_cache("dmenu");
+
+	struct cache_line* node, *tmp;
+	wl_list_for_each_safe(node, tmp, cache, link) {
+		wofi_insert_widget(node->line, node->line);
+		map_put(cached, node->line, "true");
+		free(node->line);
+		wl_list_remove(&node->link);
+		free(node);
+	}
+
+	free(cache);
+
+	char* line;
+	size_t size = 0;
+	while(getline(&line, &size, stdin) != -1) {
+		char* lf = strchr(line, '\n');
+		if(lf != NULL) {
+			*lf = 0;
+		}
+		if(map_contains(cached, line)) {
+			continue;
+		}
+		wofi_insert_widget(line, line);
+	}
+	free(line);
+	map_free(cached);
+}
+
+void dmenu_exec(const gchar* cmd) {
+	printf("%s\n", cmd);
+	exit(0);
+}
+
+bool dmenu_exec_search() {
+	return true;
+}

modes/drun.c

@@ -0,0 +1,138 @@
+/*
+ *  Copyright (C) 2019 Scoopta
+ *  This file is part of Wofi
+ *  Wofi is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Wofi is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Wofi.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <wofi.h>
+
+static char* get_text(char* file) {
+	GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(file);
+	if(info == NULL || g_desktop_app_info_get_is_hidden(info) || g_desktop_app_info_get_nodisplay(info)) {
+		return NULL;
+	}
+	const char* name = g_app_info_get_display_name(G_APP_INFO(info));
+	if(name == NULL) {
+		return NULL;
+	}
+	if(wofi_allow_images()) {
+		GIcon* icon = g_app_info_get_icon(G_APP_INFO(info));
+		if(G_IS_THEMED_ICON(icon)) {
+			GtkIconTheme* theme = gtk_icon_theme_get_default();
+			const gchar* const* icon_names = g_themed_icon_get_names(G_THEMED_ICON(icon));
+			GtkIconInfo* info = gtk_icon_theme_choose_icon(theme, (const gchar**) icon_names, wofi_get_image_size(), 0);
+			if(info == NULL) {
+				return utils_concat(2, "text:", name);
+			} else {
+				const gchar* icon_path = gtk_icon_info_get_filename(info);
+				return utils_concat(4, "img:", icon_path, ":text:", name);
+			}
+		} else {
+			return utils_concat(2, "text:", name);
+		}
+	} else {
+		return strdup(name);
+	}
+}
+
+void drun_init() {
+	struct map* cached = map_init();
+	struct wl_list* cache = wofi_read_cache("drun");
+
+	struct cache_line* node, *tmp;
+	wl_list_for_each_safe(node, tmp, cache, link) {
+		char* text = get_text(node->line);
+		if(text == NULL) {
+			goto cache_cont;
+		}
+		wofi_insert_widget(text, node->line);
+		map_put(cached, node->line, "true");
+		free(text);
+
+		cache_cont:
+		free(node->line);
+		wl_list_remove(&node->link);
+		free(node);
+	}
+
+	free(cache);
+
+	char* data_home = getenv("XDG_DATA_HOME");
+	if(data_home == NULL) {
+		data_home = utils_concat(2, getenv("HOME"), "/.local/share");
+	} else {
+		data_home = strdup(data_home);
+	}
+	char* data_dirs = getenv("XDG_DATA_DIRS");
+	if(data_dirs == NULL) {
+		data_dirs = "/usr/local/share:/usr/share";
+	}
+	char* dirs = utils_concat(3, data_home, ":", data_dirs);
+	char* original_dirs = dirs;
+	free(data_home);
+
+	size_t colon_count = utils_split(dirs, ':');
+	for(size_t count = 0; count < colon_count; ++count) {
+		char* app_dir = utils_concat(2, dirs, "/applications");
+		DIR* dir = opendir(app_dir);
+		if(dir == NULL) {
+			goto cont;
+		}
+		struct dirent* entry;
+		while((entry = readdir(dir)) != NULL) {
+			if(strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
+				continue;
+			}
+			char* full_path = utils_concat(3, app_dir, "/", entry->d_name);
+			if(map_contains(cached, full_path)) {
+				free(full_path);
+				continue;
+			}
+			char* text = get_text(full_path);
+			if(text == NULL) {
+				free(full_path);
+				continue;
+			}
+			wofi_insert_widget(text, full_path);
+			free(text);
+			free(full_path);
+		}
+		closedir(dir);
+		cont:
+		dirs += strlen(dirs) + 1;
+		free(app_dir);
+	}
+	free(original_dirs);
+	map_free(cached);
+}
+
+static void launch_done(GObject* obj, GAsyncResult* result, gpointer data) {
+	if(g_app_info_launch_uris_finish(G_APP_INFO(obj), result, NULL)) {
+		exit(0);
+	} else {
+		char* cmd = data;
+		fprintf(stderr, "%s cannot be executed\n", cmd);
+		exit(1);
+	}
+}
+
+void drun_exec(const gchar* cmd) {
+	GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(cmd);
+	if(G_IS_DESKTOP_APP_INFO(info)) {
+		g_app_info_launch_uris_async(G_APP_INFO(info), NULL, NULL, NULL, launch_done, (gchar*) cmd);
+	} else {
+		fprintf(stderr, "%s cannot be executed\n", cmd);
+		exit(1);
+	}
+}

modes/run.c

@@ -0,0 +1,69 @@
+/*
+ *  Copyright (C) 2019 Scoopta
+ *  This file is part of Wofi
+ *  Wofi is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Wofi is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Wofi.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <wofi.h>
+
+void run_init() {
+	struct map* cached = map_init();
+	struct wl_list* cache = wofi_read_cache("run");
+
+	struct cache_line* node, *tmp;
+	wl_list_for_each_safe(node, tmp, cache, link) {
+		char* text = strrchr(node->line, '/') + 1;
+		wofi_insert_widget(text, node->line);
+		map_put(cached, node->line, "true");
+		free(node->line);
+		wl_list_remove(&node->link);
+		free(node);
+	}
+
+	free(cache);
+
+	char* path = strdup(getenv("PATH"));
+	char* original_path = path;
+	size_t colon_count = utils_split(path, ':');
+	for(size_t count = 0; count < colon_count; ++count) {
+		DIR* dir = opendir(path);
+		if(dir == NULL) {
+			goto cont;
+		}
+		struct dirent* entry;
+		while((entry = readdir(dir)) != NULL) {
+			if(strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
+				continue;
+			}
+			char* full_path = utils_concat(3, path, "/", entry->d_name);
+			struct stat info;
+			stat(full_path, &info);
+			if(access(full_path, X_OK) == 0 && S_ISREG(info.st_mode) && !map_contains(cached, full_path)) {
+				wofi_insert_widget(entry->d_name, full_path);
+			}
+			free(full_path);
+		}
+		closedir(dir);
+		cont:
+		path += strlen(path) + 1;
+	}
+	free(original_path);
+	map_free(cached);
+}
+
+void run_exec(const gchar* cmd) {
+	execl(cmd, cmd, NULL);
+	fprintf(stderr, "%s cannot be executed\n", cmd);
+	exit(errno);
+}

src/main.c

@@ -415,6 +415,9 @@ int main(int argc, char** argv) {
 		fprintf(stderr, "I need a mode, please give me a mode, that's what --show is for\n");
 		exit(1);
 	}
+
+	map_put(config, "config_dir", CONFIG_LOCATION);
+
 	if(width != NULL) {
 		map_put(config, "width", width);
 	}

src/wofi.c

@@ -28,15 +28,12 @@ static int64_t filter_rate;
 static bool allow_images, allow_markup;
 static uint64_t image_size;
 static char* cache_file = NULL;
+static char* config_dir;
+static void (*mode_exec)(const gchar* cmd);
+static bool (*exec_search)();
 
 struct node {
 	char* text, *action;
-	GtkContainer* container;
-};
-
-struct cache_line {
-	char* line;
-	struct wl_list link;
 };
 
 static void nop() {}
@@ -146,7 +143,7 @@ static GtkWidget* create_label(char* text, char* action) {
 static gboolean _insert_widget(gpointer data) {
 	struct node* node = data;
 	GtkWidget* box = create_label(node->text, node->action);
-	gtk_container_add(node->container, box);
+	gtk_container_add(GTK_CONTAINER(inner_box), box);
 	gtk_widget_show_all(box);
 
 	free(node->text);
@@ -168,7 +165,7 @@ static char* get_cache_path(char* mode) {
 	return cache_path;
 }
 
-static struct wl_list* read_cache(char* mode) {
+struct wl_list* wofi_read_cache(char* mode) {
 	char* cache_path = get_cache_path(mode);
 	struct wl_list* cache = malloc(sizeof(struct wl_list));
 	wl_list_init(cache);
@@ -191,186 +188,39 @@ static struct wl_list* read_cache(char* mode) {
 		fclose(file);
 	}
 	while(wl_list_length(&lines) > 0) {
-		uint64_t largest = 0;
+		uint64_t smallest = UINT64_MAX;
-		struct cache_line* node, *largest_node = NULL;
+		struct cache_line* node, *smallest_node = NULL;
 		wl_list_for_each(node, &lines, link) {
 			uint64_t num = strtol(node->line, NULL, 10);
-			if(num > largest) {
+			if(num < smallest) {
-				largest = num;
+				smallest = num;
-				largest_node = node;
+				smallest_node = node;
 			}
 		}
-		wl_list_remove(&largest_node->link);
+		char* tmp = strdup(strchr(smallest_node->line, ' ') + 1);
-		wl_list_insert(cache, &largest_node->link);
+		free(smallest_node->line);
+		smallest_node->line = tmp;
+		wl_list_remove(&smallest_node->link);
+		wl_list_insert(cache, &smallest_node->link);
 	}
 	free(cache_path);
 	return cache;
 }
 
-static void insert_widget(char* text, char* action, GtkContainer* container) {
+void wofi_insert_widget(char* text, char* action) {
 	struct node* widget = malloc(sizeof(struct node));
-	widget->text = text;
+	widget->text = strdup(text);
-	widget->action = action;
+	widget->action = strdup(action);
-	widget->container = container;
 	g_idle_add(_insert_widget, widget);
 	utils_sleep_millis(1);
 }
 
-static struct map* load_cache(char* mode) {
+bool wofi_allow_images() {
-	struct map* cached = map_init();
+	return allow_images;
-	struct wl_list* cache = read_cache(mode);
-	struct cache_line* node, *tmp;
-	wl_list_for_each_reverse_safe(node, tmp, cache, link) {
-		char* text = NULL;
-		char* action = action = strchr(node->line, ' ') + 1;
-		if(strcmp(mode, "run") == 0) {
-			text = strrchr(node->line, '/');
-		}
-		if(text == NULL) {
-			text = action;
-		} else {
-			++text;
-		}
-		map_put(cached, action, "true");
-		insert_widget(strdup(text), strdup(action), GTK_CONTAINER(inner_box));
-		free(node->line);
-		wl_list_remove(&node->link);
-		free(node);
-	}
-	free(cache);
-	return cached;
 }
 
-static void* do_run(void* data) {
+uint64_t wofi_get_image_size() {
-	(void) data;
+	return image_size;
-	struct map* cached = load_cache("run");
-	char* path = strdup(getenv("PATH"));
-	char* original_path = path;
-	size_t colon_count = utils_split(path, ':');
-	for(size_t count = 0; count < colon_count; ++count) {
-		DIR* dir = opendir(path);
-		if(dir == NULL) {
-			goto cont;
-		}
-		struct dirent* entry;
-		while((entry = readdir(dir)) != NULL) {
-			if(strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
-				continue;
-			}
-			char* full_path = utils_concat(3, path, "/", entry->d_name);
-			struct stat info;
-			stat(full_path, &info);
-			if(access(full_path, X_OK) == 0 && S_ISREG(info.st_mode) && !map_contains(cached, full_path)) {
-				insert_widget(strdup(entry->d_name), strdup(full_path), GTK_CONTAINER(inner_box));
-			}
-			free(full_path);
-		}
-		closedir(dir);
-		cont:
-		path += strlen(path) + 1;
-	}
-	free(original_path);
-	map_free(cached);
-	return NULL;
-}
-
-static void* do_dmenu(void* data) {
-	(void) data;
-	struct map* cached = load_cache("dmenu");
-	char* line;
-	size_t size = 0;
-	while(getline(&line, &size, stdin) != -1) {
-		char* lf = strchr(line, '\n');
-		if(lf != NULL) {
-			*lf = 0;
-		}
-		if(map_contains(cached, line)) {
-			continue;
-		}
-		insert_widget(strdup(line), strdup(line), GTK_CONTAINER(inner_box));
-	}
-	free(line);
-	return NULL;
-}
-
-static void* do_drun(void* data) {
-	(void) data;
-	char* data_home = getenv("XDG_DATA_HOME");
-	if(data_home == NULL) {
-		data_home = utils_concat(2, getenv("HOME"), "/.local/share");
-	} else {
-		data_home = strdup(data_home);
-	}
-	char* data_dirs = getenv("XDG_DATA_DIRS");
-	if(data_dirs == NULL) {
-		data_dirs = "/usr/local/share:/usr/share";
-	}
-	char* dirs = utils_concat(3, data_home, ":", data_dirs);
-	char* original_dirs = dirs;
-	free(data_home);
-
-	size_t colon_count = utils_split(dirs, ':');
-	for(size_t count = 0; count < colon_count; ++count) {
-		char* app_dir = utils_concat(2, dirs, "/applications");
-		DIR* dir = opendir(app_dir);
-		if(dir == NULL) {
-			goto cont;
-		}
-		struct dirent* entry;
-		while((entry = readdir(dir)) != NULL) {
-			if(strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
-				continue;
-			}
-			char* full_path = utils_concat(3, app_dir, "/", entry->d_name);
-			GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(full_path);
-			if(info == NULL || g_desktop_app_info_get_is_hidden(info) || g_desktop_app_info_get_nodisplay(info)) {
-				free(full_path);
-				continue;
-			}
-			const char* name = g_app_info_get_display_name(G_APP_INFO(info));
-			if(name == NULL) {
-				free(full_path);
-				continue;
-			}
-			char* text;
-			GIcon* icon = g_app_info_get_icon(G_APP_INFO(info));
-			if(allow_images) {
-				if(G_IS_THEMED_ICON(icon)) {
-					GtkIconTheme* theme = gtk_icon_theme_get_default();
-					const gchar* const* icon_names = g_themed_icon_get_names(G_THEMED_ICON(icon));
-					GtkIconInfo* info = gtk_icon_theme_choose_icon(theme, (const gchar**) icon_names, image_size, 0);
-					if(info == NULL) {
-						text = utils_concat(2, "text:", name);
-					} else {
-						const gchar* icon_path = gtk_icon_info_get_filename(info);
-						text = utils_concat(4, "img:", icon_path, ":text:", name);
-					}
-				} else {
-					text = utils_concat(2, "text:", name);
-				}
-			} else {
-				text = strdup(name);
-			}
-			insert_widget(text, strdup(full_path), GTK_CONTAINER(inner_box));
-			free(full_path);
-		}
-		closedir(dir);
-		cont:
-		dirs += strlen(dirs) + 1;
-		free(app_dir);
-	}
-	free(original_dirs);
-	return NULL;
-}
-
-static void drun_launch_done(GObject* obj, GAsyncResult* result, gpointer data) {
-	if(g_app_info_launch_uris_finish(G_APP_INFO(obj), result, NULL)) {
-		exit(0);
-	} else {
-		char* cmd = data;
-		fprintf(stderr, "%s cannot be executed\n", cmd);
-		exit(1);
-	}
 }
 
 static void execute_action(char* mode, const gchar* cmd) {
@@ -416,22 +266,7 @@ static void execute_action(char* mode, const gchar* cmd) {
 	fclose(file);
 
 	free(cache_path);
-	if(strcmp(mode, "run") == 0) {
+	mode_exec(cmd);
-		execl(cmd, cmd, NULL);
-		fprintf(stderr, "%s cannot be executed\n", cmd);
-		exit(errno);
-	} else if(strcmp(mode, "dmenu") == 0) {
-		printf("%s\n", cmd);
-		exit(0);
-	} else if(strcmp(mode, "drun") == 0) {
-		GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(cmd);
-		if(G_IS_DESKTOP_APP_INFO(info)) {
-			g_app_info_launch_uris_async(G_APP_INFO(info), NULL, NULL, NULL, drun_launch_done, (gchar*) cmd);
-		} else {
-			fprintf(stderr, "%s cannot be executed\n", cmd);
-			exit(1);
-		}
-	}
 }
 
 static void activate_item(GtkFlowBox* flow_box, GtkFlowBoxChild* row, gpointer data) {
@@ -455,7 +290,7 @@ static void select_item(GtkFlowBox* flow_box, gpointer data) {
 
 static void activate_search(GtkEntry* entry, gpointer data) {
 	(void) data;
-	if(strcmp(mode, "dmenu") == 0) {
+	if(exec_search != NULL && exec_search()) {
 		execute_action(mode, gtk_entry_get_text(entry));
 	} else {
 		GtkFlowBoxChild* row = gtk_flow_box_get_child_at_pos(GTK_FLOW_BOX(inner_box), 0, 0);
@@ -512,6 +347,43 @@ static gboolean key_press(GtkWidget* widget, GdkEvent* event, gpointer data) {
 	return FALSE;
 }
 
+static void* get_plugin_proc(const char* prefix, const char* suffix) {
+	char* proc_name = utils_concat(2, prefix, suffix);
+	void* proc = dlsym(RTLD_DEFAULT, proc_name);
+	free(proc_name);
+	return proc;
+}
+
+static void* start_thread(void* data) {
+	char* mode = data;
+	char* dso = strstr(mode, ".so");
+
+	void (*init)();
+	if(dso == NULL) {
+		init = get_plugin_proc(mode, "_init");
+		mode_exec = get_plugin_proc(mode, "_exec");
+		exec_search = get_plugin_proc(mode, "_exec_search");
+	} else {
+		char* plugins_dir = utils_concat(2, config_dir, "/plugins/");
+		char* full_name = utils_concat(2, plugins_dir, mode);
+		void* plugin = dlopen(full_name, RTLD_LAZY);
+		free(full_name);
+		free(plugins_dir);
+		init = dlsym(plugin, "init");
+		mode_exec = dlsym(plugin, "exec");
+		exec_search = dlsym(plugin, "exec_search");
+	}
+
+	if(init != NULL) {
+		init();
+	} else {
+		fprintf(stderr, "I would love to show %s but Idk what it is\n", mode);
+		exit(1);
+	}
+
+	return NULL;
+}
+
 void wofi_init(struct map* config) {
 	width = strtol(config_get(config, "width", "1000"), NULL, 10);
 	height = strtol(config_get(config, "height", "400"), NULL, 10);
@@ -529,6 +401,7 @@ void wofi_init(struct map* config) {
 	allow_markup = strcmp(config_get(config, "allow_markup", "false"), "true") == 0;
 	image_size = strtol(config_get(config, "image_size", "32"), NULL, 10);
 	cache_file = map_get(config, "cache_file");
+	config_dir = map_get(config, "config_dir");
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_realize(window);
@@ -592,16 +465,7 @@ void wofi_init(struct map* config) {
 	g_signal_connect(window, "key-press-event", G_CALLBACK(key_press), NULL);
 
 	pthread_t thread;
-	if(strcmp(mode, "run") == 0) {
+	pthread_create(&thread, NULL, start_thread, mode);
-		pthread_create(&thread, NULL, do_run, NULL);
-	} else if(strcmp(mode, "dmenu") == 0) {
-		pthread_create(&thread, NULL, do_dmenu, NULL);
-	} else if(strcmp(mode, "drun") == 0) {
-		pthread_create(&thread, NULL, do_drun, NULL);
-	} else {
-		fprintf(stderr, "I would love to show %s but Idk what it is\n", mode);
-		exit(1);
-	}
 	gtk_widget_grab_focus(entry);
 	gtk_window_set_title(GTK_WINDOW(window), prompt);
 	gtk_widget_show_all(window);