X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplugin.c;h=c3e21ec49c81fcf29a60ab7d963d36c5653e0cf1;hb=3d6e0f941d36ff335ad13ecf83405a40775e4c04;hp=d4c19b12081d529059b8aa390418cb7a0fdca95b;hpb=4ed3fb89150d05e6fa134798315269c62de1bed9;p=chaz%2Fopenbox

diff --git a/openbox/plugin.c b/openbox/plugin.c
index d4c19b12..c3e21ec4 100644
--- a/openbox/plugin.c
+++ b/openbox/plugin.c
@@ -1,6 +1,7 @@
 #include <glib.h>
 #include <gmodule.h>
 
+typedef void (*PluginSetupConfig)();
 typedef void (*PluginStartup)();
 typedef void (*PluginShutdown)();
 
@@ -8,15 +9,19 @@ typedef struct {
     GModule *module;
     char *name;
 
+    PluginSetupConfig config;
     PluginStartup startup;
     PluginShutdown shutdown;
 } Plugin;
 
 static gpointer load_sym(GModule *module, char *name, char *symbol)
 {
-    gpointer var = NULL;
-    if (!g_module_symbol(module, symbol, &var))
-        g_warning("Failed to load symbol '%s' from plugin '%s'", symbol, name);
+    gpointer var;
+    if (!g_module_symbol(module, symbol, &var)) {
+        g_warning("Failed to load symbol '%s' from plugin '%s'",
+                  symbol, name);
+        var = NULL;
+    }
     return var;
 }
 
@@ -27,26 +32,29 @@ static Plugin *plugin_new(char *name)
    
     p = g_new(Plugin, 1);
 
-    path = g_build_filename(PLUGINDIR, name, NULL);
-    p->module = g_module_open(path, G_MODULE_BIND_LAZY);
+    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, G_MODULE_BIND_LAZY);
-	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, "startup");
-    p->shutdown = load_sym(p->module, name, "shutdown");
+    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;
@@ -91,9 +99,9 @@ gboolean plugin_open(char *name)
         g_warning("failed to load plugin '%s'", name);
         return FALSE;
     }
+    p->config();
 
-    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;
 }
 
@@ -101,3 +109,50 @@ void plugin_close(char *name)
 {
     g_datalist_remove_data(&plugins, name);
 }
+
+static void foreach_start(GQuark key, Plugin *p, gpointer *foo)
+{
+    p->startup();
+}
+
+void plugin_startall()
+{
+    g_datalist_foreach(&plugins, (GDataForeachFunc)foreach_start, NULL);
+}
+
+void plugin_loadall()
+{
+    GIOChannel *io;
+    GError *err;
+    char *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("keyboard");
+        plugin_open("mouse");
+        plugin_open("placement");
+        plugin_open("resistance");
+    } 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);
+            g_free(name);
+        }
+        g_io_channel_unref(io);
+    }
+}