1 files changed, 409 insertions, 404 deletions

diff --git a/app/bin/ccontrol.c b/app/bin/ccontrol.c
index 793acc3..90c4fb2 100644
--- a/app/bin/ccontrol.c
+++ b/app/bin/ccontrol.c
@@ -4,8 +4,8 @@
 
 /* -*- C -*- ****************************************************************
  *
- *  System        : 
- *  Module        : 
+ *  System        :
+ *  Module        :
  *  Object Name   : $RCSfile$
  *  Revision      : $Revision$
  *  Date          : $Date$
@@ -14,12 +14,12 @@
  *  Created       : Sun Mar 5 16:01:37 2017
  *  Last Modified : <170314.1418>
  *
- *  Description	
+ *  Description
  *
  *  Notes
  *
  *  History
- *	
+ *
  ****************************************************************************
  *
  *    Copyright (C) 2017  Robert Heller D/B/A Deepwoods Software
@@ -38,31 +38,26 @@
  *
  *    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
  *
- * 
  *
  ****************************************************************************/
 
-static const char rcsid[] = "@(#) : $Id$";
-
-#include <ctype.h>
-#include <string.h>
+//static const char rcsid[] = "@(#) : $Id$";
 
 #include "compound.h"
+#include "cselect.h"
 #include "cundo.h"
 #include "custom.h"
 #include "fileio.h"
-#include "i18n.h"
 #include "layout.h"
 #include "param.h"
 #include "track.h"
-#include "trackx.h"
-#ifdef WINDOWS
+#include "common-ui.h"
+#ifdef UTFCONVERT
 #include "include/utf8convert.h"
-#endif // WINDOWS
-#include "utility.h"
-#include "messages.h"
+#endif // UTFCONVERT
 
 EXPORT TRKTYP_T T_CONTROL = -1;
 
@@ -77,7 +72,8 @@ static drawCmd_t controlD = {
 	1.0,
 	0.0,
 	{0.0,0.0}, {0.0,0.0},
-	Pix2CoOrd, CoOrd2Pix };
+	Pix2CoOrd, CoOrd2Pix
+};
 
 static char controlName[STR_SHORT_SIZE];
 static char controlOnScript[STR_LONG_SIZE];
@@ -85,16 +81,17 @@ static char controlOffScript[STR_LONG_SIZE];
 #endif
 
 typedef struct controlData_t {
-    coOrd orig;
-    BOOL_T IsHilite;
-    char * name;
-    char * onscript;
-    char * offscript;
+	extraDataBase_t base;
+	coOrd orig;
+	BOOL_T IsHilite;
+	char * name;
+	char * onscript;
+	char * offscript;
 } controlData_t, *controlData_p;
 
 static controlData_p GetcontrolData ( track_p trk )
 {
-    return (controlData_p) GetTrkExtraData(trk);
+	return GET_EXTRA_DATA( trk, T_CONTROL, controlData_t );
 }
 
 #define RADIUS 6
@@ -102,267 +99,270 @@ static controlData_p GetcontrolData ( track_p trk )
 
 #define control_SF (3.0)
 
