--- np2/macosx/dialog/midiopt.cpp	2003/10/31 16:55:06	1.1
+++ np2/macosx/dialog/midiopt.cpp	2004/03/22 17:56:35	1.4
@@ -10,18 +10,72 @@
 #include "np2.h"
 #include "pccore.h"
 #include "sysmng.h"
+#include "dialog.h"
 #include "dialogutils.h"
 #include "midiopt.h"
+#include "dipswbmp.h"
 
 #define	setControlValue(a,b,c)		SetControl32BitValue(getControlRefByID(a,b,midiWin),c)
 #define getMenuValue				(GetControl32BitValue(getControlRefByID(cmd.commandID,0,midiWin))-1)
 
 static WindowRef	midiWin;
 static BYTE			mpu = 0;
+static COMCFG		mpucfg;
+
+extern const char cmmidi_midimapper[];
+extern char cmmidi_vermouth[];
+extern const char *cmmidi_mdlname[];
+
+static const char *midiout_name[3] = {"", cmmidi_midimapper, cmmidi_vermouth};
+
+static UINT module2number(const char *module) {
+
+	UINT	i;
+
+	for (i=0; i<12; i++) {
+		if (!milstr_extendcmp(module, cmmidi_mdlname[i])) {
+			break;
+		}
+	}
+	return(i);
+}
+
+static void setMIMPIFilename(void) {
+	ControlRef  conRef = NULL;
+	
+	conRef = getControlRefByID('mnam', 0, midiWin);
+	SetControlData(conRef, kControlNoPart, kControlStaticTextTextTag, strlen(mpucfg.def), mpucfg.def);
+	Draw1Control(conRef);
+}
+
 
 static void setMPUs(void) {
+	int		data = 1;
+	UINT	i;
+	
     setControlValue('MPio', 0, ((mpu >> 4) & 15)+1);
     setControlValue('MPin', 0, (mpu & 3)+1);
+
+	if (!milstr_cmp(mpucfg.mout, cmmidi_midimapper)) {
+		data = 2;
+	}
+#if defined(VERMOUTH_LIB)
+	else if (!milstr_cmp(mpucfg.mout, cmmidi_vermouth)) {
+		data = 3;
+	}
+#endif
+    setControlValue('mido', 0, data);
+    setControlValue('midi', 0, 1);//Not available
+	i = module2number(mpucfg.mdl);
+    setControlValue('midm', 0, i+1);
+	
+	setControlValue('usem', 0, mpucfg.def_en);
+	setMIMPIFilename();
+	
+	PicHandle   pict;
+	ControlRef  disp = getControlRefByID('BMP ', 0, midiWin);
+	setbmp(dipswbmp_getmpu(mpu), &pict);
+	SetControlData(disp, kControlNoPart, kControlPictureHandleTag, sizeof(PicHandle), &pict);
 }
 
 static pascal OSStatus cfWinproc(EventHandlerCallRef myHandler, EventRef event, void* userData) {
@@ -35,15 +89,49 @@ static pascal OSStatus cfWinproc(EventHa
         {
             case 'MPDF':
                 mpu = 0x82;
+				strcpy(mpucfg.mout, "");
+				strcpy(mpucfg.min, "");
+				strcpy(mpucfg.mdl, "GM");
+				strcpy(mpucfg.def, "");
+				mpucfg.def_en = 0;
                 setMPUs();
+                err=noErr;
                 break;
                 
             case 'MPio':
                 setjmper(&mpu, getMenuValue << 4, 0xf0);
+                err=noErr;
                 break;
 
             case 'MPin':
                 setjmper(&mpu, getMenuValue, 0x03);
+                err=noErr;
+                break;
+
+            case 'mido':
+				strcpy(mpucfg.mout, midiout_name[getMenuValue]);
+                err=noErr;
+                break;
+
+            case 'midi':
+				strcpy(mpucfg.min, midiout_name[getMenuValue]);
+                err=noErr;
+                break;
+
+            case 'midm':
+				strcpy(mpucfg.mdl, cmmidi_mdlname[getMenuValue]);
+                err=noErr;
+                break;
+
+            case 'usem':
+				mpucfg.def_en = GetControl32BitValue(getControlRefByID(cmd.commandID, 0, midiWin));
+                err=noErr;
+                break;
+
+            case 'opnm':
+				dialog_fileselect(mpucfg.def, sizeof(mpucfg.def), NULL, OPEN_MIMPI);
+				setMIMPIFilename();
+                err=noErr;
                 break;
 
             case kHICommandOK:
@@ -52,6 +140,14 @@ static pascal OSStatus cfWinproc(EventHa
                     np2cfg.mpuopt = mpu;
                     update |= SYS_UPDATECFG | SYS_UPDATEMIDI;
                 }
+                if (milstr_extendcmp(np2oscfg.mpu.mout, mpucfg.mout) ||
+					milstr_extendcmp(np2oscfg.mpu.min, mpucfg.min) ||
+					milstr_extendcmp(np2oscfg.mpu.mdl, mpucfg.mdl) ||
+					milstr_extendcmp(np2oscfg.mpu.def, mpucfg.def) ||
+					(np2oscfg.mpu.def_en != mpucfg.def_en)) {
+                    np2oscfg.mpu = mpucfg;
+                    update |= SYS_UPDATECFG | SYS_UPDATEMIDI;
+                }
                 sysmng_update(update);
                                 
                 endLoop(midiWin);
@@ -73,23 +169,77 @@ static pascal OSStatus cfWinproc(EventHa
     return err;
 }
 
+static pascal OSStatus ctrlproc(EventHandlerCallRef myHandler, EventRef event, void* userData) {
+    OSStatus	err = eventNotHandledErr;
+	HIPoint		p;
+	BYTE		bit;
+	int			move;
+	Rect		ctrlbounds, winbounds;
+	PicHandle   pict;
+	BOOL		redraw = FALSE;
+
+    if (GetEventClass(event)==kEventClassControl && GetEventKind(event)==kEventControlClick ) {
+		err = noErr;
+        GetEventParameter(event, kEventParamMouseLocation, typeHIPoint, NULL, sizeof(HIPoint), NULL, &p);
+		GetControlBounds((ControlRef)userData, &ctrlbounds);
+		GetWindowBounds(midiWin, kWindowContentRgn, &winbounds);
+		p.x -= (ctrlbounds.left + winbounds.left);
+		p.x /= 9;
+		if ((p.x >= 2) && (p.x < 6)) {
+			move = (int)(p.x - 2);
+			bit = 0x80 >> move;
+			mpu ^= bit;
+			redraw = TRUE;
+		}
+		else if ((p.x >= 9) && (p.x < 13)) {
+			bit = (BYTE)(13 - p.x);
+			if ((mpu ^ bit) & 3) {
+				mpu &= ~0x3;
+				mpu |= bit;
+				redraw = TRUE;
+			}
+		}
+		if (redraw) {
+			setMPUs();
+			setbmp(dipswbmp_getmpu(mpu), &pict);
+			SetControlData((ControlRef)userData, kControlNoPart, kControlPictureHandleTag, sizeof(PicHandle), &pict);
+			Draw1Control((ControlRef)userData);
+		}
+	}
+
+	(void)myHandler;
+	(void)userData;
+    return err;
+}
+
 static void initMidiWindow(void) {
     mpu = np2cfg.mpuopt;
+	mpucfg = np2oscfg.mpu;
     uncheckAllPopupMenuItems('MPio', 16, midiWin);
     uncheckAllPopupMenuItems('MPin', 4, midiWin);
+    uncheckAllPopupMenuItems('mido', 0, midiWin);
+    uncheckAllPopupMenuItems('midi', 0, midiWin);
+    uncheckAllPopupMenuItems('midm', 0, midiWin);
     setMPUs();
 }
 
 static void makeNibWindow (IBNibRef nibRef) {
-    OSStatus	err;
+    OSStatus		err;
     EventHandlerRef	ref;
+	ControlRef		cref;
     
     err = CreateWindowFromNib(nibRef, CFSTR("MidiDialog"), &midiWin);
     if (err == noErr) {
     
         initMidiWindow();
-        EventTypeSpec	list[]={ { kEventClassCommand, kEventCommandProcess },};
+        EventTypeSpec	list[]={ { kEventClassCommand, kEventCommandProcess },
+								 { kEventClassWindow,  kEventWindowShowing} };
         InstallWindowEventHandler (midiWin, NewEventHandlerUPP(cfWinproc), GetEventTypeCount(list), list, (void *)midiWin, &ref);
+		
+        EventTypeSpec	ctrllist[]={ { kEventClassControl, kEventControlClick } };
+		cref = getControlRefByID('BMP ', 0, midiWin);
+		InstallControlEventHandler(cref, NewEventHandlerUPP(ctrlproc), GetEventTypeCount(ctrllist), ctrllist, (void *)cref, NULL);
+		
         ShowSheetWindow(midiWin, hWndMain);
         
         err=RunAppModalLoopForWindow(midiWin);