From f8c2e9d790e246e35c503c918ca12d080ae5c601 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 12 Oct 2006 23:05:44 +0000
Subject: [PATCH] meta is a modifier key too

---
 direct/src/showbase/ShowBase.py         | 6 ++++++
 direct/src/showbase/Sources.pp          | 8 ++++----
 panda/src/framework/windowFramework.cxx | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index 01855f774d..0b43b54ce0 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -1040,6 +1040,7 @@ class ShowBase(DirectObject.DirectObject):
             mb.addButton(KeyboardButton.shift())
             mb.addButton(KeyboardButton.control())
             mb.addButton(KeyboardButton.alt())
+            mb.addButton(KeyboardButton.meta())
             mw.node().setModifierButtons(mb)
             bt = mw.attachNewNode(ButtonThrower(name))
             if (i != 0):
@@ -1048,6 +1049,7 @@ class ShowBase(DirectObject.DirectObject):
             mods.addButton(KeyboardButton.shift())
             mods.addButton(KeyboardButton.control())
             mods.addButton(KeyboardButton.alt())
+            mods.addButton(KeyboardButton.meta())
             bt.node().setModifierButtons(mods)
             self.buttonThrowers.append(bt)
             if (win.hasPointer(i)):
@@ -1129,6 +1131,10 @@ class ShowBase(DirectObject.DirectObject):
         return self.mouseWatcherNode.getModifierButtons().isDown(
             KeyboardButton.control())
 
+    def getMeta(self):
+        return self.mouseWatcherNode.getModifierButtons().isDown(
+            KeyboardButton.meta())
+
     def addAngularIntegrator(self):
         if not self.physicsMgrAngular:
             self.physicsMgrAngular = 1
diff --git a/direct/src/showbase/Sources.pp b/direct/src/showbase/Sources.pp
index ee8ca71a48..6d0d418a00 100644
--- a/direct/src/showbase/Sources.pp
+++ b/direct/src/showbase/Sources.pp
@@ -3,13 +3,13 @@
   #define LOCAL_LIBS \
     directbase
   #define OTHER_LIBS \
+    pgraph:c gsgbase:c gobj:c mathutil:c pstatclient:c \
+    lerp:c downloader:c pandabase:c pnmimage:c prc:c \
+    pipeline:c cull:c $[if $[HAVE_NET],net:c] \
     display:c linmath:c event:c putil:c panda:m \
     express:c pandaexpress:m \
     interrogatedb:c dconfig:c dtoolconfig:m \
-    dtoolutil:c dtoolbase:c dtool:m \
-    pgraph:c gsgbase:c gobj:c mathutil:c pstatclient:c \
-    lerp:c downloader:c pandabase:c pnmimage:c prc:c \
-    pipeline:c cull:c $[if $[HAVE_NET],net:c]
+    dtoolutil:c dtoolbase:c dtool:m
 
   #define SOURCES \
     showBase.cxx showBase.h
diff --git a/panda/src/framework/windowFramework.cxx b/panda/src/framework/windowFramework.cxx
index 7809c7c8aa..4cb631a617 100644
--- a/panda/src/framework/windowFramework.cxx
+++ b/panda/src/framework/windowFramework.cxx
@@ -399,6 +399,7 @@ enable_keyboard() {
     mods.add_button(KeyboardButton::shift());
     mods.add_button(KeyboardButton::control());
     mods.add_button(KeyboardButton::alt());
+    mods.add_button(KeyboardButton::meta());
     bt->set_modifier_buttons(mods);
     mouse.attach_new_node(bt);
   }