From 405f1c387ed8e695e218d9eb6b55713881efeaa7 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@users.sf.net>
Date: Fri, 22 Nov 2013 00:08:33 +0000
Subject: [PATCH] Add CMD-SHIFT-F10 -> Quit

---
 src/adb.c      | 14 ++++++++++++--
 src/fbdriver.c |  4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/adb.c b/src/adb.c
index 8537f58..f21d0fb 100644
--- a/src/adb.c
+++ b/src/adb.c
@@ -1714,7 +1714,7 @@ adb_physical_key_update(int a2code, int is_up)
 		case 0x0c: /* F12 - remap to reset */
 			a2code = 0x7f;
 			special = 0;
-			break;
+                        break;
 		default:
 			break;
 		}
@@ -1738,7 +1738,7 @@ adb_physical_key_update(int a2code, int is_up)
 // OG Disabled special keys (but warp)
 #ifndef ACTIVEGS
 		case 0x04: /* F4 - emulator config panel */
-			cfg_toggle_config_panel();
+                        cfg_toggle_config_panel();
 			break;
 		case 0x05: /* F5 - emulator clipboard paste */
 			clipboard_paste();
@@ -1778,8 +1778,18 @@ adb_physical_key_update(int a2code, int is_up)
 		case 0x0a: /* F10 - change a2vid paletter */
 			if (SHIFT_DOWN) {
 #ifdef TOGGLE_STATUS
+                            if (CMD_DOWN)
+                            {
+                                printf("Quit!\n");
+                                iwm_shut();
+                                xdriver_end();
+                                my_exit(1);
+                            }
+                            else
+                            {
 				extern void x_toggle_status_lines();
 				x_toggle_status_lines();
+                            }
 #endif
 			} else {
 				change_a2vid_palette((g_a2vid_palette + 1) & 0xf);
diff --git a/src/fbdriver.c b/src/fbdriver.c
index c2d45ee..51ac053 100644
--- a/src/fbdriver.c
+++ b/src/fbdriver.c
@@ -508,6 +508,7 @@ void check_input_events(void)
 	    {
 		if (ev.code < 128)
 		{
+#if 0
 		    if ((ev.code == KEY_F10) && SHIFT_DOWN)
 		    {
 			//quitEmulator();
@@ -515,8 +516,9 @@ void check_input_events(void)
 			xdriver_end();
 			my_exit(1);
 		    }
+#endif
 		    if (keycode_to_a2code[ev.code] >= 0)
-			adb_physical_key_update(keycode_to_a2code[ev.code], !ev.value);
+                adb_physical_key_update(keycode_to_a2code[ev.code], !ev.value);
 		}
 		else if (ev.code == BTN_LEFT)
 		{