New editor: restored CTRL+K (open sketch folder). Fixes #3103

Author: Federico Fissore

app/src/processing/app/Base.java

@@ -54,6 +54,7 @@
 import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
 import processing.app.syntax.PdeKeywords;
+import processing.app.syntax.SketchTextAreaDefaultInputMap;
 import processing.app.tools.MenuScroller;
 import processing.app.tools.ZipDeflater;
 
@@ -476,6 +477,8 @@ protected void onProgress(Progress progress) {
     } else if (parser.isGuiMode()) {
       splashScreenHelper.splashText(_("Starting..."));
 
+      installKeyboardInputMap();
+
       // Check if there were previously opened sketches to be restored
       restoreSketches();
 
@@ -505,6 +508,10 @@ protected void onProgress(Progress progress) {
     }
   }
 
+  private void installKeyboardInputMap() {
+    UIManager.put("RSyntaxTextAreaUI.inputMap", new SketchTextAreaDefaultInputMap());
+  }
+
   /**
    * Post-constructor setup for the editor area. Loads the last
    * sketch that was used (if any), and restores other Editor settings.

app/src/processing/app/syntax/SketchTextArea.java

@@ -150,17 +150,22 @@ private void setSyntaxTheme(int tokenType, String id) {
   // Removing the default focus traversal keys
   // This is because the DefaultKeyboardFocusManager handles the keypress and consumes the event
   protected void fixControlTab() {
-    KeyStroke ctrlTab = KeyStroke.getKeyStroke("ctrl TAB");
+    removeCTRLTabFromFocusTraversal();
+
+    removeCTRLSHIFTTabFromFocusTraversal();
+  }
+
+  private void removeCTRLSHIFTTabFromFocusTraversal() {
     KeyStroke ctrlShiftTab = KeyStroke.getKeyStroke("ctrl shift TAB");
+    Set<AWTKeyStroke> backwardKeys = new HashSet<AWTKeyStroke>(this.getFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS));
+    backwardKeys.remove(ctrlShiftTab);
+  }
 
-    // Remove ctrl-tab from normal focus traversal
+  private void removeCTRLTabFromFocusTraversal() {
+    KeyStroke ctrlTab = KeyStroke.getKeyStroke("ctrl TAB");
     Set<AWTKeyStroke> forwardKeys = new HashSet<AWTKeyStroke>(this.getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS));
     forwardKeys.remove(ctrlTab);
     this.setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, forwardKeys);
-
-    // Remove ctrl-shift-tab from normal focus traversal
-    Set<AWTKeyStroke> backwardKeys = new HashSet<AWTKeyStroke>(this.getFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS));
-    backwardKeys.remove(ctrlShiftTab);
   }
 
 

app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java

@@ -0,0 +1,15 @@
+package processing.app.syntax;
+
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaDefaultInputMap;
+
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+
+public class SketchTextAreaDefaultInputMap extends RSyntaxTextAreaDefaultInputMap {
+
+  public SketchTextAreaDefaultInputMap() {
+    int defaultMod = getDefaultModifier();
+
+    remove(KeyStroke.getKeyStroke(KeyEvent.VK_K, defaultMod));
+  }
+}