Skip to content

Commit e53af03

Browse files
ejaquayejaquay
authored
Merge pull request VCCE#236 from ejaquay/MoveMiscConf
Move autostart items from Config/Misc to Config/Cpu
2 parents 00f917f + f614e2f commit e53af03

File tree

3 files changed

+34
-89
lines changed

3 files changed

+34
-89
lines changed

‎Vcc.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
287287
case ID_JOYSTICKS_CONFIG:
288288
OpenJoyStickConfig();
289289
break;
290-
case ID_MISC_CONFIG:
291-
OpenMiscConfig();
292-
break;
293290
case ID_TAPE_CONFIG:
294291
OpenTapeConfig();
295292
break;

‎Vcc.rc‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ BEGIN
5656
MENUITEM "Display", ID_DISPLAY_CONFIG
5757
MENUITEM "Keyboard", ID_KEYBOARD_CONFIG
5858
MENUITEM "JoyStick", ID_JOYSTICKS_CONFIG
59-
MENUITEM "Misc", ID_MISC_CONFIG
6059
MENUITEM "Tape", ID_TAPE_CONFIG
6160
MENUITEM "BitBanger", ID_BITBANGER_CONFIG
6261

@@ -206,23 +205,26 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
206205
CAPTION "CPU Configuration"
207206
FONT 8, "MS Sans Serif", 0, 0, 0x1
208207
BEGIN
209-
GROUPBOX "Over-Clocking",IDC_STATIC,16,12,234,36,BS_CENTER
210-
CONTROL "Slider1",IDC_CLOCKSPEED,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,19,26,176,15,WS_EX_CLIENTEDGE
211-
EDITTEXT IDC_CLOCKDISPLAY,199,27,45,12,ES_AUTOHSCROLL | ES_READONLY
212-
GROUPBOX "Memory Size",IDC_STATIC,17,58,60,54,BS_CENTER
213-
RADIOBUTTON "128 K",IDC_128K,27,69,35,10
214-
RADIOBUTTON "512 K",IDC_512K,27,79,35,10
215-
RADIOBUTTON "2048 K",IDC_2M,27,90,39,10
216-
RADIOBUTTON "8192 K",IDC_8M,27,101,39,10
217-
GROUPBOX "CPU",IDC_STATIC,87,63,154,45,BS_CENTER
218-
RADIOBUTTON "Motorola MC6809 CPU",IDC_6809,97,74,89,10
219-
RADIOBUTTON "Hitachi HD6309 CPU",IDC_6309,97,88,87,10,WS_TABSTOP
220-
ICON "",IDC_CPUICON,207,77,21,20
221-
GROUPBOX "VCC Debug",IDC_STATIC,17,120,120,34,BS_CENTER
222-
CONTROL "Enable BREAK ($113E)",IDC_ENABLE_BREAK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,133,100,10
223-
DEFPUSHBUTTON "OK",IDOK,80,165,36,14
224-
PUSHBUTTON "Apply",IDAPPLY,120,165,36,14
225-
PUSHBUTTON "Cancel",IDCANCEL,160,165,36,14
208+
GROUPBOX "Over-Clocking",IDC_STATIC,16,12,234,36,BS_CENTER
209+
CONTROL "Slider1",IDC_CLOCKSPEED,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,19,26,176,15,WS_EX_CLIENTEDGE
210+
EDITTEXT IDC_CLOCKDISPLAY,199,27,45,12,ES_AUTOHSCROLL | ES_READONLY
211+
GROUPBOX "Memory Size",IDC_STATIC,17,58,60,54,BS_CENTER
212+
RADIOBUTTON "128 K",IDC_128K,27,69,35,10
213+
RADIOBUTTON "512 K",IDC_512K,27,79,35,10
214+
RADIOBUTTON "2048 K",IDC_2M,27,90,39,10
215+
RADIOBUTTON "8192 K",IDC_8M,27,101,39,10
216+
GROUPBOX "CPU",IDC_STATIC,87,63,154,45,BS_CENTER
217+
RADIOBUTTON "Motorola MC6809 CPU",IDC_6809,97,74,89,10
218+
RADIOBUTTON "Hitachi HD6309 CPU",IDC_6309,97,88,87,10,WS_TABSTOP
219+
ICON "",IDC_CPUICON,207,77,21,20
220+
GROUPBOX "VCC Debug",IDC_STATIC,16,120,110,34,BS_CENTER
221+
CONTROL "Enable BREAK ($113E)",IDC_ENABLE_BREAK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,25,133,90,10
222+
GROUPBOX "Auto Start",IDC_STATIC,138,114,98,40,BS_CENTER
223+
CONTROL "Auto Start Emulation",IDC_AUTOSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,126,80,10
224+
CONTROL "Auto Start Cartridge",IDC_AUTOCART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,138,80,10
225+
DEFPUSHBUTTON "OK",IDOK,80,165,36,14
226+
PUSHBUTTON "Apply",IDAPPLY,120,165,36,14
227+
PUSHBUTTON "Cancel",IDCANCEL,160,165,36,14
226228
END
227229

