Ticket #1424: html5-clipboard.patch

html5/index.html

@@ -53 +53 @@
                 <div class="notifications">
                 </div>
 
-                <input id="pasteboard" onblur="this.focus()" autofocus />
+                <!--  <input id="pasteboard" onblur="this.focus()" autofocus />  -->
 
+            <div>
+                    <textarea id="pasteboard" onblur="this.focus()" autofocus style="display: block; position: absolute; left: -99em;"></textarea>
+            </div>
+
                 <script>
 
-                        if (!window.location.getParameter ) {
+                        if (!window.location.getParameter) {
                                 window.location.getParameter = function(key) {
                                         function parseParams() {
                                                         var params = {},
@@ -248 +252 @@
                                 var ssl = document.location.protocol=="https:";
                             client.connect(server, port, ssl);
 
-                            // attach a callback for paste on the screen
+                            //clipboard hooks:
                                 $('#pasteboard').on('paste', function (e) {
-                                        e.preventDefault();
-                                        var text = (e.originalEvent || e).clipboardData.getData('text/plain');
-                                        client.handle_paste(text);
+                                        var paste_data = (e.originalEvent || e).clipboardData.getData('text/plain');
+                                client._send_clipboard_token(paste_data);
+                                return false;
                                 });
-
-                            // try to ensure the browser doesn't fire shortcuts
-                            // (ie: we want control-S to be sent to the application, not trigger the save-page browser action)
-                                $(window).bind('keydown', function(event) {
-                                    if (event.ctrlKey || event.metaKey) {
-                                    event.preventDefault();
-                                    }
+                                $('#pasteboard').on('copy', function (e) {
+                                        var paste_data = (e.originalEvent || e).clipboardData.getData('text/plain');
+                                $('#pasteboard').text(client.clipboard_buffer);
+                                $('#pasteboard').select();
+                                client.clipboard_pending = false;
+                                return true;
                                 });
+                                $('#pasteboard').on('cut', function (e) {
+                                        var paste_data = (e.originalEvent || e).clipboardData.getData('text/plain');
+                                $('#pasteboard').text(client.clipboard_buffer);
+                                $('#pasteboard').select();
+                                client.clipboard_pending = false;
+                                return true;
+                                });
+                                $('#screen').on('click', function (e) {
+                                        //console.log("click pending=", client.clipboard_pending, "buffer=", client.clipboard_buffer);
+                                        if (client.clipboard_pending) {
+                                        $('#pasteboard').text(client.clipboard_buffer);
+                                        $('#pasteboard').select();
+                                                //for IE:
+                                                if (window.clipboardData && window.clipboardData.setData) {
+                                                clipboardData.setData("Text", this.clipboard_buffer);
+                                                }
+                                            else {
+                                                        var success = document.execCommand('copy');
+                                                        //console.log("copy success=", success);
+                                                }
+                                        }
+                                });
                         });
                 </script>
         </body>

html5/js/Client.js

@@ -190 +190 @@
 XpraClient.prototype.init_clipboard = function() {
         // the "clipboard"
         this.clipboard_buffer = "";
+        this.clipboard_pending = false;
         this.clipboard_targets = ["UTF8_STRING", "TEXT", "STRING", "text/plain"];
 }
 
@@ -207 +208 @@
         // to allow multiple clients on the same page
         if (window.jQuery) {
                 jQuery(document).keydown(function (e) {
-                        e.preventDefault();
-                        me._keyb_onkeydown(e, me);
+                        return me._keyb_onkeydown(e, me);
                 });
                 jQuery(document).keyup(function (e) {
-                        e.preventDefault();
-                        me._keyb_onkeyup(e, me);
+                        return me._keyb_onkeyup(e, me);
                 });
                 jQuery(document).keypress(function (e) {
-                        e.preventDefault();
-                        me._keyb_onkeypress(e, me);
+                        return me._keyb_onkeypress(e, me);
                 });
         } else {
                 document.onkeydown = function (e) {
-                        me._keyb_onkeydown(e, me);
+                        return me._keyb_onkeydown(e, me);
                 };
                 document.onkeyup = function (e) {
-                        me._keyb_onkeyup(e, me);
+                        return me._keyb_onkeyup(e, me);
                 };
                 document.onkeypress = function (e) {
-                        me._keyb_onkeypress(e, me);
+                        return me._keyb_onkeypress(e, me);
                 };
         }
 }
@@ -394 +392 @@
         }
 }
 
-XpraClient.prototype.handle_paste = function(text) {
-        // set our clipboard buffer
-        this.clipboard_buffer = text;
-        // send token
-        var packet = ["clipboard-token", "CLIPBOARD"];
-        this.protocol.send(packet);
-        // tell user to paste in remote application
-        // alert("Paste acknowledged. Please paste in remote application.");
-}
 
 XpraClient.prototype._keyb_get_modifiers = function(event) {
         /**
@@ -467 +456 @@
                 str = str.toLowerCase();
 
         if (this.topwindow != null) {
-                //show("win="+win.toSource()+", keycode="+keycode+", modifiers=["+modifiers+"], str="+str);
+                //send via a timer so we get a chance to capture the clipboard value,
+                //before we send control-V to the server:
                 var packet = ["key-action", this.topwindow, keyname, pressed, modifiers, keyval, str, keycode, group];
-                this.protocol.send(packet);
+                var protocol = this.protocol;
+                setTimeout(function () {
+                        //show("win="+win.toSource()+", keycode="+keycode+", modifiers=["+modifiers+"], str="+str);
+                        protocol.send(packet);
+                }, 0);
         }
+        this.log("key", keyname);
+        //only allow key events that need to be seen by the browser
+        //for handling the clipboard
+        if (keyname=="Control_L" || keyname=="Control_R") {
+                return true;
+        }
+        if (keyname=="Shift_L" || keyname=="Shift_R") {
+                return true;
+        }
+        if (shift && keyname=="Insert") {
+                return true;
+        }
+        var control = modifiers.indexOf("control")>=0;
+        if (control) {
+                var l = keyname.toLowerCase();
+                if (control && (l=="c" || l=="x" || l=="v")) {
+                        return true;
+                }
+        }
+        //this.log("keyname=", keyname, "modifiers=", modifiers);
+        return false;
 }
 
+
 XpraClient.prototype._keyb_onkeydown = function(event, ctx) {
-        ctx._keyb_process(true, event);
-        return false;
+        return ctx._keyb_process(true, event);
 };
 XpraClient.prototype._keyb_onkeyup = function(event, ctx) {
-        ctx._keyb_process(false, event);
-        return false;
+        return ctx._keyb_process(false, event);
 };
 
 XpraClient.prototype._keyb_onkeypress = function(event, ctx) {
@@ -498 +512 @@
         var modifiers = ctx._keyb_get_modifiers(event);
 
         /* PITA: this only works for keypress event... */
-        caps_lock = false;
         var shift = modifiers.indexOf("shift")>=0;
-        if (keycode>=97 && keycode<=122 && shift)
-                caps_lock = true;
-        else if (keycode>=65 && keycode<=90 && !shift)
-                caps_lock = true;
+        if (keycode>=97 && keycode<=122 && shift) {
+                ctx.caps_lock = true;
+        }
+        else if (keycode>=65 && keycode<=90 && !shift) {
+                ctx.caps_lock = true;
+        }
+        else {
+                ctx.caps_lock = false;
+        }
         //show("caps_lock="+caps_lock);
         return false;
 };
@@ -768 +786 @@
                 //not handled yet, but we will:
                 "clipboard_enabled"                     : true,
                 "clipboard.want_targets"        : true,
-                "clipboard.selections"          : ["CLIPBOARD"],
+                "clipboard.greedy"                      : true,
+                "clipboard.selections"          : ["CLIPBOARD", "PRIMARY"],
                 "notifications"                         : true,
                 "cursors"                                       : true,
                 "bell"                                          : true,
@@ -792 +811 @@
         mydiv.id = String(wid);
         var mycanvas = document.createElement("canvas");
         mydiv.appendChild(mycanvas);
-        document.body.appendChild(mydiv);
+        var screen = document.getElementById("screen");
+        screen.appendChild(mydiv);
         // set initial sizes
         mycanvas.width = w;
         mycanvas.height = h;
@@ -1622 +1642 @@
         }
 }
 
