Implemented enough functionality to actually execute Python from within

Blender.
* Moved api2_2x/interface.c to ./BPY_interface.c
  This will be the general api layer from which all variants of the Blender
  api. Currently only the 2.2x variant is initialised.
* Used swig (www.swig.org) to create Python wrappers for a couple of dummy
  functions.
* Started implementation of the Blender and Blender.Object modules.

Michel

1 files changed, 270 insertions, 0 deletions

diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
new file mode 100644
index 00000000000..87acc182160
--- /dev/null
+++ b/source/blender/python/BPY_interface.c
@@ -0,0 +1,270 @@
+/* 
+ *
+ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * This is a new part of Blender.
+ *
+ * Contributor(s): Michel Selten
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <Python.h>
+#include <stdio.h>
+
+#include <BKE_text.h>
+#include <DNA_ID.h>
+#include <DNA_space_types.h>
+#include <DNA_text_types.h>
+
+#include <BPY_extern.h>
+
+#include "api2_2x/interface.h"
+
+/*
+ * Structure definitions
+ */
+#define FILENAME_LENGTH 24
+typedef struct _ScriptError {
+	char filename[FILENAME_LENGTH];
+	int lineno;
+} ScriptError;
+
+/*
+ * Global variables
+ */
+ScriptError g_script_error;
+
+/*
+ * Function prototypes
+ */
+PyObject * RunPython(Text *text, PyObject *globaldict);
+char *     GetName(Text *text);
+
+/*
+ * Description: This function will initialise Python and all the implemented
+ *              api variations.
+ * Notes:       Currently only the api for 2.2x will be initialised.
+ */   
+void BPY_start_python(void)
+{
+	printf ("In BPY_start_python\n");
+/* TODO: Shouldn't "blender" be replaced by PACKAGE ?? (config.h) */
+	Py_SetProgramName("blender");
+
+	Py_Initialize ();
+
+	initBlenderApi2_2x ();
+
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_end_python(void)
+{
+	printf ("In BPY_end_python\n");
+	return;
+}
+
+/*
+ * Description: This function will return the linenumber on which an error
+ *              has occurred in the Python script.
+ */   
+int BPY_Err_getLinenumber(void)
+{
+	printf ("In BPY_Err_getLinenumber\n");
+	return g_script_error.lineno;
+}
+
+/*
+ * Description: This function will return the filename of the python script.
+ */   
+const char *BPY_Err_getFilename(void)
+{
+	printf ("In BPY_Err_getFilename\n");
+	return g_script_error.filename;
+}
+
+/*
+ * Description: This function executes the script passed by st.
+ * Notes:       Currently, the script is compiled each time it is executed,
+ *              This should be optimized to store the compiled bytecode as has
+ *              been done by the previous implementation.
+ */   
+struct _object *BPY_txt_do_python(struct SpaceText* st)
+{
+	PyObject *	dict;
+	PyObject *	ret;
+	printf ("In BPY_txt_do_python\n");
+
+	if (!st->text)
+	{
+		return NULL;
+	}
+
+	dict = PyModule_GetDict(PyImport_AddModule("__main__"));
+	/* dict = newGlobalDictionary(); */
+	ret = RunPython (st->text, dict);
+
+	return dict;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_free_compiled_text(struct Text* text)
+{
+	printf ("In BPY_free_compiled_text\n");
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_clear_bad_scriptlinks(struct Text *byebye)
+{
+	printf ("In BPY_clear_bad_scriptlinks\n");
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_do_all_scripts(short event)
+{
+	printf ("In BPY_do_all_scripts(event=%d)\n",event);
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_do_pyscript(struct ID *id, short event)
+{
+	printf ("In BPY_do_pyscript(id=?, event=%d)\n",event);
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_free_scriptlink(struct ScriptLink *slink)
+{
+	printf ("In BPY_free_scriptlink\n");
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_copy_scriptlink(struct ScriptLink *scriptlink)
+{
+	printf ("In BPY_copy_scriptlink\n");
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+int BPY_call_importloader(char *name)
+{
+	printf ("In BPY_call_importloader(name=%s)\n",name);
+	return (0);
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+int BPY_spacetext_is_pywin(struct SpaceText *st)
+{
+	/* No printf is done here because it is called with every mouse move */
+	return (0);
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_spacetext_do_pywin_draw(struct SpaceText *st)
+{
+	printf ("In BPY_spacetext_do_pywin_draw\n");
+	return;
+}
+
+/*
+ * Description:
+ * Notes:       Not implemented yet
+ */   
+void BPY_spacetext_do_pywin_event(struct SpaceText *st,
+                                  unsigned short event,
+                                  short val)
+{
+	printf ("In BPY_spacetext_do_pywin_event(st=?, event=%d, val=%d)\n",
+	        event, val);
+	return;
+}
+
+/*
+ * Private functions
+ */
+
+/*
+ * Description: This function executes the python script passed by text.
+ *              The Python dictionary containing global variables needs to
+ *              be passed in globaldict.
+ */   
+PyObject * RunPython(Text *text, PyObject *globaldict)
+{
+	PyObject * ret;
+	char     * buf;
+
+	printf("Run Python script \"%s\" ...\n", GetName(text));
+	buf = txt_to_buf(text);
+	ret = PyRun_String (buf, Py_file_input, globaldict, globaldict);
+
+	MEM_freeN (buf);
+	return ret;
+}
+
+/*
+ * Description: This function returns the value of the name field of the
+ *              given Text struct.
+ */   
+char * GetName(Text *text)
+{
+	return (text->id.name+2);
+}
+