From c1f19b42d0c0a4d7bef3cbddc05f86ddd3c85945 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 20 Feb 2021 18:21:38 +0200 Subject: [PATCH] GUI CPU idle value. --- od-win32/resources/resource.h | 2 ++ od-win32/resources/winuae.rc | 11 ++++++----- od-win32/win32gui.cpp | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 3396bafb..e728965a 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -744,6 +744,8 @@ #define IDC_CPUTEXT_x86 1510 #define IDC_SCREENRESTEXT 1511 #define IDC_MAPDRIVES_AUTO 1511 +#define IDC_CPUTEXT2 1511 +#define IDC_CPUIDLETEXT 1511 #define IDC_WIDTHTEXT 1512 #define IDC_WINDOWEDTEXT 1512 #define IDC_MAPDRIVES_LIMIT 1512 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index bbeefba0..9a3fea1f 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -297,11 +297,11 @@ BEGIN CONTROL "Fastest possible",IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,143,19,195,10 CONTROL "Approximate A500/A1200 or cycle-exact",IDC_CS_68000, "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,143,33,195,10 - CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,142,50,192,20 - RTEXT "CPU Speed",IDC_STATIC,141,77,55,9,SS_CENTERIMAGE - EDITTEXT IDC_CPUTEXT,204,76,30,12,ES_CENTER | ES_READONLY - RTEXT "CPU Idle",IDC_STATIC,239,77,62,9 - CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,308,72,69,21 + CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,142,50,205,20 + RTEXT "CPU Speed",IDC_STATIC,141,77,46,9,SS_CENTERIMAGE + EDITTEXT IDC_CPUTEXT,194,75,30,12,ES_CENTER | ES_READONLY + RTEXT "CPU Idle",IDC_STATIC,230,77,41,9 + CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,278,72,69,21 GROUPBOX "Cycle-exact CPU Emulation Speed",IDC_STATIC,136,100,258,42 RTEXT "CPU Frequency",IDC_STATIC,139,121,67,10,SS_CENTERIMAGE COMBOBOX IDC_CPU_FREQUENCY,215,120,89,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -330,6 +330,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,123,119,12 COMBOBOX IDC_FPU_MODE,7,299,112,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Catch unexpected exceptions",IDC_JITCRASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,300,115,11 + EDITTEXT IDC_CPUIDLETEXT,356,75,30,12,ES_CENTER | ES_READONLY END IDD_FLOPPY DIALOGEX 0, 0, 396, 316 diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index b5ffdddb..504bbb87 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -12707,8 +12707,8 @@ static void values_to_cpudlg(HWND hDlg, WPARAM wParam) SendDlgItemMessage (hDlg, IDC_SPEED, TBM_SETPOS, TRUE, (int)(workprefs.m68k_speed_throttle / 100)); _stprintf (buffer, _T("%+d%%"), (int)(workprefs.m68k_speed_throttle / 10)); - SetDlgItemText (hDlg, IDC_CPUTEXT, buffer); + CheckDlgButton (hDlg, IDC_COMPATIBLE, workprefs.cpu_compatible); CheckDlgButton (hDlg, IDC_COMPATIBLE24, workprefs.address_space_24); CheckDlgButton (hDlg, IDC_CPUDATACACHE, workprefs.cpu_data_cache); @@ -12717,6 +12717,8 @@ static void values_to_cpudlg(HWND hDlg, WPARAM wParam) SendDlgItemMessage(hDlg, IDC_FPU_MODE, CB_SETCURSEL, workprefs.fpu_mode < 0 ? 1 : (workprefs.fpu_mode > 0 ? 2 : 0), 0); CheckDlgButton (hDlg, IDC_CPU_UNIMPLEMENTED, !workprefs.int_no_unimplemented || workprefs.cachesize); SendDlgItemMessage (hDlg, IDC_CPUIDLE, TBM_SETPOS, TRUE, workprefs.cpu_idle == 0 ? 0 : 12 - workprefs.cpu_idle / 15); + _stprintf(buffer, _T("%d%%"), (workprefs.cpu_idle == 0 ? 0 : 12 - workprefs.cpu_idle / 15) * 10); + SetDlgItemText(hDlg, IDC_CPUIDLETEXT, buffer); SendDlgItemMessage (hDlg, IDC_PPC_CPUIDLE, TBM_SETPOS, TRUE, workprefs.ppc_cpu_idle); cpu = (workprefs.cpu_model - 68000) / 10; if (cpu >= 5) -- 2.47.3