@electerm/electerm-react 5.5.6 → 5.5.15

package/client/components/spice/spice.styl

@@ -1,29 +1,20 @@
+// SPICE only styling — the session layout (control bar, viewport, fit mode)
+// lives in the shared remote session shell: common/remote-session-shell.styl
 .spice-session-wrap
-  display: flex
-  flex-direction: column
-  align-items: center
-  .session-v-info
-    position: relative
-    width: 100%
-    z-index: 300
-  &.scale-viewport
-    .spice-scroll-wrapper
+  // fit: the mount box fills the viewport and the canvas (sized by the spice
+  // client to the remote resolution) is scaled to it, keeping the ratio.
+  // !important because the client writes the surface size into the mount box
+  // inline style (`screen_id` height = surface height).
+  &.fit
+    .spice-session-mount
+      width 100% !important
+      height 100% !important
       display flex
       align-items center
       justify-content center
-      > div
-        width 100% !important
-        height 100% !important
-        display flex
-        align-items center
-        justify-content center
       canvas
         width 100% !important
         height 100% !important
         max-width 100% !important
         max-height 100% !important
         object-fit contain
-.spice-scroll-wrapper
-  position relative
-  background var(--main)
-  z-index 299

package/client/components/terminal/mixins/term-content.js

@@ -84,5 +84,43 @@ export const contentMixin = {
       const ts = `[${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}:${String(now.getSeconds()).padStart(2, '0')}.${String(now.getMilliseconds()).padStart(3, '0')}] `
       return ts + text
     }).join('\n')
+  },
+
+  /**
+   * The whole buffer as clean plain text, for the touch select-text overlay.
+   *
+   * Differs from getTerminalBufferText() on purpose: that one is for log files
+   * and keeps xterm's fixed-width padding (`translateToString(false)`), which
+   * would trail a screen-full of spaces into a textarea and make every line
+   * look wrapped. Here each row is right-trimmed, rows xterm reports as
+   * `isWrapped` are glued back so a line the shell printed as one line is
+   * copied as one line, and the blank rows scrollback starts out with are
+   * dropped so the panel opens on real output.
+   */
+  getSelectableBufferText () {
+    const buffer = this.term.buffer.active
+    const len = buffer.length
+    const lines = []
+    for (let i = 0; i < len; i++) {
+      const line = buffer.getLine(i)
+      if (!line) {
+        continue
+      }
+      const text = line.translateToString(true)
+      if (line.isWrapped && lines.length) {
+        lines[lines.length - 1] += text
+      } else {
+        lines.push(text)
+      }
+    }
+    let start = 0
+    let end = lines.length
+    while (start < end && !lines[start].trim()) {
+      start++
+    }
+    while (end > start && !lines[end - 1].trim()) {
+      end--
+    }
+    return lines.slice(start, end).join('\n')
   }
 }

package/client/components/terminal/mixins/term-context-menu.jsx

@@ -44,12 +44,23 @@ export const contextMenuMixin = {
         disabled: !hasSelection
       },
       {
-
         key: 'onSelectAll',
         icon: <iconsMap.CheckSquareOutlined />,
         label: e('selectall'),
         extra: selectAllShortcut
       },
+      // Touch only: a selection dragged out on the canvas can only ever be an
+      // approximation of a native one, so offer the overlay where the OS does
+      // the selecting (see term-touch.js / terminal-select-text.jsx).
+      ...(
+        this.isTouchMode()
+          ? [{
+              key: 'onSelectTextMode',
+              icon: <iconsMap.SelectOutlined />,
+              label: e('selectText')
+            }]
+          : []
+      ),
       ...(
         isAIDisabled()
           ? []
@@ -124,11 +135,25 @@ export const contextMenuMixin = {
     ) {
       return false
     }
+    // While a touch drag is still building the selection we copy once on
+    // release instead — otherwise every cell the finger crosses would write
+    // the clipboard and raise a toast.
+    if (this.dragSelect) {
+      return false
+    }
     this.copySelectionToClipboard()
   },
 
   copySelectionToClipboard () {
-    const txt = this.term.getSelection()
+    this.copyToClipboard(this.term.getSelection())
+  },
+
+  /**
+   * Shared clipboard write. Lives here rather than in term-touch.js so that
+   * the touch module stays free of imports (it is loaded directly by a
+   * node:test unit spec), and so every copy raises the same `copied` toast.
+   */
+  copyToClipboard (txt) {
     if (txt) {
       copy(txt)
     }
@@ -152,6 +177,9 @@ export const contextMenuMixin = {
   },
 
   pasteTextTooLong () {
+    if (this.props.config.disableConfirmForLargeClipboardContent) {
+      return false
+    }
     if (window.et.isWebApp) {
       return false
     }
@@ -180,7 +208,11 @@ export const contextMenuMixin = {
 
   async onPaste (skipTextLengthCheck) {
     let selected = await readClipboardAsync()
-    if (!skipTextLengthCheck && selected.length > 500) {
+    if (
+      !skipTextLengthCheck &&
+      !this.props.config.disableConfirmForLargeClipboardContent &&
+      selected.length > 500
+    ) {
       return this.askUserConfirm()
     }
     if (isWin && this.isRemote()) {

package/client/components/terminal/mixins/term-socket.js

@@ -18,9 +18,9 @@ import { XmodemClient } from '../xmodem-client.js'
 import { loadWebLinksAddon } from '../xterm-loader.js'
 import { KeywordHighlighterAddon } from '../highlight-addon.js'
 import {
-  createSshReloadState,
+  createTerminalReloadState,
   getAlternateBufferSnapshot,
-  shouldCaptureSshReloadState
+  shouldCaptureTerminalReloadState
 } from '../ssh-reload-state.js'
 
 // Expands \n \t \r \\ and \xHH hex byte escapes, used to let users type
@@ -58,7 +58,7 @@ function expandCloseSequence (text) {
 /**
  * Session lifecycle: opening the pty/ssh session over its websocket, error
  * and reconnect handling, input broadcast, and the screen snapshot used to
- * restore an ssh session after a reload.
+ * restore a shell session (ssh, local, telnet, serial) after a reload.
  */
 export const socketMixin = {
   buildWsUrl (port) {
@@ -392,7 +392,7 @@ export const socketMixin = {
   },
 
   getReloadState () {
-    if (!shouldCaptureSshReloadState(this.props.tab, this.props.config)) {
+    if (!shouldCaptureTerminalReloadState(this.props.tab, this.props.config)) {
       return undefined
     }
     let screen = ''
@@ -413,7 +413,7 @@ export const socketMixin = {
       console.warn('Failed to serialize terminal before reload', e)
     }
     const cwd = this.cmdAddon?.getCwd() || this.props.tab._reloadState?.cwd || ''
-    return createSshReloadState({ cwd, screen })
+    return createTerminalReloadState({ cwd, screen })
   },
 
   restoreReloadScreen (term) {