-static void DDrawControl(drawCmd_p d, coOrd orig, DIST_T scaleRatio, 
+static void DDrawControl(drawCmd_p d, coOrd orig, DIST_T scaleRatio,
                          wDrawColor color )
 {
-    coOrd p1, p2;
-    
-    p1 = orig;
-    DrawFillCircle(d,p1, RADIUS * control_SF / scaleRatio,color);
-    Translate (&p1, orig, 45, RADIUS * control_SF / scaleRatio);
-    Translate (&p2, p1, 45, LINE * control_SF / scaleRatio);
-    DrawLine(d, p1, p2, 2, color);
-    Translate (&p1, orig, 45+90, RADIUS * control_SF / scaleRatio);
-    Translate (&p2, p1, 45+90, LINE * control_SF / scaleRatio);
-    DrawLine(d, p1, p2, 2, color);
-    Translate (&p1, orig, 45+180, RADIUS * control_SF / scaleRatio);
-    Translate (&p2, p1, 45+180, LINE * control_SF / scaleRatio);
-    DrawLine(d, p1, p2, 2, color);
-    Translate (&p1, orig, 45+270, RADIUS * control_SF / scaleRatio);
-    Translate (&p2, p1, 45+270, LINE * control_SF / scaleRatio);
-    DrawLine(d, p1, p2, 2, color);
+	coOrd p1, p2;
+
+	p1 = orig;
+	DrawFillCircle(d,p1, RADIUS * control_SF / scaleRatio,color);
+	Translate (&p1, orig, 45, RADIUS * control_SF / scaleRatio);
+	Translate (&p2, p1, 45, LINE * control_SF / scaleRatio);
+	DrawLine(d, p1, p2, 2, color);
+	Translate (&p1, orig, 45+90, RADIUS * control_SF / scaleRatio);
+	Translate (&p2, p1, 45+90, LINE * control_SF / scaleRatio);
+	DrawLine(d, p1, p2, 2, color);
+	Translate (&p1, orig, 45+180, RADIUS * control_SF / scaleRatio);
+	Translate (&p2, p1, 45+180, LINE * control_SF / scaleRatio);
+	DrawLine(d, p1, p2, 2, color);
+	Translate (&p1, orig, 45+270, RADIUS * control_SF / scaleRatio);
+	Translate (&p2, p1, 45+270, LINE * control_SF / scaleRatio);
+	DrawLine(d, p1, p2, 2, color);
 }
 
 static void DrawControl (track_p t, drawCmd_p d, wDrawColor color )
 {
-    controlData_p xx = GetcontrolData(t);
-    DDrawControl(d,xx->orig,GetScaleRatio(GetTrkScale(t)),color);
+	controlData_p xx = GetcontrolData(t);
+	DDrawControl(d,xx->orig,GetScaleRatio(GetTrkScale(t)),color);
 }
 
-static void ControlBoundingBox (coOrd orig, DIST_T scaleRatio, coOrd *hi, 
+static void ControlBoundingBox (coOrd orig, DIST_T scaleRatio, coOrd *hi,
                                 coOrd *lo)
 {
-    coOrd p1, p2;
-    
-    p1 = orig;
-    Translate (&p1, orig, 0, -(RADIUS+LINE) * control_SF / scaleRatio);
-    Translate (&p2, orig, 0, (RADIUS+LINE) * control_SF / scaleRatio);
-    *hi = p1; *lo = p1;
-    if (p2.x > hi->x) hi->x = p2.x;
-    if (p2.x < lo->x) lo->x = p2.x;
-    if (p2.y > hi->y) hi->y = p2.y;
-    if (p2.y < lo->y) lo->y = p2.y;
-}    
+	coOrd p1, p2;
+
+	p1 = orig;
+	Translate (&p1, orig, 0, -(RADIUS+LINE) * control_SF / scaleRatio);
+	Translate (&p2, orig, 0, (RADIUS+LINE) * control_SF / scaleRatio);
+	*hi = p1; *lo = p1;
+	if (p2.x > hi->x) { hi->x = p2.x; }
+	if (p2.x < lo->x) { lo->x = p2.x; }
+	if (p2.y > hi->y) { hi->y = p2.y; }
+	if (p2.y < lo->y) { lo->y = p2.y; }
+}
 
 
 static void ComputeControlBoundingBox (track_p t )
 {
-    coOrd lo, hi;
-    controlData_p xx = GetcontrolData(t);
-    ControlBoundingBox(xx->orig, GetScaleRatio(GetTrkScale(t)), &hi, &lo);
-    SetBoundingBox(t, hi, lo);
+	coOrd lo, hi;
+	controlData_p xx = GetcontrolData(t);
+	ControlBoundingBox(xx->orig, GetScaleRatio(GetTrkScale(t)), &hi, &lo);
+	SetBoundingBox(t, hi, lo);
 }
 
 static DIST_T DistanceControl (track_p t, coOrd * p )
 {
-    controlData_p xx = GetcontrolData(t);
-    return FindDistance(xx->orig, *p);
+	controlData_p xx = GetcontrolData(t);
+	return FindDistance(xx->orig, *p);
 }
 
 static struct {
-    char name[STR_SHORT_SIZE];
-    coOrd pos;
-    char onscript[STR_LONG_SIZE];
-    char offscript[STR_LONG_SIZE];
+	char name[STR_SHORT_SIZE];
+	coOrd pos;
+	char onscript[STR_LONG_SIZE];
+	char offscript[STR_LONG_SIZE];
 } controlProperties;
 
 typedef enum { NM, PS, ON, OF } controlDesc_e;
 static descData_t controlDesc[] = {
-    /* NM */ { DESC_STRING, N_("Name"),      &controlProperties.name, sizeof(controlProperties.name) },
-    /* PS */ { DESC_POS,    N_("Position"),  &controlProperties.pos },
-    /* ON */ { DESC_STRING, N_("On Script"), &controlProperties.onscript, sizeof(controlProperties.onscript) },
-    /* OF */ { DESC_STRING, N_("Off Script"),&controlProperties.offscript, sizeof(controlProperties.offscript) },
-    { DESC_NULL } };
+	/* NM */ { DESC_STRING, N_("Name"),      &controlProperties.name, sizeof(controlProperties.name) },
+	/* PS */ { DESC_POS,    N_("Position"),  &controlProperties.pos },
+	/* ON */ { DESC_STRING, N_("On Script"), &controlProperties.onscript, sizeof(controlProperties.onscript) },
+	/* OF */ { DESC_STRING, N_("Off Script"),&controlProperties.offscript, sizeof(controlProperties.offscript) },
+	{ DESC_NULL }
+};
 
 static void UpdateControlProperties (  track_p trk, int inx, descData_p
-                                     descUpd, BOOL_T needUndoStart )
+                                       descUpd, BOOL_T needUndoStart )
 {
-    controlData_p xx = GetcontrolData(trk);
-    const char *thename, *theonscript, *theoffscript;
-    unsigned int max_str;
-    char *newName, *newOnScript, *newOffScript;
-    BOOL_T changed, nChanged, pChanged, onChanged, offChanged;
-    
-    switch (inx) {
-    case NM:
-        break;
-    case PS:
-        break;
-    case ON:
-        break;
-    case OF:
-        break;
-    case -1:
-        changed = nChanged = pChanged = onChanged = offChanged = FALSE;
-        thename = wStringGetValue( (wString_p) controlDesc[NM].control0 );
-        if (strcmp(thename,xx->name) != 0) {
-            nChanged = changed = TRUE;
-            max_str = controlDesc[NM].max_string;
+	controlData_p xx = GetcontrolData(trk);
+	const char *thename, *theonscript, *theoffscript;
+	unsigned int max_str;
+	char *newName, *newOnScript, *newOffScript=NULL;
+	BOOL_T changed, nChanged, pChanged, onChanged, offChanged;
+
+	switch (inx) {
+	case NM:
+		break;
+	case PS:
+		break;
+	case ON:
+		break;
+	case OF:
+		break;
+	case -1:
+		changed = nChanged = pChanged = onChanged = offChanged = FALSE;
+		thename = wStringGetValue( (wString_p) controlDesc[NM].control0 );
+		if (strcmp(thename,xx->name) != 0) {
+			nChanged = changed = TRUE;
+			max_str = controlDesc[NM].max_string;
 			if (max_str && strlen(thename)>max_str-1) {
 				newName = MyMalloc(max_str);
 				newName[0] = '\0';
 				strncat(newName,thename,max_str-1);
 				NoticeMessage2(0, MSG_ENTERED_STRING_TRUNCATED, _("Ok"), NULL, max_str-1);
-			} else newName = MyStrdup(thename);
-        }
+			} else { newName = MyStrdup(thename); }
+		}
 
 
-        theonscript = wStringGetValue( (wString_p) controlDesc[ON].control0 );
-        if (strcmp(theonscript,xx->onscript) != 0) {
-            onChanged = changed = TRUE;
-        	max_str = controlDesc[ON].max_string;
+		theonscript = wStringGetValue( (wString_p) controlDesc[ON].control0 );
+		if (strcmp(theonscript,xx->onscript) != 0) {
+			onChanged = changed = TRUE;
+			max_str = controlDesc[ON].max_string;
 			if (max_str && strlen(theonscript)>max_str-1) {
 				newOnScript = MyMalloc(max_str);
 				newOnScript[0] = '\0';
 				strncat(newOnScript,theonscript,max_str-1);
 				NoticeMessage2(0, MSG_ENTERED_STRING_TRUNCATED, _("Ok"), NULL, max_str-1);
-			} else newOnScript = MyStrdup(theonscript);
-        }
+			} else { newOnScript = MyStrdup(theonscript); }
+		}
 
-        theoffscript = wStringGetValue( (wString_p) controlDesc[OF].control0 );
-        if (strcmp(theoffscript,xx->offscript) != 0) {
-            offChanged = changed = TRUE;
-            max_str = controlDesc[OF].max_string;
+		theoffscript = wStringGetValue( (wString_p) controlDesc[OF].control0 );
+		if (strcmp(theoffscript,xx->offscript) != 0) {
+			offChanged = changed = TRUE;
+			max_str = controlDesc[OF].max_string;
 			if (max_str && strlen(theoffscript)>max_str-1) {
 				newOffScript = MyMalloc(max_str);
 				newOffScript[max_str-1] = '\0';
 				strncat(newOffScript,theoffscript,max_str-1);
 				NoticeMessage2(0, MSG_ENTERED_STRING_TRUNCATED, _("Ok"), NULL, max_str);
-			} else newOffScript = MyStrdup(theoffscript);
-        }
-
-        if (controlProperties.pos.x != xx->orig.x ||
-            controlProperties.pos.y != xx->orig.y) {
-            pChanged = changed = TRUE;
-        }
-        if (!changed) break;
-        if (needUndoStart)
-            UndoStart( _("Change Control"), "Change Control" );
-        UndoModify( trk );
-        if (nChanged) {
-            MyFree(xx->name);
-            xx->name = newName;
-        }
-        if (pChanged) {
-            UndrawNewTrack( trk );
-        }
-        if (pChanged) {
-            xx->orig = controlProperties.pos;
-        }
-        if (onChanged) {
-            MyFree(xx->onscript);
-            xx->onscript = newOnScript;
-        }
-        if (offChanged) {
-            MyFree(xx->offscript);
-            xx->offscript = newOffScript;
-        }
-        if (pChanged) { 
-            ComputeControlBoundingBox( trk );
-            DrawNewTrack( trk );
-        }
-        break;
-    }
+			} else { newOffScript = MyStrdup(theoffscript); }
+		}
+
+		if (controlProperties.pos.x != xx->orig.x ||
+		    controlProperties.pos.y != xx->orig.y) {
+			pChanged = changed = TRUE;
+		}
+		if (!changed) { break; }
+		if (needUndoStart) {
+			UndoStart( _("Change Control"), "Change Control" );
+		}
+		UndoModify( trk );
+		if (nChanged) {
+			MyFree(xx->name);
+			xx->name = newName;
+		}
+		if (pChanged) {
+			UndrawNewTrack( trk );
+		}
+		if (pChanged) {
+			xx->orig = controlProperties.pos;
+		}
+		if (onChanged) {
+			MyFree(xx->onscript);
+			xx->onscript = newOnScript;
+		}
+		if (offChanged) {
+			MyFree(xx->offscript);
+			xx->offscript = newOffScript;
+		}
+		if (pChanged) {
+			ComputeControlBoundingBox( trk );
+			DrawNewTrack( trk );
+		}
+		break;
+	}
 }
 
