Changeset 49e0132d6bb68b9d14ad8878d14a5f2ed17a1a93

Timestamp:

06/14/07 04:16:11 (6 years ago)

Author:

dsmith <dsmith@…>

Children:

bd4c9bdfca9e847cf6c0bc77ce98f90785eff251

Parents:

a09a4eea431c232fa82b3b1a9a728c8b07345d4f

git-author:

L. Donnie Smith <donnie.smith@…> (06/14/07 04:16:11)

git-committer:

dsmith <dsmith@…> (06/14/07 04:16:11)

Message:

merged branches/dev into trunk

git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@125 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• common/include/app.mak (modified) (1 diff)
• common/include/lib.mak.in (modified) (1 diff)
• common/include/plugin.mak (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• defs.mak.in (modified) (1 diff)
• doc/Makefile.in (modified) (1 diff)
• lswm/Makefile.in (modified) (1 diff)
• lswm/lswm.c (modified) (6 diffs)
• man/Makefile.in (modified) (1 diff)
• python/Makefile.in (added)
• python/Wiimote.c (added)
• python/cwiidmodule.c (added)
• python/setup.py (added)
• wminput/Makefile.in (modified) (1 diff)
• wminput/c_plugin.c (added)
• wminput/c_plugin.h (added)
• wminput/conf.c (modified) (7 diffs)
• wminput/conf.h (modified) (2 diffs)
• wminput/main.c (modified) (16 diffs)
• wminput/plugins/acc/acc.c (modified) (8 diffs)
• wminput/plugins/acc/acc.py (added)
• wminput/plugins/ir_ptr/ir_ptr.c (modified) (5 diffs)
• wminput/plugins/nunchuk_acc/nunchuk_acc.c (modified) (9 diffs)
• wminput/py_plugin.c (added)
• wminput/py_plugin.h (added)
• wminput/uinput.c (modified) (1 diff)
• wminput/util.c (modified) (2 diffs)
• wminput/wmplugin.h (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
+        python
+        * removed Wiimote_FromC function
+        * added bdaddr argument to Wiimote.init
+        * overloaded Wiimote.init to accept CObject (existing wiimote),
+          and logic to avoid closing it on dealloc
+
+        wminput
+        * refactored to isolate plugin logic
+        * now imports python plugins without changing directories
+
+2007-06-01 Nick <nickishappy@gmail.com>
+        lswm
+        * reworked command-line options (added standard options, long options)
+
+        wminput
+        * reworked command-line options (added standard options, long options)
+
+2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+        python
+        * added Wiimote_FromC
+        * exported Wiimote_FromC and ConvertMesgArray as CObjects
+        * added get_acc_cal
+
+        wminput
+        * added pyplugin.c, pyplugin.h
+        * changed wmplugin_exec prototype (&mesg->mesg)
+        * changed param format (pass pointers)
+        * added python plugin support (experimental)
+
+2007-05-30 L. Donnie Smith <cwiid@abstrakraft.org>
+        configure.ac
+        * added python/Makefile and PYTHON_VERSION variable
+
+        build system
+        * added ROOTDIR (massaged DESTDIR)
+
+        python
+        * added directory
+
+2007-05-27 Arthur Peters <amp@singingwizard.org>
+        python
+        * removed set_mesg_callback from methods table
+
 2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
         libcwiid

Makefile.in

@@ -6 +6 @@
 BIN_DIRS = wmgui wminput lswm
 DOC_DIRS = man doc
+BIND_DIRS = python
+
+SUB_DIRS = $(LIB_DIRS) $(BIN_DIRS) $(DOC_DIRS) $(BIND_DIRS) wmdemo
 
 all install clean distclean uninstall: TARGET += $(MAKECMDGOALS)
 
-all install clean distclean uninstall: $(BIN_DIRS) $(LIB_DIRS)
+all install clean distclean uninstall: $(BIN_DIRS) $(LIB_DIRS) $(BIND_DIRS)
 
 install uninstall distclean: $(DOC_DIRS)
@@ -17 +20 @@
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),distclean)
-$(BIN_DIRS): $(LIB_DIRS)
+$(BIN_DIRS) $(BIND_DIRS): $(LIB_DIRS)
 endif
 endif
@@ -25 +28 @@
 endif
 
-$(LIB_DIRS) $(BIN_DIRS) $(DOC_DIRS) wmdemo:
+$(SUB_DIRS):
         $(MAKE) $(TARGET) -C $@
 
@@ -44 +47 @@
         rm -rf $(CWIID_CONFIG_DIR)
 
-.PHONY: all install clean distclean uninstall uninstall_config $(LIB_DIRS) \
-        $(BIN_DIRS) $(DOC_DIRS) wmdemo
+.PHONY: all install clean distclean uninstall uninstall_config $(SUB_DIRS)
 
 .NOTPARALLEL:

common/include/app.mak

