Overlay update

zsnes/src/gui/gui.asm

@@ -176,6 +176,7 @@ EXTSYM numlockptr
 %ifdef __WIN32__
 EXTSYM CheckPriority
 EXTSYM CheckAlwaysOnTop
+EXTSYM initDirectDraw
 %endif
 
 NEWSYM GuiAsmStart

zsnes/src/gui/guikeys.inc

@@ -818,6 +818,13 @@ GUIOptionKeys:
     xor byte[vsyncon],1
     mov al,[vsyncon]
     mov [cfgvsync],al
+%ifdef __WIN32__
+    cmp byte[OverlayEnabled],1
+    jne .novsync
+    pushad
+    call initDirectDraw
+    popad
+%endif
 .novsync
 %endif
     cmp dh,'M'
@@ -892,6 +899,9 @@ GUIOptionKeys:
     cmp dh,'Y'
     jne .nooverlay
     xor byte[OverlayEnabled],1
+    pushad
+    call initDirectDraw
+    popad
 .nooverlay
     cmp dh,'S'
     jne .noalttimer

zsnes/src/gui/guimouse.inc

@@ -994,6 +994,24 @@ GUIWinClicked:
 %%noclick
 %endmacro
 
+%ifdef __WIN32__
+%macro GUIClickCButtonov 3
+    cmp eax,%1+1
+    jl %%noclick
+    cmp edx,%2+3
+    jl %%noclick
+    cmp eax,%1+6
+    jg %%noclick
+    cmp edx,%2+8
+    jg %%noclick
+    xor %3,1
+    pushad
+    call initDirectDraw
+    popad
+%%noclick
+%endmacro
+%endif
+
 %macro GUIClickCButtonat 3
     cmp eax,%1+1
     jl %%noclick
@@ -1133,6 +1151,32 @@ GUIWinClicked:
 %%noclick
 %endmacro
 
+%ifndef __LINUX__
+%macro GUIClickCButton2ov 5
+    cmp eax,%1+1
+    jl %%noclick
+    cmp edx,%2+3
+    jl %%noclick
+    cmp eax,%1+6
+    jg %%noclick
+    cmp edx,%2+8
+    jg %%noclick
+    xor %3,%5
+    mov al,%3
+    mov %4,al
+%ifdef __WIN32__
+    cmp byte[OverlayEnabled],1
+    jne %%noinit
+    pushad
+    call initDirectDraw
+    popad
+%%noinit
+%endif
+    ret
+%%noclick
+%endmacro
+%endif
+
 %macro GUIClickCButton3 5
     cmp eax,%1+1
     jl %%noclick
@@ -2100,7 +2144,7 @@ DisplayGUIOptionClick:
     GUIClickCButton2 11,36,byte[newengen],byte[cfgnewgfx],1
 .invalidng
 %ifndef __LINUX__
-    GUIClickCButton2 11,46,byte[vsyncon],byte[cfgvsync],1
+    GUIClickCButton2ov 11,46,byte[vsyncon],byte[cfgvsync],1
 %endif
     GUIClickCButton2 11,56,byte[FPUCopy],byte[cfgcopymethod],2
     GUIClickCButtonM 11,66,byte[pl12s34]
@@ -2120,7 +2164,7 @@ DisplayGUIOptionClick:
     GUIClickCButton 11,156,byte[AutoState]
     GUIClickCButton 11,166,byte[DontSavePath]
 %ifdef __WIN32__
-    GUIClickCButton 11,176,byte[OverlayEnabled]
+    GUIClickCButtonov 11,176,byte[OverlayEnabled]
     GUIClickCButtonat 11,186,byte[AlternateTimer]
 %endif
     ; Frameskip = 0