X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplugin.c;h=300cd82d478646d76a9d8660560b2b089fa16bf8;hb=fcdcd0fab4141d2d8bc1c156096ac5dbedbeaf61;hp=a47052e4d8a023d9595ed942545c18850a0d52c6;hpb=68eba18b7611856e0df2a10c08fde15522e6c572;p=chaz%2Fopenbox

diff --git a/openbox/plugin.c b/openbox/plugin.c
index a47052e4..300cd82d 100644
--- a/openbox/plugin.c
+++ b/openbox/plugin.c
@@ -1,24 +1,21 @@
+#include "plugins/interface.h"
+#include "parser/parse.h"
+
 #include <glib.h>
 #include <gmodule.h>
 
-typedef void (*PluginSetupConfig)();
-typedef void (*PluginStartup)();
-typedef void (*PluginShutdown)();
-typedef void *(*PluginCreate)(/* TODO */);
-typedef void (*PluginDestroy)(void *);
-
 typedef struct {
     GModule *module;
-    char *name;
+    gchar *name;
+
+    gboolean started;
 
     PluginSetupConfig config;
     PluginStartup startup;
     PluginShutdown shutdown;
-    PluginCreate create;
-    PluginDestroy destroy;
 } 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;
@@ -31,12 +28,13 @@ static gpointer load_sym(GModule *module, char *name, char *symbol,
     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(g_get_home_dir(), ".openbox", "plugins", name,
                             NULL);
@@ -61,9 +59,6 @@ static Plugin *plugin_new(char *name)
 					 FALSE);
     p->shutdown = (PluginShutdown)load_sym(p->module, name, "plugin_shutdown",
 					   FALSE);
-    p->create = (PluginCreate)load_sym(p->module, name, "plugin_create", TRUE);
-    p->destroy = (PluginDestroy)load_sym(p->module, name, "plugin_destroy",
-					 TRUE);
 
     if (p->config == NULL || p->startup == NULL || p->shutdown == NULL) {
         g_module_close(p->module);
@@ -96,43 +91,30 @@ void plugin_shutdown()
     g_datalist_clear(&plugins);
 }
 
-gboolean plugin_open_full(char *name, gboolean reopen)
+gboolean plugin_open(gchar *name, ObParseInst *i)
 {
     Plugin *p;
 
-    if (g_datalist_get_data(&plugins, name) != NULL) {
-	if (!reopen) 
-	    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();
+    p->config(i);
 
     g_datalist_set_data_full(&plugins, name, p, (GDestroyNotify) plugin_free);
     return TRUE;
 }
 
-gboolean plugin_open(char *name) {
-    return plugin_open_full(name, FALSE);
-}
-
-gboolean plugin_open_reopen(char *name) {
-    return plugin_open_full(name, TRUE);
-}
-
-void plugin_close(char *name)
-{
-    g_datalist_remove_data(&plugins, name);
-}
-
 static void foreach_start(GQuark key, Plugin *p, gpointer *foo)
 {
-    p->startup();
+    if (!p->started) {
+        p->startup();
+        p->started = TRUE;
+    }
 }
 
 void plugin_startall()
@@ -140,11 +122,25 @@ void plugin_startall()
     g_datalist_foreach(&plugins, (GDataForeachFunc)foreach_start, NULL);
 }
 
-void plugin_loadall()
+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)
 {
     GIOChannel *io;
     GError *err;
-    char *path, *name;
+    gchar *path, *name;
 
     path = g_build_filename(g_get_home_dir(), ".openbox", "pluginrc", NULL);
     err = NULL;
@@ -160,60 +156,16 @@ void plugin_loadall()
 
     if (io == NULL) {
         /* load the default plugins */
-        plugin_open("keyboard");
-        plugin_open("mouse");
-        plugin_open("placement");
-        plugin_open("resistance");
-
-        /* XXX rm me when the parser loads me magically */
-        plugin_open("client_menu");
+        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);
+                plugin_open(name, i);
             g_free(name);
         }
         g_io_channel_unref(io);
     }
 }
-
-void *plugin_create(char *name /* TODO */)
-{
-    Plugin *p = (Plugin *)g_datalist_get_data(&plugins, name);
-
-    if (p == NULL) {
-	g_warning("Unable to find plugin for create: %s", name);
-	return NULL;
-    }
-
-    if (p->create == NULL || p->destroy == NULL) {
-	g_critical("Unsupported create/destroy: %s", name);
-	return NULL;
-    }
-
-    return p->create();
-}
-
-void plugin_destroy(char *name, void *data)
-{
-    Plugin *p = (Plugin *)g_datalist_get_data(&plugins, name);
-
-    if (p == NULL) {
-	g_critical("Unable to find plugin for destroy: %s", name);
-	/* really shouldn't happen, but attempt to free something anyway? */
-	g_free(data);
-	return;
-    }
-
-    if (p->destroy == NULL || p->create == NULL) {
-	g_critical("Unsupported create/destroy: %s", name);
-	/* really, really shouldn't happen, but attempt to free anyway? */
-	g_free(data);
-	return;
-    }
-
-    p->destroy(data);
-}