a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added save main window position to win32 port

Browse Source
This commit is contained in:
pagefault
2001-05-06 00:03:07 +00:00
parent d464eb8c6a
commit 6c8e30312e
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zsnes/src/gui/gui.asm
View File

@@ -546,6 +546,9 @@ NEWSYM UseCubicSpline, db 1
NEWSYM LargeSoundBuf, db 0 NEWSYM LargeSoundBuf, db 0
NEWSYM HighPriority, db 0 NEWSYM HighPriority, db 0
NEWSYM AlwaysOnTop, db 0 NEWSYM AlwaysOnTop, db 0
NEWSYM SaveMainWindowPos, db 1
NEWSYM MainWindowX, dw -1
NEWSYM MainWindowY, dw -1
GUIsave equ $-GUIRAdd GUIsave equ $-GUIRAdd

1
zsnes/src/gui/guimouse.inc
View File

@@ -2522,6 +2522,7 @@ DisplayGUIOptnsClick:
GUIClickCButton6 12,93,byte[GUIEffect],2 GUIClickCButton6 12,93,byte[GUIEffect],2
%ifdef __WIN32__ %ifdef __WIN32__
GUIClickCButton 12,168,byte[AlwaysOnTop] GUIClickCButton 12,168,byte[AlwaysOnTop]
GUIClickCButton 12,178,byte[SaveMainWindowPos]
%endif %endif
cmp eax,25 cmp eax,25
jl near .nomovebar jl near .nomovebar

9
zsnes/src/gui/guiwindp.inc
View File

@@ -4612,6 +4612,12 @@ DisplayGUIOptns:
mov dword[GUITemp],GUIIconDataCheckBoxC mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheck9 .nocheck9
GUIDisplayIconWin 10,12,168,[GUITemp] GUIDisplayIconWin 10,12,168,[GUITemp]
mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[SaveMainWindowPos],1
jne .nocheck10
mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheck10
GUIDisplayIconWin 10,12,178,[GUITemp]
%endif %endif
mov al,[GUIWincol] mov al,[GUIWincol]
mov byte[GUItextcolor],al mov byte[GUItextcolor],al
@@ -4646,6 +4652,7 @@ DisplayGUIOptns:
GUIOuttextwin2 10,26,98,GUIGUIOptnsTextC GUIOuttextwin2 10,26,98,GUIGUIOptnsTextC
%ifdef __WIN32__ %ifdef __WIN32__
GUIOuttextwin2 10,26,173,GUIGUIOptnsTextE GUIOuttextwin2 10,26,173,GUIGUIOptnsTextE
GUIOuttextwin2 10,26,183,GUIGUIOptnsTextF
%endif %endif
mov byte[GUIGUIOptnsText6],'R' mov byte[GUIGUIOptnsText6],'R'
GUIOuttextwin2 10,16,123,GUIGUIOptnsText6 GUIOuttextwin2 10,16,123,GUIGUIOptnsText6
@@ -4664,6 +4671,7 @@ DisplayGUIOptns:
GUIOuttextwin2 10,25,97,GUIGUIOptnsTextC GUIOuttextwin2 10,25,97,GUIGUIOptnsTextC
%ifdef __WIN32__ %ifdef __WIN32__
GUIOuttextwin2 10,25,172,GUIGUIOptnsTextE GUIOuttextwin2 10,25,172,GUIGUIOptnsTextE
GUIOuttextwin2 10,25,182,GUIGUIOptnsTextF
%endif %endif
mov byte[GUIGUIOptnsText6],'R' mov byte[GUIGUIOptnsText6],'R'
GUIOuttextwin2 10,15,122,GUIGUIOptnsText6 GUIOuttextwin2 10,15,122,GUIGUIOptnsText6
@@ -4746,6 +4754,7 @@ GUIGUIOptnsTextB dd 'ENABLE SNOW EFFECT',0
GUIGUIOptnsTextC dd 'ENABLE WATER EFFECT',0 GUIGUIOptnsTextC dd 'ENABLE WATER EFFECT',0
GUIGUIOptnsTextD dd 'MAIN WINDOW OPTIONS :',0 GUIGUIOptnsTextD dd 'MAIN WINDOW OPTIONS :',0
GUIGUIOptnsTextE dd 'ALWAYS ON TOP',0 GUIGUIOptnsTextE dd 'ALWAYS ON TOP',0
GUIGUIOptnsTextF db 'SAVE MAIN WINDOW POSITION',0
DisplayGUIAbout: DisplayGUIAbout:
; cmp byte[OSPort],3 ; cmp byte[OSPort],3

7
zsnes/src/win/winlink.cpp
View File

@@ -187,6 +187,9 @@ extern DWORD SoundQuality;
extern BYTE LargeSoundBuf; extern BYTE LargeSoundBuf;
extern BYTE HighPriority; extern BYTE HighPriority;
extern BYTE AlwaysOnTop; extern BYTE AlwaysOnTop;
extern BYTE SaveMainWindowPos;
extern WORD MainWindowX;
extern WORD MainWindowY;
extern int CurKeyPos; extern int CurKeyPos;
extern int CurKeyReadPos; extern int CurKeyReadPos;
extern int KeyBuffer[16]; extern int KeyBuffer[16];
@@ -1375,6 +1378,8 @@ void initwinvideo(void)
if(Y>(GetSystemMetrics( SM_CYSCREEN )-WindowHeight)) Y=(GetSystemMetrics( SM_CYSCREEN )-WindowHeight); if(Y>(GetSystemMetrics( SM_CYSCREEN )-WindowHeight)) Y=(GetSystemMetrics( SM_CYSCREEN )-WindowHeight);
if(FullScreen==1) {X=0; Y=0;} if(FullScreen==1) {X=0; Y=0;}
if (SaveMainWindowPos == 1) { MainWindowX = X; MainWindowY = Y; }
MoveWindow( hMainWindow, X, Y, MoveWindow( hMainWindow, X, Y,
WindowWidth, WindowHeight, TRUE ); WindowWidth, WindowHeight, TRUE );
@@ -1407,6 +1412,8 @@ void initwinvideo(void)
if(FullScreen==1) {X=0; Y=0;} if(FullScreen==1) {X=0; Y=0;}
if(hMainWindow) CloseWindow(hMainWindow); if(hMainWindow) CloseWindow(hMainWindow);
if (SaveMainWindowPos == 1 && MainWindowX != -1) { X = MainWindowX; Y = MainWindowY; }
hMainWindow = CreateWindow( "ZSNESWIN", WinName, WS_VISIBLE|WS_POPUP,X,Y, //WS_OVERLAPPED "ZSNESWIN" hMainWindow = CreateWindow( "ZSNESWIN", WinName, WS_VISIBLE|WS_POPUP,X,Y, //WS_OVERLAPPED "ZSNESWIN"
WindowWidth,WindowHeight,NULL,NULL,hInst,NULL); WindowWidth,WindowHeight,NULL,NULL,hInst,NULL);