@@ -6 +6 @@
 INST_DIR ?= /usr/local/bin
 
-DEST_INST_DIR = $(DESTDIR)/$(INST_DIR)
+DEST_INST_DIR = $(ROOTDIR)$(INST_DIR)
 
 all: $(APP_NAME)

common/include/lib.mak.in

@@ -8 +8 @@
 SO_NAME    = $(LINK_NAME).$(MAJOR_VER)
 SHARED_LIB = $(SO_NAME).$(MINOR_VER)
-DEST_INC_INST_DIR = $(DESTDIR)/$(INC_INST_DIR)
-DEST_LIB_INST_DIR = $(DESTDIR)/$(LIB_INST_DIR)
+DEST_INC_INST_DIR = $(ROOTDIR)$(INC_INST_DIR)
+DEST_LIB_INST_DIR = $(ROOTDIR)$(LIB_INST_DIR)
 
 OBJECTS = $(SOURCES:.c=.o)

common/include/plugin.mak

@@ -8 +8 @@
 CFLAGS += -fpic
 
-#TODO:unify the way DESTDIR is handled
-#Currently, defs.mak adds DESTDIR to the plugin INST_DIR,
+#TODO:unify the way ROOTDIR is handled
+#Currently, defs.mak adds ROOTDIR to the plugin INST_DIR,
 #so we don't do it here
-#DEST_INST_DIR = $(DESTDIR)/$(INST_DIR)
+#DEST_INST_DIR = $(ROOTDIR)/$(INST_DIR)
 DEST_INST_DIR = $(INST_DIR)
 

configure.ac

@@ -1 +1 @@
 # ChangeLog:
+# 2007-05-30 L. Donnie Smith <cwiid@abstrakraft.org>
+# * added python/Makefile
+# * added PYTHON_VERSION variable
+#
 # 2007-04-09 L. Donnie Smith <cwiid@abstrakraft.org>
 # * updated for libcwiid rename
@@ -32 +36 @@
         AC_MSG_ERROR([bison not found])
 fi
+
+PYTHON_VERSION=[`python -c 'import sys; print sys.version[:3]'`]
+AC_SUBST(PYTHON_VERSION)
 
 AC_CHECK_LIB([pthread], [pthread_create],,
@@ -105 +112 @@
         [wminput/plugins/nunchuk_acc/Makefile]
         [lswm/Makefile]
+        [python/Makefile]
         )
 

defs.mak.in

@@ -24 +24 @@
 COMMON = @abs_top_builddir@/common
 
-CWIID_CONFIG_DIR = $(DESTDIR)/@CWIID_CONFIG_DIR@
-CWIID_PLUGINS_DIR = $(DESTDIR)/@CWIID_PLUGINS_DIR@
+ifdef DESTDIR
+        ROOTDIR = $(DESTDIR:%/=%)
+endif
+
+CWIID_CONFIG_DIR = $(ROOTDIR)@CWIID_CONFIG_DIR@
+CWIID_PLUGINS_DIR = $(ROOTDIR)@CWIID_PLUGINS_DIR@
 
 DEBUGFLAGS = -g

doc/Makefile.in

@@ -5 +5 @@
 docfiles = Xmodmap wminput.list
 
-DEST_DOC_DIR = $(DESTDIR)/$(docdir)
+DEST_DOC_DIR = $(ROOTDIR)$(docdir)
 
 all:

lswm/Makefile.in

@@ -7 +7 @@
 SOURCES = lswm.c
 
-CFLAGS += -I@top_builddir@/libcwiid
+CFLAGS += -I@top_builddir@/libcwiid -DCWIID_VERSION=\"${PACKAGE_VERSION}\"
 LDFLAGS += -L@top_builddir@/libcwiid
 LDLIBS += -lcwiid

lswm/lswm.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-01 Nick <nickishappy@gmail.com>
+ *  * reworked command-line options (added standard options, long options)
+ *
  *  2007-04-09 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * updated for libcwiid rename
@@ -32 +35 @@
 #include <bluetooth/bluetooth.h>
 #include <cwiid.h>
+#include <getopt.h>
 
-#define OPTSTRING       "ahlq"
-
-#define USAGE \
-        "%s [OPTIONS]\n" \
-        "  -a  list all bluetooth devices (not just wiimotes)\n" \
-        "  -h  print this help message\n" \
-        "  -l  long format (device details)\n" \
-        "  -q  quiet mode\n"
+void print_usage(void)
+{
+        printf("lswm lists availiable wiimotes\n");
+        printf("Usage: %s [OPTIONS]...\n\n", "lswm");
+        printf("Options:\n");
+        printf("\t-h, --help\t\tPrints this output.\n");
+        printf("\t-v, --version\t\toutput version information and exit.\n");
+        printf("\t-l, --long\t\tlong format (device details).\n");
+        printf("\t-q, --quiet\t\tquiet mode (less verbose).\n");
+        printf("\t-a, --all\t\tlist all bluetooth devices (not just wiimotes).\n");
+}
 
 int main(int argc, char *argv[])