+
+XpraClient.prototype._send_clipboard_token = function(data) {
+        this.log("sending clipboard token with data:", data);
+        var packet = ["clipboard-token", "CLIPBOARD", [], "STRING", "STRING", data.length, "bytes", data, false, true, true];
+        this.protocol.send(packet);
+}
+
 XpraClient.prototype._process_clipboard_token = function(packet, ctx) {
+        ctx.log("clipboard token:", packet);
         // only accept some clipboard types
         if(ctx.clipboard_targets.indexOf(packet[3])>=0) {
-                // we should probably update our clipboard buffer
                 ctx.clipboard_buffer = packet[7];
-                // prompt user
-                prompt("Text was placed on the remote clipboard:", packet[7]);
+                ctx.clipboard_pending = true;
         }
 }
 

xpra/clipboard/clipboard_base.py

@@ -196 +196 @@
         #older versions always claimed the selection when the token is received:
         claim = True
         if len(packet)>=10:
-            claim = packet[8]
+            claim = bool(packet[8])
             #clients can now also change the greedy flag on the fly,
             #this is needed for clipboard direction restrictions:
             #the client may want to be notified of clipboard changes, just like a greedy client
-            proxy._greedy_client = packet[9]
-        proxy.got_token(targets, target_data, claim)
+            proxy._greedy_client = bool(packet[9])
+        synchronous_client = len(packet)>=11 and bool(packet[10])
+        proxy.got_token(targets, target_data, claim, synchronous_client)
 
     def _get_clipboard_from_remote_handler(self, proxy, selection, target):
         for x in DISCARD_TARGETS:
@@ -661 +662 @@
                     glib.idle_add(self.remove_block)
         gtk.Invisible.do_selection_clear_event(self, event)
 
-    def got_token(self, targets, target_data, claim):
+    def got_token(self, targets, target_data, claim=True, synchronous_client=False):
         # We got the anti-token.
         if not self._enabled:
             return
@@ -672 +673 @@
             #re-enable the flag via idle_add so events like do_owner_changed
             #get a chance to run first.
             glib.idle_add(self.remove_block)
-        if CLIPBOARD_GREEDY and self._can_receive:
+        if (CLIPBOARD_GREEDY or synchronous_client) and self._can_receive:
             if targets:
                 for target in targets:
                     self.selection_add_target(self._selection, target, 0)
@@ -682 +683 @@
                     if text_target in target_data:
                         text_data = target_data.get(text_target)
                         log("clipboard %s set to '%s'", self._selection, repr_ellipsized(text_data))
-                        self._clipboard.set_text(text_data)
+                        self._clipboard.set_text(text_data, len=len(text_data))
         if not claim:
             log("token packet without claim, not setting the token flag")
             #the other end is just telling us to send the token again next time something changes,