From f9b1f6be5ccd2adecb8fbc6b3f217822e5c965d0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 20 Aug 2018 10:24:09 +0530
Subject: [PATCH] Fix #809

---
 __main__.py         | 6 ++++++
 glfw/cocoa_window.m | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/__main__.py b/__main__.py
index 1ebdcbf16..d9909ffb6 100644
--- a/__main__.py
+++ b/__main__.py
@@ -33,6 +33,11 @@ def hold(args):
     raise SystemExit(ret)
 
 
+def complete(args):
+    from kitty.complete import main
+    main(args[1:], entry_points, namespaced_entry_points)
+
+
 def launch(args):
     import runpy
     sys.argv = args[1:]
@@ -69,6 +74,7 @@ entry_points = {
 }
 namespaced_entry_points = {k: v for k, v in entry_points.items() if k[0] not in '+@'}
 namespaced_entry_points['hold'] = hold
+namespaced_entry_points['complete'] = complete
 
 
 def setup_openssl_environment():
diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m
index bb5d37e84..98fa9f773 100644
--- a/glfw/cocoa_window.m
+++ b/glfw/cocoa_window.m
@@ -1075,7 +1075,7 @@ is_ascii_control_char(char x) {
                 [[self keyWindow] sendEvent:event];
                 return;
             }
-            if (flags == NSEventModifierFlagControl && event.keyCode == kVK_Tab) {
+            if (event.keyCode == kVK_Tab && (flags == NSEventModifierFlagControl || flags == NSEventModifierFlagControl | NSEventModifierFlagShift)) {
                 // Cocoa swallows Ctrl+Tab to cycle between views
                 [[self keyWindow].contentView keyUp:event];
                 return;
@@ -1083,7 +1083,7 @@ is_ascii_control_char(char x) {
             break;
         case NSEventTypeKeyDown:
             flags = [event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask;
-            if (flags == NSEventModifierFlagControl && event.keyCode == kVK_Tab) {
+            if (event.keyCode == kVK_Tab && (flags == NSEventModifierFlagControl || flags == NSEventModifierFlagControl | NSEventModifierFlagShift)) {
                 // Cocoa swallows Ctrl+Tab to cycle between views
                 [[self keyWindow].contentView keyDown:event];
                 return;