Macintosh-Tools/uvmac
1
0
Fork 0
mirror of https://github.com/InvisibleUp/uvmac.git synced 2024-06-11 05:29:26 +00:00
Code Issues Projects Releases Wiki Activity

Force EnableMagnify and VarFullScreen flags to 1

Browse Source
This commit is contained in:
InvisibleUp 2020-04-13 21:46:51 -04:00
parent f965fb1739
commit f5a3528db9
12 changed files with 337 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/LANG/INTLCHAR.h
View File

@ -1647,13 +1647,11 @@ LOCALVAR bool SpeedStopped = false;
LOCALVAR bool RunInBackground = (WantInitRunInBackground != 0); LOCALVAR bool RunInBackground = (WantInitRunInBackground != 0);
#if VarFullScreen #if 1
LOCALVAR bool WantFullScreen = (WantInitFullScreen != 0); LOCALVAR bool WantFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify
LOCALVAR bool WantMagnify = (WantInitMagnify != 0); LOCALVAR bool WantMagnify = (WantInitMagnify != 0);
#endif
#if NeedRequestInsertDisk #if NeedRequestInsertDisk
LOCALVAR bool RequestInsertDisk = false; LOCALVAR bool RequestInsertDisk = false;
@ -1718,7 +1716,6 @@ LOCALFUNC char * GetSubstitutionStr(char x)
} }
break; break;
#endif #endif
#if EnableMagnify
case 'g': case 'g':
if (WantMagnify) { if (WantMagnify) {
s = kStrOn; s = kStrOn;
@ -1726,8 +1723,7 @@ LOCALFUNC char * GetSubstitutionStr(char x)
s = kStrOff; s = kStrOff;
} }
break; break;
#endif #if 1
#if VarFullScreen
case 'f': case 'f':
if (WantFullScreen) { if (WantFullScreen) {
s = kStrOn; s = kStrOn;

6
src/PROGMAIN.c
View File

@ -374,14 +374,12 @@ LOCALPROC ExtraTimeEndNotify(void)
GLOBALPROC EmulationReserveAlloc(void) GLOBALPROC EmulationReserveAlloc(void)
{ {
ReserveAllocOneBlock(&RAM, ReserveAllocOneBlock(&RAM, kRAM_Size + RAMSafetyMarginFudge, 5, false);
kRAM_Size + RAMSafetyMarginFudge, 5, false);
#if EmVidCard #if EmVidCard
ReserveAllocOneBlock(&VidROM, kVidROM_Size, 5, false); ReserveAllocOneBlock(&VidROM, kVidROM_Size, 5, false);
#endif #endif
#if IncludeVidMem #if IncludeVidMem
ReserveAllocOneBlock(&VidMem, ReserveAllocOneBlock(&VidMem, kVidMemRAM_Size + RAMSafetyMarginFudge, 5, true);
kVidMemRAM_Size + RAMSafetyMarginFudge, 5, true);
#endif #endif
#if SmallGlobals #if SmallGlobals
MINEM68K_ReserveAlloc(); MINEM68K_ReserveAlloc();

4
src/UI/COMOSGLU.h
View File

@ -24,11 +24,7 @@
#define EnableFSMouseMotion 0 #define EnableFSMouseMotion 0
#endif #endif
#if EnableMagnify || VarFullScreen
#define EnableRecreateW 1 #define EnableRecreateW 1
#else
#define EnableRecreateW 0
#endif
#if EnableRecreateW || EnableFSMouseMotion #if EnableRecreateW || EnableFSMouseMotion
#define EnableMoveMouse 1 #define EnableMoveMouse 1

14
src/UI/CONTROLM.h
View File

@ -511,7 +511,7 @@ LOCALPROC SetSpeedValue(uint8_t i)
ControlMessage = kCntrlMsgNewSpeed; ControlMessage = kCntrlMsgNewSpeed;
} }
#if VarFullScreen #if 1
FORWARDPROC ToggleWantFullScreen(void); FORWARDPROC ToggleWantFullScreen(void);
#endif #endif
@ -625,13 +625,11 @@ LOCALPROC DoControlModeKey(uint8_t key)
RequestInsertDisk = true; RequestInsertDisk = true;
break; break;
#endif #endif
#if EnableMagnify
case MKC_M: case MKC_M:
WantMagnify = ! WantMagnify; WantMagnify = ! WantMagnify;
ControlMessage = kCntrlMsgMagnify; ControlMessage = kCntrlMsgMagnify;
break; break;
#endif #if 1
#if VarFullScreen
case MKC_F: case MKC_F:
ToggleWantFullScreen(); ToggleWantFullScreen();
ControlMessage = kCntrlMsgFullScreen; ControlMessage = kCntrlMsgFullScreen;
@ -846,10 +844,8 @@ LOCALPROC DrawCellsControlModeBody(void)
#endif #endif
DrawCellsKeyCommand("Q", kStrCmdQuit); DrawCellsKeyCommand("Q", kStrCmdQuit);
DrawCellsKeyCommand("S", kStrCmdSpeedControl); DrawCellsKeyCommand("S", kStrCmdSpeedControl);
#if EnableMagnify
DrawCellsKeyCommand("M", kStrCmdMagnifyToggle); DrawCellsKeyCommand("M", kStrCmdMagnifyToggle);
#endif #if 1
#if VarFullScreen
DrawCellsKeyCommand("F", kStrCmdFullScrnToggle); DrawCellsKeyCommand("F", kStrCmdFullScrnToggle);
#endif #endif
#if WantEnblCtrlKtg #if WantEnblCtrlKtg
@ -894,12 +890,10 @@ LOCALPROC DrawCellsControlModeBody(void)
case kCntrlMsgNewAutoSlow: case kCntrlMsgNewAutoSlow:
DrawCellsOneLineStr(kStrNewAutoSlow); DrawCellsOneLineStr(kStrNewAutoSlow);
break; break;
#if EnableMagnify
case kCntrlMsgMagnify: case kCntrlMsgMagnify:
DrawCellsOneLineStr(kStrNewMagnify); DrawCellsOneLineStr(kStrNewMagnify);
break; break;
#endif #if 1
#if VarFullScreen
case kCntrlMsgFullScreen: case kCntrlMsgFullScreen:
DrawCellsOneLineStr(kStrNewFullScreen); DrawCellsOneLineStr(kStrNewFullScreen);
break; break;

116
src/UI/MACOSX/OSGLUCCO.m
View File

@ -1441,22 +1441,15 @@ LOCALVAR short vOffset;
LOCALVAR bool GrabMachine = false; LOCALVAR bool GrabMachine = false;
#endif #endif
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (0 != WantInitFullScreen); LOCALVAR bool UseFullScreen = (0 != WantInitFullScreen);
#endif #endif
#if EnableMagnify
LOCALVAR bool UseMagnify = (0 != WantInitMagnify); LOCALVAR bool UseMagnify = (0 != WantInitMagnify);
#endif
LOCALVAR bool gBackgroundFlag = false; LOCALVAR bool gBackgroundFlag = false;
LOCALVAR bool CurSpeedStopped = true; LOCALVAR bool CurSpeedStopped = true;
#if EnableMagnify
#define MaxScale WindowScale #define MaxScale WindowScale
#else
#define MaxScale 1
#endif
LOCALVAR bool HaveCursorHidden = false; LOCALVAR bool HaveCursorHidden = false;
@ -1476,7 +1469,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
NSPoint p; NSPoint p;
CGPoint cgp; CGPoint cgp;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1486,14 +1479,12 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
} }
#endif #endif
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
h *= WindowScale; h *= WindowScale;
v *= WindowScale; v *= WindowScale;
} }
#endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1590,7 +1581,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
{ {
bool ShouldHaveCursorHidden = true; bool ShouldHaveCursorHidden = true;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1600,14 +1591,12 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
} }
#endif #endif
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
NewMousePosh /= WindowScale; NewMousePosh /= WindowScale;
NewMousePosv /= WindowScale; NewMousePosv /= WindowScale;
} }
#endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1641,7 +1630,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
ShouldHaveCursorHidden = false; ShouldHaveCursorHidden = false;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1769,7 +1758,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t
int16_t top2; int16_t top2;
int16_t left2; int16_t left2;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1796,7 +1785,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t
top2 = top; top2 = top;
left2 = left; left2 = left;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1806,12 +1795,10 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t
} }
#endif #endif
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
top2 *= WindowScale; top2 *= WindowScale;
left2 *= WindowScale; left2 *= WindowScale;
} }
#endif
[NSOpnGLCntxt makeCurrentContext]; [NSOpnGLCntxt makeCurrentContext];
@ -2794,7 +2781,6 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
break; break;
} }
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
for (i = top * WindowScale; i < bottom * WindowScale; ++i) { for (i = top * WindowScale; i < bottom * WindowScale; ++i) {
for (j = left * WindowScale; for (j = left * WindowScale;
@ -2830,7 +2816,6 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} }
} }
} else } else
#endif
{ {
for (i = top; i < bottom; ++i) { for (i = top; i < bottom; ++i) {
for (j = left; j < right; ++j) { for (j = left; j < right; ++j) {
@ -2862,15 +2847,12 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} }
} }
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
SDL_UpdateRect(left * WindowScale, SDL_UpdateRect(left * WindowScale,
top * WindowScale, top * WindowScale,
(right - left) * WindowScale, (right - left) * WindowScale,
(bottom - top) * WindowScale); (bottom - top) * WindowScale);
} else } else {
#endif
{
SDL_UpdateRect(left, top, SDL_UpdateRect(left, top,
right - left, bottom - top); right - left, bottom - top);
} }
@ -3105,12 +3087,9 @@ LOCALPROC AdjustGLforSize(int h, int v)
#endif #endif
glColor3f(0.0, 0.0, 0.0); glColor3f(0.0, 0.0, 0.0);
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
glPixelZoom(WindowScale, - WindowScale); glPixelZoom(WindowScale, - WindowScale);
} else } else {
#endif
{
glPixelZoom(1, -1); glPixelZoom(1, -1);
} }
glPixelStorei(GL_UNPACK_ROW_LENGTH, vMacScreenWidth); glPixelStorei(GL_UNPACK_ROW_LENGTH, vMacScreenWidth);
@ -3221,7 +3200,7 @@ typedef NSUInteger (*modifierFlagsProcPtr)
- (BOOL)canBecomeKeyWindow - (BOOL)canBecomeKeyWindow
{ {
return return
#if VarFullScreen #if 1
(! UseFullScreen) ? [super canBecomeKeyWindow] : (! UseFullScreen) ? [super canBecomeKeyWindow] :
#endif #endif
YES; YES;
@ -3232,7 +3211,7 @@ typedef NSUInteger (*modifierFlagsProcPtr)
- (BOOL)canBecomeMainWindow - (BOOL)canBecomeMainWindow
{ {
return return
#if VarFullScreen #if 1
(! UseFullScreen) ? [super canBecomeMainWindow] : (! UseFullScreen) ? [super canBecomeMainWindow] :
#endif #endif
YES; YES;
@ -3243,7 +3222,7 @@ typedef NSUInteger (*modifierFlagsProcPtr)
- (NSRect)constrainFrameRect:(NSRect)frameRect - (NSRect)constrainFrameRect:(NSRect)frameRect
toScreen:(NSScreen *)screen toScreen:(NSScreen *)screen
{ {
#if VarFullScreen #if 1
if (! UseFullScreen) { if (! UseFullScreen) {
return [super constrainFrameRect:frameRect toScreen:screen]; return [super constrainFrameRect:frameRect toScreen:screen];
} else } else
@ -3442,9 +3421,7 @@ LOCALPROC QZ_SetCaption(void)
enum { enum {
kMagStateNormal, kMagStateNormal,
#if EnableMagnify
kMagStateMagnifgy, kMagStateMagnifgy,
#endif
kNumMagStates kNumMagStates
}; };
@ -3472,7 +3449,7 @@ LOCALFUNC bool CreateMainWindow(void)
int NewWindowWidth = vMacScreenWidth; int NewWindowWidth = vMacScreenWidth;
bool v = false; bool v = false;
#if VarFullScreen #if 1
if (UseFullScreen) { if (UseFullScreen) {
_HideMenuBar(); _HideMenuBar();
} else { } else {
@ -3498,12 +3475,10 @@ LOCALFUNC bool CreateMainWindow(void)
} }
} }
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
NewWindowHeight *= WindowScale; NewWindowHeight *= WindowScale;
NewWindowWidth *= WindowScale; NewWindowWidth *= WindowScale;
} }
#endif
botleftPos.x = MainScrnBounds.origin.x botleftPos.x = MainScrnBounds.origin.x
+ floor((MainScrnBounds.size.width + floor((MainScrnBounds.size.width
@ -3518,19 +3493,17 @@ LOCALFUNC bool CreateMainWindow(void)
botleftPos.y = MainScrnBounds.origin.y; botleftPos.y = MainScrnBounds.origin.y;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
{ {
ViewHSize = MainScrnBounds.size.width; ViewHSize = MainScrnBounds.size.width;
ViewVSize = MainScrnBounds.size.height; ViewVSize = MainScrnBounds.size.height;
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
ViewHSize /= WindowScale; ViewHSize /= WindowScale;
ViewVSize /= WindowScale; ViewVSize /= WindowScale;
} }
#endif
if (ViewHSize >= vMacScreenWidth) { if (ViewHSize >= vMacScreenWidth) {
ViewHStart = 0; ViewHStart = 0;
ViewHSize = vMacScreenWidth; ViewHSize = vMacScreenWidth;
@ -3547,7 +3520,7 @@ LOCALFUNC bool CreateMainWindow(void)
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3565,19 +3538,16 @@ LOCALFUNC bool CreateMainWindow(void)
style = NSBorderlessWindowMask; style = NSBorderlessWindowMask;
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
{ {
int WinIndx; int WinIndx;
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
WinIndx = kMagStateMagnifgy; WinIndx = kMagStateMagnifgy;
} else } else {
#endif
{
WinIndx = kMagStateNormal; WinIndx = kMagStateNormal;
} }
@ -3708,12 +3678,10 @@ struct WState {
short f_hOffset; short f_hOffset;
short f_vOffset; short f_vOffset;
#endif #endif
#if VarFullScreen #if 1
bool f_UseFullScreen; bool f_UseFullScreen;
#endif #endif
#if EnableMagnify
bool f_UseMagnify; bool f_UseMagnify;
#endif
#if MayNotFullScreen #if MayNotFullScreen
int f_CurWinIndx; int f_CurWinIndx;
#endif #endif
@ -3745,12 +3713,10 @@ LOCALPROC GetWState(WState *r)
r->f_hOffset = hOffset; r->f_hOffset = hOffset;
r->f_vOffset = vOffset; r->f_vOffset = vOffset;
#endif #endif
#if VarFullScreen #if 1
r->f_UseFullScreen = UseFullScreen; r->f_UseFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify
r->f_UseMagnify = UseMagnify; r->f_UseMagnify = UseMagnify;
#endif
#if MayNotFullScreen #if MayNotFullScreen
r->f_CurWinIndx = CurWinIndx; r->f_CurWinIndx = CurWinIndx;
#endif #endif
@ -3781,12 +3747,10 @@ LOCALPROC SetWState(WState *r)
hOffset = r->f_hOffset; hOffset = r->f_hOffset;
vOffset = r->f_vOffset; vOffset = r->f_vOffset;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = r->f_UseFullScreen; UseFullScreen = r->f_UseFullScreen;
#endif #endif
#if EnableMagnify
UseMagnify = r->f_UseMagnify; UseMagnify = r->f_UseMagnify;
#endif
#if MayNotFullScreen #if MayNotFullScreen
CurWinIndx = r->f_CurWinIndx; CurWinIndx = r->f_CurWinIndx;
#endif #endif
@ -3813,7 +3777,7 @@ LOCALPROC ReCreateMainWindow(void)
WState new_state; WState new_state;
bool HadCursorHidden = HaveCursorHidden; bool HadCursorHidden = HaveCursorHidden;
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3839,10 +3803,8 @@ LOCALPROC ReCreateMainWindow(void)
ZapWState(); ZapWState();
#if EnableMagnify
UseMagnify = WantMagnify; UseMagnify = WantMagnify;
#endif #if 1
#if VarFullScreen
UseFullScreen = WantFullScreen; UseFullScreen = WantFullScreen;
#endif #endif
@ -3850,7 +3812,7 @@ LOCALPROC ReCreateMainWindow(void)
CloseMainWindow(); CloseMainWindow();
SetWState(&old_state); SetWState(&old_state);
#if VarFullScreen #if 1
if (UseFullScreen) { if (UseFullScreen) {
_HideMenuBar(); _HideMenuBar();
} else { } else {
@ -3859,12 +3821,10 @@ LOCALPROC ReCreateMainWindow(void)
#endif #endif
/* avoid retry */ /* avoid retry */
#if VarFullScreen #if 1
WantFullScreen = UseFullScreen; WantFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify
WantMagnify = UseMagnify; WantMagnify = UseMagnify;
#endif
} else { } else {
GetWState(&new_state); GetWState(&new_state);
@ -3879,17 +3839,13 @@ LOCALPROC ReCreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen && EnableMagnify
enum { enum {
kWinStateWindowed, kWinStateWindowed,
#if EnableMagnify
kWinStateFullScreen, kWinStateFullScreen,
#endif
kNumWinStates kNumWinStates
}; };
#endif
#if VarFullScreen && EnableMagnify #if 1
LOCALVAR int WinMagStates[kNumWinStates]; LOCALVAR int WinMagStates[kNumWinStates];
#endif #endif
@ -3904,7 +3860,7 @@ LOCALPROC ZapWinStateVars(void)
} }
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1
{ {
int i; int i;
@ -3915,12 +3871,11 @@ LOCALPROC ZapWinStateVars(void)
#endif #endif
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
#if EnableMagnify
{ {
int OldWinState = int OldWinState =
UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; UseFullScreen ? kWinStateFullScreen : kWinStateWindowed;
@ -3949,7 +3904,6 @@ LOCALPROC ToggleWantFullScreen(void)
} }
} }
} }
#endif
} }
#endif #endif
@ -4179,7 +4133,7 @@ LOCALPROC CheckForSavedTasks(void)
} }
#endif #endif
#if VarFullScreen #if 1
if (gTrueBackgroundFlag && WantFullScreen) { if (gTrueBackgroundFlag && WantFullScreen) {
ToggleWantFullScreen(); ToggleWantFullScreen();
} }
@ -4190,7 +4144,7 @@ LOCALPROC CheckForSavedTasks(void)
UpdateOpenGLContext(); UpdateOpenGLContext();
#if VarFullScreen #if 1
/* /*
triggered on enter full screen for some triggered on enter full screen for some
reason in OS X 10.11. so check against reason in OS X 10.11. so check against
@ -4222,10 +4176,8 @@ LOCALPROC CheckForSavedTasks(void)
#if EnableRecreateW #if EnableRecreateW
if (0 if (0
#if EnableMagnify
|| (UseMagnify != WantMagnify) || (UseMagnify != WantMagnify)
#endif #if 1
#if VarFullScreen
|| (UseFullScreen != WantFullScreen) || (UseFullScreen != WantFullScreen)
#endif #endif
) )
@ -4236,7 +4188,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (GrabMachine != ( if (GrabMachine != (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
! (gTrueBackgroundFlag || CurSpeedStopped))) ! (gTrueBackgroundFlag || CurSpeedStopped)))
@ -4290,7 +4242,7 @@ LOCALPROC CheckForSavedTasks(void)
if (HaveCursorHidden != ( if (HaveCursorHidden != (
#if MayNotFullScreen #if MayNotFullScreen
(WantCursorHidden (WantCursorHidden
#if VarFullScreen #if 1
|| UseFullScreen || UseFullScreen
#endif #endif
) && ) &&
@ -4393,7 +4345,7 @@ LOCALPROC ProcessOneSystemEvent(NSEvent *event)
&& (! gTrueBackgroundFlag) && (! gTrueBackgroundFlag)
#if MayNotFullScreen #if MayNotFullScreen
&& (WantCursorHidden && (WantCursorHidden
#if VarFullScreen #if 1
|| UseFullScreen || UseFullScreen
#endif #endif
) )

124
src/UI/MACOSX/OSGLUOSX.c
View File

@ -1193,15 +1193,12 @@ LOCALVAR short vOffset;
LOCALVAR bool GrabMachine = false; LOCALVAR bool GrabMachine = false;
#endif #endif
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify
LOCALVAR bool UseMagnify = (WantInitMagnify != 0); LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
#endif
#if EnableMagnify
LOCALPROC ScaleRect(Rect *r) LOCALPROC ScaleRect(Rect *r)
{ {
r->left *= WindowScale; r->left *= WindowScale;
@ -1209,7 +1206,6 @@ LOCALPROC ScaleRect(Rect *r)
r->top *= WindowScale; r->top *= WindowScale;
r->bottom *= WindowScale; r->bottom *= WindowScale;
} }
#endif
LOCALPROC SetScrnRectFromCoords(Rect *r, LOCALPROC SetScrnRectFromCoords(Rect *r,
int16_t top, int16_t left, int16_t bottom, int16_t right) int16_t top, int16_t left, int16_t bottom, int16_t right)
@ -1219,7 +1215,7 @@ LOCALPROC SetScrnRectFromCoords(Rect *r,
r->top = top; r->top = top;
r->bottom = bottom; r->bottom = bottom;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1228,13 +1224,11 @@ LOCALPROC SetScrnRectFromCoords(Rect *r,
} }
#endif #endif
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
ScaleRect(r); ScaleRect(r);
} }
#endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1357,7 +1351,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t
right = vMacScreenWidth; right = vMacScreenWidth;
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1384,7 +1378,7 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t
top2 = top; top2 = top;
left2 = left; left2 = left;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1394,12 +1388,10 @@ LOCALPROC DrawWithOpenGL(uint16_t top, uint16_t left, uint16_t bottom, uint16_t
} }
#endif #endif
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
top2 *= WindowScale; top2 *= WindowScale;
left2 *= WindowScale; left2 *= WindowScale;
} }
#endif
#if 0 #if 0
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
@ -1501,7 +1493,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos)
NewMousePos.h -= r.left; NewMousePos.h -= r.left;
NewMousePos.v -= r.top; NewMousePos.v -= r.top;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1511,14 +1503,12 @@ LOCALPROC MousePositionNotify(Point NewMousePos)
} }
#endif #endif
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
NewMousePos.h /= WindowScale; NewMousePos.h /= WindowScale;
NewMousePos.v /= WindowScale; NewMousePos.v /= WindowScale;
} }
#endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1775,7 +1765,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
Point CurMousePos; Point CurMousePos;
Rect r; Rect r;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1785,14 +1775,12 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
} }
#endif #endif
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
h *= WindowScale; h *= WindowScale;
v *= WindowScale; v *= WindowScale;
} }
#endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1908,7 +1896,7 @@ LOCALFUNC bool InitMousePosition(void)
start by moving cursor to known position. start by moving cursor to known position.
*/ */
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -2519,12 +2507,9 @@ LOCALPROC AdjustGLforSize(int h, int v)
#endif #endif
glColor3f(0.0, 0.0, 0.0); glColor3f(0.0, 0.0, 0.0);
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
glPixelZoom(WindowScale, - WindowScale); glPixelZoom(WindowScale, - WindowScale);
} else } else {
#endif
{
glPixelZoom(1, -1); glPixelZoom(1, -1);
} }
glPixelStorei(GL_UNPACK_ROW_LENGTH, vMacScreenWidth); glPixelStorei(GL_UNPACK_ROW_LENGTH, vMacScreenWidth);
@ -2630,7 +2615,7 @@ LOCALVAR AGLContext fullscreen_ctx = NULL;
LOCALPROC MaybeFullScreen(void) LOCALPROC MaybeFullScreen(void)
{ {
if ( if (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
(NULL == fullscreen_ctx) (NULL == fullscreen_ctx)
@ -3931,7 +3916,7 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow)
if (noErr == CreateNewWindow( if (noErr == CreateNewWindow(
#if VarFullScreen #if 1
UseFullScreen ? UseFullScreen ?
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3953,7 +3938,7 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow)
*/ */
kPlainWindowClass kPlainWindowClass
#endif #endif
#if VarFullScreen #if 1
: :
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3961,13 +3946,13 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow)
#endif #endif
, ,
#if VarFullScreen #if 1
UseFullScreen ? UseFullScreen ?
#endif #endif
#if MayFullScreen #if MayFullScreen
/* kWindowStandardHandlerAttribute */ 0 /* kWindowStandardHandlerAttribute */ 0
#endif #endif
#if VarFullScreen #if 1
: :
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3979,7 +3964,7 @@ LOCALFUNC bool CreateNewWindow(Rect *Bounds, WindowPtr *theWindow)
Bounds, &ResultWin Bounds, &ResultWin
)) ))
{ {
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4054,9 +4039,7 @@ LOCALPROC CloseMainWindow(void)
enum { enum {
kMagStateNormal, kMagStateNormal,
#if EnableMagnify
kMagStateMagnifgy, kMagStateMagnifgy,
#endif
kNumMagStates kNumMagStates
}; };
@ -4082,7 +4065,7 @@ LOCALFUNC bool CreateMainWindow(void)
short NewWindowWidth = vMacScreenWidth; short NewWindowWidth = vMacScreenWidth;
bool IsOk = false; bool IsOk = false;
#if VarFullScreen #if 1
if (UseFullScreen) { if (UseFullScreen) {
_HideMenuBar(); _HideMenuBar();
} else { } else {
@ -4097,12 +4080,10 @@ LOCALFUNC bool CreateMainWindow(void)
GetGrayRgnBounds(&AllScrnBounds); GetGrayRgnBounds(&AllScrnBounds);
GetScreenBitsBounds(&MainScrnBounds); GetScreenBitsBounds(&MainScrnBounds);
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
NewWindowHeight *= WindowScale; NewWindowHeight *= WindowScale;
NewWindowWidth *= WindowScale; NewWindowWidth *= WindowScale;
} }
#endif
leftPos = MainScrnBounds.left leftPos = MainScrnBounds.left
+ ((MainScrnBounds.right - MainScrnBounds.left) + ((MainScrnBounds.right - MainScrnBounds.left)
@ -4117,19 +4098,17 @@ LOCALFUNC bool CreateMainWindow(void)
topPos = MainScrnBounds.top; topPos = MainScrnBounds.top;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
{ {
ViewHSize = MainScrnBounds.right - MainScrnBounds.left; ViewHSize = MainScrnBounds.right - MainScrnBounds.left;
ViewVSize = MainScrnBounds.bottom - MainScrnBounds.top; ViewVSize = MainScrnBounds.bottom - MainScrnBounds.top;
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
ViewHSize /= WindowScale; ViewHSize /= WindowScale;
ViewVSize /= WindowScale; ViewVSize /= WindowScale;
} }
#endif
if (ViewHSize >= vMacScreenWidth) { if (ViewHSize >= vMacScreenWidth) {
ViewHStart = 0; ViewHStart = 0;
ViewHSize = vMacScreenWidth; ViewHSize = vMacScreenWidth;
@ -4149,7 +4128,7 @@ LOCALFUNC bool CreateMainWindow(void)
SetRect(&MainScrnBounds, 0, 0, NewWindowWidth, NewWindowHeight); SetRect(&MainScrnBounds, 0, 0, NewWindowWidth, NewWindowHeight);
OffsetRect(&MainScrnBounds, leftPos, topPos); OffsetRect(&MainScrnBounds, leftPos, topPos);
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -4157,17 +4136,14 @@ LOCALFUNC bool CreateMainWindow(void)
NewWinRect = AllScrnBounds; NewWinRect = AllScrnBounds;
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
{ {
#if EnableMagnify
if (UseMagnify) { if (UseMagnify) {
WinIndx = kMagStateMagnifgy; WinIndx = kMagStateMagnifgy;
} else } else {
#endif
{
WinIndx = kMagStateNormal; WinIndx = kMagStateNormal;
} }
@ -4188,7 +4164,7 @@ LOCALFUNC bool CreateMainWindow(void)
CurWinIndx = WinIndx; CurWinIndx = WinIndx;
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -4242,7 +4218,7 @@ LOCALFUNC bool CreateMainWindow(void)
} else { } else {
ctx = window_ctx; ctx = window_ctx;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -4255,7 +4231,7 @@ LOCALFUNC bool CreateMainWindow(void)
AdjustGLforSize(h, v); AdjustGLforSize(h, v);
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4285,7 +4261,7 @@ LOCALFUNC bool CreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4350,10 +4326,10 @@ struct WState {
uint16_t f_ViewHStart; uint16_t f_ViewHStart;
uint16_t f_ViewVStart; uint16_t f_ViewVStart;
#endif #endif
#if VarFullScreen #if 1
bool f_UseFullScreen; bool f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
bool f_UseMagnify; bool f_UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4381,10 +4357,10 @@ LOCALPROC GetWState(WState *r)
r->f_ViewHStart = ViewHStart; r->f_ViewHStart = ViewHStart;
r->f_ViewVStart = ViewVStart; r->f_ViewVStart = ViewVStart;
#endif #endif
#if VarFullScreen #if 1
r->f_UseFullScreen = UseFullScreen; r->f_UseFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
r->f_UseMagnify = UseMagnify; r->f_UseMagnify = UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4411,10 +4387,10 @@ LOCALPROC SetWState(WState *r)
ViewHStart = r->f_ViewHStart; ViewHStart = r->f_ViewHStart;
ViewVStart = r->f_ViewVStart; ViewVStart = r->f_ViewVStart;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = r->f_UseFullScreen; UseFullScreen = r->f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
UseMagnify = r->f_UseMagnify; UseMagnify = r->f_UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4435,7 +4411,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
WState old_state; WState old_state;
WState new_state; WState new_state;
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4464,10 +4440,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
ZapWState(); ZapWState();
#if VarFullScreen #if 1
UseFullScreen = WantFullScreen; UseFullScreen = WantFullScreen;
#endif #endif
#if EnableMagnify #if 1
UseMagnify = WantMagnify; UseMagnify = WantMagnify;
#endif #endif
@ -4476,7 +4452,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
CloseMainWindow(); CloseMainWindow();
SetWState(&old_state); SetWState(&old_state);
#if VarFullScreen #if 1
if (UseFullScreen) { if (UseFullScreen) {
_HideMenuBar(); _HideMenuBar();
} else { } else {
@ -4485,10 +4461,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
#endif #endif
/* avoid retry */ /* avoid retry */
#if VarFullScreen #if 1
WantFullScreen = UseFullScreen; WantFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
WantMagnify = UseMagnify; WantMagnify = UseMagnify;
#endif #endif
@ -4512,17 +4488,17 @@ LOCALFUNC bool ReCreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
enum { enum {
kWinStateWindowed, kWinStateWindowed,
#if EnableMagnify #if 1
kWinStateFullScreen, kWinStateFullScreen,
#endif #endif
kNumWinStates kNumWinStates
}; };
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
LOCALVAR int WinMagStates[kNumWinStates]; LOCALVAR int WinMagStates[kNumWinStates];
#endif #endif
@ -4537,7 +4513,7 @@ LOCALPROC ZapWinStateVars(void)
} }
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
{ {
int i; int i;
@ -4548,12 +4524,12 @@ LOCALPROC ZapWinStateVars(void)
#endif #endif
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
#if EnableMagnify #if 1
{ {
int OldWinState = int OldWinState =
UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; UseFullScreen ? kWinStateFullScreen : kWinStateWindowed;
@ -4629,7 +4605,7 @@ LOCALPROC DoNotInBackgroundTasks(void)
if (HaveCursorHidden != ( if (HaveCursorHidden != (
#if MayNotFullScreen #if MayNotFullScreen
(WantCursorHidden (WantCursorHidden
#if VarFullScreen #if 1
|| UseFullScreen || UseFullScreen
#endif #endif
) && ) &&
@ -4709,7 +4685,7 @@ LOCALPROC CheckForSavedTasks(void)
} }
} }
#if VarFullScreen #if 1
if (gTrueBackgroundFlag && WantFullScreen) { if (gTrueBackgroundFlag && WantFullScreen) {
ToggleWantFullScreen(); ToggleWantFullScreen();
} }
@ -4729,10 +4705,10 @@ LOCALPROC CheckForSavedTasks(void)
#if EnableRecreateW #if EnableRecreateW
if (gWeAreActive) { if (gWeAreActive) {
if (0 if (0
#if EnableMagnify #if 1
|| (UseMagnify != WantMagnify) || (UseMagnify != WantMagnify)
#endif #endif
#if VarFullScreen #if 1
|| (UseFullScreen != WantFullScreen) || (UseFullScreen != WantFullScreen)
#endif #endif
) )
@ -4744,7 +4720,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (GrabMachine != ( if (GrabMachine != (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
gWeAreActive && ! CurSpeedStopped)) gWeAreActive && ! CurSpeedStopped))
@ -5137,7 +5113,7 @@ static void DisplayRegisterReconfigurationCallback(
WantScreensChangedCheck = true; WantScreensChangedCheck = true;
#if VarFullScreen #if 1
if (WantFullScreen) { if (WantFullScreen) {
ToggleWantFullScreen(); ToggleWantFullScreen();
} }

10
src/UI/NDS/OSGLUNDS.c
View File

@ -469,17 +469,17 @@ LOCALVAR short hOffset;
LOCALVAR short vOffset; LOCALVAR short vOffset;
#endif #endif
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify #if 1
LOCALVAR bool UseMagnify = (WantInitMagnify != 0); LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
#endif #endif
LOCALVAR bool CurSpeedStopped = true; LOCALVAR bool CurSpeedStopped = true;
#if EnableMagnify #if 1
#define MaxScale WindowScale #define MaxScale WindowScale
#else #else
#define MaxScale 1 #define MaxScale 1
@ -897,7 +897,7 @@ LOCALFUNC bool Screen_Init(void)
return true; return true;
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
@ -1072,7 +1072,7 @@ LOCALPROC DS_ScrollBackground(void)
TODO: TODO:
Lots of magic numbers here. Lots of magic numbers here.
*/ */
#if EnableMagnify #if 1
if (WantMagnify) { if (WantMagnify) {
ScrollX = ((int) CurMouseH) - (DS_ScreenWidth / 4); ScrollX = ((int) CurMouseH) - (DS_ScreenWidth / 4);
ScrollY = ((int) CurMouseV) - (DS_ScreenHeight / 4); ScrollY = ((int) CurMouseV) - (DS_ScreenHeight / 4);

112
src/UI/OLDMAC/OSGLUMAC.c
View File

@ -963,15 +963,15 @@ LOCALVAR short vOffset;
LOCALVAR bool GrabMachine = false; LOCALVAR bool GrabMachine = false;
#endif #endif
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify #if 1
LOCALVAR bool UseMagnify = (WantInitMagnify != 0); LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
#endif #endif
#if EnableMagnify #if 1
LOCALPROC ScaleRect(Rect *r) LOCALPROC ScaleRect(Rect *r)
{ {
r->left *= WindowScale; r->left *= WindowScale;
@ -989,7 +989,7 @@ LOCALPROC SetScrnRectFromCoords(Rect *r,
r->top = top; r->top = top;
r->bottom = bottom; r->bottom = bottom;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -998,13 +998,13 @@ LOCALPROC SetScrnRectFromCoords(Rect *r,
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
ScaleRect(r); ScaleRect(r);
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1015,16 +1015,16 @@ LOCALPROC SetScrnRectFromCoords(Rect *r,
} }
#if EnableMagnify #if 1
#define ScaledHeight (WindowScale * vMacScreenHeight) #define ScaledHeight (WindowScale * vMacScreenHeight)
#define ScaledWidth (WindowScale * vMacScreenWidth) #define ScaledWidth (WindowScale * vMacScreenWidth)
#endif #endif
#if EnableMagnify #if 1
LOCALVAR uint8_t * ScalingBuff = nullpr; LOCALVAR uint8_t * ScalingBuff = nullpr;
#endif #endif
#if EnableMagnify #if 1
LOCALVAR uint8_t * ScalingTabl = nullpr; LOCALVAR uint8_t * ScalingTabl = nullpr;
#define ScalingTablsz (256 * WindowScale) #define ScalingTablsz (256 * WindowScale)
@ -1041,7 +1041,7 @@ LOCALVAR uint8_t * ScalingTabl = nullpr;
#endif #endif
#if EnableMagnify #if 1
LOCALPROC SetUpScalingTabl(void) LOCALPROC SetUpScalingTabl(void)
{ {
uint8_t *p4; uint8_t *p4;
@ -1085,7 +1085,7 @@ LOCALPROC DefaultDrawScreenBuff(int16_t top, int16_t left,
src.rowBytes = vMacScreenMonoByteWidth; src.rowBytes = vMacScreenMonoByteWidth;
SetRect(&src.bounds, 0, 0, vMacScreenWidth, vMacScreenHeight); SetRect(&src.bounds, 0, 0, vMacScreenWidth, vMacScreenHeight);
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
if (! ColorTransValid) { if (! ColorTransValid) {
@ -1119,7 +1119,7 @@ LOCALPROC Update_Screen(void)
GetPort(&savePort); GetPort(&savePort);
_SetPortWindowPort(gMainWindow); _SetPortWindowPort(gMainWindow);
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1142,7 +1142,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left,
PixMapHandle pm= (**GetMainDevice()).gdPMap; PixMapHandle pm= (**GetMainDevice()).gdPMap;
/* LockPixels(pm); */ /* LockPixels(pm); */
#if EnableMagnify #if 1
if (! UseMagnify) { if (! UseMagnify) {
#define PixelT uint32_t #define PixelT uint32_t
PixelT *p1 = (PixelT *)GetPixBaseAddr(pm); PixelT *p1 = (PixelT *)GetPixBaseAddr(pm);
@ -1470,7 +1470,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
bool IsOk; bool IsOk;
long int StartTime = TickCount(); long int StartTime = TickCount();
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1480,14 +1480,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
h *= WindowScale; h *= WindowScale;
v *= WindowScale; v *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1598,7 +1598,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos)
{ {
bool ShouldHaveCursorHidden = true; bool ShouldHaveCursorHidden = true;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1607,7 +1607,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos)
NewMousePos.v -= vOffset; NewMousePos.v -= vOffset;
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -1618,14 +1618,14 @@ LOCALPROC MousePositionNotify(Point NewMousePos)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
NewMousePos.h /= WindowScale; NewMousePos.h /= WindowScale;
NewMousePos.v /= WindowScale; NewMousePos.v /= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1659,7 +1659,7 @@ LOCALPROC MousePositionNotify(Point NewMousePos)
ShouldHaveCursorHidden = false; ShouldHaveCursorHidden = false;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -4450,7 +4450,7 @@ LOCALFUNC bool PrepareForDragging(void)
} }
#endif #endif
#if EnableMagnify #if 1
#define ScaleBuffSzMult (WindowScale * WindowScale) #define ScaleBuffSzMult (WindowScale * WindowScale)
#endif #endif
@ -4497,7 +4497,7 @@ LOCALPROC CloseMainWindow(void)
enum { enum {
kMagStateNormal, kMagStateNormal,
#if EnableMagnify #if 1
kMagStateMagnifgy, kMagStateMagnifgy,
#endif #endif
kNumMagStates kNumMagStates
@ -4536,7 +4536,7 @@ LOCALFUNC bool CreateMainWindow(void)
short NewWindowWidth = vMacScreenWidth; short NewWindowWidth = vMacScreenWidth;
bool IsOk = false; bool IsOk = false;
#if VarFullScreen #if 1
if (UseFullScreen) { if (UseFullScreen) {
_HideMenuBar(); _HideMenuBar();
} else { } else {
@ -4551,7 +4551,7 @@ LOCALFUNC bool CreateMainWindow(void)
GetGrayRgnBounds(&AllScrnBounds); GetGrayRgnBounds(&AllScrnBounds);
GetScreenBitsBounds(&MainScrnBounds); GetScreenBitsBounds(&MainScrnBounds);
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
NewWindowHeight *= WindowScale; NewWindowHeight *= WindowScale;
NewWindowWidth *= WindowScale; NewWindowWidth *= WindowScale;
@ -4571,14 +4571,14 @@ LOCALFUNC bool CreateMainWindow(void)
topPos = MainScrnBounds.top; topPos = MainScrnBounds.top;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
{ {
ViewHSize = MainScrnBounds.right - MainScrnBounds.left; ViewHSize = MainScrnBounds.right - MainScrnBounds.left;
ViewVSize = MainScrnBounds.bottom - MainScrnBounds.top; ViewVSize = MainScrnBounds.bottom - MainScrnBounds.top;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
ViewHSize /= WindowScale; ViewHSize /= WindowScale;
ViewVSize /= WindowScale; ViewVSize /= WindowScale;
@ -4603,7 +4603,7 @@ LOCALFUNC bool CreateMainWindow(void)
SetRect(&MainScrnBounds, 0, 0, NewWindowWidth, NewWindowHeight); SetRect(&MainScrnBounds, 0, 0, NewWindowWidth, NewWindowHeight);
OffsetRect(&MainScrnBounds, leftPos, topPos); OffsetRect(&MainScrnBounds, leftPos, topPos);
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -4611,12 +4611,12 @@ LOCALFUNC bool CreateMainWindow(void)
NewWinRect = AllScrnBounds; NewWinRect = AllScrnBounds;
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
{ {
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
WinIndx = kMagStateMagnifgy; WinIndx = kMagStateMagnifgy;
} else } else
@ -4642,7 +4642,7 @@ LOCALFUNC bool CreateMainWindow(void)
CurWinIndx = WinIndx; CurWinIndx = WinIndx;
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -4656,7 +4656,7 @@ LOCALFUNC bool CreateMainWindow(void)
ShowWindow(gMainWindow); ShowWindow(gMainWindow);
/* check if window rect valid */ /* check if window rect valid */
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4702,10 +4702,10 @@ struct WState {
uint16_t f_ViewHStart; uint16_t f_ViewHStart;
uint16_t f_ViewVStart; uint16_t f_ViewVStart;
#endif #endif
#if VarFullScreen #if 1
bool f_UseFullScreen; bool f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
bool f_UseMagnify; bool f_UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4727,10 +4727,10 @@ LOCALPROC GetWState(WState *r)
r->f_ViewHStart = ViewHStart; r->f_ViewHStart = ViewHStart;
r->f_ViewVStart = ViewVStart; r->f_ViewVStart = ViewVStart;
#endif #endif
#if VarFullScreen #if 1
r->f_UseFullScreen = UseFullScreen; r->f_UseFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
r->f_UseMagnify = UseMagnify; r->f_UseMagnify = UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4751,10 +4751,10 @@ LOCALPROC SetWState(WState *r)
ViewHStart = r->f_ViewHStart; ViewHStart = r->f_ViewHStart;
ViewVStart = r->f_ViewVStart; ViewVStart = r->f_ViewVStart;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = r->f_UseFullScreen; UseFullScreen = r->f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
UseMagnify = r->f_UseMagnify; UseMagnify = r->f_UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4784,7 +4784,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
WState old_state; WState old_state;
WState new_state; WState new_state;
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4809,10 +4809,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
ZapWState(); ZapWState();
#if VarFullScreen #if 1
UseFullScreen = WantFullScreen; UseFullScreen = WantFullScreen;
#endif #endif
#if EnableMagnify #if 1
UseMagnify = WantMagnify; UseMagnify = WantMagnify;
#endif #endif
@ -4822,7 +4822,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
CloseMainWindow(); CloseMainWindow();
SetWState(&old_state); SetWState(&old_state);
#if VarFullScreen #if 1
if (UseFullScreen) { if (UseFullScreen) {
_HideMenuBar(); _HideMenuBar();
} else { } else {
@ -4831,10 +4831,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
#endif #endif
/* avoid retry */ /* avoid retry */
#if VarFullScreen #if 1
WantFullScreen = UseFullScreen; WantFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
WantMagnify = UseMagnify; WantMagnify = UseMagnify;
#endif #endif
@ -4854,17 +4854,17 @@ LOCALFUNC bool ReCreateMainWindow(void)
} }
} }
#if VarFullScreen && EnableMagnify #if 1 && 1
enum { enum {
kWinStateWindowed, kWinStateWindowed,
#if EnableMagnify #if 1
kWinStateFullScreen, kWinStateFullScreen,
#endif #endif
kNumWinStates kNumWinStates
}; };
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
LOCALVAR int WinMagStates[kNumWinStates]; LOCALVAR int WinMagStates[kNumWinStates];
#endif #endif
@ -4879,7 +4879,7 @@ LOCALPROC ZapWinStateVars(void)
} }
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
{ {
int i; int i;
@ -4890,12 +4890,12 @@ LOCALPROC ZapWinStateVars(void)
#endif #endif
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
#if EnableMagnify #if 1
{ {
int OldWinState = int OldWinState =
UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; UseFullScreen ? kWinStateFullScreen : kWinStateWindowed;
@ -4943,7 +4943,7 @@ LOCALPROC EnterBackground(void)
{ {
DisconnectKeyCodes3(); DisconnectKeyCodes3();
#if VarFullScreen #if 1
if (WantFullScreen) { if (WantFullScreen) {
ToggleWantFullScreen(); ToggleWantFullScreen();
} }
@ -5018,10 +5018,10 @@ LOCALPROC CheckForSavedTasks(void)
#if EnableRecreateW #if EnableRecreateW
if (! (gTrueBackgroundFlag)) { if (! (gTrueBackgroundFlag)) {
if (0 if (0
#if EnableMagnify #if 1
|| (UseMagnify != WantMagnify) || (UseMagnify != WantMagnify)
#endif #endif
#if VarFullScreen #if 1
|| (UseFullScreen != WantFullScreen) || (UseFullScreen != WantFullScreen)
#endif #endif
) )
@ -5036,7 +5036,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (GrabMachine != ( if (GrabMachine != (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
! (gTrueBackgroundFlag || CurSpeedStopped))) ! (gTrueBackgroundFlag || CurSpeedStopped)))
@ -5378,7 +5378,7 @@ LOCALPROC CheckForSystemEvents(void)
only hog cpu in full screen mode only hog cpu in full screen mode
*/ */
if ( if (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
((uint8_t) -1 == SpeedValue) && ! CurSpeedStopped) ((uint8_t) -1 == SpeedValue) && ! CurSpeedStopped)
@ -5622,7 +5622,7 @@ LOCALPROC ReserveAllocAll(void)
ReserveAllocOneBlock(&CntrlDisplayBuff, ReserveAllocOneBlock(&CntrlDisplayBuff,
vMacScreenNumBytes, 5, false); vMacScreenNumBytes, 5, false);
#endif #endif
#if EnableMagnify #if 1
ReserveAllocOneBlock(&ScalingBuff, ReserveAllocOneBlock(&ScalingBuff,
vMacScreenNumBytes * (ScaleBuffSzMult), 5, false); vMacScreenNumBytes * (ScaleBuffSzMult), 5, false);
ReserveAllocOneBlock(&ScalingTabl, ReserveAllocOneBlock(&ScalingTabl,

130
src/UI/UNIX/OSGLUXWN.c
View File

@ -1049,11 +1049,11 @@ LOCALVAR short hOffset;
LOCALVAR short vOffset; LOCALVAR short vOffset;
#endif #endif
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify #if 1
LOCALVAR bool UseMagnify = (WantInitMagnify != 0); LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
#endif #endif
@ -1067,17 +1067,17 @@ LOCALVAR bool CurSpeedStopped = true;
LOCALVAR XImage *image = NULL; LOCALVAR XImage *image = NULL;
#if EnableMagnify #if 1
LOCALVAR XImage *Scaled_image = NULL; LOCALVAR XImage *Scaled_image = NULL;
#endif #endif
#if EnableMagnify #if 1
#define MaxScale WindowScale #define MaxScale WindowScale
#else #else
#define MaxScale 1 #define MaxScale 1
#endif #endif
#define WantScalingTabl (EnableMagnify || UseColorImage) #define WantScalingTabl (1 || UseColorImage)
#if WantScalingTabl #if WantScalingTabl
@ -1094,7 +1094,7 @@ LOCALVAR uint8_t * ScalingTabl = nullpr;
#endif /* WantScalingTabl */ #endif /* WantScalingTabl */
#define WantScalingBuff (EnableMagnify || UseColorImage) #define WantScalingBuff (1 || UseColorImage)
#if WantScalingBuff #if WantScalingBuff
@ -1112,7 +1112,7 @@ LOCALVAR uint8_t * ScalingBuff = nullpr;
#endif /* WantScalingBuff */ #endif /* WantScalingBuff */
#if EnableMagnify && ! UseColorImage #if 1 && ! UseColorImage
LOCALPROC SetUpScalingTabl(void) LOCALPROC SetUpScalingTabl(void)
{ {
uint8_t *p4; uint8_t *p4;
@ -1142,7 +1142,7 @@ LOCALPROC SetUpScalingTabl(void)
} }
#endif #endif
//#if EnableMagnify && (0 != vMacScreenDepth) && (vMacScreenDepth < 4) //#if 1 && (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
LOCALPROC SetUpColorScalingTabl(void) LOCALPROC SetUpColorScalingTabl(void)
{ {
int i; int i;
@ -1185,7 +1185,7 @@ LOCALPROC SetUpColorTabl(void)
} }
} }
//#if EnableMagnify && UseColorImage //#if 1 && UseColorImage
LOCALPROC SetUpBW2ColorScalingTabl(void) LOCALPROC SetUpBW2ColorScalingTabl(void)
{ {
int i; int i;
@ -1232,7 +1232,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
} }
#if EnableMagnify && ! UseColorImage #if 1 && ! UseColorImage
#define ScrnMapr_DoMap UpdateScaledBWCopy #define ScrnMapr_DoMap UpdateScaledBWCopy
#define ScrnMapr_Src GetCurDrawBuff() #define ScrnMapr_Src GetCurDrawBuff()
@ -1261,7 +1261,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
#endif #endif
#if EnableMagnify && (0 != vMacScreenDepth) && (vMacScreenDepth < 4) #if 1 && (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
#define ScrnMapr_DoMap UpdateMappedScaledColorCopy #define ScrnMapr_DoMap UpdateMappedScaledColorCopy
#define ScrnMapr_Src GetCurDrawBuff() #define ScrnMapr_Src GetCurDrawBuff()
@ -1288,7 +1288,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
#endif #endif
#if EnableMagnify && (vMacScreenDepth >= 4) #if 1 && (vMacScreenDepth >= 4)
#define ScrnTrns_DoTrans UpdateTransScaledColorCopy #define ScrnTrns_DoTrans UpdateTransScaledColorCopy
#define ScrnTrns_Src GetCurDrawBuff() #define ScrnTrns_Src GetCurDrawBuff()
@ -1302,7 +1302,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
#endif #endif
#if EnableMagnify && UseColorImage #if 1 && UseColorImage
#define ScrnMapr_DoMap UpdateMappedScaledBW2ColorCopy #define ScrnMapr_DoMap UpdateMappedScaledBW2ColorCopy
#define ScrnMapr_Src GetCurDrawBuff() #define ScrnMapr_Src GetCurDrawBuff()
@ -1338,7 +1338,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
int YDest; int YDest;
char *the_data; char *the_data;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1365,7 +1365,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
XDest = left; XDest = left;
YDest = top; YDest = top;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1375,14 +1375,14 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
XDest *= WindowScale; XDest *= WindowScale;
YDest *= WindowScale; YDest *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1392,7 +1392,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
#if UseColorImage #if UseColorImage
#if 0 != vMacScreenDepth #if 0 != vMacScreenDepth
@ -1442,7 +1442,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
Scaled_image->data = saveData; Scaled_image->data = saveData;
} }
} else } else
#endif /* EnableMagnify */ #endif /* 1 */
{ {
#if UseColorImage #if UseColorImage
#if 0 != vMacScreenDepth #if 0 != vMacScreenDepth
@ -1589,7 +1589,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
bool IsOk; bool IsOk;
int attempts = 0; int attempts = 0;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1599,14 +1599,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
h *= WindowScale; h *= WindowScale;
v *= WindowScale; v *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1691,7 +1691,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
{ {
bool ShouldHaveCursorHidden = true; bool ShouldHaveCursorHidden = true;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1701,14 +1701,14 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
NewMousePosh /= WindowScale; NewMousePosh /= WindowScale;
NewMousePosv /= WindowScale; NewMousePosv /= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1742,7 +1742,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
ShouldHaveCursorHidden = false; ShouldHaveCursorHidden = false;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3015,7 +3015,7 @@ LOCALPROC HandleTheEvent(XEvent *theEvent)
dbglog_writeln("- event - Expose"); dbglog_writeln("- event - Expose");
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3027,7 +3027,7 @@ LOCALPROC HandleTheEvent(XEvent *theEvent)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
x0 /= WindowScale; x0 /= WindowScale;
y0 /= WindowScale; y0 /= WindowScale;
@ -3036,7 +3036,7 @@ LOCALPROC HandleTheEvent(XEvent *theEvent)
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3335,7 +3335,7 @@ LOCALFUNC bool Screen_Init(void)
#endif /* UseColorImage */ #endif /* UseColorImage */
#if EnableMagnify && (! UseColorImage) #if 1 && (! UseColorImage)
Scaled_image = XCreateImage(x_display, Xvisual, Scaled_image = XCreateImage(x_display, Xvisual,
1, XYBitmap, 0, 1, XYBitmap, 0,
NULL /* (char *)image_Mem1 */, NULL /* (char *)image_Mem1 */,
@ -3351,7 +3351,7 @@ LOCALFUNC bool Screen_Init(void)
Scaled_image->byte_order = MSBFirst; Scaled_image->byte_order = MSBFirst;
#endif #endif
#if EnableMagnify && UseColorImage #if 1 && UseColorImage
Scaled_image = XCreateImage(x_display, Xvisual, Scaled_image = XCreateImage(x_display, Xvisual,
24, ZPixmap, 0, 24, ZPixmap, 0,
NULL /* (char *)image_Mem1 */, NULL /* (char *)image_Mem1 */,
@ -3387,7 +3387,7 @@ LOCALPROC CloseMainWindow(void)
enum { enum {
kMagStateNormal, kMagStateNormal,
#if EnableMagnify #if 1
kMagStateMagnifgy, kMagStateMagnifgy,
#endif #endif
kNumMagStates kNumMagStates
@ -3440,7 +3440,7 @@ LOCALFUNC bool CreateMainWindow(void)
XGetGeometry(x_display, rootwin, XGetGeometry(x_display, rootwin,
&rr, &xr, &yr, &wr, &hr, &bwr, &dr); &rr, &xr, &yr, &wr, &hr, &bwr, &dr);
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
NewWindowHeight *= WindowScale; NewWindowHeight *= WindowScale;
NewWindowWidth *= WindowScale; NewWindowWidth *= WindowScale;
@ -3458,14 +3458,14 @@ LOCALFUNC bool CreateMainWindow(void)
topPos = 0; topPos = 0;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
{ {
ViewHSize = wr; ViewHSize = wr;
ViewVSize = hr; ViewVSize = hr;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
ViewHSize /= WindowScale; ViewHSize /= WindowScale;
ViewVSize /= WindowScale; ViewVSize /= WindowScale;
@ -3486,12 +3486,12 @@ LOCALFUNC bool CreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
{ {
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
WinIndx = kMagStateMagnifgy; WinIndx = kMagStateMagnifgy;
} else } else
@ -3511,7 +3511,7 @@ LOCALFUNC bool CreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3531,7 +3531,7 @@ LOCALFUNC bool CreateMainWindow(void)
&xattr /* attributes */); &xattr /* attributes */);
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3607,7 +3607,7 @@ LOCALFUNC bool CreateMainWindow(void)
XSetState(x_display, gc, x_black.pixel, x_white.pixel, XSetState(x_display, gc, x_black.pixel, x_white.pixel,
GXcopy, AllPlanes); GXcopy, AllPlanes);
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3637,7 +3637,7 @@ LOCALFUNC bool CreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3729,10 +3729,10 @@ struct WState {
uint16_t f_ViewHStart; uint16_t f_ViewHStart;
uint16_t f_ViewVStart; uint16_t f_ViewVStart;
#endif #endif
#if VarFullScreen #if 1
bool f_UseFullScreen; bool f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
bool f_UseMagnify; bool f_UseMagnify;
#endif #endif
}; };
@ -3752,10 +3752,10 @@ LOCALPROC GetWState(WState *r)
r->f_ViewHStart = ViewHStart; r->f_ViewHStart = ViewHStart;
r->f_ViewVStart = ViewVStart; r->f_ViewVStart = ViewVStart;
#endif #endif
#if VarFullScreen #if 1
r->f_UseFullScreen = UseFullScreen; r->f_UseFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
r->f_UseMagnify = UseMagnify; r->f_UseMagnify = UseMagnify;
#endif #endif
} }
@ -3774,10 +3774,10 @@ LOCALPROC SetWState(WState *r)
ViewHStart = r->f_ViewHStart; ViewHStart = r->f_ViewHStart;
ViewVStart = r->f_ViewVStart; ViewVStart = r->f_ViewVStart;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = r->f_UseFullScreen; UseFullScreen = r->f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
UseMagnify = r->f_UseMagnify; UseMagnify = r->f_UseMagnify;
#endif #endif
} }
@ -3807,7 +3807,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
ForceShowCursor(); /* hide/show cursor api is per window */ ForceShowCursor(); /* hide/show cursor api is per window */
#if MayNotFullScreen #if MayNotFullScreen
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
if (main_wind) if (main_wind)
@ -3865,10 +3865,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
GetWState(&old_state); GetWState(&old_state);
ZapWState(); ZapWState();
#if EnableMagnify #if 1
UseMagnify = WantMagnify; UseMagnify = WantMagnify;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = WantFullScreen; UseFullScreen = WantFullScreen;
#endif #endif
@ -3879,10 +3879,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
SetWState(&old_state); SetWState(&old_state);
/* avoid retry */ /* avoid retry */
#if VarFullScreen #if 1
WantFullScreen = UseFullScreen; WantFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
WantMagnify = UseMagnify; WantMagnify = UseMagnify;
#endif #endif
@ -3917,17 +3917,17 @@ LOCALFUNC bool ReCreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
enum { enum {
kWinStateWindowed, kWinStateWindowed,
#if EnableMagnify #if 1
kWinStateFullScreen, kWinStateFullScreen,
#endif #endif
kNumWinStates kNumWinStates
}; };
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
LOCALVAR int WinMagStates[kNumWinStates]; LOCALVAR int WinMagStates[kNumWinStates];
#endif #endif
@ -3942,7 +3942,7 @@ LOCALPROC ZapWinStateVars(void)
} }
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
{ {
int i; int i;
@ -3953,12 +3953,12 @@ LOCALPROC ZapWinStateVars(void)
#endif #endif
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
#if EnableMagnify #if 1
{ {
int OldWinState = int OldWinState =
UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; UseFullScreen ? kWinStateFullScreen : kWinStateWindowed;
@ -4044,7 +4044,7 @@ LOCALPROC CheckForSavedTasks(void)
if (NeedFinishOpen2 && ! NeedFinishOpen1) { if (NeedFinishOpen2 && ! NeedFinishOpen1) {
NeedFinishOpen2 = false; NeedFinishOpen2 = false;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -4053,7 +4053,7 @@ LOCALPROC CheckForSavedTasks(void)
RevertToPointerRoot, CurrentTime); RevertToPointerRoot, CurrentTime);
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -4141,7 +4141,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (gTrueBackgroundFlag if (gTrueBackgroundFlag
#if VarFullScreen #if 1
&& WantFullScreen && WantFullScreen
#endif #endif
) )
@ -4164,10 +4164,10 @@ LOCALPROC CheckForSavedTasks(void)
#if EnableRecreateW #if EnableRecreateW
if (0 if (0
#if EnableMagnify #if 1
|| (UseMagnify != WantMagnify) || (UseMagnify != WantMagnify)
#endif #endif
#if VarFullScreen #if 1
|| (UseFullScreen != WantFullScreen) || (UseFullScreen != WantFullScreen)
#endif #endif
) )
@ -4179,7 +4179,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (GrabMachine != ( if (GrabMachine != (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
! (gTrueBackgroundFlag || CurSpeedStopped))) ! (gTrueBackgroundFlag || CurSpeedStopped)))
@ -4715,7 +4715,7 @@ LOCALPROC UnInitOSGLU(void)
if (image != NULL) { if (image != NULL) {
XDestroyImage(image); XDestroyImage(image);
} }
#if EnableMagnify #if 1
if (Scaled_image != NULL) { if (Scaled_image != NULL) {
XDestroyImage(Scaled_image); XDestroyImage(Scaled_image);
} }

84
src/UI/WIN32/OSGLUWIN.c
View File

@ -387,11 +387,11 @@ LOCALVAR short oldOrientation;
LOCALVAR unsigned long oldDisplayOrientation; LOCALVAR unsigned long oldDisplayOrientation;
#endif #endif
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify #if 1
LOCALVAR bool UseMagnify = (WantInitMagnify != 0); LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
#endif #endif
@ -425,7 +425,7 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
LONG x = h; LONG x = h;
LONG y = v; LONG y = v;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -435,14 +435,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
x *= WindowScale; x *= WindowScale;
y *= WindowScale; y *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -2842,7 +2842,7 @@ LOCALPROC DisposeMainWindow(void)
enum { enum {
kMagStateNormal, kMagStateNormal,
#if EnableMagnify #if 1
kMagStateMagnifgy, kMagStateMagnifgy,
#endif #endif
kNumMagStates kNumMagStates
@ -2921,7 +2921,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
DWORD WStyle; DWORD WStyle;
DWORD WExStyle; DWORD WExStyle;
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -2935,7 +2935,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
#if EnableMagnify #if 1
if (WantMagnify) { if (WantMagnify) {
WinIndx = kMagStateMagnifgy; WinIndx = kMagStateMagnifgy;
} else } else
@ -2945,14 +2945,14 @@ LOCALFUNC bool ReCreateMainWindow(void)
} }
#endif #endif
#if EnableMagnify #if 1
if (WantMagnify) { if (WantMagnify) {
NewWindowHeight *= WindowScale; NewWindowHeight *= WindowScale;
NewWindowWidth *= WindowScale; NewWindowWidth *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (WantFullScreen) if (WantFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -2975,7 +2975,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
NewWinR.bottom = ScreenY; NewWinR.bottom = ScreenY;
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3024,13 +3024,13 @@ LOCALFUNC bool ReCreateMainWindow(void)
#endif #endif
if ((OldMainWindow == NULL) if ((OldMainWindow == NULL)
#if VarFullScreen #if 1
|| (WantFullScreen != UseFullScreen) || (WantFullScreen != UseFullScreen)
#endif #endif
) )
{ {
#if VarFullScreen #if 1
if (WantFullScreen) if (WantFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3038,7 +3038,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
mb = NULL; mb = NULL;
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3140,21 +3140,21 @@ LOCALFUNC bool ReCreateMainWindow(void)
MainWnd = NewMainWindow; MainWnd = NewMainWindow;
MainWndDC = NewMainWndDC; MainWndDC = NewMainWndDC;
gTrueBackgroundFlag = false; gTrueBackgroundFlag = false;
#if VarFullScreen #if 1
UseFullScreen = WantFullScreen; UseFullScreen = WantFullScreen;
#endif #endif
#if EnableMagnify #if 1
UseMagnify = WantMagnify; UseMagnify = WantMagnify;
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
{ {
ViewHSize = ScreenX; ViewHSize = ScreenX;
ViewVSize = ScreenY; ViewVSize = ScreenY;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
ViewHSize /= WindowScale; ViewHSize /= WindowScale;
ViewVSize /= WindowScale; ViewVSize /= WindowScale;
@ -3291,7 +3291,7 @@ typedef struct BITMAPINFOHEADER256 {
//RGBQUAD colors[2]; //RGBQUAD colors[2];
} BITMAPINFOHEADER256; } BITMAPINFOHEADER256;
#if EnableMagnify #if 1
#define ScaledHeight (WindowScale * vMacScreenHeight) #define ScaledHeight (WindowScale * vMacScreenHeight)
#define ScaledWidth (WindowScale * vMacScreenWidth) #define ScaledWidth (WindowScale * vMacScreenWidth)
#endif #endif
@ -3304,7 +3304,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left,
int XDest; int XDest;
int YDest; int YDest;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3331,7 +3331,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left,
XDest = left; XDest = left;
YDest = top; YDest = top;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3341,13 +3341,13 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left,
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
XDest *= WindowScale; XDest *= WindowScale;
YDest *= WindowScale; YDest *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3451,7 +3451,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left,
} }
} }
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
nDestWidth *= WindowScale; nDestWidth *= WindowScale;
nDestHeight *= WindowScale; nDestHeight *= WindowScale;
@ -3505,7 +3505,7 @@ LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left,
bmh.colors[1].rgbReserved = 0; bmh.colors[1].rgbReserved = 0;
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
#if EnableScalingBuff #if EnableScalingBuff
if (ScalingBuff != NULL) { if (ScalingBuff != NULL) {
@ -3760,7 +3760,7 @@ LOCALPROC MousePositionNotify(LONG NewMousePosx, LONG NewMousePosy)
{ {
bool ShouldHaveCursorHidden = true; bool ShouldHaveCursorHidden = true;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3770,14 +3770,14 @@ LOCALPROC MousePositionNotify(LONG NewMousePosx, LONG NewMousePosy)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
NewMousePosx /= WindowScale; NewMousePosx /= WindowScale;
NewMousePosy /= WindowScale; NewMousePosy /= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3811,7 +3811,7 @@ LOCALPROC MousePositionNotify(LONG NewMousePosx, LONG NewMousePosy)
ShouldHaveCursorHidden = false; ShouldHaveCursorHidden = false;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -5144,13 +5144,13 @@ LOCALFUNC bool ScanCommandLine(void)
LOCALPROC CheckMagnifyAndFullScreen(void) LOCALPROC CheckMagnifyAndFullScreen(void)
{ {
if ( if (
#if EnableMagnify #if 1
(UseMagnify != WantMagnify) (UseMagnify != WantMagnify)
#endif #endif
#if EnableMagnify && VarFullScreen #if 1 && 1
|| ||
#endif #endif
#if VarFullScreen #if 1
(UseFullScreen != WantFullScreen) (UseFullScreen != WantFullScreen)
#endif #endif
) )
@ -5160,17 +5160,17 @@ LOCALPROC CheckMagnifyAndFullScreen(void)
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
enum { enum {
kWinStateWindowed, kWinStateWindowed,
#if EnableMagnify #if 1
kWinStateFullScreen, kWinStateFullScreen,
#endif #endif
kNumWinStates kNumWinStates
}; };
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
LOCALVAR int WinMagStates[kNumWinStates]; LOCALVAR int WinMagStates[kNumWinStates];
#endif #endif
@ -5185,7 +5185,7 @@ LOCALPROC ZapWinStateVars(void)
} }
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
{ {
int i; int i;
@ -5196,12 +5196,12 @@ LOCALPROC ZapWinStateVars(void)
#endif #endif
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
#if EnableMagnify #if 1
{ {
int OldWinState = int OldWinState =
UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; UseFullScreen ? kWinStateFullScreen : kWinStateWindowed;
@ -5279,7 +5279,7 @@ LOCALPROC EnterBackground(void)
{ {
DisconnectKeyCodes3(); DisconnectKeyCodes3();
#if VarFullScreen #if 1
if (WantFullScreen) { if (WantFullScreen) {
ToggleWantFullScreen(); ToggleWantFullScreen();
} }
@ -5368,7 +5368,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (GrabMachine != ( if (GrabMachine != (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
! (gTrueBackgroundFlag || CurSpeedStopped))) ! (gTrueBackgroundFlag || CurSpeedStopped)))
@ -5458,7 +5458,7 @@ LRESULT CALLBACK Win32WMProc(HWND hwnd,
PAINTSTRUCT ps; PAINTSTRUCT ps;
BeginPaint(hwnd, (LPPAINTSTRUCT)&ps); BeginPaint(hwnd, (LPPAINTSTRUCT)&ps);
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -5907,7 +5907,7 @@ LOCALPROC ReserveAllocAll(void)
#if EnableScalingBuff #if EnableScalingBuff
{ {
uint32_t n = vMacScreenMonoNumBytes uint32_t n = vMacScreenMonoNumBytes
#if EnableMagnify #if 1
* WindowScale * WindowScale * WindowScale * WindowScale
#endif #endif
; ;

110
src/UI/XPLAT/OSGLUSD2.c
View File

@ -544,11 +544,11 @@ LOCALVAR int hOffset;
LOCALVAR int vOffset; LOCALVAR int vOffset;
#endif #endif
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify #if 1
LOCALVAR bool UseMagnify = (WantInitMagnify != 0); LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
#endif #endif
@ -560,7 +560,7 @@ LOCALVAR bool gBackgroundFlag = false;
LOCALVAR bool gTrueBackgroundFlag = false; LOCALVAR bool gTrueBackgroundFlag = false;
LOCALVAR bool CurSpeedStopped = true; LOCALVAR bool CurSpeedStopped = true;
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
#define MaxScale WindowScale #define MaxScale WindowScale
#else #else
#define MaxScale 1 #define MaxScale 1
@ -581,7 +581,7 @@ LOCALVAR uint8_t * CLUT_final;
256 possible values of one byte 256 possible values of one byte
8 pixels per byte maximum (when black and white) 8 pixels per byte maximum (when black and white)
4 bytes per destination pixel maximum 4 bytes per destination pixel maximum
multiplied by WindowScale if EnableMagnify multiplied by WindowScale if 1
*/ */
#define ScrnMapr_DoMap UpdateBWDepth3Copy #define ScrnMapr_DoMap UpdateBWDepth3Copy
@ -611,7 +611,7 @@ LOCALVAR uint8_t * CLUT_final;
#include "HW/SCREEN/SCRNMAPR.h" #include "HW/SCREEN/SCRNMAPR.h"
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
#define ScrnMapr_DoMap UpdateBWDepth3ScaledCopy #define ScrnMapr_DoMap UpdateBWDepth3ScaledCopy
#define ScrnMapr_Src GetCurDrawBuff() #define ScrnMapr_Src GetCurDrawBuff()
@ -643,7 +643,7 @@ LOCALVAR uint8_t * CLUT_final;
#include "HW/SCREEN/SCRNMAPR.h" #include "HW/SCREEN/SCRNMAPR.h"
#endif /* EnableMagnify && ! UseSDLscaling */ #endif /* 1 && ! UseSDLscaling */
#if (0 != vMacScreenDepth) && (vMacScreenDepth < 4) #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
@ -675,7 +675,7 @@ LOCALVAR uint8_t * CLUT_final;
#include "HW/SCREEN/SCRNMAPR.h" #include "HW/SCREEN/SCRNMAPR.h"
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
#define ScrnMapr_DoMap UpdateColorDepth3ScaledCopy #define ScrnMapr_DoMap UpdateColorDepth3ScaledCopy
#define ScrnMapr_Src GetCurDrawBuff() #define ScrnMapr_Src GetCurDrawBuff()
@ -707,7 +707,7 @@ LOCALVAR uint8_t * CLUT_final;
#include "HW/SCREEN/SCRNMAPR.h" #include "HW/SCREEN/SCRNMAPR.h"
#endif /* EnableMagnify && ! UseSDLscaling */ #endif /* 1 && ! UseSDLscaling */
#endif #endif
@ -736,7 +736,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
int DestWidth; int DestWidth;
int DestHeight; int DestHeight;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -765,7 +765,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
DestWidth = (right - left); DestWidth = (right - left);
DestHeight = (bottom - top); DestHeight = (bottom - top);
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -775,7 +775,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
XDest *= WindowScale; XDest *= WindowScale;
YDest *= WindowScale; YDest *= WindowScale;
@ -784,7 +784,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -799,7 +799,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
bottom2 = bottom; bottom2 = bottom;
right2 = right; right2 = right;
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
if (UseMagnify) { if (UseMagnify) {
top2 *= WindowScale; top2 *= WindowScale;
left2 *= WindowScale; left2 *= WindowScale;
@ -817,7 +817,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
int bpp = format->BytesPerPixel; int bpp = format->BytesPerPixel;
uint32_t ExpectedPitch = vMacScreenWidth * bpp; uint32_t ExpectedPitch = vMacScreenWidth * bpp;
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
if (UseMagnify) { if (UseMagnify) {
ExpectedPitch *= WindowScale; ExpectedPitch *= WindowScale;
} }
@ -851,7 +851,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
{ {
int k; int k;
Uint32 v; Uint32 v;
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
int a; int a;
#endif #endif
int PixPerByte = int PixPerByte =
@ -880,7 +880,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
v = BWLUT_pixel[(i >> k) & 1]; v = BWLUT_pixel[(i >> k) & 1];
} }
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
for (a = UseMagnify ? WindowScale : 1; --a >= 0; ) for (a = UseMagnify ? WindowScale : 1; --a >= 0; )
#endif #endif
{ {
@ -905,7 +905,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
#if (0 != vMacScreenDepth) && (vMacScreenDepth < 4) #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
if (UseColorMode) { if (UseColorMode) {
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
if (UseMagnify) { if (UseMagnify) {
switch (bpp) { switch (bpp) {
case 1: case 1:
@ -939,7 +939,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} else } else
#endif #endif
{ {
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
if (UseMagnify) { if (UseMagnify) {
switch (bpp) { switch (bpp) {
case 1: case 1:
@ -984,7 +984,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
Uint8 *bufp = (Uint8 *)pixels Uint8 *bufp = (Uint8 *)pixels
+ i * pitch + j * bpp; + i * pitch + j * bpp;
#if EnableMagnify && ! UseSDLscaling #if 1 && ! UseSDLscaling
if (UseMagnify) { if (UseMagnify) {
i0 /= WindowScale; i0 /= WindowScale;
j0 /= WindowScale; j0 /= WindowScale;
@ -1123,7 +1123,7 @@ LOCALPROC ForceShowCursor(void)
#if EnableMoveMouse && HaveWorkingWarp #if EnableMoveMouse && HaveWorkingWarp
LOCALFUNC bool MoveMouse(int16_t h, int16_t v) LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
{ {
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1133,14 +1133,14 @@ LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
h *= WindowScale; h *= WindowScale;
v *= WindowScale; v *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1162,7 +1162,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
{ {
bool ShouldHaveCursorHidden = true; bool ShouldHaveCursorHidden = true;
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1172,14 +1172,14 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
} }
#endif #endif
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
NewMousePosh /= WindowScale; NewMousePosh /= WindowScale;
NewMousePosv /= WindowScale; NewMousePosv /= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1213,7 +1213,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
ShouldHaveCursorHidden = false; ShouldHaveCursorHidden = false;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1238,7 +1238,7 @@ LOCALPROC MousePositionNotifyRelative(int deltah, int deltav)
{ {
bool ShouldHaveCursorHidden = true; bool ShouldHaveCursorHidden = true;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
/* /*
This is not really right. If only move one pixel This is not really right. If only move one pixel
@ -3329,7 +3329,7 @@ LOCALPROC MouseConstrain(void)
enum { enum {
kMagStateNormal, kMagStateNormal,
#if EnableMagnify #if 1
kMagStateMagnifgy, kMagStateMagnifgy,
#endif #endif
kNumMagStates kNumMagStates
@ -3353,14 +3353,14 @@ LOCALFUNC bool CreateMainWindow(void)
Uint32 flags = 0 /* SDL_WINDOW_HIDDEN */; Uint32 flags = 0 /* SDL_WINDOW_HIDDEN */;
bool v = false; bool v = false;
#if EnableMagnify && 1 #if 1 && 1
if (UseMagnify) { if (UseMagnify) {
NewWindowHeight *= WindowScale; NewWindowHeight *= WindowScale;
NewWindowWidth *= WindowScale; NewWindowWidth *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3375,14 +3375,14 @@ LOCALFUNC bool CreateMainWindow(void)
NewWindowY = SDL_WINDOWPOS_UNDEFINED; NewWindowY = SDL_WINDOWPOS_UNDEFINED;
} }
#endif #endif
#if VarFullScreen #if 1
else else
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
{ {
int WinIndx; int WinIndx;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
WinIndx = kMagStateMagnifgy; WinIndx = kMagStateMagnifgy;
} else } else
@ -3465,7 +3465,7 @@ LOCALFUNC bool CreateMainWindow(void)
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -3477,7 +3477,7 @@ LOCALFUNC bool CreateMainWindow(void)
ViewHSize = wr; ViewHSize = wr;
ViewVSize = hr; ViewVSize = hr;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
ViewHSize /= WindowScale; ViewHSize /= WindowScale;
ViewVSize /= WindowScale; ViewVSize /= WindowScale;
@ -3562,10 +3562,10 @@ struct WState {
int f_hOffset; int f_hOffset;
int f_vOffset; int f_vOffset;
#endif #endif
#if VarFullScreen #if 1
bool f_UseFullScreen; bool f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
bool f_UseMagnify; bool f_UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3590,10 +3590,10 @@ LOCALPROC GetWState(WState *r)
r->f_hOffset = hOffset; r->f_hOffset = hOffset;
r->f_vOffset = vOffset; r->f_vOffset = vOffset;
#endif #endif
#if VarFullScreen #if 1
r->f_UseFullScreen = UseFullScreen; r->f_UseFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
r->f_UseMagnify = UseMagnify; r->f_UseMagnify = UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3617,10 +3617,10 @@ LOCALPROC SetWState(WState *r)
hOffset = r->f_hOffset; hOffset = r->f_hOffset;
vOffset = r->f_vOffset; vOffset = r->f_vOffset;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = r->f_UseFullScreen; UseFullScreen = r->f_UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
UseMagnify = r->f_UseMagnify; UseMagnify = r->f_UseMagnify;
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3633,17 +3633,17 @@ LOCALPROC SetWState(WState *r)
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
enum { enum {
kWinStateWindowed, kWinStateWindowed,
#if EnableMagnify #if 1
kWinStateFullScreen, kWinStateFullScreen,
#endif #endif
kNumWinStates kNumWinStates
}; };
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
LOCALVAR int WinMagStates[kNumWinStates]; LOCALVAR int WinMagStates[kNumWinStates];
#endif #endif
@ -3655,7 +3655,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
#if HaveWorkingWarp #if HaveWorkingWarp
bool HadCursorHidden = HaveCursorHidden; bool HadCursorHidden = HaveCursorHidden;
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
int OldWinState = int OldWinState =
UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; UseFullScreen ? kWinStateFullScreen : kWinStateWindowed;
int OldMagState = int OldMagState =
@ -3665,7 +3665,7 @@ LOCALFUNC bool ReCreateMainWindow(void)
OldMagState; OldMagState;
#endif #endif
#if VarFullScreen #if 1
if (! UseFullScreen) if (! UseFullScreen)
#endif #endif
#if MayNotFullScreen #if MayNotFullScreen
@ -3690,10 +3690,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
ZapWState(); ZapWState();
#if EnableMagnify #if 1
UseMagnify = WantMagnify; UseMagnify = WantMagnify;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = WantFullScreen; UseFullScreen = WantFullScreen;
#endif #endif
@ -3702,10 +3702,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
SetWState(&old_state); SetWState(&old_state);
/* avoid retry */ /* avoid retry */
#if VarFullScreen #if 1
WantFullScreen = UseFullScreen; WantFullScreen = UseFullScreen;
#endif #endif
#if EnableMagnify #if 1
WantMagnify = UseMagnify; WantMagnify = UseMagnify;
#endif #endif
@ -3737,7 +3737,7 @@ LOCALPROC ZapWinStateVars(void)
} }
} }
#endif #endif
#if VarFullScreen && EnableMagnify #if 1 && 1
{ {
int i; int i;
@ -3748,12 +3748,12 @@ LOCALPROC ZapWinStateVars(void)
#endif #endif
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
#if EnableMagnify #if 1
{ {
int OldWinState = int OldWinState =
UseFullScreen ? kWinStateFullScreen : kWinStateWindowed; UseFullScreen ? kWinStateFullScreen : kWinStateWindowed;
@ -3873,10 +3873,10 @@ LOCALPROC CheckForSavedTasks(void)
#if EnableRecreateW #if EnableRecreateW
if (0 if (0
#if EnableMagnify #if 1
|| (UseMagnify != WantMagnify) || (UseMagnify != WantMagnify)
#endif #endif
#if VarFullScreen #if 1
|| (UseFullScreen != WantFullScreen) || (UseFullScreen != WantFullScreen)
#endif #endif
) )
@ -3887,7 +3887,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (GrabMachine != ( if (GrabMachine != (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
! (gTrueBackgroundFlag || CurSpeedStopped))) ! (gTrueBackgroundFlag || CurSpeedStopped)))

44
src/UI/XPLAT/OSGLUSDL.c
View File

@ -348,11 +348,11 @@ LOCALFUNC bool LoadMacRom(void)
/* --- video out --- */ /* --- video out --- */
#if VarFullScreen #if 1
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0); LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
#endif #endif
#if EnableMagnify #if 1
LOCALVAR bool UseMagnify = (WantInitMagnify != 0); LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
#endif #endif
@ -360,7 +360,7 @@ LOCALVAR bool gBackgroundFlag = false;
LOCALVAR bool gTrueBackgroundFlag = false; LOCALVAR bool gTrueBackgroundFlag = false;
LOCALVAR bool CurSpeedStopped = true; LOCALVAR bool CurSpeedStopped = true;
#if EnableMagnify #if 1
#define MaxScale WindowScale #define MaxScale WindowScale
#else #else
#define MaxScale 1 #define MaxScale 1
@ -378,7 +378,7 @@ LOCALVAR uint8_t * CLUT_final;
256 possible values of one byte 256 possible values of one byte
8 pixels per byte maximum (when black and white) 8 pixels per byte maximum (when black and white)
4 bytes per destination pixel maximum 4 bytes per destination pixel maximum
multiplied by WindowScale if EnableMagnify multiplied by WindowScale if 1
*/ */
#define ScrnMapr_DoMap UpdateBWDepth3Copy #define ScrnMapr_DoMap UpdateBWDepth3Copy
@ -517,7 +517,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
uint32_t bottom2 = bottom; uint32_t bottom2 = bottom;
uint32_t right2 = right; uint32_t right2 = right;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
top2 *= WindowScale; top2 *= WindowScale;
left2 *= WindowScale; left2 *= WindowScale;
@ -537,7 +537,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
int bpp = surface->format->BytesPerPixel; int bpp = surface->format->BytesPerPixel;
uint32_t ExpectedPitch = vMacScreenWidth * bpp; uint32_t ExpectedPitch = vMacScreenWidth * bpp;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
ExpectedPitch *= WindowScale; ExpectedPitch *= WindowScale;
} }
@ -571,7 +571,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
{ {
int k; int k;
Uint32 v; Uint32 v;
#if EnableMagnify #if 1
int a; int a;
#endif #endif
int PixPerByte = int PixPerByte =
@ -600,7 +600,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
v = BWLUT_pixel[(i >> k) & 1]; v = BWLUT_pixel[(i >> k) & 1];
} }
#if EnableMagnify #if 1
for (a = UseMagnify ? WindowScale : 1; --a >= 0; ) for (a = UseMagnify ? WindowScale : 1; --a >= 0; )
#endif #endif
{ {
@ -625,7 +625,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
#if (0 != vMacScreenDepth) && (vMacScreenDepth < 4) #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
if (UseColorMode) { if (UseColorMode) {
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
switch (bpp) { switch (bpp) {
case 1: case 1:
@ -659,7 +659,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
} else } else
#endif #endif
{ {
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
switch (bpp) { switch (bpp) {
case 1: case 1:
@ -704,7 +704,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
Uint8 *bufp = (Uint8 *)surface->pixels Uint8 *bufp = (Uint8 *)surface->pixels
+ i * surface->pitch + j * bpp; + i * surface->pitch + j * bpp;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
i0 /= WindowScale; i0 /= WindowScale;
j0 /= WindowScale; j0 /= WindowScale;
@ -824,7 +824,7 @@ LOCALPROC ForceShowCursor(void)
LOCALFUNC bool MoveMouse(int16_t h, int16_t v) LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
{ {
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
h *= WindowScale; h *= WindowScale;
v *= WindowScale; v *= WindowScale;
@ -842,7 +842,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
{ {
bool ShouldHaveCursorHidden = true; bool ShouldHaveCursorHidden = true;
#if EnableMagnify #if 1
if (UseMagnify) { if (UseMagnify) {
NewMousePosh /= WindowScale; NewMousePosh /= WindowScale;
NewMousePosv /= WindowScale; NewMousePosv /= WindowScale;
@ -873,7 +873,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
ShouldHaveCursorHidden = false; ShouldHaveCursorHidden = false;
} }
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1863,14 +1863,14 @@ LOCALFUNC bool CreateMainWindow(void)
Uint32 flags = SDL_SWSURFACE; Uint32 flags = SDL_SWSURFACE;
bool v = false; bool v = false;
#if EnableMagnify && 1 #if 1 && 1
if (UseMagnify) { if (UseMagnify) {
NewWindowHeight *= WindowScale; NewWindowHeight *= WindowScale;
NewWindowWidth *= WindowScale; NewWindowWidth *= WindowScale;
} }
#endif #endif
#if VarFullScreen #if 1
if (UseFullScreen) if (UseFullScreen)
#endif #endif
#if MayFullScreen #if MayFullScreen
@ -1916,10 +1916,10 @@ LOCALFUNC bool ReCreateMainWindow(void)
} }
#endif #endif
#if EnableMagnify #if 1
UseMagnify = WantMagnify; UseMagnify = WantMagnify;
#endif #endif
#if VarFullScreen #if 1
UseFullScreen = WantFullScreen; UseFullScreen = WantFullScreen;
#endif #endif
@ -1937,7 +1937,7 @@ LOCALPROC ZapWinStateVars(void)
{ {
} }
#if VarFullScreen #if 1
LOCALPROC ToggleWantFullScreen(void) LOCALPROC ToggleWantFullScreen(void)
{ {
WantFullScreen = ! WantFullScreen; WantFullScreen = ! WantFullScreen;
@ -2031,10 +2031,10 @@ LOCALPROC CheckForSavedTasks(void)
#if EnableRecreateW #if EnableRecreateW
if (0 if (0
#if EnableMagnify #if 1
|| (UseMagnify != WantMagnify) || (UseMagnify != WantMagnify)
#endif #endif
#if VarFullScreen #if 1
|| (UseFullScreen != WantFullScreen) || (UseFullScreen != WantFullScreen)
#endif #endif
) )
@ -2045,7 +2045,7 @@ LOCALPROC CheckForSavedTasks(void)
#if MayFullScreen #if MayFullScreen
if (GrabMachine != ( if (GrabMachine != (
#if VarFullScreen #if 1
UseFullScreen && UseFullScreen &&
#endif #endif
! (gTrueBackgroundFlag || CurSpeedStopped))) ! (gTrueBackgroundFlag || CurSpeedStopped)))