Changeset 1208 for libcaca/trunk/caca/caca.cTweet

Timestamp:

Oct 20, 2006, 12:43:17 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Added a --enable-plugins configure flag that builds the GL and X11 drivers as plugins. This way, libcaca does not directly depend on those libraries.

File:

• libcaca/trunk/caca/caca.c (modified) (6 diffs)

libcaca/trunk/caca/caca.c

@@ -24 +24 @@
 #   include <stdlib.h>
 #   include <string.h>
+#   include <stdio.h>
 #   if defined(HAVE_ERRNO_H)
 #       include <errno.h>
+#   endif
+#   if defined(USE_PLUGINS)
+#       if defined(HAVE_DLFCN_H)
+#           include <dlfcn.h>
+#       endif
 #   endif
 #endif
@@ -34 +40 @@
 #include "caca_internals.h"
 
-static int caca_select_driver(caca_display_t *dp);
+#if defined(USE_PLUGINS)
+#   define gl_install(p) caca_plugin_install("gl", p)
+#   define x11_install(p) caca_plugin_install("x11", p)
+#endif
+
+static int caca_select_driver(caca_display_t *);
+#if defined(USE_PLUGINS)
+static int caca_plugin_install(char const *, caca_display_t *);
+#endif
 
 /** \brief Attach a caca graphical context to a cucul canvas.
@@ -63 +77 @@
 
     dp->cv = cv;
+#if defined(USE_PLUGINS)
+    dp->plugin = NULL;
+#endif
 
     if(caca_select_driver(dp))
     {
+#if defined(USE_PLUGINS)
+        if(dp->plugin)
+            dlclose(dp->plugin);
+#endif
         free(dp);
 #if defined(HAVE_ERRNO_H)
@@ -75 +96 @@
     if(dp->drv.init_graphics(dp))
     {
+#if defined(USE_PLUGINS)
+        if(dp->plugin)
+            dlclose(dp->plugin);
+#endif
         free(dp);
 #if defined(HAVE_ERRNO_H)
@@ -129 +154 @@
 {
     dp->drv.end_graphics(dp);
+#if defined(USE_PLUGINS)
+    if(dp->plugin)
+        dlclose(dp->plugin);
+#endif
     dp->cv->refcount--;
     free(dp);
@@ -202 +231 @@
 }
 
+#if defined(USE_PLUGINS)
+static int caca_plugin_install(char const *name, caca_display_t *dp)
+{
+    char buf[512];
+    int (*sym) (caca_display_t *);
+
+    sprintf(buf, "%s/lib%s_plugin.so", PLUGINDIR, name);
+    dp->plugin = dlopen(buf, RTLD_NOW);
+    if(!dp->plugin)
+    {
+        sprintf(buf, "lib%s_plugin.so", name);
+        dp->plugin = dlopen(buf, RTLD_NOW);
+        if(!dp->plugin)
+            return -1;
+    }
+
+    sprintf(buf, "%s_install", name);
+    sym = dlsym(dp->plugin, buf);
+    if(!sym)
+    {
+        dlclose(dp->plugin);
+        return -1;
+    }
+
+    return sym(dp);
+}
+#endif
+