From 22940880a50764b8e3c3631ebc80c9ad38a70cd2 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Tue, 14 May 2024 12:24:45 +0700
Subject: [PATCH] #301 add clipboard sync to server button

---
 html5/icons/clipboard.png | Bin 0 -> 1441 bytes
 html5/index.html          |  12 ++++++++++++
 html5/js/Client.js        |  11 ++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 html5/icons/clipboard.png

diff --git a/html5/icons/clipboard.png b/html5/icons/clipboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cb162d4f3ebe6a64575b678fb4f8e22ac3c3cf
GIT binary patch
literal 1441
zcmV;S1z!4zP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+z12_I3vC$uB-q61ujWM
zK~!ko%~(r_990xOw_a6s4>O&_NHT_)h$Q%pE=KV~7K#WXZZttO1hX_7VMI4B9mqC2
zvoRaNMOH3Uln`VV*$4?PdKSrq&|x4mnM@`<-95i_cU8T6UDT&*2s720s($#IM>jN8
z?|#lX_udB-ylS;t@_S-pV$*+<laoas2P*o7^Yinl*X!2E$jFyL5WL3BtJP}tkJG15
zPXoZ&vuAPf;zj%~*Oe<*006VIv%l18HJO>2kvn(p$o%~L+WGV6-x<W2)>eOf_u1=D
z{Ic=!aa_7|X@99yI@4@6_0-hVwS|R++1<N$kBp6teZNy9zd3PiXAg?}`NYputJR4{
zqal|sU;YQc=trM?@%-ZAqP~9p`aJ+o?Zl4fp0;+*fnU#kI(cA^JI)NfwWEw~rwbf-
zOTGC1nO7XQv}<*xxi&NP^R2yyUb2q7`SBZp?@N7g?(Y4oKh9O`E?LS6PnRvAL7;oh
z?(NTi`28yY!HylM{&ecT<JF&e+-QJ>;8O|R@<F&qK1Aiv7<{h{-}mKFyG{G{kK*Cd
z5^QCO>$<QVhl0)q)^Gg<r+E`4=|D*risUg%ECOl`XXV=qQ^#vd-i@v7v$J8uKC{46
z6^Oel44D9HZ4afx$Du}FLwRH$bl_pR{s2J`!1Fv35hwy6j8<!v9LIs<IIwL8<(E%_
z`2^bQ_u)Ud0WAKD;UPD2f}kXT>(wE`I$%-T*_Y`63!pV)=!Fk(@a<C&W-Kq);VnG`
z*+cMkfKF=}T5AMBfFKB<wZ`!9FaV%jE~C|I!S{VArC{4OENcTwDOh#|*0b-z-}@>K
zA3FxubpaxDn{%lDeGVd>Opw^wOa@p4WS3x<EAYK88mnzQ>S}O%70jF%t+fU-gNRV6
zRN(tQL<G!?PNxIQvS3+OXng8h#KOu(7YBCj1rfn_hQKMP=5jzHmI(_)!VLh-46Q?6
z6A^6NhEfV50;Lp~8I48*T5Gtj3nGGufQUduk#V7OuIr*yDkbkuI2N8w`5?rA#XYf5
zO5y0yqlxj`^G6b6w=G7N1>3ea1x*AH1_+Wj15qTR=*Q7cA6V3iGawwo764@+s2>$d
zglFI@ovl!&v!Aj1ii)K0FN1eQ;*SUfLb)>#?l2WHU<ZgO3>Zi9A={J4%B}-(^o;~R
zIg9%|&+f+o;+`W$AS42ogvclWLefL00SHNodt4NWIZCY=2!&e<KvEcqVGKeLfleHu
zyc|f|Y!E^m1&#8y5>X_W%|fUr8U-|Sn;JQTDik#n`J1_3APhlB;!ZU?URHn6h_he_
zLP#K#*~<2(Lfq?32JZzW!D10e-g!W?P+S#71j1}Ug<=^+CW*5ll<H5+bfQuF9z!;R
z#8y8L3dtl!W&)&|M+WlCsAd79C!<CnB+;3i9kl*c$RLCymhU3wfq1w!51}Y<xeHk;
z14bc~;zG`eENbW=<{*@+!jzW-$$V-MLTT;+loLYHHVvUzGqPr~YzT3WP$pGKbL>RU
z48%8O@#WUQyV1B3Clg@aIuI8!^idWI?np%nxLVwVe;NEdu&MT-h|As7wF-f<M4=!Y
z_1YKYZKr|Wcqaxx6wdI}<6Qomxlr2H7jI+s+HXc6<ZU#;fsZ~0vi>pvB3YT6rj@(X
zFtsca0Hyqetm9*yePIv`FG0I2e!x1&<-pbHg|E8-zb7n~N%M(-jn3-B)+5vok5+K^
v!P?IBI9dvTV|d#D)Sk)^ZeBRKrH%gq@ptzCIsjU~00000NkvXXu0mjf){~SC

literal 0
HcmV?d00001

diff --git a/html5/index.html b/html5/index.html
index 83076c70..0e3530c9 100644
--- a/html5/index.html
+++ b/html5/index.html
@@ -257,6 +257,14 @@
               data-icon="keyboard"
             ></a>
           </li>
+          <li class="-hasSubmenu -noChevron">
+            <a
+              href="#"
+              id="clipboard_button"
+              title="Clipboard Copy"
+              data-icon="content_copy"
+            ></a>
+          </li>
           <li class="-hasSubmenu -noChevron">
             <a
               href="#"
@@ -1592,6 +1600,10 @@ <h2>Xpra Bug Report</h2>
           toggle_keyboard();
         });
 
+        $("#clipboard_button").on("click", function (e) {
+          client.read_clipboard(e);
+        });
+
         // Configure Xpra tray window list right click behavior.
         $("#open_windows_list")
           .siblings("a")
diff --git a/html5/js/Client.js b/html5/js/Client.js
index 54ae8255..f8f7fe44 100644
--- a/html5/js/Client.js
+++ b/html5/js/Client.js
@@ -96,6 +96,7 @@ class XpraClient {
     this.debug_categories = [];
     this.start_new_session = null;
     this.clipboard_enabled = false;
+    this.clipboard_poll = false;
     this.file_transfer = false;
     this.remote_file_size_limit = 0;
     this.remote_file_chunks = 0;
@@ -1662,6 +1663,7 @@ class XpraClient {
       selections = ["CLIPBOARD", "PRIMARY"];
       this.log("legacy clipboard");
     }
+    this.log("clipboard polling: ", this.clipboard_poll);
     return {
       "enabled" : this.clipboard_enabled,
       "want_targets" : true,
@@ -2119,7 +2121,7 @@ class XpraClient {
   }
 
   _poll_clipboard(e) {
-    if (this.clipboard_enabled === false) {
+    if (!this.clipboard_poll) {
       return;
     }
     //see if the clipboard contents have changed:
@@ -2127,6 +2129,13 @@ class XpraClient {
       //we're still waiting to set the clipboard..
       return false;
     }
+    this.read_clipboard(e);
+  }
+
+  read_clipboard(e) {
+    if (this.clipboard_enabled === false) {
+      return;
+    }
     if (navigator.clipboard && navigator.clipboard.clipboardData) {
       this.debug("clipboard", "polling using", navigator.clipboard.clipboardData);
       this.read_clipboard_data();