From ad17454c532b226bc069e7636aa68f18f4d5f4be Mon Sep 17 00:00:00 2001 From: Unrud Date: Thu, 28 Jun 2018 03:04:03 +0200 Subject: [PATCH 001/311] Add links to binaries --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 4bda6c8..17d955c 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,11 @@ To take control open the displayed URL or scan the QR code. Supports Linux/X11 and Windows. +## Installation + + * [Flatpak](https://flathub.org/apps/details/com.github.unrud.RemoteTouchpad) + * [Windows](https://github.com/Unrud/remote-touchpad/releases/latest) + ## Screenshots ![screenshot 1](https://raw.githubusercontent.com/Unrud/remote-touchpad/master/screenshots/1.png) From 931dff5f049a56fd5ab797ed408bd464ee575ab6 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 22 Jul 2018 10:34:47 +0200 Subject: [PATCH 002/311] set correct license --- desktop/remote-touchpad.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/remote-touchpad.appdata.xml b/desktop/remote-touchpad.appdata.xml index 4808eb4..4f2b2b0 100644 --- a/desktop/remote-touchpad.appdata.xml +++ b/desktop/remote-touchpad.appdata.xml @@ -2,7 +2,7 @@ remote-touchpad.desktop CC0-1.0 - AGPL-3.0-or-later + GPL-3.0-or-later Remote Touchpad Control mouse and keyboard from a smartphone From 5ef0e86ab873424f96a390e459d7f7c045b0a2e8 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 22 Jul 2018 10:36:28 +0200 Subject: [PATCH 003/311] add setting for mouse polling interval --- bindata.generated.go | 4 ++-- main.go | 8 ++++++++ webdata/fn.js | 24 ++++++++++++++++++++---- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/bindata.generated.go b/bindata.generated.go index 5528843..d66bb51 100644 --- a/bindata.generated.go +++ b/bindata.generated.go @@ -74,7 +74,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _webdataFnJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\xdd\x6f\xdb\xb6\xb7\xef\xf9\x2b\x4e\xf5\x50\xc8\x8d\x23\xdb\x29\x7a\x37\xd4\x75\xee\xf5\x52\x77\x09\x96\x34\x81\xed\x6c\x35\x82\xa0\xa0\xa5\x63\x5b\xab\x4c\x6a\x22\x15\x27\xbd\xcd\xff\x7e\x41\x7d\x52\x14\x25\xa7\x1d\xfa\x72\xf1\x33\xb0\x4e\x21\xcf\x39\x3c\xdf\x1f\x94\x7a\xaf\x0e\xe0\x15\x00\xc0\x29\x0b\x1f\x23\x7f\xbd\x11\x60\xbb\x1d\x38\xee\x0f\x7e\x85\x1b\x1a\xc5\xde\xbb\x58\xfe\xfb\x3f\x2c\x16\x01\x63\x5f\x1c\x97\x6d\x4f\x0e\x20\x47\x9a\x6f\x7c\x0e\x2b\x3f\x40\xf0\x39\x84\x24\x12\xc0\x56\x30\xc5\x2d\x13\x78\x34\x67\xb1\xbb\x09\x89\xe7\x94\xe0\x1f\x18\x5b\x92\x48\xc2\xae\x22\x44\xe0\x6c\x25\x76\x24\xc2\xb7\xf0\xc8\x62\x70\x09\x85\x08\x3d\x9f\x8b\xc8\x5f\xc6\x02\xc1\x17\x40\xa8\xd7\x63\x11\x6c\x99\xe7\xaf\x1e\x33\x22\xbe\x80\x98\x7a\x18\x81\xd8\x20\x08\x8c\xb6\x5c\x1e\x2a\xff\xf8\xfd\xe3\x0d\xfc\x8e\x14\x23\x12\xc0\x75\xbc\x0c\x7c\x17\x2e\x7c\x17\x29\x47\x20\x1c\x42\xb9\xc2\x37\xe8\xc1\x32\x27\x25\x91\x3e\x48\x4e\x66\x19\x27\xf0\x81\xc5\xd4\x23\xc2\x67\xb4\x0b\xe8\x8b\x0d\x46\x70\x8f\x11\xf7\x19\x85\xd7\xf9\x31\x19\xcd\x2e\xb0\x28\xa3\x63\x13\x21\x45\x88\x80\x85\x12\xb5\x03\x84\x3e\x42\x40\x44\x89\xad\x28\x41\x53\x8f\xd4\x46\x29\xb4\x07\x3e\x4d\x0e\xd9\xb0\x10\x41\x6c\x88\x90\xf2\xee\xfc\x20\x80\x25\x42\xcc\x71\x15\x07\xdd\x8c\xd0\x32\x16\xf0\xd7\xf9\xfc\xec\xea\x66\x0e\xe3\x8f\x0b\xf8\x6b\x3c\x9d\x8e\x3f\xce\x17\x43\xd8\xf9\x62\xc3\x62\x01\x78\x8f\x29\x35\x7f\x1b\x06\x3e\x7a\xb0\x23\x51\x44\xa8\x78\x04\xb6\xca\x88\x5c\x4e\xa6\xa7\x67\xe3\x8f\xf3\xf1\x6f\xe7\x17\xe7\xf3\x05\xb0\x08\x3e\x9c\xcf\x3f\x4e\x66\x33\xf8\x70\x35\x85\x31\x5c\x8f\xa7\xf3\xf3\xd3\x9b\x8b\xf1\x14\xae\x6f\xa6\xd7\x57\xb3\x89\x03\x30\x43\xc9\x1c\x66\x34\x5a\xf4\xbe\x4a\xac\x17\x21\x78\x28\x88\x1f\xf0\x52\x0f\x0b\x16\x03\xdf\xb0\x38\xf0\x60\x43\xee\x11\x22\x74\xd1\xbf\x47\x0f\x08\xb8\x2c\x7c\xdc\x6f\xd3\x94\x0c\x09\x18\x5d\x27\x02\x67\xde\xe5\x00\x9c\xaf\x80\x32\xd1\x05\x8e\x08\xef\x36\x42\x84\x6f\x7b\xbd\xdd\x6e\xe7\xac\x69\xec\xb0\x68\xdd\x0b\x52\x02\xbc\x77\x22\xd9\xe9\x1d\x1c\x40\xaf\x07\xb7\x03\x48\x4c\xd2\x85\xe3\xf4\x01\x79\x17\x5e\xe7\x8f\x77\x07\x2e\xa3\x5c\xc0\xfc\xea\xe6\xf4\xec\xf3\xe5\xd5\x9f\x93\xcf\xf3\xb3\xe9\x64\x76\x76\x75\xf1\x1e\x46\x70\x3b\xe8\x77\x61\xf0\x46\xfe\x77\x37\xac\x80\xce\xcf\x2f\x27\xd2\x40\x23\x38\x7e\xd3\xcf\xb7\x12\xfc\xcb\x9b\x0b\xb9\x3c\xc8\x17\x67\xa7\xd3\xab\x8b\x8b\x7c\xb9\xef\xf4\xdf\x0c\x0f\x24\x5f\xb7\xe1\x43\x8f\x77\x61\x1b\x07\xe2\xae\x0b\x8e\xe3\xe4\xbc\x5c\x5f\x9d\x7f\x9c\x4f\xa6\x9f\xc7\xa7\xa7\x93\x8b\xc9\x74\x3c\x3f\xbf\xfa\x28\x79\xb9\xed\x77\xa1\x7f\xd7\x85\xdb\x5f\x7f\xe9\xc2\x40\x3e\x0c\x7e\x79\x9d\x3d\xbd\x79\xf3\xba\x0b\xc7\x77\x05\x93\x37\xd7\xef\xc7\xf3\xc9\xe7\x84\xd0\x9f\xe3\x0b\x18\x81\xc2\xe5\xf8\xd3\xe7\xf3\xf7\x17\x93\xcf\x29\xd0\x4c\x32\xdb\x1f\x1e\x1c\xdc\x93\x08\x76\x7c\x98\xfc\x3f\x24\x5e\xf1\x10\x90\x25\x06\xd9\xbe\x90\x6a\xbb\x64\xd2\x9e\x23\x58\x91\x80\xe3\xb0\x5c\x9f\x09\x99\x29\x46\xd0\x57\xd6\x2e\x08\x17\x13\xea\x69\xab\x53\x0c\x90\x70\xf4\x4e\x59\x4c\x15\x0c\x46\xd7\xcc\xa7\xeb\xcc\x36\x52\xe6\xbb\x74\x63\xcb\xee\xf1\xd3\x2c\xde\x96\xa0\x72\x65\x51\x59\xe1\x6e\xc4\x82\xe0\x93\x61\xad\x0a\xe7\x45\x64\xbd\xf6\xe9\xba\x2a\x40\xbe\x3a\xf7\xb7\x28\x43\x6c\x04\x34\x0e\x82\x74\x2f\x0e\x3d\x22\x50\xee\x44\x95\x75\xdf\x0b\xf0\x26\xd9\xe3\x29\xf9\x83\x55\x4c\x5d\x99\x29\x60\x15\x07\x01\x77\x23\x44\x3a\xa1\x64\x19\xa0\x67\x77\xe0\x7f\x0f\x64\x50\x45\x28\xe2\x88\x82\xed\x31\x37\xde\x22\x15\x4e\x0d\x14\xbe\x7d\x4b\x20\xe5\xaf\x80\xda\xe1\xf2\x8b\x2f\x3e\x3c\x0b\x76\xcb\xbe\x4a\xc0\xd9\x7e\x40\xde\x4a\x30\x51\x4f\x67\x78\xf0\xa4\x08\x16\xe1\x3f\x31\x72\x85\x11\x1b\x73\xc9\xfc\x15\xd8\xe8\xd4\x00\xf2\x6d\xf9\x33\x6c\xdb\x9d\x61\xb2\xfd\x04\x18\x70\xcc\x88\xa4\xd2\x4e\xdb\x49\x35\x00\x19\x09\x6e\xd9\x57\x05\x70\x66\xa0\x66\x82\x30\x93\xe2\x7b\xf8\x32\x00\x14\x84\x2a\xba\xc4\x07\xbf\x02\xa3\xe8\xb1\x30\x51\x15\x46\x3d\xa8\x01\xc4\xc0\xb3\xe6\x44\x93\xfd\x24\x4d\x80\x6d\x84\xb7\xec\xeb\x29\xa1\x2e\x06\x66\xed\xb6\xc1\xb5\x92\xe5\xcf\xe0\x55\x07\x32\xeb\x5a\x89\xb2\x00\x25\xde\xb3\x02\x32\x05\x7d\x5e\x40\xb6\xc0\x56\x03\xb2\x0d\x90\xb7\x12\x94\xa9\x47\x8b\x47\xe2\x79\x25\x8a\xbb\x21\x74\x8d\x93\x7b\xa4\xe2\xc2\xe7\x42\x96\x57\x3b\xc8\x1e\x8c\xde\x55\x17\xf5\xc5\x68\x94\xb4\x61\x2b\x9f\xa2\x67\xd4\x37\xf1\xbc\xea\x09\xd6\x4a\x63\xc0\xea\x42\x71\xea\x3e\x67\xac\xcb\xfb\x23\x1c\xa4\xb4\x7e\x8c\x0f\xa3\x71\x7e\x84\x89\x2d\xfb\xfa\x83\x1c\x18\xac\xfe\x23\x0c\x5c\xce\x4a\x3a\xa7\x4d\xe7\x57\xbc\x47\x76\x64\x49\xb5\xb5\x45\xda\x23\x09\x7f\x8b\x33\x41\xb6\xa1\x16\x1d\xe5\xf9\xbe\x87\x54\xf8\x2b\x1f\xa3\xb7\x69\x2d\x77\xca\x95\x6e\x01\x15\x92\x35\x7e\xca\x01\x92\x3f\xb4\xbd\xa4\x57\x68\x01\x58\xa8\x7b\x0b\x6d\xaf\x86\xac\x00\x14\x12\xbc\x2d\x1f\x53\xc9\xab\x81\xa3\xf6\x1a\xe7\xd4\xc3\x87\xdf\x1e\xcf\x3d\xdb\xf7\xe6\xec\x83\x4f\x0b\x8d\xcb\x3e\xd7\x4e\x6a\x7d\x52\xe1\xc1\x87\x77\x5a\x97\xe2\x04\x48\xd7\x62\x33\x04\xff\xf0\x50\xb5\x53\xda\x20\xc0\x48\x03\xbf\xf5\xef\x14\x85\x0d\x0f\x4a\xbd\xae\xc0\x96\xf0\x23\xd0\x79\xc8\x7f\x99\x29\xfc\x61\xb1\xfa\x74\x50\xfe\x9b\xed\x1e\x0d\xaa\x62\xba\x24\x70\x63\x39\xb2\x5c\x33\x9f\x0a\x8c\xc6\xae\x8b\x01\x46\xc9\x28\x74\x19\x07\xc2\xe6\x21\x62\xab\xb8\xa6\x76\xb4\x49\x68\x7e\x0c\x23\x23\xc2\xad\x7f\x77\xdb\xbf\x2b\x39\x27\x6d\x80\x03\x05\x50\xaa\x85\x1f\xc3\xbb\x11\x54\x18\xcd\x7f\x2e\xa3\xc2\xa7\x31\xea\x3a\x29\x34\x2a\x15\xda\x6f\xd0\x24\x39\x36\xa1\xf1\x41\x23\x6b\x47\x03\x4d\x8a\x76\x50\x55\x8e\xbc\xca\xa4\xfa\x3e\xe2\x83\x0e\xf4\xa4\x64\xf2\xa9\x03\xaf\xc0\x26\xc7\x47\x64\xd0\x81\x43\x20\x83\xa1\x62\x56\x29\x44\x8b\x05\xe0\xa4\x2a\x5d\x76\x8c\x91\xa7\x16\x32\x2a\xb7\x15\x77\x1a\xe8\x41\xf3\xbe\xda\x27\x17\x55\xb4\xa9\x7f\x96\x7b\x3b\xee\x70\xa4\x9e\x6d\x2d\x07\xc3\xbe\xa5\x15\xb0\xb4\xb9\x96\x23\xc5\x98\x7a\xb3\xa4\x5f\xaf\x74\x42\x95\xe6\x3b\xa5\xaa\x0a\xcc\xe8\x4d\x01\x90\xf0\x53\x75\x1d\x7d\x0e\x3a\x81\x3e\xbc\x7c\x59\xed\xdc\x0d\x0e\x52\xed\xf8\x39\x8a\x73\x19\x3b\xf7\x24\xb0\xb5\xf3\xba\xfa\xa4\xd5\xa9\x47\x67\x55\x81\x1a\xbb\xb9\xa4\x0a\x43\x87\xc9\xf0\x98\xe7\x90\x64\xf4\x81\x11\x5c\x12\xb1\x71\x44\x14\x53\xd7\xce\xa7\xa1\x4e\x15\x6a\x51\x87\x5a\x94\x50\x52\x1b\xc9\x2e\x59\xf2\x94\x42\x07\x4e\x46\x30\x80\x6f\xdf\xa0\xb2\xbe\x48\xd7\x55\x95\x14\xe3\xd7\xd1\x28\x7d\x1e\x56\xb6\x16\xca\xd6\x42\xd1\xbf\x3e\x1e\xe5\x1b\x85\x3f\x6c\x2d\x38\xcc\x04\x3c\x04\x6b\x98\xff\xb5\xe8\xa8\x9e\xa8\xcc\x76\x55\x01\xcb\x81\x4f\x51\x44\x36\xf1\x99\x20\x9b\x94\x91\xd1\x31\xa8\x23\xc3\xab\x2b\x44\x99\x35\x8f\x46\xf9\x5f\x43\x6d\x7b\x51\xd9\xfe\x2e\xc5\x70\xa9\x8a\x5c\xe8\x5c\x35\x39\x37\x7a\x7a\x50\xc9\x9d\x8c\x6a\xe3\xbd\xca\xb7\x1b\x20\x89\x0a\x5f\x56\xbc\x5c\x71\x5b\xd3\xb4\x5b\x77\xe4\x0d\xa1\x5e\x80\x49\x21\xb6\xf1\x5e\xa8\x11\x6b\xac\x8f\xb5\x30\xab\xdc\x18\xe0\xbd\x70\x8a\x6a\x3d\xac\xc2\x68\xb7\x0d\x95\x3d\xc3\x3d\x42\xbe\x5f\x1f\xf3\xab\x2e\x25\x8a\x4b\x06\x79\x78\xda\xae\x79\x19\xcf\xc3\xc6\x62\x28\xda\x8b\xbe\x14\x5f\x94\x85\x5e\x90\x68\x8d\x69\x2f\x17\x12\x4f\x26\x9e\xc6\xcd\xe4\x92\xe5\x7b\xaa\x9b\xe4\x3a\x8c\x50\x76\x80\xef\x71\x45\x64\x29\x57\x8c\xa8\xd9\x20\x8c\xf9\xc6\xd6\x9a\xbd\x84\x8b\x6e\x55\xf5\x9d\x8e\xa6\xe0\xca\xf5\x8d\x2a\xe5\x8b\x5c\xbf\x3a\xcf\xca\x55\x4d\x73\xca\xaa\x65\x8f\xb6\xcc\x55\x95\xbb\x72\xcd\xd3\x96\x0d\xb4\x40\x6c\x4f\x08\xb9\x58\x7a\x19\x7b\x61\x28\x39\x45\x20\xe5\x49\x5c\x43\xd2\x64\x6c\xab\x8c\x06\x67\x15\x51\xdd\xde\xa6\xd0\x9b\x50\x4f\x0d\xbc\x9f\xe6\xd2\x69\x1f\xfb\xa0\x35\xb2\x65\xc7\x2c\x4c\x7d\xad\xa6\x55\x89\xff\xae\x5e\x65\xdb\xdc\x5b\x73\x60\x1e\x06\xbe\x8b\x92\x50\x17\x06\xba\x93\x56\xb2\xc0\xe1\x61\xa3\x0b\x1b\xb2\x4c\x99\x45\x0d\xf9\xe4\xc4\x78\x2d\x9c\x29\xaa\x96\xcb\xf2\x3c\x55\x1a\xf0\xe9\x19\x29\xb1\x48\x0a\xda\xd1\xb2\x14\xbd\x7c\x69\x74\x12\xf5\xe4\x5a\x6b\xf5\x13\xce\x7d\xa1\x88\xf7\xf2\x65\x55\x8b\x70\xa4\x26\xf2\x77\xd5\xcb\x71\xdd\x8d\x96\xb1\x10\x8c\xd6\x73\x89\x29\x95\x6b\x05\x17\xd2\xf7\x22\x29\xfa\x40\x71\x98\x72\x9c\x36\x53\x39\x6e\xa4\xf2\x5a\xa1\xb2\x87\xc8\xeb\x46\x22\xc6\x09\xa2\x34\x8a\x2c\xdb\x19\xac\xac\xe2\x03\x4b\x0b\x8c\x9c\x8e\x41\xda\x7a\xda\xe0\x28\xf2\x8c\x53\xeb\xc3\xbb\x9a\xe6\x6b\x1a\xaa\x12\x6f\xe4\xb0\x6f\xed\x69\x60\xd3\xe4\x93\x5e\xe2\xfd\x27\xff\xfc\xeb\xfc\x03\x6d\xd9\xa3\xae\x77\x09\xa5\x6b\x9d\xc7\xdb\x4f\x65\x4c\x65\x2b\x8b\xea\xca\xff\x27\xcb\x24\x6f\x6b\x7c\x2e\xf2\x8a\xce\xff\x89\x44\xda\xcc\x87\x6c\xa7\x1e\x9a\xdc\x2a\xc1\x51\xed\x02\xc6\x7b\xc8\xf6\x92\xa4\xd5\x95\x29\xe2\x10\x9a\x08\x2c\x5a\x08\x2c\x0a\x02\x9a\x54\xe6\xb4\xdb\x5a\x4e\xe4\xdc\x91\x48\x65\x86\xba\x35\x93\x3c\x82\xc1\x9d\xae\xbb\x06\x77\x32\x28\x51\x9a\xee\x7b\xf4\x35\xac\xa2\x3f\xd6\xd1\x5b\xb5\x55\x45\x97\x81\xf0\x1e\x03\x41\xf4\xc0\x68\x20\x61\x08\x9c\xc4\xf3\x0f\x47\x52\x90\x57\xfb\x2f\xba\x8a\xa9\xce\x7b\xe8\x40\x4f\x39\xff\x15\x0c\xfa\xfd\x7e\xa7\x42\x77\x91\xd0\x7d\xfc\x3e\xba\x8f\x7b\xe8\x36\x2a\xd6\x60\x87\xfd\x58\x0b\x83\xfa\xdb\xb1\x4a\x15\x3f\xa7\x17\x6a\x2f\xf8\x79\x56\x3b\x19\x35\xd7\xfc\xd6\x0e\x24\x99\xb4\xf7\x0e\x11\x87\xa3\xd4\xca\xaf\xca\x77\xeb\x0d\x13\x44\x0a\xb9\x30\x43\x2a\x6d\x42\x23\x43\xb5\x4e\x41\x1b\xf2\x53\x36\x94\xb7\xf9\x43\x03\xf4\xa2\x84\x5e\x34\x41\x3f\x69\xa3\xb6\x76\xf7\x65\xbc\xa7\xdf\x90\x40\x72\x8a\x53\xe4\x21\xa3\x1c\xed\x2d\x72\x4e\xd6\x58\x29\x04\x1b\x72\xb5\xfc\x5b\xce\x17\xb8\x83\xbf\xf9\xec\x6c\x6c\x5b\xb3\xb3\xf1\xd1\xf1\x9b\xff\xb2\xba\x60\xcd\x27\x9f\xe6\x79\x75\x4f\x41\x1d\x8e\xe2\xec\x72\x7c\xfa\x07\x3e\xe6\xf4\xcc\x70\x29\x9f\xf6\xce\xa7\x1e\xdb\x39\x01\x73\x13\xef\x77\x36\x84\x6f\x1c\x1e\x2f\xb9\x88\xec\x41\x9e\x03\xb3\x8b\xc3\xa5\x60\xc4\xce\xd0\xd7\xe9\x31\xb6\xf5\xdb\x62\x3e\x99\x59\x9d\xf4\x06\x30\xa3\x56\x7f\x8d\x11\x30\xe2\x59\x5d\xc8\x85\xb7\x55\x19\x49\x2c\x36\xb2\x94\xb8\x44\xe8\x97\x02\xc9\x07\x04\x21\xd2\x74\x8c\x2a\x5e\x93\xac\x51\x64\xef\x54\x92\xa2\x64\x65\x20\x96\x72\x67\xe4\x06\x8c\x27\xd4\x1a\x91\x52\x88\x1c\x47\xce\xf2\x2d\xc0\x21\x51\x21\x93\xc1\x7e\x0f\x78\x02\xa3\x72\xf4\x05\x1f\x97\x8c\x44\xad\xc7\xe4\x30\x2a\x5e\xf9\xfe\xa9\xe8\x50\x1b\xf1\x75\x58\x95\x8e\xc0\x07\xd1\x86\x2b\xf7\x73\xf8\x54\x37\x0e\x17\x8f\x01\x3a\x9e\xcf\xc3\x80\xc8\xca\x60\x51\x46\xd1\x2a\xd4\xd0\xba\x9f\x8b\xd2\x0a\x24\xcf\x74\xee\x49\x10\xa3\xdc\xb0\xb2\x57\x27\xe9\x47\x2b\xd7\x11\x13\xcc\x65\x52\xcf\xd6\x8e\xf3\xb7\x56\x79\xcd\x57\x78\x6b\x58\xc0\x8c\xc0\x4a\xbe\x1e\xb2\xaa\x93\x54\x95\x48\x4e\x23\x8d\xd6\x1d\xcf\xe2\xea\x2f\x5c\xce\x98\xfb\x05\x85\xad\x20\x1c\x82\xd5\xeb\xc9\x4e\xba\x0c\x0d\xc6\x05\x25\x5b\x84\xc3\x4a\x92\x50\x7e\x0a\x63\x2c\x12\xf0\xdf\x60\xbd\xad\x50\x48\x56\xdf\x82\x65\x75\x9a\x69\x58\xbd\x1d\x97\x66\xc8\x58\x74\x18\xcd\xc2\x58\x46\x46\x1e\x3e\xc9\x15\x91\x9e\x96\x2b\x71\xa4\x27\xbe\x1d\x77\x12\xa3\xda\xda\x4d\x46\x1a\xda\xa6\x44\xa6\x87\x65\xb5\xed\xc8\xa7\x8d\x7a\x16\x4b\x78\x73\x3c\x22\x88\xda\x42\x65\x21\xda\xea\x0d\xb9\x20\x1b\x9f\x0b\x16\x3d\x3a\x5c\x10\x81\x89\x69\xcb\xb8\xd0\xc4\x6a\xf6\xb2\x55\x80\x0f\x56\x55\xd6\xc4\xdb\x56\xcc\x8d\xb9\xbd\x6f\x98\x32\x7a\xb7\x46\x32\x53\xd5\x53\xfe\xc2\x2f\x31\x56\xa2\x64\xd5\x54\xba\x95\x0c\x1f\x2d\xe8\x42\x99\x3f\xfe\xa8\x5a\xe7\xb9\xfa\xdc\x17\xa6\xed\x4a\x4c\x00\x0b\xb8\xa6\xac\xa0\xea\x25\xd7\xc6\xde\x14\x97\x27\x28\x43\xb1\x70\x03\xdf\xfd\x62\x75\x9b\x22\xe4\xb9\xbf\x32\x5a\x7e\x92\x0d\xfe\x9d\x6e\x35\x6f\x32\x3b\x67\x1e\x0a\x61\xcc\x37\x33\x19\x0e\x4a\x8d\xe8\x82\x95\x7e\x9f\x0a\x7f\x68\x65\xe3\x49\x79\x25\xf2\xc2\xf0\xd9\x9a\x2a\xac\x5e\x32\x5a\x25\x4a\x65\xaf\xa1\x34\x9a\xf0\xa7\xd9\xc0\x14\xb3\xf5\xcf\xd0\x42\xe2\xd5\xaf\x3e\xf2\x95\x46\x0f\x95\x79\xed\x27\x7b\x67\xb3\x5a\x94\x8a\xf8\x62\x94\x54\x8a\x86\x5b\x1e\x21\x2b\x4b\x09\xdd\x31\xa4\x3a\xb5\xb0\x56\x95\x90\x50\x4a\x7b\xb5\xdc\xc3\x96\xc4\xfd\x62\x6b\xfe\x93\x81\x30\x1a\xb2\x30\x4b\xc6\x7b\x6a\x50\x93\xbb\xe7\xfe\xae\x8b\xf3\x9c\x3c\x0b\xcf\xed\x26\xa0\xf1\x6a\xac\x59\xd4\x52\x27\x4f\xc3\xf6\xc4\x15\xa1\x6c\x62\x7f\x76\xda\x32\x7b\x46\xd1\x41\xa4\x4c\xe8\x76\x92\x5a\xac\xf3\x93\xcc\x74\x5c\x90\x48\x58\x5d\xf5\xdd\x5e\xb7\xf8\x08\x74\x0f\x2e\x52\xaf\xc0\x9c\x50\xef\xd9\x78\x6e\x72\x93\x58\xa0\xa6\x17\x8b\xcf\xc6\x96\xd3\x5f\x81\x2b\xe7\xa8\x12\xf3\xa9\x7c\xfc\xbf\x00\x00\x00\xff\xff\x99\xae\x88\x84\x0c\x31\x00\x00") +var _webdataFnJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\x5b\x6f\xdb\x38\x97\xef\xfe\x15\xa7\x7a\x28\xe4\xc6\xf1\x25\x45\x77\x06\x75\x9d\x5d\x4f\xea\x4c\x82\xc9\x0d\xb6\xb3\x53\x23\x08\x0a\x5a\x3a\xb6\x35\x95\x49\x8d\x48\xc5\x49\xb7\xf9\xef\x0b\xea\x4a\x51\x94\x9c\x76\xbe\xbe\x7c\xf8\x0c\x4c\x47\x21\xcf\x39\x3c\xf7\x0b\xa5\xde\x9b\x16\xbc\x01\x00\x38\x61\xc1\x53\xe8\xad\x37\x02\x6c\xa7\x0d\x47\xfd\xc1\xaf\x70\x4b\xc3\xc8\xfd\x10\xc9\x7f\xff\x87\x45\xc2\x67\xec\x4b\xd7\x61\xdb\xe3\x16\x64\x48\xf3\x8d\xc7\x61\xe5\xf9\x08\x1e\x87\x80\x84\x02\xd8\x0a\xa6\xb8\x65\x02\x0f\xe7\x2c\x72\x36\x01\x71\xbb\x05\xf8\x29\x63\x4b\x12\x4a\xd8\x55\x88\x08\x9c\xad\xc4\x8e\x84\xf8\x1e\x9e\x58\x04\x0e\xa1\x10\xa2\xeb\x71\x11\x7a\xcb\x48\x20\x78\x02\x08\x75\x7b\x2c\x84\x2d\x73\xbd\xd5\x53\x4a\xc4\x13\x10\x51\x17\x43\x10\x1b\x04\x81\xe1\x96\xcb\x43\xe5\x1f\xbf\x5f\xdd\xc2\xef\x48\x31\x24\x3e\xdc\x44\x4b\xdf\x73\xe0\xc2\x73\x90\x72\x04\xc2\x21\x90\x2b\x7c\x83\x2e\x2c\x33\x52\x12\xe9\x54\x72\x32\x4b\x39\x81\x53\x16\x51\x97\x08\x8f\xd1\x0e\xa0\x27\x36\x18\xc2\x03\x86\xdc\x63\x14\xde\x66\xc7\xa4\x34\x3b\xc0\xc2\x94\x8e\x4d\x84\x14\x21\x04\x16\x48\xd4\x36\x10\xfa\x04\x3e\x11\x05\xb6\xa2\x04\x4d\x3d\x52\x1b\x85\xd0\x2e\x78\x34\x3e\x64\xc3\x02\x04\xb1\x21\x42\xca\xbb\xf3\x7c\x1f\x96\x08\x11\xc7\x55\xe4\x77\x52\x42\xcb\x48\xc0\x9f\xe7\xf3\xb3\xeb\xdb\x39\x8c\xaf\x16\xf0\xe7\x78\x3a\x1d\x5f\xcd\x17\x43\xd8\x79\x62\xc3\x22\x01\xf8\x80\x09\x35\x6f\x1b\xf8\x1e\xba\xb0\x23\x61\x48\xa8\x78\x02\xb6\x4a\x89\x5c\x4e\xa6\x27\x67\xe3\xab\xf9\xf8\xb7\xf3\x8b\xf3\xf9\x02\x58\x08\xa7\xe7\xf3\xab\xc9\x6c\x06\xa7\xd7\x53\x18\xc3\xcd\x78\x3a\x3f\x3f\xb9\xbd\x18\x4f\xe1\xe6\x76\x7a\x73\x3d\x9b\x74\x01\x66\x28\x99\xc3\x94\x46\x83\xde\x57\xb1\xf5\x42\x04\x17\x05\xf1\x7c\x5e\xe8\x61\xc1\x22\xe0\x1b\x16\xf9\x2e\x6c\xc8\x03\x42\x88\x0e\x7a\x0f\xe8\x02\x01\x87\x05\x4f\xfb\x6d\x9a\x90\x21\x3e\xa3\xeb\x58\xe0\xd4\xbb\xba\x00\xe7\x2b\xa0\x4c\x74\x80\x23\xc2\x87\x8d\x10\xc1\xfb\x5e\x6f\xb7\xdb\x75\xd7\x34\xea\xb2\x70\xdd\xf3\x13\x02\xbc\x77\x2c\xd9\xe9\xb5\x5a\xd0\xeb\xc1\xdd\x00\x62\x93\x74\xe0\x28\x79\x40\xde\x81\xb7\xd9\xe3\x7d\xcb\x61\x94\x0b\x98\x5f\xdf\x9e\x9c\x7d\xbe\xbc\xfe\xdf\xc9\xe7\xf9\xd9\x74\x32\x3b\xbb\xbe\xf8\x08\x23\xb8\x1b\xf4\x3b\x30\x78\x27\xff\xbb\x1f\x96\x40\xe7\xe7\x97\x13\x69\xa0\x11\x1c\xbd\xeb\x67\x5b\x31\xfe\xe5\xed\x85\x5c\x1e\x64\x8b\xb3\x93\xe9\xf5\xc5\x45\xb6\xdc\xef\xf6\xdf\x0d\x5b\x92\xaf\xbb\xe0\xb1\xc7\x3b\xb0\x8d\x7c\x71\xdf\x81\x6e\xb7\x9b\xf1\x72\x73\x7d\x7e\x35\x9f\x4c\x3f\x8f\x4f\x4e\x26\x17\x93\xe9\x78\x7e\x7e\x7d\x25\x79\xb9\xeb\x77\xa0\x7f\xdf\x81\xbb\x5f\x7f\xe9\xc0\x40\x3e\x0c\x7e\x79\x9b\x3e\xbd\x7b\xf7\xb6\x03\x47\xf7\x39\x93\x97\xe3\x4f\x9f\xcf\x3f\x5e\x4c\x3e\xdf\xde\x7c\x1c\xcf\x27\x33\xc9\x50\x7f\xd8\x6a\x3d\x90\x10\x76\x7c\x18\xff\x3f\x20\x6e\xfe\xe0\x93\x25\xfa\xe9\xbe\x90\xaa\xb9\x64\xd2\x66\x23\x58\x11\x9f\xe3\xb0\x58\x9f\x09\x99\x0d\x46\xd0\x57\xd6\x2e\x08\x17\x13\xea\x6a\xab\x53\xf4\x91\x70\x74\x4f\x58\x44\x15\x0c\x46\xd7\xcc\xa3\xeb\x54\xff\x52\xae\xfb\x64\x63\xcb\x1e\xf0\xd3\x2c\xda\x16\xa0\x72\x65\x51\x5a\xe1\x4e\xc8\x7c\xff\x93\x61\xad\x0c\xe7\x86\x64\xbd\xf6\xe8\xba\x2c\x40\xb6\x3a\xf7\xb6\x28\xc3\x68\x04\x34\xf2\xfd\x64\x2f\x0a\x5c\x22\x50\xee\x84\x86\xf5\x73\x2a\x30\x7c\x20\x7e\x71\x82\xe7\xfa\x78\x1b\xef\xf1\x64\xb1\xb5\x8a\xa8\x23\xb3\x04\xac\x22\xdf\xe7\x4e\x88\x48\x27\x94\x2c\x7d\x74\xed\x36\xfc\x5f\x4b\x06\x54\x88\x22\x0a\x29\xd8\x2e\x73\xa2\x2d\x52\xd1\xad\x80\xc2\xb7\x6f\x31\xa4\xfc\xe5\x50\x3b\x5c\x7e\xf1\xc4\xe9\x8b\x60\xb7\xec\xab\x04\x9c\xed\x07\xe4\x8d\x04\x63\xb5\xb5\x87\xad\x67\x45\xb0\x10\xff\x8e\x90\x2b\x8c\xd8\x98\x49\xe6\xad\xc0\xc6\x6e\x05\x20\xdb\x96\x3f\xc3\xb6\xdd\x1e\xc6\xdb\xcf\x80\x3e\xc7\x94\x48\x22\xed\xb4\x99\x54\x0d\x90\x91\xe0\x96\x7d\x55\x00\x67\x06\x6a\x26\x08\x33\x29\xbe\x87\x2f\x03\x40\x4e\xa8\xa4\x4b\x7c\xf4\x4a\x30\x8a\x1e\x73\x13\x95\x61\xd4\x83\x6a\x40\x0c\x3c\x6b\x4e\x34\xd9\x4f\xd2\x04\xd8\x44\x78\xcb\xbe\x9e\x10\xea\xa0\x6f\xd6\x6e\x13\x5c\x23\x59\xfe\x02\x5e\x75\x20\xb3\xae\x95\x28\xf3\x51\xe2\xbd\x28\x20\x13\xd0\x97\x05\x64\x03\x6c\x39\x20\x9b\x00\x79\x23\x41\x99\x92\xb4\x78\x24\xae\x5b\xa0\x38\x1b\x42\xd7\x38\x79\x40\x2a\x2e\x3c\x2e\x64\x69\xb5\xfd\xf4\xc1\xe8\x5d\x55\x51\x5f\x8d\x46\x71\x0b\xb6\xf2\x28\xba\x46\x7d\x13\xd7\x2d\x9f\x60\xad\x34\x06\xac\x0e\xe4\xa7\xee\x73\xc6\xaa\xbc\x3f\xc2\x41\x42\xeb\xc7\xf8\x30\x1a\xe7\x47\x98\xd8\xb2\xaf\x3f\xc8\x81\xc1\xea\x3f\xc2\xc0\xe5\xac\xa0\x73\x52\x77\x7e\xc9\x7b\x64\x37\x16\x57\x61\x5b\x24\xfd\x91\xf0\xb6\x38\x13\x64\x1b\x68\xd1\x51\x9c\xef\xb9\x48\x85\xb7\xf2\x30\x7c\x9f\xd4\xf8\x6e\xb1\xd2\xc9\xa1\x02\xb2\xc6\x4f\x19\x40\xfc\x87\xb6\x17\xf7\x10\x0d\x00\x0b\x75\x6f\xa1\xed\x55\x90\x15\x80\x5c\x82\xf7\xc5\x63\x22\x79\x39\x70\xd4\x1e\xe4\x9c\xba\xf8\xf8\xdb\xd3\xb9\x6b\x7b\xee\x9c\x9d\x7a\x34\xd7\xb8\xec\x71\xed\xb8\xd6\xc7\x15\x1e\x3c\xf8\xa0\x75\x2f\x5d\x1f\xe9\x5a\x6c\x86\xe0\x1d\x1c\xa8\x76\x4a\x1a\x04\x18\x69\xe0\x77\xde\xbd\xa2\xb0\x61\xab\xd0\xeb\x0a\x6c\x09\x3f\x02\x9d\x87\xec\x97\x9a\xc2\x1b\xe6\xab\xcf\xad\xe2\xdf\x74\xf7\x70\x50\x16\xd3\x21\xbe\x13\xc9\x71\xe5\x86\x79\xb2\x81\x19\x3b\x0e\xfa\x18\xc6\x63\xd0\x65\xe4\x0b\x9b\x07\x88\x8d\xe2\x9a\x5a\xd1\x3a\xa1\xf9\x11\x8c\x8c\x08\x77\xde\xfd\x5d\xff\xbe\xe0\x9c\x34\x01\x0e\x14\x40\xa9\x16\x7e\x04\x1f\x46\x50\x62\x34\xfb\x39\x8c\x0a\x8f\x46\xa8\xeb\x24\xd7\xa8\x54\x68\xbf\x46\x93\xe4\xc8\x84\xc6\x07\xb5\xac\x1d\x0e\x34\x29\x9a\x41\x55\x39\xb2\x2a\x93\xe8\xfb\x90\x0f\xda\xd0\x93\x92\xc9\xa7\x36\xbc\x01\x9b\x1c\x1d\x92\x41\x1b\x0e\x80\x0c\x86\x8a\x59\xa5\x10\x0d\x16\x80\xe3\xb2\x74\xe9\x31\x46\x9e\x1a\xc8\xa8\xdc\x96\xdc\x69\xa0\x07\xcd\xc7\x72\xff\x9c\x57\xd1\xba\xbe\x5a\xee\xed\x78\x97\x23\x75\x6d\x6b\x39\x18\xf6\x2d\xad\x80\x25\xcd\xb5\x1c\x35\xc6\xd4\x9d\xc5\x7d\x7c\xa9\x13\x2a\x35\xe5\x09\x55\x55\x60\x46\x6f\x73\x80\x98\x9f\xb2\xeb\x68\xad\xfb\x31\xf4\xe1\xf5\xeb\x72\xe3\x6e\xf0\x8f\xf2\x20\xc0\x51\x64\x04\x6c\xed\xb8\x8e\x36\x1b\xb4\xab\xb1\x59\x56\x9f\xc6\x6c\x26\xa7\xc2\xcf\x41\x3c\x36\x66\x19\x24\x1e\x88\x60\x04\x97\x44\x6c\xba\x22\x8c\xa8\x63\x67\x33\x52\xbb\x0c\xb5\xa8\x42\x2d\x0a\x28\xa9\x8b\x78\x97\x2c\x79\x42\xa1\x0d\xc7\x23\x18\xc0\xb7\x6f\x50\x5a\x5f\x24\xeb\xaa\x46\xf2\xa1\xec\x70\x94\x3c\x0f\x4b\x5b\x0b\x65\x6b\xa1\x68\x5f\x1f\x8e\xb2\x8d\xdc\x1b\xb6\x16\x1c\xa4\x02\x1e\x80\x35\xcc\xfe\x5a\xb4\x55\x3f\x54\x26\xbe\xb2\x80\xc5\x18\xa8\x28\x22\x9d\x03\x4d\x90\x75\xca\x48\xe9\x18\xd4\x91\xe2\x55\x15\xa2\x4c\xa0\x87\xa3\xec\xaf\xa1\xb6\xbd\x28\x6d\x7f\x97\x62\xb8\x54\x45\x26\x74\xa6\x9a\x8c\x1b\x3d\x39\xa8\xe4\x8e\x47\x95\xa1\x5f\xe5\xdb\xf1\x91\x84\xb9\x2b\x2b\x4e\xae\xb8\xad\x69\x06\xae\x3a\xf2\x86\x50\xd7\xc7\xb8\x0c\xdb\xf8\x20\xd4\x78\x35\x56\xc7\x4a\x94\x95\xee\x11\xf0\x41\x74\xf3\x5a\x3d\x2c\xc3\x68\x77\x10\xa5\x3d\xc3\xed\x42\xb6\x5f\x1d\xfe\xcb\x2e\x25\xf2\xab\x07\x79\x78\xd2\xac\xb9\x29\xcf\xc3\xda\x52\x28\x9a\x4b\xbe\x14\x5f\x14\x65\x5e\x90\x70\x8d\x49\x27\x17\x10\x57\xe6\x9d\xda\xcd\xf8\xea\xe5\x7b\x6a\x9b\xe4\x3a\x08\x51\xf6\x7f\x1f\x71\x45\x64\x21\x57\x8c\xa8\xd9\x20\x88\xf8\xc6\xd6\x5a\xbd\x98\x8b\x4e\x59\xf5\xed\xb6\xa6\xe0\xd2\xa5\x8e\x2a\xe5\xab\x4c\xbf\x3a\xcf\xca\x05\x4e\x7d\xca\xaa\x64\x8f\xa6\xcc\x55\x96\xbb\x74\xf9\xd3\x94\x0d\xb4\x40\x6c\x4e\x08\x99\x58\x7a\x11\x7b\x65\x28\x38\x79\x20\x65\x49\x5c\x43\xd2\x64\x6c\xaa\x8b\x06\x67\x15\x61\xd5\xde\xa6\xd0\x9b\x50\x57\x0d\xbc\x9f\xe6\xd2\x49\x17\xfb\xa8\xb5\xb1\x45\xbf\x2c\x4c\x5d\xad\xa6\x55\x89\xff\xa1\x5a\x64\x9b\xdc\x5b\x73\x60\x1e\xf8\x9e\x83\x92\x50\x07\x06\xba\x93\x96\xb2\xc0\xc1\x41\xad\x0b\x1b\xb2\x4c\x91\x45\x0d\xf9\xe4\xd8\x78\x21\x9c\x2a\xaa\x92\xcb\xb2\x3c\x55\x18\xf0\xf9\x05\x29\x31\x4f\x0a\xda\xd1\xb2\x14\xbd\x7e\x6d\x74\x12\xf5\xe4\x4a\x63\xf5\x13\xce\x7d\xa5\x88\xf7\xfa\x75\x59\x8b\x70\xa8\x26\xf2\x0f\xe5\x6b\x71\xdd\x8d\x96\x91\x10\x8c\x56\x73\x89\x29\x95\x6b\x05\x17\x92\x37\x22\x09\xfa\x40\x71\x98\x62\x98\x36\x53\x39\xaa\xa5\xf2\x56\xa1\xb2\x87\xc8\xdb\x5a\x22\xc6\xf9\xa1\x30\x8a\x2c\xdb\x29\xac\xac\xe2\x03\x4b\x0b\x8c\x8c\x8e\x41\xda\x6a\xda\xe0\x28\xb2\x8c\x53\xe9\xc2\x3b\x9a\xe6\x2b\x1a\x2a\x13\xaf\xe5\xb0\x6f\xed\x69\x60\x93\xe4\x93\x5c\xe1\xfd\x27\xff\xfc\xe3\xfc\x03\x4d\xd9\xa3\xaa\x77\x09\xa5\x6b\x9d\x47\xdb\x4f\x45\x4c\xa5\x2b\x8b\xf2\xca\xbf\x93\x65\xe2\x77\x38\x1e\x17\x59\x45\xe7\x7f\x87\x22\x69\xe6\x03\xb6\x53\x0f\x8d\xef\x94\xe0\xb0\x72\xfd\xe2\x3e\xa6\x7b\x71\xd2\xea\xc8\x14\x71\x00\x75\x04\x16\x0d\x04\x16\x39\x01\x4d\x2a\x73\xda\x6d\x2c\x27\x72\xee\x88\xa5\x32\x43\xdd\x99\x49\x1e\xc2\xe0\x5e\xd7\x5d\x8d\x3b\x19\x94\x28\x4d\xf7\x3d\xfa\x1a\x96\xd1\x9f\xaa\xe8\x8d\xda\x2a\xa3\xcb\x40\xf8\x88\xbe\x20\x7a\x60\xd4\x90\x30\x04\x4e\xec\xf9\x07\x23\x29\xc8\x9b\xfd\xd7\x5c\xf9\x54\xe7\x3e\xb6\xa1\xa7\x9c\xff\x06\x06\xfd\x7e\xbf\x5d\xa2\xbb\x88\xe9\x3e\x7d\x1f\xdd\xa7\x3d\x74\x6b\x15\x6b\xb0\xc3\x7e\xac\x85\x41\xfd\xcd\x58\x85\x8a\x5f\xd2\x0b\x35\x17\xfc\x2c\xab\x1d\x8f\xea\x6b\x7e\x63\x07\x12\x4f\xda\x7b\x87\x88\x83\x51\x62\xe5\x37\xc5\x5b\xf5\x9a\x09\x22\x81\x5c\x98\x21\x95\x36\xa1\x96\xa1\x4a\xa7\xa0\x0d\xf9\x09\x1b\xca\x7b\xfc\xa1\x01\x7a\x51\x40\x2f\xea\xa0\x9f\xb5\x51\x5b\xbb\xf9\x32\xde\xd2\x6f\x88\x2f\x39\xc5\x29\xf2\x80\x51\x8e\xf6\x16\x39\x27\x6b\x2c\x15\x82\x0d\xb9\x5e\xfe\x25\xe7\x0b\xdc\xc1\x5f\x7c\x76\x36\xb6\xad\xd9\xd9\xf8\xf0\xe8\xdd\x7f\x59\x1d\xb0\xe6\x93\x4f\xf3\xac\xba\x27\xa0\x5d\x8e\xe2\xec\x72\x7c\xf2\x07\x3e\x65\xf4\xcc\x70\x09\x9f\xf6\xce\xa3\x2e\xdb\x75\x7d\xe6\xc4\xde\xdf\xdd\x10\xbe\xe9\xf2\x68\xc9\x45\x68\x0f\xb2\x1c\x98\x5e\x1b\x2e\x05\x23\x76\x8a\xbe\x4e\x8e\xb1\xad\xdf\x16\xf3\xc9\xcc\x6a\x6b\xf7\x7f\x41\xc8\x1c\xe4\xfc\x84\x6d\xb7\x84\xba\xba\x64\xd2\x66\xe9\x92\x2c\x5c\xe1\x58\xd8\xfd\xb6\xb4\x97\xe5\x59\x7a\x35\x92\x09\x2d\x20\x21\xc7\x73\x2a\x72\x24\x9d\xc1\x8c\xa8\xc7\xaf\xc8\x95\xfd\xd8\x96\x7e\xf8\xd8\x15\x6c\x26\x42\x8f\xae\xed\x36\xbc\x1a\x41\x05\x37\x06\x32\x55\xaa\x54\x5c\xed\x72\x42\x37\xb1\xf2\xe5\xc0\xe3\xf0\x5f\x72\x1b\xa3\x9c\xad\x0f\x1c\x65\x96\x9e\x5b\xad\xd4\x6e\xd5\xd7\x45\x3e\x23\xae\xd5\x81\xcc\x12\xb6\xea\x4d\x24\x12\x1b\x59\xb4\x1d\x22\xf4\xeb\x97\xf8\x03\x8e\x00\x69\x32\xb0\xe6\xaf\xa3\xd6\x28\xd2\x77\x57\x71\xf9\xb7\x52\x10\x4b\xb9\x9d\x73\x7c\xc6\x63\x6a\xb5\x48\x09\x44\x86\x13\x90\x46\xe0\x80\xa8\x90\xf1\x15\xca\x1e\xf0\x18\x46\xe5\xe8\x0b\x3e\x2d\x19\x09\x1b\x8f\xc9\x60\x54\xbc\xe2\x3d\x5f\x3e\x0b\xd4\xe2\xeb\xb0\x2a\x1d\x81\x8f\xa2\x09\x57\xee\x67\xf0\x89\x6e\xba\x5c\x3c\xf9\xd8\x75\x3d\x1e\xf8\x44\xd6\x60\x8b\x32\x8a\x56\xae\x86\xc6\xfd\x4c\x94\x46\x20\x79\x66\xf7\x81\xf8\x11\xca\x0d\x2b\x7d\x45\x95\x7c\x34\x74\x13\x32\xc1\x1c\x26\xf5\x6c\xed\x38\x7f\x6f\x15\x17\xaa\x79\x5e\x08\x72\x98\x11\x58\xf1\x17\x5a\x56\x79\x66\x2d\x13\xc9\x68\x24\xde\xbb\xe3\x69\x06\xfb\x13\x97\x33\xe6\x7c\x41\x61\x2b\x08\x07\x60\xf5\x7a\x72\x66\x29\x92\x10\xe3\x82\x92\x2d\xc2\x41\x29\x2e\x95\x9f\xc2\x18\x0b\x05\xfc\x37\x58\xef\x4b\x14\xe2\xd5\xf7\x60\x59\xed\x7a\x1a\x56\x6f\xc7\xa5\x19\x52\x16\xbb\x8c\xa6\x29\x42\x46\x46\x16\x3e\xf1\x65\x9c\x5e\x00\x4b\x71\xa4\x67\x8f\xf8\x26\x4d\xcb\x7f\x31\x95\xae\x4b\x04\x69\xeb\xe0\xe9\xe1\xb1\x1f\xd8\xda\x35\xd3\xb3\x21\x2d\x99\x12\x92\x1e\xd7\xe5\x0e\x31\x1b\x0c\xab\x05\x47\x65\x4b\x69\x33\x92\x18\x6f\x74\xa7\x4c\xd0\x8d\xc7\x05\x0b\x9f\xba\x5c\x10\x81\xb1\x6f\x14\x81\xa5\x09\x5a\xef\xa6\x2b\x1f\x1f\xad\xb2\xe4\xb1\xbb\xae\x98\x13\x71\x7b\xdf\xdc\x6b\x0c\x0f\x8d\x64\xaa\xaa\xe7\xec\xcd\x6c\x6c\xed\x58\xe5\xaa\xad\x75\x33\x1b\xbe\x2e\xd1\x85\x32\x7f\xa5\x53\xb6\xce\x4b\xf5\xb9\x2f\xce\x9b\x95\x18\x03\x2a\x65\xc8\x9c\x56\x54\xbd\x64\xda\xd8\x9b\x23\xb3\x0c\x67\xa8\x36\x8e\xef\x39\x5f\xac\x4e\x5d\x88\xbd\xf4\x57\x84\xdb\x4f\xb2\xc1\x3f\xd3\xad\xe6\x4d\x66\xe7\xcc\x42\x21\x88\xf8\x66\x26\xc3\x41\x29\x32\x1d\xb0\x92\x8f\x88\xe1\x0f\xad\xee\x3c\x2b\x6f\xaf\x5e\x19\xbe\x2f\x54\x85\xd5\x6b\x4e\xa3\x44\x89\xec\x15\x94\x5a\x13\xfe\x34\x1b\x98\x62\xb6\xfa\xbd\x60\x40\xdc\xea\x2d\x55\xb6\x52\xeb\xa1\x32\xaf\xfd\x64\xef\xac\x57\x8b\x52\x52\x5f\x8d\xe2\x52\x53\x73\x21\x27\x64\x69\x2a\xa0\xdb\x86\x54\xa7\x56\xe6\xb2\x12\x62\x4a\x49\xb3\x97\x79\xd8\x92\x38\x5f\x6c\xcd\x7f\x52\x10\x46\x03\x16\xa4\xc9\x78\x4f\x11\xab\x73\xf7\xcc\xdf\x75\x71\x5e\x92\x67\xe1\xa5\xed\x08\xd4\xde\x62\xd6\x8b\x5a\xe8\xe4\x79\xd8\x9c\xb8\x42\x94\x5d\xf0\xcf\x4e\x5b\x66\xcf\xc8\x5b\x90\x84\x09\xdd\x4e\x52\x8b\x55\x7e\xe2\xf1\x9b\x0b\x12\x0a\xab\xa3\xbe\x86\xed\xe4\x5f\xeb\xee\xc1\x45\xea\xe6\x98\x13\xea\xbe\x18\xcf\x89\x2f\x7d\x73\xd4\xe4\x0e\xf8\xc5\xd8\x72\x50\xcf\x71\xe5\xc8\x5b\x60\x3e\x17\x8f\xff\x1f\x00\x00\xff\xff\x6b\xa4\xaf\x2d\xb1\x32\x00\x00") func webdataFnJsBytes() ([]byte, error) { return bindataRead( @@ -89,7 +89,7 @@ func webdataFnJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/fn.js", size: 12556, mode: os.FileMode(436), modTime: time.Unix(1529985773, 0)} + info := bindataFileInfo{name: "webdata/fn.js", size: 12977, mode: os.FileMode(436), modTime: time.Unix(1532248388, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/main.go b/main.go index 3af536e..18a30d4 100644 --- a/main.go +++ b/main.go @@ -43,6 +43,7 @@ const ( authenticationRateLimit time.Duration = time.Second / 10 authenticationRateBurst int = 10 challengeLength int = 8 + defaultUpdateInterval int = 50 defaultBind string = ":0" version string = "0.0.3" ) @@ -127,12 +128,15 @@ func secureRandBase64(length int) string { func main() { var bind, certFile, keyFile, secret string var showVersion, invert bool + var updateInterval int flag.BoolVar(&showVersion, "version", false, "show program's version number and exit") flag.StringVar(&bind, "bind", defaultBind, "bind server to [IP]:PORT") flag.StringVar(&secret, "secret", "", "shared secret for client authentication") flag.StringVar(&certFile, "cert", "", "file containing TLS certificate") flag.StringVar(&keyFile, "key", "", "file containing TLS private key") flag.BoolVar(&invert, "invert", false, "use inverse colors for QR code") + flag.IntVar(&updateInterval, "interval", defaultUpdateInterval, + "mouse polling interval in milliseconds") flag.Parse() if showVersion { fmt.Println(version) @@ -148,6 +152,9 @@ func main() { if secret == "" { secret = secureRandBase64(defaultSecretLength) } + if updateInterval < 0 { + log.Fatal("interval must be greater or equal to zero") + } var plugin Plugin platformErrors := "" for _, f := range Plugins { @@ -199,6 +206,7 @@ func main() { if !challenge.verify(message) { return } + websocket.Message.Send(ws, fmt.Sprintf("i%d", updateInterval)) for { if err := websocket.Message.Receive(ws, &message); err != nil { return diff --git a/webdata/fn.js b/webdata/fn.js index 0d154c1..6861e41 100644 --- a/webdata/fn.js +++ b/webdata/fn.js @@ -24,7 +24,6 @@ const MOVE_MULT = 1; const SCROLL_MULT = 0.05; // [[px/s, mult], ...] const POINTER_ACCELERATION = [[0, 0], [87, 1], [173, 1], [553, 2]]; -const UPDATE_INTERVAL = 50; const MAX_IDLE_UPDATES = 10; var ws; @@ -43,6 +42,7 @@ var scrollYSum = 0; var dragging = false; var draggingTimeout = null; var updateTimer = null; +var updateInterval = 0; var idleUpdates = 0; function fullscreenEnabled() { @@ -147,8 +147,8 @@ function onDraggingTimeout() { function updateMoveAndScroll() { if (updateTimer == null) { onUpdateTimeout(); - if (UPDATE_INTERVAL > 0 && idleUpdates == 0) { - updateTimer = setInterval(onUpdateTimeout, UPDATE_INTERVAL); + if (updateInterval > 0 && idleUpdates == 0) { + updateTimer = setInterval(onUpdateTimeout, updateInterval); } } } @@ -298,6 +298,20 @@ function challengeResponse(message) { return btoa(shaObj.getHMAC("BYTES")); } +function processCommand(message) { + if (message.charAt(0) == "i") { + var x = parseInt(message.substr(1)); + if (isNaN(x) || x.toString() != message.substr(1) || x < 0) { + return false; + } + updateInterval = x; + clearInterval(updateTimer); + updateTimer = null; + return true; + } + return false; +} + window.addEventListener("load", function() { var authenticated = false; var opening = document.getElementById("opening"); @@ -322,7 +336,9 @@ window.addEventListener("load", function() { ws.onmessage = function(event) { if (authenticated) { - ws.close(); + if (!processCommand(event.data)) { + ws.close(); + } return; } authenticated = true; From 3a8ecb0b88afc6864fd232739a47e162fc2b417d Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 22 Jul 2018 10:38:10 +0200 Subject: [PATCH 004/311] bump version to 0.0.4 --- desktop/remote-touchpad.appdata.xml | 7 ++++--- main.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop/remote-touchpad.appdata.xml b/desktop/remote-touchpad.appdata.xml index 4f2b2b0..1a5b781 100644 --- a/desktop/remote-touchpad.appdata.xml +++ b/desktop/remote-touchpad.appdata.xml @@ -18,19 +18,20 @@ https://github.com/Unrud/remote-touchpad Unrud + - https://raw.githubusercontent.com/Unrud/remote-touchpad/0.0.3/screenshots/1.png + https://raw.githubusercontent.com/Unrud/remote-touchpad/0.0.4/screenshots/1.png - https://raw.githubusercontent.com/Unrud/remote-touchpad/0.0.3/screenshots/2.png + https://raw.githubusercontent.com/Unrud/remote-touchpad/0.0.4/screenshots/2.png - https://raw.githubusercontent.com/Unrud/remote-touchpad/0.0.3/screenshots/3.png + https://raw.githubusercontent.com/Unrud/remote-touchpad/0.0.4/screenshots/3.png diff --git a/main.go b/main.go index 18a30d4..6c6aafe 100644 --- a/main.go +++ b/main.go @@ -45,7 +45,7 @@ const ( challengeLength int = 8 defaultUpdateInterval int = 50 defaultBind string = ":0" - version string = "0.0.3" + version string = "0.0.4" ) func processCommand(plugin Plugin, command string) error { From a296bd11887e6dccdb01ad51f7519b20d8a9c08c Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:18:45 +0200 Subject: [PATCH 005/311] set mode and modTime --- bindata.generated.go | 12 ++++++------ bindata.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bindata.generated.go b/bindata.generated.go index d66bb51..295f7c6 100644 --- a/bindata.generated.go +++ b/bindata.generated.go @@ -89,7 +89,7 @@ func webdataFnJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/fn.js", size: 12977, mode: os.FileMode(436), modTime: time.Unix(1532248388, 0)} + info := bindataFileInfo{name: "webdata/fn.js", size: 12977, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -109,7 +109,7 @@ func webdataIconPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/icon.png", size: 1578, mode: os.FileMode(436), modTime: time.Unix(1529985773, 0)} + info := bindataFileInfo{name: "webdata/icon.png", size: 1578, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -129,7 +129,7 @@ func webdataIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/index.html", size: 1132, mode: os.FileMode(436), modTime: time.Unix(1529985773, 0)} + info := bindataFileInfo{name: "webdata/index.html", size: 1132, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -149,7 +149,7 @@ func webdataMainCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/main.css", size: 1724, mode: os.FileMode(436), modTime: time.Unix(1529985773, 0)} + info := bindataFileInfo{name: "webdata/main.css", size: 1724, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -169,7 +169,7 @@ func webdataSha256Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/sha256.js", size: 9380, mode: os.FileMode(436), modTime: time.Unix(1529985773, 0)} + info := bindataFileInfo{name: "webdata/sha256.js", size: 9380, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -189,7 +189,7 @@ func webdataTexPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/tex.png", size: 3878, mode: os.FileMode(436), modTime: time.Unix(1529985773, 0)} + info := bindataFileInfo{name: "webdata/tex.png", size: 3878, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/bindata.go b/bindata.go index 5465368..3ed0ac6 100644 --- a/bindata.go +++ b/bindata.go @@ -1,3 +1,3 @@ package main -//go:generate go-bindata-assetfs -o ./bindata.generated.go webdata/... +//go:generate go-bindata-assetfs -mode 0664 -modtime 1 -o ./bindata.generated.go webdata/... From 26337f3a0e164e5c498ec00d53933a810f22458f Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:18:47 +0200 Subject: [PATCH 006/311] break long lines --- host.go | 3 ++- plugin_windows.go | 14 ++++++++++---- plugin_x11.go | 15 ++++++++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/host.go b/host.go index beb5921..f22174d 100644 --- a/host.go +++ b/host.go @@ -61,7 +61,8 @@ func FindDefaultHost() string { if fallbackAddr == "" { fallbackAddr = ip.String() } - for _, linkLocalPrefix := range []string{"169.254.", "fe8", "fe9", "fea", "feb"} { + for _, linkLocalPrefix := range []string{ + "169.254.", "fe8", "fe9", "fea", "feb"} { if strings.HasPrefix(ip.String(), linkLocalPrefix) { continue addrs } diff --git a/plugin_windows.go b/plugin_windows.go index 34c472f..8ad78e7 100644 --- a/plugin_windows.go +++ b/plugin_windows.go @@ -98,7 +98,9 @@ func (p *windowsPlugin) KeyboardText(text string) error { inputs[i].dwFlags |= keyeventfKeyup } } - if r, _, err := p.sendInputProc.Call(uintptr(len(inputs)), uintptr(unsafe.Pointer(&inputs[0])), unsafe.Sizeof(inputs[0])); int(r) != len(inputs) { + if r, _, err := p.sendInputProc.Call(uintptr(len(inputs)), + uintptr(unsafe.Pointer(&inputs[0])), + unsafe.Sizeof(inputs[0])); int(r) != len(inputs) { return err } return nil @@ -124,7 +126,8 @@ func (p *windowsPlugin) PointerButton(button uint, press bool) error { } else if button == 3 { input.dwFlags = mouseeventfRightup } - if r, _, err := p.sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)), unsafe.Sizeof(input)); int(r) != 1 { + if r, _, err := p.sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)), + unsafe.Sizeof(input)); int(r) != 1 { return err } return nil @@ -137,7 +140,8 @@ func (p *windowsPlugin) PointerMove(deltaX, deltaY int) error { dy: int32(deltaY), dwFlags: mouseeventfMove, } - if r, _, err := p.sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)), unsafe.Sizeof(input)); int(r) != 1 { + if r, _, err := p.sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)), + unsafe.Sizeof(input)); int(r) != 1 { return err } return nil @@ -162,7 +166,9 @@ func (p *windowsPlugin) PointerScroll(stepsHorizontal, stepsVertical int) error if len(inputs) == 0 { return nil } - if r, _, err := p.sendInputProc.Call(uintptr(len(inputs)), uintptr(unsafe.Pointer(&inputs[0])), unsafe.Sizeof(inputs[0])); int(r) != len(inputs) { + if r, _, err := p.sendInputProc.Call(uintptr(len(inputs)), + uintptr(unsafe.Pointer(&inputs[0])), + unsafe.Sizeof(inputs[0])); int(r) != len(inputs) { return err } return nil diff --git a/plugin_x11.go b/plugin_x11.go index bf520f4..15e1d91 100644 --- a/plugin_x11.go +++ b/plugin_x11.go @@ -71,7 +71,8 @@ func (p *x11Plugin) KeyboardText(text string) error { var minKeycodes, maxKeycodes C.int C.XDisplayKeycodes(p.display, &minKeycodes, &maxKeycodes) var keysymsPerKeycode C.int - keysyms := C.XGetKeyboardMapping(p.display, C.KeyCode(minKeycodes), maxKeycodes-minKeycodes+1, &keysymsPerKeycode) + keysyms := C.XGetKeyboardMapping(p.display, C.KeyCode(minKeycodes), + maxKeycodes-minKeycodes+1, &keysymsPerKeycode) if keysyms == nil { return errors.New("failed to get keyboard mapping") } @@ -79,8 +80,10 @@ func (p *x11Plugin) KeyboardText(text string) error { keycodes: for keycode := C.KeyCode(minKeycodes); keycode <= C.KeyCode(maxKeycodes); keycode++ { for i := 0; i < int(keysymsPerKeycode); i++ { - keysymsIndex := int(keycode-C.KeyCode(minKeycodes))*int(keysymsPerKeycode) + i - keysym := *(*C.KeySym)(unsafe.Pointer(uintptr(unsafe.Pointer(keysyms)) + uintptr(keysymsIndex)*unsafe.Sizeof(*keysyms))) + keysymsIndex := int(keycode- + C.KeyCode(minKeycodes))*int(keysymsPerKeycode) + i + keysym := *(*C.KeySym)(unsafe.Pointer(uintptr(unsafe.Pointer(keysyms)) + + uintptr(keysymsIndex)*unsafe.Sizeof(*keysyms))) if keysym != 0 { continue keycodes } @@ -98,7 +101,8 @@ keycodes: for i := range keycodeMapping { keycodeMapping[i] = keysym } - C.XChangeKeyboardMapping(p.display, C.int(emptyKeycode), keysymsPerKeycode, (*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])), 1) + C.XChangeKeyboardMapping(p.display, C.int(emptyKeycode), keysymsPerKeycode, + (*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])), 1) C.XTestFakeKeyEvent(p.display, C.uint(emptyKeycode), C.True, 0) C.XTestFakeKeyEvent(p.display, C.uint(emptyKeycode), C.False, 0) // race condition! @@ -108,7 +112,8 @@ keycodes: for i := range keycodeMapping { keycodeMapping[i] = 0 } - C.XChangeKeyboardMapping(p.display, C.int(emptyKeycode), keysymsPerKeycode, (*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])), 1) + C.XChangeKeyboardMapping(p.display, C.int(emptyKeycode), keysymsPerKeycode, + (*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])), 1) C.XFlush(p.display) return nil } From a9230ceea4f1d997e1a82690f3e3aff71b1bcbf4 Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:18:49 +0200 Subject: [PATCH 007/311] use defer for cleanup --- plugin_x11.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugin_x11.go b/plugin_x11.go index 15e1d91..89cdcb8 100644 --- a/plugin_x11.go +++ b/plugin_x11.go @@ -76,6 +76,7 @@ func (p *x11Plugin) KeyboardText(text string) error { if keysyms == nil { return errors.New("failed to get keyboard mapping") } + defer C.XFree(unsafe.Pointer(keysyms)) emptyKeycode := C.KeyCode(0) keycodes: for keycode := C.KeyCode(minKeycodes); keycode <= C.KeyCode(maxKeycodes); keycode++ { @@ -91,11 +92,18 @@ keycodes: emptyKeycode = keycode break } - C.XFree(unsafe.Pointer(keysyms)) if emptyKeycode == 0 { return errors.New("no empty keycode found") } keycodeMapping := make([]C.KeySym, keysymsPerKeycode) + defer func() { + for i := range keycodeMapping { + keycodeMapping[i] = 0 + } + C.XChangeKeyboardMapping(p.display, C.int(emptyKeycode), keysymsPerKeycode, + (*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])), 1) + C.XFlush(p.display) + }() for _, runeValue := range text { keysym := C.KeySym(0x01000000 + runeValue) for i := range keycodeMapping { @@ -109,12 +117,6 @@ keycodes: C.XFlush(p.display) time.Sleep(typingDelay) } - for i := range keycodeMapping { - keycodeMapping[i] = 0 - } - C.XChangeKeyboardMapping(p.display, C.int(emptyKeycode), keysymsPerKeycode, - (*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])), 1) - C.XFlush(p.display) return nil } From 57d37479682f967238eefa30ce92ef21d0ab0582 Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:18:52 +0200 Subject: [PATCH 008/311] remove goto --- host.go | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/host.go b/host.go index f22174d..483f7ec 100644 --- a/host.go +++ b/host.go @@ -25,8 +25,8 @@ import ( "strings" ) -func FindDefaultHost() string { - fallbackAddr := "" +func FindDefaultHost() (host string) { + host = "localhost" for _, publicIP := range []string{"2001:4860:4860::8888", "8.8.8.8"} { addr := fmt.Sprintf("[%s]:80", publicIP) conn, err := net.Dial("udp", addr) @@ -34,15 +34,15 @@ func FindDefaultHost() string { continue } conn.Close() - host, _, err := net.SplitHostPort(conn.LocalAddr().String()) + host, _, err = net.SplitHostPort(conn.LocalAddr().String()) if err != nil { - continue + panic(err) } - return host + return } interfaces, err := net.Interfaces() if err != nil { - goto fallback + return } for _, inter := range interfaces { if inter.Flags&net.FlagUp == 0 || inter.Flags&net.FlagLoopback != 0 { @@ -58,8 +58,8 @@ func FindDefaultHost() string { if err != nil { continue } - if fallbackAddr == "" { - fallbackAddr = ip.String() + if host == "localhost" { + host = ip.String() } for _, linkLocalPrefix := range []string{ "169.254.", "fe8", "fe9", "fea", "feb"} { @@ -71,9 +71,5 @@ func FindDefaultHost() string { } } -fallback: - if fallbackAddr != "" { - return fallbackAddr - } - return "localhost" + return } From f2e67640feeb69cf2f53f91cac986221657ad2bb Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:18:54 +0200 Subject: [PATCH 009/311] remove duplicate check --- plugin_windows.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugin_windows.go b/plugin_windows.go index 8ad78e7..61454b3 100644 --- a/plugin_windows.go +++ b/plugin_windows.go @@ -107,9 +107,6 @@ func (p *windowsPlugin) KeyboardText(text string) error { } func (p *windowsPlugin) PointerButton(button uint, press bool) error { - if button == 0 || button > 3 { - return errors.New("unsupported pointer button") - } input := mouseInput{ typ: inputMouse, } @@ -125,6 +122,8 @@ func (p *windowsPlugin) PointerButton(button uint, press bool) error { input.dwFlags = mouseeventfRightdown } else if button == 3 { input.dwFlags = mouseeventfRightup + } else { + return errors.New("unsupported pointer button") } if r, _, err := p.sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)), unsafe.Sizeof(input)); int(r) != 1 { From f9ab379abc595bd0c029aa29c68de501a6180eea Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:18:56 +0200 Subject: [PATCH 010/311] rename "unknown" to "unsupported" --- main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 6c6aafe..4707aac 100644 --- a/main.go +++ b/main.go @@ -79,7 +79,7 @@ func processCommand(plugin Plugin, command string) error { } if command[0] == 'b' { if x <= 0 || x > 3 { - return errors.New("unknown pointer button") + return errors.New("unsupported pointer button") } b := true if y == 0 { @@ -87,7 +87,7 @@ func processCommand(plugin Plugin, command string) error { } return plugin.PointerButton(uint(x), b) } - return errors.New("unknown command") + return errors.New("unsupported command") } type challenge struct { From 5fe430b3f22f057d7105d9fca71e3d83f898c4fb Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:18:58 +0200 Subject: [PATCH 011/311] wait on error when started via desktop file --- desktop/remote-touchpad-wait-on-error | 8 ++++++++ desktop/remote-touchpad.desktop | 2 +- flatpak/com.github.unrud.RemoteTouchpad.json | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 desktop/remote-touchpad-wait-on-error diff --git a/desktop/remote-touchpad-wait-on-error b/desktop/remote-touchpad-wait-on-error new file mode 100644 index 0000000..88778dd --- /dev/null +++ b/desktop/remote-touchpad-wait-on-error @@ -0,0 +1,8 @@ +#!/bin/bash + +remote-touchpad "$@" +if [ $? -eq 1 ]; then + echo + read -n 1 -s -r -p "Press any key to close" + echo +fi diff --git a/desktop/remote-touchpad.desktop b/desktop/remote-touchpad.desktop index 8ba6773..7924c12 100644 --- a/desktop/remote-touchpad.desktop +++ b/desktop/remote-touchpad.desktop @@ -4,6 +4,6 @@ Type=Application Name=Remote Touchpad Comment=Control mouse and keyboard from a smartphone Terminal=true -Exec=remote-touchpad +Exec=remote-touchpad-wait-on-error Icon=remote-touchpad Categories=Network;RemoteAccess;ConsoleOnly; diff --git a/flatpak/com.github.unrud.RemoteTouchpad.json b/flatpak/com.github.unrud.RemoteTouchpad.json index ef4b838..efa6dc7 100644 --- a/flatpak/com.github.unrud.RemoteTouchpad.json +++ b/flatpak/com.github.unrud.RemoteTouchpad.json @@ -47,6 +47,7 @@ "build-commands" : [ ". /usr/lib/sdk/golang/enable.sh; env GOPATH=\"$(pwd)\" go build github.com/unrud/remote-touchpad", "install -Dm0755 -t /app/bin remote-touchpad", + "install -Dm0755 -t /app/bin src/github.com/unrud/remote-touchpad/desktop/remote-touchpad-wait-on-error", "install -Dm0644 -t /app/share/appdata src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.appdata.xml", "install -Dm0644 -t /app/share/applications src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.desktop", "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_64.png /app/share/icons/hicolor/64x64/apps/remote-touchpad.png", From e73a18710b28362a0754e0c9adaab791bbf4f2ef Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:00 +0200 Subject: [PATCH 012/311] use build tag for x11 --- README.md | 2 +- desktop/remote-touchpad.appdata.xml | 2 +- flatpak/com.github.unrud.RemoteTouchpad.json | 2 +- plugin_x11.go | 2 +- plugin_x11_dummy.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 17d955c..904fd5e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Control mouse and keyboard from the webbrowser of a smartphone (or any other device with a touchscreen). To take control open the displayed URL or scan the QR code. -Supports Linux/X11 and Windows. +Supports Windows and X11. ## Installation diff --git a/desktop/remote-touchpad.appdata.xml b/desktop/remote-touchpad.appdata.xml index 1a5b781..b549b08 100644 --- a/desktop/remote-touchpad.appdata.xml +++ b/desktop/remote-touchpad.appdata.xml @@ -11,7 +11,7 @@ To take control open the displayed URL or scan the QR code.

