X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Fsketcher%2Fsketcherwindow.C;h=796a84c4312a0920cde427caa84b0d8976d8aabf;hb=HEAD;hp=bd2eaa9f58934a76a60b22372f90ce5deae6e25b;hpb=b64142b983e53a7f0bfe8422efc3bb4f4ebb897c;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
index bd2eaa9f..c022ecdd 100644
--- a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
+++ b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
@@ -39,8 +39,8 @@
 
 #define AltMask Mod1Mask
 
-#define COLOR_W 32
-#define COLOR_H 24
+#define COLOR_W xS(40)
+#define COLOR_H yS(24)
 
 const char *SketcherPoint::types[] = {
 	N_("off"),
@@ -68,7 +68,7 @@ int SketcherCurvePenItem::handle_event()
 	popup->update(pen);
 	SketcherWindow *gui = popup->gui;
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 && ci < config.curves.size() ) {
 		SketcherCurve *cv = config.curves[ci];
 		cv->pen = pen;
@@ -79,9 +79,10 @@ int SketcherCurvePenItem::handle_event()
 }
 
 SketcherCurvePen::SketcherCurvePen(SketcherWindow *gui, int x, int y, int pen)
- : BC_PopupMenu(x,y,72,_(cv_pen[pen]))
+ : BC_PopupMenu(x,y,xS(100),_(cv_pen[pen]))
 {
 	this->gui = gui;
+	this->pen = pen;
 }
 void SketcherCurvePen::create_objects()
 {
@@ -91,126 +92,44 @@ void SketcherCurvePen::create_objects()
 }
 void SketcherCurvePen::update(int pen)
 {
-	set_text(_(cv_pen[pen]));
+	set_text(_(cv_pen[this->pen=pen]));
 }
 
 
-SketcherCurveColor::SketcherCurveColor(SketcherWindow *gui, int x, int y, int w, int h)
- : BC_Button(x, y, w, vframes)
+SketcherCurveColor::SketcherCurveColor(SketcherWindow *gui,
+		int x, int y, int w, int h, int color, int alpha)
+ : ColorBoxButton(_("Curve Color"), x, y, w, h, color, alpha, 1)
 {
 	this->gui = gui;
 	this->color = CV_COLOR;
-	for( int i=0; i<3; ++i ) {
-		vframes[i] = new VFrame(w, h, BC_RGB888);
-		vframes[i]->clear_frame();
-	}
 }
 
 SketcherCurveColor::~SketcherCurveColor()
 {
-	for( int i=0; i<3; ++i )
-		delete vframes[i];
-}
-
-void SketcherCurveColor::set_color(int color)
-{
-	this->color = color;
-	int r = (color>>16) & 0xff;
-	int g = (color>>8) & 0xff;
-	int b = (color>>0) & 0xff;
-	for( int i=0; i<3; ++i ) {
-		VFrame *vframe = vframes[i];
-		int ww = vframe->get_w(), hh = vframe->get_h();
-		uint8_t **rows = vframe->get_rows();
-		int rr = r, gg = g, bb = b;
-		switch( i ) {
-		case BUTTON_UP:
-			break;
-		case BUTTON_UPHI:
-			if( (rr+=48) > 0xff ) rr = 0xff;
-			if( (gg+=48) > 0xff ) gg = 0xff;
-			if( (bb+=48) > 0xff ) bb = 0xff;
-			break;
-		case BUTTON_DOWNHI:
-			if( (rr-=48) < 0x00 ) rr = 0x00;
-			if( (gg-=48) < 0x00 ) gg = 0x00;
-			if( (bb-=48) < 0x00 ) bb = 0x00;
-			break;
-		}
-		for( int y=0; y<hh; ++y ) {
-			uint8_t *rp = rows[y];
-			for( int x=0; x<ww; ++x ) {
-				*rp++ = rr;  *rp++ = gg;  *rp++ = bb;
-			}
-		}
-	}
-	set_images(vframes);
-}
-
-void SketcherCurveColor::update_gui(int color)
-{
-	set_color(color);
-	draw_face();
-}
-
-int SketcherCurveColor::handle_event()
-{
-	gui->start_color_thread(this);
-	return 1;
-}
-
-SketcherCurveColorPicker::SketcherCurveColorPicker(SketcherWindow *gui, SketcherCurveColor *color_button)
- : ColorPicker(1, _("Color"))
-{
-	this->gui = gui;
-	this->color_button = color_button;
-	this->color = CV_COLOR;
-	color_update = new SketcherCurveColorThread(this);
-}
-
-SketcherCurveColorPicker::~SketcherCurveColorPicker()
-{
-	delete color_update;
 }
 
-void SketcherCurveColorPicker::start(int color)
+void SketcherCurveColor::handle_done_event(int result)
 {
-	this->color = color;
-	int alpha = (~color>>24) & 0xff;
-	start_window(color & 0xffffff, alpha, 1);
-	color_update->start();
-}
-
-void SketcherCurveColorPicker::handle_done_event(int result)
-{
-	color_update->stop();
-	gui->lock_window("SketcherCurveColorPicker::handle_done_event");
-	if( result ) { color = orig_color | (~orig_alpha<<24); }
-	color_button->update_gui(color);
-	gui->unlock_window();
+	if( result ) color = orig_color | (~orig_alpha<<24);
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 && ci < config.curves.size() ) {
 		SketcherCurve *cv = config.curves[ci];
 		cv->color = color;
+		gui->lock_window("SketcherCurveColor::handle_done_event");
 		gui->curve_list->update(ci);
+		gui->unlock_window();
 		gui->send_configure_change();
 	}
 }
 
-int SketcherCurveColorPicker::handle_new_color(int color, int alpha)
+int SketcherCurveColor::handle_new_color(int color, int alpha)
 {
-	this->color = color | (~alpha<<24);
-	color_update->update_lock->unlock();
-	return 1;
-}
-
-void SketcherCurveColorPicker::update_gui()
-{
-	gui->lock_window("SketcherCurveColorPicker::update_gui");
-	color_button->update_gui(color);
+	color |= ~alpha<<24;  this->color = color;
+	gui->lock_window("SketcherCurveColor::update_gui");
+	update_gui(color);
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 ) {
 		SketcherCurve *cv = config.curves[ci];
 		cv->color = color;
@@ -218,52 +137,13 @@ void SketcherCurveColorPicker::update_gui()
 		gui->send_configure_change();
 	}
 	gui->unlock_window();
-}
-
-SketcherCurveColorThread::SketcherCurveColorThread(SketcherCurveColorPicker *color_picker)
- : Thread(1, 0, 0)
-{
-	this->color_picker = color_picker;
-	this->update_lock = new Condition(0,"SketcherCurveColorThread::update_lock");
-	done = 1;
-}
-
-SketcherCurveColorThread::~SketcherCurveColorThread()
-{
-	stop();
-	delete update_lock;
-}
-
-void SketcherCurveColorThread::start()
-{
-	if( done ) {
-		done = 0;
-		Thread::start();
-	}
-}
-
-void SketcherCurveColorThread::stop()
-{
-	if( !done ) {
-		done = 1;
-		update_lock->unlock();
-		join();
-	}
-}
-
-void SketcherCurveColorThread::run()
-{
-	while( !done ) {
-		update_lock->lock("SketcherCurveColorThread::run");
-		if( done ) break;
-		color_picker->update_gui();
-	}
+	return 1;
 }
 
 
 SketcherCoord::SketcherCoord(SketcherWindow *gui, int x, int y,
 		coord output, coord mn, coord mx)
