Support units in modal numinput

Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.

We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).

Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.

Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).

Related to T37600.

Reviewers: brecht, campbellbarton, carter2422

Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!

Differential Revision: http://developer.blender.org/D61

3 files changed, 367 insertions, 260 deletions

diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index ddb58cd6c7b..9a6131f76e9 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -36,6 +36,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_editmesh.h"
+#include "BKE_unit.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -74,18 +75,23 @@ typedef struct {
 
 static void edbm_bevel_update_header(wmOperator *op, bContext *C)
 {
-	const char *str = IFACE_("Confirm: Enter/LClick, Cancel: (Esc/RMB), Offset: %s, Segments: %d");
+	const char *str = IFACE_("Confirm: (Enter/LMB), Cancel: (Esc/RMB), Offset: %s, Segments: %d");
 
 	char msg[HEADER_LENGTH];
 	ScrArea *sa = CTX_wm_area(C);
 
 	if (sa) {
+		BevelData *opdata = op->customdata;
 		char offset_str[NUM_STR_REP_LEN];
-		BLI_snprintf(offset_str, NUM_STR_REP_LEN, "%f", RNA_float_get(op->ptr, "offset"));
-		BLI_snprintf(msg, HEADER_LENGTH, str,
-		             offset_str,
-		             RNA_int_get(op->ptr, "segments")
-		            );
+
+		if (hasNumInput(&opdata->num_input)) {
+			outputNumInput(&opdata->num_input, offset_str);
+		}
+		else {
+			BLI_snprintf(offset_str, NUM_STR_REP_LEN, "%f", RNA_float_get(op->ptr, "offset"));
+		}
+
+		BLI_snprintf(msg, HEADER_LENGTH, str, offset_str, RNA_int_get(op->ptr, "segments"));
 
 		ED_area_headerprint(sa, msg);
 	}
@@ -94,6 +100,7 @@ static void edbm_bevel_update_header(wmOperator *op, bContext *C)
 static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 {
 	Object *obedit = CTX_data_edit_object(C);
+	Scene *scene = CTX_data_scene(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BevelData *opdata;
 
@@ -108,7 +115,10 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 	opdata->shift_factor = -1.0f;
 
 	initNumInput(&opdata->num_input);
-	opdata->num_input.flag = NUM_NO_NEGATIVE;
+	opdata->num_input.idx_max = 0;
+	opdata->num_input.val_flag[0] |= NUM_NO_NEGATIVE;
+	opdata->num_input.unit_sys = scene->unit.system;
+	opdata->num_input.unit_type[0] = B_UNIT_NONE;  /* Not sure this is a factor or a unit? */
 
 	/* avoid the cost of allocating a bm copy */
 	if (is_modal) {
@@ -306,10 +316,9 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 	BevelData *opdata = op->customdata;
 	int segments = RNA_int_get(op->ptr, "segments");
 
-	if (event->val == KM_PRESS) {
-		/* Try to handle numeric inputs... */
-
-		if (handleNumInput(&opdata->num_input, event)) {
+	if (event->val == KM_PRESS && hasNumInput(&opdata->num_input)) {
+		/* Modal numinput active, try to handle numeric inputs first... */
+		if (handleNumInput(C, &opdata->num_input, event)) {
 			float value = RNA_float_get(op->ptr, "offset");
 			applyNumInput(&opdata->num_input, &value);
 			RNA_float_set(op->ptr, "offset", value);
@@ -318,51 +327,73 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			return OPERATOR_RUNNING_MODAL;
 		}
 	}
+	else {
+		bool handled = false;
+		switch (event->type) {
+			case ESCKEY:
+			case RIGHTMOUSE:
+				edbm_bevel_cancel(C, op);
+				return OPERATOR_CANCELLED;
+
+			case MOUSEMOVE:
+				if (!hasNumInput(&opdata->num_input)) {
+					const float factor = edbm_bevel_mval_factor(op, event);
+					RNA_float_set(op->ptr, "offset", factor);
+
+					edbm_bevel_calc(op);
+					edbm_bevel_update_header(op, C);
+					handled = true;
+				}
+				break;
+
+			case LEFTMOUSE:
+			case PADENTER:
+			case RETKEY:
+				edbm_bevel_calc(op);
+				edbm_bevel_exit(C, op);
+				return OPERATOR_FINISHED;
 
-	switch (event->type) {
-		case ESCKEY:
-		case RIGHTMOUSE:
-			edbm_bevel_cancel(C, op);
-			return OPERATOR_CANCELLED;
+			/* Note this will prevent padplus and padminus to ever activate modal numinput.
+			 * This is not really an issue though, as we only expect positive values here...
+			 * Else we could force them to only modify segments number when shift is pressed, or so.
+			 */
 
-		case MOUSEMOVE:
-			if (!hasNumInput(&opdata->num_input)) {
-				const float factor = edbm_bevel_mval_factor(op, event);
-				RNA_float_set(op->ptr, "offset", factor);
+			case WHEELUPMOUSE:  /* change number of segments */
+			case PADPLUSKEY:
+				if (event->val == KM_RELEASE)
+					break;
 
+				segments++;
+				RNA_int_set(op->ptr, "segments", segments);
 				edbm_bevel_calc(op);
 				edbm_bevel_update_header(op, C);
-			}
-			break;
-
-		case LEFTMOUSE:
-		case PADENTER:
-		case RETKEY:
-			edbm_bevel_calc(op);
-			edbm_bevel_exit(C, op);
-			return OPERATOR_FINISHED;
-
-		case WHEELUPMOUSE:  /* change number of segments */
-		case PADPLUSKEY:
-			if (event->val == KM_RELEASE)
+				handled = true;
 				break;
 
-			segments++;
-			RNA_int_set(op->ptr, "segments", segments);
-			edbm_bevel_calc(op);
-			edbm_bevel_update_header(op, C);
-			break;
+			case WHEELDOWNMOUSE:  /* change number of segments */
+			case PADMINUS:
+				if (event->val == KM_RELEASE)
+					break;
 
-		case WHEELDOWNMOUSE:  /* change number of segments */
-		case PADMINUS:
-			if (event->val == KM_RELEASE)
+				segments = max_ii(segments - 1, 1);
+				RNA_int_set(op->ptr, "segments", segments);
+				edbm_bevel_calc(op);
+				edbm_bevel_update_header(op, C);
+				handled = true;
 				break;
+		}
 
-			segments = max_ii(segments - 1, 1);
-			RNA_int_set(op->ptr, "segments", segments);
-			edbm_bevel_calc(op);
-			edbm_bevel_update_header(op, C);
-			break;
+		if (!handled && event->val == KM_PRESS) {
+			/* Modal numinput inactive, try to handle numeric inputs last... */
+			if (handleNumInput(C, &opdata->num_input, event)) {
+				float value = RNA_float_get(op->ptr, "offset");
+				applyNumInput(&opdata->num_input, &value);
+				RNA_float_set(op->ptr, "offset", value);
+				edbm_bevel_calc(op);
+				edbm_bevel_update_header(op, C);
+				return OPERATOR_RUNNING_MODAL;
+			}
+		}
 	}
 
 	return OPERATOR_RUNNING_MODAL;
diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c
index 137554459ce..5f23a5deb97 100644
--- a/source/blender/editors/mesh/editmesh_inset.c
+++ b/source/blender/editors/mesh/editmesh_inset.c
@@ -36,6 +36,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_editmesh.h"
+#include "BKE_unit.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -110,6 +111,7 @@ static void edbm_inset_update_header(wmOperator *op, bContext *C)
 static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 {
 	InsetData *opdata;
+	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
@@ -129,6 +131,9 @@ static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 
 	initNumInput(&opdata->num_input);
 	opdata->num_input.idx_max = 1; /* Two elements. */
+	opdata->num_input.unit_sys = scene->unit.system;
+	opdata->num_input.unit_type[0] = B_UNIT_LENGTH;
+	opdata->num_input.unit_type[1] = B_UNIT_LENGTH;
 
 	if (is_modal) {
 		View3D *v3d = CTX_wm_view3d(C);
@@ -291,10 +296,9 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	InsetData *opdata = op->customdata;
 
-	if (event->val == KM_PRESS) {
-		/* Try to handle numeric inputs... */
-
-		if (handleNumInput(&opdata->num_input, event)) {
+	if (event->val == KM_PRESS && hasNumInput(&opdata->num_input)) {
+		/* Modal numinput active, try to handle numeric inputs first... */
+		if (handleNumInput(C, &opdata->num_input, event)) {
 			float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
 			                    RNA_float_get(op->ptr, "depth")};
 			applyNumInput(&opdata->num_input, amounts);
@@ -312,134 +316,163 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			}
 		}
 	}
+	else {
+		bool handled = false;
+		switch (event->type) {
+			case ESCKEY:
+			case RIGHTMOUSE:
+				edbm_inset_cancel(C, op);
+				return OPERATOR_CANCELLED;
 
-	switch (event->type) {
-		case ESCKEY:
-		case RIGHTMOUSE:
-			edbm_inset_cancel(C, op);
-			return OPERATOR_CANCELLED;
-
-		case MOUSEMOVE:
-			if (!hasNumInput(&opdata->num_input)) {
-				float mdiff[2];
-				float amount;
-
-				mdiff[0] = opdata->mcenter[0] - event->mval[0];
-				mdiff[1] = opdata->mcenter[1] - event->mval[1];
-
-				if (opdata->modify_depth)
-					amount = opdata->old_depth     + ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
-				else
-					amount = opdata->old_thickness - ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
-
-				/* Fake shift-transform... */
-				if (opdata->shift)
-					amount = (amount - opdata->shift_amount) * 0.1f + opdata->shift_amount;
-
-				if (opdata->modify_depth)
-					RNA_float_set(op->ptr, "depth", amount);
-				else {
-					amount = max_ff(amount, 0.0f);
-					RNA_float_set(op->ptr, "thickness", amount);
+			case MOUSEMOVE:
+				if (!hasNumInput(&opdata->num_input)) {
+					float mdiff[2];
+					float amount;
+
+					mdiff[0] = opdata->mcenter[0] - event->mval[0];
+					mdiff[1] = opdata->mcenter[1] - event->mval[1];
+
+					if (opdata->modify_depth)
+						amount = opdata->old_depth     + ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
+					else
+						amount = opdata->old_thickness - ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
+
+					/* Fake shift-transform... */
+					if (opdata->shift)
+						amount = (amount - opdata->shift_amount) * 0.1f + opdata->shift_amount;
+
+					if (opdata->modify_depth)
+						RNA_float_set(op->ptr, "depth", amount);
+					else {
+						amount = max_ff(amount, 0.0f);
+						RNA_float_set(op->ptr, "thickness", amount);
+					}
+
+					if (edbm_inset_calc(op))
+						edbm_inset_update_header(op, C);
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
+				}
+				break;
+
+			case LEFTMOUSE:
+			case PADENTER:
+			case RETKEY:
+				edbm_inset_calc(op);
+				edbm_inset_exit(C, op);
+				return OPERATOR_FINISHED;
+
+			case LEFTSHIFTKEY:
+			case RIGHTSHIFTKEY:
+				if (event->val == KM_PRESS) {
+					if (opdata->modify_depth)
+						opdata->shift_amount = RNA_float_get(op->ptr, "depth");
+					else
+						opdata->shift_amount = RNA_float_get(op->ptr, "thickness");
+					opdata->shift = true;
+					handled = true;
 				}
-
-				if (edbm_inset_calc(op))
-					edbm_inset_update_header(op, C);
 				else {
-					edbm_inset_cancel(C, op);
-					return OPERATOR_CANCELLED;
+					opdata->shift_amount = 0.0f;
+					opdata->shift = false;
+					handled = true;
 				}
-			}
-			break;
-
-		case LEFTMOUSE:
-		case PADENTER:
-		case RETKEY:
-			edbm_inset_calc(op);
-			edbm_inset_exit(C, op);
-			return OPERATOR_FINISHED;
-
-		case LEFTSHIFTKEY:
-		case RIGHTSHIFTKEY:
-			if (event->val == KM_PRESS) {
-				if (opdata->modify_depth)
-					opdata->shift_amount = RNA_float_get(op->ptr, "depth");
-				else
-					opdata->shift_amount = RNA_float_get(op->ptr, "thickness");
-				opdata->shift = true;
-			}
-			else {
-				opdata->shift_amount = 0.0f;
-				opdata->shift = false;
-			}
-			break;
-
-		case LEFTCTRLKEY:
-		case RIGHTCTRLKEY:
-		{
-			float mlen[2];
+				break;
 
-			mlen[0] = opdata->mcenter[0] - event->mval[0];
-			mlen[1] = opdata->mcenter[1] - event->mval[1];
-
-			if (event->val == KM_PRESS) {
-				opdata->old_thickness = RNA_float_get(op->ptr, "thickness");
-				if (opdata->shift)
-					opdata->shift_amount = opdata->old_thickness;
-				opdata->modify_depth = true;
-			}
-			else {
-				opdata->old_depth = RNA_float_get(op->ptr, "depth");
-				if (opdata->shift)
-					opdata->shift_amount = opdata->old_depth;
-				opdata->modify_depth = false;
-			}
-			opdata->initial_length = len_v2(mlen);
+			case LEFTCTRLKEY:
+			case RIGHTCTRLKEY:
+			{
+				float mlen[2];
 
-			edbm_inset_update_header(op, C);
-			break;
-		}
+				mlen[0] = opdata->mcenter[0] - event->mval[0];
+				mlen[1] = opdata->mcenter[1] - event->mval[1];
 
-		case OKEY:
-			if (event->val == KM_PRESS) {
-				const bool use_outset = RNA_boolean_get(op->ptr, "use_outset");
-				RNA_boolean_set(op->ptr, "use_outset", !use_outset);
-				if (edbm_inset_calc(op)) {
-					edbm_inset_update_header(op, C);
+				if (event->val == KM_PRESS) {
+					opdata->old_thickness = RNA_float_get(op->ptr, "thickness");
+					if (opdata->shift)
+						opdata->shift_amount = opdata->old_thickness;
+					opdata->modify_depth = true;
 				}
 				else {
-					edbm_inset_cancel(C, op);
-					return OPERATOR_CANCELLED;
+					opdata->old_depth = RNA_float_get(op->ptr, "depth");
+					if (opdata->shift)
+						opdata->shift_amount = opdata->old_depth;
+					opdata->modify_depth = false;
 				}
+				opdata->initial_length = len_v2(mlen);
+
+				edbm_inset_update_header(op, C);
+				handled = true;
+				break;
 			}
-			break;
-		case BKEY:
-			if (event->val == KM_PRESS) {
-				const bool use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
-				RNA_boolean_set(op->ptr, "use_boundary", !use_boundary);
-				if (edbm_inset_calc(op)) {
-					edbm_inset_update_header(op, C);
+
+			case OKEY:
+				if (event->val == KM_PRESS) {
+					const bool use_outset = RNA_boolean_get(op->ptr, "use_outset");
+					RNA_boolean_set(op->ptr, "use_outset", !use_outset);
+					if (edbm_inset_calc(op)) {
+						edbm_inset_update_header(op, C);
+					}
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
 				}
-				else {
-					edbm_inset_cancel(C, op);
-					return OPERATOR_CANCELLED;
+				break;
+			case BKEY:
+				if (event->val == KM_PRESS) {
+					const bool use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
+					RNA_boolean_set(op->ptr, "use_boundary", !use_boundary);
+					if (edbm_inset_calc(op)) {
+						edbm_inset_update_header(op, C);
+					}
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
 				}
-			}
-			break;
-		case IKEY:
-			if (event->val == KM_PRESS) {
-				const bool use_individual = RNA_boolean_get(op->ptr, "use_individual");
-				RNA_boolean_set(op->ptr, "use_individual", !use_individual);
+				break;
+			case IKEY:
+				if (event->val == KM_PRESS) {
+					const bool use_individual = RNA_boolean_get(op->ptr, "use_individual");
+					RNA_boolean_set(op->ptr, "use_individual", !use_individual);
+					if (edbm_inset_calc(op)) {
+						edbm_inset_update_header(op, C);
+					}
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
+				}
+				break;
+		}
+
+		if (!handled && event->val == KM_PRESS) {
+			/* Modal numinput inactive, try to handle numeric inputs last... */
+			if (handleNumInput(C, &opdata->num_input, event)) {
+				float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
+				                    RNA_float_get(op->ptr, "depth")};
+				applyNumInput(&opdata->num_input, amounts);
+				amounts[0] = max_ff(amounts[0], 0.0f);
+				RNA_float_set(op->ptr, "thickness", amounts[0]);
+				RNA_float_set(op->ptr, "depth", amounts[1]);
+
 				if (edbm_inset_calc(op)) {
 					edbm_inset_update_header(op, C);
+					return OPERATOR_RUNNING_MODAL;
 				}
 				else {
 					edbm_inset_cancel(C, op);
 					return OPERATOR_CANCELLED;
 				}
 			}
-			break;
-
+		}
 	}
 
 	return OPERATOR_RUNNING_MODAL;
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 9223f6d9450..fd24981bde0 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -43,6 +43,7 @@
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
 #include "BKE_DerivedMesh.h"
+#include "BKE_unit.h"
 
 #include "BIF_gl.h"
 
@@ -392,6 +393,7 @@ static void ringsel_exit(bContext *UNUSED(C), wmOperator *op)
 static int ringsel_init(bContext *C, wmOperator *op, bool do_cut)
 {
 	RingSelOpData *lcd;
+	Scene *scene = CTX_data_scene(C);
 
 	/* alloc new customdata */
 	lcd = op->customdata = MEM_callocN(sizeof(RingSelOpData), "ringsel Modal Op Data");
@@ -405,8 +407,12 @@ static int ringsel_init(bContext *C, wmOperator *op, bool do_cut)
 	lcd->do_cut = do_cut;
 	
 	initNumInput(&lcd->num);
-	lcd->num.idx_max = 0;
-	lcd->num.flag |= NUM_NO_NEGATIVE | NUM_NO_FRACTION;
+	lcd->num.idx_max = 1;
+	lcd->num.val_flag[0] |= NUM_NO_NEGATIVE | NUM_NO_FRACTION;
+	/* No specific flags for smoothness. */
+	lcd->num.unit_sys = scene->unit.system;
+	lcd->num.unit_type[0] = B_UNIT_NONE;
+	lcd->num.unit_type[1] = B_UNIT_NONE;
 
 	/* XXX, temp, workaround for [#	] */
 	EDBM_mesh_ensure_valid_dm_hack(CTX_data_scene(C), lcd->em);
@@ -529,126 +535,163 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event)
 
 	view3d_operator_needs_opengl(C);
 
-	switch (event->type) {
-		case RETKEY:
-		case PADENTER:
-		case LEFTMOUSE: /* confirm */ // XXX hardcoded
-			if (event->val == KM_PRESS) {
-				/* finish */
+	/* using the keyboard to input the number of cuts */
+	if (event->val == KM_PRESS && hasNumInput(&lcd->num)) {
+		/* Modal numinput active, try to handle numeric inputs first... */
+		if (handleNumInput(C, &lcd->num, event)) {
+			float values[2] = {(float)cuts, smoothness};
+			applyNumInput(&lcd->num, values);
+			
+			/* allow zero so you can backspace and type in a value
+			 * otherwise 1 as minimum would make more sense */
+			cuts = CLAMPIS(values[0], 0, SUBD_CUTS_MAX);
+			smoothness = CLAMPIS(values[1], -SUBD_SMOOTH_MAX, SUBD_SMOOTH_MAX);
+			
+			RNA_int_set(op->ptr, "number_cuts", cuts);
+			ringsel_find_edge(lcd, cuts);
+			show_cuts = true;
+			RNA_float_set(op->ptr, "smoothness", smoothness);
+			
+			ED_region_tag_redraw(lcd->ar);
+		}
+	}
+	else {
+		bool handled = false;
+		switch (event->type) {
+			case RETKEY:
+			case PADENTER:
+			case LEFTMOUSE: /* confirm */ // XXX hardcoded
+				if (event->val == KM_PRESS) {
+					/* finish */
+					ED_region_tag_redraw(lcd->ar);
+					ED_area_headerprint(CTX_wm_area(C), NULL);
+
+					if (lcd->eed) {
+						/* set for redo */
+						BM_mesh_elem_index_ensure(lcd->em->bm, BM_EDGE);
+						RNA_int_set(op->ptr, "edge_index", BM_elem_index_get(lcd->eed));
+
+						/* execute */
+						ringsel_finish(C, op);
+						ringsel_exit(C, op);
+					}
+					else {
+						ringcut_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+
+					return OPERATOR_FINISHED;
+				}
+				
+				ED_region_tag_redraw(lcd->ar);
+				handled = true;
+				break;
+			case RIGHTMOUSE: /* abort */ // XXX hardcoded
 				ED_region_tag_redraw(lcd->ar);
+				ringsel_exit(C, op);
 				ED_area_headerprint(CTX_wm_area(C), NULL);
 
-				if (lcd->eed) {
-					/* set for redo */
-					BM_mesh_elem_index_ensure(lcd->em->bm, BM_EDGE);
-					RNA_int_set(op->ptr, "edge_index", BM_elem_index_get(lcd->eed));
-
-					/* execute */
-					ringsel_finish(C, op);
-					ringsel_exit(C, op);
-				}
-				else {
+				return OPERATOR_FINISHED;
+			case ESCKEY:
+				if (event->val == KM_RELEASE) {
+					/* cancel */
+					ED_region_tag_redraw(lcd->ar);
+					ED_area_headerprint(CTX_wm_area(C), NULL);
+					
 					ringcut_cancel(C, op);
 					return OPERATOR_CANCELLED;
 				}
-
-				return OPERATOR_FINISHED;
-			}
-			
-			ED_region_tag_redraw(lcd->ar);
-			break;
-		case RIGHTMOUSE: /* abort */ // XXX hardcoded
-			ED_region_tag_redraw(lcd->ar);
-			ringsel_exit(C, op);
-			ED_area_headerprint(CTX_wm_area(C), NULL);
-
-			return OPERATOR_FINISHED;
-		case ESCKEY:
-			if (event->val == KM_RELEASE) {
-				/* cancel */
+				
 				ED_region_tag_redraw(lcd->ar);
-				ED_area_headerprint(CTX_wm_area(C), NULL);
+				handled = true;
+				break;
+			case PADPLUSKEY:
+			case PAGEUPKEY:
+			case WHEELUPMOUSE:  /* change number of cuts */
+				if (event->val == KM_RELEASE)
+					break;
+				if (event->alt == 0) {
+					cuts++;
+					cuts = CLAMPIS(cuts, 0, SUBD_CUTS_MAX);
+					RNA_int_set(op->ptr, "number_cuts", cuts);
+					ringsel_find_edge(lcd, cuts);
+					show_cuts = true;
+				}
+				else {
+					smoothness = min_ff(smoothness + 0.05f, SUBD_SMOOTH_MAX);
+					RNA_float_set(op->ptr, "smoothness", smoothness);
+					show_cuts = true;
+				}
 				
-				ringcut_cancel(C, op);
-				return OPERATOR_CANCELLED;
-			}
-			
-			ED_region_tag_redraw(lcd->ar);
-			break;
-		case PADPLUSKEY:
-		case PAGEUPKEY:
-		case WHEELUPMOUSE:  /* change number of cuts */
-			if (event->val == KM_RELEASE)
+				ED_region_tag_redraw(lcd->ar);
+				handled = true;
 				break;
-			if (event->alt == 0) {
-				cuts++;
-				cuts = CLAMPIS(cuts, 0, SUBD_CUTS_MAX);
-				RNA_int_set(op->ptr, "number_cuts", cuts);
-				ringsel_find_edge(lcd, cuts);
-				show_cuts = true;
-			}
-			else {
-				smoothness = min_ff(smoothness + 0.05f, SUBD_SMOOTH_MAX);
-				RNA_float_set(op->ptr, "smoothness", smoothness);
-				show_cuts = true;
-			}
-			
-			ED_region_tag_redraw(lcd->ar);
-			break;
-		case PADMINUS:
-		case PAGEDOWNKEY:
-		case WHEELDOWNMOUSE:  /* change number of cuts */
-			if (event->val == KM_RELEASE)
+			case PADMINUS:
+			case PAGEDOWNKEY:
+			case WHEELDOWNMOUSE:  /* change number of cuts */
+				if (event->val == KM_RELEASE)
+					break;
+
+				if (event->alt == 0) {
+					cuts = max_ii(cuts - 1, 1);
+					RNA_int_set(op->ptr, "number_cuts", cuts);
+					ringsel_find_edge(lcd, cuts);
+					show_cuts = true;
+				}
+				else {
+					smoothness = max_ff(smoothness - 0.05f, -SUBD_SMOOTH_MAX);
+					RNA_float_set(op->ptr, "smoothness", smoothness);
+					show_cuts = true;
+				}
+				
+				ED_region_tag_redraw(lcd->ar);
+				handled = true;
+				break;
+			case MOUSEMOVE:  /* mouse moved somewhere to select another loop */
+			{
+				lcd->vc.mval[0] = event->mval[0];
+				lcd->vc.mval[1] = event->mval[1];
+				loopcut_mouse_move(lcd, cuts);
+
+				ED_region_tag_redraw(lcd->ar);
+				handled = true;
 				break;
+			}
+		}
 
-			if (event->alt == 0) {
-				cuts = max_ii(cuts - 1, 1);
+		if (!handled && event->val == KM_PRESS) {
+			/* Modal numinput inactive, try to handle numeric inputs last... */
+			if (handleNumInput(C, &lcd->num, event)) {
+				float values[2] = {(float)cuts, smoothness};
+				applyNumInput(&lcd->num, values);
+				
+				/* allow zero so you can backspace and type in a value
+				 * otherwise 1 as minimum would make more sense */
+				cuts = CLAMPIS(values[0], 0, SUBD_CUTS_MAX);
+				smoothness = CLAMPIS(values[1], -SUBD_SMOOTH_MAX, SUBD_SMOOTH_MAX);
+				
 				RNA_int_set(op->ptr, "number_cuts", cuts);
 				ringsel_find_edge(lcd, cuts);
 				show_cuts = true;
-			}
-			else {
-				smoothness = max_ff(smoothness - 0.05f, -SUBD_SMOOTH_MAX);
 				RNA_float_set(op->ptr, "smoothness", smoothness);
-				show_cuts = true;
+				
+				ED_region_tag_redraw(lcd->ar);
 			}
-			
-			ED_region_tag_redraw(lcd->ar);
-			break;
-		case MOUSEMOVE:  /* mouse moved somewhere to select another loop */
-		{
-			lcd->vc.mval[0] = event->mval[0];
-			lcd->vc.mval[1] = event->mval[1];
-			loopcut_mouse_move(lcd, cuts);
-
-			ED_region_tag_redraw(lcd->ar);
-			break;
-		}
-	}
-	
-	/* using the keyboard to input the number of cuts */
-	if (event->val == KM_PRESS) {
-		/* init as zero so backspace clears */
-		
-		if (handleNumInput(&lcd->num, event)) {
-			float value = RNA_int_get(op->ptr, "number_cuts");
-			applyNumInput(&lcd->num, &value);
-			
-			/* allow zero so you can backspace and type in a value
-			 * otherwise 1 as minimum would make more sense */
-			cuts = CLAMPIS(value, 0, SUBD_CUTS_MAX);
-			
-			RNA_int_set(op->ptr, "number_cuts", cuts);
-			ringsel_find_edge(lcd, cuts);
-			show_cuts = true;
-			
-			ED_region_tag_redraw(lcd->ar);
 		}
 	}
-	
+
 	if (show_cuts) {
-		char buf[64];
-		BLI_snprintf(buf, sizeof(buf), IFACE_("Number of Cuts: %d, Smooth: %.2f (Alt)"), cuts, smoothness);
+		char buf[64 + NUM_STR_REP_LEN * 2];
+		char str_rep[NUM_STR_REP_LEN * 2];
+		if (hasNumInput(&lcd->num)) {
+			outputNumInput(&lcd->num, str_rep);
+		}
+		else {
+			BLI_snprintf(str_rep, NUM_STR_REP_LEN, "%d", cuts);
+			BLI_snprintf(str_rep + NUM_STR_REP_LEN, NUM_STR_REP_LEN, "%.2f", smoothness);
+		}
+		BLI_snprintf(buf, sizeof(buf), IFACE_("Number of Cuts: %s, Smooth: %s (Alt)"),
+		             str_rep, str_rep + NUM_STR_REP_LEN);
 		ED_area_headerprint(CTX_wm_area(C), buf);
 	}