- Supports Linux/X11 and Windows. + Supports Windows and X11.

https://github.com/Unrud/remote-touchpad/issues diff --git a/flatpak/com.github.unrud.RemoteTouchpad.json b/flatpak/com.github.unrud.RemoteTouchpad.json index efa6dc7..151250b 100644 --- a/flatpak/com.github.unrud.RemoteTouchpad.json +++ b/flatpak/com.github.unrud.RemoteTouchpad.json @@ -45,7 +45,7 @@ ], "buildsystem" : "simple", "build-commands" : [ - ". /usr/lib/sdk/golang/enable.sh; env GOPATH=\"$(pwd)\" go build github.com/unrud/remote-touchpad", + ". /usr/lib/sdk/golang/enable.sh; env GOPATH=\"$(pwd)\" go build -tags x11 github.com/unrud/remote-touchpad", "install -Dm0755 -t /app/bin remote-touchpad", "install -Dm0755 -t /app/bin src/github.com/unrud/remote-touchpad/desktop/remote-touchpad-wait-on-error", "install -Dm0644 -t /app/share/appdata src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.appdata.xml", diff --git a/plugin_x11.go b/plugin_x11.go index 89cdcb8..50555fd 100644 --- a/plugin_x11.go +++ b/plugin_x11.go @@ -1,4 +1,4 @@ -// +build linux +// +build x11 /* * Copyright (c) 2018 Unrud diff --git a/plugin_x11_dummy.go b/plugin_x11_dummy.go index 029f5aa..d404c0c 100644 --- a/plugin_x11_dummy.go +++ b/plugin_x11_dummy.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !x11 /* * Copyright (c) 2018 Unrud From fe568cd37cee6c647cd30f0a4ec435e3e9c802c2 Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:02 +0200 Subject: [PATCH 013/311] add changelog --- CHANGELOG.md | 17 +++++++++++++++++ desktop/remote-touchpad.appdata.xml | 22 ++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..3df0d89 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,17 @@ +# Changelog + +## 0.0.4 (2018-07-22) + + * add setting for mouse polling interval + +## 0.0.3 (2018-06-26) + + * fix websocket with https + +## 0.0.2 (2018-06-25) + + * add reload button to disconnected-page + +## 0.0.1 (2018-06-23) + +initial release \ No newline at end of file diff --git a/desktop/remote-touchpad.appdata.xml b/desktop/remote-touchpad.appdata.xml index b549b08..5e269ed 100644 --- a/desktop/remote-touchpad.appdata.xml +++ b/desktop/remote-touchpad.appdata.xml @@ -18,10 +18,24 @@ https://github.com/Unrud/remote-touchpad Unrud - - - - + +​
    +
  • add setting for mouse polling interval
    • +
