#include <glib.h>
#include <gmodule.h>
+typedef void (*PluginSetupConfig)();
typedef void (*PluginStartup)();
typedef void (*PluginShutdown)();
GModule *module;
char *name;
+ PluginSetupConfig config;
PluginStartup startup;
PluginShutdown shutdown;
} Plugin;
p = g_new(Plugin, 1);
- path = g_build_filename(PLUGINDIR, name, NULL);
+ path = g_build_filename(g_get_home_dir(), ".openbox", "plugins", name,
+ NULL);
p->module = g_module_open(path, 0);
g_free(path);
if (p->module == NULL) {
- path = g_build_filename(g_get_home_dir(), ".openbox", "plugins", name,
- NULL);
- p->module = g_module_open(path, 0);
- g_free(path);
+ path = g_build_filename(PLUGINDIR, name, NULL);
+ p->module = g_module_open(path, 0);
+ g_free(path);
}
if (p->module == NULL) {
return NULL;
}
+ p->config = (PluginSetupConfig)load_sym(p->module, name,
+ "plugin_setup_config");
p->startup = (PluginStartup)load_sym(p->module, name, "plugin_startup");
p->shutdown = (PluginShutdown)load_sym(p->module, name, "plugin_shutdown");
- if (p->startup == NULL || p->shutdown == NULL) {
+ if (p->config == NULL || p->startup == NULL || p->shutdown == NULL) {
g_module_close(p->module);
g_free(p);
return NULL;
g_warning("failed to load plugin '%s'", name);
return FALSE;
}
- /* XXX p->plugin_set_config(); */
+ p->config();
- g_datalist_set_data_full(&plugins, name, p, (GDestroyNotify) plugin_free);
+ g_datalist_set_data_full(&plugins, name, p, (GDestroyNotify) plugin_free);
return TRUE;
}
/* load the plugins in the rc file */
while (g_io_channel_read_line(io, &name, NULL, NULL, &err) ==
G_IO_STATUS_NORMAL) {
+ g_strstrip(name);
plugin_open(name);
g_free(name);
}