provide ability to set default cursor in TerminalPanel

Regression after 9d461c3. Now, `TerminalPanel.setCursorShape` passes `null` for the default cursor, but the full reset (`JediTerminal.reset`) is performed on startup, so a cursor configured in `JBTerminalPanel` constructor was cleared.
JetBrains · Sep 10, 2024 · c1cb74d · c1cb74d
1 parent 0f93b21
commit c1cb74d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/JediTerm/src/main/java/com/jediterm/example/BasicTerminalShellExample.java b/JediTerm/src/main/java/com/jediterm/example/BasicTerminalShellExample.java
@@ -1,6 +1,7 @@
 package com.jediterm.example;
 
 import com.jediterm.pty.PtyProcessTtyConnector;
+import com.jediterm.terminal.CursorShape;
 import com.jediterm.terminal.TtyConnector;
 import com.jediterm.terminal.ui.JediTermWidget;
 import com.jediterm.terminal.ui.settings.DefaultSettingsProvider;
@@ -21,6 +22,7 @@ public class BasicTerminalShellExample {
 
   private static @NotNull JediTermWidget createTerminalWidget() {
     JediTermWidget widget = new JediTermWidget(80, 24, new DefaultSettingsProvider());
+    widget.getTerminalPanel().setDefaultCursorShape(CursorShape.BLINK_UNDERLINE);
     widget.setTtyConnector(createTtyConnector());
     widget.start();
     return widget;

diff --git a/JediTerm/src/main/java/com/jediterm/ui/AbstractTerminalFrame.java b/JediTerm/src/main/java/com/jediterm/ui/AbstractTerminalFrame.java
@@ -3,6 +3,7 @@
 import com.jediterm.app.JediTerm;
 import com.jediterm.app.TtyConnectorWaitFor;
 import com.jediterm.core.compatibility.Point;
+import com.jediterm.terminal.CursorShape;
 import com.jediterm.terminal.Terminal;
 import com.jediterm.terminal.TtyConnector;
 import com.jediterm.terminal.model.SelectionUtil;
@@ -176,7 +177,9 @@ private static void onTermination(@NotNull JediTermWidget widget, @NotNull IntCo
   }
 
   protected JediTermWidget createTerminalWidget(@NotNull SettingsProvider settingsProvider) {
-    return new JediTermWidget(settingsProvider);
+    JediTermWidget widget = new JediTermWidget(settingsProvider);
+    widget.getTerminalPanel().setDefaultCursorShape(CursorShape.BLINK_VERTICAL_BAR);
+    return widget;
   }
 
   private void sizeFrameForTerm(final JFrame frame) {

diff --git a/JediTerm/src/main/kotlin/com/jediterm/app/JediTermMain.kt b/JediTerm/src/main/kotlin/com/jediterm/app/JediTermMain.kt
@@ -88,7 +88,7 @@ class JediTerm : AbstractTerminalFrame() {
   }
 
   override fun createTerminalWidget(settingsProvider: SettingsProvider): JediTermWidget {
-    val widget = JediTermWidget(settingsProvider)
+    val widget = super.createTerminalWidget(settingsProvider)
     widget.addHyperlinkFilter(UrlFilter())
     return widget
   }

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.45
+3.46
diff --git a/ui/src/com/jediterm/terminal/ui/TerminalPanel.java b/ui/src/com/jediterm/terminal/ui/TerminalPanel.java
@@ -1100,6 +1100,7 @@ private class TerminalCursor {
     // cursor state
     private boolean myCursorIsShown; // blinking state
     private final Point myCursorCoordinates = new Point();
+    private @NotNull CursorShape myDefaultCursorShape = CursorShape.BLINK_BLOCK;
     private @Nullable CursorShape myShape;
 
     // terminal modes
@@ -1236,7 +1237,11 @@ void setShape(@Nullable CursorShape shape) {
     }
 
     @NotNull CursorShape getEffectiveShape() {
-      return Objects.requireNonNullElse(myShape, CursorShape.BLINK_BLOCK);
+      return Objects.requireNonNullElse(myShape, myDefaultCursorShape);
+    }
+
+    private void setDefaultShape(@NotNull CursorShape defaultShape) {
+      myDefaultCursorShape = defaultShape;
     }
   }
 
@@ -1548,6 +1553,10 @@ public void setCursorShape(@Nullable CursorShape cursorShape) {
     myCursor.setShape(cursorShape);
   }
 
+  public void setDefaultCursorShape(@NotNull CursorShape defaultCursorShape) {
+    myCursor.setDefaultShape(defaultCursorShape);
+  }
+
   public void beep() {
     if (mySettingsProvider.audibleBell()) {
       Toolkit.getDefaultToolkit().beep();