- : BC_TumbleTextBox(gui, output, mn, mx, x, y, 64, 1)
+ : BC_TumbleTextBox(gui, output, mn, mx, x, y, xS(80), 1)
 {
 	this->gui = gui;
 	set_increment(1);
@@ -274,7 +154,7 @@ SketcherCoord::~SketcherCoord()
 
 SketcherNum::SketcherNum(SketcherWindow *gui, int x, int y,
 		int output, int mn, int mx)
- : BC_TumbleTextBox(gui, output, mn, mx, x, y, 54)
+ : BC_TumbleTextBox(gui, output, mn, mx, x, y, xS(54))
 {
 	this->gui = gui;
 	set_increment(1);
@@ -287,11 +167,11 @@ int SketcherPointX::handle_event()
 {
 	if( !SketcherCoord::handle_event() ) return 0;
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 && ci < config.curves.size() ) {
 		SketcherCurve *cv = config.curves[ci];
 		SketcherPointList *point_list = gui->point_list;
-		int pi = config.pt_selected;
+		int pi = gui->plugin->pt_selected;
 		SketcherPoints &points = cv->points;
 		if( pi >= 0 && pi < points.size() ) {
 			coord v = atof(get_text());
@@ -307,11 +187,11 @@ int SketcherPointY::handle_event()
 {
 	if( !SketcherCoord::handle_event() ) return 0;
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 && ci < config.curves.size() ) {
 		SketcherCurve *cv = config.curves[ci];
 		SketcherPointList *point_list = gui->point_list;
-		int pi = config.pt_selected;
+		int pi = gui->plugin->pt_selected;
 		SketcherPoints &points = cv->points;
 		if( pi >= 0 && pi < points.size() ) {
 			coord v = atof(get_text());
@@ -328,11 +208,11 @@ int SketcherPointId::handle_event()
 {
 	if( !SketcherNum::handle_event() ) return 0;
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 && ci < config.curves.size() ) {
 		SketcherCurve *cv = config.curves[ci];
 		SketcherPointList *point_list = gui->point_list;
-		int pi = config.pt_selected;
+		int pi = gui->plugin->pt_selected;
 		SketcherPoints &points = cv->points;
 		if( pi >= 0 && pi < points.size() ) {
 			int id = atoi(get_text());
@@ -345,11 +225,20 @@ int SketcherPointId::handle_event()
 	return 1;
 }
 
+SketcherCurveWidth::SketcherCurveWidth(SketcherWindow *gui, int x, int y, int width)
+ : SketcherNum(gui, x, y, width, 0, 255)
+{
+	this->width = width;
+}
+SketcherCurveWidth::~SketcherCurveWidth()
+{
+}
+
 int SketcherCurveWidth::handle_event()
 {
 	if( !SketcherNum::handle_event() ) return 0;
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 && ci < config.curves.size() ) {
 		SketcherCurve *cv = config.curves[ci];
 		int v = atoi(get_text());
@@ -360,14 +249,64 @@ int SketcherCurveWidth::handle_event()
 	return 1;
 }
 
+void SketcherCurveWidth::update(int width)
+{
+	SketcherNum::update(this->width=width);
+}
+
+
+SketcherAliasItem::SketcherAliasItem(SketcherAliasing *popup, int v)
+ : BC_MenuItem(popup->alias_to_text(v))
+{
+	this->popup = popup;
+	this->v = v;
+}
+
+int SketcherAliasItem::handle_event()
+{
+	popup->set_text(get_text());
+	popup->plugin->config.aliasing = v;
+	popup->gui->send_configure_change();
+	return 1;
+}
+
+
+SketcherAliasing::SketcherAliasing(SketcherWindow *gui, Sketcher *plugin,
+		int x, int y)
+ : BC_PopupMenu(x, y, xS(80),
+		alias_to_text(plugin->config.aliasing), 1, 0, xS(3))
+{
+	this->gui = gui;
+	this->plugin = plugin;
+	set_tooltip(_("Anti-Aliasing"));
+}
+SketcherAliasing::~SketcherAliasing()
+{
+}
+
+void SketcherAliasing::create_objects()
+{
+	add_item(new SketcherAliasItem(this, -1));
+	add_item(new SketcherAliasItem(this, 0));
+	add_item(new SketcherAliasItem(this, 1));
+}
+
+const char *SketcherAliasing::alias_to_text(int alias)
+{
+	if( alias < 0 ) return _("Off");
+	if( alias > 0 ) return _("Double");
+	return _("On");
+}
+
+
 
 SketcherWindow::SketcherWindow(Sketcher *plugin)
- : PluginClientWindow(plugin, 380, 580, 380, 580, 0)
+ : PluginClientWindow(plugin, xS(460), yS(680), xS(460), yS(680), 0)
 {
 	this->plugin = plugin;
 	this->title_pen = 0;  this->curve_pen = 0;
 	this->title_color = 0; this->curve_color = 0;
-	this->color_picker = 0; this->drag = 0;
+	this->drag = 0;
 	this->new_curve = 0;  this->del_curve = 0;
 	this->curve_up = 0;   this->curve_dn = 0;
 	this->title_x = 0;    this->point_x = 0;
@@ -380,14 +319,17 @@ SketcherWindow::SketcherWindow(Sketcher *plugin)
 
 	position = -1;
 	track_w = track_h -1;
-	cursor_x = cursor_y = -1;
 	output_x = output_y = -1;
+	track_x = track_y = -1;
 	last_x = last_y = -1;
 	projector_x = projector_y = projector_z = -1;
 	state = 0;  dragging = 0;
 	new_points = 0;
 	pending_motion = 0;
 	pending_config = 0;
+	helped = 0;
+	help_h = get_h();
+	last_time = 0;
 }
 
 SketcherWindow::~SketcherWindow()
@@ -395,20 +337,19 @@ SketcherWindow::~SketcherWindow()
 	delete curve_width;
 	delete point_x;
 	delete point_y;
-	delete color_picker;
 }
 
 void SketcherWindow::create_objects()
 {
-	int x = 10, y = 10, dy = 0, x1, y1;
+	int x = xS(10), y = yS(10), dy = 0, x1, y1;
 	int margin = plugin->get_theme()->widget_border;
 	BC_Title *title;
-	int ci = plugin->config.cv_selected;
+	int ci = plugin->cv_selected;
 	if( ci < 0 || ci >= plugin->config.curves.size() )
 		ci = plugin->new_curve();
 	SketcherCurve *cv = plugin->config.curves[ci];
 
-	reset_curves = new SketcherResetCurves(this, plugin, x1=x, y+3);
+	reset_curves = new SketcherResetCurves(this, plugin, x1=x, y);
 	add_subwindow(reset_curves);	dy = bmax(dy,reset_curves->get_h());
 	x1 += reset_curves->get_w() + 2*margin;
 	const char *curve_text = _("Curve");
@@ -417,6 +358,10 @@ void SketcherWindow::create_objects()
 	x1 += title_width->get_w() + margin;
 	curve_width = new SketcherCurveWidth(this, x1, y, cv->width);
 	curve_width->create_objects();
+	x1 += curve_width->get_w() + margin;
+	aliasing = new SketcherAliasing(this, plugin, x1, y);
+	add_subwindow(aliasing);	dy = bmax(dy,aliasing->get_h());
+	aliasing->create_objects();
 	y += dy + 2*margin;		dy = 0;
 
 	x1 = get_w()-x - BC_Title::calculate_w(this, curve_text, LARGEFONT);
@@ -434,10 +379,12 @@ void SketcherWindow::create_objects()
 	curve_up = new SketcherCurveUp(this, x1, y);
 	add_subwindow(curve_up);	dy = bmax(dy,curve_up->get_h());
 	x1 += curve_up->get_w() + 4*margin;
-	title_pen = new BC_Title(x1+30, y, _("Pen:"));
+	y1 = BC_Title::calculate_h(this, _("Pen:"));
+	title_pen = new BC_Title(x1+xS(30), y+dy-y1, _("Pen:"));
 	add_subwindow(title_pen);	dy = bmax(dy,title_pen->get_h());
-	int x2 = (get_w()+x1)/2;
-	title_color = new BC_Title(x2+10, y, _("Color:"));
+	int x2 = (get_w()+x1)/2 + xS(20);
+	y1 = BC_Title::calculate_h(this, _("Color:"));
+	title_color = new BC_Title(x2, y+dy-y1, _("Color:"));
 	add_subwindow(title_color);	dy = bmax(dy,title_color->get_h());
 	y += dy + margin;		dy = 0;
 
@@ -450,34 +397,35 @@ void SketcherWindow::create_objects()
 	curve_pen = new SketcherCurvePen(this, x1, y, cv->pen);
 	add_subwindow(curve_pen);	dy = bmax(dy,curve_pen->get_h());
 	curve_pen->create_objects();
-	curve_color = new SketcherCurveColor(this, x2+20, y, COLOR_W, COLOR_H);
+	curve_color = new SketcherCurveColor(this, x2, y, COLOR_W, COLOR_H,
+		cv->color&0xffffff, (~cv->color>>24)&0xff);
 	add_subwindow(curve_color);	dy = bmax(dy,curve_color->get_h());
-	curve_color->set_color(cv->color);
-	curve_color->draw_face();
 	y += dy + margin;  dy = 0;
 	curve_list->update(ci);
 
 	BC_Bar *bar;
-	bar = new BC_Bar(x, y, get_w()-2*x);
+	bar = new BC_Bar(x, y, get_w()-xS(2)*x);
+	add_subwindow(bar);		dy = bmax(dy,bar->get_h());
+	bar = new BC_Bar(x, y+=dy, get_w()-xS(2)*x);
 	add_subwindow(bar);		dy = bmax(dy,bar->get_h());
-	y += dy + 2*margin;
+	y += dy + yS(2)*margin;
 
-	int pi = plugin->config.pt_selected;
+	int pi = plugin->pt_selected;
 	SketcherPoint *pt = pi >= 0 && pi < cv->points.size() ? cv->points[pi] : 0;
-	reset_points = new SketcherResetPoints(this, plugin, x1=x, y+3);
+	reset_points = new SketcherResetPoints(this, plugin, x1=x, y+yS(3));
 	add_subwindow(reset_points);	dy = bmax(dy,reset_points->get_h());
-	x1 += reset_points->get_w() + 2*margin; 
-	if( plugin->config.drag ) {
+	x1 += reset_points->get_w() + xS(2)*margin;
+	if( plugin->drag ) {
 		if( !grab(plugin->server->mwindow->cwindow->gui) ) {
 			eprintf("drag enabled, but compositor already grabbed\n");
-			plugin->config.drag = 0;
+			plugin->drag = 0;
 		}
 	}
 	drag = new SketcherDrag(this, x1, y);
 	add_subwindow(drag);		dy = bmax(dy,drag->get_h());
-	x1 += drag->get_w() + 2*margin;
-	int pty = pt ? pt->pty : PTY_LINE;
-	point_type = new SketcherPointType(this, x1, y, pty);
+	x1 += drag->get_w() + xS(2)*margin;
+	int arc = pt ? pt->arc : ARC_LINE;
+	point_type = new SketcherPointType(this, x1, y, arc);
 	add_subwindow(point_type);	dy = bmax(dy,point_type->get_h());
 	point_type->create_objects();
 	y += dy + margin;  dy = 0;
@@ -496,14 +444,15 @@ void SketcherWindow::create_objects()
 	x1 += new_point->get_w() + margin;
 	point_up = new SketcherPointUp(this, x1, y);
 	add_subwindow(point_up);	dy = bmax(dy,point_up->get_h());
-	x1 += point_up->get_w() + 2*margin;
+	x1 += point_up->get_w() + xS(2)*margin;
 	title_x = new BC_Title(x1, y, _("X:"));
 	add_subwindow(title_x);		dy = bmax(dy,title_x->get_h());
 	x1 += title_x->get_w() + margin;
 	point_x = new SketcherPointX(this, x1, y, !pt ? 0.f : pt->x);
 	point_x->create_objects();	dy = bmax(dy, point_x->get_h());
-	x2 = x1 + point_x->get_w() + 2*margin;
-	title_id = new BC_Title(x2, y, _("ID:"));
+	x2 = x1 + point_x->get_w() + xS(2)*margin + xS(10);
+	y1 = BC_Title::calculate_h(this, _("ID:"));
+	title_id = new BC_Title(x2+xS(16), y+dy-y1, _("ID:"));
 	add_subwindow(title_id);	dy = bmax(dy, title_id->get_h());
 	y += dy + margin;  dy = 0;
 
@@ -512,41 +461,62 @@ void SketcherWindow::create_objects()
 	x1 += del_point->get_w() + margin;
 	point_dn = new SketcherPointDn(this, x1, y);
 	add_subwindow(point_dn);	dy = bmax(dy,point_dn->get_h());
-	x1 += point_dn->get_w() + 2*margin;
+	x1 += point_dn->get_w() + xS(2)*margin;
 	title_y = new BC_Title(x1, y, _("Y:"));
 	add_subwindow(title_y);		dy = bmax(dy,title_y->get_h());
 	x1 += title_y->get_w() + margin;
 	point_y = new SketcherPointY(this, x1, y, !pt ? 0.f : pt->y);
 	point_y->create_objects();	dy = bmax(dy, point_y->get_h());
-	point_id = new SketcherPointId(this, x2+10, y, !pt ? 0 : pt->id);
+	point_id = new SketcherPointId(this, x2, y, !pt ? 0 : pt->id);
 	point_id->create_objects();	dy = bmax(dy, point_id->get_h());
-	y += dy + margin + 5;
+	y += dy + margin + yS(5);		dy = 0;
 	point_list->update(pi);
 
+	add_subwindow(help = new SketcherHelp(this, plugin, x, y));
+	y += help->get_h() + yS(5);
+	help_y = y;
+	bar = new BC_Bar(x, y, get_w()-xS(2)*x);
+	add_subwindow(bar);		dy = bmax(dy,bar->get_h());
+	y += dy + yS(2)*margin;
+
 	add_subwindow(notes0 = new BC_Title(x, y,
 		 _("\n"
 		   "Shift=\n"
 		   "None=\n"
 		   "Ctrl=\n"
-		   "Alt=\n"
-		   "DEL=\n")));
-	add_subwindow(notes1 = new BC_Title(x+80, y,
+		   "Ctrl+Alt=\n"
+		   "Ctrl+Shift=")));	dy = bmax(dy, notes0->get_h());
+	add_subwindow(notes1 = new BC_Title(x+xS(100), y,
 		 _("     LMB\n"
 		   "new line point\n"
 		   "select point\n"
 		   "drag point\n"
 		   "drag all curves\n"
-		   "deletes point\n")));
-	add_subwindow(notes2 = new BC_Title(x+200, y,
+		   "new fill point"))); dy = bmax(dy, notes1->get_h());
+	add_subwindow(notes2 = new BC_Title(x+xS(280), y,
 		 _("      RMB\n"
 		   "new arc point\n"
 		   "select curve\n"
 		   "drag curve\n"
 		   "new curve\n"
-		   "deletes curve\n")));
+		   "new off point"))); dy = bmax(dy, notes2->get_h());
+	y += dy + margin + yS(10);
+
+	add_subwindow(notes3 = new BC_Title(x, y,
+		 _("Wheel: rotate, centered on cursor\n"
+		   "Wheel: shift: scale, centered on cursor\n"
+		   "Key DEL= delete point, +Shift= delete curve\n")));
+
+	resize_window(get_w(), help_y);
 	show_window(1);
 }
 
+void SketcherWindow::done_event(int result)
+{
+	curve_color->close_picker();
+	ungrab(plugin->server->mwindow->cwindow->gui);
+}
+
 void SketcherWindow::send_configure_change()
 {
 	pending_config = 0;
@@ -558,12 +528,13 @@ int SketcherWindow::grab_event(XEvent *event)
 {
 	int ret = do_grab_event(event);
 	if( !grab_event_count() ) {
-		if( pending_motion && grab_cursor_motion(&motion_event) )
+		if( grab_cursor_motion() )
 			pending_config = 1;
-		if( pending_config )
+		if( pending_config ) {
+			last_x = track_x;  last_y = track_y;
 			send_configure_change();
+		}
 	}
-	last_x = output_x;  last_y = output_y;
 	return ret;
 }
 
@@ -590,16 +561,17 @@ int SketcherWindow::do_grab_event(XEvent *event)
 	MWindow *mwindow = plugin->server->mwindow;
 	CWindowGUI *cwindow_gui = mwindow->cwindow->gui;
 	CWindowCanvas *canvas = cwindow_gui->canvas;
-	int cx, cy;  cwindow_gui->get_relative_cursor(cx, cy);
-	cx -= mwindow->theme->ccanvas_x;
-	cy -= mwindow->theme->ccanvas_y;
+	cwindow_gui->get_relative_cursor(cursor_x, cursor_y);
+	output_x = cursor_x - canvas->view_x;
+	output_y = cursor_y - canvas->view_y;
 
 	if( !dragging ) {
-		if( cx < 0 || cx >= mwindow->theme->ccanvas_w ||
-		    cy < 0 || cy >= mwindow->theme->ccanvas_h )
+		if( output_x < 0 || output_x >= canvas->view_w ||
+		    output_y < 0 || output_y >= canvas->view_h )
 			return 0;
 	}
 
+
 	switch( event->type ) {
 	case ButtonPress:
 		if( dragging ) return 0;
@@ -614,21 +586,18 @@ int SketcherWindow::do_grab_event(XEvent *event)
 		return 0;
 	}
 
-	cursor_x = cx, cursor_y = cy;
-	canvas->canvas_to_output(mwindow->edl, 0, cursor_x, cursor_y);
-	position = plugin->get_source_position();
-	Track *track = plugin->server->plugin->track;
-	track_w = track->track_w;
-	track_h = track->track_h;
-	track->automation->get_projector(
-		&projector_x, &projector_y, &projector_z,
-		position, PLAY_FORWARD);
-	projector_x += mwindow->edl->session->output_w / 2;
-	projector_y += mwindow->edl->session->output_h / 2;
-	output_x = (cursor_x - projector_x) / projector_z + track_w / 2;
-	output_y = (cursor_y - projector_y) / projector_z + track_h / 2;
+	canvas->canvas_to_output(mwindow->edl, 0, output_x, output_y);
+	plugin->output_to_track(output_x, output_y, track_x, track_y);
 	state = event->xmotion.state;
 
+	if( event->type == MotionNotify ) {
+		memcpy(&motion_event, event, sizeof(motion_event));
+		pending_motion = 1;
+		return 1;
+	}
+	if( grab_cursor_motion() )
+		pending_config = 1;
+
 	switch( event->type ) {
 	case ButtonPress:
 		pending_config = grab_button_press(event);
@@ -636,10 +605,6 @@ int SketcherWindow::do_grab_event(XEvent *event)
 	case ButtonRelease:
 		new_points = 0;
 		break;
-	case MotionNotify:
-		memcpy(&motion_event, event, sizeof(motion_event));
-		pending_motion = 1;
-		break;
 	}
 
 	return 1;
@@ -648,60 +613,101 @@ int SketcherWindow::do_grab_event(XEvent *event)
 int SketcherWindow::grab_button_press(XEvent *event)
 {
 	SketcherConfig &config = plugin->config;
-	int ci = config.cv_selected;
+	int ci = plugin->cv_selected;
 	if( ci < 0 || ci >= plugin->config.curves.size() )
 		return 0;
+        MWindow *mwindow = plugin->server->mwindow;
+        CWindowGUI *cwindow_gui = mwindow->cwindow->gui;
+        CWindowCanvas *canvas = cwindow_gui->canvas;
+
 	SketcherCurves &curves = config.curves;
 	SketcherCurve *cv = curves[ci];
 	SketcherPoints &points = cv->points;
-	int pi = config.pt_selected;
-
+	int pi = plugin->pt_selected;
+
+	float s = 1.001; // min scale
+	float th = 0.1 * M_PI/180.f; // min theta .1 deg per wheel_btn
+	int64_t ms = event->xbutton.time;
+	double dt = (ms - last_time) / 1000.;  // seconds
+	last_time = ms;
+	double mx_accel = 100., r = mx_accel / exp(1.);
+	double mx_dt = 1./2., mn_dt = 1./15.; // mn..mx period in sec/xev
+	bclip(dt, mn_dt, mx_dt);
+	double accel = r * exp(-(dt-mn_dt)/(mx_dt-mn_dt));
 	int button_no = event->xbutton.button;
 	switch( button_no ) {
+	case WHEEL_DOWN:
+		s = 2 - s;
+		th = -th;  // fall thru
+	case WHEEL_UP: { // shift_down scale, !shift_down rotate
+		s =  1 + (s-1)*accel;
+		th *= accel;
+		float st = sin(th), ct = cos(th);
+		int sz = points.size();
+		int shift_down = (state & ShiftMask) ? 1 : 0;
+		for( int i=0; i<sz; ++i ) {
+			SketcherPoint *pt = points[i];
+			float px = pt->x - track_x, py = pt->y - track_y;
+			float nx = shift_down ? px*s : px*ct + py*st;
+			float ny = shift_down ? py*s : py*ct - px*st;
+			point_list->set_point(i, PT_X, pt->x = nx + track_x);
+			point_list->set_point(i, PT_Y, pt->y = ny + track_y);
+		}
+		point_list->update(-1);
+		button_no = 0;
+		break; }
+
 	case LEFT_BUTTON: {
 		if( (state & ShiftMask) ) { // create new point/string
 			++new_points;
-			pi = plugin->new_point(cv, PTY_LINE, output_x, output_y, pi+1);
+			pi = plugin->new_point(cv,
+				!(state & ControlMask) ? ARC_LINE : ARC_FILL,
+				track_x, track_y, pi+1);
 			point_list->update(pi);
 			break;
 		}
 		SketcherPoint *pt = 0; // select point
-		double dist = cv->nearest_point(pi, output_x,output_y);
+		double dist = cv->nearest_point(pi, track_x,track_y);
 		if( dist >= 0 ) {
 			pt = points[pi];
-			Track *track = plugin->server->plugin->track;
-			int track_w = track->track_w, track_h = track->track_h;
-			float px = (pt->x - track_w / 2) * projector_z + projector_x;
-			float py = (pt->y - track_h / 2) * projector_z + projector_y;
-			float pix = DISTANCE(px, py, cursor_x,cursor_y);
-			if( (state & ControlMask) && pix >= HANDLE_W ) { pi = -1;  pt = 0; }
+			float cx, cy;
+			plugin->track_to_output(pt->x, pt->y, cx, cy);
+			canvas->output_to_canvas(mwindow->edl, 0, cx, cy);
+			cx += canvas->view_x;  cy += canvas->view_y;
+			dist = DISTANCE(cx,cy, cursor_x,cursor_y);
+			if( (state & ControlMask) && dist >= HANDLE_W ) {
+				pi = -1;  pt = 0;
+			}
 		}
 		point_list->set_selected(pi);
 		break; }
 	case RIGHT_BUTTON: {
 		if( (state & ShiftMask) ) { // create new curve point
 			++new_points;
-			pi = plugin->new_point(cv, PTY_CURVE,
-					output_x, output_y, pi+1);
+			pi = plugin->new_point(cv,
+				!(state & ControlMask) ? ARC_CURVE : ARC_OFF,
+				track_x, track_y, pi+1);
 			point_list->update(pi);
 			break;
 		}
-		if( (state & AltMask) ) { // create new curve
-			ci = plugin->new_curve(cv->pen, cv->width, cv->color);
+		if( (state & ControlMask) && (state & AltMask) ) { // create new curve
+			ci = plugin->new_curve(cv->pen, cv->width, curve_color->color);
 			curve_list->update(ci);
 			point_list->update(-1);
 			break;
 		}
 		SketcherPoint *pt = 0;
-		double dist = config.nearest_point(ci, pi, output_x,output_y);
+		double dist = config.nearest_point(ci, pi, track_x,track_y);
 		if( dist >= 0 ) {
 			pt = curves[ci]->points[pi];
-			Track *track = plugin->server->plugin->track;
-			int track_w = track->track_w, track_h = track->track_h;
-			float px = (pt->x - track_w / 2) * projector_z + projector_x;
-			float py = (pt->y - track_h / 2) * projector_z + projector_y;
-			float pix = DISTANCE(px, py, cursor_x,cursor_y);
-			if( (state & ControlMask) && pix >= HANDLE_W ) { ci = pi = -1;  pt = 0; }
+			float cx, cy;
+			plugin->track_to_output(pt->x, pt->y, cx, cy);
+			canvas->output_to_canvas(mwindow->edl, 0, cx, cy);
+			cx += canvas->view_x;  cy += canvas->view_y;
+			dist = DISTANCE(cx,cy, cursor_x,cursor_y);
+			if( (state & ControlMask) && dist >= HANDLE_W ) {
+				ci = pi = -1;  pt = 0;
+			}
 		}
 		if( pt ) {
 			curve_list->update(ci);
@@ -712,47 +718,49 @@ int SketcherWindow::grab_button_press(XEvent *event)
 	return 1;
 }
 
-int SketcherWindow::grab_cursor_motion(XEvent *event)
+int SketcherWindow::grab_cursor_motion()
 {
+	if( !pending_motion )
+		return 0;
 	pending_motion = 0;
 	SketcherConfig &config = plugin->config;
-	int ci = config.cv_selected;
+	int ci = plugin->cv_selected;
 	if( ci < 0 || ci >= plugin->config.curves.size() )
 		return 0;
 	SketcherCurves &curves = config.curves;
 	SketcherCurve *cv = curves[ci];
 	SketcherPoints &points = cv->points;
-	int pi = config.pt_selected;
+	int pi = plugin->pt_selected;
 
 	if( (state & ShiftMask) ) {  // string of points
 		if( (state & (Button1Mask|Button3Mask)) ) {
 			SketcherPoint *pt = pi >= 0 && pi < points.size() ? points[pi] : 0;
 			if( pt ) {
-				float dist = DISTANCE(pt->x, pt->y, output_x, output_y);
+				float dist = DISTANCE(pt->x, pt->y, track_x, track_y);
 				if( dist < get_w()*0.1 ) return 0; // tolerance w/10
 			}
 			++new_points;
-			int pty = (state & Button1Mask) ? PTY_LINE : PTY_CURVE;
-			pi = plugin->new_point(cv, pty, output_x, output_y, pi+1);
+			int arc = (state & Button1Mask) ? ARC_LINE : ARC_CURVE;
+			pi = plugin->new_point(cv, arc, track_x, track_y, pi+1);
 			point_list->update(pi);
 		}
 		return 1;
 	}
 	if( (state & Button1Mask) ) {
-		if( (state & ControlMask) ) { // drag selected point
+		if( (state & ControlMask) && !(state & AltMask) ) { // drag selected point
 			SketcherPoint *pt = pi >= 0 && pi < points.size() ? points[pi] : 0;
 			if( pt ) {
-				point_list->set_point(pi, PT_X, pt->x = output_x);
-				point_list->set_point(pi, PT_Y, pt->y = output_y);
+				point_list->set_point(pi, PT_X, pt->x = track_x);
+				point_list->set_point(pi, PT_Y, pt->y = track_y);
 				point_list->update_list(pi);
 				point_x->update(pt->x);
 				point_y->update(pt->y);
 			}
 			return 1;
 		}
-		if( (state & AltMask) ) { // drag all curves
-			int dx = round(output_x - last_x);
-			int dy = round(output_y - last_y);
+		if( (state & ControlMask) && (state & AltMask) ) { // drag all curves
+			int dx = round(track_x - last_x);
+			int dy = round(track_y - last_y);
 			for( int i=0; i<curves.size(); ++i ) {
 				SketcherCurve *crv = plugin->config.curves[i];
 				int pts = crv->points.size();
@@ -769,15 +777,15 @@ int SketcherWindow::grab_cursor_motion(XEvent *event)
 			point_list->update(pi);
 			return 1;
 		}
-		double dist = cv->nearest_point(pi, output_x,output_y);
+		double dist = cv->nearest_point(pi, track_x,track_y);
 		if( dist >= 0 )
 			point_list->set_selected(pi);
 		return 1;
 	}
 	if( (state & Button3Mask) ) {
 		if( (state & (ControlMask | AltMask)) ) { // drag selected curve(s)
-			int dx = round(output_x - last_x);
-			int dy = round(output_y - last_y);
+			int dx = round(track_x - last_x);
+			int dy = round(track_y - last_y);
 			for( int i=0; i<points.size(); ++i ) {
 				SketcherPoint *pt = points[i];
 				pt->x += dx;  pt->y += dy;
@@ -790,7 +798,7 @@ int SketcherWindow::grab_cursor_motion(XEvent *event)
 			point_list->update(pi);
 			return 1;
 		}
-		double dist = config.nearest_point(ci, pi, output_x,output_y);
+		double dist = config.nearest_point(ci, pi, track_x,track_y);
 		if( dist >= 0 ) {
 			curve_list->update(ci);
 			point_list->update(pi);
@@ -808,39 +816,20 @@ int SketcherWindow::keypress_event()
 			del_curve->handle_event() :
 			del_point->handle_event() ;
 	}
-	return 0;
-}
-
-void SketcherWindow::done_event(int result)
-{
-	ungrab(client->server->mwindow->cwindow->gui);
-}
-
-void SketcherWindow::start_color_thread(SketcherCurveColor *color_button)
-{
-	unlock_window();
-	delete color_picker;
-	color_picker = new SketcherCurveColorPicker(this, color_button);
-	int color = CV_COLOR, ci = plugin->config.cv_selected;
-	if( ci >= 0 && ci < plugin->config.curves.size() ) {
-		SketcherCurve *cv = plugin->config.curves[ci];
-		color = cv->color;
-	}
-	color_picker->start(color);
-	lock_window("SketcherWindow::start_color_thread");
+	return context_help_check_and_show();
 }
 
 
 SketcherCurveList::SketcherCurveList(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_ListBox(x, y, 360, 130, LISTBOX_TEXT)
+ : BC_ListBox(x, y, xS(360), yS(130), LISTBOX_TEXT)
 {
 	this->gui = gui;
 	this->plugin = plugin;
-	col_titles[CV_ID] = _("ID");      col_widths[CV_ID] = 64;
-	col_titles[CV_RAD] = _("width");  col_widths[CV_RAD] = 64;
-	col_titles[CV_PEN] = _("pen");    col_widths[CV_PEN] = 64;
-	col_titles[CV_CLR] = _("color");  col_widths[CV_CLR] = 80;
-	col_titles[CV_ALP] = _("alpha");  col_widths[CV_ALP] = 64;
+	col_titles[CV_ID] = _("ID");      col_widths[CV_ID] = xS(64);
+	col_titles[CV_RAD] = _("width");  col_widths[CV_RAD] = xS(64);
+	col_titles[CV_PEN] = _("pen");    col_widths[CV_PEN] = xS(64);
+	col_titles[CV_CLR] = _("color");  col_widths[CV_CLR] = xS(80);
+	col_titles[CV_ALP] = _("alpha");  col_widths[CV_ALP] = xS(64);
 }
 SketcherCurveList::~SketcherCurveList()
 {
@@ -870,6 +859,7 @@ int SketcherCurveList::handle_event()
 
 int SketcherCurveList::selection_changed()
 {
+	gui->curve_color->close_picker();
 	handle_event();
 	return 1;
 }
@@ -884,7 +874,7 @@ void SketcherCurveList::set_selected(int k)
 		gui->curve_color->update_gui(cv->color);
 		ci = k;
 	}
-	plugin->config.cv_selected = ci;
+	plugin->cv_selected = ci;
 	update_list(ci);
 }
 
@@ -929,7 +919,7 @@ void SketcherCurveList::add_curve(const char *id, const char *pen,
 }
 
 SketcherNewCurve::SketcherNewCurve(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, 64, _("New"))
+ : BC_GenericButton(x, y, xS(96), _("New"))
 {
 	this->gui = gui;
 	this->plugin = plugin;
@@ -939,8 +929,10 @@ SketcherNewCurve::~SketcherNewCurve()
 }
 int SketcherNewCurve::handle_event()
 {
-	int pen = PTY_LINE, width = 1, color = CV_COLOR;
-	int ci = plugin->config.cv_selected;
+	int pen = gui->curve_pen->pen;
+	int color = gui->curve_color->color;
+	int width = gui->curve_width->width;
+	int ci = plugin->cv_selected;
 	if( ci >= 0 && ci < plugin->config.curves.size() ) {
 		SketcherCurve *cv = plugin->config.curves[ci];
 		pen = cv->pen;  width = cv->width;  color = cv->color;
@@ -953,7 +945,7 @@ int SketcherNewCurve::handle_event()
 }
 
 SketcherDelCurve::SketcherDelCurve(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, 64, C_("Del"))
+ : BC_GenericButton(x, y, xS(96), C_("Del"))
 {
 	this->gui = gui;
 	this->plugin = plugin;
@@ -964,7 +956,7 @@ SketcherDelCurve::~SketcherDelCurve()
 int SketcherDelCurve::handle_event()
 {
 	SketcherConfig &config = plugin->config;
-	int ci = config.cv_selected;
+	int ci = plugin->cv_selected;
 	SketcherCurves &curves = config.curves;
 	if( ci >= 0 && ci < curves.size() ) {
 		curves.remove_object_number(ci--);
@@ -979,7 +971,7 @@ int SketcherDelCurve::handle_event()
 }
 
 SketcherCurveUp::SketcherCurveUp(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Up"))
+ : BC_GenericButton(x, y, xS(96), _("Up"))
 {
 	this->gui = gui;
 }
@@ -990,7 +982,7 @@ SketcherCurveUp::~SketcherCurveUp()
 int SketcherCurveUp::handle_event()
 {
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	SketcherCurves &curves = config.curves;
 	if( ci > 0 && ci < curves.size() ) {
 		SketcherCurve *&cv0 = curves[ci];
@@ -1003,7 +995,7 @@ int SketcherCurveUp::handle_event()
 }
 
 SketcherCurveDn::SketcherCurveDn(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Dn"))
+ : BC_GenericButton(x, y, xS(96), _("Dn"))
 {
 	this->gui = gui;
 }
@@ -1014,7 +1006,7 @@ SketcherCurveDn::~SketcherCurveDn()
 int SketcherCurveDn::handle_event()
 {
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	SketcherCurves &curves = config.curves;
 	if( ci >= 0 && ci < curves.size()-1 ) {
 		SketcherCurve *&cv0 = curves[ci];
@@ -1027,24 +1019,23 @@ int SketcherCurveDn::handle_event()
 }
 
 
-SketcherPointTypeItem::SketcherPointTypeItem(int pty)
- : BC_MenuItem(_(pt_type[pty]))
+SketcherPointTypeItem::SketcherPointTypeItem(int arc)
+ : BC_MenuItem(_(pt_type[arc]))
 {
-	this->pty = pty;
+	this->arc = arc;
 }
 int SketcherPointTypeItem::handle_event()
 {
 	SketcherPointType *popup = (SketcherPointType*)get_popup_menu();
-	popup->update(pty);
+	popup->update(arc);
 	SketcherWindow *gui = popup->gui;
 	SketcherConfig &config = gui->plugin->config;
 	SketcherCurves &curves = config.curves;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci < 0 || ci >= curves.size() )
 		return 1;
 	SketcherCurve *cv = curves[ci];
 	SketcherPoints &points = cv->points;
-	int pi = config.pt_selected;
 
 	ArrayList<int> selected;
 	for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
@@ -1054,40 +1045,42 @@ int SketcherPointTypeItem::handle_event()
 		int k = selected[i];
 		if( k < 0 || k >= points.size() ) continue;
 		SketcherPoint *pt = cv->points[k];
-		pt->pty = pty;
-		gui->point_list->set_point(k, PT_TY, _(pt_type[pty]));
+		pt->arc = arc;
+		gui->point_list->set_point(k, PT_TY, _(pt_type[arc]));
 	}
 
+	int pi = gui->plugin->pt_selected;
 	gui->point_list->update_list(pi);
 	gui->send_configure_change();
 	return 1;
 }
 
-SketcherPointType::SketcherPointType(SketcherWindow *gui, int x, int y, int pty)
- : BC_PopupMenu(x,y,64,_(pt_type[pty]))
+SketcherPointType::SketcherPointType(SketcherWindow *gui, int x, int y, int arc)
+ : BC_PopupMenu(x,y,xS(100),_(pt_type[arc]))
 {
 	this->gui = gui;
+	this->type = arc;
 }
 void SketcherPointType::create_objects()
 {
-	for( int pty=0; pty<PT_SZ; ++pty )
-		add_item(new SketcherPointTypeItem(pty));
+	for( int arc=0; arc<PT_SZ; ++arc )
+		add_item(new SketcherPointTypeItem(arc));
 }
-void SketcherPointType::update(int pty)
+void SketcherPointType::update(int arc)
 {
-	set_text(_(pt_type[pty]));
+	set_text(_(pt_type[this->type=arc]));
 }
 
 
 SketcherPointList::SketcherPointList(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_ListBox(x, y, 360, 130, LISTBOX_TEXT)
+ : BC_ListBox(x, y, xS(360), yS(130), LISTBOX_TEXT)
 {
 	this->gui = gui;
 	this->plugin = plugin;
-	col_titles[PT_ID] = _("ID");    col_widths[PT_ID] = 50;
-	col_titles[PT_TY] = _("Type");  col_widths[PT_TY] = 80;
-	col_titles[PT_X] = _("X");      col_widths[PT_X] = 90;
-	col_titles[PT_Y] = _("Y");      col_widths[PT_Y] = 90;
+	col_titles[PT_ID] = _("ID");    col_widths[PT_ID] = xS(50);
+	col_titles[PT_TY] = _("Type");  col_widths[PT_TY] = xS(80);
+	col_titles[PT_X] = _("X");      col_widths[PT_X] = xS(90);
+	col_titles[PT_Y] = _("Y");      col_widths[PT_Y] = xS(90);
 	set_selection_mode(LISTBOX_MULTIPLE);
 }
 SketcherPointList::~SketcherPointList()
@@ -1150,16 +1143,16 @@ void SketcherPointList::set_point(int i, int c, const char *cp)
 void SketcherPointList::set_selected(int k)
 {
 	SketcherPoint *pt = 0;
-	int ci = plugin->config.cv_selected, pi = -1;
+	int ci = plugin->cv_selected, pi = -1;
 	if( ci >= 0 && ci < plugin->config.curves.size() ) {
 		SketcherCurve *cv = plugin->config.curves[ci];
 		pt = k >= 0 && k < cv->points.size() ? cv->points[pi=k] : 0;
 	}
-	gui->point_type->update(pt ? pt->pty : PTY_OFF);
+	gui->point_type->update(pt ? pt->arc : ARC_OFF);
 	gui->point_x->update(pt ? pt->x : 0.f);
 	gui->point_y->update(pt ? pt->y : 0.f);
 	gui->point_id->update(pt ? pt->id : 0);
-	plugin->config.pt_selected = pi;
+	plugin->pt_selected = pi;
 	update_list(pi);
 }
 void SketcherPointList::update_list(int k)
@@ -1172,7 +1165,7 @@ void SketcherPointList::update_list(int k)
 void SketcherPointList::update(int k)
 {
 	clear();
-	int ci = plugin->config.cv_selected, sz = 0;
+	int ci = plugin->cv_selected, sz = 0;
 	if( ci >= 0 && ci < plugin->config.curves.size() ) {
 		SketcherCurve *cv = plugin->config.curves[ci];
 		SketcherPoints &points = cv->points;
@@ -1180,7 +1173,7 @@ void SketcherPointList::update(int k)
 		for( int i=0; i<sz; ++i ) {
 			SketcherPoint *pt = points[i];
 			char itxt[BCSTRLEN];  sprintf(itxt,"%d", pt->id);
-			char ttxt[BCSTRLEN];  sprintf(ttxt,"%s", _(pt_type[pt->pty]));
+			char ttxt[BCSTRLEN];  sprintf(ttxt,"%s", _(pt_type[pt->arc]));
 			char xtxt[BCSTRLEN];  sprintf(xtxt,"%0.1f", pt->x);
 			char ytxt[BCSTRLEN];  sprintf(ytxt,"%0.1f", pt->y);
 			add_point(itxt, ttxt, xtxt, ytxt);
@@ -1192,24 +1185,24 @@ void SketcherPointList::update(int k)
 void SketcherWindow::update_gui()
 {
 	SketcherConfig &config = plugin->config;
-	int ci = config.cv_selected;
-	int pi = config.pt_selected;
-	curve_list->update(ci);
-	point_list->update(pi);
+	curve_list->update(plugin->cv_selected);
+	point_list->update(plugin->pt_selected);
+	int ci = plugin->cv_selected;
 	SketcherCurve *cv = ci >= 0 ? config.curves[ci] : 0;
 	curve_width->update(cv ? cv->width : 1);
 	curve_pen->update(cv ? cv->pen : PEN_SQUARE);
 	curve_color->set_color(cv ? cv->color : CV_COLOR);
-	SketcherPoint *pt = pi >= 0 ? cv->points[pi] : 0;
+	int pi = plugin->pt_selected;
+	SketcherPoint *pt = pi >= 0 && pi<cv->points.size() ? cv->points[pi] : 0;
 	point_x->update(pt ? pt->x : 0);
 	point_y->update(pt ? pt->y : 0);
 	point_id->update(pt ? pt->id : 0);
-	drag->update(plugin->config.drag);
+	drag->update(plugin->drag);
 }
 
 
 SketcherPointUp::SketcherPointUp(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Up"))
+ : BC_GenericButton(x, y, xS(96), _("Up"))
 {
 	this->gui = gui;
 }
@@ -1220,14 +1213,16 @@ SketcherPointUp::~SketcherPointUp()
 int SketcherPointUp::handle_event()
 {
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci < 0 || ci >= config.curves.size() )
 		return 1;
 	SketcherCurve *cv = config.curves[ci];
 	SketcherPoints &points = cv->points;
 	if( points.size() < 2 )
 		return 1;
-	int pi = config.pt_selected;
+	int pi = gui->plugin->pt_selected;
+	if( pi < 0 || pi >= points.size() )
+		return 1;
 
 	ArrayList<int> selected;
 	for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
@@ -1247,7 +1242,7 @@ int SketcherPointUp::handle_event()
 }
 
 SketcherPointDn::SketcherPointDn(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Dn"))
+ : BC_GenericButton(x, y, xS(96), _("Dn"))
 {
 	this->gui = gui;
 }
@@ -1258,7 +1253,7 @@ SketcherPointDn::~SketcherPointDn()
 int SketcherPointDn::handle_event()
 {
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci < 0 || ci >= config.curves.size() )
 		return 1;
 	SketcherCurve *cv = config.curves[ci];
@@ -1266,7 +1261,9 @@ int SketcherPointDn::handle_event()
 	int sz1 = points.size()-1;
 	if( sz1 < 1 )
 		return 1;
-	int pi = config.pt_selected;
+	int pi = gui->plugin->pt_selected;
+	if( pi < 0 || pi >= points.size() )
+		return 1;
 
 	ArrayList<int> selected;
 	for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
@@ -1286,7 +1283,7 @@ int SketcherPointDn::handle_event()
 }
 
 SketcherDrag::SketcherDrag(SketcherWindow *gui, int x, int y)
- : BC_CheckBox(x, y, gui->plugin->config.drag, _("Drag"))
+ : BC_CheckBox(x, y, gui->plugin->drag, (C_("Drag")))
 {
 	this->gui = gui;
 }
@@ -1302,13 +1299,23 @@ int SketcherDrag::handle_event()
 	}
 	else
 		gui->ungrab(cwindow_gui);
-	gui->plugin->config.drag = value;
+	gui->plugin->drag = value;
 	gui->send_configure_change();
 	return 1;
 }
+int SketcherWindow::handle_ungrab()
+{
+	CWindowGUI *cwindow_gui = plugin->server->mwindow->cwindow->gui;
+	int ret = ungrab(cwindow_gui);
+	if( ret ) {
+		drag->update(0);
+		plugin->drag = 0;
+	}
+	return ret;
+}
 
 SketcherNewPoint::SketcherNewPoint(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, 64, _("New"))
+ : BC_GenericButton(x, y, xS(96), _("New"))
 {
 	this->gui = gui;
 	this->plugin = plugin;
@@ -1318,15 +1325,25 @@ SketcherNewPoint::~SketcherNewPoint()
 }
 int SketcherNewPoint::handle_event()
 {
-	int pi = plugin->config.pt_selected;
-	int k = plugin->new_point(pi+1);
+	SketcherConfig &config = gui->plugin->config;
+	SketcherCurves &curves = config.curves;
+	int ci = gui->plugin->cv_selected;
+	if( ci < 0 || ci >= curves.size() )
+		return -1;
+	SketcherCurve *cv = curves[ci];
+	SketcherPoints &points = cv->points;
+	int pi = gui->plugin->pt_selected;
+	if( pi < 0 || pi >= points.size() )
+		return -1;
+	int arc = gui->point_type->type;
+	int k = plugin->new_point(pi<0 ? 0 : pi+1, arc);
 	gui->point_list->update(k);
 	gui->send_configure_change();
 	return 1;
 }
 
 SketcherDelPoint::SketcherDelPoint(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, 64, C_("Del"))
+ : BC_GenericButton(x, y, xS(96), C_("Del"))
 {
 	this->gui = gui;
 	this->plugin = plugin;
@@ -1338,12 +1355,14 @@ int SketcherDelPoint::handle_event()
 {
 	SketcherConfig &config = gui->plugin->config;
 	SketcherCurves &curves = config.curves;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci < 0 || ci >= curves.size() )
 		return 1;
 	SketcherCurve *cv = curves[ci];
 	SketcherPoints &points = cv->points;
-	int pi = config.pt_selected;
+	int pi = gui->plugin->pt_selected;
+	if( pi < 0 || pi >= points.size() )
+		return 1;
 
 	ArrayList<int> selected;
 	for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
@@ -1381,7 +1400,7 @@ int SketcherResetCurves::handle_event()
 }
 
 SketcherResetPoints::SketcherResetPoints(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, _("Reset"))
+ : BC_GenericButton(x, y-yS(2), _("Reset"))
 {
 	this->gui = gui;
 	this->plugin = plugin;
@@ -1392,7 +1411,7 @@ SketcherResetPoints::~SketcherResetPoints()
 int SketcherResetPoints::handle_event()
 {
 	SketcherConfig &config = gui->plugin->config;
-	int ci = config.cv_selected;
+	int ci = gui->plugin->cv_selected;
 	if( ci >= 0 && ci < config.curves.size() ) {
 		SketcherCurve *cv = config.curves[ci];
 		cv->points.remove_all_objects();
@@ -1402,3 +1421,23 @@ int SketcherResetPoints::handle_event()
 	return 1;
 }
 
+SketcherHelp::SketcherHelp(SketcherWindow *gui, Sketcher *plugin, int x, int y)
+ : BC_CheckBox(x, y, 0, _("Help"))
+{
+	this->gui = gui;
+	this->plugin = plugin;
+        set_tooltip(_("Show help text"));
+}
+SketcherHelp::~SketcherHelp()
+{
+}
+
+int SketcherHelp::handle_event()
+{
+        gui->helped = get_value();
+        gui->resize_window(gui->get_w(),
+                gui->helped ? gui->help_h : gui->help_y);
+        gui->update_gui();
+        return 1;
+}
+