2.5

- Lasso select back (CTRL+LMB), object centers only, 
  and for editmesh. See template in wm_operators.c

- Circle select for editmode back. Currently it still
  uses Ckey, and is only a temporary mode, not persistant.
  Persistant circle select can be added later with 
  tweak gesture keymap? We'll see. :) The old circle
  select was actually annoying that it was so sticky.

5 files changed, 173 insertions, 52 deletions

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index f5cf17d6857..40a67c3c67a 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -39,14 +39,14 @@ struct wmGesture;
 struct rcti;
 struct PointerRNA;
 
-			/* general API */
+/* general API */
 void		WM_setprefsize		(int stax, int stay, int sizx, int sizy);
 
 void		WM_init				(struct bContext *C);
 void		WM_exit				(struct bContext *C);
 void		WM_main				(struct bContext *C);
 
-wmWindow	*WM_window_open		(struct bContext *C, struct rcti *rect);
+struct wmWindow	*WM_window_open		(struct bContext *C, struct rcti *rect);
 
 			/* files */
 int			WM_read_homefile	(struct bContext *C, int from_memory);
@@ -70,7 +70,7 @@ wmKeymapItem *WM_keymap_verify_item(ListBase *lb, char *idname, short type,
 								 short val, int modifier, short keymodifier);
 wmKeymapItem *WM_keymap_add_item	(ListBase *lb, char *idname, short type, 
 								 short val, int modifier, short keymodifier);