-        
+
 
 
 
 static void DescribeControl (track_p trk, char * str, CSIZE_T len )
 {
-    controlData_p xx = GetcontrolData(trk);
-    
-    strcpy( str, _(GetTrkTypeName( trk )) );
-    str++;
-    while (*str) {
-        *str = tolower((unsigned char)*str);
-        str++;
-    }
-    sprintf( str, _("(%d [%s]): Layer=%u, at %0.3f,%0.3f"),
-             GetTrkIndex(trk),
-             xx->name,GetTrkLayer(trk)+1, xx->orig.x, xx->orig.y);
-    strncpy(controlProperties.name,xx->name,STR_SHORT_SIZE-1);
-    controlProperties.name[STR_SHORT_SIZE-1] = '\0';
-    strncpy(controlProperties.onscript,xx->onscript,STR_LONG_SIZE-1);
-    controlProperties.onscript[STR_LONG_SIZE-1] = '\0';
-    strncpy(controlProperties.offscript,xx->offscript,STR_LONG_SIZE-1);
-    controlProperties.offscript[STR_LONG_SIZE-1] = '\0';
-    controlProperties.pos = xx->orig;
-    controlDesc[NM].mode = 
-          controlDesc[ON].mode = 
-          controlDesc[OF].mode = DESC_NOREDRAW;
-    DoDescribe( _("Control"), trk, controlDesc, UpdateControlProperties );
-    
+	controlData_p xx = GetcontrolData(trk);
+
+	strcpy( str, _(GetTrkTypeName( trk )) );
+	str++;
+	while (*str) {
+		*str = tolower((unsigned char)*str);
+		str++;
+	}
+	sprintf( str, _("(%d [%s]): Layer=%u, at %0.3f,%0.3f"),
+	         GetTrkIndex(trk),
+	         xx->name,GetTrkLayer(trk)+1, xx->orig.x, xx->orig.y);
+	strncpy(controlProperties.name,xx->name,STR_SHORT_SIZE-1);
+	controlProperties.name[STR_SHORT_SIZE-1] = '\0';
+	strncpy(controlProperties.onscript,xx->onscript,STR_LONG_SIZE-1);
+	controlProperties.onscript[STR_LONG_SIZE-1] = '\0';
+	strncpy(controlProperties.offscript,xx->offscript,STR_LONG_SIZE-1);
+	controlProperties.offscript[STR_LONG_SIZE-1] = '\0';
+	controlProperties.pos = xx->orig;
+	controlDesc[NM].mode =
+	        controlDesc[ON].mode =
+	                controlDesc[OF].mode = DESC_NOREDRAW;
+	DoDescribe( _("Control"), trk, controlDesc, UpdateControlProperties );
+
 }
 