228230
IDD_AUDIO DIALOGEX 0, 0, 210,110
@@ -331,19 +333,6 @@ BEGIN
331333
PUSHBUTTON "Cancel",IDCANCEL,215,227,36,14
332334
END
333335

334-
IDD_MISC DIALOGEX 0, 0, 130, 80
335-
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
336-
CAPTION "Misc Configuration"
337-
FONT 8, "MS Sans Serif", 0, 0, 0x0
338-
BEGIN
339-
GROUPBOX "Misc.",IDC_STATIC,12,8,105,38,BS_CENTER
340-
CONTROL "AutoStart Emulation",IDC_AUTOSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,20,78,10
341-
CONTROL "AutoStart Cart",IDC_AUTOCART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,31,60,10
342-
DEFPUSHBUTTON "OK",IDOK,7,58,36,14
343-
PUSHBUTTON "Apply",IDAPPLY,47,58,36,14
344-
PUSHBUTTON "Cancel",IDCANCEL,87,58,36,14
345-
END
346-
347336
IDD_CASSETTE DIALOGEX 0, 0, 265, 115
348337
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
349338
CAPTION "Cassette Tape Configuration"

‎config.c‎

Lines changed: 14 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void buildTransDisp2ScanTable();
6262

6363
LRESULT CALLBACK CpuConfig(HWND, UINT, WPARAM, LPARAM);
6464
LRESULT CALLBACK AudioConfig(HWND, UINT, WPARAM, LPARAM);
65-
LRESULT CALLBACK MiscConfig(HWND, UINT, WPARAM, LPARAM);
65+
//LRESULT CALLBACK MiscConfig(HWND, UINT, WPARAM, LPARAM);
6666
LRESULT CALLBACK DisplayConfig(HWND, UINT, WPARAM, LPARAM);
6767
LRESULT CALLBACK InputConfig(HWND, UINT, WPARAM, LPARAM);
6868
LRESULT CALLBACK JoyStickConfig(HWND, UINT, WPARAM, LPARAM);
@@ -240,7 +240,6 @@ unsigned char WriteIniFile(void)
240240
WritePrivateProfileInt("Video","MonitorType",CurrentConfig.MonitorType,IniFilePath);
241241
WritePrivateProfileInt("Video","PaletteType",CurrentConfig.PaletteType, IniFilePath);
242242
WritePrivateProfileInt("Video","ScanLines",CurrentConfig.ScanLines,IniFilePath);
243-
//WritePrivateProfileInt("Video","AllowResize",CurrentConfig.Resize,IniFilePath);
244243
WritePrivateProfileInt("Video","ForceAspect",CurrentConfig.Aspect,IniFilePath);
245244
WritePrivateProfileInt("Video","RememberSize", CurrentConfig.RememberSize, IniFilePath);
246245
WritePrivateProfileInt("Video", "WindowSizeX", tp.x, IniFilePath);
@@ -484,6 +483,8 @@ LRESULT CALLBACK CpuConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
484483
SendDlgItemMessage
485484
(hDlg,IDC_CPUICON,STM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)CpuIcons[CurrentConfig.CpuType]);
486485
SendDlgItemMessage(hDlg,IDC_ENABLE_BREAK,BM_SETCHECK,CurrentConfig.BreakOpcEnabled,0);
486+
SendDlgItemMessage(hDlg,IDC_AUTOSTART,BM_SETCHECK,tmpcfg.AutoStart,0);
487+
SendDlgItemMessage(hDlg,IDC_AUTOCART,BM_SETCHECK,tmpcfg.CartAutoStart,0);
487488
break;
488489

489490
case WM_HSCROLL:
@@ -516,6 +517,8 @@ LRESULT CALLBACK CpuConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
516517
// Set CPU icon in dialog window
517518
SendDlgItemMessage ( hDlg,IDC_CPUICON,STM_SETIMAGE,(WPARAM)IMAGE_ICON,
518519
(LPARAM)CpuIcons[CurrentConfig.CpuType] );
520+
CurrentConfig.AutoStart = tmpcfg.AutoStart;
521+
CurrentConfig.CartAutoStart = tmpcfg.CartAutoStart;
519522
// Exit dialog if IDOK
520523
if (LOWORD(wParam)==IDOK) {
521524
hCpuDlg = NULL;
@@ -550,7 +553,15 @@ LRESULT CALLBACK CpuConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
550553
tmpcfg.BreakOpcEnabled = (unsigned char)
551554
SendDlgItemMessage(hDlg,IDC_ENABLE_BREAK,BM_GETCHECK,0,0);
552555
break;
553-
556+
case IDC_AUTOSTART:
557+
tmpcfg.AutoStart = (unsigned char)
558+
SendDlgItemMessage(hDlg,IDC_AUTOSTART,BM_GETCHECK,0,0);
559+
break;
560+
case IDC_AUTOCART:
561+
tmpcfg.CartAutoStart = (unsigned char)
562+
SendDlgItemMessage(hDlg,IDC_AUTOCART,BM_GETCHECK,0,0);
563+
break;
564+
554565
} //End switch LOWORD(wParam)
555566
break; //Break WM_COMMAND
556567
} //END switch (message)
@@ -593,53 +604,6 @@ void DecreaseOverclockSpeed()
593604
EmuState.ResetPending = 4;
594605
}
595606