@@ -54 +61 @@
 
         /* Parse options */
-        while ((c = getopt(argc, argv, OPTSTRING)) != -1) {
+        while (1) {
+                int option_index = 0;
+
+                static struct option long_options[] = {
+                        {"help", 0, 0, 'h'},
+                        {"all", 0, 0, 'a'},
+                        {"long", 0, 0, 'l'},
+                        {"version", 0, 0, 'v'},
+                        {"quiet", 0, 0, 'q'},
+                        {0, 0, 0, 0}
+                };
+
+                c = getopt_long(argc, argv, "halvq", long_options, &option_index);
+
+                if (c == -1) {
+                        break;
+                }
+
                 switch (c) {
                 case 'h':
-                        printf(USAGE, argv[0]);
+                        print_usage();
                         return 0;
                         break;
@@ -66 +90 @@
                         long_format = 1;
                         break;
+                case 'v':
+                        printf("CWiid Version %s\n", CWIID_VERSION);
+                        return 0;
+                        break;
                 case 'q':
                         quiet = 1;
@@ -71 +99 @@
                 case '?':
                 default:
-                        fprintf(stderr, "Try '%s -h' for more information\n", argv[0]);
+                        fprintf(stderr, "Try '%s --help' for more information\n", argv[0]);
                         return -1;
                         break;
                 }
         }
-
-        /* TODO: check for other stuff on the command-line? */
 
         /* Handle quiet mode */
@@ -112 +138 @@
         return 0;
 }
-

man/Makefile.in

@@ -3 +3 @@
 include @top_builddir@/defs.mak
 
-DEST_MAN_DIR = $(DESTDIR)/$(mandir)
+DEST_MAN_DIR = $(ROOTDIR)$(mandir)
 
 all:

wminput/Makefile.in

@@ -5 +5 @@
 APP_NAME = wminput
 
-SOURCES = main.c conf.c uinput.c action_enum.c parser.c lexer.c util.c
+SOURCES = main.c conf.c c_plugin.c py_plugin.c uinput.c action_enum.c parser.c \
+        lexer.c util.c
 
 WMINPUT_CONFIG_DIR = $(CWIID_CONFIG_DIR)/wminput
-CFLAGS += -I@top_builddir@/libcwiid \
+CFLAGS += -I@top_builddir@/libcwiid -I/usr/include/python@PYTHON_VERSION@ \
         -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \
-        -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\"
-LDLIBS += -lcwiid -ldl
+        -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" \
+        -DCWIID_VERSION=\"${PACKAGE_VERSION}\"
+LDLIBS += -lcwiid -ldl -lpython@PYTHON_VERSION@
 LDFLAGS += -L@top_builddir@/libcwiid -rdynamic
 INST_DIR = @bindir@

wminput/conf.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * refactored to isolate plugin logic
+ *
+ *  2007-06-03 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * fixed plugin->data malloc bug
+ *
+ *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added python plugin support
+ *  * changed param interface (pass pointers)
+ *
  *  2007-04-15 <work.eric@gmail.com>
  *  * fixed classic controller configuration bug
@@ -33 +43 @@
 #include <string.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dlfcn.h>
-#include <unistd.h>
-
 #include "conf.h"
 #include "util.h"
 #include "y.tab.h"
+#include "c_plugin.h"
+#include "py_plugin.h"
 
 extern FILE *yyin;
@@ -85 +92 @@
                 if (conf->plugins[i].name) {
                         free(conf->plugins[i].name);
-                        dlclose(conf->plugins[i].handle);
-                }
-                else {
-                        break;
+                        switch (conf->plugins[i].type) {
+                        case PLUGIN_C:
+                                c_plugin_close(&conf->plugins[i]);
+                                break;
+                        case PLUGIN_PYTHON:
+                                py_plugin_close(&conf->plugins[i]);
+                                break;
+                        }
                 }
         }
@@ -326 +337 @@
         }
 
-        switch (plugin->info->param_info[i].type) {
-        case WMPLUGIN_PARAM_INT:
-                plugin->info->param_info[i].value.Int = value;
-                break;
-        case WMPLUGIN_PARAM_FLOAT:
-                plugin->info->param_info[i].value.Float = (float) value;
-                break;
-        default:
-                wminput_err("unknown parameter type: %s.%s", name, param);
-                return -1;
+        switch (plugin->type) {
+        case PLUGIN_C:
+                if (c_plugin_param_int(plugin, i, value)) {
+                        return -1;
+                }
+                break;
+        case PLUGIN_PYTHON:
+                if (py_plugin_param_int(plugin, i, value)) {
+                        return -1;
+                }
                 break;
         }
@@ -365 +376 @@
         }
 