-static void DeleteControl ( track_p trk ) 
+static void DeleteControl ( track_p trk )
 {
-    controlData_p xx = GetcontrolData(trk);
-    MyFree(xx->name); xx->name = NULL;
-    MyFree(xx->onscript); xx->onscript = NULL;
-    MyFree(xx->offscript); xx->offscript = NULL;
+	controlData_p xx = GetcontrolData(trk);
+	MyFree(xx->name); xx->name = NULL;
+	MyFree(xx->onscript); xx->onscript = NULL;
+	MyFree(xx->offscript); xx->offscript = NULL;
 }
 
 static BOOL_T WriteControl ( track_p t, FILE * f )
 {
-    BOOL_T rc = TRUE;
-    controlData_p xx = GetcontrolData(t);
+	BOOL_T rc = TRUE;
+	controlData_p xx = GetcontrolData(t);
 	char *controlName = MyStrdup(xx->name);
 
-#ifdef WINDOWS
+#ifdef UTFCONVERT
 	controlName = Convert2UTF8(controlName);
-#endif // WINDOWS
+#endif // UTFCONVERT
 
-    rc &= fprintf(f, "CONTROL %d %u %s %d %0.6f %0.6f \"%s\" \"%s\" \"%s\"\n",
-                  GetTrkIndex(t), GetTrkLayer(t), GetTrkScaleName(t),
-                  GetTrkVisible(t), xx->orig.x, xx->orig.y, controlName, 
-                  xx->onscript, xx->offscript)>0;
+	rc &= fprintf(f, "CONTROL %d %u %s %d %0.6f %0.6f \"%s\" \"%s\" \"%s\"\n",
+	              GetTrkIndex(t), GetTrkLayer(t), GetTrkScaleName(t),
+	              GetTrkVisible(t), xx->orig.x, xx->orig.y, controlName,
+	              xx->onscript, xx->offscript)>0;
 
 	MyFree(controlName);
-    return rc;
+	return rc;
 }
 
 static BOOL_T ReadControl ( char * line )
 {
-    wIndex_t index;
-    /*TRKINX_T trkindex;*/
-    track_p trk;
-    /*char * cp = NULL;*/
-    char *name;
-    char *onscript, *offscript;
-    coOrd orig;
-    BOOL_T visible;
-    char scale[10];
-    wIndex_t layer;
-    controlData_p xx;
-    if (!GetArgs(line+7,"dLsdpqqq",&index,&layer,scale, &visible, &orig,&name,&onscript,&offscript)) {
-        return FALSE;
-    }
-
-#ifdef WINDOWS
+	wIndex_t index;
+	/*TRKINX_T trkindex;*/
+	track_p trk;
+	/*char * cp = NULL;*/
+	char *name;
+	char *onscript, *offscript;
+	coOrd orig;
+	BOOL_T visible;
+	char scale[10];
+	wIndex_t layer;
+	controlData_p xx;
+	if (!GetArgs(line+7,"dLsdpqqq",&index,&layer,scale, &visible, &orig,&name,
+	             &onscript,&offscript)) {
+		return FALSE;
+	}
+
+#ifdef UTFCONVERT
 	ConvertUTF8ToSystem(name);
-#endif // WINDOWS
-
-    trk = NewTrack(index, T_CONTROL, 0, sizeof(controlData_t));
-    SetTrkVisible(trk, visible); 
-    SetTrkScale(trk, LookupScale( scale ));
-    SetTrkLayer(trk, layer);
-    xx = GetcontrolData ( trk );
-    xx->name = name;
-    xx->orig = orig;
-    xx->onscript = onscript;
-    xx->offscript = offscript;
-    ComputeControlBoundingBox(trk);
-    return TRUE;
+#endif // UTFCONVERT
+
+	trk = NewTrack(index, T_CONTROL, 0, sizeof(controlData_t));
+	SetTrkVisible(trk, visible);
+	SetTrkScale(trk, LookupScale( scale ));
+	SetTrkLayer(trk, layer);
+	xx = GetcontrolData ( trk );
+	xx->name = name;
+	xx->orig = orig;
+	xx->onscript = onscript;
+	xx->offscript = offscript;
+	ComputeControlBoundingBox(trk);
+	return TRUE;
 }
 
 static void MoveControl (track_p trk, coOrd orig )
 {
-    controlData_p xx = GetcontrolData ( trk );
-    xx->orig.x += orig.x;
-    xx->orig.y += orig.y;
-    ComputeControlBoundingBox(trk);
+	controlData_p xx = GetcontrolData ( trk );
+	xx->orig.x += orig.x;
+	xx->orig.y += orig.y;
+	ComputeControlBoundingBox(trk);
 }
 
 static void RotateControl (track_p trk, coOrd orig, ANGLE_T angle )
