Remove kitty hack.

clipetty.el

@@ -43,125 +43,43 @@
   :link '(emacs-commentary-link :tag "Commentary" "clipetty.el")
   :link '(emacs-library-link :tag "Lisp File" "clipetty.el"))
 
-(defcustom clipetty-assume-nested-mux nil
-  "Non-nil means if we detect a remote multiplexer, we assume it's nested.
-Nesting is the practice of running a terminal multiplexer inside
-a terminal multiplexer, which is what you'd be doing if you ran
-tmux both locally and on remote hosts you SSH into."
-  :type 'boolean)
-
-(defcustom clipetty-tmux-ssh-tty "tmux show-environment SSH_TTY"
-  "The command we send to tmux to determine the SSH_TTY.
-This default assumes that tmux is on your PATH.  If tmux lives
-elsewhere for you, or it is named something else, you can change
-it here."
-  :type 'string)
-
-(defcustom clipetty-screen-regexp "^screen"
-  "This regexp is matched against TERM to test for the presence of GNU screen.
-If you've configured GNU screen to use an unusual terminal type,
-you can change this regular expression so Clipetty will recognize
-when you're running in screen."
-  :type 'regexp)
-
-(defcustom clipetty-tmux-ssh-tty-regexp "^SSH_TTY=\\([^\n]+\\)"
-  "This regexp is used to capture the SSH_TTY from output of tmux.
-Unless you're inventing a new method for determining the SSH_TTY, after
-a detach / re-attach it's unlikely you'll need to change this."
-  :type 'regexp)
-
-(defconst clipetty--max-cut 74994
-  "The maximum length of a string you can send to the clipboard via OSC52.
-The max OSC 52 message is 100,000 bytes.  This means we can
-support base64 encoded strings of up to 74,994 bytes long.")
-
-(defconst clipetty--screen-dcs-start "\eP"
-  "The start DCS escape sequence that GNU screen recognizes.")
-
-(defconst clipetty--tmux-dcs-start "\ePtmux;\e"
-  "The start DCS escape sequence that Tmux recognizes.")
-
-(defconst clipetty--dcs-end "\e\\"
-  "The end DCS escape sequence that everyone recognizes.")
+(defconst clipetty--max-cut 320000
+  "The maximum length of a string you can send to the clipboard via OSC52.")
 
 (defconst clipetty--osc-start "\e]52;c;"
   "The initial OSC 52 escape sequence.")
 
 (defconst clipetty--osc-end "\a"
   "The end OSC 52 escape sequence.")
 
-(defun clipetty--get-tmux-ssh-tty ()
-  "Query tmux for its local SSH_TTY environment variable and return it.
-Return nil if tmux is unable to locate the environment variable"
-  (let ((tmux-ssh-tty (shell-command-to-string clipetty-tmux-ssh-tty)))
-    (if (and tmux-ssh-tty
-             (string-match clipetty-tmux-ssh-tty-regexp tmux-ssh-tty))
-        (match-string 1 tmux-ssh-tty)
-    nil)))
-
-(defun clipetty--tty (ssh-tty tmux)
-  "Return which TTY we should send our OSC payload to.
-Both the SSH-TTY and TMUX arguments should come from the selected
-frame's environment."
-  (if (not ssh-tty)
-      (terminal-name)
-    (if tmux
-        (let ((tmux-ssh-tty (clipetty--get-tmux-ssh-tty)))
-          (if tmux-ssh-tty tmux-ssh-tty ssh-tty))
-      ssh-tty)))
-
-(defun clipetty--make-dcs (string &optional screen)
-  "Return STRING, wrapped in a Tmux flavored Device Control String.
-Return STRING, wrapped in a GNU screen flavored DCS, if SCREEN is non-nil."
-  (let ((dcs-start (if screen
-		       clipetty--screen-dcs-start
-		     clipetty--tmux-dcs-start)))
-    (concat dcs-start string clipetty--dcs-end)))
-
-(defun clipetty--dcs-wrap (string tmux term ssh-tty)
-  "Return STRING wrapped in an appropriate DCS if necessary.
-The arguments TMUX, TERM, and SSH-TTY should come from the selected
-frame's environment."
-  (let* ((screen (if term (string-match-p clipetty-screen-regexp term) nil))
-         (dcs
-          (cond (screen (clipetty--make-dcs string t))
-                (tmux   (clipetty--make-dcs string))
-                (t      string))))
-    (if ssh-tty (if clipetty-assume-nested-mux dcs string) dcs)))
-
-(defun clipetty--osc (string &optional encode)
-  "Return an OSC 52 escape sequence out of STRING.
-Optionally base64 encode it first if you specify non-nil for ENCODE."
+(defun clipetty--tty ()
+  "Return which TTY we should send our OSC payload to."
+  (terminal-name))
+
+(defun clipetty--osc (string)
+  "Return an OSC 52 escape sequence out of STRING."
   (let ((bin (base64-encode-string (encode-coding-string string 'binary) t)))
-    (concat clipetty--osc-start (if encode bin string) clipetty--osc-end)))
+    (concat clipetty--osc-start bin clipetty--osc-end)))
 
 (defun clipetty--emit (string)
-  "Emit STRING, optionally wrapped in a DCS, to an appropriate tty."
-  (let ((tmux    (getenv "TMUX" (selected-frame)))
-        (term    (getenv "TERM" (selected-frame)))
-        (ssh-tty (getenv "SSH_TTY" (selected-frame))))
-    (if (<= (length string) clipetty--max-cut)
-        (write-region
-         (clipetty--dcs-wrap string tmux term ssh-tty)
-         nil
-         (clipetty--tty ssh-tty tmux)
-         t
-         0)
-      (message "Selection too long to send to terminal %d" (length string))
-      (sit-for 1))))
+  "Emit STRING to an appropriate tty."
+  (message (int-to-string (length string)))
+  (if (<= (length string) clipetty--max-cut)
+      (write-region
+       string
+       nil
+       (clipetty--tty)
+       t
+       0)
+    (message "Selection too long to send to terminal %d" (length string))
+    (sit-for 1)))
 
 (defun clipetty-cut (orig-fun string)
   "If in a terminal frame, convert STRING to a series of OSC 52 messages.
 Since this is intended to be used with `add-function', ORIG-FUN is
 the original `interprogram-cut-function' that we're advising."
   (unless (display-graphic-p)
-    ;; An exclamation mark is an invalid base64 string. This signals to the
-    ;; Kitty terminal emulator to reset the clipboard.  Other terminals will
-    ;; simply ignore this.
-    ;;
-    ;; TODO: Support longer than `clipetty--max-cut' length messages in Kitty.
-    (clipetty--emit (clipetty--osc "!"))
-    (clipetty--emit (clipetty--osc string t)))
+    (clipetty--emit (clipetty--osc string)))
   ;; Always chain to the original cut function.
   (funcall orig-fun string))