[Wesnoth-cvs-commits] wesnoth src/hotkeys.cpp ./changelog

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/05/12 20:36:47

Modified files:
        src            : hotkeys.cpp 
        .              : changelog 

Log message:
        recognize right Command (META) key, not just left

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.665&tr2=1.666&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.665 wesnoth/changelog:1.666
--- wesnoth/changelog:1.665     Thu May 12 18:48:46 2005
+++ wesnoth/changelog   Thu May 12 20:36:47 2005
@@ -1,6 +1,7 @@
 CVS HEAD:
  * balancing change: reduced cost of dwarvish fighter by 1 gold; made 
Lieutenant more powerful
  * user interface improvements:
+   * recognize right Command (META) key, not just left
    * explicitly mention 100 gold minimum next scenario (#12987)
    * made menu widgets sortable
    * added %-to-kill to Damage Calculations
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.74 wesnoth/src/hotkeys.cpp:1.75
--- wesnoth/src/hotkeys.cpp:1.74        Sun Apr 17 20:42:10 2005
+++ wesnoth/src/hotkeys.cpp     Thu May 12 20:36:47 2005
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp,v 1.74 2005/04/17 20:42:10 gruikya Exp $ */
+/* $Id: hotkeys.cpp,v 1.75 2005/05/12 20:36:47 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -294,11 +294,12 @@
 
 hotkey_item& get_hotkey(const SDL_KeyboardEvent& event, bool mods)
 {
-       return get_hotkey(event.keysym.sym, 
-                       (event.keysym.mod & KMOD_SHIFT) != 0, 
-                       (event.keysym.mod & KMOD_CTRL) != 0, 
-                       (event.keysym.mod & KMOD_ALT) != 0, 
-                       (event.keysym.mod & KMOD_LMETA) != 0, 
+       return get_hotkey(event.keysym.sym,
+                       (event.keysym.mod & KMOD_SHIFT) != 0,
+                       (event.keysym.mod & KMOD_CTRL) != 0,
+                       (event.keysym.mod & KMOD_ALT) != 0,
+                       (event.keysym.mod & KMOD_LMETA) != 0
+                       || (event.keysym.mod & KMOD_RMETA) != 0,
                        mods);
 }