match the func prototypes in the header

[chaz/openbox] / openbox / plugin.c

diff --git a/openbox/plugin.c b/openbox/plugin.c
index 247d490a5faa03fe5b1c090f8cc6a6f33a2aae52..300cd82d478646d76a9d8660560b2b089fa16bf8 100644 (file)
--- a/openbox/plugin.c
+++ b/openbox/plugin.c
@@ -1,55 +1,66 @@
+#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;
+    gchar *name;
+
+    gboolean started;
 
+    PluginSetupConfig config;
     PluginStartup startup;
     PluginShutdown shutdown;
 } Plugin;
 
-static gpointer load_sym(GModule *module, char *name, char *symbol)
+static gpointer load_sym(GModule *module, gchar *name, gchar *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;
 }
 
-static Plugin *plugin_new(char *name)
+static Plugin *plugin_new(gchar *name)
 {
     Plugin *p;
-    char *path;
+    gchar *path;
    
     p = g_new(Plugin, 1);
+    p->started = FALSE;
 
-    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 = load_sym(p->module, name, "plugin_startup");
-    p->shutdown = 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;
@@ -80,27 +91,81 @@ void plugin_shutdown()
     g_datalist_clear(&plugins);
 }
 
-gboolean plugin_open(char *name)
+gboolean plugin_open(gchar *name, ObParseInst *i)
 {
     Plugin *p;
 
-    if (g_datalist_get_data(&plugins, name) != NULL) {
-        g_warning("plugin '%s' already loaded, can't load again", name);
+    if (g_datalist_get_data(&plugins, name) != NULL)
         return TRUE;
-    }
 
     p = plugin_new(name);
     if (p == NULL) {
         g_warning("failed to load plugin '%s'", name);
         return FALSE;
     }
+    p->config(i);
 
-    g_datalist_set_data_full(&plugins, name, p,  (GDestroyNotify) plugin_free);
-    p->startup();
+    g_datalist_set_data_full(&plugins, name, p, (GDestroyNotify) plugin_free);
     return TRUE;
 }
 
-void plugin_close(char *name)
+static void foreach_start(GQuark key, Plugin *p, gpointer *foo)
+{
+    if (!p->started) {
+        p->startup();
+        p->started = TRUE;
+    }
+}
+
+void plugin_startall()
+{
+    g_datalist_foreach(&plugins, (GDataForeachFunc)foreach_start, NULL);
+}
+
+void plugin_start(gchar *name)
+{
+    Plugin *p;
+
+    if (!(p = g_datalist_get_data(&plugins, name))) {
+        g_warning("Tried to start plugin '%s' but it is not loaded", name);
+        return;
+    }
+    if (!p->started) {
+        p->startup();
+        p->started = TRUE;
+    }
+}
+
+void plugin_loadall(ObParseInst *i)
 {
-    g_datalist_remove_data(&plugins, name);
+    GIOChannel *io;
+    GError *err;
+    gchar *path, *name;
+
+    path = g_build_filename(g_get_home_dir(), ".openbox", "pluginrc", NULL);
+    err = NULL;
+    io = g_io_channel_new_file(path, "r", &err);
+    g_free(path);
+
+    if (io == NULL) {
+        path = g_build_filename(RCDIR, "pluginrc", NULL);
+        err = NULL;
+        io = g_io_channel_new_file(path, "r", &err);
+        g_free(path);
+    }
+
+    if (io == NULL) {
+        /* load the default plugins */
+        plugin_open("placement", i);
+    } else {
+        /* 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);
+            if (name[0] != '\0' && name[0] != '#')
+                plugin_open(name, i);
+            g_free(name);
+        }
+        g_io_channel_unref(io);
+    }
 }