diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/pycore.c | 33 | ||||
| -rw-r--r-- | src/pycore.h | 4 | ||||
| -rw-r--r-- | src/pyirssi.h | 2 |
4 files changed, 29 insertions, 20 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5a28039..d5356a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,16 +1,16 @@ moduledir = $(libdir)/irssi/modules wrappersdir = $(datadir)/irssi/scripts -module_LTLIBRARIES = libirssi_python.la +module_LTLIBRARIES = libpython.la -libirssi_python_la_DEPENDENCIES = objects/libobjects.la -libirssi_python_la_LIBADD = $(PYTHON_LDFLAGS) objects/libobjects.la -libirssi_python_la_LDFLAGS = -avoid-version +libpython_la_DEPENDENCIES = objects/libobjects.la +libpython_la_LIBADD = $(PYTHON_LDFLAGS) objects/libobjects.la +libpython_la_LDFLAGS = -avoid-version INCLUDES = $(IRSSI_PYTHON_INCLUDES) \ -I$(top_srcdir)/src/objects \ -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" -libirssi_python_la_SOURCES = \ +libpython_la_SOURCES = \ pycore.c \ pyutils.c \ pymodule.c \ diff --git a/src/pycore.c b/src/pycore.c index f367e5f..0003392 100644 --- a/src/pycore.c +++ b/src/pycore.c @@ -32,7 +32,14 @@ #include "pyconstants.h" #include "factory.h" -/*XXX: copy parse into utils */ +static void cmd_default(const char *data, SERVER_REC *server, void *item) +{ + if (!*data) + data = "list"; + + command_runsub("py", data, server, item); +} + static void cmd_exec(const char *data) { PyObject *co; @@ -136,7 +143,7 @@ static void intr_catch(int sig) } #endif -void irssi_python_init(void) +void python_init(void) { Py_InitializeEx(0); @@ -156,21 +163,23 @@ void irssi_python_init(void) "import irssi_startup\n" ); - //assert(signal(SIGINT, intr_catch) != SIG_ERR); + /* assert(signal(SIGINT, intr_catch) != SIG_ERR); */ - command_bind("pyload", NULL, (SIGNAL_FUNC) cmd_load); - command_bind("pyunload", NULL, (SIGNAL_FUNC) cmd_unload); - command_bind("pylist", NULL, (SIGNAL_FUNC) cmd_list); - command_bind("pyexec", NULL, (SIGNAL_FUNC) cmd_exec); + command_bind("py", NULL, (SIGNAL_FUNC) cmd_default); + command_bind("py load", NULL, (SIGNAL_FUNC) cmd_load); + command_bind("py unload", NULL, (SIGNAL_FUNC) cmd_unload); + command_bind("py list", NULL, (SIGNAL_FUNC) cmd_list); + command_bind("py exec", NULL, (SIGNAL_FUNC) cmd_exec); module_register(MODULE_NAME, "core"); } -void irssi_python_deinit(void) +void python_deinit(void) { - command_unbind("pyload", (SIGNAL_FUNC) cmd_load); - command_unbind("pyunload", (SIGNAL_FUNC) cmd_unload); - command_unbind("pylist", (SIGNAL_FUNC) cmd_list); - command_unbind("pyexec", (SIGNAL_FUNC) cmd_exec); + command_unbind("py", (SIGNAL_FUNC) cmd_default); + command_unbind("py load", (SIGNAL_FUNC) cmd_load); + command_unbind("py unload", (SIGNAL_FUNC) cmd_unload); + command_unbind("py list", (SIGNAL_FUNC) cmd_list); + command_unbind("py exec", (SIGNAL_FUNC) cmd_exec); pymodule_deinit(); pyloader_deinit(); diff --git a/src/pycore.h b/src/pycore.h index ae51924..f3f1c36 100644 --- a/src/pycore.h +++ b/src/pycore.h @@ -1,7 +1,7 @@ #ifndef _PYCORE_H #define _PYCORE_H -void irssi_python_init(void); -void irssi_python_deinit(void); +void python_init(void); +void python_deinit(void); #endif diff --git a/src/pyirssi.h b/src/pyirssi.h index 3fc4223..1db4dfd 100644 --- a/src/pyirssi.h +++ b/src/pyirssi.h @@ -1,7 +1,7 @@ #ifndef _PYIRSSI_H_ #define _PYIRSSI_H_ -#define MODULE_NAME "irssi_python" +#define MODULE_NAME "python" #include "config.h" #include "core.h" #include "common.h" |