diff --git a/src/LANG/INTLCHAR.h b/src/LANG/INTLCHAR.h index cc38e1b..fa7b104 100644 --- a/src/LANG/INTLCHAR.h +++ b/src/LANG/INTLCHAR.h @@ -1647,13 +1647,11 @@ LOCALVAR bool SpeedStopped = false; LOCALVAR bool RunInBackground = (WantInitRunInBackground != 0); -#if VarFullScreen +#if 1 LOCALVAR bool WantFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify LOCALVAR bool WantMagnify = (WantInitMagnify != 0); -#endif #if NeedRequestInsertDisk LOCALVAR bool RequestInsertDisk = false; @@ -1718,7 +1716,6 @@ LOCALFUNC char * GetSubstitutionStr(char x) } break; #endif -#if EnableMagnify case 'g': if (WantMagnify) { s = kStrOn; @@ -1726,8 +1723,7 @@ LOCALFUNC char * GetSubstitutionStr(char x) s = kStrOff; } break; -#endif -#if VarFullScreen +#if 1 case 'f': if (WantFullScreen) { s = kStrOn; diff --git a/src/PROGMAIN.c b/src/PROGMAIN.c index f7279f5..6154c43 100644 --- a/src/PROGMAIN.c +++ b/src/PROGMAIN.c @@ -374,14 +374,12 @@ LOCALPROC ExtraTimeEndNotify(void) GLOBALPROC EmulationReserveAlloc(void) { - ReserveAllocOneBlock(&RAM, - kRAM_Size + RAMSafetyMarginFudge, 5, false); + ReserveAllocOneBlock(&RAM, kRAM_Size + RAMSafetyMarginFudge, 5, false); #if EmVidCard ReserveAllocOneBlock(&VidROM, kVidROM_Size, 5, false); #endif #if IncludeVidMem - ReserveAllocOneBlock(&VidMem, - kVidMemRAM_Size + RAMSafetyMarginFudge, 5, true); + ReserveAllocOneBlock(&VidMem, kVidMemRAM_Size + RAMSafetyMarginFudge, 5, true); #endif #if SmallGlobals MINEM68K_ReserveAlloc(); diff --git a/src/UI/COMOSGLU.h b/src/UI/COMOSGLU.h index ec441ad..840d296 100644 --- a/src/UI/COMOSGLU.h +++ b/src/UI/COMOSGLU.h @@ -24,11 +24,7 @@ #define EnableFSMouseMotion 0 #endif -#if EnableMagnify || VarFullScreen #define EnableRecreateW 1 -#else -#define EnableRecreateW 0 -#endif #if EnableRecreateW || EnableFSMouseMotion #define EnableMoveMouse 1 diff --git a/src/UI/CONTROLM.h b/src/UI/CONTROLM.h index 8748003..ac3a859 100644 --- a/src/UI/CONTROLM.h +++ b/src/UI/CONTROLM.h @@ -511,7 +511,7 @@ LOCALPROC SetSpeedValue(uint8_t i) ControlMessage = kCntrlMsgNewSpeed; } -#if VarFullScreen +#if 1 FORWARDPROC ToggleWantFullScreen(void); #endif @@ -625,13 +625,11 @@ LOCALPROC DoControlModeKey(uint8_t key) RequestInsertDisk = true; break; #endif -#if EnableMagnify case MKC_M: WantMagnify = ! WantMagnify; ControlMessage = kCntrlMsgMagnify; break; -#endif -#if VarFullScreen +#if 1 case MKC_F: ToggleWantFullScreen(); ControlMessage = kCntrlMsgFullScreen; @@ -846,10 +844,8 @@ LOCALPROC DrawCellsControlModeBody(void) #endif DrawCellsKeyCommand("Q", kStrCmdQuit); DrawCellsKeyCommand("S", kStrCmdSpeedControl); -#if EnableMagnify DrawCellsKeyCommand("M", kStrCmdMagnifyToggle); -#endif -#if VarFullScreen +#if 1 DrawCellsKeyCommand("F", kStrCmdFullScrnToggle); #endif #if WantEnblCtrlKtg @@ -894,12 +890,10 @@ LOCALPROC DrawCellsControlModeBody(void) case kCntrlMsgNewAutoSlow: DrawCellsOneLineStr(kStrNewAutoSlow); break; -#if EnableMagnify case kCntrlMsgMagnify: DrawCellsOneLineStr(kStrNewMagnify); break; -#endif -#if VarFullScreen +#if 1 case kCntrlMsgFullScreen: DrawCellsOneLineStr(kStrNewFullScreen); break; diff --git a/src/UI/MACOSX/OSGLUCCO.m b/src/UI/MACOSX/OSGLUCCO.m index c80f1ce..9685d7f 100644 --- a/src/UI/MACOSX/OSGLUCCO.m +++ b/src/UI/MACOSX/OSGLUCCO.m @@ -1441,22 +1441,15 @@ LOCALVAR short vOffset; LOCALVAR bool GrabMachine = false; #endif -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (0 != WantInitFullScreen); #endif -#if EnableMagnify LOCALVAR bool UseMagnify = (0 != WantInitMagnify); -#endif - LOCALVAR bool gBackgroundFlag = false; LOCALVAR bool CurSpeedStopped = true; -#if EnableMagnify #define MaxScale WindowScale -#else -#define MaxScale 1 -#endif LOCALVAR bool HaveCursorHidden = false; @@ -1476,7 +1469,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) NSPoint p; CGPoint cgp; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1486,14 +1479,12 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) } #endif -#if EnableMagnify if (UseMagnify) { h *= WindowScale; v *= WindowScale; } -#endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1590,7 +1581,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) { bool ShouldHaveCursorHidden = true; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1600,14 +1591,12 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) } #endif -#if EnableMagnify if (UseMagnify) { NewMousePosh /= WindowScale; NewMousePosv /= WindowScale; } -#endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1641,7 +1630,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) ShouldHaveCursorHidden = false; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1769,7 +1758,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t int16_t top2; int16_t left2; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1796,7 +1785,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t top2 = top; left2 = left; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1806,12 +1795,10 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t } #endif -#if EnableMagnify if (UseMagnify) { top2 *= WindowScale; left2 *= WindowScale; } -#endif [NSOpnGLCntxt makeCurrentContext]; @@ -2794,7 +2781,6 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, break; } -#if EnableMagnify if (UseMagnify) { for (i = top * WindowScale; i < bottom * WindowScale; ++i) { for (j = left * WindowScale; @@ -2830,7 +2816,6 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } } } else -#endif { for (i = top; i < bottom; ++i) { for (j = left; j < right; ++j) { @@ -2862,15 +2847,12 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } } -#if EnableMagnify if (UseMagnify) { SDL_UpdateRect(left * WindowScale, top * WindowScale, (right - left) * WindowScale, (bottom - top) * WindowScale); - } else -#endif - { + } else { SDL_UpdateRect(left, top, right - left, bottom - top); } @@ -3105,12 +3087,9 @@ LOCALPROC AdjustGLforSize(int h, int v) #endif glColor3f(0.0, 0.0, 0.0); -#if EnableMagnify if (UseMagnify) { glPixelZoom(WindowScale, - WindowScale); - } else -#endif - { + } else { glPixelZoom(1, -1); } glPixelStorei(GL_UNPACK_ROW_LENGTH, vMacScreenWidth); @@ -3221,7 +3200,7 @@ typedef NSUInteger (*modifierFlagsProcPtr) - (BOOL)canBecomeKeyWindow { return -#if VarFullScreen +#if 1 (! UseFullScreen) ? [super canBecomeKeyWindow] : #endif YES; @@ -3232,7 +3211,7 @@ typedef NSUInteger (*modifierFlagsProcPtr) - (BOOL)canBecomeMainWindow { return -#if VarFullScreen +#if 1 (! UseFullScreen) ? [super canBecomeMainWindow] : #endif YES; @@ -3243,7 +3222,7 @@ typedef NSUInteger (*modifierFlagsProcPtr) - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen { -#if VarFullScreen +#if 1 if (! UseFullScreen) { return [super constrainFrameRect:frameRect toScreen:screen]; } else @@ -3442,9 +3421,7 @@ LOCALPROC QZ_SetCaption(void) enum { kMagStateNormal, -#if EnableMagnify kMagStateMagnifgy, -#endif kNumMagStates }; @@ -3472,7 +3449,7 @@ LOCALFUNC bool CreateMainWindow(void) int NewWindowWidth = vMacScreenWidth; bool v = false; -#if VarFullScreen +#if 1 if (UseFullScreen) { _HideMenuBar(); } else { @@ -3498,12 +3475,10 @@ LOCALFUNC bool CreateMainWindow(void) } } -#if EnableMagnify if (UseMagnify) { NewWindowHeight *= WindowScale; NewWindowWidth *= WindowScale; } -#endif botleftPos.x = MainScrnBounds.origin.x + floor((MainScrnBounds.size.width @@ -3518,19 +3493,17 @@ LOCALFUNC bool CreateMainWindow(void) botleftPos.y = MainScrnBounds.origin.y; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen { ViewHSize = MainScrnBounds.size.width; ViewVSize = MainScrnBounds.size.height; -#if EnableMagnify if (UseMagnify) { ViewHSize /= WindowScale; ViewVSize /= WindowScale; } -#endif if (ViewHSize >= vMacScreenWidth) { ViewHStart = 0; ViewHSize = vMacScreenWidth; @@ -3547,7 +3520,7 @@ LOCALFUNC bool CreateMainWindow(void) #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3565,19 +3538,16 @@ LOCALFUNC bool CreateMainWindow(void) style = NSBorderlessWindowMask; } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen { int WinIndx; -#if EnableMagnify if (UseMagnify) { WinIndx = kMagStateMagnifgy; - } else -#endif - { + } else { WinIndx = kMagStateNormal; } @@ -3708,12 +3678,10 @@ struct WState { short f_hOffset; short f_vOffset; #endif -#if VarFullScreen +#if 1 bool f_UseFullScreen; #endif -#if EnableMagnify bool f_UseMagnify; -#endif #if MayNotFullScreen int f_CurWinIndx; #endif @@ -3745,12 +3713,10 @@ LOCALPROC GetWState(WState *r) r->f_hOffset = hOffset; r->f_vOffset = vOffset; #endif -#if VarFullScreen +#if 1 r->f_UseFullScreen = UseFullScreen; #endif -#if EnableMagnify r->f_UseMagnify = UseMagnify; -#endif #if MayNotFullScreen r->f_CurWinIndx = CurWinIndx; #endif @@ -3781,12 +3747,10 @@ LOCALPROC SetWState(WState *r) hOffset = r->f_hOffset; vOffset = r->f_vOffset; #endif -#if VarFullScreen +#if 1 UseFullScreen = r->f_UseFullScreen; #endif -#if EnableMagnify UseMagnify = r->f_UseMagnify; -#endif #if MayNotFullScreen CurWinIndx = r->f_CurWinIndx; #endif @@ -3813,7 +3777,7 @@ LOCALPROC ReCreateMainWindow(void) WState new_state; bool HadCursorHidden = HaveCursorHidden; -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -3839,10 +3803,8 @@ LOCALPROC ReCreateMainWindow(void) ZapWState(); -#if EnableMagnify UseMagnify = WantMagnify; -#endif -#if VarFullScreen +#if 1 UseFullScreen = WantFullScreen; #endif @@ -3850,7 +3812,7 @@ LOCALPROC ReCreateMainWindow(void) CloseMainWindow(); SetWState(&old_state); -#if VarFullScreen +#if 1 if (UseFullScreen) { _HideMenuBar(); } else { @@ -3859,12 +3821,10 @@ LOCALPROC ReCreateMainWindow(void) #endif /* avoid retry */ -#if VarFullScreen +#if 1 WantFullScreen = UseFullScreen; #endif -#if EnableMagnify WantMagnify = UseMagnify; -#endif } else { GetWState(&new_state); @@ -3879,17 +3839,13 @@ LOCALPROC ReCreateMainWindow(void) } #endif -#if VarFullScreen && EnableMagnify enum { kWinStateWindowed, -#if EnableMagnify kWinStateFullScreen, -#endif kNumWinStates }; -#endif -#if VarFullScreen && EnableMagnify +#if 1 LOCALVAR int WinMagStates[kNumWinStates]; #endif @@ -3904,7 +3860,7 @@ LOCALPROC ZapWinStateVars(void) } } #endif -#if VarFullScreen && EnableMagnify +#if 1 { int i; @@ -3915,12 +3871,11 @@ LOCALPROC ZapWinStateVars(void) #endif } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; -#if EnableMagnify { int OldWinState = UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; @@ -3949,7 +3904,6 @@ LOCALPROC ToggleWantFullScreen(void) } } } -#endif } #endif @@ -4179,7 +4133,7 @@ LOCALPROC CheckForSavedTasks(void) } #endif -#if VarFullScreen +#if 1 if (gTrueBackgroundFlag && WantFullScreen) { ToggleWantFullScreen(); } @@ -4190,7 +4144,7 @@ LOCALPROC CheckForSavedTasks(void) UpdateOpenGLContext(); -#if VarFullScreen +#if 1 /* triggered on enter full screen for some reason in OS X 10.11. so check against @@ -4222,10 +4176,8 @@ LOCALPROC CheckForSavedTasks(void) #if EnableRecreateW if (0 -#if EnableMagnify || (UseMagnify != WantMagnify) -#endif -#if VarFullScreen +#if 1 || (UseFullScreen != WantFullScreen) #endif ) @@ -4236,7 +4188,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (GrabMachine != ( -#if VarFullScreen +#if 1 UseFullScreen && #endif ! (gTrueBackgroundFlag || CurSpeedStopped))) @@ -4290,7 +4242,7 @@ LOCALPROC CheckForSavedTasks(void) if (HaveCursorHidden != ( #if MayNotFullScreen (WantCursorHidden -#if VarFullScreen +#if 1 || UseFullScreen #endif ) && @@ -4393,7 +4345,7 @@ LOCALPROC ProcessOneSystemEvent(NSEvent *event) && (! gTrueBackgroundFlag) #if MayNotFullScreen && (WantCursorHidden -#if VarFullScreen +#if 1 || UseFullScreen #endif ) diff --git a/src/UI/MACOSX/OSGLUOSX.c b/src/UI/MACOSX/OSGLUOSX.c index 5d45c5c..30d2203 100644 --- a/src/UI/MACOSX/OSGLUOSX.c +++ b/src/UI/MACOSX/OSGLUOSX.c @@ -1193,15 +1193,12 @@ LOCALVAR short vOffset; LOCALVAR bool GrabMachine = false; #endif -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify LOCALVAR bool UseMagnify = (WantInitMagnify != 0); -#endif -#if EnableMagnify LOCALPROC ScaleRect(Rect *r) { r->left *= WindowScale; @@ -1209,7 +1206,6 @@ LOCALPROC ScaleRect(Rect *r) r->top *= WindowScale; r->bottom *= WindowScale; } -#endif LOCALPROC SetScrnRectFromCoords(Rect *r, int16_t top, int16_t left, int16_t bottom, int16_t right) @@ -1219,7 +1215,7 @@ LOCALPROC SetScrnRectFromCoords(Rect *r, r->top = top; r->bottom = bottom; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1228,13 +1224,11 @@ LOCALPROC SetScrnRectFromCoords(Rect *r, } #endif -#if EnableMagnify if (UseMagnify) { ScaleRect(r); } -#endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1357,7 +1351,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t right = vMacScreenWidth; #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1384,7 +1378,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t top2 = top; left2 = left; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1394,12 +1388,10 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t } #endif -#if EnableMagnify if (UseMagnify) { top2 *= WindowScale; left2 *= WindowScale; } -#endif #if 0 glClear(GL_COLOR_BUFFER_BIT); @@ -1501,7 +1493,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos) NewMousePos.h -= r.left; NewMousePos.v -= r.top; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1511,14 +1503,12 @@ LOCALPROC MousePositionNotify(Point NewMousePos) } #endif -#if EnableMagnify if (UseMagnify) { NewMousePos.h /= WindowScale; NewMousePos.v /= WindowScale; } -#endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1775,7 +1765,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) Point CurMousePos; Rect r; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1785,14 +1775,12 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) } #endif -#if EnableMagnify if (UseMagnify) { h *= WindowScale; v *= WindowScale; } -#endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1908,7 +1896,7 @@ LOCALFUNC bool InitMousePosition(void) start by moving cursor to known position. */ -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -2519,12 +2507,9 @@ LOCALPROC AdjustGLforSize(int h, int v) #endif glColor3f(0.0, 0.0, 0.0); -#if EnableMagnify if (UseMagnify) { glPixelZoom(WindowScale, - WindowScale); - } else -#endif - { + } else { glPixelZoom(1, -1); } glPixelStorei(GL_UNPACK_ROW_LENGTH, vMacScreenWidth); @@ -2630,7 +2615,7 @@ LOCALVAR AGLContext fullscreen_ctx = NULL; LOCALPROC MaybeFullScreen(void) { if ( -#if VarFullScreen +#if 1 UseFullScreen && #endif (NULL == fullscreen_ctx) @@ -3931,7 +3916,7 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow) if (noErr == CreateNewWindow( -#if VarFullScreen +#if 1 UseFullScreen ? #endif #if MayFullScreen @@ -3953,7 +3938,7 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow) */ kPlainWindowClass #endif -#if VarFullScreen +#if 1 : #endif #if MayNotFullScreen @@ -3961,13 +3946,13 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow) #endif , -#if VarFullScreen +#if 1 UseFullScreen ? #endif #if MayFullScreen /* kWindowStandardHandlerAttribute */ 0 #endif -#if VarFullScreen +#if 1 : #endif #if MayNotFullScreen @@ -3979,7 +3964,7 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow) Bounds, &ResultWin )) { -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -4054,9 +4039,7 @@ LOCALPROC CloseMainWindow(void) enum { kMagStateNormal, -#if EnableMagnify kMagStateMagnifgy, -#endif kNumMagStates }; @@ -4082,7 +4065,7 @@ LOCALFUNC bool CreateMainWindow(void) short NewWindowWidth = vMacScreenWidth; bool IsOk = false; -#if VarFullScreen +#if 1 if (UseFullScreen) { _HideMenuBar(); } else { @@ -4097,12 +4080,10 @@ LOCALFUNC bool CreateMainWindow(void) GetGrayRgnBounds(&AllScrnBounds); GetScreenBitsBounds(&MainScrnBounds); -#if EnableMagnify if (UseMagnify) { NewWindowHeight *= WindowScale; NewWindowWidth *= WindowScale; } -#endif leftPos = MainScrnBounds.left + ((MainScrnBounds.right - MainScrnBounds.left) @@ -4117,19 +4098,17 @@ LOCALFUNC bool CreateMainWindow(void) topPos = MainScrnBounds.top; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen { ViewHSize = MainScrnBounds.right - MainScrnBounds.left; ViewVSize = MainScrnBounds.bottom - MainScrnBounds.top; -#if EnableMagnify if (UseMagnify) { ViewHSize /= WindowScale; ViewVSize /= WindowScale; } -#endif if (ViewHSize >= vMacScreenWidth) { ViewHStart = 0; ViewHSize = vMacScreenWidth; @@ -4149,7 +4128,7 @@ LOCALFUNC bool CreateMainWindow(void) SetRect(&MainScrnBounds, 0, 0, NewWindowWidth, NewWindowHeight); OffsetRect(&MainScrnBounds, leftPos, topPos); -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -4157,17 +4136,14 @@ LOCALFUNC bool CreateMainWindow(void) NewWinRect = AllScrnBounds; } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen { -#if EnableMagnify if (UseMagnify) { WinIndx = kMagStateMagnifgy; - } else -#endif - { + } else { WinIndx = kMagStateNormal; } @@ -4188,7 +4164,7 @@ LOCALFUNC bool CreateMainWindow(void) CurWinIndx = WinIndx; #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -4242,7 +4218,7 @@ LOCALFUNC bool CreateMainWindow(void) } else { ctx = window_ctx; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -4255,7 +4231,7 @@ LOCALFUNC bool CreateMainWindow(void) AdjustGLforSize(h, v); } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen @@ -4285,7 +4261,7 @@ LOCALFUNC bool CreateMainWindow(void) } #endif -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -4350,10 +4326,10 @@ struct WState { uint16_t f_ViewHStart; uint16_t f_ViewVStart; #endif -#if VarFullScreen +#if 1 bool f_UseFullScreen; #endif -#if EnableMagnify +#if 1 bool f_UseMagnify; #endif #if MayNotFullScreen @@ -4381,10 +4357,10 @@ LOCALPROC GetWState(WState *r) r->f_ViewHStart = ViewHStart; r->f_ViewVStart = ViewVStart; #endif -#if VarFullScreen +#if 1 r->f_UseFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 r->f_UseMagnify = UseMagnify; #endif #if MayNotFullScreen @@ -4411,10 +4387,10 @@ LOCALPROC SetWState(WState *r) ViewHStart = r->f_ViewHStart; ViewVStart = r->f_ViewVStart; #endif -#if VarFullScreen +#if 1 UseFullScreen = r->f_UseFullScreen; #endif -#if EnableMagnify +#if 1 UseMagnify = r->f_UseMagnify; #endif #if MayNotFullScreen @@ -4435,7 +4411,7 @@ LOCALFUNC bool ReCreateMainWindow(void) WState old_state; WState new_state; -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -4464,10 +4440,10 @@ LOCALFUNC bool ReCreateMainWindow(void) ZapWState(); -#if VarFullScreen +#if 1 UseFullScreen = WantFullScreen; #endif -#if EnableMagnify +#if 1 UseMagnify = WantMagnify; #endif @@ -4476,7 +4452,7 @@ LOCALFUNC bool ReCreateMainWindow(void) CloseMainWindow(); SetWState(&old_state); -#if VarFullScreen +#if 1 if (UseFullScreen) { _HideMenuBar(); } else { @@ -4485,10 +4461,10 @@ LOCALFUNC bool ReCreateMainWindow(void) #endif /* avoid retry */ -#if VarFullScreen +#if 1 WantFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 WantMagnify = UseMagnify; #endif @@ -4512,17 +4488,17 @@ LOCALFUNC bool ReCreateMainWindow(void) } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 enum { kWinStateWindowed, -#if EnableMagnify +#if 1 kWinStateFullScreen, #endif kNumWinStates }; #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 LOCALVAR int WinMagStates[kNumWinStates]; #endif @@ -4537,7 +4513,7 @@ LOCALPROC ZapWinStateVars(void) } } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 { int i; @@ -4548,12 +4524,12 @@ LOCALPROC ZapWinStateVars(void) #endif } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; -#if EnableMagnify +#if 1 { int OldWinState = UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; @@ -4629,7 +4605,7 @@ LOCALPROC DoNotInBackgroundTasks(void) if (HaveCursorHidden != ( #if MayNotFullScreen (WantCursorHidden -#if VarFullScreen +#if 1 || UseFullScreen #endif ) && @@ -4709,7 +4685,7 @@ LOCALPROC CheckForSavedTasks(void) } } -#if VarFullScreen +#if 1 if (gTrueBackgroundFlag && WantFullScreen) { ToggleWantFullScreen(); } @@ -4729,10 +4705,10 @@ LOCALPROC CheckForSavedTasks(void) #if EnableRecreateW if (gWeAreActive) { if (0 -#if EnableMagnify +#if 1 || (UseMagnify != WantMagnify) #endif -#if VarFullScreen +#if 1 || (UseFullScreen != WantFullScreen) #endif ) @@ -4744,7 +4720,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (GrabMachine != ( -#if VarFullScreen +#if 1 UseFullScreen && #endif gWeAreActive && ! CurSpeedStopped)) @@ -5137,7 +5113,7 @@ static void DisplayRegisterReconfigurationCallback( WantScreensChangedCheck = true; -#if VarFullScreen +#if 1 if (WantFullScreen) { ToggleWantFullScreen(); } diff --git a/src/UI/NDS/OSGLUNDS.c b/src/UI/NDS/OSGLUNDS.c index 4d219fc..28dc905 100644 --- a/src/UI/NDS/OSGLUNDS.c +++ b/src/UI/NDS/OSGLUNDS.c @@ -469,17 +469,17 @@ LOCALVAR short hOffset; LOCALVAR short vOffset; #endif -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify +#if 1 LOCALVAR bool UseMagnify = (WantInitMagnify != 0); #endif LOCALVAR bool CurSpeedStopped = true; -#if EnableMagnify +#if 1 #define MaxScale WindowScale #else #define MaxScale 1 @@ -897,7 +897,7 @@ LOCALFUNC bool Screen_Init(void) return true; } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; @@ -1072,7 +1072,7 @@ LOCALPROC DS_ScrollBackground(void) TODO: Lots of magic numbers here. */ -#if EnableMagnify +#if 1 if (WantMagnify) { ScrollX = ((int) CurMouseH) - (DS_ScreenWidth / 4); ScrollY = ((int) CurMouseV) - (DS_ScreenHeight / 4); diff --git a/src/UI/OLDMAC/OSGLUMAC.c b/src/UI/OLDMAC/OSGLUMAC.c index 7507bb1..a267774 100644 --- a/src/UI/OLDMAC/OSGLUMAC.c +++ b/src/UI/OLDMAC/OSGLUMAC.c @@ -963,15 +963,15 @@ LOCALVAR short vOffset; LOCALVAR bool GrabMachine = false; #endif -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify +#if 1 LOCALVAR bool UseMagnify = (WantInitMagnify != 0); #endif -#if EnableMagnify +#if 1 LOCALPROC ScaleRect(Rect *r) { r->left *= WindowScale; @@ -989,7 +989,7 @@ LOCALPROC SetScrnRectFromCoords(Rect *r, r->top = top; r->bottom = bottom; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -998,13 +998,13 @@ LOCALPROC SetScrnRectFromCoords(Rect *r, } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { ScaleRect(r); } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1015,16 +1015,16 @@ LOCALPROC SetScrnRectFromCoords(Rect *r, } -#if EnableMagnify +#if 1 #define ScaledHeight (WindowScale * vMacScreenHeight) #define ScaledWidth (WindowScale * vMacScreenWidth) #endif -#if EnableMagnify +#if 1 LOCALVAR uint8_t * ScalingBuff = nullpr; #endif -#if EnableMagnify +#if 1 LOCALVAR uint8_t * ScalingTabl = nullpr; #define ScalingTablsz (256 * WindowScale) @@ -1041,7 +1041,7 @@ LOCALVAR uint8_t * ScalingTabl = nullpr; #endif -#if EnableMagnify +#if 1 LOCALPROC SetUpScalingTabl(void) { uint8_t *p4; @@ -1085,7 +1085,7 @@ LOCALPROC DefaultDrawScreenBuff(int16_t top, int16_t left, src.rowBytes = vMacScreenMonoByteWidth; SetRect(&src.bounds, 0, 0, vMacScreenWidth, vMacScreenHeight); -#if EnableMagnify +#if 1 if (UseMagnify) { if (! ColorTransValid) { @@ -1119,7 +1119,7 @@ LOCALPROC Update_Screen(void) GetPort(&savePort); _SetPortWindowPort(gMainWindow); -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1142,7 +1142,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left, PixMapHandle pm= (**GetMainDevice()).gdPMap; /* LockPixels(pm); */ -#if EnableMagnify +#if 1 if (! UseMagnify) { #define PixelT uint32_t PixelT *p1 = (PixelT *)GetPixBaseAddr(pm); @@ -1470,7 +1470,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) bool IsOk; long int StartTime = TickCount(); -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1480,14 +1480,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { h *= WindowScale; v *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1598,7 +1598,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos) { bool ShouldHaveCursorHidden = true; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1607,7 +1607,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos) NewMousePos.v -= vOffset; } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen @@ -1618,14 +1618,14 @@ LOCALPROC MousePositionNotify(Point NewMousePos) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { NewMousePos.h /= WindowScale; NewMousePos.v /= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1659,7 +1659,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos) ShouldHaveCursorHidden = false; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -4450,7 +4450,7 @@ LOCALFUNC bool PrepareForDragging(void) } #endif -#if EnableMagnify +#if 1 #define ScaleBuffSzMult (WindowScale * WindowScale) #endif @@ -4497,7 +4497,7 @@ LOCALPROC CloseMainWindow(void) enum { kMagStateNormal, -#if EnableMagnify +#if 1 kMagStateMagnifgy, #endif kNumMagStates @@ -4536,7 +4536,7 @@ LOCALFUNC bool CreateMainWindow(void) short NewWindowWidth = vMacScreenWidth; bool IsOk = false; -#if VarFullScreen +#if 1 if (UseFullScreen) { _HideMenuBar(); } else { @@ -4551,7 +4551,7 @@ LOCALFUNC bool CreateMainWindow(void) GetGrayRgnBounds(&AllScrnBounds); GetScreenBitsBounds(&MainScrnBounds); -#if EnableMagnify +#if 1 if (UseMagnify) { NewWindowHeight *= WindowScale; NewWindowWidth *= WindowScale; @@ -4571,14 +4571,14 @@ LOCALFUNC bool CreateMainWindow(void) topPos = MainScrnBounds.top; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen { ViewHSize = MainScrnBounds.right - MainScrnBounds.left; ViewVSize = MainScrnBounds.bottom - MainScrnBounds.top; -#if EnableMagnify +#if 1 if (UseMagnify) { ViewHSize /= WindowScale; ViewVSize /= WindowScale; @@ -4603,7 +4603,7 @@ LOCALFUNC bool CreateMainWindow(void) SetRect(&MainScrnBounds, 0, 0, NewWindowWidth, NewWindowHeight); OffsetRect(&MainScrnBounds, leftPos, topPos); -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -4611,12 +4611,12 @@ LOCALFUNC bool CreateMainWindow(void) NewWinRect = AllScrnBounds; } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen { -#if EnableMagnify +#if 1 if (UseMagnify) { WinIndx = kMagStateMagnifgy; } else @@ -4642,7 +4642,7 @@ LOCALFUNC bool CreateMainWindow(void) CurWinIndx = WinIndx; #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -4656,7 +4656,7 @@ LOCALFUNC bool CreateMainWindow(void) ShowWindow(gMainWindow); /* check if window rect valid */ -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -4702,10 +4702,10 @@ struct WState { uint16_t f_ViewHStart; uint16_t f_ViewVStart; #endif -#if VarFullScreen +#if 1 bool f_UseFullScreen; #endif -#if EnableMagnify +#if 1 bool f_UseMagnify; #endif #if MayNotFullScreen @@ -4727,10 +4727,10 @@ LOCALPROC GetWState(WState *r) r->f_ViewHStart = ViewHStart; r->f_ViewVStart = ViewVStart; #endif -#if VarFullScreen +#if 1 r->f_UseFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 r->f_UseMagnify = UseMagnify; #endif #if MayNotFullScreen @@ -4751,10 +4751,10 @@ LOCALPROC SetWState(WState *r) ViewHStart = r->f_ViewHStart; ViewVStart = r->f_ViewVStart; #endif -#if VarFullScreen +#if 1 UseFullScreen = r->f_UseFullScreen; #endif -#if EnableMagnify +#if 1 UseMagnify = r->f_UseMagnify; #endif #if MayNotFullScreen @@ -4784,7 +4784,7 @@ LOCALFUNC bool ReCreateMainWindow(void) WState old_state; WState new_state; -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -4809,10 +4809,10 @@ LOCALFUNC bool ReCreateMainWindow(void) ZapWState(); -#if VarFullScreen +#if 1 UseFullScreen = WantFullScreen; #endif -#if EnableMagnify +#if 1 UseMagnify = WantMagnify; #endif @@ -4822,7 +4822,7 @@ LOCALFUNC bool ReCreateMainWindow(void) CloseMainWindow(); SetWState(&old_state); -#if VarFullScreen +#if 1 if (UseFullScreen) { _HideMenuBar(); } else { @@ -4831,10 +4831,10 @@ LOCALFUNC bool ReCreateMainWindow(void) #endif /* avoid retry */ -#if VarFullScreen +#if 1 WantFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 WantMagnify = UseMagnify; #endif @@ -4854,17 +4854,17 @@ LOCALFUNC bool ReCreateMainWindow(void) } } -#if VarFullScreen && EnableMagnify +#if 1 && 1 enum { kWinStateWindowed, -#if EnableMagnify +#if 1 kWinStateFullScreen, #endif kNumWinStates }; #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 LOCALVAR int WinMagStates[kNumWinStates]; #endif @@ -4879,7 +4879,7 @@ LOCALPROC ZapWinStateVars(void) } } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 { int i; @@ -4890,12 +4890,12 @@ LOCALPROC ZapWinStateVars(void) #endif } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; -#if EnableMagnify +#if 1 { int OldWinState = UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; @@ -4943,7 +4943,7 @@ LOCALPROC EnterBackground(void) { DisconnectKeyCodes3(); -#if VarFullScreen +#if 1 if (WantFullScreen) { ToggleWantFullScreen(); } @@ -5018,10 +5018,10 @@ LOCALPROC CheckForSavedTasks(void) #if EnableRecreateW if (! (gTrueBackgroundFlag)) { if (0 -#if EnableMagnify +#if 1 || (UseMagnify != WantMagnify) #endif -#if VarFullScreen +#if 1 || (UseFullScreen != WantFullScreen) #endif ) @@ -5036,7 +5036,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (GrabMachine != ( -#if VarFullScreen +#if 1 UseFullScreen && #endif ! (gTrueBackgroundFlag || CurSpeedStopped))) @@ -5378,7 +5378,7 @@ LOCALPROC CheckForSystemEvents(void) only hog cpu in full screen mode */ if ( -#if VarFullScreen +#if 1 UseFullScreen && #endif ((uint8_t) -1 == SpeedValue) && ! CurSpeedStopped) @@ -5622,7 +5622,7 @@ LOCALPROC ReserveAllocAll(void) ReserveAllocOneBlock(&CntrlDisplayBuff, vMacScreenNumBytes, 5, false); #endif -#if EnableMagnify +#if 1 ReserveAllocOneBlock(&ScalingBuff, vMacScreenNumBytes * (ScaleBuffSzMult), 5, false); ReserveAllocOneBlock(&ScalingTabl, diff --git a/src/UI/UNIX/OSGLUXWN.c b/src/UI/UNIX/OSGLUXWN.c index 43e577f..91eca6c 100644 --- a/src/UI/UNIX/OSGLUXWN.c +++ b/src/UI/UNIX/OSGLUXWN.c @@ -1049,11 +1049,11 @@ LOCALVAR short hOffset; LOCALVAR short vOffset; #endif -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify +#if 1 LOCALVAR bool UseMagnify = (WantInitMagnify != 0); #endif @@ -1067,17 +1067,17 @@ LOCALVAR bool CurSpeedStopped = true; LOCALVAR XImage *image = NULL; -#if EnableMagnify +#if 1 LOCALVAR XImage *Scaled_image = NULL; #endif -#if EnableMagnify +#if 1 #define MaxScale WindowScale #else #define MaxScale 1 #endif -#define WantScalingTabl (EnableMagnify || UseColorImage) +#define WantScalingTabl (1 || UseColorImage) #if WantScalingTabl @@ -1094,7 +1094,7 @@ LOCALVAR uint8_t * ScalingTabl = nullpr; #endif /* WantScalingTabl */ -#define WantScalingBuff (EnableMagnify || UseColorImage) +#define WantScalingBuff (1 || UseColorImage) #if WantScalingBuff @@ -1112,7 +1112,7 @@ LOCALVAR uint8_t * ScalingBuff = nullpr; #endif /* WantScalingBuff */ -#if EnableMagnify && ! UseColorImage +#if 1 && ! UseColorImage LOCALPROC SetUpScalingTabl(void) { uint8_t *p4; @@ -1142,7 +1142,7 @@ LOCALPROC SetUpScalingTabl(void) } #endif -//#if EnableMagnify && (0 != vMacScreenDepth) && (vMacScreenDepth < 4) +//#if 1 && (0 != vMacScreenDepth) && (vMacScreenDepth < 4) LOCALPROC SetUpColorScalingTabl(void) { int i; @@ -1185,7 +1185,7 @@ LOCALPROC SetUpColorTabl(void) } } -//#if EnableMagnify && UseColorImage +//#if 1 && UseColorImage LOCALPROC SetUpBW2ColorScalingTabl(void) { int i; @@ -1232,7 +1232,7 @@ LOCALPROC SetUpBW2ColorTabl(void) } -#if EnableMagnify && ! UseColorImage +#if 1 && ! UseColorImage #define ScrnMapr_DoMap UpdateScaledBWCopy #define ScrnMapr_Src GetCurDrawBuff() @@ -1261,7 +1261,7 @@ LOCALPROC SetUpBW2ColorTabl(void) #endif -#if EnableMagnify && (0 != vMacScreenDepth) && (vMacScreenDepth < 4) +#if 1 && (0 != vMacScreenDepth) && (vMacScreenDepth < 4) #define ScrnMapr_DoMap UpdateMappedScaledColorCopy #define ScrnMapr_Src GetCurDrawBuff() @@ -1288,7 +1288,7 @@ LOCALPROC SetUpBW2ColorTabl(void) #endif -#if EnableMagnify && (vMacScreenDepth >= 4) +#if 1 && (vMacScreenDepth >= 4) #define ScrnTrns_DoTrans UpdateTransScaledColorCopy #define ScrnTrns_Src GetCurDrawBuff() @@ -1302,7 +1302,7 @@ LOCALPROC SetUpBW2ColorTabl(void) #endif -#if EnableMagnify && UseColorImage +#if 1 && UseColorImage #define ScrnMapr_DoMap UpdateMappedScaledBW2ColorCopy #define ScrnMapr_Src GetCurDrawBuff() @@ -1338,7 +1338,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, int YDest; char *the_data; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1365,7 +1365,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, XDest = left; YDest = top; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1375,14 +1375,14 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { XDest *= WindowScale; YDest *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1392,7 +1392,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { #if UseColorImage #if 0 != vMacScreenDepth @@ -1442,7 +1442,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, Scaled_image->data = saveData; } } else -#endif /* EnableMagnify */ +#endif /* 1 */ { #if UseColorImage #if 0 != vMacScreenDepth @@ -1589,7 +1589,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) bool IsOk; int attempts = 0; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1599,14 +1599,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { h *= WindowScale; v *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1691,7 +1691,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) { bool ShouldHaveCursorHidden = true; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1701,14 +1701,14 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { NewMousePosh /= WindowScale; NewMousePosv /= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1742,7 +1742,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) ShouldHaveCursorHidden = false; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3015,7 +3015,7 @@ LOCALPROC HandleTheEvent(XEvent *theEvent) dbglog_writeln("- event - Expose"); #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3027,7 +3027,7 @@ LOCALPROC HandleTheEvent(XEvent *theEvent) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { x0 /= WindowScale; y0 /= WindowScale; @@ -3036,7 +3036,7 @@ LOCALPROC HandleTheEvent(XEvent *theEvent) } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3335,7 +3335,7 @@ LOCALFUNC bool Screen_Init(void) #endif /* UseColorImage */ -#if EnableMagnify && (! UseColorImage) +#if 1 && (! UseColorImage) Scaled_image = XCreateImage(x_display, Xvisual, 1, XYBitmap, 0, NULL /* (char *)image_Mem1 */, @@ -3351,7 +3351,7 @@ LOCALFUNC bool Screen_Init(void) Scaled_image->byte_order = MSBFirst; #endif -#if EnableMagnify && UseColorImage +#if 1 && UseColorImage Scaled_image = XCreateImage(x_display, Xvisual, 24, ZPixmap, 0, NULL /* (char *)image_Mem1 */, @@ -3387,7 +3387,7 @@ LOCALPROC CloseMainWindow(void) enum { kMagStateNormal, -#if EnableMagnify +#if 1 kMagStateMagnifgy, #endif kNumMagStates @@ -3440,7 +3440,7 @@ LOCALFUNC bool CreateMainWindow(void) XGetGeometry(x_display, rootwin, &rr, &xr, &yr, &wr, &hr, &bwr, &dr); -#if EnableMagnify +#if 1 if (UseMagnify) { NewWindowHeight *= WindowScale; NewWindowWidth *= WindowScale; @@ -3458,14 +3458,14 @@ LOCALFUNC bool CreateMainWindow(void) topPos = 0; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen { ViewHSize = wr; ViewVSize = hr; -#if EnableMagnify +#if 1 if (UseMagnify) { ViewHSize /= WindowScale; ViewVSize /= WindowScale; @@ -3486,12 +3486,12 @@ LOCALFUNC bool CreateMainWindow(void) } #endif -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen { -#if EnableMagnify +#if 1 if (UseMagnify) { WinIndx = kMagStateMagnifgy; } else @@ -3511,7 +3511,7 @@ LOCALFUNC bool CreateMainWindow(void) } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3531,7 +3531,7 @@ LOCALFUNC bool CreateMainWindow(void) &xattr /* attributes */); } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen @@ -3607,7 +3607,7 @@ LOCALFUNC bool CreateMainWindow(void) XSetState(x_display, gc, x_black.pixel, x_white.pixel, GXcopy, AllPlanes); -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -3637,7 +3637,7 @@ LOCALFUNC bool CreateMainWindow(void) } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3729,10 +3729,10 @@ struct WState { uint16_t f_ViewHStart; uint16_t f_ViewVStart; #endif -#if VarFullScreen +#if 1 bool f_UseFullScreen; #endif -#if EnableMagnify +#if 1 bool f_UseMagnify; #endif }; @@ -3752,10 +3752,10 @@ LOCALPROC GetWState(WState *r) r->f_ViewHStart = ViewHStart; r->f_ViewVStart = ViewVStart; #endif -#if VarFullScreen +#if 1 r->f_UseFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 r->f_UseMagnify = UseMagnify; #endif } @@ -3774,10 +3774,10 @@ LOCALPROC SetWState(WState *r) ViewHStart = r->f_ViewHStart; ViewVStart = r->f_ViewVStart; #endif -#if VarFullScreen +#if 1 UseFullScreen = r->f_UseFullScreen; #endif -#if EnableMagnify +#if 1 UseMagnify = r->f_UseMagnify; #endif } @@ -3807,7 +3807,7 @@ LOCALFUNC bool ReCreateMainWindow(void) ForceShowCursor(); /* hide/show cursor api is per window */ #if MayNotFullScreen -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif if (main_wind) @@ -3865,10 +3865,10 @@ LOCALFUNC bool ReCreateMainWindow(void) GetWState(&old_state); ZapWState(); -#if EnableMagnify +#if 1 UseMagnify = WantMagnify; #endif -#if VarFullScreen +#if 1 UseFullScreen = WantFullScreen; #endif @@ -3879,10 +3879,10 @@ LOCALFUNC bool ReCreateMainWindow(void) SetWState(&old_state); /* avoid retry */ -#if VarFullScreen +#if 1 WantFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 WantMagnify = UseMagnify; #endif @@ -3917,17 +3917,17 @@ LOCALFUNC bool ReCreateMainWindow(void) } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 enum { kWinStateWindowed, -#if EnableMagnify +#if 1 kWinStateFullScreen, #endif kNumWinStates }; #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 LOCALVAR int WinMagStates[kNumWinStates]; #endif @@ -3942,7 +3942,7 @@ LOCALPROC ZapWinStateVars(void) } } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 { int i; @@ -3953,12 +3953,12 @@ LOCALPROC ZapWinStateVars(void) #endif } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; -#if EnableMagnify +#if 1 { int OldWinState = UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; @@ -4044,7 +4044,7 @@ LOCALPROC CheckForSavedTasks(void) if (NeedFinishOpen2 && ! NeedFinishOpen1) { NeedFinishOpen2 = false; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -4053,7 +4053,7 @@ LOCALPROC CheckForSavedTasks(void) RevertToPointerRoot, CurrentTime); } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen @@ -4141,7 +4141,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (gTrueBackgroundFlag -#if VarFullScreen +#if 1 && WantFullScreen #endif ) @@ -4164,10 +4164,10 @@ LOCALPROC CheckForSavedTasks(void) #if EnableRecreateW if (0 -#if EnableMagnify +#if 1 || (UseMagnify != WantMagnify) #endif -#if VarFullScreen +#if 1 || (UseFullScreen != WantFullScreen) #endif ) @@ -4179,7 +4179,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (GrabMachine != ( -#if VarFullScreen +#if 1 UseFullScreen && #endif ! (gTrueBackgroundFlag || CurSpeedStopped))) @@ -4715,7 +4715,7 @@ LOCALPROC UnInitOSGLU(void) if (image != NULL) { XDestroyImage(image); } -#if EnableMagnify +#if 1 if (Scaled_image != NULL) { XDestroyImage(Scaled_image); } diff --git a/src/UI/WIN32/OSGLUWIN.c b/src/UI/WIN32/OSGLUWIN.c index 109165f..93d7c06 100644 --- a/src/UI/WIN32/OSGLUWIN.c +++ b/src/UI/WIN32/OSGLUWIN.c @@ -387,11 +387,11 @@ LOCALVAR short oldOrientation; LOCALVAR unsigned long oldDisplayOrientation; #endif -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify +#if 1 LOCALVAR bool UseMagnify = (WantInitMagnify != 0); #endif @@ -425,7 +425,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) LONG x = h; LONG y = v; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -435,14 +435,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { x *= WindowScale; y *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -2842,7 +2842,7 @@ LOCALPROC DisposeMainWindow(void) enum { kMagStateNormal, -#if EnableMagnify +#if 1 kMagStateMagnifgy, #endif kNumMagStates @@ -2921,7 +2921,7 @@ LOCALFUNC bool ReCreateMainWindow(void) DWORD WStyle; DWORD WExStyle; -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -2935,7 +2935,7 @@ LOCALFUNC bool ReCreateMainWindow(void) #endif #if MayNotFullScreen -#if EnableMagnify +#if 1 if (WantMagnify) { WinIndx = kMagStateMagnifgy; } else @@ -2945,14 +2945,14 @@ LOCALFUNC bool ReCreateMainWindow(void) } #endif -#if EnableMagnify +#if 1 if (WantMagnify) { NewWindowHeight *= WindowScale; NewWindowWidth *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (WantFullScreen) #endif #if MayFullScreen @@ -2975,7 +2975,7 @@ LOCALFUNC bool ReCreateMainWindow(void) NewWinR.bottom = ScreenY; } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen @@ -3024,13 +3024,13 @@ LOCALFUNC bool ReCreateMainWindow(void) #endif if ((OldMainWindow == NULL) -#if VarFullScreen +#if 1 || (WantFullScreen != UseFullScreen) #endif ) { -#if VarFullScreen +#if 1 if (WantFullScreen) #endif #if MayFullScreen @@ -3038,7 +3038,7 @@ LOCALFUNC bool ReCreateMainWindow(void) mb = NULL; } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen @@ -3140,21 +3140,21 @@ LOCALFUNC bool ReCreateMainWindow(void) MainWnd = NewMainWindow; MainWndDC = NewMainWndDC; gTrueBackgroundFlag = false; -#if VarFullScreen +#if 1 UseFullScreen = WantFullScreen; #endif -#if EnableMagnify +#if 1 UseMagnify = WantMagnify; #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen { ViewHSize = ScreenX; ViewVSize = ScreenY; -#if EnableMagnify +#if 1 if (UseMagnify) { ViewHSize /= WindowScale; ViewVSize /= WindowScale; @@ -3291,7 +3291,7 @@ typedef struct BITMAPINFOHEADER256 { //RGBQUAD colors[2]; } BITMAPINFOHEADER256; -#if EnableMagnify +#if 1 #define ScaledHeight (WindowScale * vMacScreenHeight) #define ScaledWidth (WindowScale * vMacScreenWidth) #endif @@ -3304,7 +3304,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left, int XDest; int YDest; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3331,7 +3331,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left, XDest = left; YDest = top; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3341,13 +3341,13 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left, } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { XDest *= WindowScale; YDest *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3451,7 +3451,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left, } } -#if EnableMagnify +#if 1 if (UseMagnify) { nDestWidth *= WindowScale; nDestHeight *= WindowScale; @@ -3505,7 +3505,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left, bmh.colors[1].rgbReserved = 0; #endif -#if EnableMagnify +#if 1 if (UseMagnify) { #if EnableScalingBuff if (ScalingBuff != NULL) { @@ -3760,7 +3760,7 @@ LOCALPROC MousePositionNotify(LONG NewMousePosx, LONG NewMousePosy) { bool ShouldHaveCursorHidden = true; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3770,14 +3770,14 @@ LOCALPROC MousePositionNotify(LONG NewMousePosx, LONG NewMousePosy) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { NewMousePosx /= WindowScale; NewMousePosy /= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3811,7 +3811,7 @@ LOCALPROC MousePositionNotify(LONG NewMousePosx, LONG NewMousePosy) ShouldHaveCursorHidden = false; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -5144,13 +5144,13 @@ LOCALFUNC bool ScanCommandLine(void) LOCALPROC CheckMagnifyAndFullScreen(void) { if ( -#if EnableMagnify +#if 1 (UseMagnify != WantMagnify) #endif -#if EnableMagnify && VarFullScreen +#if 1 && 1 || #endif -#if VarFullScreen +#if 1 (UseFullScreen != WantFullScreen) #endif ) @@ -5160,17 +5160,17 @@ LOCALPROC CheckMagnifyAndFullScreen(void) } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 enum { kWinStateWindowed, -#if EnableMagnify +#if 1 kWinStateFullScreen, #endif kNumWinStates }; #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 LOCALVAR int WinMagStates[kNumWinStates]; #endif @@ -5185,7 +5185,7 @@ LOCALPROC ZapWinStateVars(void) } } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 { int i; @@ -5196,12 +5196,12 @@ LOCALPROC ZapWinStateVars(void) #endif } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; -#if EnableMagnify +#if 1 { int OldWinState = UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; @@ -5279,7 +5279,7 @@ LOCALPROC EnterBackground(void) { DisconnectKeyCodes3(); -#if VarFullScreen +#if 1 if (WantFullScreen) { ToggleWantFullScreen(); } @@ -5368,7 +5368,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (GrabMachine != ( -#if VarFullScreen +#if 1 UseFullScreen && #endif ! (gTrueBackgroundFlag || CurSpeedStopped))) @@ -5458,7 +5458,7 @@ LRESULT CALLBACK Win32WMProc(HWND hwnd, PAINTSTRUCT ps; BeginPaint(hwnd, (LPPAINTSTRUCT)&ps); -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -5907,7 +5907,7 @@ LOCALPROC ReserveAllocAll(void) #if EnableScalingBuff { uint32_t n = vMacScreenMonoNumBytes -#if EnableMagnify +#if 1 * WindowScale * WindowScale #endif ; diff --git a/src/UI/XPLAT/OSGLUSD2.c b/src/UI/XPLAT/OSGLUSD2.c index 056076c..696af80 100644 --- a/src/UI/XPLAT/OSGLUSD2.c +++ b/src/UI/XPLAT/OSGLUSD2.c @@ -544,11 +544,11 @@ LOCALVAR int hOffset; LOCALVAR int vOffset; #endif -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify +#if 1 LOCALVAR bool UseMagnify = (WantInitMagnify != 0); #endif @@ -560,7 +560,7 @@ LOCALVAR bool gBackgroundFlag = false; LOCALVAR bool gTrueBackgroundFlag = false; LOCALVAR bool CurSpeedStopped = true; -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling #define MaxScale WindowScale #else #define MaxScale 1 @@ -581,7 +581,7 @@ LOCALVAR uint8_t * CLUT_final; 256 possible values of one byte 8 pixels per byte maximum (when black and white) 4 bytes per destination pixel maximum - multiplied by WindowScale if EnableMagnify + multiplied by WindowScale if 1 */ #define ScrnMapr_DoMap UpdateBWDepth3Copy @@ -611,7 +611,7 @@ LOCALVAR uint8_t * CLUT_final; #include "HW/SCREEN/SCRNMAPR.h" -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling #define ScrnMapr_DoMap UpdateBWDepth3ScaledCopy #define ScrnMapr_Src GetCurDrawBuff() @@ -643,7 +643,7 @@ LOCALVAR uint8_t * CLUT_final; #include "HW/SCREEN/SCRNMAPR.h" -#endif /* EnableMagnify && ! UseSDLscaling */ +#endif /* 1 && ! UseSDLscaling */ #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4) @@ -675,7 +675,7 @@ LOCALVAR uint8_t * CLUT_final; #include "HW/SCREEN/SCRNMAPR.h" -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling #define ScrnMapr_DoMap UpdateColorDepth3ScaledCopy #define ScrnMapr_Src GetCurDrawBuff() @@ -707,7 +707,7 @@ LOCALVAR uint8_t * CLUT_final; #include "HW/SCREEN/SCRNMAPR.h" -#endif /* EnableMagnify && ! UseSDLscaling */ +#endif /* 1 && ! UseSDLscaling */ #endif @@ -736,7 +736,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, int DestWidth; int DestHeight; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -765,7 +765,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, DestWidth = (right - left); DestHeight = (bottom - top); -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -775,7 +775,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { XDest *= WindowScale; YDest *= WindowScale; @@ -784,7 +784,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -799,7 +799,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, bottom2 = bottom; right2 = right; -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling if (UseMagnify) { top2 *= WindowScale; left2 *= WindowScale; @@ -817,7 +817,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, int bpp = format->BytesPerPixel; uint32_t ExpectedPitch = vMacScreenWidth * bpp; -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling if (UseMagnify) { ExpectedPitch *= WindowScale; } @@ -851,7 +851,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, { int k; Uint32 v; -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling int a; #endif int PixPerByte = @@ -880,7 +880,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, v = BWLUT_pixel[(i >> k) & 1]; } -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling for (a = UseMagnify ? WindowScale : 1; --a >= 0; ) #endif { @@ -905,7 +905,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4) if (UseColorMode) { -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling if (UseMagnify) { switch (bpp) { case 1: @@ -939,7 +939,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } else #endif { -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling if (UseMagnify) { switch (bpp) { case 1: @@ -984,7 +984,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, Uint8 *bufp = (Uint8 *)pixels + i * pitch + j * bpp; -#if EnableMagnify && ! UseSDLscaling +#if 1 && ! UseSDLscaling if (UseMagnify) { i0 /= WindowScale; j0 /= WindowScale; @@ -1123,7 +1123,7 @@ LOCALPROC ForceShowCursor(void) #if EnableMoveMouse && HaveWorkingWarp LOCALFUNC bool MoveMouse(int16_t h, int16_t v) { -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1133,14 +1133,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { h *= WindowScale; v *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1162,7 +1162,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) { bool ShouldHaveCursorHidden = true; -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1172,14 +1172,14 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) } #endif -#if EnableMagnify +#if 1 if (UseMagnify) { NewMousePosh /= WindowScale; NewMousePosv /= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1213,7 +1213,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) ShouldHaveCursorHidden = false; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1238,7 +1238,7 @@ LOCALPROC MousePositionNotifyRelative(int deltah, int deltav) { bool ShouldHaveCursorHidden = true; -#if EnableMagnify +#if 1 if (UseMagnify) { /* This is not really right. If only move one pixel @@ -3329,7 +3329,7 @@ LOCALPROC MouseConstrain(void) enum { kMagStateNormal, -#if EnableMagnify +#if 1 kMagStateMagnifgy, #endif kNumMagStates @@ -3353,14 +3353,14 @@ LOCALFUNC bool CreateMainWindow(void) Uint32 flags = 0 /* SDL_WINDOW_HIDDEN */; bool v = false; -#if EnableMagnify && 1 +#if 1 && 1 if (UseMagnify) { NewWindowHeight *= WindowScale; NewWindowWidth *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3375,14 +3375,14 @@ LOCALFUNC bool CreateMainWindow(void) NewWindowY = SDL_WINDOWPOS_UNDEFINED; } #endif -#if VarFullScreen +#if 1 else #endif #if MayNotFullScreen { int WinIndx; -#if EnableMagnify +#if 1 if (UseMagnify) { WinIndx = kMagStateMagnifgy; } else @@ -3465,7 +3465,7 @@ LOCALFUNC bool CreateMainWindow(void) } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -3477,7 +3477,7 @@ LOCALFUNC bool CreateMainWindow(void) ViewHSize = wr; ViewVSize = hr; -#if EnableMagnify +#if 1 if (UseMagnify) { ViewHSize /= WindowScale; ViewVSize /= WindowScale; @@ -3562,10 +3562,10 @@ struct WState { int f_hOffset; int f_vOffset; #endif -#if VarFullScreen +#if 1 bool f_UseFullScreen; #endif -#if EnableMagnify +#if 1 bool f_UseMagnify; #endif #if MayNotFullScreen @@ -3590,10 +3590,10 @@ LOCALPROC GetWState(WState *r) r->f_hOffset = hOffset; r->f_vOffset = vOffset; #endif -#if VarFullScreen +#if 1 r->f_UseFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 r->f_UseMagnify = UseMagnify; #endif #if MayNotFullScreen @@ -3617,10 +3617,10 @@ LOCALPROC SetWState(WState *r) hOffset = r->f_hOffset; vOffset = r->f_vOffset; #endif -#if VarFullScreen +#if 1 UseFullScreen = r->f_UseFullScreen; #endif -#if EnableMagnify +#if 1 UseMagnify = r->f_UseMagnify; #endif #if MayNotFullScreen @@ -3633,17 +3633,17 @@ LOCALPROC SetWState(WState *r) } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 enum { kWinStateWindowed, -#if EnableMagnify +#if 1 kWinStateFullScreen, #endif kNumWinStates }; #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 LOCALVAR int WinMagStates[kNumWinStates]; #endif @@ -3655,7 +3655,7 @@ LOCALFUNC bool ReCreateMainWindow(void) #if HaveWorkingWarp bool HadCursorHidden = HaveCursorHidden; #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 int OldWinState = UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; int OldMagState = @@ -3665,7 +3665,7 @@ LOCALFUNC bool ReCreateMainWindow(void) OldMagState; #endif -#if VarFullScreen +#if 1 if (! UseFullScreen) #endif #if MayNotFullScreen @@ -3690,10 +3690,10 @@ LOCALFUNC bool ReCreateMainWindow(void) ZapWState(); -#if EnableMagnify +#if 1 UseMagnify = WantMagnify; #endif -#if VarFullScreen +#if 1 UseFullScreen = WantFullScreen; #endif @@ -3702,10 +3702,10 @@ LOCALFUNC bool ReCreateMainWindow(void) SetWState(&old_state); /* avoid retry */ -#if VarFullScreen +#if 1 WantFullScreen = UseFullScreen; #endif -#if EnableMagnify +#if 1 WantMagnify = UseMagnify; #endif @@ -3737,7 +3737,7 @@ LOCALPROC ZapWinStateVars(void) } } #endif -#if VarFullScreen && EnableMagnify +#if 1 && 1 { int i; @@ -3748,12 +3748,12 @@ LOCALPROC ZapWinStateVars(void) #endif } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; -#if EnableMagnify +#if 1 { int OldWinState = UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; @@ -3873,10 +3873,10 @@ LOCALPROC CheckForSavedTasks(void) #if EnableRecreateW if (0 -#if EnableMagnify +#if 1 || (UseMagnify != WantMagnify) #endif -#if VarFullScreen +#if 1 || (UseFullScreen != WantFullScreen) #endif ) @@ -3887,7 +3887,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (GrabMachine != ( -#if VarFullScreen +#if 1 UseFullScreen && #endif ! (gTrueBackgroundFlag || CurSpeedStopped))) diff --git a/src/UI/XPLAT/OSGLUSDL.c b/src/UI/XPLAT/OSGLUSDL.c index d4998c0..320c15d 100644 --- a/src/UI/XPLAT/OSGLUSDL.c +++ b/src/UI/XPLAT/OSGLUSDL.c @@ -348,11 +348,11 @@ LOCALFUNC bool LoadMacRom(void) /* --- video out --- */ -#if VarFullScreen +#if 1 LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); #endif -#if EnableMagnify +#if 1 LOCALVAR bool UseMagnify = (WantInitMagnify != 0); #endif @@ -360,7 +360,7 @@ LOCALVAR bool gBackgroundFlag = false; LOCALVAR bool gTrueBackgroundFlag = false; LOCALVAR bool CurSpeedStopped = true; -#if EnableMagnify +#if 1 #define MaxScale WindowScale #else #define MaxScale 1 @@ -378,7 +378,7 @@ LOCALVAR uint8_t * CLUT_final; 256 possible values of one byte 8 pixels per byte maximum (when black and white) 4 bytes per destination pixel maximum - multiplied by WindowScale if EnableMagnify + multiplied by WindowScale if 1 */ #define ScrnMapr_DoMap UpdateBWDepth3Copy @@ -517,7 +517,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, uint32_t bottom2 = bottom; uint32_t right2 = right; -#if EnableMagnify +#if 1 if (UseMagnify) { top2 *= WindowScale; left2 *= WindowScale; @@ -537,7 +537,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, int bpp = surface->format->BytesPerPixel; uint32_t ExpectedPitch = vMacScreenWidth * bpp; -#if EnableMagnify +#if 1 if (UseMagnify) { ExpectedPitch *= WindowScale; } @@ -571,7 +571,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, { int k; Uint32 v; -#if EnableMagnify +#if 1 int a; #endif int PixPerByte = @@ -600,7 +600,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, v = BWLUT_pixel[(i >> k) & 1]; } -#if EnableMagnify +#if 1 for (a = UseMagnify ? WindowScale : 1; --a >= 0; ) #endif { @@ -625,7 +625,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4) if (UseColorMode) { -#if EnableMagnify +#if 1 if (UseMagnify) { switch (bpp) { case 1: @@ -659,7 +659,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, } else #endif { -#if EnableMagnify +#if 1 if (UseMagnify) { switch (bpp) { case 1: @@ -704,7 +704,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left, Uint8 *bufp = (Uint8 *)surface->pixels + i * surface->pitch + j * bpp; -#if EnableMagnify +#if 1 if (UseMagnify) { i0 /= WindowScale; j0 /= WindowScale; @@ -824,7 +824,7 @@ LOCALPROC ForceShowCursor(void) LOCALFUNC bool MoveMouse(int16_t h, int16_t v) { -#if EnableMagnify +#if 1 if (UseMagnify) { h *= WindowScale; v *= WindowScale; @@ -842,7 +842,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) { bool ShouldHaveCursorHidden = true; -#if EnableMagnify +#if 1 if (UseMagnify) { NewMousePosh /= WindowScale; NewMousePosv /= WindowScale; @@ -873,7 +873,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv) ShouldHaveCursorHidden = false; } -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1863,14 +1863,14 @@ LOCALFUNC bool CreateMainWindow(void) Uint32 flags = SDL_SWSURFACE; bool v = false; -#if EnableMagnify && 1 +#if 1 && 1 if (UseMagnify) { NewWindowHeight *= WindowScale; NewWindowWidth *= WindowScale; } #endif -#if VarFullScreen +#if 1 if (UseFullScreen) #endif #if MayFullScreen @@ -1916,10 +1916,10 @@ LOCALFUNC bool ReCreateMainWindow(void) } #endif -#if EnableMagnify +#if 1 UseMagnify = WantMagnify; #endif -#if VarFullScreen +#if 1 UseFullScreen = WantFullScreen; #endif @@ -1937,7 +1937,7 @@ LOCALPROC ZapWinStateVars(void) { } -#if VarFullScreen +#if 1 LOCALPROC ToggleWantFullScreen(void) { WantFullScreen = ! WantFullScreen; @@ -2031,10 +2031,10 @@ LOCALPROC CheckForSavedTasks(void) #if EnableRecreateW if (0 -#if EnableMagnify +#if 1 || (UseMagnify != WantMagnify) #endif -#if VarFullScreen +#if 1 || (UseFullScreen != WantFullScreen) #endif ) @@ -2045,7 +2045,7 @@ LOCALPROC CheckForSavedTasks(void) #if MayFullScreen if (GrabMachine != ( -#if VarFullScreen +#if 1 UseFullScreen && #endif ! (gTrueBackgroundFlag || CurSpeedStopped)))