From fb7b2782ae55bc07d5914b8b5eb0c7fa33b7ae32 Mon Sep 17 00:00:00 2001 From: zsknight <> Date: Mon, 7 May 2001 00:41:48 +0000 Subject: [PATCH] GUI minimize button removed for Linux --- zsnes/src/gui/gui.asm | 17 +++++++++++++++++ zsnes/src/gui/guimouse.inc | 9 +++++++++ 2 files changed, 26 insertions(+) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index e55cb4f0..ab3e1c7d 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -3564,20 +3564,32 @@ DisplayMenu: cmp byte[OSPort],3 jne near .notwinpressa + %ifdef __LINUX__ + GUIShadow 238,9,247,20 + %endif + %ifdef __WIN32__ GUIShadow 238,9,247,14 GUIShadow 238,16,247,20 + %endif GUIShadow 249,9,257,20 .notwinpressa cmp byte[OSPort],3 jne near .notwinpressb + %ifdef __LINUX__ + mov byte[GUIMenuItem+36],247 + GUIDMHelpB 233,242,GUIMenuItem+36,1 + %endif + %ifdef __WIN32__ mov byte[GUIMenuItem+36],249 GUIDMHelpB2 233,242,GUIMenuItem+36,1 mov byte[GUIMenuItem+36],248 GUIDMHelpB3 233,242,GUIMenuItem+36,3 + %endif mov byte[GUIMenuItem+36],'x' GUIDMHelpB 244,253,GUIMenuItem+36,2 .notwinpressb + ; Display upper-left box mov byte[GUIMenuItem+36],25 GUIDMHelp 4,12,GUIMenuItem+6,1 @@ -4784,6 +4796,11 @@ NEWSYM GUIFontData db 00000000b db 00000000b db 00000000b; Minimize + db 11111000b + db 10001000b + db 10001000b + db 10001000b + db 11111000b; Maximize (Linux) ; 189 .. 220 GUIIconDataClose: diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 53d83461..04beec63 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -212,6 +212,9 @@ ProcessMouseButtons: jb near .noclickedw cmp word[GUImouseposx],242 ja .notfound7 + %ifdef __LINUX__ + jmp .clickawn + %endif cmp word[GUImouseposy],8 jb .clickawn cmp word[GUImouseposy],8 @@ -456,8 +459,14 @@ ProcessMouseButtons: mov byte[GUIcwinpress],0 cmp word[GUImouseposy],3 jb .notwinpressa + %ifdef __LINUX__ + cmp word[GUImouseposy],13 + ja .notwinpressa + %endif + %ifdef __WIN32__ cmp word[GUImouseposy],7 ja .notwinpressa + %endif cmp word[GUImouseposx],233 jb .notwinpressa cmp word[GUImouseposx],242