-        switch (plugin->info->param_info[i].type) {
-        case WMPLUGIN_PARAM_INT:
-                wminput_err("possible loss of precision: %s.%s (cast float to int)",
-                            name, param);
-                plugin->info->param_info[i].value.Int = value;
-                break;
-        case WMPLUGIN_PARAM_FLOAT:
-                plugin->info->param_info[i].value.Float = value;
-                break;
-        default:
-                wminput_err("unknown parameter type: %s.%s", name, param);
-                return -1;
+        switch (plugin->type) {
+        case PLUGIN_C:
+                if (c_plugin_param_float(plugin, i, value)) {
+                        return -1;
+                }
+                break;
+        case PLUGIN_PYTHON:
+                if (py_plugin_param_float(plugin, i, value)) {
+                        return -1;
+                }
                 break;
         }
@@ -556 +565 @@
 }
 
-#define PLUGIN_PATHNAME_LEN     128
 struct plugin *get_plugin(struct conf *conf, const char *name)
 {
         int i;
-        char pathname[PLUGIN_PATHNAME_LEN];
+        char plugin_found = 0;
         struct plugin *plugin;
-        struct stat buf;
-        wmplugin_info_t *info;
 
         for (i=0; i < CONF_MAX_PLUGINS; i++) {
@@ -578 +584 @@
                 return NULL;
         }
-        else {
-                plugin = &conf->plugins[i];
-                plugin->name = (char *)name;
-
-                for (i=0; conf->plugin_search_dirs[i]; i++) {
-                        snprintf(pathname, PLUGIN_PATHNAME_LEN, "%s/%s.so",
-                                 conf->plugin_search_dirs[i], name);
-                        if (!stat(pathname, &buf)) {
-                                if (!(plugin->handle = dlopen(pathname, RTLD_NOW))) {
-                                        wminput_err(dlerror());
-                                }
-                                break;
-                        }
-                }
-
-                if (!plugin->handle) {
-                        wminput_err("plugin not found: %s", name);
-                        free(plugin->name);
-                        plugin->name = NULL;
-                        return NULL;
-                }
-                else if ((info = dlsym(plugin->handle, "wmplugin_info")) ==
-                         NULL) {
-                        wminput_err("Unable to load plugin info function: %s", dlerror());
-                        free(plugin->name);
-                        plugin->name = NULL;
-                        dlclose(plugin->handle);
-                        return NULL;
-                }
-                else if ((plugin->info = (*info)()) == NULL) {
-                        wminput_err("Invalid plugin info from %s", plugin->name);
-                        free(plugin->name);
-                        plugin->name = NULL;
-                        dlclose(plugin->handle);
-                        return NULL;
-                }
-                else if ((plugin->init = dlsym(plugin->handle, "wmplugin_init")) ==
-                         NULL) {
-                        wminput_err("Unable to load plugin init function: %s", dlerror());
-                        free(plugin->name);
-                        plugin->name = NULL;
-                        dlclose(plugin->handle);
-                        return NULL;
-                }
-                else if ((plugin->exec = dlsym(plugin->handle, "wmplugin_exec")) ==
-                         NULL) {
-                        wminput_err("Unable to load plugin exec function: %s", dlerror());
-                        free(plugin->name);
-                        plugin->name = NULL;
-                        dlclose(plugin->handle);
-                        return NULL;
-                }
+
+        plugin = &conf->plugins[i];
+        plugin->name = (char *)name;
+
+        for (i=0; conf->plugin_search_dirs[i]; i++) {
+                if (!c_plugin_open(plugin, conf->plugin_search_dirs[i])) {
+                        plugin_found = 1;
+                        break;
+                }
+                if (!py_plugin_open(plugin, conf->plugin_search_dirs[i])) {
+                        plugin_found = 1;
+                        break;
+                }
+        }
+
+        if (!plugin_found) {
+                wminput_err("plugin not found: %s", name);
+                free(plugin->name);
+                plugin->name = NULL;
+                return NULL;
         }
 
         return plugin;
 }
-

wminput/conf.h

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * refactored to isolate plugin logic
+ *
+ *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added python plugin support
+ *
  *  2007-04-09 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * updated for libcwiid rename
@@ -133 +139 @@
 };
 
+enum plugin_type {
+        PLUGIN_C,
+        PLUGIN_PYTHON
+};
+
 struct plugin {
         char *name;
+        enum plugin_type type;
+        uint8_t rpt_mode_flags;
         struct wmplugin_info *info;
-        void *handle;
-        wmplugin_init_t *init;
-        wmplugin_exec_t *exec;
-        uint8_t rpt_mode_flags;
+        struct wmplugin_data *data;
         uint16_t prev_buttons;
         struct btn_map bmap[WMPLUGIN_MAX_BUTTON_COUNT];
         struct axis_map amap[WMPLUGIN_MAX_AXIS_COUNT];
+        void *p;
 };
 

