krobelus
commented
8 months ago Here is an experimental implementation. Though I'm curious what's the use case; I believe that some terminals will ask for permission before enabling this feature, so as it stands this might make things worse.
diff --git a/doc_src/cmds/commandline.rst b/doc_src/cmds/commandline.rst
index 3473f42c3..a6f901f06 100644
--- a/doc_src/cmds/commandline.rst
+++ b/doc_src/cmds/commandline.rst
@@ -37,6 +37,9 @@ The following options are available:
This option cannot be combined with any other option.
See :doc:`bind <bind>` for a list of input functions.
+**-q** or **--queue**
+ Queue the additional arguments as if they are typed.
+
**-h** or **--help**
Displays help about using this command.
diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index 8ce4991c1..65fc5c3ab 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -1,15 +1,42 @@
function fish_clipboard_paste
set -l data
- if type -q pbpaste
- set data (pbpaste 2>/dev/null | string collect -N)
- else if set -q WAYLAND_DISPLAY; and type -q wl-paste
- set data (wl-paste -n 2>/dev/null | string collect -N)
- else if set -q DISPLAY; and type -q xsel
- set data (xsel --clipboard | string collect -N)
- else if set -q DISPLAY; and type -q xclip
- set data (xclip -selection clipboard -o 2>/dev/null | string collect -N)
- else if type -q powershell.exe
- set data (powershell.exe Get-Clipboard | string trim -r -c \r | string collect -N)
+ if type -q base64 && isatty stdout
+ printf '\e]52;c;?\a'
+ set -l reply
+ set -l c
+ set -l state 1
+ set -l expected \e ] 5 2 \; c \;
+ while read -n1 c <&0
+ switch $state
+ case 1 2 3 4 5 6 7
+ if test $c != $expected[$state]
+ commandline --queue -- $c
+ break
+ end
+ set state (math $state + 1)
+ case 8
+ if test $c = \a
+ break
+ end
+ set -a reply $c
+ end
+ end
+ if test -n "$reply"
+ set data (string join '' -- $reply | base64 -d | string collect -N)
+ end
+ end
+ if not set -q data[1]
+ if type -q pbpaste
+ set data (pbpaste 2>/dev/null | string collect -N)
+ else if set -q WAYLAND_DISPLAY; and type -q wl-paste
+ set data (wl-paste -n 2>/dev/null | string collect -N)
+ else if set -q DISPLAY; and type -q xsel
+ set data (xsel --clipboard | string collect -N)
+ else if set -q DISPLAY; and type -q xclip
+ set data (xclip -selection clipboard -o 2>/dev/null | string collect -N)
+ else if type -q powershell.exe
+ set data (powershell.exe Get-Clipboard | string trim -r -c \r | string collect -N)
+ end
end
# Issue 6254: Handle zero-length clipboard content
diff --git a/src/builtins/commandline.rs b/src/builtins/commandline.rs
index c96b3d2e7..06fb7a06c 100644
--- a/src/builtins/commandline.rs
+++ b/src/builtins/commandline.rs
@@ -12,7 +12,8 @@ use crate::parse_util::{
};
use crate::proc::is_interactive_session;
use crate::reader::{
- commandline_get_state, commandline_set_buffer, reader_handle_command, reader_queue_ch,
+ commandline_get_state, commandline_set_buffer, reader_handle_command,
+ reader_inject_chars_front, reader_queue_ch,
};
use crate::tokenizer::TOK_ACCEPT_UNFINISHED;
use crate::tokenizer::{TokenType, Tokenizer};
@@ -183,6 +184,7 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
let mut append_mode = None;
let mut function_mode = false;
+ let mut queue_mode = false;
let mut selection_mode = false;
let mut token_mode = None;
@@ -217,6 +219,7 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
wopt(L!("current-token"), woption_argument_t::no_argument, 't'),
wopt(L!("cut-at-cursor"), woption_argument_t::no_argument, 'c'),
wopt(L!("function"), woption_argument_t::no_argument, 'f'),
+ wopt(L!("queue"), woption_argument_t::no_argument, 'q'),
wopt(L!("tokens-expanded"), woption_argument_t::no_argument, 'x'),
wopt(L!("tokens-raw"), woption_argument_t::no_argument, '\x02'),
wopt(L!("tokenize"), woption_argument_t::no_argument, 'o'),
@@ -245,6 +248,7 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
'j' => buffer_part = Some(TextScope::Job),
'p' => buffer_part = Some(TextScope::Process),
'f' => function_mode = true,
+ 'q' => queue_mode = true,
'x' | '\x02' | 'o' => {
if token_mode.is_some() {
streams.err.append(wgettext_fmt!(
@@ -293,7 +297,7 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
let positional_args = w.argv.len() - w.woptind;
- if function_mode {
+ if function_mode || queue_mode {
// Check for invalid switch combinations.
if buffer_part.is_some()
|| cut_at_cursor
@@ -312,12 +316,26 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
}
if positional_args == 0 {
- builtin_missing_argument(parser, streams, cmd, L!("--function"), true);
+ builtin_missing_argument(
+ parser,
+ streams,
+ cmd,
+ if function_mode {
+ L!("--function")
+ } else {
+ L!("--queue")
+ },
+ true,
+ );
return STATUS_INVALID_ARGS;
}
type rl = ReadlineCmd;
for arg in &w.argv[w.woptind..] {
+ if queue_mode {
+ reader_inject_chars_front(arg);
+ continue;
+ }
let Some(cmd) = input_function_get_code(arg) else {
streams
.err
diff --git a/src/builtins/read.rs b/src/builtins/read.rs
index e7467287f..72bde2018 100644
--- a/src/builtins/read.rs
+++ b/src/builtins/read.rs
@@ -606,7 +606,7 @@ pub fn read(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Opt
loop {
buff.clear();
- if stream_stdin_is_a_tty && !opts.split_null {
+ if stream_stdin_is_a_tty && !streams.stdin_is_directly_redirected && !opts.split_null {
// Read interactively using reader_readline(). This does not support splitting on null.
exit_res = read_interactive(
parser,
diff --git a/src/reader.rs b/src/reader.rs
index 5acb96cdb..dde83eaf9 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -69,7 +69,7 @@ use crate::history::{
};
use crate::input::init_input;
use crate::input::Inputter;
-use crate::input_common::{CharEvent, CharInputStyle, ReadlineCmd};
+use crate::input_common::{CharEvent, CharInputStyle, InputEventQueuer, ReadlineCmd};
use crate::io::IoChain;
use crate::kill::{kill_add, kill_replace, kill_yank, kill_yank_rotate};
use crate::libc::MB_CUR_MAX;
@@ -877,6 +877,13 @@ pub fn reader_queue_ch(ch: CharEvent) {
}
}
+pub fn reader_inject_chars_front(chars: &wstr) {
+ if let Some(data) = current_data() {
+ data.inputter
+ .insert_front(chars.chars().map(CharEvent::from_char));
+ }
+}
+
/// Return the value of the interrupted flag, which is set by the sigint handler, and clear it if it
/// was set. If the current reader is interruptible, call \c reader_exit().
pub fn reader_reading_interrupted() -> i32 {
name-snrl
faho
Hi, @krobelus and other contributors to #9232. Are there any plans to implement pasting part?