WIP, low level python UI functions, so far tested popup menu to work with bpyui.pupMenuBegin, menuItemO and pupMenuEnd functions.

And a popup block with python callback with bpyui.pupBlock, beginBlock, popupBoundsBlock and endBlock funcions.

These functions should not be accessed by scripters directly.

3 files changed, 300 insertions, 0 deletions

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 1b4b611120a..17802ec3a29 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -1,4 +1,7 @@
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <Python.h>
 #include "compile.h"		/* for the PyCodeObject */
 #include "eval.h"		/* for PyEval_EvalCode */
@@ -35,6 +38,17 @@ static PyObject *CreateGlobalDictionary( bContext *C )
 	item = BPY_operator_module(C);
 	PyDict_SetItemString( dict, "bpyoperator", item );
 	Py_DECREF(item);
+
+	
+	// XXX very experemental, consiter this a test, especiall PyCObject is not meant to be perminant
+	item = BPY_ui_module();
+	PyDict_SetItemString( dict, "bpyui", item );
+	Py_DECREF(item);
+	
+	// XXX - evil, need to access context
+	item = PyCObject_FromVoidPtr( C, NULL );
+	PyDict_SetItemString( dict, "__bpy_context__", item );
+	Py_DECREF(item);
 	
 	return dict;
 }