@@ -373,44 +373,44 @@ static void RescaleControl (track_p trk, FLOAT_T ratio )
 {
 }
 
-static void FlipControl (track_p trk, coOrd orig, ANGLE_T angle ) 
+static void FlipControl (track_p trk, coOrd orig, ANGLE_T angle )
 {
-    controlData_p xx = GetcontrolData ( trk );
-    FlipPoint(&(xx->orig), orig, angle);
-    ComputeControlBoundingBox(trk);
+	controlData_p xx = GetcontrolData ( trk );
+	FlipPoint(&(xx->orig), orig, angle);
+	ComputeControlBoundingBox(trk);
 }
 
 static trackCmd_t controlCmds = {
-    "CONTROL",
-    DrawControl,
-    DistanceControl,
-    DescribeControl,
-    DeleteControl,
-    WriteControl,
-    ReadControl,
-    MoveControl,
-    RotateControl,
-    RescaleControl,
-    NULL, /* audit */
-    NULL, /* getAngle */
-    NULL, /* split */
-    NULL, /* traverse */
-    NULL, /* enumerate */
-    NULL, /* redraw */
-    NULL, /* trim */
-    NULL, /* merge */
-    NULL, /* modify */
-    NULL, /* getLength */
-    NULL, /* getTrkParams */
-    NULL, /* moveEndPt */
-    NULL, /* query */
-    NULL, /* ungroup */
-    FlipControl, /* flip */
-    NULL, /* drawPositionIndicator */
-    NULL, /* advancePositionIndicator */
-    NULL, /* checkTraverse */
-    NULL, /* makeParallel */
-    NULL  /* drawDesc */
+	"CONTROL",
+	DrawControl,
+	DistanceControl,
+	DescribeControl,
+	DeleteControl,
+	WriteControl,
+	ReadControl,
+	MoveControl,
+	RotateControl,
+	RescaleControl,
+	NULL, /* audit */
+	NULL, /* getAngle */
+	NULL, /* split */
+	NULL, /* traverse */
+	NULL, /* enumerate */
+	NULL, /* redraw */
+	NULL, /* trim */
+	NULL, /* merge */
+	NULL, /* modify */
+	NULL, /* getLength */
+	NULL, /* getTrkParams */
+	NULL, /* moveEndPt */
+	NULL, /* query */
+	NULL, /* ungroup */
+	FlipControl, /* flip */
+	NULL, /* drawPositionIndicator */
+	NULL, /* advancePositionIndicator */
+	NULL, /* checkTraverse */
+	NULL, /* makeParallel */
+	NULL  /* drawDesc */
 };
 
 static coOrd controlEditOrig;
