+#include "plugins/interface.h"
+#include "parser/parse.h"
+
#include <glib.h>
#include <gmodule.h>
-typedef void (*PluginStartup)();
-typedef void (*PluginShutdown)();
-
typedef struct {
GModule *module;
char *name;
+ PluginSetupConfig config;
PluginStartup startup;
PluginShutdown shutdown;
} Plugin;
-static gpointer load_sym(GModule *module, char *name, char *symbol)
+static gpointer load_sym(GModule *module, char *name, char *symbol,
+ gboolean allow_fail)
{
gpointer var;
if (!g_module_symbol(module, symbol, &var)) {
- g_warning("Failed to load symbol '%s' from plugin '%s'",
- symbol, name);
+ if (!allow_fail)
+ g_warning("Failed to load symbol '%s' from plugin '%s'",
+ symbol, name);
var = NULL;
}
return var;
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) {
+ g_warning(g_module_error());
g_free(p);
return NULL;
}
- p->startup = (PluginStartup)load_sym(p->module, name, "plugin_startup");
- p->shutdown = (PluginShutdown)load_sym(p->module, name, "plugin_shutdown");
+ p->config = (PluginSetupConfig)load_sym(p->module, name,
+ "plugin_setup_config", FALSE);
+ p->startup = (PluginStartup)load_sym(p->module, name, "plugin_startup",
+ FALSE);
+ p->shutdown = (PluginShutdown)load_sym(p->module, name, "plugin_shutdown",
+ FALSE);
- 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_datalist_clear(&plugins);
}
-gboolean plugin_open(char *name)
+gboolean plugin_open_full(char *name, gboolean reopen, ObParseInst *i)
{
Plugin *p;
if (g_datalist_get_data(&plugins, name) != NULL) {
- g_warning("plugin '%s' already loaded, can't load again", name);
+ if (!reopen)
+ g_warning("plugin '%s' already loaded, can't load again", name);
return TRUE;
}
g_warning("failed to load plugin '%s'", name);
return FALSE;
}
- /* XXX p->plugin_set_config(); */
+ p->config(i);
- g_datalist_set_data_full(&plugins, name, p, (GDestroyNotify) plugin_free);
+ g_datalist_set_data_full(&plugins, name, p, (GDestroyNotify) plugin_free);
return TRUE;
}
+gboolean plugin_open(char *name, ObParseInst *i) {
+ return plugin_open_full(name, FALSE, i);
+}
+
+gboolean plugin_open_reopen(char *name, ObParseInst *i) {
+ return plugin_open_full(name, TRUE, i);
+}
+
void plugin_close(char *name)
{
g_datalist_remove_data(&plugins, name);
g_datalist_foreach(&plugins, (GDataForeachFunc)foreach_start, NULL);
}
-void plugin_loadall()
+void plugin_loadall(ObParseInst *i)
{
GIOChannel *io;
GError *err;
if (io == NULL) {
/* load the default plugins */
- plugin_open("focus");
- plugin_open("keyboard");
- plugin_open("mouse");
- plugin_open("placement");
- plugin_open("resistance");
+ plugin_open("placement", i);
+
+ /* XXX rm me when the parser loads me magically */
+ plugin_open("client_menu", i);
+ plugin_open("client_list_menu", i);
} else {
/* load the plugins in the rc file */
while (g_io_channel_read_line(io, &name, NULL, NULL, &err) ==
G_IO_STATUS_NORMAL) {
- plugin_open(name);
+ g_strstrip(name);
+ if (name[0] != '\0' && name[0] != '#')
+ plugin_open(name, i);
g_free(name);
}
g_io_channel_unref(io);