wminput/main.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * refactored to isolate plugin logic
+ *
+ *  2007-06-01 Nick <nickishappy@gmail.com>
+ *  * reworked command-line options (added standard options, long options)
+ *
+ *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added python plugin support
+ *  * pass mesg instead of &mesg to wmplugin_exec
+ *
  *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * changed cwiid_{connect,disconnect,command} to
@@ -40 +50 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <getopt.h>
 
 #include <pthread.h>
@@ -51 +62 @@
 #include "util.h"
 #include "wmplugin.h"
+#include "c_plugin.h"
+#include "py_plugin.h"
 
 struct conf conf;
-
-/* GetOpt */
-#define OPTSTRING       "hwc:"
-extern char *optarg;
-extern int optind, opterr, optopt;
 
 /* Prototypes */
@@ -73 +81 @@
 #define DEFAULT_CONFIG_FILE     "default"
 
-#define USAGE "usage:%s [-h] [-w] [-c config] [bdaddr]\n"
-
 #define HOME_DIR_LEN    128
+
+void print_usage(void)
+{
+        printf("wminput is a program that allows you to use a wiimote as a standard input device\n");
+        printf("Usage: %s [OPTIONS]...\n\n", "wminput");
+        printf("Options:\n");
+        printf("\t-h, --help\t\tPrints this output.\n");
+        printf("\t-v, --version\t\toutput version information and exit.\n");
+        printf("\t-c, --config [file]\tChoose config file to use.\n");
+        printf("\t-w, --wait\t\tWait indefinitely for wiimote to connect.\n");
+}
+
 int main(int argc, char *argv[])
 {
@@ -95 +113 @@
 
         /* Parse Options */
-        while ((c = getopt(argc, argv, OPTSTRING)) != -1) {
+        while (1) {
+                int option_index = 0;
+
+                static struct option long_options[] = {
+                        {"help", 0, 0, 'h'},
+                        {"wait", 0, 0, 'w'},
+                        {"config", 1, 0, 'c'},
+                        {"version", 0, 0, 'v'},
+                        {0, 0, 0, 0}
+                };
+
+                c = getopt_long (argc, argv, "hwc:v", long_options, &option_index);
+
+                if (c == -1) {
+                        break;
+                }
+
                 switch (c) {
                 case 'h':
-                        printf(USAGE, argv[0]);
+                        print_usage();
                         return 0;
                         break;
@@ -107 +141 @@
                         config_filename = optarg;
                         break;
+                case 'v':
+                        printf("CWiid Version %s\n", CWIID_VERSION);
+                        return 0;
+                        break;
                 case '?':
+                        printf("Try `wminput --help` for more information\n");
+                        return 1;
+                        break;
                 default:
                         return -1;
@@ -114 +155 @@
         }
 
+        if (c_init()) {
+                return -1;
+        }
+        if (py_init()) {
+                return -1;
+        }
+
         /* Load Config */
+        /* Setup search directory arrays */
         if ((tmp = getenv("HOME")) == NULL) {
                 wminput_err("unable to find home directory");
@@ -136 +185 @@
         }
 
-        /* BDADDR */
+        /* Determine BDADDR */
+        /* priority: command-line option, environment variable, BDADDR_ANY */
         if (optind < argc) {
                 if (str2ba(argv[optind], &bdaddr)) {
@@ -145 +195 @@
                 if (optind < argc) {
                         wminput_err("invalid command-line");
-                        printf(USAGE, argv[0]);
+                        print_usage();
                         conf_unload(&conf);
                         return -1;
@@ -160 +210 @@
         }
 
-        /* Wiimote connect */
+        /* TODO: fix wait_forever logic - currently assumes bdaddr is unspecified */
+        /* Wiimote Connect */
         printf("Put Wiimote in discoverable mode now (press 1+2)...\n");
         if (wait_forever) {
@@ -180 +231 @@
         }
 
+        if (c_wiimote(wiimote)) {
+                conf_unload(&conf);
+                return -1;
+        }
+        if (py_wiimote(wiimote)) {
+                conf_unload(&conf);
+                return -1;
+        }
+
         /* init plugins */
         for (i=0; (i < CONF_MAX_PLUGINS) && conf.plugins[i].name; i++) {
-                if ((*conf.plugins[i].init)(i, wiimote)) {
-                        wminput_err("error on %s init", conf.plugins[i].name);
-                        conf_unload(&conf);
-                        cwiid_close(wiimote);
-                        return -1;
+                switch (conf.plugins[i].type) {
+                case PLUGIN_C:
+                        if (c_plugin_init(&conf.plugins[i], i)) {
+                                wminput_err("error on %s init", conf.plugins[i].name);
+                                conf_unload(&conf);
+                                cwiid_close(wiimote);
+                                return -1;
+                        }
+                        break;
+                case PLUGIN_PYTHON:
+                        if (py_plugin_init(&conf.plugins[i], i)) {
+                                wminput_err("error %s init", conf.plugins[i].name);
+                                conf_unload(&conf);
+                                cwiid_close(wiimote);
+                                return -1;
+                        }
+                        break;
                 }
         }
@@ -240 +312 @@
         }
 
+        py_deinit();
+
         return ret;
 }
 
-int wmplugin_set_report_mode(int id, uint8_t flags)
+int wminput_set_report_mode()
+{
+        unsigned char rpt_mode_flags;
+        int i;
+
+        rpt_mode_flags = conf.rpt_mode_flags;
+
+        for (i=0; (i < CONF_MAX_PLUGINS) && conf.plugins[i].name; i++) {
+                rpt_mode_flags |= conf.plugins[i].rpt_mode_flags;
+        }
+
+        if (cwiid_set_rpt_mode(wiimote, rpt_mode_flags)) {
+                wminput_err("error setting report mode");
+                return -1;
+        }
+
+        return 0;
+}
+
+int wmplugin_set_rpt_mode(int id, uint8_t flags)
 {
         conf.plugins[id].rpt_mode_flags = flags;
@@ -249 +342 @@
         if (!init) {
                 wminput_set_report_mode();
-        }
-
-        return 0;
-}
-
-int wminput_set_report_mode()
-{
-        unsigned char rpt_mode_flags;
-        int i;
-
-        rpt_mode_flags = conf.rpt_mode_flags;
-
-        for (i=0; (i < CONF_MAX_PLUGINS) && conf.plugins[i].name; i++) {
-                rpt_mode_flags |= conf.plugins[i].rpt_mode_flags;
-        }
-
-        if (cwiid_set_rpt_mode(wiimote, rpt_mode_flags)) {
-                wminput_err("error setting report mode");
-                return -1;
         }
 
@@ -520 +594 @@
                     union cwiid_mesg mesg[])
 {
-        union cwiid_mesg *plugin_mesg[CWIID_MAX_MESG_COUNT];
+        static union cwiid_mesg plugin_mesg[CWIID_MAX_MESG_COUNT];
         int plugin_mesg_count = 0;
         int i;
         uint8_t flag;
-        struct wmplugin_data *data;
         uint16_t pressed, released;
         __s32 axis_value;
@@ -552 +625 @@
                 }
                 if (plugin->rpt_mode_flags & flag) {
-                        plugin_mesg[plugin_mesg_count++] = &mesg[i];
+                        /* TODO: copy correct (smaller) message size */
+                        memcpy(&plugin_mesg[plugin_mesg_count++], &mesg[i], sizeof mesg[i]);
                 }
         }
 
         if (plugin_mesg_count > 0) {
-                if (!(data = (*plugin->exec)(plugin_mesg_count, plugin_mesg))) {
-                        return;
+                switch (plugin->type) {
+                case PLUGIN_C:
+                        if (c_plugin_exec(plugin, plugin_mesg_count, plugin_mesg)) {
+                                return;
+                        }
+                        break;
+                case PLUGIN_PYTHON:
+                        if (py_plugin_exec(plugin, plugin_mesg_count, plugin_mesg)) {
+                                return;
+                        }
+                        break;
                 }
 
                 /* Plugin Button/Key Events */
-                pressed = data->buttons & ~plugin->prev_buttons;
-                released = ~data->buttons & plugin->prev_buttons;
+                pressed = plugin->data->buttons & ~plugin->prev_buttons;
+                released = ~plugin->data->buttons & plugin->prev_buttons;
                 for (i=0; i < plugin->info->button_count; i++) {
                         if (plugin->bmap[i].active) {
@@ -574 +657 @@
                         }
                 }
-                plugin->prev_buttons = data->buttons;
+                plugin->prev_buttons = plugin->data->buttons;
 
                 /* Plugin Axis Events */
                 for (i=0; i < plugin->info->axis_count; i++) {
-                        if (plugin->amap[i].active && data->axes && data->axes[i].valid) {
-                                axis_value = data->axes[i].value;
+                        if (plugin->amap[i].active && plugin->data->axes &&
+                          plugin->data->axes[i].valid) {
+                                axis_value = plugin->data->axes[i].value;
                                 if (plugin->amap[i].flags & CONF_INVERT) {
                                         axis_value = plugin->info->axis_info[i].max +

wminput/plugins/acc/acc.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * updated for wmplugin_exec prototype change (&mesg->mesg)
+ *  * updated for param interface change (pass pointers)
+ *
  *  2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * use cwiid_get_acc_cal to get acc calibration values
@@ -58 +62 @@
 wmplugin_exec_t wmplugin_exec;
 static void process_acc(struct cwiid_acc_mesg *mesg);
+
+static float Roll_Scale = 1.0;
+static float Pitch_Scale = 1.0;
+static float X_Scale = 1.0;
+static float Y_Scale = 1.0;
 
 struct wmplugin_info *wmplugin_info() {
@@ -90 +99 @@
                 info.param_info[0].name = "Roll_Scale";
                 info.param_info[0].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[0].value.Float = 1.0;
+                info.param_info[0].ptr = &Roll_Scale;
                 info.param_info[1].name = "Pitch_Scale";
                 info.param_info[1].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[1].value.Float = 1.0;
+                info.param_info[1].ptr = &Pitch_Scale;
                 info.param_info[2].name = "X_Scale";
                 info.param_info[2].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[2].value.Float = 1.0;
+                info.param_info[2].ptr = &X_Scale;
                 info.param_info[3].name = "Y_Scale";
                 info.param_info[3].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[3].value.Float = 1.0;
+                info.param_info[3].ptr = &Y_Scale;
                 info_init = 1;
         }
@@ -112 +121 @@
         data.axes[0].valid = 1;
         data.axes[1].valid = 1;
-        if (wmplugin_set_report_mode(id, CWIID_RPT_ACC)) {
+        if (wmplugin_set_rpt_mode(id, CWIID_RPT_ACC)) {
                 return -1;
         }
@@ -124 +133 @@
 }
 
-struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg *mesg[])
+struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[])
 {
         int i;
@@ -130 +139 @@
 
         for (i=0; i < mesg_count; i++) {
-                switch (mesg[i]->type) {
+                switch (mesg[i].type) {
                 case CWIID_MESG_ACC:
-                        process_acc(&mesg[i]->acc_mesg);
+                        process_acc(&mesg[i].acc_mesg);
                         ret = &data;
                         break;
@@ -170 +179 @@
         pitch = atan(a_y/a_z*cos(roll));
 
-        data.axes[0].value = roll  * 1000 * info.param_info[0].value.Float;
-        data.axes[1].value = pitch * 1000 * info.param_info[1].value.Float;
+        data.axes[0].value = roll  * 1000 * Roll_Scale;
+        data.axes[1].value = pitch * 1000 * Pitch_Scale;
 
         if ((a > 0.85) && (a < 1.15)) {
                 if ((fabs(roll)*(180/PI) > 10) && (fabs(pitch)*(180/PI) < 80)) {
                         data.axes[2].valid = 1;
-                        data.axes[2].value = roll * 5 * info.param_info[2].value.Float;
+                        data.axes[2].value = roll * 5 * X_Scale;
                 }
                 else {
@@ -183 +192 @@
                 if (fabs(pitch)*(180/PI) > 10) {
                         data.axes[3].valid = 1;
-                        data.axes[3].value = pitch * 10 * info.param_info[3].value.Float;
+                        data.axes[3].value = pitch * 10 * Y_Scale;
                 }
                 else {

wminput/plugins/ir_ptr/ir_ptr.c

@@ -1 @@
-/* Copyright (C) 2007 L. Donnie Smith <wiimote@abstrakraft.org>
+/* Copyright (C) 2007 L. Donnie Smith <cwiidabstrakraft.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * updated for wmplugin_exec prototype change (&mesg->mesg)
+ *
  *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * changed cwiid_{connect,disconnect,command} to
@@ -92 +95 @@
         data.buttons = 0;
 
-        if (wmplugin_set_report_mode(id, CWIID_RPT_IR)) {
+        if (wmplugin_set_rpt_mode(id, CWIID_RPT_IR)) {
                 return -1;
         }
@@ -99 +102 @@
 }
 
-struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg *mesg[])
+struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[])
 {
         int i;
@@ -108 +111 @@
         ir_mesg = NULL;
         for (i=0; i < mesg_count; i++) {
-                if (mesg[i]->type == CWIID_MESG_IR) {
-                        ir_mesg = &mesg[i]->ir_mesg;
+                if (mesg[i].type == CWIID_MESG_IR) {
+                        ir_mesg = &mesg[i].ir_mesg;
                 }
         }

wminput/plugins/nunchuk_acc/nunchuk_acc.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * updated for wmplugin_exec prototype change (&mesg->mesg)
+ *  * updated for param interface change (pass pointers)
+ *
  *  2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * use cwiid_get_acc_cal to get acc calibration values
@@ -56 +60 @@
 wmplugin_init_t wmplugin_init;
 wmplugin_exec_t wmplugin_exec;
-
 static void process_nunchuk(struct cwiid_nunchuk_mesg *mesg);
+
+static float Roll_Scale = 1.0;
+static float Pitch_Scale = 1.0;
+static float X_Scale = 1.0;
+static float Y_Scale = 1.0;
 
 struct wmplugin_info *wmplugin_info() {
@@ -90 +98 @@
                 info.param_info[0].name = "Roll_Scale";
                 info.param_info[0].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[0].value.Float = 1.0;
+                info.param_info[0].ptr = &Roll_Scale;
                 info.param_info[1].name = "Pitch_Scale";
                 info.param_info[1].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[1].value.Float = 1.0;
+                info.param_info[1].ptr = &Pitch_Scale;
                 info.param_info[2].name = "X_Scale";
                 info.param_info[2].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[2].value.Float = 1.0;
+                info.param_info[2].ptr = &X_Scale;
                 info.param_info[3].name = "Y_Scale";
                 info.param_info[3].type = WMPLUGIN_PARAM_FLOAT;
-                info.param_info[3].value.Float = 1.0;
+                info.param_info[3].ptr = &Y_Scale;
                 info_init = 1;
         }
@@ -112 +120 @@
         data.axes[0].valid = 1;
         data.axes[1].valid = 1;
-        if (wmplugin_set_report_mode(id,
-                                     CWIID_RPT_STATUS | CWIID_RPT_NUNCHUK)) {
+        if (wmplugin_set_rpt_mode(id, CWIID_RPT_STATUS | CWIID_RPT_NUNCHUK)) {
                 return -1;
         }
@@ -120 +127 @@
 }
 
-struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg *mesg[])
+struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[])
 {
         int i;
@@ -127 +134 @@
 
         for (i=0; i < mesg_count; i++) {
-                switch (mesg[i]->type) {
+                switch (mesg[i].type) {
                 case CWIID_MESG_STATUS:
-                        if ((mesg[i]->status_mesg.ext_type == CWIID_EXT_NUNCHUK) &&
+                        if ((mesg[i].status_mesg.ext_type == CWIID_EXT_NUNCHUK) &&
                           (ext_type != CWIID_EXT_NUNCHUK)) {
                                 if (cwiid_get_acc_cal(wiimote, CWIID_EXT_NUNCHUK, &acc_cal)) {
@@ -135 +142 @@
                                 }
                         }
-                        ext_type = mesg[i]->status_mesg.ext_type;
+                        ext_type = mesg[i].status_mesg.ext_type;
                         break;
                 case CWIID_MESG_NUNCHUK:
-                        process_nunchuk(&mesg[i]->nunchuk_mesg);
+                        process_nunchuk(&mesg[i].nunchuk_mesg);
                         ret = &data;
                         break;
@@ -176 +183 @@
         pitch = atan(a_y/a_z*cos(roll));
 
-        data.axes[0].value = roll  * 1000 * info.param_info[0].value.Float;
-        data.axes[1].value = pitch * 1000 * info.param_info[1].value.Float;
+        data.axes[0].value = roll  * 1000 * Roll_Scale;
+        data.axes[1].value = pitch * 1000 * Pitch_Scale;
 
         if ((a > 0.85) && (a < 1.15)) {
                 if ((fabs(roll)*(180/PI) > 10) && (fabs(pitch)*(180/PI) < 80)) {
                         data.axes[2].valid = 1;
-                        data.axes[2].value = roll * 5 * info.param_info[2].value.Float;
+                        data.axes[2].value = roll * 5 * X_Scale;
                 }
                 else {
@@ -189 +196 @@
                 if (fabs(pitch)*(180/PI) > 10) {
                         data.axes[3].valid = 1;
-                        data.axes[3].value = pitch * 10 * info.param_info[3].value.Float;
+                        data.axes[3].value = pitch * 10 * Y_Scale;
                 }
                 else {

wminput/uinput.c

@@ -291 +291 @@
         } while (-1);
 }
-

wminput/util.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * refactored to isolate plugin logic
+ *
  *  2007-03-04 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * Initial ChangeLog
@@ -34 +37 @@
         va_end(ap);
 }
-
-void wmplugin_err(int id, char *str, ...)
-{
-        va_list ap;
-
-        va_start(ap, str);
-        vfprintf(stderr, str, ap);
-        fprintf(stderr, "\n");
-        va_end(ap);
-}
-

wminput/wmplugin.h

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed wmplugin_exec prototype (pass mesg instead of &mesg)
+ *  * changed param interface (pass pointers)
+ *
  *  2007-04-09 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * updated for libcwiid rename
@@ -59 +63 @@
 };
 
-union wmplugin_param_value {
-        int Int;
-        float Float;
-};
-
 struct wmplugin_param_info {
         char *name;
         enum wmplugin_param_type type;
-        union wmplugin_param_value value;
+        void *ptr;
 };
 
@@ -91 +90 @@
 typedef struct wmplugin_info *wmplugin_info_t(void);
 typedef int wmplugin_init_t(int, cwiid_wiimote_t *);
-typedef struct wmplugin_data *wmplugin_exec_t(int, union cwiid_mesg * []);
+typedef struct wmplugin_data *wmplugin_exec_t(int, union cwiid_mesg []);
 
-int wmplugin_set_report_mode(int id, uint8_t flags);
+int wmplugin_set_rpt_mode(int id, uint8_t rpt_mode);
 void wmplugin_err(int id, char *str, ...);
 
 #endif
-