-ListBase	*WM_keymap_listbase	(wmWindowManager *wm, const char *nameid, 
+ListBase	*WM_keymap_listbase	(struct wmWindowManager *wm, const char *nameid, 
 								 int spaceid, int regionid);
 
 char		*WM_key_event_string(short type);
@@ -91,7 +91,7 @@ void		WM_event_remove_ui_handler(ListBase *handlers,
 			int (*func)(struct bContext *C, struct wmEvent *event, void *userdata),
 			void (*remove)(struct bContext *C, void *userdata), void *userdata);
 
-struct wmEventHandler *WM_event_add_modal_handler(struct bContext *C, ListBase *handlers, wmOperator *op);
+struct wmEventHandler *WM_event_add_modal_handler(struct bContext *C, ListBase *handlers, struct wmOperator *op);
 void		WM_event_remove_handlers(struct bContext *C, ListBase *handlers);
 
 void		WM_event_add_mousemove(struct bContext *C);
@@ -99,12 +99,12 @@ int			WM_modal_tweak_exit(struct wmEvent *evt, int tweak_event);
 
 void		WM_event_add_notifier(struct bContext *C, unsigned int type, void *data);
 
-void		wm_event_add		(wmWindow *win, struct wmEvent *event_to_add); /* XXX only for warning */
+void		wm_event_add		(struct wmWindow *win, struct wmEvent *event_to_add); /* XXX only for warning */
 
 			/* at maximum, every timestep seconds it triggers event_type events */
-struct wmTimer *WM_event_add_window_timer(wmWindow *win, int event_type, double timestep);
-void		WM_event_remove_window_timer(wmWindow *win, struct wmTimer *timer);
-void		WM_event_window_timer_sleep(wmWindow *win, struct wmTimer *timer, int dosleep);
+struct wmTimer *WM_event_add_window_timer(struct wmWindow *win, int event_type, double timestep);
+void		WM_event_remove_window_timer(struct wmWindow *win, struct wmTimer *timer);
+void		WM_event_window_timer_sleep(struct wmWindow *win, struct wmTimer *timer, int dosleep);
 
 		/* operator api, default callbacks */
 			/* invoke callback, uses enum property named "type" */
@@ -128,24 +128,26 @@ int         WM_operator_name_call	(struct bContext *C, const char *opstring, int
 void		WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring);
 void		WM_operator_properties_free(struct PointerRNA *ptr);
 
-/* operator as a python command (resultuing string must be free'd) */
-char *WM_operator_pystring(struct wmOperator *op);
+		/* operator as a python command (resultuing string must be free'd) */
+char		*WM_operator_pystring(struct wmOperator *op);
 
 			/* default operator callbacks for border/circle/lasso */
-int			WM_border_select_invoke	(struct bContext *C, wmOperator *op, struct wmEvent *event);
-int			WM_border_select_modal	(struct bContext *C, wmOperator *op, struct wmEvent *event);
-int			WM_gesture_circle_invoke(struct bContext *C, wmOperator *op, struct wmEvent *event);
-int			WM_gesture_circle_modal(struct bContext *C, wmOperator *op, struct wmEvent *event);
+int			WM_border_select_invoke	(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+int			WM_border_select_modal	(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+int			WM_gesture_circle_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+int			WM_gesture_circle_modal(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+int			WM_gesture_lasso_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+int			WM_gesture_lasso_modal(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
 
 			/* default operator for arearegions, generates event */
-void		WM_OT_tweak_gesture(wmOperatorType *ot);
+void		WM_OT_tweak_gesture(struct wmOperatorType *ot);
 
 			/* Gesture manager API */
 struct wmGesture *WM_gesture_new(struct bContext *C, struct wmEvent *event, int type);
 void		WM_gesture_end(struct bContext *C, struct wmGesture *gesture);
 
 			/* OpenGL wrappers, mimicking opengl syntax */
-void		wmSubWindowSet		(wmWindow *win, int swinid);
+void		wmSubWindowSet		(struct wmWindow *win, int swinid);
 
 void		wmLoadMatrix		(float mat[][4]);
 void		wmGetMatrix			(float mat[][4]);
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index fe9650094a2..d25e4e38d82 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -205,11 +205,12 @@ typedef struct wmGesture {
 	int mode;		/* for modal callback */
 	int type;		/* gesture type define */
 	int swinid;		/* initial subwindow id where it started */
+	int points;		/* optional, amount of points stored */
 	
 	void *customdata;
 	/* customdata for border is a recti */
 	/* customdata for circle is recti, (xmin, ymin) is center, xmax radius */
-	
+	/* customdata for lasso is short array */
 } wmGesture;
 
 
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index a8dd6f41e47..17addfe1b4b 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -43,6 +43,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "wm.h"
 #include "wm_event_system.h"
 #include "wm_subwindow.h"
 
@@ -81,6 +82,13 @@ wmGesture *WM_gesture_new(bContext *C, wmEvent *event, int type)
 			rect->ymax= event->y - sy;
 		}
 	}
+	else if (type==WM_GESTURE_LASSO) {
+		short *lasso;
+		gesture->customdata= lasso= MEM_callocN(2*sizeof(short)*WM_LASSO_MAX_POINTS, "lasso points");
+		lasso[0] = event->x - sx;
+		lasso[1] = event->y - sy;
+		gesture->points= 1;
+	}
 	
 	return gesture;
 }
@@ -92,12 +100,6 @@ void WM_gesture_end(bContext *C, wmGesture *gesture)
 	MEM_freeN(gesture);
 }
 
-/* for line, lasso, ... */
-void wm_gesture_point_add(bContext *C, wmGesture *gesture)
-{
-	
-}
-
 /* tweak and line gestures */
 #define TWEAK_THRESHOLD		10
 int wm_gesture_evaluate(bContext *C, wmGesture *gesture)
@@ -187,6 +189,30 @@ static void wm_gesture_draw_circle(wmWindow *win, wmGesture *gt)
 	
 }
 
+static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt)
+{
+	short *lasso= (short *)gt->customdata;
+	int i;
+	
+	glEnable(GL_LINE_STIPPLE);
+	glColor3ub(0, 0, 0);
+	glLineStipple(1, 0xAAAA);
+	glBegin(GL_LINE_STRIP);
+	for(i=0; i<gt->points; i++, lasso+=2)
+		glVertex2sv(lasso);
+	glEnd();
+	
+	glColor3ub(255, 255, 255);
+	glLineStipple(1, 0x5555);
+	glBegin(GL_LINE_STRIP);
+	lasso= (short *)gt->customdata;
+	for(i=0; i<gt->points; i++, lasso+=2)
+		glVertex2sv(lasso);
+	glEnd();
+	
+	glDisable(GL_LINE_STIPPLE);
+	
+}
 
 static void wm_gesture_draw_cross(wmWindow *win, wmGesture *gt)
 {
@@ -226,6 +252,8 @@ void wm_gesture_draw(wmWindow *win)
 			else
 				wm_gesture_draw_cross(win, gt);
 		}