@@ -422,130 +422,136 @@ static char controlEditOffScript[STR_LONG_SIZE];
 static paramFloatRange_t r_1000_1000    = { -1000.0, 1000.0, 80 };
 static paramData_t controlEditPLs[] = {
 #define I_CONTROLNAME (0)
-    /*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(controlEditName) },
+	/*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF | PDO_NOTBLANK, I2VP(200), N_("Name"), 0, 0, sizeof(controlEditName) },
 #define I_ORIGX (1)
-    /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") },
+	/*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") },
 #define I_ORIGY (2)
-    /*2*/ { PD_FLOAT, &controlEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") },
+	/*2*/ { PD_FLOAT, &controlEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") },
 #define I_CONTROLONSCRIPT (3)
-    /*3*/ { PD_STRING, controlEditOnScript, "script", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)350, N_("On Script"), 0, 0, sizeof(controlEditOnScript)},
+	/*3*/ { PD_STRING, controlEditOnScript, "script", PDO_NOPREF, I2VP(350), N_("On Script"), 0, 0, sizeof(controlEditOnScript)},
 #define I_CONTROLOFFSCRIPT (4)
-    /*4*/ { PD_STRING, controlEditOffScript, "script", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)350, N_("Off Script"), 0, 0, sizeof(controlEditOffScript)},
+	/*4*/ { PD_STRING, controlEditOffScript, "script", PDO_NOPREF, I2VP(350), N_("Off Script"), 0, 0, sizeof(controlEditOffScript)},
 };
 
-static paramGroup_t controlEditPG = { "controlEdit", 0, controlEditPLs, sizeof controlEditPLs/sizeof controlEditPLs[0] };
+static paramGroup_t controlEditPG = { "controlEdit", 0, controlEditPLs, COUNT( controlEditPLs ) };
 static wWin_p controlEditW;
 
 static void ControlEditOk ( void * junk )
 {
-    track_p trk;
-    controlData_p xx;
-    
-    if (controlEditTrack == NULL) {
-        UndoStart( _("Create Control"), "Create Control");
-        trk = NewTrack(0, T_CONTROL, 0, sizeof(controlData_t));
-    } else {
-        UndoStart( _("Modify Control"), "Modify Control");
-        trk = controlEditTrack;
-    }
-    xx = GetcontrolData(trk);
-    xx->orig = controlEditOrig;
-    if ( xx->name == NULL || strncmp (xx->name, controlEditName, STR_SHORT_SIZE) != 0) {
-        MyFree(xx->name);
-        xx->name = MyStrdup(controlEditName);
-    }
-    if ( xx->onscript == NULL || strncmp (xx->onscript, controlEditOnScript, STR_LONG_SIZE) != 0) {
-        MyFree(xx->onscript);
-        xx->onscript = MyStrdup(controlEditOnScript);
-    }
-    if ( xx->offscript == NULL || strncmp (xx->offscript, controlEditOffScript, STR_LONG_SIZE) != 0) {
-        MyFree(xx->offscript);
-        xx->offscript = MyStrdup(controlEditOffScript);
-    }
-    UndoEnd();
-    ComputeControlBoundingBox(trk);
-    DoRedraw();
-    wHide( controlEditW );
+	track_p trk;
+	controlData_p xx;
+
+	if (controlEditTrack == NULL) {
+		UndoStart( _("Create Control"), "Create Control");
+		trk = NewTrack(0, T_CONTROL, 0, sizeof(controlData_t));
+	} else {
+		UndoStart( _("Modify Control"), "Modify Control");
+		trk = controlEditTrack;
+	}
+	xx = GetcontrolData(trk);
+	xx->orig = controlEditOrig;
+	if ( xx->name == NULL
+	     || strncmp (xx->name, controlEditName, STR_SHORT_SIZE) != 0) {
+		MyFree(xx->name);
+		xx->name = MyStrdup(controlEditName);
+	}
+	if ( xx->onscript == NULL
+	     || strncmp (xx->onscript, controlEditOnScript, STR_LONG_SIZE) != 0) {
+		MyFree(xx->onscript);
+		xx->onscript = MyStrdup(controlEditOnScript);
+	}
+	if ( xx->offscript == NULL
+	     || strncmp (xx->offscript, controlEditOffScript, STR_LONG_SIZE) != 0) {
+		MyFree(xx->offscript);
+		xx->offscript = MyStrdup(controlEditOffScript);
+	}
+	UndoEnd();
+	ComputeControlBoundingBox(trk);
+	DoRedraw();
+	wHide( controlEditW );
 }
 
 #if 0
 static void ControlEditCancel ( wWin_p junk )
 {
-    wHide( controlEditW );
+	wHide( controlEditW );
 }
 #endif
 
 static void EditControlDialog()
 {
-    controlData_p xx;
-    
-    if ( !controlEditW ) {
-        ParamRegister( &controlEditPG );
-        controlEditW = ParamCreateDialog (&controlEditPG,
-                                          MakeWindowTitle(_("Edit control")),
-                                          _("Ok"), ControlEditOk,
-                                          wHide, TRUE, NULL,
-                                          F_BLOCK,
-                                          NULL );
-    }
-    if (controlEditTrack == NULL) {
-        controlEditName[0] = '\0';
-        controlEditOnScript[0] = '\0';
-        controlEditOffScript[0] = '\0';
-    } else {
-        xx = GetcontrolData ( controlEditTrack );
-        strncpy(controlEditName,xx->name,STR_SHORT_SIZE);
-        strncpy(controlEditOnScript,xx->onscript,STR_LONG_SIZE);
-        strncpy(controlEditOffScript,xx->offscript,STR_LONG_SIZE);
-        controlEditOrig = xx->orig;
-    }
-    ParamLoadControls( &controlEditPG );
-    wShow( controlEditW );
+	controlData_p xx;
+
+	if ( !controlEditW ) {
+		ParamRegister( &controlEditPG );
+		controlEditW = ParamCreateDialog (&controlEditPG,
+		                                  MakeWindowTitle(_("Edit control")),
+		                                  _("Ok"), ControlEditOk,
+		                                  wHide, TRUE, NULL,
+		                                  F_BLOCK,
+		                                  NULL );
+	}
+	if (controlEditTrack == NULL) {
+		controlEditName[0] = '\0';
+		controlEditOnScript[0] = '\0';
+		controlEditOffScript[0] = '\0';
+	} else {
+		xx = GetcontrolData ( controlEditTrack );
+		strncpy(controlEditName,xx->name,STR_SHORT_SIZE-1);
+		strncpy(controlEditOnScript,xx->onscript,STR_LONG_SIZE-1);
+		strncpy(controlEditOffScript,xx->offscript,STR_LONG_SIZE-1);
+		controlEditOrig = xx->orig;
+	}
+	ParamLoadControls( &controlEditPG );
+	wShow( controlEditW );
 }
 
 static void EditControl (track_p trk)
 {
-    controlEditTrack = trk;
-    EditControlDialog();
+	controlEditTrack = trk;
+	EditControlDialog();
 }
 
 static void CreateNewControl (coOrd orig)
 {
-    controlEditOrig = orig;
-    controlEditTrack = NULL;
-    EditControlDialog();
+	controlEditOrig = orig;
+	controlEditTrack = NULL;
+	EditControlDialog();
 }
 
 static STATUS_T CmdControl ( wAction_t action, coOrd pos )
 {
-    
-    static coOrd control_pos;
-    static BOOL_T create;
-    switch (action) {
-    case C_START:
-        InfoMessage(_("Place control"));
-        create = FALSE;
-        return C_CONTINUE;
-    case C_DOWN:
-    	create = TRUE;
-    	/* no break */
+
+	static coOrd control_pos;
+	static BOOL_T create;
+	switch (action) {
+	case C_START:
+		InfoMessage(_("Place control"));
+		SetAllTrackSelect( FALSE );
+		create = FALSE;
+		return C_CONTINUE;
+	case C_DOWN:
+		create = TRUE;
+	/* no break */
 	case C_MOVE:
 		SnapPos(&pos);
 		control_pos = pos;
-        return C_CONTINUE;
-    case C_UP:
-        SnapPos(&pos);
-        CreateNewControl(pos);
-        return C_TERMINATE;
-    case C_REDRAW:
-    	if (create)
-    		DDrawControl( &tempD, control_pos, GetScaleRatio(GetLayoutCurScale()), wDrawColorBlack );
-    	return C_CONTINUE;
-    case C_CANCEL:
-        return C_CONTINUE;
-    default:
-        return C_CONTINUE;
-    }
+		return C_CONTINUE;
+	case C_UP:
+		SnapPos(&pos);
+		CreateNewControl(pos);
+		return C_TERMINATE;
+	case C_REDRAW:
+		if (create) {
+			DDrawControl( &tempD, control_pos, GetScaleRatio(GetLayoutCurScale()),
+			              wDrawColorBlack );
+		}
+		return C_CONTINUE;
+	case C_CANCEL:
+		return C_CONTINUE;
+	default:
+		return C_CONTINUE;
+	}
 }
 
 static coOrd ctlhiliteOrig, ctlhiliteSize;
