mirror of
https://github.com/libretro/Mu.git
synced 2026-09-23 07:05:37 +00:00
Clean up MuExpDriver GUI
Decided not to let the user set the OS version, that will only cause more issues I will have to deal with down the line.
This commit is contained in:
@@ -14,12 +14,11 @@ MODAL
|
||||
BEGIN
|
||||
TITLE "Emulator Options"
|
||||
CHECKBOX "Enable driver" ID GUI_CHECKBOX_DRIVER_ENABLED AT (42 16 AUTO AUTO) FONT 0
|
||||
LABEL "OS Version:" AUTOID AT (33 70) FONT 0
|
||||
FIELD ID GUI_FIELD_OS_VERSION AT (PREVRIGHT+3 PREVTOP 37 11) FONT 0 UNDERLINED MAXCHARS 5 NUMERIC
|
||||
CHECKBOX "Patch Inconsistent APIs" ID GUI_CHECKBOX_PATCH_INCONSISTENT_APIS AT (CENTER 33 AUTO AUTO) FONT 0
|
||||
LABEL "CPU Speed:" AUTOID AT (33 PREVBOTTOM+4) FONT 0
|
||||
FIELD ID GUI_FIELD_CPU_SPEED AT (PREVRIGHT+5 PREVTOP 23 11) FONT 0 UNDERLINED MAXCHARS 3 NUMERIC
|
||||
LABEL "CPU Speed:" AUTOID AT (33 51) FONT 0
|
||||
FIELD ID GUI_FIELD_CPU_SPEED AT (PREVRIGHT+5 PREVTOP 17 11) FONT 0 UNDERLINED MAXCHARS 3 NUMERIC
|
||||
BUTTON "Save and reboot" ID GUI_BUTTON_SAVE_AND_REBOOT AT (CENTER 141 AUTO AUTO) FONT 0
|
||||
LABEL "SAFE MODE" ID GUI_LABEL_SAFE_MODE AT (CENTER 123) FONT 1 NONUSABLE
|
||||
END
|
||||
|
||||
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
#define GUI_FORM_MAIN_WINDOW 1001
|
||||
|
||||
#define GUI_FIELD_CPU_SPEED 1002
|
||||
#define GUI_FIELD_OS_VERSION 1003
|
||||
//#undef GUI_RESERVED 1003
|
||||
|
||||
#define GUI_CHECKBOX_DRIVER_ENABLED 1004
|
||||
#define GUI_CHECKBOX_PATCH_INCONSISTENT_APIS 1005
|
||||
|
||||
#define GUI_BUTTON_SAVE_AND_REBOOT 1006
|
||||
|
||||
#define GUI_LABEL_SAFE_MODE 1007
|
||||
|
||||
@@ -37,6 +37,10 @@ static Boolean appHandleEvent(EventPtr eventP){
|
||||
|
||||
CtlSetValue(getObjectPtr(GUI_CHECKBOX_DRIVER_ENABLED), guiConfigFile[DRIVER_ENABLED]);
|
||||
FldSetTextHandle(getObjectPtr(GUI_FIELD_CPU_SPEED), cpuSpeedTextHandle);
|
||||
if(guiConfigFile[SAFE_MODE])
|
||||
FrmShowObject(FrmGetActiveForm(), GUI_LABEL_SAFE_MODE);
|
||||
else
|
||||
FrmHideObject(FrmGetActiveForm(), GUI_LABEL_SAFE_MODE);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -60,6 +64,8 @@ static Boolean appHandleEvent(EventPtr eventP){
|
||||
return true;
|
||||
|
||||
case GUI_BUTTON_SAVE_AND_REBOOT:
|
||||
/*clear safe mode flag if its set and test the new config*/
|
||||
guiConfigFile[SAFE_MODE] = false;
|
||||
writeConfigFile(guiConfigFile);
|
||||
debugLog("Attempting reboot!\n");
|
||||
SysReset();
|
||||
|
||||
@@ -278,6 +278,14 @@ void emuScrDrawChars(WinPtr pWindow, Int16 xLoc, Int16 yLoc, Int16 xExtent, Int1
|
||||
/*do nothing*/
|
||||
}
|
||||
|
||||
/*
|
||||
may need to set this to change the border color like on OS 5
|
||||
Boolean UIPickColor(IndexedColorType *indexP, RGBColorType *rgbP,
|
||||
UIPickColorStartType start, const Char *titleP,
|
||||
const Char *tipP)
|
||||
SYS_TRAP(sysTrapUIPickColor);
|
||||
*/
|
||||
|
||||
/*
|
||||
may need to remove these from trap table:
|
||||
ScrGetGrayPat
|
||||
|
||||
@@ -9,5 +9,6 @@ GUI
|
||||
Setting window color like OS 5
|
||||
Tungsten W drivers are corrupting the trap table pointer(and a ton of other low mem globals)
|
||||
For some reason the new versions of MuExpDriver dont work with Chuzzle anymore
|
||||
Need to allocate a new trap table and set the global to that, not just write off the end of the existing one
|
||||
|
||||
Fixed:
|
||||
Reference in New Issue
Block a user