+		else if(gt->type==WM_GESTURE_LASSO) 
+			wm_gesture_draw_lasso(win, gt);
 	}
 }
 
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index f099122096d..305d72a53c6 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -378,7 +378,7 @@ static void border_apply(bContext *C, wmOperator *op, int event_type)
 	op->type->exec(C, op);
 }
 
-static void border_end(bContext *C, wmOperator *op)
+static void wm_gesture_end(bContext *C, wmOperator *op)
 {
 	wmGesture *gesture= op->customdata;
 	
@@ -436,12 +436,12 @@ int WM_border_select_modal(bContext *C, wmOperator *op, wmEvent *event)
 			}
 			else {
 				border_apply(C, op, event->type);
-				border_end(C, op);
+				wm_gesture_end(C, op);
 				return OPERATOR_FINISHED;
 			}
 			break;
 		case ESCKEY:
-			border_end(C, op);
+			wm_gesture_end(C, op);
 			return OPERATOR_CANCELLED;
 	}
 	return OPERATOR_RUNNING_MODAL;
@@ -462,16 +462,6 @@ int WM_gesture_circle_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-static void gesture_circle_end(bContext *C, wmOperator *op)
-{
-	wmGesture *gesture= op->customdata;
-	
-	WM_gesture_end(C, gesture);	/* frees gesture itself, and unregisters from window */
-	op->customdata= NULL;
-	
-	ED_area_tag_redraw(CTX_wm_area(C));
-}
-
 static void gesture_circle_apply(bContext *C, wmOperator *op, int event_type)
 {
 	wmGesture *gesture= op->customdata;
@@ -521,7 +511,7 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, wmEvent *event)
 		case MIDDLEMOUSE:
 		case RIGHTMOUSE:
 			if(event->val==0) {	/* key release */
-				gesture_circle_end(C, op);
+				wm_gesture_end(C, op);
 				return OPERATOR_FINISHED;
 			}
 			else
@@ -529,7 +519,7 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, wmEvent *event)
 
 			break;
 		case ESCKEY:
-			gesture_circle_end(C, op);
+			wm_gesture_end(C, op);
 			return OPERATOR_CANCELLED;
 	}
 	return OPERATOR_RUNNING_MODAL;
@@ -568,17 +558,6 @@ static int tweak_gesture_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-static void tweak_gesture_end(bContext *C, wmOperator *op)
-{
-	wmGesture *gesture= op->customdata;
-	
-	WM_gesture_end(C, gesture);	/* frees gesture itself, and unregisters from window */
-	op->customdata= NULL;
-
-	ED_area_tag_redraw(CTX_wm_area(C));
-	
-}
-
 static int tweak_gesture_modal(bContext *C, wmOperator *op, wmEvent *event)
 {
 	wmWindow *window= CTX_wm_window(C);
@@ -608,7 +587,7 @@ static int tweak_gesture_modal(bContext *C, wmOperator *op, wmEvent *event)
 				/* mouse coords! */
 				wm_event_add(window, &event);
 				
-				tweak_gesture_end(C, op);
+				wm_gesture_end(C, op);
 				return OPERATOR_FINISHED;
 			}
 			else
@@ -621,7 +600,7 @@ static int tweak_gesture_modal(bContext *C, wmOperator *op, wmEvent *event)
 		case MIDDLEMOUSE:
 			if(gesture->event_type==event->type) {
 				wm_gesture_evaluate(C, gesture);
-				tweak_gesture_end(C, op);
+				wm_gesture_end(C, op);
 				return OPERATOR_FINISHED;
 			}
 			break;