@@ -553,96 +559,95 @@ static POS_T ctlhiliteBorder;
 static wDrawColor ctlhiliteColor = 0;
 static void DrawControlTrackHilite( void )
 {
-	wPos_t x, y, w, h;
-	if (ctlhiliteColor==0)
+	if (ctlhiliteColor==0) {
 		ctlhiliteColor = wDrawColorGray(87);
-	w = (wPos_t)((ctlhiliteSize.x/mainD.scale)*mainD.dpi+0.5);
-	h = (wPos_t)((ctlhiliteSize.y/mainD.scale)*mainD.dpi+0.5);
-	mainD.CoOrd2Pix(&mainD,ctlhiliteOrig,&x,&y);
-	wDrawFilledRectangle( mainD.d, x, y, w, h, ctlhiliteColor, wDrawOptTemp|wDrawOptTransparent );
+	}
+	DrawRectangle( &tempD, ctlhiliteOrig, ctlhiliteSize, ctlhiliteColor,
+	               DRAW_TRANSPARENT );
 }
 
 static int ControlMgmProc ( int cmd, void * data )
 {
-    track_p trk = (track_p) data;
-    controlData_p xx = GetcontrolData(trk);
-    /*char msg[STR_SIZE];*/
-    
-    switch ( cmd ) {
-    case CONTMGM_CAN_EDIT:
-        return TRUE;
-        break;
-    case CONTMGM_DO_EDIT:
-        EditControl(trk);
-        return TRUE;
-        break;
-    case CONTMGM_CAN_DELETE:
-        return TRUE;
-        break;
-    case CONTMGM_DO_DELETE:
-        DeleteTrack(trk, FALSE);
-        return TRUE;
-        break;
-    case CONTMGM_DO_HILIGHT:
-        if (!xx->IsHilite) {
-            ctlhiliteBorder = mainD.scale*0.1;
-            if ( ctlhiliteBorder < trackGauge ) ctlhiliteBorder = trackGauge;
-            GetBoundingBox( trk, &ctlhiliteSize, &ctlhiliteOrig );
-            ctlhiliteOrig.x -= ctlhiliteBorder;
-            ctlhiliteOrig.y -= ctlhiliteBorder;
-            ctlhiliteSize.x -= ctlhiliteOrig.x-ctlhiliteBorder;
-            ctlhiliteSize.y -= ctlhiliteOrig.y-ctlhiliteBorder;
-            DrawControlTrackHilite();
-            xx->IsHilite = TRUE;
-        }
-        break;
-    case CONTMGM_UN_HILIGHT:
-        if (xx->IsHilite) {
-            ctlhiliteBorder = mainD.scale*0.1;
-            if ( ctlhiliteBorder < trackGauge ) ctlhiliteBorder = trackGauge;
-            GetBoundingBox( trk, &ctlhiliteSize, &ctlhiliteOrig );
-            ctlhiliteOrig.x -= ctlhiliteBorder;
-            ctlhiliteOrig.y -= ctlhiliteBorder;
-            ctlhiliteSize.x -= ctlhiliteOrig.x-ctlhiliteBorder;
-            ctlhiliteSize.y -= ctlhiliteOrig.y-ctlhiliteBorder;
-            DrawControlTrackHilite();
-            xx->IsHilite = FALSE;
-        }
-        break;
-    case CONTMGM_GET_TITLE:
-        sprintf(message,"\t%s\t",xx->name);
-        break;
-    }
-    return FALSE;
+	track_p trk = (track_p) data;
+	controlData_p xx = GetcontrolData(trk);
+	/*char msg[STR_SIZE];*/
+
+	switch ( cmd ) {
+	case CONTMGM_CAN_EDIT:
+		return TRUE;
+		break;
+	case CONTMGM_DO_EDIT:
+		EditControl(trk);
+		return TRUE;
+		break;
+	case CONTMGM_CAN_DELETE:
+		return TRUE;
+		break;
+	case CONTMGM_DO_DELETE:
+		DeleteTrack(trk, FALSE);
+		return TRUE;
+		break;
+	case CONTMGM_DO_HILIGHT:
+		if (!xx->IsHilite) {
+			ctlhiliteBorder = mainD.scale*0.1;
+			if ( ctlhiliteBorder < trackGauge ) { ctlhiliteBorder = trackGauge; }
+			GetBoundingBox( trk, &ctlhiliteSize, &ctlhiliteOrig );
+			ctlhiliteOrig.x -= ctlhiliteBorder;
+			ctlhiliteOrig.y -= ctlhiliteBorder;
+			ctlhiliteSize.x -= ctlhiliteOrig.x-ctlhiliteBorder;
+			ctlhiliteSize.y -= ctlhiliteOrig.y-ctlhiliteBorder;
+			DrawControlTrackHilite();
+			xx->IsHilite = TRUE;
+		}
+		break;
+	case CONTMGM_UN_HILIGHT:
+		if (xx->IsHilite) {
+			ctlhiliteBorder = mainD.scale*0.1;
+			if ( ctlhiliteBorder < trackGauge ) { ctlhiliteBorder = trackGauge; }
+			GetBoundingBox( trk, &ctlhiliteSize, &ctlhiliteOrig );
+			ctlhiliteOrig.x -= ctlhiliteBorder;
+			ctlhiliteOrig.y -= ctlhiliteBorder;
+			ctlhiliteSize.x -= ctlhiliteOrig.x-ctlhiliteBorder;
+			ctlhiliteSize.y -= ctlhiliteOrig.y-ctlhiliteBorder;
+			DrawControlTrackHilite();
+			xx->IsHilite = FALSE;
+		}
+		break;
+	case CONTMGM_GET_TITLE:
+		sprintf(message,"\t%s\t",xx->name);
+		break;
+	}
+	return FALSE;
 }
 
