From eee5773db56a8cde498bae0aae764591bc811af0 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sat, 26 Apr 2008 13:28:47 +0000
Subject: [PATCH] use modifier mask as reported by the input system

---
 keyboard.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/keyboard.xml b/keyboard.xml
index 96dd3e3e4..b68ab1686 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -13,14 +13,11 @@ top down before the key bindings are parsed.
 <PropertyList>
  <nasal>
   <script>
+      var modifiers = props.globals.getNode("/devices/status/keyboard");
       var shift = props.globals.getNode("/devices/status/keyboard/shift");
       var ctrl = props.globals.getNode("/devices/status/keyboard/ctrl");
       var alt = props.globals.getNode("/devices/status/keyboard/alt");
 
-      var get_modifiers = func {
-          shift.getValue() + 2 * ctrl.getValue() + 4 * alt.getValue();
-      }
-
       var space_release = func {}
       var space = func(state, mod) {
           if (!state) {
@@ -29,7 +26,7 @@ top down before the key bindings are parsed.
           }
           if (mod == 0 or mod == 1) {
               controls.ptt(mod + 1);
-              space_release = func { controls.ptt(0) }
+              space_release = func controls.ptt(0);
           }
       }
 
@@ -272,23 +269,23 @@ top down before the key bindings are parsed.
   <desc>PTT - Push To Talk (via VoIP)</desc>
   <binding>
    <command>nasal</command>
-   <script>space(1, get_modifiers())</script>
+   <script>space(1, modifiers.getValue())</script>
   </binding>
   <mod-up>
    <binding>
     <command>nasal</command>
-    <script>space(0, get_modifiers())</script>
+    <script>space(0, modifiers.getValue())</script>
    </binding>
   </mod-up>
   <mod-shift>
    <binding>
     <command>nasal</command>
-    <script>space(1, get_modifiers())</script>
+    <script>space(1, modifiers.getValue())</script>
    </binding>
    <mod-up>
     <binding>
      <command>nasal</command>
-     <script>space(0, get_modifiers())</script>
+     <script>space(0, modifiers.getValue())</script>
     </binding>
    </mod-up>
   </mod-shift>