@@ -640,6 +619,117 @@ void WM_OT_tweak_gesture(wmOperatorType *ot)
 	ot->poll= WM_operator_winactive;
 }
 
+/* *********************** lasso gesture ****************** */
+
+int WM_gesture_lasso_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	op->customdata= WM_gesture_new(C, event, WM_GESTURE_LASSO);
+	
+	/* add modal handler */
+	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+	
+	wm_gesture_tag_redraw(C);
+	
+	return OPERATOR_RUNNING_MODAL;
+}
+
+
+static void gesture_lasso_apply(bContext *C, wmOperator *op, int event_type)
+{
+	wmGesture *gesture= op->customdata;
+	PointerRNA itemptr;
+	float loc[2];
+	int i;
+	short *lasso= gesture->customdata;
+	
+	/* operator storage as path. */
+
+	for(i=0; i<gesture->points; i++, lasso+=2) {
+		loc[0]= lasso[0];
+		loc[1]= lasso[1];
+		RNA_collection_add(op->ptr, "path", &itemptr);
+		RNA_float_set_array(&itemptr, "loc", loc);
+	}
+	
+	wm_gesture_end(C, op);
+		
+	if(op->type->exec)
+		op->type->exec(C, op);
+	
+}
+
+int WM_gesture_lasso_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+	wmGesture *gesture= op->customdata;
+	int sx, sy;
+	
+	switch(event->type) {
+		case MOUSEMOVE:
+			
+			wm_gesture_tag_redraw(C);
+			
+			wm_subwindow_getorigin(CTX_wm_window(C), gesture->swinid, &sx, &sy);
+			if(gesture->points < WM_LASSO_MAX_POINTS) {
+				short *lasso= gesture->customdata;
+				lasso += 2 * gesture->points;
+				lasso[0] = event->x - sx;
+				lasso[1] = event->y - sy;
+				gesture->points++;
+			}
+			else {
+				gesture_lasso_apply(C, op, event->type);
+				return OPERATOR_FINISHED;
+			}
+			break;
+			
+		case LEFTMOUSE:
+		case MIDDLEMOUSE:
+		case RIGHTMOUSE:
+			if(event->val==0) {	/* key release */
+				gesture_lasso_apply(C, op, event->type);
+				return OPERATOR_FINISHED;
+			}
+			break;
+		case ESCKEY:
+			wm_gesture_end(C, op);
+			return OPERATOR_CANCELLED;
+	}
+	return OPERATOR_RUNNING_MODAL;
+}
+
+#if 0
+/* template to copy from */
+
+static int gesture_lasso_exec(bContext *C, wmOperator *op)
+{
+	RNA_BEGIN(op->ptr, itemptr, "path") {
+		float loc[2];
+		
+		RNA_float_get_array(&itemptr, "loc", loc);
+		printf("Location: %f %f\n", loc[0], loc[1]);
+	}
+	RNA_END;
+	
+	return OPERATOR_FINISHED;
+}
+
+void WM_OT_lasso_gesture(wmOperatorType *ot)
+{
+	PropertyRNA *prop;
+	
+	ot->name= "Lasso Gesture";
+	ot->idname= "WM_OT_lasso_gesture";
+	
+	ot->invoke= WM_gesture_lasso_invoke;
+	ot->modal= WM_gesture_lasso_modal;
+	ot->exec= gesture_lasso_exec;
+	
+	ot->poll= WM_operator_winactive;
+	
+	prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath);
+}
+#endif
 
 /* ******************************************************* */
  
@@ -671,6 +761,5 @@ void wm_window_keymap(wmWindowManager *wm)
 	WM_keymap_verify_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", FKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
-
 }
 
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index 2e12f4ed4d5..1835a475323 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -47,6 +47,7 @@ void wm_operatortype_init(void);
 void wm_window_keymap(wmWindowManager *wm);
 
 /* wm_gesture.c */
+#define WM_LASSO_MAX_POINTS		1024
 void wm_gesture_draw(struct wmWindow *win);
 int wm_gesture_evaluate(bContext *C, wmGesture *gesture);
 void wm_gesture_tag_redraw(bContext *C);