596-
/********************************************/
597-
/* Misc Config */
598-
/********************************************/
599-
HWND hMiscDlg = NULL;
600-
void OpenMiscConfig() {
601-
if (hMiscDlg==NULL) {
602-
hMiscDlg = CreateDialog
603-
(EmuState.WindowInstance,(LPCTSTR) IDD_MISC, EmuState.WindowHandle,(DLGPROC) MiscConfig);
604-
}
605-
ShowWindow(hMiscDlg,SW_SHOWNORMAL);
606-
SetFocus(hMiscDlg);
607-
}
608-
LRESULT CALLBACK MiscConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
609-
{
610-
static STRConfig tmpcfg;
611-
switch (message) {
612-
case WM_INITDIALOG:
613-
tmpcfg = CurrentConfig;
614-
SendDlgItemMessage(hDlg,IDC_AUTOSTART,BM_SETCHECK,tmpcfg.AutoStart,0);
615-
SendDlgItemMessage(hDlg,IDC_AUTOCART,BM_SETCHECK,tmpcfg.CartAutoStart,0);
616-
break;
617-
case WM_COMMAND:
618-
tmpcfg.AutoStart=(unsigned char)SendDlgItemMessage(hDlg,IDC_AUTOSTART,BM_GETCHECK,0,0);
619-
tmpcfg.CartAutoStart=(unsigned char)SendDlgItemMessage(hDlg,IDC_AUTOCART,BM_GETCHECK,0,0);
620-
switch (LOWORD(wParam)) {
621-
case IDCANCEL:
622-
case IDCLOSE:
623-
hMiscDlg = NULL;
624-
DestroyWindow(hDlg);
625-
break;
626-
case IDOK:
627-
case IDAPPLY:
628-
CurrentConfig.AutoStart = tmpcfg.AutoStart;
629-
CurrentConfig.CartAutoStart = tmpcfg.CartAutoStart;
630-
UpdateConfig();
631-
// Exit dialog if IDOK
632-
if (LOWORD(wParam)==IDOK) {
633-
hMiscDlg = NULL;
634-
DestroyWindow(hDlg);
635-
}
636-
break;
637-
}
638-
break;
639-
}
640-
return(0);
641-
}
642-
643607
/********************************************/
644608
/* Tape Config */
645609
/********************************************/
@@ -655,7 +619,6 @@ void OpenTapeConfig() {
655619
}
656620
LRESULT CALLBACK TapeConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
657621
{
658-
// HWND hCounter=NULL;
659622
CounterText.cbSize = sizeof(CHARFORMAT);
660623
CounterText.dwMask = CFM_BOLD | CFM_COLOR ;
661624
CounterText.dwEffects = CFE_BOLD;
@@ -674,14 +637,10 @@ LRESULT CALLBACK TapeConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPara
674637
SendDlgItemMessage(hDlg,IDC_MODE,WM_SETTEXT,strlen(Tmodes[Tmode]),(LPARAM)(LPCSTR)Tmodes[Tmode]);
675638
GetTapeName(TapeFileName); // Defined in Cassette.cpp
676639
SendDlgItemMessage(hDlg,IDC_TAPEFILE,WM_SETTEXT,strlen(TapeFileName),(LPARAM)(LPCSTR)TapeFileName);
677-
// hCounter=GetDlgItem(hDlg,IDC_TCOUNT);
678-
// SendMessage (hCounter, EM_SETBKGNDCOLOR, 0, (LPARAM)RGB(0,0,0));
679640
SendDlgItemMessage(hDlg,IDC_TCOUNT,EM_SETBKGNDCOLOR ,0,(LPARAM)RGB(0,0,0));
680641
SendDlgItemMessage(hDlg,IDC_TCOUNT,EM_SETCHARFORMAT ,SCF_ALL,(LPARAM)&CounterText);
681642
SendDlgItemMessage(hDlg,IDC_MODE,EM_SETBKGNDCOLOR ,0,(LPARAM)RGB(0,0,0));
682643
SendDlgItemMessage(hDlg,IDC_MODE,EM_SETCHARFORMAT ,SCF_ALL,(LPARAM)&CounterText);
683-
// SendDlgItemMessage(hDlg,IDC_MODE,EM_SETCHARFORMAT ,SCF_ALL,(LPARAM)&ModeText);
684-
// hTapeDlg=hDlg;
685644
break;
686645

687646
case WM_COMMAND:

0 commit comments

Comments
 (0)