gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Texture plugin update

Browse Source
This commit is contained in:
kojima
1999-03-18 05:41:00 +00:00
parent 9a3d1fef45
commit 1ba54a5199
3 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/defaults.c
View File

@@ -34,6 +34,12 @@
#include <limits.h>
#include <signal.h>
#ifdef HAVE_DLFCN_H
# include <dlfcn.h>
#endif
#ifndef PATH_MAX
#define PATH_MAX DEFAULT_PATH_MAX
#endif
@@ -1860,7 +1866,8 @@ parse_texture(WScreen *scr, proplist_t pl)
}
#ifdef TEXTURE_PLUGIN
else if (strcasecmp(val, "function")==0) {
WTexFunction *function;
void (*initFunc) (Display *, Colormap);
char *lib, *func, **argv;
int i, argc;
@@ -1881,20 +1888,36 @@ parse_texture(WScreen *scr, proplist_t pl)
}
func = PLGetString(elem);
argc = nelem - 3;
argv = (char **) wmalloc (argc * sizeof (char *));
argc = nelem - 2;
argv = (char **)wmalloc(argc * sizeof(char *));
/* get the parameters */
for (i=0; i<argc; i++) {
elem = PLGetArrayElement(pl, 3+i);
argv[0] = wstrdup(func);
for (i = 0; i < argc - 1; i++) {
elem = PLGetArrayElement(pl, 3 + i);
if (!elem || !PLIsString(elem)) {
free (argv);
free(argv);
return NULL;
}
argv[i] = PLGetString(elem);
argv[i+1] = wstrdup(PLGetString(elem));
}
texture = (WTexture*)wTextureMakeFunction(scr, lib, func, argc, argv);
function = wTextureMakeFunction(scr, lib, func, argc, argv);
#ifdef HAVE_DLFCN_H
if (function) {
initFunc = dlsym(function->handle, "initWindowMaker");
if (initFunc) {
initFunc(dpy, scr->w_colormap);
} else {
wwarning(_("could not initialize library %s"), lib);
}
} else {
wwarning(_("could not find function %s::%s"), lib, func);
}
#endif /* HAVE_DLFCN_H */
texture = (WTexture*)function;
}
#endif /* TEXTURE_PLUGIN */
else {