diff --git a/source/blender/python/intern/bpy_ui.c b/source/blender/python/intern/bpy_ui.c
new file mode 100644
index 00000000000..f622c130d6f
--- /dev/null
+++ b/source/blender/python/intern/bpy_ui.c
@@ -0,0 +1,255 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL 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.
+ *
+ * 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.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "bpy_ui.h"
+#include "bpy_compat.h"
+
+#include "BLI_dynstr.h"
+
+#include "MEM_guardedalloc.h"
+#include "BKE_global.h" /* evil G.* */
+#include "BKE_context.h"
+
+#include "DNA_screen_types.h"
+#include "UI_interface.h"
+#include "WM_api.h"
+
+static PyObject *Method_pupMenuBegin( PyObject * self, PyObject * args )
+{
+	char *title; int icon;
+	
+	if( !PyArg_ParseTuple( args, "si:pupMenuBegin", &title, &icon))
+		return NULL;
+	
+	return PyCObject_FromVoidPtr( uiPupMenuBegin(title, icon), NULL );
+}
+
+static PyObject *Method_pupMenuEnd( PyObject * self, PyObject * args )
+{
+	PyObject *py_context, *py_head;
+	
+	if( !PyArg_ParseTuple( args, "O!O!:pupMenuEnd", &PyCObject_Type, &py_context, &PyCObject_Type, &py_head))
+		return NULL;
+	
+	uiPupMenuEnd(PyCObject_AsVoidPtr(py_context), PyCObject_AsVoidPtr(py_head));
+	
+	Py_RETURN_NONE;
+}
+
+static PyObject *Method_menuItemO( PyObject * self, PyObject * args )
+{
+	PyObject *py_head;
+	char *opname;
+	int icon;
+	
+	if( !PyArg_ParseTuple( args, "O!is:menuItemO", &PyCObject_Type, &py_head, &icon, &opname))
+		return NULL;
+	
+	uiMenuItemO(PyCObject_AsVoidPtr(py_head), icon, opname);
+	
+	Py_RETURN_NONE;
+}
+
+static PyObject *Method_defButO( PyObject * self, PyObject * args )
+{
+	PyObject *py_block;
+	char *opname, *butname, *tip;
+	int exec, xco, yco, width, height;
+	
+	if( !PyArg_ParseTuple( args, "O!sisiiiis:defButO", &PyCObject_Type, &py_block, &opname, &exec, &butname, &xco, &yco, &width, &height, &tip))
+		return NULL;
+	
+	return PyCObject_FromVoidPtr(uiDefButO(PyCObject_AsVoidPtr(py_block), BUT, opname, exec, butname, xco, yco, width, height, tip), NULL );
+}
+
+static uiBlock *py_internal_uiBlockCreateFunc(struct bContext *C, struct ARegion *ar, void *arg1)
+{
+	PyObject *ret, *args;
+	
+	args = Py_BuildValue("(NN)", PyCObject_FromVoidPtr(C, NULL), PyCObject_FromVoidPtr(ar, NULL));
+	ret = PyObject_CallObject( (PyObject *)arg1, args );
+	Py_DECREF(args);
+	
+	if (ret==NULL) {
+		PyErr_Print();
+		return NULL;
+	}
+	if (!PyCObject_Check(ret)) {
+		printf("invalid return value, not a PyCObject block\n");
+		return NULL;
+	}
+	
+	return (uiBlock *)PyCObject_AsVoidPtr(ret);
+}
+
+static PyObject *Method_pupBlock( PyObject * self, PyObject * args )
+{
+	PyObject *py_context, *py_func;
+	
+	if( !PyArg_ParseTuple( args, "O!O:pupBlock", &PyCObject_Type, &py_context, &py_func) )
+		return NULL;
+	
+	if (!PyCallable_Check(py_func)) {
+		PyErr_SetString(PyExc_ValueError, "arg not callable");
+		return NULL;
+	}
+	
+	uiPupBlock(PyCObject_AsVoidPtr(py_context), py_internal_uiBlockCreateFunc, (void *)py_func);
+	Py_RETURN_NONE;
+}
+
+static PyObject *Method_beginBlock( PyObject * self, PyObject * args ) // XXX missing 2 args - UI_EMBOSS, UI_HELV, do we care?
+{
+	PyObject *py_context, *py_ar;
+	char *name;
+	
+	if( !PyArg_ParseTuple( args, "O!O!s:beginBlock", &PyCObject_Type, &py_context, &PyCObject_Type, &py_ar, &name) )
+		return NULL;
+	
+	return PyCObject_FromVoidPtr(uiBeginBlock(PyCObject_AsVoidPtr(py_context), PyCObject_AsVoidPtr(py_ar), name, UI_EMBOSS, UI_HELV), NULL);
+}
+
+static PyObject *Method_endBlock( PyObject * self, PyObject * args )
+{
+	PyObject *py_context, *py_block;
+	
+	if( !PyArg_ParseTuple( args, "O!O!:endBlock", &PyCObject_Type, &py_context, &PyCObject_Type, &py_block) )
+		return NULL;
+	
+	uiEndBlock(PyCObject_AsVoidPtr(py_context), PyCObject_AsVoidPtr(py_block));
+	Py_RETURN_NONE;
+}
+
+static PyObject *Method_popupBoundsBlock( PyObject * self, PyObject * args )
+{
+	PyObject *py_block;
+	int addval, mx, my;
+	
+	if( !PyArg_ParseTuple( args, "O!iii:popupBoundsBlock", &PyCObject_Type, &py_block, &addval, &mx, &my) )
+		return NULL;
+	
+	uiPopupBoundsBlock(PyCObject_AsVoidPtr(py_block), addval, mx, my);
+	Py_RETURN_NONE;
+}
+
+static PyObject *Method_blockBeginAlign( PyObject * self, PyObject * args )
+{
+	PyObject *py_block;
+	
+	if( !PyArg_ParseTuple( args, "O!:blockBeginAlign", &PyCObject_Type, &py_block) )
+		return NULL;
+	
+	uiBlockBeginAlign(PyCObject_AsVoidPtr(py_block));
+	Py_RETURN_NONE;
+}
+
+static PyObject *Method_blockEndAlign( PyObject * self, PyObject * args )
+{
+	PyObject *py_block;
+	
+	if( !PyArg_ParseTuple( args, "O!:blockEndAlign", &PyCObject_Type, &py_block))
+		return NULL;
+	
+	uiBlockEndAlign(PyCObject_AsVoidPtr(py_block));
+	Py_RETURN_NONE;
+}
+
+static PyObject *Method_newPanel( PyObject * self, PyObject * args )
+{
+	PyObject *py_context, *py_area, *py_block;
+	char *panelname, *tabname;
+	int ofsx, ofsy, sizex, sizey;
+	
+	if( !PyArg_ParseTuple( args, "O!O!O!ssiiii:newPanel", &PyCObject_Type, &py_context, &PyCObject_Type, &py_area, &PyCObject_Type, &py_block, &panelname, &tabname, &ofsx, &ofsy, &sizex, &sizey))
+		return NULL;
+	
+	return PyLong_FromSize_t(uiNewPanel(PyCObject_AsVoidPtr(py_context), PyCObject_AsVoidPtr(py_area), PyCObject_AsVoidPtr(py_block), panelname, tabname, ofsx, ofsy, sizex, sizey));
+}
+
+/* internal use only */
+static bContext *get_py_context__internal(void)
+{
+	PyObject *globals = PyEval_GetGlobals();
+	PyObject *val= PyDict_GetItemString(globals, "__bpy_context__");
+	return PyCObject_AsVoidPtr(val);
+}
+
+static PyObject *Method_getRegonPtr( PyObject * self )
+{
+	bContext *C= get_py_context__internal();
+	
+	ARegion *ar = CTX_wm_region(C);
+	return PyCObject_FromVoidPtr(ar, NULL);
+}
+
+static PyObject *Method_getAreaPtr( PyObject * self )
+{
+	bContext *C= get_py_context__internal();
+	
+	ScrArea *area = CTX_wm_area(C);
+	return PyCObject_FromVoidPtr(area, NULL);
+}
+
+static PyObject *Method_getScreenPtr( PyObject * self )
+{
+	bContext *C= get_py_context__internal();
+	
+	bScreen *screen= CTX_wm_screen(C);
+	return PyCObject_FromVoidPtr(screen, NULL);
+}
+
+static PyObject *Method_getWindowPtr( PyObject * self )
+{
+	bContext *C= get_py_context__internal();
+	
+	wmWindow *window= CTX_wm_window(C);
+	return PyCObject_FromVoidPtr(window, NULL);
+}
+
+static struct PyMethodDef ui_methods[] = {
+	{"pupMenuBegin", (PyCFunction)Method_pupMenuBegin, METH_VARARGS, ""},
+	{"pupMenuEnd", (PyCFunction)Method_pupMenuEnd, METH_VARARGS, ""},
+	{"menuItemO", (PyCFunction)Method_menuItemO, METH_VARARGS, ""},
+	{"defButO", (PyCFunction)Method_defButO, METH_VARARGS, ""},
+	{"pupBlock", (PyCFunction)Method_pupBlock, METH_VARARGS, ""},
+	{"beginBlock", (PyCFunction)Method_beginBlock, METH_VARARGS, ""},
+	{"endBlock", (PyCFunction)Method_endBlock, METH_VARARGS, ""},
+	{"popupBoundsBlock", (PyCFunction)Method_popupBoundsBlock, METH_VARARGS, ""},
+	{"blockBeginAlign", (PyCFunction)Method_blockBeginAlign, METH_VARARGS, ""},
+	{"blockEndAlign", (PyCFunction)Method_blockEndAlign, METH_VARARGS, ""},
+	{"newPanel", (PyCFunction)Method_newPanel, METH_VARARGS, ""},
+	
+	{"getRegonPtr", (PyCFunction)Method_getRegonPtr,	METH_NOARGS, ""}, // XXX Nasty, we really need to improve dealing with context!
+	{"getAreaPtr", (PyCFunction)Method_getAreaPtr,		METH_NOARGS, ""},
+	{"getScreenPtr", (PyCFunction)Method_getScreenPtr, METH_NOARGS, ""},
+	{"getWindowPtr", (PyCFunction)Method_getWindowPtr, METH_NOARGS, ""},
+	{NULL, NULL, 0, NULL}
+};
+
+PyObject *BPY_ui_module( void )
+{
+	PyObject *submodule;
+	submodule = Py_InitModule3( "bpyui", ui_methods, "" );
+	return submodule;
+}
diff --git a/source/blender/python/intern/bpy_ui.h b/source/blender/python/intern/bpy_ui.h
new file mode 100644
index 00000000000..4182a32d3f0
--- /dev/null
+++ b/source/blender/python/intern/bpy_ui.h
@@ -0,0 +1,31 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL 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.
+ *
+ * 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.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef BPY_UI_H__
+#define BPY_UI_H__
+
+#include <Python.h>
+
+PyObject *BPY_ui_module( void );
+
+#endif