- template with an example of a modal operator drawing with opengl (draw a line on the screen)

- access to event.mouse_region_x/y
- basic type checking to callback functions (use PyCapsule names)

3 files changed, 31 insertions, 12 deletions

diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index a16c1956cc4..87424dda04d 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -170,8 +170,7 @@ static void unit_dual_convert(double value, bUnitCollection *usys,
 {
 	bUnitDef *unit= unit_best_fit(value, usys, NULL, 1);
 
-	if(value < 0.0) *value_a= -floor(-value/unit->scalar) * unit->scalar;
-	else			*value_a=  floor( value/unit->scalar) * unit->scalar;
+	*value_a=  (value < 0.0 ? ceil:floor)(value/unit->scalar) * unit->scalar;
 	*value_b= value - (*value_a);
 
 	*unit_a=	unit;
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 9b2a49b6ee5..a76030d9960 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1088,6 +1088,16 @@ static void rna_def_event(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "y");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Mouse Y Position", "The window relative horizontal location of the mouse");
+
+	prop= RNA_def_property(srna, "mouse_region_x", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "mval[0]");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Mouse X Position", "The region relative vertical location of the mouse");
+
+	prop= RNA_def_property(srna, "mouse_region_y", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "mval[1]");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Mouse Y Position", "The region relative horizontal location of the mouse");
 	
 	prop= RNA_def_property(srna, "mouse_prev_x", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "prevx");
diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c
index ee0c5cb143b..ab97d7c3446 100644
--- a/source/blender/python/intern/bpy_rna_callback.c
+++ b/source/blender/python/intern/bpy_rna_callback.c
@@ -32,12 +32,9 @@
 #include "BKE_context.h"
 #include "ED_space_api.h"
 
-EnumPropertyItem region_draw_mode_items[] = {
-	{REGION_DRAW_POST_VIEW, "POST_VIEW", 0, "Pose View", ""},
-	{REGION_DRAW_POST_PIXEL, "POST_PIXEL", 0, "Post Pixel", ""},
-	{REGION_DRAW_PRE_VIEW, "PRE_VIEW", 0, "Pre View", ""},
-	{0, NULL, 0, NULL, NULL}};
-
+/* use this to stop other capsules from being mis-used */
+#define RNA_CAPSULE_ID "RNA_HANDLE"
+#define RNA_CAPSULE_ID_INVALID "RNA_HANDLE_REMOVED"
 
 void cb_region_draw(const bContext *C, ARegion *ar, void *customdata)
 {
@@ -74,6 +71,12 @@ PyObject *pyrna_callback_add(BPy_StructRNA *self, PyObject *args)
 
 	if(RNA_struct_is_a(self->ptr.type, &RNA_Region)) {
 
+		EnumPropertyItem region_draw_mode_items[] = {
+			{REGION_DRAW_POST_VIEW, "POST_VIEW", 0, "Pose View", ""},
+			{REGION_DRAW_POST_PIXEL, "POST_PIXEL", 0, "Post Pixel", ""},
+			{REGION_DRAW_PRE_VIEW, "PRE_VIEW", 0, "Pre View", ""},
+			{0, NULL, 0, NULL, NULL}};
+
 		if(pyrna_enum_value_from_id(region_draw_mode_items, cb_event_str, &cb_event, "bpy_struct.callback_add()") < 0)
 			return NULL;
 
@@ -81,24 +84,28 @@ PyObject *pyrna_callback_add(BPy_StructRNA *self, PyObject *args)
 		Py_INCREF(args);
 	}
 	else {
-		PyErr_SetString(PyExc_TypeError, "callbcak_add(): type does not suppport cllbacks");
+		PyErr_SetString(PyExc_TypeError, "callback_add(): type does not suppport callbacks");
 		return NULL;
 	}
 
-	return PyCapsule_New((void *)handle, NULL, NULL);
+	return PyCapsule_New((void *)handle, RNA_CAPSULE_ID, NULL);
 }
 
 PyObject *pyrna_callback_remove(BPy_StructRNA *self, PyObject *args)
 {
 	PyObject *py_handle;
-	PyObject *py_args;
 	void *handle;
 	void *customdata;
 
 	if (!PyArg_ParseTuple(args, "O!:callback_remove", &PyCapsule_Type, &py_handle))
 		return NULL;
 
-	handle= PyCapsule_GetPointer(py_handle, NULL);
+	handle= PyCapsule_GetPointer(py_handle, RNA_CAPSULE_ID);
+
+	if(handle==NULL) {
+		PyErr_SetString(PyExc_ValueError, "callback_remove(handle): NULL handle given, invalid or already removed.");
+		return NULL;
+	}
 
 	if(RNA_struct_is_a(self->ptr.type, &RNA_Region)) {
 		customdata= ED_region_draw_cb_customdata(handle);
@@ -107,5 +114,8 @@ PyObject *pyrna_callback_remove(BPy_StructRNA *self, PyObject *args)
 		ED_region_draw_cb_exit(((ARegion *)self->ptr.data)->type, handle);
 	}
 
+	/* dont allow reuse */
+	PyCapsule_SetName(py_handle, RNA_CAPSULE_ID_INVALID);
+
 	Py_RETURN_NONE;
 }