-#include "bitmaps/control.xpm"
+#include "bitmaps/control.xpm3"
 
 EXPORT void ControlMgmLoad ( void )
 {
-    track_p trk;
-    static wIcon_p controlI = NULL;
-    
-    if (controlI == NULL) {
-        controlI = wIconCreatePixMap( control_xpm );
-    }
-    
-    TRK_ITERATE(trk) {
-        if (GetTrkType(trk) != T_CONTROL) continue;
-        ContMgmLoad (controlI, ControlMgmProc, (void *) trk );
-    }
+	track_p trk;
+	static wIcon_p controlI = NULL;
+
+	if (controlI == NULL) {
+		controlI = wIconCreatePixMap( control_xpm3[iconSize] );
+	}
+
+	TRK_ITERATE(trk) {
+		if (GetTrkType(trk) != T_CONTROL) { continue; }
+		ContMgmLoad (controlI, ControlMgmProc, trk );
+	}
 }
 
 #define ACCL_CONTROL 0
 
 EXPORT void InitCmdControl ( wMenu_p menu )
 {
-    AddMenuButton( menu, CmdControl, "cmdControl", _("Control"), 
-                   wIconCreatePixMap( control_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CONTROL, NULL );
+	AddMenuButton( menu, CmdControl, "cmdControl", _("Control"),
+	               wIconCreatePixMap( control_xpm3[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2,
+	               ACCL_CONTROL, NULL );
 }
 
 EXPORT void InitTrkControl ( void )
 {
-    T_CONTROL = InitObject ( &controlCmds );
-    log_control = LogFindIndex ( "control" );
+	T_CONTROL = InitObject ( &controlCmds );
+	log_control = LogFindIndex ( "control" );
 }