[orca: 2/2] Merge branch 'shiftlock' into 'master'

[Joanmarie Diggs <joanied src gnome org>]

commit 0513fd455d22b2b2099d8587252350c7b207fcf7
Merge: 403e7a617 496ea5167
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Jul 2 20:41:06 2019 +0000

    Merge branch 'shiftlock' into 'master'
    
    keyboard: add support for ShiftLock
    
    Closes #10
    
    See merge request GNOME/orca!17

 src/orca/input_event.py           | 18 +++++++++++----
 src/orca/keybindings.py           | 10 ++++++++
 src/orca/keynames.py              |  5 ++++
 src/orca/orca-setup.ui            |  2 +-
 src/orca/orca.py                  | 48 +++++++++++++++++++++++++++------------
 src/orca/orca_gui_prefs.py        |  9 +++++++-
 src/orca/settings.py              |  2 +-
 test/harness/generalSettings.conf |  2 +-
 8 files changed, 74 insertions(+), 22 deletions(-)
---
diff --cc src/orca/input_event.py
index 396b76363,d96343db6..a0e8d4f5e
--- a/src/orca/input_event.py
+++ b/src/orca/input_event.py
@@@ -713,11 -710,19 +715,19 @@@ class KeyboardEvent(InputEvent)
                      debug.println(debug.LEVEL_INFO, "Done with capslock", True)
                  except:
                      debug.println(debug.LEVEL_INFO, "Could not trigger capslock, " \
 -                        "at-spi2-core >= 2.30 is needed for triggering capslock", True)
 +                        "at-spi2-core >= 2.32 is needed for triggering capslock", True)
                      pass
              return lockit
+         if self.event_string == "Caps_Lock":
+             modifier = 1 << pyatspi.MODIFIER_SHIFTLOCK
+         elif self.event_string == "Shift_Lock":
+             modifier = 1 << pyatspi.MODIFIER_SHIFT
+         else:
+             msg = "Unknown locking key %s" % self.event_string
+             debug.println(debug.LEVEL_WARNING, msg, False)
+             return
          debug.println(debug.LEVEL_INFO, "Scheduling capslock", True)
-         GLib.timeout_add(1, lock_mod(self.modifiers))
+         GLib.timeout_add(1, lock_mod(self.modifiers, modifier))
  
      def _consume(self):
          startTime = time.time()