+ + +​
    +
  • fix websocket with https
    • +
+ + +​
    +
  • add reload button to disconnected-page
    • +
+ + +​

initial release

+ From 2eb0baaca1834c6641924719732b9b822ecb9856 Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:05 +0200 Subject: [PATCH 014/311] log plugin errors --- main.go | 11 +++++++---- plugin.go | 16 +++++++++------- plugin_windows.go | 2 +- plugin_windows_dummy.go | 4 +++- plugin_x11.go | 3 ++- plugin_x11_dummy.go | 4 +++- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/main.go b/main.go index 4707aac..2d354df 100644 --- a/main.go +++ b/main.go @@ -156,16 +156,18 @@ func main() { log.Fatal("interval must be greater or equal to zero") } var plugin Plugin + var pluginName string platformErrors := "" - for _, f := range Plugins { + for _, pluginInfo := range Plugins { + pluginName = pluginInfo.Name var err error - plugin, err = f() + plugin, err = pluginInfo.Init() if err == nil { break } else if _, ok := err.(UnsupportedPlatformError); ok { - platformErrors += err.Error() + "\n" + platformErrors += fmt.Sprintf("%s plugin: %v\n", pluginName, err) } else { - log.Fatal(err) + log.Fatal(fmt.Sprintf("%s plugin: %v", pluginName, err)) } } if plugin == nil { @@ -212,6 +214,7 @@ func main() { return } if err := processCommand(plugin, message); err != nil { + log.Print(fmt.Sprintf("%s plugin: %v", pluginName, err)) return } } diff --git a/plugin.go b/plugin.go index 014f6ef..8f9c722 100644 --- a/plugin.go +++ b/plugin.go @@ -19,20 +19,22 @@ package main -import "fmt" +type PluginInfo struct { + Name string + Init func() (Plugin, error) +} -var Plugins [](func() (Plugin, error)) = [](func() (Plugin, error)){ - InitX11Plugin, - InitWindowsPlugin, +var Plugins []PluginInfo = []PluginInfo{ + {"X11", InitX11Plugin}, + {"Windows", InitWindowsPlugin}, } type UnsupportedPlatformError struct { - name string - message string + err error } func (e UnsupportedPlatformError) Error() string { - return fmt.Sprintf("%s plugin: %s", e.name, e.message) + return e.err.Error() } type Plugin interface { diff --git a/plugin_windows.go b/plugin_windows.go index 61454b3..64db40f 100644 --- a/plugin_windows.go +++ b/plugin_windows.go @@ -75,7 +75,7 @@ func InitWindowsPlugin() (Plugin, error) { p.userDLL = syscall.NewLazyDLL("user32.dll") p.sendInputProc = p.userDLL.NewProc("SendInput") if err := p.sendInputProc.Find(); err != nil { - return nil, UnsupportedPlatformError{"Windows", err.Error()} + return nil, UnsupportedPlatformError{err} } return p, nil } diff --git a/plugin_windows_dummy.go b/plugin_windows_dummy.go index 8db1b06..dae0dbe 100644 --- a/plugin_windows_dummy.go +++ b/plugin_windows_dummy.go @@ -21,6 +21,8 @@ package main +import "errors" + func InitWindowsPlugin() (Plugin, error) { - return nil, UnsupportedPlatformError{"Windows", "disabled"} + return nil, UnsupportedPlatformError{errors.New("disabled")} } diff --git a/plugin_x11.go b/plugin_x11.go index 50555fd..8031dad 100644 --- a/plugin_x11.go +++ b/plugin_x11.go @@ -43,7 +43,8 @@ type x11Plugin struct { func InitX11Plugin() (Plugin, error) { display := C.XOpenDisplay(nil) if display == nil { - return nil, UnsupportedPlatformError{"X11", "failed to connect to X server"} + return nil, UnsupportedPlatformError{ + errors.New("failed to connect to X server")} } return &x11Plugin{display: display}, nil } diff --git a/plugin_x11_dummy.go b/plugin_x11_dummy.go index d404c0c..9b41d2e 100644 --- a/plugin_x11_dummy.go +++ b/plugin_x11_dummy.go @@ -21,6 +21,8 @@ package main +import "errors" + func InitX11Plugin() (Plugin, error) { - return nil, UnsupportedPlatformError{"X11", "disabled"} + return nil, UnsupportedPlatformError{errors.New("disabled")} } From e8779478241195a8835e456b8822efdd03d1560c Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:06 +0200 Subject: [PATCH 015/311] remove mouse polling interval --- bindata.generated.go | 4 ++-- main.go | 11 ++--------- webdata/fn.js | 38 +------------------------------------- 3 files changed, 5 insertions(+), 48 deletions(-) diff --git a/bindata.generated.go b/bindata.generated.go index 295f7c6..9c02c58 100644 --- a/bindata.generated.go +++ b/bindata.generated.go @@ -74,7 +74,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _webdataFnJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\x5b\x6f\xdb\x38\x97\xef\xfe\x15\xa7\x7a\x28\xe4\xc6\xf1\x25\x45\x77\x06\x75\x9d\x5d\x4f\xea\x4c\x82\xc9\x0d\xb6\xb3\x53\x23\x08\x0a\x5a\x3a\xb6\x35\x95\x49\x8d\x48\xc5\x49\xb7\xf9\xef\x0b\xea\x4a\x51\x94\x9c\x76\xbe\xbe\x7c\xf8\x0c\x4c\x47\x21\xcf\x39\x3c\xf7\x0b\xa5\xde\x9b\x16\xbc\x01\x00\x38\x61\xc1\x53\xe8\xad\x37\x02\x6c\xa7\x0d\x47\xfd\xc1\xaf\x70\x4b\xc3\xc8\xfd\x10\xc9\x7f\xff\x87\x45\xc2\x67\xec\x4b\xd7\x61\xdb\xe3\x16\x64\x48\xf3\x8d\xc7\x61\xe5\xf9\x08\x1e\x87\x80\x84\x02\xd8\x0a\xa6\xb8\x65\x02\x0f\xe7\x2c\x72\x36\x01\x71\xbb\x05\xf8\x29\x63\x4b\x12\x4a\xd8\x55\x88\x08\x9c\xad\xc4\x8e\x84\xf8\x1e\x9e\x58\x04\x0e\xa1\x10\xa2\xeb\x71\x11\x7a\xcb\x48\x20\x78\x02\x08\x75\x7b\x2c\x84\x2d\x73\xbd\xd5\x53\x4a\xc4\x13\x10\x51\x17\x43\x10\x1b\x04\x81\xe1\x96\xcb\x43\xe5\x1f\xbf\x5f\xdd\xc2\xef\x48\x31\x24\x3e\xdc\x44\x4b\xdf\x73\xe0\xc2\x73\x90\x72\x04\xc2\x21\x90\x2b\x7c\x83\x2e\x2c\x33\x52\x12\xe9\x54\x72\x32\x4b\x39\x81\x53\x16\x51\x97\x08\x8f\xd1\x0e\xa0\x27\x36\x18\xc2\x03\x86\xdc\x63\x14\xde\x66\xc7\xa4\x34\x3b\xc0\xc2\x94\x8e\x4d\x84\x14\x21\x04\x16\x48\xd4\x36\x10\xfa\x04\x3e\x11\x05\xb6\xa2\x04\x4d\x3d\x52\x1b\x85\xd0\x2e\x78\x34\x3e\x64\xc3\x02\x04\xb1\x21\x42\xca\xbb\xf3\x7c\x1f\x96\x08\x11\xc7\x55\xe4\x77\x52\x42\xcb\x48\xc0\x9f\xe7\xf3\xb3\xeb\xdb\x39\x8c\xaf\x16\xf0\xe7\x78\x3a\x1d\x5f\xcd\x17\x43\xd8\x79\x62\xc3\x22\x01\xf8\x80\x09\x35\x6f\x1b\xf8\x1e\xba\xb0\x23\x61\x48\xa8\x78\x02\xb6\x4a\x89\x5c\x4e\xa6\x27\x67\xe3\xab\xf9\xf8\xb7\xf3\x8b\xf3\xf9\x02\x58\x08\xa7\xe7\xf3\xab\xc9\x6c\x06\xa7\xd7\x53\x18\xc3\xcd\x78\x3a\x3f\x3f\xb9\xbd\x18\x4f\xe1\xe6\x76\x7a\x73\x3d\x9b\x74\x01\x66\x28\x99\xc3\x94\x46\x83\xde\x57\xb1\xf5\x42\x04\x17\x05\xf1\x7c\x5e\xe8\x61\xc1\x22\xe0\x1b\x16\xf9\x2e\x6c\xc8\x03\x42\x88\x0e\x7a\x0f\xe8\x02\x01\x87\x05\x4f\xfb\x6d\x9a\x90\x21\x3e\xa3\xeb\x58\xe0\xd4\xbb\xba\x00\xe7\x2b\xa0\x4c\x74\x80\x23\xc2\x87\x8d\x10\xc1\xfb\x5e\x6f\xb7\xdb\x75\xd7\x34\xea\xb2\x70\xdd\xf3\x13\x02\xbc\x77\x2c\xd9\xe9\xb5\x5a\xd0\xeb\xc1\xdd\x00\x62\x93\x74\xe0\x28\x79\x40\xde\x81\xb7\xd9\xe3\x7d\xcb\x61\x94\x0b\x98\x5f\xdf\x9e\x9c\x7d\xbe\xbc\xfe\xdf\xc9\xe7\xf9\xd9\x74\x32\x3b\xbb\xbe\xf8\x08\x23\xb8\x1b\xf4\x3b\x30\x78\x27\xff\xbb\x1f\x96\x40\xe7\xe7\x97\x13\x69\xa0\x11\x1c\xbd\xeb\x67\x5b\x31\xfe\xe5\xed\x85\x5c\x1e\x64\x8b\xb3\x93\xe9\xf5\xc5\x45\xb6\xdc\xef\xf6\xdf\x0d\x5b\x92\xaf\xbb\xe0\xb1\xc7\x3b\xb0\x8d\x7c\x71\xdf\x81\x6e\xb7\x9b\xf1\x72\x73\x7d\x7e\x35\x9f\x4c\x3f\x8f\x4f\x4e\x26\x17\x93\xe9\x78\x7e\x7e\x7d\x25\x79\xb9\xeb\x77\xa0\x7f\xdf\x81\xbb\x5f\x7f\xe9\xc0\x40\x3e\x0c\x7e\x79\x9b\x3e\xbd\x7b\xf7\xb6\x03\x47\xf7\x39\x93\x97\xe3\x4f\x9f\xcf\x3f\x5e\x4c\x3e\xdf\xde\x7c\x1c\xcf\x27\x33\xc9\x50\x7f\xd8\x6a\x3d\x90\x10\x76\x7c\x18\xff\x3f\x20\x6e\xfe\xe0\x93\x25\xfa\xe9\xbe\x90\xaa\xb9\x64\xd2\x66\x23\x58\x11\x9f\xe3\xb0\x58\x9f\x09\x99\x0d\x46\xd0\x57\xd6\x2e\x08\x17\x13\xea\x6a\xab\x53\xf4\x91\x70\x74\x4f\x58\x44\x15\x0c\x46\xd7\xcc\xa3\xeb\x54\xff\x52\xae\xfb\x64\x63\xcb\x1e\xf0\xd3\x2c\xda\x16\xa0\x72\x65\x51\x5a\xe1\x4e\xc8\x7c\xff\x93\x61\xad\x0c\xe7\x86\x64\xbd\xf6\xe8\xba\x2c\x40\xb6\x3a\xf7\xb6\x28\xc3\x68\x04\x34\xf2\xfd\x64\x2f\x0a\x5c\x22\x50\xee\x84\x86\xf5\x73\x2a\x30\x7c\x20\x7e\x71\x82\xe7\xfa\x78\x1b\xef\xf1\x64\xb1\xb5\x8a\xa8\x23\xb3\x04\xac\x22\xdf\xe7\x4e\x88\x48\x27\x94\x2c\x7d\x74\xed\x36\xfc\x5f\x4b\x06\x54\x88\x22\x0a\x29\xd8\x2e\x73\xa2\x2d\x52\xd1\xad\x80\xc2\xb7\x6f\x31\xa4\xfc\xe5\x50\x3b\x5c\x7e\xf1\xc4\xe9\x8b\x60\xb7\xec\xab\x04\x9c\xed\x07\xe4\x8d\x04\x63\xb5\xb5\x87\xad\x67\x45\xb0\x10\xff\x8e\x90\x2b\x8c\xd8\x98\x49\xe6\xad\xc0\xc6\x6e\x05\x20\xdb\x96\x3f\xc3\xb6\xdd\x1e\xc6\xdb\xcf\x80\x3e\xc7\x94\x48\x22\xed\xb4\x99\x54\x0d\x90\x91\xe0\x96\x7d\x55\x00\x67\x06\x6a\x26\x08\x33\x29\xbe\x87\x2f\x03\x40\x4e\xa8\xa4\x4b\x7c\xf4\x4a\x30\x8a\x1e\x73\x13\x95\x61\xd4\x83\x6a\x40\x0c\x3c\x6b\x4e\x34\xd9\x4f\xd2\x04\xd8\x44\x78\xcb\xbe\x9e\x10\xea\xa0\x6f\xd6\x6e\x13\x5c\x23\x59\xfe\x02\x5e\x75\x20\xb3\xae\x95\x28\xf3\x51\xe2\xbd\x28\x20\x13\xd0\x97\x05\x64\x03\x6c\x39\x20\x9b\x00\x79\x23\x41\x99\x92\xb4\x78\x24\xae\x5b\xa0\x38\x1b\x42\xd7\x38\x79\x40\x2a\x2e\x3c\x2e\x64\x69\xb5\xfd\xf4\xc1\xe8\x5d\x55\x51\x5f\x8d\x46\x71\x0b\xb6\xf2\x28\xba\x46\x7d\x13\xd7\x2d\x9f\x60\xad\x34\x06\xac\x0e\xe4\xa7\xee\x73\xc6\xaa\xbc\x3f\xc2\x41\x42\xeb\xc7\xf8\x30\x1a\xe7\x47\x98\xd8\xb2\xaf\x3f\xc8\x81\xc1\xea\x3f\xc2\xc0\xe5\xac\xa0\x73\x52\x77\x7e\xc9\x7b\x64\x37\x16\x57\x61\x5b\x24\xfd\x91\xf0\xb6\x38\x13\x64\x1b\x68\xd1\x51\x9c\xef\xb9\x48\x85\xb7\xf2\x30\x7c\x9f\xd4\xf8\x6e\xb1\xd2\xc9\xa1\x02\xb2\xc6\x4f\x19\x40\xfc\x87\xb6\x17\xf7\x10\x0d\x00\x0b\x75\x6f\xa1\xed\x55\x90\x15\x80\x5c\x82\xf7\xc5\x63\x22\x79\x39\x70\xd4\x1e\xe4\x9c\xba\xf8\xf8\xdb\xd3\xb9\x6b\x7b\xee\x9c\x9d\x7a\x34\xd7\xb8\xec\x71\xed\xb8\xd6\xc7\x15\x1e\x3c\xf8\xa0\x75\x2f\x5d\x1f\xe9\x5a\x6c\x86\xe0\x1d\x1c\xa8\x76\x4a\x1a\x04\x18\x69\xe0\x77\xde\xbd\xa2\xb0\x61\xab\xd0\xeb\x0a\x6c\x09\x3f\x02\x9d\x87\xec\x97\x9a\xc2\x1b\xe6\xab\xcf\xad\xe2\xdf\x74\xf7\x70\x50\x16\xd3\x21\xbe\x13\xc9\x71\xe5\x86\x79\xb2\x81\x19\x3b\x0e\xfa\x18\xc6\x63\xd0\x65\xe4\x0b\x9b\x07\x88\x8d\xe2\x9a\x5a\xd1\x3a\xa1\xf9\x11\x8c\x8c\x08\x77\xde\xfd\x5d\xff\xbe\xe0\x9c\x34\x01\x0e\x14\x40\xa9\x16\x7e\x04\x1f\x46\x50\x62\x34\xfb\x39\x8c\x0a\x8f\x46\xa8\xeb\x24\xd7\xa8\x54\x68\xbf\x46\x93\xe4\xc8\x84\xc6\x07\xb5\xac\x1d\x0e\x34\x29\x9a\x41\x55\x39\xb2\x2a\x93\xe8\xfb\x90\x0f\xda\xd0\x93\x92\xc9\xa7\x36\xbc\x01\x9b\x1c\x1d\x92\x41\x1b\x0e\x80\x0c\x86\x8a\x59\xa5\x10\x0d\x16\x80\xe3\xb2\x74\xe9\x31\x46\x9e\x1a\xc8\xa8\xdc\x96\xdc\x69\xa0\x07\xcd\xc7\x72\xff\x9c\x57\xd1\xba\xbe\x5a\xee\xed\x78\x97\x23\x75\x6d\x6b\x39\x18\xf6\x2d\xad\x80\x25\xcd\xb5\x1c\x35\xc6\xd4\x9d\xc5\x7d\x7c\xa9\x13\x2a\x35\xe5\x09\x55\x55\x60\x46\x6f\x73\x80\x98\x9f\xb2\xeb\x68\xad\xfb\x31\xf4\xe1\xf5\xeb\x72\xe3\x6e\xf0\x8f\xf2\x20\xc0\x51\x64\x04\x6c\xed\xb8\x8e\x36\x1b\xb4\xab\xb1\x59\x56\x9f\xc6\x6c\x26\xa7\xc2\xcf\x41\x3c\x36\x66\x19\x24\x1e\x88\x60\x04\x97\x44\x6c\xba\x22\x8c\xa8\x63\x67\x33\x52\xbb\x0c\xb5\xa8\x42\x2d\x0a\x28\xa9\x8b\x78\x97\x2c\x79\x42\xa1\x0d\xc7\x23\x18\xc0\xb7\x6f\x50\x5a\x5f\x24\xeb\xaa\x46\xf2\xa1\xec\x70\x94\x3c\x0f\x4b\x5b\x0b\x65\x6b\xa1\x68\x5f\x1f\x8e\xb2\x8d\xdc\x1b\xb6\x16\x1c\xa4\x02\x1e\x80\x35\xcc\xfe\x5a\xb4\x55\x3f\x54\x26\xbe\xb2\x80\xc5\x18\xa8\x28\x22\x9d\x03\x4d\x90\x75\xca\x48\xe9\x18\xd4\x91\xe2\x55\x15\xa2\x4c\xa0\x87\xa3\xec\xaf\xa1\xb6\xbd\x28\x6d\x7f\x97\x62\xb8\x54\x45\x26\x74\xa6\x9a\x8c\x1b\x3d\x39\xa8\xe4\x8e\x47\x95\xa1\x5f\xe5\xdb\xf1\x91\x84\xb9\x2b\x2b\x4e\xae\xb8\xad\x69\x06\xae\x3a\xf2\x86\x50\xd7\xc7\xb8\x0c\xdb\xf8\x20\xd4\x78\x35\x56\xc7\x4a\x94\x95\xee\x11\xf0\x41\x74\xf3\x5a\x3d\x2c\xc3\x68\x77\x10\xa5\x3d\xc3\xed\x42\xb6\x5f\x1d\xfe\xcb\x2e\x25\xf2\xab\x07\x79\x78\xd2\xac\xb9\x29\xcf\xc3\xda\x52\x28\x9a\x4b\xbe\x14\x5f\x14\x65\x5e\x90\x70\x8d\x49\x27\x17\x10\x57\xe6\x9d\xda\xcd\xf8\xea\xe5\x7b\x6a\x9b\xe4\x3a\x08\x51\xf6\x7f\x1f\x71\x45\x64\x21\x57\x8c\xa8\xd9\x20\x88\xf8\xc6\xd6\x5a\xbd\x98\x8b\x4e\x59\xf5\xed\xb6\xa6\xe0\xd2\xa5\x8e\x2a\xe5\xab\x4c\xbf\x3a\xcf\xca\x05\x4e\x7d\xca\xaa\x64\x8f\xa6\xcc\x55\x96\xbb\x74\xf9\xd3\x94\x0d\xb4\x40\x6c\x4e\x08\x99\x58\x7a\x11\x7b\x65\x28\x38\x79\x20\x65\x49\x5c\x43\xd2\x64\x6c\xaa\x8b\x06\x67\x15\x61\xd5\xde\xa6\xd0\x9b\x50\x57\x0d\xbc\x9f\xe6\xd2\x49\x17\xfb\xa8\xb5\xb1\x45\xbf\x2c\x4c\x5d\xad\xa6\x55\x89\xff\xa1\x5a\x64\x9b\xdc\x5b\x73\x60\x1e\xf8\x9e\x83\x92\x50\x07\x06\xba\x93\x96\xb2\xc0\xc1\x41\xad\x0b\x1b\xb2\x4c\x91\x45\x0d\xf9\xe4\xd8\x78\x21\x9c\x2a\xaa\x92\xcb\xb2\x3c\x55\x18\xf0\xf9\x05\x29\x31\x4f\x0a\xda\xd1\xb2\x14\xbd\x7e\x6d\x74\x12\xf5\xe4\x4a\x63\xf5\x13\xce\x7d\xa5\x88\xf7\xfa\x75\x59\x8b\x70\xa8\x26\xf2\x0f\xe5\x6b\x71\xdd\x8d\x96\x91\x10\x8c\x56\x73\x89\x29\x95\x6b\x05\x17\x92\x37\x22\x09\xfa\x40\x71\x98\x62\x98\x36\x53\x39\xaa\xa5\xf2\x56\xa1\xb2\x87\xc8\xdb\x5a\x22\xc6\xf9\xa1\x30\x8a\x2c\xdb\x29\xac\xac\xe2\x03\x4b\x0b\x8c\x8c\x8e\x41\xda\x6a\xda\xe0\x28\xb2\x8c\x53\xe9\xc2\x3b\x9a\xe6\x2b\x1a\x2a\x13\xaf\xe5\xb0\x6f\xed\x69\x60\x93\xe4\x93\x5c\xe1\xfd\x27\xff\xfc\xe3\xfc\x03\x4d\xd9\xa3\xaa\x77\x09\xa5\x6b\x9d\x47\xdb\x4f\x45\x4c\xa5\x2b\x8b\xf2\xca\xbf\x93\x65\xe2\x77\x38\x1e\x17\x59\x45\xe7\x7f\x87\x22\x69\xe6\x03\xb6\x53\x0f\x8d\xef\x94\xe0\xb0\x72\xfd\xe2\x3e\xa6\x7b\x71\xd2\xea\xc8\x14\x71\x00\x75\x04\x16\x0d\x04\x16\x39\x01\x4d\x2a\x73\xda\x6d\x2c\x27\x72\xee\x88\xa5\x32\x43\xdd\x99\x49\x1e\xc2\xe0\x5e\xd7\x5d\x8d\x3b\x19\x94\x28\x4d\xf7\x3d\xfa\x1a\x96\xd1\x9f\xaa\xe8\x8d\xda\x2a\xa3\xcb\x40\xf8\x88\xbe\x20\x7a\x60\xd4\x90\x30\x04\x4e\xec\xf9\x07\x23\x29\xc8\x9b\xfd\xd7\x5c\xf9\x54\xe7\x3e\xb6\xa1\xa7\x9c\xff\x06\x06\xfd\x7e\xbf\x5d\xa2\xbb\x88\xe9\x3e\x7d\x1f\xdd\xa7\x3d\x74\x6b\x15\x6b\xb0\xc3\x7e\xac\x85\x41\xfd\xcd\x58\x85\x8a\x5f\xd2\x0b\x35\x17\xfc\x2c\xab\x1d\x8f\xea\x6b\x7e\x63\x07\x12\x4f\xda\x7b\x87\x88\x83\x51\x62\xe5\x37\xc5\x5b\xf5\x9a\x09\x22\x81\x5c\x98\x21\x95\x36\xa1\x96\xa1\x4a\xa7\xa0\x0d\xf9\x09\x1b\xca\x7b\xfc\xa1\x01\x7a\x51\x40\x2f\xea\xa0\x9f\xb5\x51\x5b\xbb\xf9\x32\xde\xd2\x6f\x88\x2f\x39\xc5\x29\xf2\x80\x51\x8e\xf6\x16\x39\x27\x6b\x2c\x15\x82\x0d\xb9\x5e\xfe\x25\xe7\x0b\xdc\xc1\x5f\x7c\x76\x36\xb6\xad\xd9\xd9\xf8\xf0\xe8\xdd\x7f\x59\x1d\xb0\xe6\x93\x4f\xf3\xac\xba\x27\xa0\x5d\x8e\xe2\xec\x72\x7c\xf2\x07\x3e\x65\xf4\xcc\x70\x09\x9f\xf6\xce\xa3\x2e\xdb\x75\x7d\xe6\xc4\xde\xdf\xdd\x10\xbe\xe9\xf2\x68\xc9\x45\x68\x0f\xb2\x1c\x98\x5e\x1b\x2e\x05\x23\x76\x8a\xbe\x4e\x8e\xb1\xad\xdf\x16\xf3\xc9\xcc\x6a\x6b\xf7\x7f\x41\xc8\x1c\xe4\xfc\x84\x6d\xb7\x84\xba\xba\x64\xd2\x66\xe9\x92\x2c\x5c\xe1\x58\xd8\xfd\xb6\xb4\x97\xe5\x59\x7a\x35\x92\x09\x2d\x20\x21\xc7\x73\x2a\x72\x24\x9d\xc1\x8c\xa8\xc7\xaf\xc8\x95\xfd\xd8\x96\x7e\xf8\xd8\x15\x6c\x26\x42\x8f\xae\xed\x36\xbc\x1a\x41\x05\x37\x06\x32\x55\xaa\x54\x5c\xed\x72\x42\x37\xb1\xf2\xe5\xc0\xe3\xf0\x5f\x72\x1b\xa3\x9c\xad\x0f\x1c\x65\x96\x9e\x5b\xad\xd4\x6e\xd5\xd7\x45\x3e\x23\xae\xd5\x81\xcc\x12\xb6\xea\x4d\x24\x12\x1b\x59\xb4\x1d\x22\xf4\xeb\x97\xf8\x03\x8e\x00\x69\x32\xb0\xe6\xaf\xa3\xd6\x28\xd2\x77\x57\x71\xf9\xb7\x52\x10\x4b\xb9\x9d\x73\x7c\xc6\x63\x6a\xb5\x48\x09\x44\x86\x13\x90\x46\xe0\x80\xa8\x90\xf1\x15\xca\x1e\xf0\x18\x46\xe5\xe8\x0b\x3e\x2d\x19\x09\x1b\x8f\xc9\x60\x54\xbc\xe2\x3d\x5f\x3e\x0b\xd4\xe2\xeb\xb0\x2a\x1d\x81\x8f\xa2\x09\x57\xee\x67\xf0\x89\x6e\xba\x5c\x3c\xf9\xd8\x75\x3d\x1e\xf8\x44\xd6\x60\x8b\x32\x8a\x56\xae\x86\xc6\xfd\x4c\x94\x46\x20\x79\x66\xf7\x81\xf8\x11\xca\x0d\x2b\x7d\x45\x95\x7c\x34\x74\x13\x32\xc1\x1c\x26\xf5\x6c\xed\x38\x7f\x6f\x15\x17\xaa\x79\x5e\x08\x72\x98\x11\x58\xf1\x17\x5a\x56\x79\x66\x2d\x13\xc9\x68\x24\xde\xbb\xe3\x69\x06\xfb\x13\x97\x33\xe6\x7c\x41\x61\x2b\x08\x07\x60\xf5\x7a\x72\x66\x29\x92\x10\xe3\x82\x92\x2d\xc2\x41\x29\x2e\x95\x9f\xc2\x18\x0b\x05\xfc\x37\x58\xef\x4b\x14\xe2\xd5\xf7\x60\x59\xed\x7a\x1a\x56\x6f\xc7\xa5\x19\x52\x16\xbb\x8c\xa6\x29\x42\x46\x46\x16\x3e\xf1\x65\x9c\x5e\x00\x4b\x71\xa4\x67\x8f\xf8\x26\x4d\xcb\x7f\x31\x95\xae\x4b\x04\x69\xeb\xe0\xe9\xe1\xb1\x1f\xd8\xda\x35\xd3\xb3\x21\x2d\x99\x12\x92\x1e\xd7\xe5\x0e\x31\x1b\x0c\xab\x05\x47\x65\x4b\x69\x33\x92\x18\x6f\x74\xa7\x4c\xd0\x8d\xc7\x05\x0b\x9f\xba\x5c\x10\x81\xb1\x6f\x14\x81\xa5\x09\x5a\xef\xa6\x2b\x1f\x1f\xad\xb2\xe4\xb1\xbb\xae\x98\x13\x71\x7b\xdf\xdc\x6b\x0c\x0f\x8d\x64\xaa\xaa\xe7\xec\xcd\x6c\x6c\xed\x58\xe5\xaa\xad\x75\x33\x1b\xbe\x2e\xd1\x85\x32\x7f\xa5\x53\xb6\xce\x4b\xf5\xb9\x2f\xce\x9b\x95\x18\x03\x2a\x65\xc8\x9c\x56\x54\xbd\x64\xda\xd8\x9b\x23\xb3\x0c\x67\xa8\x36\x8e\xef\x39\x5f\xac\x4e\x5d\x88\xbd\xf4\x57\x84\xdb\x4f\xb2\xc1\x3f\xd3\xad\xe6\x4d\x66\xe7\xcc\x42\x21\x88\xf8\x66\x26\xc3\x41\x29\x32\x1d\xb0\x92\x8f\x88\xe1\x0f\xad\xee\x3c\x2b\x6f\xaf\x5e\x19\xbe\x2f\x54\x85\xd5\x6b\x4e\xa3\x44\x89\xec\x15\x94\x5a\x13\xfe\x34\x1b\x98\x62\xb6\xfa\xbd\x60\x40\xdc\xea\x2d\x55\xb6\x52\xeb\xa1\x32\xaf\xfd\x64\xef\xac\x57\x8b\x52\x52\x5f\x8d\xe2\x52\x53\x73\x21\x27\x64\x69\x2a\xa0\xdb\x86\x54\xa7\x56\xe6\xb2\x12\x62\x4a\x49\xb3\x97\x79\xd8\x92\x38\x5f\x6c\xcd\x7f\x52\x10\x46\x03\x16\xa4\xc9\x78\x4f\x11\xab\x73\xf7\xcc\xdf\x75\x71\x5e\x92\x67\xe1\xa5\xed\x08\xd4\xde\x62\xd6\x8b\x5a\xe8\xe4\x79\xd8\x9c\xb8\x42\x94\x5d\xf0\xcf\x4e\x5b\x66\xcf\xc8\x5b\x90\x84\x09\xdd\x4e\x52\x8b\x55\x7e\xe2\xf1\x9b\x0b\x12\x0a\xab\xa3\xbe\x86\xed\xe4\x5f\xeb\xee\xc1\x45\xea\xe6\x98\x13\xea\xbe\x18\xcf\x89\x2f\x7d\x73\xd4\xe4\x0e\xf8\xc5\xd8\x72\x50\xcf\x71\xe5\xc8\x5b\x60\x3e\x17\x8f\xff\x1f\x00\x00\xff\xff\x6b\xa4\xaf\x2d\xb1\x32\x00\x00") +var _webdataFnJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\x5d\x6f\xdb\xb8\xb2\xef\xf9\x15\x53\x3d\x14\x72\xe3\xc8\x76\x8a\xde\x5d\xd4\x75\xef\xf5\xa6\xee\x26\xd8\xa4\x09\x6c\xe7\x6e\x8d\x20\x58\xd0\xd2\xd8\xd6\x56\x26\xb5\x22\x15\xc7\x3d\xcd\x7f\x3f\xa0\x3e\x29\x8a\x92\xb3\x5d\xf4\xe5\xe0\x18\x68\x2a\x93\x33\xc3\xf9\xfe\xa0\xdc\x7b\x75\x04\xaf\x00\x00\xce\x58\xb8\x8f\xfc\xf5\x46\x80\xed\x76\xe0\xb4\x3f\xf8\x19\x6e\x69\x14\x7b\xef\x62\xf9\xf7\xff\x58\x2c\x02\xc6\xbe\x38\x2e\xdb\xbe\x3f\x82\x1c\x69\xbe\xf1\x39\xac\xfc\x00\xc1\xe7\x10\x92\x48\x00\x5b\xc1\x14\xb7\x4c\xe0\xc9\x9c\xc5\xee\x26\x24\x9e\x53\x82\x7f\x64\x6c\x49\x22\x09\xbb\x8a\x10\x81\xb3\x95\xd8\x91\x08\xdf\xc2\x9e\xc5\xe0\x12\x0a\x11\x7a\x3e\x17\x91\xbf\x8c\x05\x82\x2f\x80\x50\xaf\xc7\x22\xd8\x32\xcf\x5f\xed\x33\x22\xbe\x80\x98\x7a\x18\x81\xd8\x20\x08\x8c\xb6\x5c\x1e\x2a\xbf\xfc\xfa\xe9\x16\x7e\x45\x8a\x11\x09\xe0\x26\x5e\x06\xbe\x0b\x97\xbe\x8b\x94\x23\x10\x0e\xa1\x5c\xe1\x1b\xf4\x60\x99\x93\x92\x48\x1f\x25\x27\xb3\x8c\x13\xf8\xc8\x62\xea\x11\xe1\x33\xda\x05\xf4\xc5\x06\x23\x78\xc0\x88\xfb\x8c\xc2\xeb\xfc\x98\x8c\x66\x17\x58\x94\xd1\xb1\x89\x90\x22\x44\xc0\x42\x89\xda\x01\x42\xf7\x10\x10\x51\x62\x2b\x4a\xd0\xd4\x23\xb5\x51\x0a\xed\x81\x4f\x93\x43\x36\x2c\x44\x10\x1b\x22\xa4\xbc\x3b\x3f\x08\x60\x89\x10\x73\x5c\xc5\x41\x37\x23\xb4\x8c\x05\xfc\x7e\x31\x3f\xbf\xbe\x9d\xc3\xf8\xd3\x02\x7e\x1f\x4f\xa7\xe3\x4f\xf3\xc5\x10\x76\xbe\xd8\xb0\x58\x00\x3e\x60\x4a\xcd\xdf\x86\x81\x8f\x1e\xec\x48\x14\x11\x2a\xf6\xc0\x56\x19\x91\xab\xc9\xf4\xec\x7c\xfc\x69\x3e\xfe\xe5\xe2\xf2\x62\xbe\x00\x16\xc1\xc7\x8b\xf9\xa7\xc9\x6c\x06\x1f\xaf\xa7\x30\x86\x9b\xf1\x74\x7e\x71\x76\x7b\x39\x9e\xc2\xcd\xed\xf4\xe6\x7a\x36\x71\x00\x66\x28\x99\xc3\x8c\x46\x8b\xde\x57\x89\xf5\x22\x04\x0f\x05\xf1\x03\x5e\xea\x61\xc1\x62\xe0\x1b\x16\x07\x1e\x6c\xc8\x03\x42\x84\x2e\xfa\x0f\xe8\x01\x01\x97\x85\xfb\xc3\x36\x4d\xc9\x90\x80\xd1\x75\x22\x70\xe6\x5d\x0e\xc0\xc5\x0a\x28\x13\x5d\xe0\x88\xf0\x6e\x23\x44\xf8\xb6\xd7\xdb\xed\x76\xce\x9a\xc6\x0e\x8b\xd6\xbd\x20\x25\xc0\x7b\xef\x25\x3b\xbd\xa3\x23\xe8\xf5\xe0\x6e\x00\x89\x49\xba\x70\x9a\x3e\x20\xef\xc2\xeb\xfc\xf1\xfe\xc8\x65\x94\x0b\x98\x5f\xdf\x9e\x9d\xff\x71\x75\xfd\xff\x93\x3f\xe6\xe7\xd3\xc9\xec\xfc\xfa\xf2\x03\x8c\xe0\x6e\xd0\xef\xc2\xe0\x8d\xfc\x77\x3f\xac\x80\xce\x2f\xae\x26\xd2\x40\x23\x38\x7d\xd3\xcf\xb7\x12\xfc\xab\xdb\x4b\xb9\x3c\xc8\x17\x67\x67\xd3\xeb\xcb\xcb\x7c\xb9\xef\xf4\xdf\x0c\x8f\x24\x5f\x77\xe1\x63\x8f\x77\x61\x1b\x07\xe2\xbe\x0b\x8e\xe3\xe4\xbc\xdc\x5c\x5f\x7c\x9a\x4f\xa6\x7f\x8c\xcf\xce\x26\x97\x93\xe9\x78\x7e\x71\xfd\x49\xf2\x72\xd7\xef\x42\xff\xbe\x0b\x77\x3f\xff\xd4\x85\x81\x7c\x18\xfc\xf4\x3a\x7b\x7a\xf3\xe6\x75\x17\x4e\xef\xef\x87\x47\x47\x0f\x24\x82\x1d\x1f\x26\xff\x87\xc4\x2b\x1e\x02\xb2\xc4\x20\xdb\x17\x52\xfa\x2b\x26\xcd\x32\x82\x15\x09\x38\x0e\xcb\xf5\x99\x90\x01\x3f\x82\xbe\xb2\x76\x49\xb8\x98\x50\x4f\x5b\x9d\x62\x80\x84\xa3\x77\xc6\x62\xaa\x60\x30\xba\x66\x3e\x5d\x67\x2a\x96\xac\xdf\xa7\x1b\x5b\xf6\x80\x9f\x67\xf1\xb6\x04\x95\x2b\x8b\xca\x0a\x77\x23\x16\x04\x9f\x0d\x6b\x55\x38\x2f\x22\xeb\xb5\x4f\xd7\x55\x01\xf2\xd5\xb9\xbf\x45\x19\x29\x23\xa0\x71\x20\xa5\x5e\xc5\xd4\x95\x31\x0c\xab\x38\x08\xb8\x1b\x21\xd2\x09\x25\xcb\x00\x3d\xbb\x03\xff\x3a\x92\xee\x1e\xa1\x88\x23\x0a\xb6\xc7\xdc\x78\x8b\x54\x38\x35\x50\xf8\xf6\x2d\x81\x94\x9f\x02\x6a\x87\xcb\x2f\xbe\xf8\xf8\x2c\xd8\x2d\xfb\x2a\x01\x67\x87\x01\x79\x2b\xc1\x44\xe2\xce\xf0\xe8\x49\x11\x2c\xc2\xbf\x62\xe4\x0a\x23\x36\xe6\x92\xf9\x2b\xb0\xd1\xa9\x01\xe4\xdb\xf2\x63\xd8\xb6\x3b\xc3\x64\xfb\x09\x30\xe0\x98\x11\x49\xa5\x9d\xb6\x93\x6a\x00\x32\x12\xdc\xb2\xaf\x0a\xe0\xcc\x40\xcd\x04\x61\x26\xc5\x0f\xf0\x65\x00\x28\x08\x55\x74\x89\x8f\x7e\x05\x46\xd1\x63\x61\xa2\x2a\x8c\x7a\x50\x03\x88\x81\x67\xcd\x89\x26\x87\x49\x9a\x00\xdb\x08\x6f\xd9\xd7\x33\x42\x5d\x0c\xcc\xda\x6d\x83\x6b\x25\xcb\x9f\xc1\xab\x0e\x64\xd6\xb5\x12\x65\x01\x4a\xbc\x67\x05\x64\x0a\xfa\xbc\x80\x6c\x81\xad\x06\x64\x1b\x20\x6f\x25\x28\xb3\x8c\x16\x8f\xc4\xf3\x4a\x14\x77\x43\xe8\x1a\x27\x0f\x48\xc5\xa5\xcf\x85\x2c\x7c\x76\x90\x3d\x18\xbd\xab\x2e\xea\x8b\xd1\x28\x69\x90\x56\x3e\x45\xcf\xa8\x6f\xe2\x79\xd5\x13\xac\x95\xc6\x80\xd5\x85\xe2\xd4\x43\xce\x58\x97\xf7\x7b\x38\x48\x69\x7d\x1f\x1f\x46\xe3\x7c\x0f\x13\x5b\xf6\xf5\x3b\x39\x30\x58\xfd\x7b\x18\xb8\x9a\x95\x74\xce\x9a\xce\xaf\x78\x8f\xec\x95\x92\x02\x6a\x8b\xb4\x7b\x11\xfe\x16\x67\x82\x6c\x43\x2d\x3a\xca\xf3\x7d\x0f\xa9\xf0\x57\x3e\x46\x6f\xd3\xf2\xec\x94\x2b\xdd\x02\x2a\x24\x6b\xfc\x9c\x03\x24\x5f\xb4\xbd\xa4\xfc\xb7\x00\x2c\xd4\xbd\x85\xb6\x57\x43\x56\x00\x0a\x09\xde\x96\x8f\xa9\xe4\xd5\xc0\x51\xdb\x87\x0b\xea\xe1\xe3\x2f\xfb\x0b\xcf\xf6\xbd\x39\xfb\xe8\xd3\x42\xe3\xb2\x03\xb5\x65\xc9\xf7\x93\x9e\x00\x7c\x78\xa7\x35\x1e\x4e\x80\x74\x2d\x36\x43\xf0\x8f\x8f\x55\x3b\x25\x48\xb2\x95\xa9\x82\xdf\xf9\xf7\x8a\xc2\x86\x47\xa5\x5e\x57\x60\x4b\xf8\x11\xe8\x3c\xe4\x9f\xcc\x14\xfe\xb0\x58\x7d\x3a\x2a\xff\x66\xbb\x27\x83\xaa\x98\x2e\x09\xdc\x58\x0e\x13\x37\xcc\xa7\x02\xa3\xb1\xeb\x62\x80\x51\x32\xa4\x5c\xc5\x81\xb0\x79\x88\xd8\x2a\xae\xa9\x51\x6c\x12\x9a\x9f\xc2\xc8\x88\x70\xe7\xdf\xdf\xf5\xef\x4b\xce\x49\x1b\xe0\x40\x01\x94\x6a\xe1\xa7\xf0\x6e\x04\x15\x46\xf3\x8f\xcb\xa8\xf0\x69\x8c\xba\x4e\x0a\x8d\x4a\x85\xf6\x1b\x34\x49\x4e\x4d\x68\x7c\xd0\xc8\xda\xc9\x40\x93\xa2\x1d\x54\x95\x23\xaf\x32\xa9\xbe\x4f\xf8\xa0\x03\x3d\x29\x99\x7c\xea\xc0\x2b\xb0\xc9\xe9\x09\x19\x74\xe0\x18\xc8\x60\xa8\x98\x55\x0a\xd1\x62\x01\x78\x5f\x95\x2e\x3b\xc6\xc8\x53\x0b\x19\x95\xdb\x8a\x3b\x0d\xf4\xa0\xf9\x50\x6d\x7d\x8b\x2a\xda\xd4\x12\xcb\xbd\x1d\x77\x38\x52\xcf\xb6\x96\x83\x61\xdf\xd2\x0a\x58\x1c\x7a\x44\xa0\x9c\x12\xc6\xd4\x9b\x25\x2d\x78\x41\xb4\xe8\xe6\x61\x04\x57\x44\x6c\x1c\x11\xc5\xd4\xb5\xf3\x06\x3f\x4b\x69\x45\x87\x5f\x87\x5a\x94\x50\x52\x91\xc9\x2e\x59\xf2\x94\x42\x07\xde\x8f\x60\x00\xdf\xbe\x41\x65\x7d\x91\xae\xab\x5a\x2d\x26\x8a\x93\x51\xfa\x3c\xac\x6c\x2d\x94\xad\x45\xb9\x55\x88\xbd\xb5\xe0\x38\x93\xe3\x18\xac\x61\xfe\x6d\xd1\x51\x15\xae\x4c\x25\x55\x39\xca\x51\x45\x91\x37\x9b\x55\x4c\x90\x4d\x32\x67\x74\x0c\x52\x67\x78\x75\xb9\x95\x29\xe9\x64\x94\x7f\x1b\x6a\xdb\x8b\xca\xb6\x49\x7e\x2e\x25\xce\x65\xcb\x35\x90\x1f\x6a\x2a\x4b\x1b\x42\xbd\x00\x93\x2c\x6f\xe3\x83\x50\x5b\x17\x63\xf2\xad\x05\x79\x65\xc2\xc4\x07\xe1\x14\xa5\x60\x58\x85\xd1\xa6\xd3\xca\x9e\x61\xee\xcc\xf7\xeb\x63\x61\xd5\x90\xa2\x18\x4a\xe5\xe1\x69\x2f\xe0\x65\x3c\x0f\x1b\x33\xad\x68\xaf\x28\x52\x7c\x51\x56\x11\x41\xa2\x35\xa6\x8d\x42\x48\x3c\x78\xf9\x12\x1a\x37\x93\xa1\xfc\xef\xa4\x4e\xc9\x75\x18\xa1\x6c\x2f\x3e\xe0\x8a\xc8\x3a\xd1\x29\xe1\x34\x1b\x84\x31\xdf\xd8\x5a\x27\x91\x70\xd1\xad\xaa\xbe\xd3\xd1\x14\x5c\x19\xf7\x55\x29\x5f\xe4\xfa\xd5\x79\x56\x46\xfb\xe6\x7c\x50\x0b\xcd\xb6\xb4\x50\x95\xbb\x72\x2d\xd0\x16\x83\x9a\xfb\xb7\x87\x61\x2e\x96\x9e\x23\xa5\x75\x92\x96\x5e\xb7\x4c\x80\x24\xca\x13\xac\x86\xa4\xc9\xd8\x96\x76\x0d\xce\x2a\xa2\xba\xbd\x4d\xa1\x37\xa1\x9e\x1a\x78\x3f\xcc\xa5\xd3\x26\xe9\x51\xeb\x92\xca\x76\x4c\x98\x9a\x26\x4d\xab\x12\xff\x5d\xbd\xc6\xb7\xb9\xb7\xe6\xc0\x3c\x0c\x7c\x17\x25\xa1\x2e\x0c\x74\x27\xad\x64\x81\xe3\xe3\x46\x17\x36\x64\x99\xb2\x82\x1b\xf2\xc9\x7b\xe3\x6d\x60\xa6\xa8\x5a\x2e\xcb\xf3\x54\x69\xc0\xa7\x67\xa4\xc4\x22\x29\x68\x47\xcb\x02\xf0\xf2\xa5\xd1\x49\xd4\x93\x6b\x75\xfb\x07\x9c\xfb\x42\x11\xef\xe5\xcb\xaa\x16\xe1\x44\x4d\xe4\xef\xaa\x77\xa2\xba\x1b\x2d\x63\x21\x18\xad\xe7\x12\x53\x2a\xd7\xca\x1c\xa4\xd7\xe1\x29\xfa\x40\x71\x98\x72\x56\x33\x53\x39\x6d\xa4\xf2\x5a\xa1\x72\x80\xc8\xeb\x46\x22\xc6\xf6\xb4\x34\x8a\xac\xa2\x19\xac\x2c\xaa\x03\x4b\x0b\x8c\x9c\x8e\x41\xda\x7a\xda\xe0\x28\xf2\x8c\x53\x6b\xf2\xba\x9a\xe6\x6b\x1a\xaa\x12\x6f\xe4\xb0\x6f\xd5\x92\xae\x29\xf9\xa4\x37\x44\xff\xcd\x3f\xff\x38\xff\x40\x5b\xf6\xa8\xeb\x5d\x42\xe9\x5a\xe7\xf1\xf6\x73\x19\x53\xd9\xca\xa2\xba\xf2\x9f\x64\x99\xe4\x76\xdf\xe7\x22\xaf\xe8\xfc\xaf\x48\xa4\x2d\x74\xc8\x76\xea\xa1\xc9\x95\x05\x9c\xd4\xa6\x7b\xef\x31\xdb\x4b\x92\x56\x57\xa6\x88\x63\x68\x22\xb0\x68\x21\xb0\x28\x08\x68\x52\x99\xd3\x6e\x6b\x39\x91\xdd\x7e\x22\x95\x19\xea\xce\x4c\xf2\x04\x06\xf7\xba\xee\x1a\xdc\xc9\xa0\x44\x69\xba\xbf\xa3\xaf\x61\x15\x7d\x5f\x47\x6f\xd5\x56\x15\x5d\x06\xc2\x07\x0c\x04\xd1\x03\xa3\x81\x84\x21\x70\x12\xcf\x3f\x1e\x49\x41\x5e\x1d\xbe\x45\x29\x66\x29\xef\x51\x0e\xf6\xe5\xf9\xaf\x60\xd0\xef\xf7\x3b\x15\xba\x8b\x84\xee\xfe\xef\xd1\xdd\x1f\xa0\xdb\xa8\x58\x83\x1d\x0e\x63\x2d\x0c\xea\x6f\xc7\x2a\x55\xfc\x9c\x5e\xa8\xbd\xe0\xe7\x59\xed\xfd\xa8\xb9\xe6\xb7\x76\x20\xc9\x7c\x7b\x70\x88\x38\x1e\xa5\x56\x7e\x55\xbe\x52\x6d\x98\x20\x52\xc8\x85\x19\x52\x69\x13\x1a\x19\xaa\x75\x0a\xda\x68\x9d\xb2\xa1\xbc\xc4\x1d\x1a\xa0\x17\x25\xf4\xa2\x09\xba\x8c\x42\xe3\xc5\x8a\xf1\x12\x78\x43\x02\xc9\x29\x4e\x91\x87\x8c\x72\xb4\xb7\xc8\x39\x59\x63\xa5\x10\x6c\xc8\xf5\xf2\x4f\x39\x5f\xe0\x0e\xfe\xe4\xb3\xf3\xb1\x6d\xcd\xce\xc7\x27\xa7\x6f\xfe\xc7\xea\x82\x35\x9f\x7c\x9e\xe7\xd5\x3d\x05\x75\x38\x8a\xf3\xab\xf1\xd9\x6f\xb8\xcf\xe9\x99\xe1\x52\x3e\xed\x9d\x4f\x3d\xb6\x73\x02\xe6\x26\xde\xef\x6c\x08\xdf\x38\x3c\x5e\x72\x11\xd9\x83\x3c\x07\x66\xb7\x52\x4b\xc1\x88\x9d\xa1\xaf\xd3\x63\x6c\xeb\x97\xc5\x7c\x32\xb3\x3a\xe9\xf5\x52\x46\xad\x7e\x47\x1e\x30\xe2\x59\x5d\xc8\x85\xaf\x5c\x35\x91\x58\x6c\x64\x29\x71\x89\xd0\x2f\x05\x92\x17\xce\x21\xd2\x74\x8c\x2a\xee\xe0\xd7\x28\xb2\x0b\xfb\xa4\x28\x59\x19\x88\xa5\xdc\xd4\xb8\x01\xe3\x09\xb5\x46\xa4\x14\x22\xc7\x91\xb3\x7c\x0b\x70\x48\x54\xc8\x64\xb0\x3f\x00\x9e\xc0\xa8\x1c\x7d\xc1\xfd\x92\x91\xa8\xf5\x98\x1c\x46\xc5\x2b\x5f\x6e\x14\x1d\x6a\x23\xbe\x0e\xab\xd2\x11\xf8\x28\xda\x70\xe5\x7e\x0e\x9f\xea\xc6\xe1\x62\x1f\xa0\xe3\xf9\x3c\x0c\x88\xac\x0c\x16\x65\x14\xad\x42\x0d\xad\xfb\xb9\x28\xad\x40\xf2\x4c\xe7\x81\x04\x31\xca\x0d\x2b\xbb\x97\x4f\x7f\xe4\x70\x13\x31\xc1\x5c\x26\xf5\x6c\xed\x38\x7f\x6b\x95\x97\x6b\x85\xb7\x86\x05\xcc\x08\xac\xe4\x47\x23\x56\x75\x92\xaa\x12\xc9\x69\xa4\xd1\xba\xe3\x59\x5c\xfd\x8e\xcb\x19\x73\xbf\xa0\xb0\x15\x84\x63\xb0\x7a\x3d\xd9\x49\x97\xa1\xc1\xb8\xa0\x64\x8b\x70\x5c\x49\x12\xca\x47\x61\x8c\x45\x02\xfe\x17\xac\xb7\x15\x0a\xc9\xea\x5b\xb0\xac\x4e\x33\x0d\xab\xb7\xe3\xd2\x0c\x19\x8b\x0e\xa3\x59\x18\xcb\xc8\xc8\xc3\x27\xb9\x22\xd2\xd3\x72\x25\x8e\xf4\xc4\xb7\xe3\x4e\x62\x54\x5b\xbb\xc9\x48\x43\xdb\x94\xc8\xf4\xb0\xac\xb6\x1d\xf9\xb4\x51\xcf\x62\x09\x6f\x8e\x47\x04\x51\x5b\xa8\x2c\x44\x5b\xbd\x21\x17\x64\xe3\x73\xc1\xa2\xbd\xc3\x05\x11\x98\x98\xb6\x8c\x0b\x4d\xac\x66\x2f\x5b\x05\xf8\x68\x55\x65\x4d\xbc\x6d\xc5\xdc\x98\xdb\x87\x86\x29\xa3\x77\x6b\x24\x33\x55\x3d\xe5\x6f\x93\x12\x63\x25\x4a\x56\x4d\xa5\x5b\xc9\xf0\x46\x5c\x17\xca\xfc\xcb\x82\xaa\x75\x9e\xab\xcf\x43\x61\xda\xae\xc4\x04\xb0\x80\x6b\xca\x0a\xaa\x5e\x72\x6d\x1c\x4c\x71\x79\x82\x32\x14\x0b\x37\xf0\xdd\x2f\x56\xb7\x29\x42\x9e\xfb\x29\xa3\xe5\x07\xd9\xe0\x9f\xe9\x56\xf3\x26\xb3\x73\xe6\xa1\x10\xc6\x7c\x33\x93\xe1\xa0\xd4\x88\x2e\x58\xe9\xcf\x12\xe1\x37\xad\x6c\x3c\x29\x2f\x22\x5e\x18\x7e\x13\xa5\x0a\xab\x97\x8c\x56\x89\x52\xd9\x6b\x28\x8d\x26\xfc\x61\x36\x30\xc5\x6c\xfd\x37\x4e\x21\xf1\xea\x57\x1f\xf9\x4a\xa3\x87\xca\xbc\xf6\x83\xbd\xb3\x59\x2d\x4a\x45\x7c\x31\x4a\x2a\x45\xc3\x2d\x8f\x90\x95\xa5\x84\xee\x18\x52\x9d\x5a\x58\xab\x4a\x48\x28\xa5\xbd\x5a\xee\x61\x4b\xe2\x7e\xb1\x35\xff\xc9\x40\x18\x0d\x59\x98\x25\xe3\x03\x35\xa8\xc9\xdd\x73\x7f\xd7\xc5\x79\x4e\x9e\x85\xe7\x76\x13\xd0\x78\x35\xd6\x2c\x6a\xa9\x93\xa7\x61\x7b\xe2\x8a\x50\x36\xb1\x3f\x3a\x6d\x99\x3d\xa3\xe8\x20\x52\x26\x74\x3b\x49\x2d\xd6\xf9\x49\x66\x3a\x2e\x48\x24\xac\xae\xfa\x6e\xaf\x5b\xfc\xc2\xf0\x00\x2e\x52\xaf\xc0\x9c\x50\xef\xd9\x78\x6e\x72\x93\x58\xa0\xa6\x17\x8b\xcf\xc6\x96\xd3\x5f\x81\x2b\xe7\xa8\x12\xf3\xa9\x7c\xfc\x77\x00\x00\x00\xff\xff\x43\x36\xc0\xc9\x03\x2f\x00\x00") func webdataFnJsBytes() ([]byte, error) { return bindataRead( @@ -89,7 +89,7 @@ func webdataFnJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/fn.js", size: 12977, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/fn.js", size: 12035, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/main.go b/main.go index 2d354df..1e3edf4 100644 --- a/main.go +++ b/main.go @@ -43,7 +43,6 @@ const ( authenticationRateLimit time.Duration = time.Second / 10 authenticationRateBurst int = 10 challengeLength int = 8 - defaultUpdateInterval int = 50 defaultBind string = ":0" version string = "0.0.4" ) @@ -128,15 +127,13 @@ func secureRandBase64(length int) string { func main() { var bind, certFile, keyFile, secret string var showVersion, invert bool - var updateInterval int flag.BoolVar(&showVersion, "version", false, "show program's version number and exit") - flag.StringVar(&bind, "bind", defaultBind, "bind server to [IP]:PORT") + flag.StringVar(&bind, "bind", defaultBind, "bind server to [HOSTNAME]:PORT") flag.StringVar(&secret, "secret", "", "shared secret for client authentication") flag.StringVar(&certFile, "cert", "", "file containing TLS certificate") flag.StringVar(&keyFile, "key", "", "file containing TLS private key") flag.BoolVar(&invert, "invert", false, "use inverse colors for QR code") - flag.IntVar(&updateInterval, "interval", defaultUpdateInterval, - "mouse polling interval in milliseconds") + flag.Int("interval", 0, "obsolete, not used anymore") flag.Parse() if showVersion { fmt.Println(version) @@ -152,9 +149,6 @@ func main() { if secret == "" { secret = secureRandBase64(defaultSecretLength) } - if updateInterval < 0 { - log.Fatal("interval must be greater or equal to zero") - } var plugin Plugin var pluginName string platformErrors := "" @@ -208,7 +202,6 @@ func main() { if !challenge.verify(message) { return } - websocket.Message.Send(ws, fmt.Sprintf("i%d", updateInterval)) for { if err := websocket.Message.Receive(ws, &message); err != nil { return diff --git a/webdata/fn.js b/webdata/fn.js index 6861e41..35d174a 100644 --- a/webdata/fn.js +++ b/webdata/fn.js @@ -24,7 +24,6 @@ const MOVE_MULT = 1; const SCROLL_MULT = 0.05; // [[px/s, mult], ...] const POINTER_ACCELERATION = [[0, 0], [87, 1], [173, 1], [553, 2]]; -const MAX_IDLE_UPDATES = 10; var ws; var pad; @@ -41,9 +40,6 @@ var scrollXSum = 0; var scrollYSum = 0; var dragging = false; var draggingTimeout = null; -var updateTimer = null; -var updateInterval = 0; -var idleUpdates = 0; function fullscreenEnabled() { return (document.fullscreenEnabled || @@ -145,22 +141,11 @@ function onDraggingTimeout() { } function updateMoveAndScroll() { - if (updateTimer == null) { - onUpdateTimeout(); - if (updateInterval > 0 && idleUpdates == 0) { - updateTimer = setInterval(onUpdateTimeout, updateInterval); - } - } -} - -function onUpdateTimeout() { - idleUpdates += 1; var moveX = Math.trunc(moveXSum); var moveY = Math.trunc(moveYSum); if (Math.abs(moveX) >= 1 || Math.abs(moveY) >= 1) { moveXSum -= moveX; moveYSum -= moveY; - idleUpdates = 0; ws.send("m" + moveX + ";" + moveY); } var scrollX = Math.trunc(scrollXSum); @@ -168,13 +153,8 @@ function onUpdateTimeout() { if (Math.abs(scrollX) >= 1 || Math.abs(scrollY) >= 1) { scrollXSum -= scrollX; scrollYSum -= scrollY; - idleUpdates = 0; ws.send("s" + scrollX + ";" + scrollY); } - if (idleUpdates >= MAX_IDLE_UPDATES) { - clearInterval(updateTimer); - updateTimer = null; - } } function handleStart(evt) { @@ -298,20 +278,6 @@ function challengeResponse(message) { return btoa(shaObj.getHMAC("BYTES")); } -function processCommand(message) { - if (message.charAt(0) == "i") { - var x = parseInt(message.substr(1)); - if (isNaN(x) || x.toString() != message.substr(1) || x < 0) { - return false; - } - updateInterval = x; - clearInterval(updateTimer); - updateTimer = null; - return true; - } - return false; -} - window.addEventListener("load", function() { var authenticated = false; var opening = document.getElementById("opening"); @@ -336,9 +302,7 @@ window.addEventListener("load", function() { ws.onmessage = function(event) { if (authenticated) { - if (!processCommand(event.data)) { - ws.close(); - } + ws.close(); return; } authenticated = true; From 209eaf960d8fb1b4bdad1ce90e7b75d67ede33bb Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:08 +0200 Subject: [PATCH 016/311] X11 plugin: check session type --- plugin_x11.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugin_x11.go b/plugin_x11.go index 8031dad..6273f4f 100644 --- a/plugin_x11.go +++ b/plugin_x11.go @@ -28,6 +28,8 @@ package main import "C" import ( "errors" + "fmt" + "os" "sync" "time" "unsafe" @@ -41,6 +43,11 @@ type x11Plugin struct { } func InitX11Plugin() (Plugin, error) { + sessionType := os.Getenv("XDG_SESSION_TYPE") + if sessionType != "" && sessionType != "x11" { + return nil, UnsupportedPlatformError{errors.New(fmt.Sprintf( + "unsupported session type '%v'", sessionType))} + } display := C.XOpenDisplay(nil) if display == nil { return nil, UnsupportedPlatformError{ From c1509ac8fa9c8a16d0dfd94e793d7bccb7b022f1 Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:10 +0200 Subject: [PATCH 017/311] add support for "pixel-perfect" scrolling --- bindata.generated.go | 4 ++-- main.go | 3 +++ plugin.go | 3 ++- plugin_windows.go | 16 ++++++++++------ plugin_x11.go | 26 ++++++++++++++++++++++---- webdata/fn.js | 24 ++++++++++++++++++------ 6 files changed, 57 insertions(+), 19 deletions(-) diff --git a/bindata.generated.go b/bindata.generated.go index 9c02c58..46238ef 100644 --- a/bindata.generated.go +++ b/bindata.generated.go @@ -74,7 +74,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _webdataFnJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\x5d\x6f\xdb\xb8\xb2\xef\xf9\x15\x53\x3d\x14\x72\xe3\xc8\x76\x8a\xde\x5d\xd4\x75\xef\xf5\xa6\xee\x26\xd8\xa4\x09\x6c\xe7\x6e\x8d\x20\x58\xd0\xd2\xd8\xd6\x56\x26\xb5\x22\x15\xc7\x3d\xcd\x7f\x3f\xa0\x3e\x29\x8a\x92\xb3\x5d\xf4\xe5\xe0\x18\x68\x2a\x93\x33\xc3\xf9\xfe\xa0\xdc\x7b\x75\x04\xaf\x00\x00\xce\x58\xb8\x8f\xfc\xf5\x46\x80\xed\x76\xe0\xb4\x3f\xf8\x19\x6e\x69\x14\x7b\xef\x62\xf9\xf7\xff\x58\x2c\x02\xc6\xbe\x38\x2e\xdb\xbe\x3f\x82\x1c\x69\xbe\xf1\x39\xac\xfc\x00\xc1\xe7\x10\x92\x48\x00\x5b\xc1\x14\xb7\x4c\xe0\xc9\x9c\xc5\xee\x26\x24\x9e\x53\x82\x7f\x64\x6c\x49\x22\x09\xbb\x8a\x10\x81\xb3\x95\xd8\x91\x08\xdf\xc2\x9e\xc5\xe0\x12\x0a\x11\x7a\x3e\x17\x91\xbf\x8c\x05\x82\x2f\x80\x50\xaf\xc7\x22\xd8\x32\xcf\x5f\xed\x33\x22\xbe\x80\x98\x7a\x18\x81\xd8\x20\x08\x8c\xb6\x5c\x1e\x2a\xbf\xfc\xfa\xe9\x16\x7e\x45\x8a\x11\x09\xe0\x26\x5e\x06\xbe\x0b\x97\xbe\x8b\x94\x23\x10\x0e\xa1\x5c\xe1\x1b\xf4\x60\x99\x93\x92\x48\x1f\x25\x27\xb3\x8c\x13\xf8\xc8\x62\xea\x11\xe1\x33\xda\x05\xf4\xc5\x06\x23\x78\xc0\x88\xfb\x8c\xc2\xeb\xfc\x98\x8c\x66\x17\x58\x94\xd1\xb1\x89\x90\x22\x44\xc0\x42\x89\xda\x01\x42\xf7\x10\x10\x51\x62\x2b\x4a\xd0\xd4\x23\xb5\x51\x0a\xed\x81\x4f\x93\x43\x36\x2c\x44\x10\x1b\x22\xa4\xbc\x3b\x3f\x08\x60\x89\x10\x73\x5c\xc5\x41\x37\x23\xb4\x8c\x05\xfc\x7e\x31\x3f\xbf\xbe\x9d\xc3\xf8\xd3\x02\x7e\x1f\x4f\xa7\xe3\x4f\xf3\xc5\x10\x76\xbe\xd8\xb0\x58\x00\x3e\x60\x4a\xcd\xdf\x86\x81\x8f\x1e\xec\x48\x14\x11\x2a\xf6\xc0\x56\x19\x91\xab\xc9\xf4\xec\x7c\xfc\x69\x3e\xfe\xe5\xe2\xf2\x62\xbe\x00\x16\xc1\xc7\x8b\xf9\xa7\xc9\x6c\x06\x1f\xaf\xa7\x30\x86\x9b\xf1\x74\x7e\x71\x76\x7b\x39\x9e\xc2\xcd\xed\xf4\xe6\x7a\x36\x71\x00\x66\x28\x99\xc3\x8c\x46\x8b\xde\x57\x89\xf5\x22\x04\x0f\x05\xf1\x03\x5e\xea\x61\xc1\x62\xe0\x1b\x16\x07\x1e\x6c\xc8\x03\x42\x84\x2e\xfa\x0f\xe8\x01\x01\x97\x85\xfb\xc3\x36\x4d\xc9\x90\x80\xd1\x75\x22\x70\xe6\x5d\x0e\xc0\xc5\x0a\x28\x13\x5d\xe0\x88\xf0\x6e\x23\x44\xf8\xb6\xd7\xdb\xed\x76\xce\x9a\xc6\x0e\x8b\xd6\xbd\x20\x25\xc0\x7b\xef\x25\x3b\xbd\xa3\x23\xe8\xf5\xe0\x6e\x00\x89\x49\xba\x70\x9a\x3e\x20\xef\xc2\xeb\xfc\xf1\xfe\xc8\x65\x94\x0b\x98\x5f\xdf\x9e\x9d\xff\x71\x75\xfd\xff\x93\x3f\xe6\xe7\xd3\xc9\xec\xfc\xfa\xf2\x03\x8c\xe0\x6e\xd0\xef\xc2\xe0\x8d\xfc\x77\x3f\xac\x80\xce\x2f\xae\x26\xd2\x40\x23\x38\x7d\xd3\xcf\xb7\x12\xfc\xab\xdb\x4b\xb9\x3c\xc8\x17\x67\x67\xd3\xeb\xcb\xcb\x7c\xb9\xef\xf4\xdf\x0c\x8f\x24\x5f\x77\xe1\x63\x8f\x77\x61\x1b\x07\xe2\xbe\x0b\x8e\xe3\xe4\xbc\xdc\x5c\x5f\x7c\x9a\x4f\xa6\x7f\x8c\xcf\xce\x26\x97\x93\xe9\x78\x7e\x71\xfd\x49\xf2\x72\xd7\xef\x42\xff\xbe\x0b\x77\x3f\xff\xd4\x85\x81\x7c\x18\xfc\xf4\x3a\x7b\x7a\xf3\xe6\x75\x17\x4e\xef\xef\x87\x47\x47\x0f\x24\x82\x1d\x1f\x26\xff\x87\xc4\x2b\x1e\x02\xb2\xc4\x20\xdb\x17\x52\xfa\x2b\x26\xcd\x32\x82\x15\x09\x38\x0e\xcb\xf5\x99\x90\x01\x3f\x82\xbe\xb2\x76\x49\xb8\x98\x50\x4f\x5b\x9d\x62\x80\x84\xa3\x77\xc6\x62\xaa\x60\x30\xba\x66\x3e\x5d\x67\x2a\x96\xac\xdf\xa7\x1b\x5b\xf6\x80\x9f\x67\xf1\xb6\x04\x95\x2b\x8b\xca\x0a\x77\x23\x16\x04\x9f\x0d\x6b\x55\x38\x2f\x22\xeb\xb5\x4f\xd7\x55\x01\xf2\xd5\xb9\xbf\x45\x19\x29\x23\xa0\x71\x20\xa5\x5e\xc5\xd4\x95\x31\x0c\xab\x38\x08\xb8\x1b\x21\xd2\x09\x25\xcb\x00\x3d\xbb\x03\xff\x3a\x92\xee\x1e\xa1\x88\x23\x0a\xb6\xc7\xdc\x78\x8b\x54\x38\x35\x50\xf8\xf6\x2d\x81\x94\x9f\x02\x6a\x87\xcb\x2f\xbe\xf8\xf8\x2c\xd8\x2d\xfb\x2a\x01\x67\x87\x01\x79\x2b\xc1\x44\xe2\xce\xf0\xe8\x49\x11\x2c\xc2\xbf\x62\xe4\x0a\x23\x36\xe6\x92\xf9\x2b\xb0\xd1\xa9\x01\xe4\xdb\xf2\x63\xd8\xb6\x3b\xc3\x64\xfb\x09\x30\xe0\x98\x11\x49\xa5\x9d\xb6\x93\x6a\x00\x32\x12\xdc\xb2\xaf\x0a\xe0\xcc\x40\xcd\x04\x61\x26\xc5\x0f\xf0\x65\x00\x28\x08\x55\x74\x89\x8f\x7e\x05\x46\xd1\x63\x61\xa2\x2a\x8c\x7a\x50\x03\x88\x81\x67\xcd\x89\x26\x87\x49\x9a\x00\xdb\x08\x6f\xd9\xd7\x33\x42\x5d\x0c\xcc\xda\x6d\x83\x6b\x25\xcb\x9f\xc1\xab\x0e\x64\xd6\xb5\x12\x65\x01\x4a\xbc\x67\x05\x64\x0a\xfa\xbc\x80\x6c\x81\xad\x06\x64\x1b\x20\x6f\x25\x28\xb3\x8c\x16\x8f\xc4\xf3\x4a\x14\x77\x43\xe8\x1a\x27\x0f\x48\xc5\xa5\xcf\x85\x2c\x7c\x76\x90\x3d\x18\xbd\xab\x2e\xea\x8b\xd1\x28\x69\x90\x56\x3e\x45\xcf\xa8\x6f\xe2\x79\xd5\x13\xac\x95\xc6\x80\xd5\x85\xe2\xd4\x43\xce\x58\x97\xf7\x7b\x38\x48\x69\x7d\x1f\x1f\x46\xe3\x7c\x0f\x13\x5b\xf6\xf5\x3b\x39\x30\x58\xfd\x7b\x18\xb8\x9a\x95\x74\xce\x9a\xce\xaf\x78\x8f\xec\x95\x92\x02\x6a\x8b\xb4\x7b\x11\xfe\x16\x67\x82\x6c\x43\x2d\x3a\xca\xf3\x7d\x0f\xa9\xf0\x57\x3e\x46\x6f\xd3\xf2\xec\x94\x2b\xdd\x02\x2a\x24\x6b\xfc\x9c\x03\x24\x5f\xb4\xbd\xa4\xfc\xb7\x00\x2c\xd4\xbd\x85\xb6\x57\x43\x56\x00\x0a\x09\xde\x96\x8f\xa9\xe4\xd5\xc0\x51\xdb\x87\x0b\xea\xe1\xe3\x2f\xfb\x0b\xcf\xf6\xbd\x39\xfb\xe8\xd3\x42\xe3\xb2\x03\xb5\x65\xc9\xf7\x93\x9e\x00\x7c\x78\xa7\x35\x1e\x4e\x80\x74\x2d\x36\x43\xf0\x8f\x8f\x55\x3b\x25\x48\xb2\x95\xa9\x82\xdf\xf9\xf7\x8a\xc2\x86\x47\xa5\x5e\x57\x60\x4b\xf8\x11\xe8\x3c\xe4\x9f\xcc\x14\xfe\xb0\x58\x7d\x3a\x2a\xff\x66\xbb\x27\x83\xaa\x98\x2e\x09\xdc\x58\x0e\x13\x37\xcc\xa7\x02\xa3\xb1\xeb\x62\x80\x51\x32\xa4\x5c\xc5\x81\xb0\x79\x88\xd8\x2a\xae\xa9\x51\x6c\x12\x9a\x9f\xc2\xc8\x88\x70\xe7\xdf\xdf\xf5\xef\x4b\xce\x49\x1b\xe0\x40\x01\x94\x6a\xe1\xa7\xf0\x6e\x04\x15\x46\xf3\x8f\xcb\xa8\xf0\x69\x8c\xba\x4e\x0a\x8d\x4a\x85\xf6\x1b\x34\x49\x4e\x4d\x68\x7c\xd0\xc8\xda\xc9\x40\x93\xa2\x1d\x54\x95\x23\xaf\x32\xa9\xbe\x4f\xf8\xa0\x03\x3d\x29\x99\x7c\xea\xc0\x2b\xb0\xc9\xe9\x09\x19\x74\xe0\x18\xc8\x60\xa8\x98\x55\x0a\xd1\x62\x01\x78\x5f\x95\x2e\x3b\xc6\xc8\x53\x0b\x19\x95\xdb\x8a\x3b\x0d\xf4\xa0\xf9\x50\x6d\x7d\x8b\x2a\xda\xd4\x12\xcb\xbd\x1d\x77\x38\x52\xcf\xb6\x96\x83\x61\xdf\xd2\x0a\x58\x1c\x7a\x44\xa0\x9c\x12\xc6\xd4\x9b\x25\x2d\x78\x41\xb4\xe8\xe6\x61\x04\x57\x44\x6c\x1c\x11\xc5\xd4\xb5\xf3\x06\x3f\x4b\x69\x45\x87\x5f\x87\x5a\x94\x50\x52\x91\xc9\x2e\x59\xf2\x94\x42\x07\xde\x8f\x60\x00\xdf\xbe\x41\x65\x7d\x91\xae\xab\x5a\x2d\x26\x8a\x93\x51\xfa\x3c\xac\x6c\x2d\x94\xad\x45\xb9\x55\x88\xbd\xb5\xe0\x38\x93\xe3\x18\xac\x61\xfe\x6d\xd1\x51\x15\xae\x4c\x25\x55\x39\xca\x51\x45\x91\x37\x9b\x55\x4c\x90\x4d\x32\x67\x74\x0c\x52\x67\x78\x75\xb9\x95\x29\xe9\x64\x94\x7f\x1b\x6a\xdb\x8b\xca\xb6\x49\x7e\x2e\x25\xce\x65\xcb\x35\x90\x1f\x6a\x2a\x4b\x1b\x42\xbd\x00\x93\x2c\x6f\xe3\x83\x50\x5b\x17\x63\xf2\xad\x05\x79\x65\xc2\xc4\x07\xe1\x14\xa5\x60\x58\x85\xd1\xa6\xd3\xca\x9e\x61\xee\xcc\xf7\xeb\x63\x61\xd5\x90\xa2\x18\x4a\xe5\xe1\x69\x2f\xe0\x65\x3c\x0f\x1b\x33\xad\x68\xaf\x28\x52\x7c\x51\x56\x11\x41\xa2\x35\xa6\x8d\x42\x48\x3c\x78\xf9\x12\x1a\x37\x93\xa1\xfc\xef\xa4\x4e\xc9\x75\x18\xa1\x6c\x2f\x3e\xe0\x8a\xc8\x3a\xd1\x29\xe1\x34\x1b\x84\x31\xdf\xd8\x5a\x27\x91\x70\xd1\xad\xaa\xbe\xd3\xd1\x14\x5c\x19\xf7\x55\x29\x5f\xe4\xfa\xd5\x79\x56\x46\xfb\xe6\x7c\x50\x0b\xcd\xb6\xb4\x50\x95\xbb\x72\x2d\xd0\x16\x83\x9a\xfb\xb7\x87\x61\x2e\x96\x9e\x23\xa5\x75\x92\x96\x5e\xb7\x4c\x80\x24\xca\x13\xac\x86\xa4\xc9\xd8\x96\x76\x0d\xce\x2a\xa2\xba\xbd\x4d\xa1\x37\xa1\x9e\x1a\x78\x3f\xcc\xa5\xd3\x26\xe9\x51\xeb\x92\xca\x76\x4c\x98\x9a\x26\x4d\xab\x12\xff\x5d\xbd\xc6\xb7\xb9\xb7\xe6\xc0\x3c\x0c\x7c\x17\x25\xa1\x2e\x0c\x74\x27\xad\x64\x81\xe3\xe3\x46\x17\x36\x64\x99\xb2\x82\x1b\xf2\xc9\x7b\xe3\x6d\x60\xa6\xa8\x5a\x2e\xcb\xf3\x54\x69\xc0\xa7\x67\xa4\xc4\x22\x29\x68\x47\xcb\x02\xf0\xf2\xa5\xd1\x49\xd4\x93\x6b\x75\xfb\x07\x9c\xfb\x42\x11\xef\xe5\xcb\xaa\x16\xe1\x44\x4d\xe4\xef\xaa\x77\xa2\xba\x1b\x2d\x63\x21\x18\xad\xe7\x12\x53\x2a\xd7\xca\x1c\xa4\xd7\xe1\x29\xfa\x40\x71\x98\x72\x56\x33\x53\x39\x6d\xa4\xf2\x5a\xa1\x72\x80\xc8\xeb\x46\x22\xc6\xf6\xb4\x34\x8a\xac\xa2\x19\xac\x2c\xaa\x03\x4b\x0b\x8c\x9c\x8e\x41\xda\x7a\xda\xe0\x28\xf2\x8c\x53\x6b\xf2\xba\x9a\xe6\x6b\x1a\xaa\x12\x6f\xe4\xb0\x6f\xd5\x92\xae\x29\xf9\xa4\x37\x44\xff\xcd\x3f\xff\x38\xff\x40\x5b\xf6\xa8\xeb\x5d\x42\xe9\x5a\xe7\xf1\xf6\x73\x19\x53\xd9\xca\xa2\xba\xf2\x9f\x64\x99\xe4\x76\xdf\xe7\x22\xaf\xe8\xfc\xaf\x48\xa4\x2d\x74\xc8\x76\xea\xa1\xc9\x95\x05\x9c\xd4\xa6\x7b\xef\x31\xdb\x4b\x92\x56\x57\xa6\x88\x63\x68\x22\xb0\x68\x21\xb0\x28\x08\x68\x52\x99\xd3\x6e\x6b\x39\x91\xdd\x7e\x22\x95\x19\xea\xce\x4c\xf2\x04\x06\xf7\xba\xee\x1a\xdc\xc9\xa0\x44\x69\xba\xbf\xa3\xaf\x61\x15\x7d\x5f\x47\x6f\xd5\x56\x15\x5d\x06\xc2\x07\x0c\x04\xd1\x03\xa3\x81\x84\x21\x70\x12\xcf\x3f\x1e\x49\x41\x5e\x1d\xbe\x45\x29\x66\x29\xef\x51\x0e\xf6\xe5\xf9\xaf\x60\xd0\xef\xf7\x3b\x15\xba\x8b\x84\xee\xfe\xef\xd1\xdd\x1f\xa0\xdb\xa8\x58\x83\x1d\x0e\x63\x2d\x0c\xea\x6f\xc7\x2a\x55\xfc\x9c\x5e\xa8\xbd\xe0\xe7\x59\xed\xfd\xa8\xb9\xe6\xb7\x76\x20\xc9\x7c\x7b\x70\x88\x38\x1e\xa5\x56\x7e\x55\xbe\x52\x6d\x98\x20\x52\xc8\x85\x19\x52\x69\x13\x1a\x19\xaa\x75\x0a\xda\x68\x9d\xb2\xa1\xbc\xc4\x1d\x1a\xa0\x17\x25\xf4\xa2\x09\xba\x8c\x42\xe3\xc5\x8a\xf1\x12\x78\x43\x02\xc9\x29\x4e\x91\x87\x8c\x72\xb4\xb7\xc8\x39\x59\x63\xa5\x10\x6c\xc8\xf5\xf2\x4f\x39\x5f\xe0\x0e\xfe\xe4\xb3\xf3\xb1\x6d\xcd\xce\xc7\x27\xa7\x6f\xfe\xc7\xea\x82\x35\x9f\x7c\x9e\xe7\xd5\x3d\x05\x75\x38\x8a\xf3\xab\xf1\xd9\x6f\xb8\xcf\xe9\x99\xe1\x52\x3e\xed\x9d\x4f\x3d\xb6\x73\x02\xe6\x26\xde\xef\x6c\x08\xdf\x38\x3c\x5e\x72\x11\xd9\x83\x3c\x07\x66\xb7\x52\x4b\xc1\x88\x9d\xa1\xaf\xd3\x63\x6c\xeb\x97\xc5\x7c\x32\xb3\x3a\xe9\xf5\x52\x46\xad\x7e\x47\x1e\x30\xe2\x59\x5d\xc8\x85\xaf\x5c\x35\x91\x58\x6c\x64\x29\x71\x89\xd0\x2f\x05\x92\x17\xce\x21\xd2\x74\x8c\x2a\xee\xe0\xd7\x28\xb2\x0b\xfb\xa4\x28\x59\x19\x88\xa5\xdc\xd4\xb8\x01\xe3\x09\xb5\x46\xa4\x14\x22\xc7\x91\xb3\x7c\x0b\x70\x48\x54\xc8\x64\xb0\x3f\x00\x9e\xc0\xa8\x1c\x7d\xc1\xfd\x92\x91\xa8\xf5\x98\x1c\x46\xc5\x2b\x5f\x6e\x14\x1d\x6a\x23\xbe\x0e\xab\xd2\x11\xf8\x28\xda\x70\xe5\x7e\x0e\x9f\xea\xc6\xe1\x62\x1f\xa0\xe3\xf9\x3c\x0c\x88\xac\x0c\x16\x65\x14\xad\x42\x0d\xad\xfb\xb9\x28\xad\x40\xf2\x4c\xe7\x81\x04\x31\xca\x0d\x2b\xbb\x97\x4f\x7f\xe4\x70\x13\x31\xc1\x5c\x26\xf5\x6c\xed\x38\x7f\x6b\x95\x97\x6b\x85\xb7\x86\x05\xcc\x08\xac\xe4\x47\x23\x56\x75\x92\xaa\x12\xc9\x69\xa4\xd1\xba\xe3\x59\x5c\xfd\x8e\xcb\x19\x73\xbf\xa0\xb0\x15\x84\x63\xb0\x7a\x3d\xd9\x49\x97\xa1\xc1\xb8\xa0\x64\x8b\x70\x5c\x49\x12\xca\x47\x61\x8c\x45\x02\xfe\x17\xac\xb7\x15\x0a\xc9\xea\x5b\xb0\xac\x4e\x33\x0d\xab\xb7\xe3\xd2\x0c\x19\x8b\x0e\xa3\x59\x18\xcb\xc8\xc8\xc3\x27\xb9\x22\xd2\xd3\x72\x25\x8e\xf4\xc4\xb7\xe3\x4e\x62\x54\x5b\xbb\xc9\x48\x43\xdb\x94\xc8\xf4\xb0\xac\xb6\x1d\xf9\xb4\x51\xcf\x62\x09\x6f\x8e\x47\x04\x51\x5b\xa8\x2c\x44\x5b\xbd\x21\x17\x64\xe3\x73\xc1\xa2\xbd\xc3\x05\x11\x98\x98\xb6\x8c\x0b\x4d\xac\x66\x2f\x5b\x05\xf8\x68\x55\x65\x4d\xbc\x6d\xc5\xdc\x98\xdb\x87\x86\x29\xa3\x77\x6b\x24\x33\x55\x3d\xe5\x6f\x93\x12\x63\x25\x4a\x56\x4d\xa5\x5b\xc9\xf0\x46\x5c\x17\xca\xfc\xcb\x82\xaa\x75\x9e\xab\xcf\x43\x61\xda\xae\xc4\x04\xb0\x80\x6b\xca\x0a\xaa\x5e\x72\x6d\x1c\x4c\x71\x79\x82\x32\x14\x0b\x37\xf0\xdd\x2f\x56\xb7\x29\x42\x9e\xfb\x29\xa3\xe5\x07\xd9\xe0\x9f\xe9\x56\xf3\x26\xb3\x73\xe6\xa1\x10\xc6\x7c\x33\x93\xe1\xa0\xd4\x88\x2e\x58\xe9\xcf\x12\xe1\x37\xad\x6c\x3c\x29\x2f\x22\x5e\x18\x7e\x13\xa5\x0a\xab\x97\x8c\x56\x89\x52\xd9\x6b\x28\x8d\x26\xfc\x61\x36\x30\xc5\x6c\xfd\x37\x4e\x21\xf1\xea\x57\x1f\xf9\x4a\xa3\x87\xca\xbc\xf6\x83\xbd\xb3\x59\x2d\x4a\x45\x7c\x31\x4a\x2a\x45\xc3\x2d\x8f\x90\x95\xa5\x84\xee\x18\x52\x9d\x5a\x58\xab\x4a\x48\x28\xa5\xbd\x5a\xee\x61\x4b\xe2\x7e\xb1\x35\xff\xc9\x40\x18\x0d\x59\x98\x25\xe3\x03\x35\xa8\xc9\xdd\x73\x7f\xd7\xc5\x79\x4e\x9e\x85\xe7\x76\x13\xd0\x78\x35\xd6\x2c\x6a\xa9\x93\xa7\x61\x7b\xe2\x8a\x50\x36\xb1\x3f\x3a\x6d\x99\x3d\xa3\xe8\x20\x52\x26\x74\x3b\x49\x2d\xd6\xf9\x49\x66\x3a\x2e\x48\x24\xac\xae\xfa\x6e\xaf\x5b\xfc\xc2\xf0\x00\x2e\x52\xaf\xc0\x9c\x50\xef\xd9\x78\x6e\x72\x93\x58\xa0\xa6\x17\x8b\xcf\xc6\x96\xd3\x5f\x81\x2b\xe7\xa8\x12\xf3\xa9\x7c\xfc\x77\x00\x00\x00\xff\xff\x43\x36\xc0\xc9\x03\x2f\x00\x00") +var _webdataFnJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\xeb\x6f\xdb\x38\xf2\xdf\xf3\x57\x4c\xf5\xa1\x90\x1b\xc7\x8f\x14\xfd\xed\x22\xae\xfb\x3b\x6f\xea\x6c\x82\xcd\x0b\xb6\x7b\x5b\x23\x08\x16\xb4\x34\xb6\xb5\x95\x49\xad\x48\xc5\x71\xaf\xf9\xdf\x0f\xd4\x93\xa2\x28\x39\xed\x5d\xee\xc3\xe1\x0c\x6c\x57\x21\x67\x86\xf3\x9e\xe1\x48\xdd\x37\x07\xf0\x06\x00\xe0\x94\x05\xbb\xd0\x5b\xad\x05\xd8\x4e\x0b\x8e\x7b\xfd\x9f\xe1\x13\x0d\x23\xf7\x7d\x24\xff\xfd\x1b\x8b\x84\xcf\xd8\x97\x8e\xc3\x36\x1f\x0e\x20\x43\x9a\xad\x3d\x0e\x4b\xcf\x47\xf0\x38\x04\x24\x14\xc0\x96\x30\xc1\x0d\x13\x78\x34\x63\x91\xb3\x0e\x88\xdb\x29\xc0\xcf\x18\x5b\x90\x50\xc2\x2e\x43\x44\xe0\x6c\x29\xb6\x24\xc4\x13\xd8\xb1\x08\x1c\x42\x21\x44\xd7\xe3\x22\xf4\x16\x91\x40\xf0\x04\x10\xea\x76\x59\x08\x1b\xe6\x7a\xcb\x5d\x4a\xc4\x13\x10\x51\x17\x43\x10\x6b\x04\x81\xe1\x86\xcb\x43\xe5\x1f\xbf\x5e\x7f\x82\x5f\x91\x62\x48\x7c\xb8\x8d\x16\xbe\xe7\xc0\xa5\xe7\x20\xe5\x08\x84\x43\x20\x57\xf8\x1a\x5d\x58\x64\xa4\x24\xd2\x99\xe4\x64\x9a\x72\x02\x67\x2c\xa2\x2e\x11\x1e\xa3\x6d\x40\x4f\xac\x31\x84\x07\x0c\xb9\xc7\x28\xbc\xcd\x8e\x49\x69\xb6\x81\x85\x29\x1d\x9b\x08\x29\x42\x08\x2c\x90\xa8\x2d\x20\x74\x07\x3e\x11\x05\xb6\xa2\x04\x4d\x3d\x52\x1b\x85\xd0\x2e\x78\x34\x3e\x64\xcd\x02\x04\xb1\x26\x42\xca\xbb\xf5\x7c\x1f\x16\x08\x11\xc7\x65\xe4\xb7\x53\x42\x8b\x48\xc0\xef\x17\xb3\xf3\x9b\x4f\x33\x18\x5d\xcf\xe1\xf7\xd1\x64\x32\xba\x9e\xcd\x07\xb0\xf5\xc4\x9a\x45\x02\xf0\x01\x13\x6a\xde\x26\xf0\x3d\x74\x61\x4b\xc2\x90\x50\xb1\x03\xb6\x4c\x89\x5c\x8d\x27\xa7\xe7\xa3\xeb\xd9\xe8\x97\x8b\xcb\x8b\xd9\x1c\x58\x08\x67\x17\xb3\xeb\xf1\x74\x0a\x67\x37\x13\x18\xc1\xed\x68\x32\xbb\x38\xfd\x74\x39\x9a\xc0\xed\xa7\xc9\xed\xcd\x74\xdc\x01\x98\xa2\x64\x0e\x53\x1a\x0d\x7a\x5f\xc6\xd6\x0b\x11\x5c\x14\xc4\xf3\x79\xa1\x87\x39\x8b\x80\xaf\x59\xe4\xbb\xb0\x26\x0f\x08\x21\x3a\xe8\x3d\xa0\x0b\x04\x1c\x16\xec\xf6\xdb\x34\x21\x43\x7c\x46\x57\xb1\xc0\xa9\x77\x75\x00\x2e\x96\x40\x99\x68\x03\x47\x84\xf7\x6b\x21\x82\x93\x6e\x77\xbb\xdd\x76\x56\x34\xea\xb0\x70\xd5\xf5\x13\x02\xbc\xfb\x41\xb2\xd3\x3d\x38\x80\x6e\x17\xee\xfa\x10\x9b\xa4\x0d\xc7\xc9\x03\xf2\x36\xbc\xcd\x1e\xef\x0f\x1c\x46\xb9\x80\xd9\xcd\xa7\xd3\xf3\x3f\xae\x6e\xfe\x3e\xfe\x63\x76\x3e\x19\x4f\xcf\x6f\x2e\x3f\xc2\x10\xee\xfa\xbd\x36\xf4\xdf\xc9\xff\xee\x07\x25\xd0\xd9\xc5\xd5\x58\x1a\x68\x08\xc7\xef\x7a\x83\x03\x79\xd0\x5d\xf0\xd8\xe5\x6d\xd8\x44\xbe\xb8\x6f\x43\xa7\xd3\xc9\x88\xdf\xde\x5c\x5c\xcf\xc6\x93\x3f\x46\xa7\xa7\xe3\xcb\xf1\x64\x34\xbb\xb8\xb9\x96\xc4\xef\x7a\x6d\xe8\xdd\xb7\xe1\xee\xe7\x9f\xda\xd0\x97\x0f\xfd\x9f\xde\xa6\x4f\xef\xde\xbd\x6d\xc3\xf1\xfd\xfd\xe0\xe0\xe0\x81\x84\xb0\xe5\x83\xf8\xff\x01\x71\xf3\x07\x9f\x2c\xd0\x4f\xf7\x85\x14\xe7\x8a\x49\x3d\x0f\x61\x49\x7c\x8e\x83\x62\x7d\x2a\x64\x04\x0f\xa1\xa7\xac\x5d\x12\x2e\xc6\xd4\xd5\x56\x27\xe8\x23\xe1\xe8\x9e\xb2\x88\x2a\x18\x8c\xae\x98\x47\x57\xa9\xce\x24\xeb\xf7\xc9\xc6\x86\x3d\xe0\xe7\x69\xb4\x29\x40\xe5\xca\xbc\xb4\xc2\x9d\x90\xf9\xfe\x67\xc3\x5a\x19\xce\x0d\xc9\x6a\xe5\xd1\x55\x59\x80\x6c\x75\xe6\x6d\x50\xba\xfe\x10\x68\xe4\xfb\x2a\x95\x12\xca\xc1\x32\xa2\x8e\x8c\x55\x58\x46\xbe\xcf\x9d\x10\x91\x8e\x29\x59\xf8\xe8\xda\x2d\xf8\xc7\x81\x74\xeb\x10\x45\x14\x52\xb0\x5d\xe6\x44\x1b\xa4\xa2\x53\x01\x85\x6f\xdf\x62\x48\xf9\xcb\xa1\xb6\xb8\xf8\xe2\x89\xb3\x67\xc1\x6e\xd8\x57\x09\x38\xdd\x0f\xc8\x1b\x09\xc6\x52\xb5\x06\x07\x4f\x8a\x60\x21\xfe\x15\x21\x57\x18\xb1\x31\x93\xcc\x5b\x82\x8d\x9d\x0a\x40\xb6\x2d\x7f\x86\x6d\xbb\x35\x88\xb7\x9f\x00\x7d\x8e\x29\x91\x44\xda\x49\x33\xa9\x1a\x20\x23\xc1\x0d\xfb\xaa\x00\x4e\x0d\xd4\x4c\x10\x66\x52\x7c\x0f\x5f\x06\x80\x9c\x50\x49\x97\xf8\xe8\x95\x60\x14\x3d\xe6\x26\x2a\xc3\xa8\x07\xd5\x80\x18\x78\xd6\x9c\x68\xbc\x9f\xa4\x09\xb0\x89\xf0\x86\x7d\x3d\x25\xd4\x41\xdf\xac\xdd\x26\xb8\x46\xb2\xfc\x19\xbc\xea\x40\x66\x5d\x2b\x51\xe6\xa3\xc4\x7b\x56\x40\x26\xa0\xcf\x0b\xc8\x06\xd8\x72\x40\x36\x01\xf2\x46\x82\x32\xf9\x68\xf1\x48\x5c\xb7\x40\x71\xd6\x84\xae\x70\xfc\x80\x54\x5c\x7a\x5c\xc8\x02\x67\xfb\xe9\x83\xd1\xbb\xaa\xa2\xbe\x1a\x0e\xe3\x46\x68\xe9\x51\x74\x8d\xfa\x26\xae\x5b\x3e\xc1\x5a\x6a\x0c\x58\x6d\xc8\x4f\xdd\xe7\x8c\x55\x79\x7f\x84\x83\x84\xd6\x8f\xf1\x61\x34\xce\x8f\x30\xb1\x61\x5f\x7f\x90\x03\x83\xd5\x7f\x84\x81\xab\x69\x41\xe7\xb4\xee\xfc\x92\xf7\xc8\x9e\x28\xae\xab\xb6\x48\xba\x14\xe1\x6d\x70\x2a\xc8\x26\xd0\xa2\xa3\x38\xdf\x73\x91\x0a\x6f\xe9\x61\x78\x92\x54\xed\x4e\xb1\xd2\xce\xa1\x02\xb2\xc2\xcf\x19\x40\xfc\x87\xb6\x17\x77\x05\x0d\x00\x73\x75\x6f\xae\xed\x55\x90\x15\x80\x5c\x82\x93\xe2\x31\x91\xbc\x1c\x38\x6a\x57\x71\x41\x5d\x7c\xfc\x65\x77\xe1\xda\x9e\x3b\x63\x67\x1e\xcd\x35\x2e\x3b\x4d\x5b\x56\x7b\x2f\x6e\x15\xc0\x83\xf7\x5a\x3f\xd2\xf1\x91\xae\xc4\x7a\x00\xde\xe1\xa1\x6a\xa7\x18\x49\x76\x38\x65\xf0\x3b\xef\x5e\x51\xd8\xe0\xa0\xd0\xeb\x12\x6c\x09\x3f\x04\x9d\x87\xec\x97\x9a\xc2\x1b\xe4\xab\x4f\x07\xc5\xbf\xe9\xee\x51\xbf\x2c\xa6\x43\x7c\x27\x92\x97\x86\x5b\xe6\x51\x81\xe1\xc8\x71\xd0\xc7\x30\xbe\x8c\x5c\x45\xbe\xb0\x79\x80\xd8\x28\xae\xa9\x7f\xac\x13\x9a\x1f\xc3\xd0\x88\x70\xe7\xdd\xdf\xf5\xee\x0b\xce\x49\x13\x60\x5f\x01\x94\x6a\xe1\xc7\xf0\x7e\x08\x25\x46\xb3\x9f\xc3\xa8\xf0\x68\x84\xba\x4e\x72\x8d\x4a\x85\xf6\x6a\x34\x49\x8e\x4d\x68\xbc\x5f\xcb\xda\x51\x5f\x93\xa2\x19\x54\x95\x23\xab\x32\x89\xbe\x8f\x78\xbf\x05\x5d\x29\x99\x7c\x6a\xc1\x1b\xb0\xc9\xf1\x11\xe9\xb7\xe0\x10\x48\x7f\xa0\x98\x55\x0a\xd1\x60\x01\xf8\x50\x96\x2e\x3d\xc6\xc8\x53\x03\x19\x95\xdb\x92\x3b\xf5\xf5\xa0\xf9\x58\xee\x88\xf3\x2a\x5a\xd7\x29\xcb\xbd\x2d\xef\x70\xa4\xae\x6d\x2d\xfa\x83\x9e\xa5\x15\xb0\x28\x70\x89\x40\x79\x79\x18\x51\x77\x1a\xf7\xd4\x39\xd1\xbc\xc9\x87\x21\x5c\x11\xb1\xee\x88\x30\xa2\x8e\x9d\xf5\xfd\x69\x4a\xcb\x1b\xff\x2a\xd4\xbc\x80\x92\x8a\x8c\x77\xc9\x82\x27\x14\x5a\xf0\x61\x08\x7d\xf8\xf6\x0d\x4a\xeb\xf3\x64\x5d\xd5\x6a\x7e\xd1\x38\x1a\x26\xcf\x83\xd2\xd6\x5c\xd9\x9a\x17\x5b\xb9\xd8\x1b\x0b\x0e\x53\x39\x0e\xc1\x1a\x64\x7f\xcd\x5b\xaa\xc2\x95\xcb\x4a\x59\x8e\xe2\x06\xa3\xc8\x9b\x5e\x61\x4c\x90\x75\x32\xa7\x74\x0c\x52\xa7\x78\x55\xb9\x95\xcb\xd3\xd1\x30\xfb\x6b\xa0\x6d\xcf\x4b\xdb\x73\x7d\x3b\xb9\x20\x89\x50\x8d\xd1\x5c\x33\x5c\xea\x22\x93\x3a\xd3\x4d\xc6\x8e\xa9\x60\xad\x09\x75\x7d\x8c\xf3\xbf\x8d\x0f\x42\x6d\x6a\x8c\x69\xb9\x12\xfe\xa5\x2b\x29\x3e\x88\x4e\x5e\x24\x06\x65\x18\xed\x3a\x5b\xda\x33\x5c\x54\xb3\xfd\xea\x3d\xb2\x6c\x62\x91\xdf\x62\xe5\xe1\x49\x97\xe0\xa6\x3c\x0f\x6a\x73\xb0\x68\xae\x35\x52\x7c\x51\xd4\x17\x41\xc2\x15\x26\x2d\x44\x40\x5c\x78\xfd\x1a\x6a\x37\xe3\x5b\xfc\xf7\x24\x55\xc9\x75\x10\xa2\x6c\x3c\x3e\xe2\x92\xc8\x0a\xd2\x2a\xe0\x34\x1b\x04\x11\x5f\xdb\x5a\x8f\x11\x73\xd1\x2e\xab\xbe\xd5\xd2\x14\x5c\x9a\x0f\xa8\x52\xbe\xca\xf4\xab\xf3\xac\xcc\x02\xea\x33\x45\x25\x68\x9b\x12\x46\x59\xee\xd2\x1c\xa1\x29\x3a\xb5\xc0\x68\x0e\xd0\x4c\x2c\x3d\x7b\x4a\xeb\xc4\xcd\xbe\x6e\x19\x1f\x49\x98\xa5\x5e\x0d\x49\x93\xb1\x29\x21\x1b\x9c\xb5\x1c\xa0\xe5\x22\x9a\x07\xb2\xce\x4e\x11\xc7\x4b\x4b\x3b\xde\x30\x1d\x29\x13\x37\xc5\xf5\x98\xba\x6a\x54\xbf\x58\xbc\x24\xbd\xd9\xa3\xd6\x9c\x15\x5d\xa0\x30\xf5\x6a\x9a\xc9\x24\xfe\xfb\x6a\x6b\xd1\x14\x3b\x5a\x74\xf0\xc0\xf7\x1c\x94\x84\xda\xd0\xd7\x23\xa0\x94\x62\x0e\x0f\x6b\xe3\xa3\x26\x85\xbd\xa0\xd9\x40\x4d\x38\xe5\x4c\xf8\xc1\x38\xc9\x4c\xad\x50\xc9\xc2\x59\x86\x2d\x5c\xef\xe9\x19\xc9\x3c\x4f\x67\xda\xd1\xb2\xa8\xbd\x7e\x6d\x74\x6f\xf5\xe4\x4a\x2f\xf2\x02\xe7\xbe\x52\xc4\x7b\xfd\xba\x6c\x22\x38\x52\x4b\xd0\xfb\xf2\x3c\x57\xf7\xd1\x45\x24\x04\xa3\xd5\x2c\x68\x2a\x42\x5a\xe9\x86\x64\x94\x9f\xa0\xf7\x15\x2b\x16\xf7\x4f\x33\x95\xe3\x5a\x2a\x6f\x15\x2a\x7b\x88\xbc\xad\x25\x62\x6c\xb9\x0b\xa3\xc8\xfa\x9f\xc2\xca\x76\xa0\x6f\x69\x51\x97\xd1\x31\x48\x5b\x4d\x78\x1c\x45\x96\x2b\x2b\x8d\x6b\x5b\xd3\x7c\x45\x43\x35\x21\xa3\x73\xd8\xb3\x2a\xe5\xc2\x94\xd9\x92\xa9\xd7\xff\x92\xdb\xbf\x25\xb9\xd5\x64\x0f\xf8\x4f\x97\x2b\xc9\x82\x6e\x52\x1e\x6d\x3e\x17\x01\x9b\xae\xcc\xcb\x2b\xff\x4d\x66\x8f\xdf\x92\x78\x5c\x64\x8d\x0e\xff\x2b\x14\xc9\x9d\x23\x60\x5b\xf5\xd0\x78\xc6\x03\x47\x95\x71\x88\xfb\x98\xee\xc5\x19\xb1\x2d\xf3\xcf\x21\xd4\x11\x98\x37\x10\x98\xe7\x04\x34\xa9\xcc\x39\xbd\xb1\x56\xc9\xeb\x51\x2c\x95\x19\xea\xce\x4c\xf2\x08\xfa\xf7\xba\xee\x1a\x7c\x55\x53\xa2\x34\xdd\xf7\xe8\x6b\x50\x46\xdf\x55\xd1\x1b\xb5\x55\x46\x97\x51\xf6\x11\x7d\x41\xf4\xa8\xab\x21\x61\x88\xca\xd8\xf3\x0f\x87\x52\x90\x37\xfb\xc7\x4e\xf9\xe5\xd3\x7d\x6c\x41\x57\x39\xff\x0d\xf4\x7b\xbd\x5e\xab\x44\x77\x1e\xd3\xdd\x7d\x1f\xdd\xdd\x1e\xba\xb5\x8a\x35\xd8\x61\x3f\xd6\xdc\xa0\xfe\x66\xac\x42\xc5\xc6\x44\xa7\x35\x5a\xcd\xdd\x44\x96\x32\x3f\x0c\xeb\x1b\x8a\xc6\xf6\x26\x1e\x08\xec\xbd\x5b\x1d\x0e\x63\x2b\xd7\x5c\xa6\x92\xdd\xb9\xb1\xd7\xa8\x3d\xb8\xd2\x6e\x68\x33\x87\xca\x71\xda\xd0\xa1\x7c\x60\xfe\x64\x9c\x2a\x19\x27\xe0\x6b\xe2\x4b\x6e\x70\x82\x3c\x60\x94\xa3\xbd\x41\xce\xc9\x0a\x4b\x49\x7d\x4d\x6e\x16\x7f\xca\x2b\x14\x6e\xe1\x4f\x3e\x3d\x1f\xd9\xd6\xf4\x7c\x74\x74\xfc\xee\xff\xac\x36\x58\xb3\xf1\xe7\x59\x56\x50\x12\xd0\x0e\x47\x71\x7e\x35\x3a\xfd\x0d\x77\x19\x3d\x33\x5c\xc2\xa7\xbd\xf5\xa8\xcb\xb6\x1d\x9f\x39\xb1\x27\x77\xd6\x84\xaf\x3b\x3c\x5a\x70\x11\xda\xfd\x2c\x9f\xa5\x23\xb9\x85\x60\xc4\x4e\xd1\x57\xc9\x31\xb6\xf5\xcb\x7c\x36\x9e\x5a\xad\x64\xb6\x96\x52\xab\xbe\x20\xf0\x19\x71\xad\x36\x64\xc2\x97\xe6\x6c\x24\x12\x6b\x59\x16\x1c\x22\xf4\xb9\x47\xfc\x12\x3e\x40\x9a\x94\xc7\xfc\x05\xc4\x0a\x45\xfa\xb6\x22\x2e\x30\x56\x0a\x62\x29\x63\x2a\xc7\x67\x3c\xa6\x56\x8b\x94\x40\x64\x38\x01\x69\x04\x0e\x88\x0a\x19\xcf\x2e\xf6\x80\xc7\x30\x2a\x47\x5f\x70\xb7\x60\x24\x6c\x3c\x26\x83\x51\xf1\x8a\x37\x3b\x79\x2b\x5b\x8b\xaf\xc3\xaa\x74\x04\x3e\x8a\x26\x5c\xb9\x9f\xc1\x27\xba\xe9\x70\xb1\xf3\xb1\xe3\x7a\x3c\xf0\x89\xcc\xf2\x16\x65\x14\xad\x5c\x0d\x8d\xfb\x99\x28\x8d\x40\xf2\xcc\xce\x03\xf1\x23\x94\x1b\x56\xfa\x52\x22\xf9\xf0\xe3\x36\x64\x82\x39\x4c\xea\xd9\xda\x72\x7e\x62\x15\x93\xc5\xdc\x5b\x83\x1c\x66\x08\x56\xfc\x65\x8c\x55\xbe\x72\x95\x89\x64\x34\x92\x68\xdd\xf2\x34\xae\x7e\xc7\xc5\x94\x39\x5f\x50\xd8\x0a\xc2\x21\x58\xdd\xae\x6c\xb9\x8b\xd0\x60\x5c\x50\xb2\x41\x38\x2c\xa5\x05\xe5\xa7\x30\xc6\x42\x01\xff\x0f\xd6\x49\x89\x42\xbc\x7a\x02\x96\xd5\xaa\xa7\x61\x75\xb7\x5c\x9a\x21\x65\xb1\xc3\x68\x1a\xc6\x32\x32\xb2\xf0\x89\xa7\x60\x7a\x8a\x2d\xc5\x91\xa1\x03\x8d\x8d\x6a\x6b\xed\x67\x12\xda\xa6\x44\xa6\x87\xa5\x79\x90\x5a\xcd\x62\x31\x6f\x1d\x97\x08\xa2\xb6\x43\x69\x88\x36\x7a\x43\x26\xc8\xda\xe3\x82\x85\xbb\x0e\x17\x44\x60\x6c\xda\x22\x2e\x34\xb1\xea\xbd\x6c\xe9\xe3\xa3\x55\x96\x35\xf6\xb6\x25\x73\x22\x6e\xef\xbb\x75\x19\xbd\x5b\x23\x99\xaa\xea\x29\x7b\x95\x16\x1b\x2b\x56\xb2\x6a\x2a\xdd\x4a\x86\xcf\x01\x74\xa1\xcc\x9f\x55\x94\xad\xf3\x5c\x7d\xee\x0b\xd3\x66\x25\xc6\x80\x39\x5c\x5d\x56\x50\xf5\x92\x69\x63\x6f\x8a\xcb\x12\x94\xa1\x58\x38\xbe\xe7\x7c\xb1\xda\x75\x11\xf2\xdc\x5f\x11\x2d\x2f\x64\x83\x7f\x4d\xb7\x9a\x37\x99\x9d\x33\x0b\x85\x20\xe2\xeb\xa9\x0c\x07\xa5\x46\xb4\xc1\x4a\xbe\xbd\x84\xdf\xb4\xb2\xf1\xa4\xbc\x85\x79\x65\xf8\x20\x4c\x15\x56\x2f\x19\x8d\x12\x25\xb2\x57\x50\x6a\x4d\xf8\x62\x36\x30\xc5\x6c\xf5\x03\xaf\x80\xb8\xd5\x19\x49\xb6\x52\xeb\xa1\x32\xaf\xbd\xb0\x77\xd6\xab\x45\xa9\x88\xaf\x86\x71\xa5\xa8\x99\x24\x08\x59\x59\x0a\xe8\x96\x21\xd5\xa9\x85\xb5\xac\x84\x98\x52\xd2\xab\x65\x1e\xb6\x20\xce\x17\x5b\xf3\x9f\x14\x84\xd1\x80\x05\x69\x32\xde\x53\x83\xea\xdc\x3d\xf3\x77\x5d\x9c\xe7\xe4\x59\x78\x6e\x37\x01\xb5\x33\xb4\x7a\x51\x0b\x9d\x3c\x0d\x9a\x13\x57\x88\xb2\x89\x7d\xe9\xb4\x65\xf6\x8c\xbc\x83\x48\x98\xd0\xed\x24\xb5\x58\xe5\x27\xbe\x9f\x71\x41\x42\x61\xb5\xd5\xd7\x97\xed\xfc\xf3\xca\x3d\xb8\x48\xdd\x1c\x73\x4c\xdd\x67\xe3\x39\xf1\xc8\x31\x47\x4d\x26\x90\xcf\xc6\x96\xb7\xba\x1c\x57\xde\xa3\x0a\xcc\xa7\xe2\xf1\x9f\x01\x00\x00\xff\xff\x16\x31\x02\x9c\xe8\x2f\x00\x00") func webdataFnJsBytes() ([]byte, error) { return bindataRead( @@ -89,7 +89,7 @@ func webdataFnJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/fn.js", size: 12035, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/fn.js", size: 12264, mode: os.FileMode(436), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/main.go b/main.go index 1e3edf4..7f7a08d 100644 --- a/main.go +++ b/main.go @@ -51,6 +51,9 @@ func processCommand(plugin Plugin, command string) error { if len(command) == 0 { return errors.New("empty command") } + if command == "sf" { + return plugin.PointerScrollFinish() + } if command[0] == 't' { text := command[1:] if !utf8.ValidString(text) { diff --git a/plugin.go b/plugin.go index 8f9c722..9445537 100644 --- a/plugin.go +++ b/plugin.go @@ -42,5 +42,6 @@ type Plugin interface { KeyboardText(text string) error PointerButton(button uint, press bool) error PointerMove(deltaX, deltaY int) error - PointerScroll(stepsHorizontal, stepsVertical int) error + PointerScroll(deltaHorizontal, deltaVertical int) error + PointerScrollFinish() error } diff --git a/plugin_windows.go b/plugin_windows.go index 64db40f..91c6e97 100644 --- a/plugin_windows.go +++ b/plugin_windows.go @@ -44,7 +44,7 @@ const ( mouseeventfWheel uint32 = 0x800 mouseeventfHwheel uint32 = 0x1000 - wheelDelta int = 120 + scrollMult int = 6 ) type mouseInput struct { @@ -146,20 +146,20 @@ func (p *windowsPlugin) PointerMove(deltaX, deltaY int) error { return nil } -func (p *windowsPlugin) PointerScroll(stepsHorizontal, stepsVertical int) error { +func (p *windowsPlugin) PointerScroll(deltaHorizontal, deltaVertical int) error { inputs := make([]mouseInput, 0, 2) - if stepsHorizontal != 0 { + if deltaHorizontal != 0 { inputs = append(inputs, mouseInput{ typ: inputMouse, dwFlags: mouseeventfHwheel, - mouseData: uint32(stepsHorizontal * wheelDelta), + mouseData: uint32(deltaHorizontal * scrollMult), }) } - if stepsVertical != 0 { + if deltaVertical != 0 { inputs = append(inputs, mouseInput{ typ: inputMouse, dwFlags: mouseeventfWheel, - mouseData: uint32(stepsVertical * wheelDelta), + mouseData: uint32(deltaVertical * scrollMult), }) } if len(inputs) == 0 { @@ -172,3 +172,7 @@ func (p *windowsPlugin) PointerScroll(stepsHorizontal, stepsVertical int) error } return nil } + +func (p *windowsPlugin) PointerScrollFinish() error { + return nil +} diff --git a/plugin_x11.go b/plugin_x11.go index 6273f4f..747df9f 100644 --- a/plugin_x11.go +++ b/plugin_x11.go @@ -35,11 +35,15 @@ import ( "unsafe" ) -const typingDelay time.Duration = 100 * time.Millisecond +const ( + typingDelay time.Duration = 100 * time.Millisecond + scrollDiv int = 20 +) type x11Plugin struct { - display *C.Display - lock sync.Mutex + display *C.Display + lock sync.Mutex + scrollHorizontal, scrollVertical int } func InitX11Plugin() (Plugin, error) { @@ -157,7 +161,13 @@ func (p *x11Plugin) PointerMove(deltaX, deltaY int) error { return nil } -func (p *x11Plugin) PointerScroll(stepsHorizontal, stepsVertical int) error { +func (p *x11Plugin) PointerScroll(deltaHorizontal, deltaVertical int) error { + p.lock.Lock() + stepsHorizontal := (p.scrollHorizontal + deltaHorizontal) / scrollDiv + stepsVertical := (p.scrollVertical + deltaVertical) / scrollDiv + p.scrollHorizontal = (p.scrollHorizontal + deltaHorizontal) % scrollDiv + p.scrollVertical = (p.scrollVertical + deltaVertical) % scrollDiv + p.lock.Unlock() var buttonHorizontal uint = 7 if stepsHorizontal < 0 { buttonHorizontal = 6 @@ -186,3 +196,11 @@ func (p *x11Plugin) PointerScroll(stepsHorizontal, stepsVertical int) error { } return nil } + +func (p *x11Plugin) PointerScrollFinish() error { + p.lock.Lock() + defer p.lock.Unlock() + p.scrollHorizontal = 0 + p.scrollVertical = 0 + return nil +} diff --git a/webdata/fn.js b/webdata/fn.js index 35d174a..9bc7f6f 100644 --- a/webdata/fn.js +++ b/webdata/fn.js @@ -20,8 +20,6 @@ // [1 Touch, 2 Touches, 3 Touches] const TOUCH_MOVE_THRESHOLD = [10, 15, 15]; const TOUCH_TIMEOUT = 250; -const MOVE_MULT = 1; -const SCROLL_MULT = 0.05; // [[px/s, mult], ...] const POINTER_ACCELERATION = [[0, 0], [87, 1], [173, 1], [553, 2]]; @@ -40,6 +38,7 @@ var scrollXSum = 0; var scrollYSum = 0; var dragging = false; var draggingTimeout = null; +var scrolling = false; function fullscreenEnabled() { return (document.fullscreenEnabled || @@ -153,6 +152,7 @@ function updateMoveAndScroll() { if (Math.abs(scrollX) >= 1 || Math.abs(scrollY) >= 1) { scrollXSum -= scrollX; scrollYSum -= scrollY; + scrolling = true; ws.send("s" + scrollX + ";" + scrollY); } } @@ -183,6 +183,10 @@ function handleStart(evt) { draggingTimeout = null; dragging = true; } + if (scrolling) { + ws.send("sf"); + scrolling = false; + } } } @@ -196,6 +200,10 @@ function handleEnd(evt) { ongoingTouches.splice(idx, 1); touchReleasedCount++; touchLastEnd = evt.timeStamp; + if (scrolling) { + ws.send("sf"); + scrolling = false; + } } if (touchReleasedCount > TOUCH_MOVE_THRESHOLD.length) { touchMoved = true; @@ -234,6 +242,10 @@ function handleCancel(evt) { touchReleasedCount++; touchLastEnd = evt.timeStamp; touchMoved = true; + if (scrolling) { + ws.send("sf"); + scrolling = false; + } } } @@ -261,11 +273,11 @@ function handleMove(evt) { } if (touchMoved && evt.timeStamp - touchLastEnd >= TOUCH_TIMEOUT) { if (ongoingTouches.length == 1 || dragging) { - moveXSum += sumX * MOVE_MULT; - moveYSum += sumY * MOVE_MULT; + moveXSum += sumX; + moveYSum += sumY; } else if (ongoingTouches.length == 2) { - scrollXSum -= sumX * SCROLL_MULT; - scrollYSum -= sumY * SCROLL_MULT; + scrollXSum -= sumX; + scrollYSum -= sumY; } updateMoveAndScroll(); } From 71d7cd42b9031481c406b9bfe9f75742a96bec5d Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:12 +0200 Subject: [PATCH 018/311] add support for Flatpak's RemoteDesktop portal --- README.md | 2 +- desktop/remote-touchpad.appdata.xml | 2 +- flatpak/com.github.unrud.RemoteTouchpad.json | 8 +- plugin.go | 1 + plugin_portal.go | 271 +++++++++++++++++++ plugin_portal_dummy.go | 28 ++ 6 files changed, 309 insertions(+), 3 deletions(-) create mode 100644 plugin_portal.go create mode 100644 plugin_portal_dummy.go diff --git a/README.md b/README.md index 904fd5e..42ea676 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Control mouse and keyboard from the webbrowser of a smartphone (or any other device with a touchscreen). To take control open the displayed URL or scan the QR code. -Supports Windows and X11. +Supports Flatpak's RemoteDesktop portal (experimental), Windows and X11. ## Installation diff --git a/desktop/remote-touchpad.appdata.xml b/desktop/remote-touchpad.appdata.xml index 5e269ed..62dd6c5 100644 --- a/desktop/remote-touchpad.appdata.xml +++ b/desktop/remote-touchpad.appdata.xml @@ -11,7 +11,7 @@ To take control open the displayed URL or scan the QR code.

- Supports Windows and X11. + Supports Flatpak's RemoteDesktop portal (experimental), Windows and X11.

https://github.com/Unrud/remote-touchpad/issues diff --git a/flatpak/com.github.unrud.RemoteTouchpad.json b/flatpak/com.github.unrud.RemoteTouchpad.json index 151250b..db92ec4 100644 --- a/flatpak/com.github.unrud.RemoteTouchpad.json +++ b/flatpak/com.github.unrud.RemoteTouchpad.json @@ -36,6 +36,12 @@ "commit" : "38087fe4dafb822e541b3f7955075cc1c30bd294", "dest" : "src/github.com/elazarl/go-bindata-assetfs" }, + { + "type" : "git", + "url" : "https://anonscm.debian.org/git/pkg-go/packages/golang-dbus.git", + "commit" : "79d96b151df08809558c825f8a75188826e8e228", + "dest" : "src/anonscm.debian.org/git/pkg-go/packages/golang-dbus.git" + }, { "type" : "git", "path" : "..", @@ -45,7 +51,7 @@ ], "buildsystem" : "simple", "build-commands" : [ - ". /usr/lib/sdk/golang/enable.sh; env GOPATH=\"$(pwd)\" go build -tags x11 github.com/unrud/remote-touchpad", + ". /usr/lib/sdk/golang/enable.sh; env GOPATH=\"$(pwd)\" go build -tags 'portal x11' github.com/unrud/remote-touchpad", "install -Dm0755 -t /app/bin remote-touchpad", "install -Dm0755 -t /app/bin src/github.com/unrud/remote-touchpad/desktop/remote-touchpad-wait-on-error", "install -Dm0644 -t /app/share/appdata src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.appdata.xml", diff --git a/plugin.go b/plugin.go index 9445537..64482fc 100644 --- a/plugin.go +++ b/plugin.go @@ -26,6 +26,7 @@ type PluginInfo struct { var Plugins []PluginInfo = []PluginInfo{ {"X11", InitX11Plugin}, + {"RemoteDesktop portal", InitPortalPlugin}, {"Windows", InitWindowsPlugin}, } diff --git a/plugin_portal.go b/plugin_portal.go new file mode 100644 index 0000000..faa6a5d --- /dev/null +++ b/plugin_portal.go @@ -0,0 +1,271 @@ +// +build portal + +/* + * Copyright (c) 2018 Unrud + * + * This file is part of Remote-Touchpad. + * + * Foobar is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Remote-Touchpad is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Foobar. If not, see . + */ + +package main + +import ( + dbus "anonscm.debian.org/git/pkg-go/packages/golang-dbus.git" + "errors" + "fmt" + "sync" +) + +const ( + deviceKeyboard uint32 = 1 + devicePointer uint32 = 2 + + btnReleased uint32 = 0 + btnPressed uint32 = 1 + + btnLeft int32 = 0x110 + btnRight int32 = 0x111 + btnMiddle int32 = 0x112 +) + +type portalPlugin struct { + bus *dbus.Conn + remoteDesktop dbus.BusObject + sessionHandle dbus.ObjectPath + lock sync.RWMutex +} + +func InitPortalPlugin() (Plugin, error) { + bus, err := dbus.SessionBusPrivate() + if err != nil { + return nil, UnsupportedPlatformError{err} + } + cleanupBus := true + defer func() { + if cleanupBus { + bus.Close() + } + }() + err = bus.Auth(nil) + if err != nil { + return nil, UnsupportedPlatformError{err} + } + err = bus.Hello() + if err != nil { + return nil, UnsupportedPlatformError{err} + } + remoteDesktop := bus.Object("org.freedesktop.portal.Desktop", + "/org/freedesktop/portal/desktop") + availableDeviceTypesV, err := remoteDesktop.GetProperty( + "org.freedesktop.portal.RemoteDesktop.AvailableDeviceTypes") + if err != nil { + return nil, UnsupportedPlatformError{err} + } + availableDeviceTypes, ok := availableDeviceTypesV.Value().(uint32) + if !ok { + return nil, UnsupportedPlatformError{errors.New( + "unexpected 'AvailableDeviceTypes' return type")} + } + if availableDeviceTypes&deviceKeyboard == 0 || + availableDeviceTypes&devicePointer == 0 { + return nil, UnsupportedPlatformError{errors.New( + "keyboard or pointer source type not supported")} + } + inVardict := make(map[string]dbus.Variant) + inVardict["session_handle_token"] = dbus.MakeVariant("t") + result, outVardict, err := getResponse(bus, remoteDesktop, + "org.freedesktop.portal.RemoteDesktop.CreateSession", 0, inVardict) + if err != nil { + return nil, UnsupportedPlatformError{err} + } + if result != 0 { + return nil, UnsupportedPlatformError{errors.New(fmt.Sprintf( + "Calling 'CreateSession' failed (%v)", result))} + } + sessionHandleV, ok := outVardict["session_handle"] + if !ok { + return nil, UnsupportedPlatformError{errors.New( + "'session_handle' missing from 'CreateSession' return value")} + } + sessionHandleS, ok := sessionHandleV.Value().(string) + if !ok { + return nil, UnsupportedPlatformError{errors.New( + "unexpected 'session_handle' type in 'CreateSession' return value")} + } + sessionHandle := dbus.ObjectPath(sessionHandleS) + inVardict = make(map[string]dbus.Variant) + inVardict["type"] = dbus.MakeVariant(deviceKeyboard | devicePointer) + result, outVardict, err = getResponse(bus, remoteDesktop, + "org.freedesktop.portal.RemoteDesktop.SelectDevices", 0, sessionHandle, inVardict) + if err != nil { + return nil, UnsupportedPlatformError{err} + } + if result != 0 { + return nil, UnsupportedPlatformError{errors.New(fmt.Sprintf( + "Calling 'SelectDevices' failed (%v)", result))} + } + inVardict = make(map[string]dbus.Variant) + result, outVardict, err = getResponse(bus, remoteDesktop, + "org.freedesktop.portal.RemoteDesktop.Start", 0, sessionHandle, "", inVardict) + if err != nil { + return nil, UnsupportedPlatformError{err} + } + if result != 0 { + return nil, errors.New("keyboard or pointer access denied") + } + devicesV, ok := outVardict["devices"] + if !ok { + return nil, UnsupportedPlatformError{errors.New( + "'devices' missing from 'Start' return value")} + } + devices, ok := devicesV.Value().(uint32) + if !ok { + return nil, UnsupportedPlatformError{errors.New( + "unexpected 'devices' type in 'Start' return value")} + } + if devices&deviceKeyboard == 0 || devices&devicePointer == 0 { + return nil, errors.New("keyboard or pointer access denied") + } + cleanupBus = false + return &portalPlugin{bus: bus, remoteDesktop: remoteDesktop, + sessionHandle: sessionHandle}, nil +} + +func getResponse(bus *dbus.Conn, object dbus.BusObject, method string, + flags dbus.Flags, args ...interface{}) (uint32, map[string]dbus.Variant, error) { + ch := make(chan *dbus.Signal) + bus.Signal(ch) + defer bus.RemoveSignal(ch) + var requestPath dbus.ObjectPath + if err := object.Call(method, flags, args...).Store(&requestPath); err != nil { + return 0, nil, err + } + for { + s := <-ch + if s.Path == requestPath && s.Name == "org.freedesktop.portal.Request.Response" { + if len(s.Body) != 2 { + return 0, nil, errors.New("unexpected 'Response' return length") + } + result, ok := s.Body[0].(uint32) + if !ok { + return 0, nil, errors.New("unexpected 'Response' return type") + } + outVardict, ok := s.Body[1].(map[string]dbus.Variant) + if !ok { + return 0, nil, errors.New("unexpected 'Response' return type") + } + return result, outVardict, nil + } + } +} + +func (p *portalPlugin) Close() error { + p.lock.Lock() + defer p.lock.Unlock() + if p.bus == nil { + return errors.New("dbus connection closed") + } + if err := p.bus.Close(); err != nil { + return err + } + p.bus = nil + p.remoteDesktop = nil + return nil +} + +func (p *portalPlugin) KeyboardText(text string) error { + p.lock.RLock() + defer p.lock.RUnlock() + if p.bus == nil { + return errors.New("dbus connection closed") + } + inVardict := make(map[string]dbus.Variant) + for _, runeValue := range text { + keysym := int32(0x01000000 + runeValue) + for _, state := range [...]uint32{btnPressed, btnReleased} { + if err := p.remoteDesktop.Call( + "org.freedesktop.portal.RemoteDesktop.NotifyKeyboardKeysym", + 0, p.sessionHandle, inVardict, keysym, state).Store(); err != nil { + return err + } + } + } + return nil +} + +func (p *portalPlugin) PointerButton(button uint, press bool) error { + p.lock.RLock() + defer p.lock.RUnlock() + if p.bus == nil { + return errors.New("dbus connection closed") + } + var btn int32 + if button == 1 { + btn = btnLeft + } else if button == 2 { + btn = btnMiddle + } else if button == 3 { + btn = btnRight + } else { + return errors.New("unsupported pointer button") + } + state := btnReleased + if press { + state = btnPressed + } + inVardict := make(map[string]dbus.Variant) + if err := p.remoteDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerButton", + 0, p.sessionHandle, inVardict, btn, state).Store(); err != nil { + return err + } + return nil +} + +func (p *portalPlugin) PointerMove(deltaX, deltaY int) error { + p.lock.RLock() + defer p.lock.RUnlock() + if p.bus == nil { + return errors.New("dbus connection closed") + } + inVardict := make(map[string]dbus.Variant) + if err := p.remoteDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerMotion", + 0, p.sessionHandle, inVardict, float64(deltaX), float64(deltaY)).Store(); err != nil { + return err + } + return nil +} + +func (p *portalPlugin) pointerScrollFull(deltaHorizontal, deltaVertical int, finish bool) error { + p.lock.RLock() + defer p.lock.RUnlock() + if p.bus == nil { + return errors.New("dbus connection closed") + } + inVardict := make(map[string]dbus.Variant) + inVardict["finish"] = dbus.MakeVariant(finish) + if err := p.remoteDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerAxis", + 0, p.sessionHandle, inVardict, float64(deltaHorizontal), float64(deltaVertical)).Store(); err != nil { + return err + } + return nil +} + +func (p *portalPlugin) PointerScroll(deltaHorizontal, deltaVertical int) error { + return p.pointerScrollFull(deltaHorizontal, deltaVertical, false) +} + +func (p *portalPlugin) PointerScrollFinish() error { + return p.pointerScrollFull(0, 0, true) +} diff --git a/plugin_portal_dummy.go b/plugin_portal_dummy.go new file mode 100644 index 0000000..9148781 --- /dev/null +++ b/plugin_portal_dummy.go @@ -0,0 +1,28 @@ +// +build !portal + +/* + * Copyright (c) 2018 Unrud + * + * This file is part of Remote-Touchpad. + * + * Foobar is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Remote-Touchpad is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Foobar. If not, see . + */ + +package main + +import "errors" + +func InitPortalPlugin() (Plugin, error) { + return nil, UnsupportedPlatformError{errors.New("disabled")} +} From 1fe8ae8b75a62b4b0a9f0cb290254c5f52471d73 Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 31 Jul 2018 20:19:16 +0200 Subject: [PATCH 019/311] bump version to 0.0.5 --- CHANGELOG.md | 8 ++++++++ desktop/remote-touchpad.appdata.xml | 15 ++++++++++++--- main.go | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3df0d89..e02f4f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.0.5 (2018-07-31) + + * remove mouse polling interval + * add support for "pixel-perfect" scrolling + * add experimental support for Flatpak's RemoteDesktop portal + * X11 plugin: check session type + * improve error logging + ## 0.0.4 (2018-07-22) * add setting for mouse polling interval diff --git a/desktop/remote-touchpad.appdata.xml b/desktop/remote-touchpad.appdata.xml index 62dd6c5..139d300 100644 --- a/desktop/remote-touchpad.appdata.xml +++ b/desktop/remote-touchpad.appdata.xml @@ -18,6 +18,15 @@ https://github.com/Unrud/remote-touchpad Unrud + +​
    +
  • remove mouse polling interval
    • +
  • add support for "pixel-perfect" scrolling
    • +
  • add experimental support for Flatpak's RemoteDesktop portal
    • +
  • X11 plugin: check session type
    • +
  • improve error logging
    • +
+ ​