Give Alt+F4 similar special treatment to Cmd+Q

wesnoth · Sep 9, 2015 · d8a85e3 · d8a85e3
1 parent 7c4523d
commit d8a85e3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/events.cpp b/src/events.cpp
@@ -399,6 +399,16 @@ void pump()
 				}
 				break;
 			}
+
+#ifndef __APPLE__
+			case SDL_KEYDOWN: {
+				if(event.key.keysym.sym == SDLK_F4 && (event.key.keysym.mod == KMOD_RALT || event.key.keysym.mod == KMOD_LALT)) {
+					quit_confirmation::quit();
+					continue; // this event is already handled
+				}
+				break;
+			}
+#endif
 
 #if defined(_X11) && !defined(__APPLE__)
 			case SDL_SYSWMEVENT: {

diff --git a/src/hotkey/hotkey_item.cpp b/src/hotkey/hotkey_item.cpp
@@ -481,11 +481,13 @@ std::string get_names(std::string id)
 	if (id == "quit") {
 		names.push_back("escape");
 	}
-#ifdef __APPLE__
 	else if (id == "quit-to-desktop") {
+#ifdef __APPLE__
 		names.push_back("cmd+q");
-	}
+#else
+		names.push_back("alt+F4");
 #endif
+	}
 
 	return boost::algorithm::join(names, ", ");
 }