Hello community, here is the log from the commit of package novnc for openSUSE:Factory checked in at 2013-09-26 07:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/novnc (Old) and /work/SRC/openSUSE:Factory/.novnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "novnc" Changes: -------- --- /work/SRC/openSUSE:Factory/novnc/novnc.changes 2013-04-29 14:08:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.novnc.new/novnc.changes 2013-09-26 07:09:46.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 24 19:38:06 UTC 2013 - [email protected] + +- update to 0.4: + * Clarify permissive licenses of HTML, CSS, images. + * Use render queue and requestAnimationFrame + * UltraVNC repeater support + +------------------------------------------------------------------- Old: ---- noVNC-0.3.tar.gz New: ---- noVNC-0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ novnc.spec ++++++ --- /var/tmp/diff_new_pack.bS2pNW/_old 2013-09-26 07:09:46.000000000 +0200 +++ /var/tmp/diff_new_pack.bS2pNW/_new 2013-09-26 07:09:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: novnc -Version: 0.3 +Version: 0.4 Release: 0 Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support License: GPL-3.0 @@ -39,7 +39,7 @@ Websocket implementation of VNC client %prep -%setup -q +%setup -q -n noVNC-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 ++++++ noVNC-0.3.tar.gz -> noVNC-0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/LICENSE.txt new/noVNC-0.4/LICENSE.txt --- old/novnc-0.3/LICENSE.txt 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/LICENSE.txt 2012-09-15 00:00:56.000000000 +0200 @@ -1,35 +1,78 @@ noVNC is Copyright (C) 2011 Joel Martin <[email protected]> +The noVNC core library is licensed under the LGPLv3 (GNU Lesser +General Public License). The noVNC core library is composed of the +Javascript code necessary for full noVNC operation. This includes (but +is not limited to): + + include/base64.js + include/des.js + include/display.js + include/input.js + include/jsunzip.js + include/logo.js + include/rfb.js + include/ui.js + include/util.js + include/vnc.js + include/websock.js + include/webutil.js + +The HTML, CSS, font and images files that included with the noVNC +source distibution (or repository) are not considered part of the +noVNC core library and are licensed under more permissive licenses. +The intent is to allow easy integration of noVNC into existing web +sites and web applications. + +The HTML, CSS, font and image files are licensed as follows: + + *.html : 2-Clause BSD license + + include/*.css : 2-Clause BSD license + + include/Orbitron* : SIL Open Font License 1.1 + (Copyright 2009 Matt McInerney) + + images/ : Creative Commons Attribution-ShareAlike + http://creativecommons.org/licenses/by-sa/3.0/ + +In addition the following file, which is part of the noVNC core +library, may be licensed under either the LGPL-2, LGPL-3 or MPL 2.0 +when it used separately from the noVNC core library. + + include/input.js : LGPL-2 or any later version + Some portions of noVNC are copyright to their individual authors. Please refer to the individual source files and/or to the noVNC commit history: https://github.com/kanaka/noVNC/commits/master -noVNC is licensed under the LGPL (GNU Lesser General Public License) -version 3 with the following exceptions (all LGPL-3 compatible): +The are several files and projects that have been incorporated into +the noVNC core library. Here is a list of those files and the original +licenses (all LGPL-3 compatible): - include/input.js : LGPL-2 or any later version - - include/base64.js : Dual GPL-2 or LGPL-2.1 + include/base64.js : MPL 1.1, GPL-2 or LGPL-2.1 include/des.js : Various BSD style licenses include/jsunzip.js : zlib/libpng license - include/web-socket-js/ : New BSD license. Source code at + include/web-socket-js/ : New BSD license (3-clause). Source code at http://github.com/gimite/web-socket-js - include/Orbitron* : SIL Open Font License 1.1 - (Copyright 2009 Matt McInerney) - - images/ : Creative Commons Attribution-ShareAlike - http://creativecommons.org/licenses/by-sa/3.0/ +The following license texts are included: -The license texts are included at: docs/LICENSE.LGPL-3 and docs/LICENSE.GPL-3 docs/LICENSE.OFL-1.1 + docs/LICENSE.BSD-3-Clause (New BSD) + docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD) + docs/LICENSE.zlib + docs/LICENSE.MPL-2.0 Or alternatively the license texts may be found here: + http://www.gnu.org/licenses/lgpl.html and http://www.gnu.org/licenses/gpl.html http://scripts.sil.org/OFL + http://www.mozilla.org/MPL/1.1/ + http://www.mozilla.org/MPL/2.0/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/README.md new/noVNC-0.4/README.md --- old/novnc-0.3/README.md 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/README.md 2012-09-15 00:00:56.000000000 +0200 @@ -6,11 +6,37 @@ noVNC is a HTML5 VNC client that runs well in any modern browser including mobile browsers (iPhone/iPad and Android). +More than 16 companies/projects have integrated noVNC into their +products including [Ganeti Web +Manager](http://code.osuosl.org/projects/ganeti-webmgr), +[OpenStack](http://www.openstack.org), and +[OpenNebula](http://opennebula.org/). See [the Projects and Companies +wiki page](https://github.com/kanaka/noVNC/wiki/ProjectsCompanies-using-noVNC) +for more complete list. + +### News/help/contact + Notable commits, announcements and news are posted to @<a href="http://www.twitter.com/noVNC";>noVNC</a> -There are many companies/projects that have integrated noVNC into -their products including: [Ganeti Web Manager](http://code.osuosl.org/projects/ganeti-webmgr), [Archipel](http://archipelproject.org), [openQRM](http://www.openqrm.com/), [OpenNode](http://www.opennodecloud.com/), [OpenStack](http://www.openstack.org), [Broadway (HTML5 GDK/GTK+ backend)](http://blogs.gnome.org/alexl/2011/03/15/gtk-html-backend-update/), [OpenNebula](http://opennebula.org/), [CloudSigma](http://www.cloudsigma.com/), [Zentyal (formerly eBox)](http://www.zentyal.org/), [SlapOS](http://www.slapos.org), [Intel MeshCentral](https://meshcentral.com), [Amahi](http://amahi.org), [Brightbox](http://brightbox.com/), [Foreman](http://theforeman.org) and [LibVNCServer](http://libvncserver.sourceforge.net). See [this wiki page](https://github.com/kanaka/noVNC/wiki/ProjectsCompanies-using-noVNC) for more info and links. +If you are a noVNC developer/integrator/user (or want to be) please +join the <a +href="https://groups.google.com/forum/?fromgroups#!forum/novnc";>noVNC +discussion group</a> + +Bugs and feature requests can be submitted via [github +issues](https://github.com/kanaka/noVNC/issues). If you are looking +for a place to start contributing to noVNC, a good place to start +would be the issues that I have marked as +["patchwelcome"](https://github.com/kanaka/noVNC/issues?labels=patchwelcome). + +If you want to show appreciation for noVNC you could buy something off +my [Amazon wishlist](http://www.amazon.com/registry/wishlist/XTXFXK39IA8C/?reveal=unpurchased&sort=priority&layout=compact) or you could donate to a great non-profits such as: [Compassion +International](http://www.compassion.com/), [SIL](http://www.sil.org), +[Habitat for Humanity](http://www.habitat.org), [Electronic Frontier +Foundation](https://www.eff.org/), [Against Malaria +Foundation](http://www.againstmalaria.com/), [Nothing But +Nets](http://www.nothingbutnets.net/), etc. ### Features @@ -56,7 +82,8 @@ ### Server Requirements Unless you are using a VNC server with support for WebSockets -connections (such as [x11vnc/libvncserver](http://libvncserver.sourceforge.net/)), +connections (such as [x11vnc/libvncserver](http://libvncserver.sourceforge.net/) or +[PocketVNC](http://www.pocketvnc.com/blog/?page_id=866)), you need to use a WebSockets to TCP socket proxy. There is a python proxy included ('websockify'). @@ -76,8 +103,9 @@ ### Other Pages -* [Advanced Usage](https://github.com/kanaka/noVNC/wiki/Advanced-usage). Generating an SSL - certificate, starting a VNC server, advanced websockify usage, etc. +* [Encrypted Connections](https://github.com/kanaka/websockify/wiki/Encrypted-Connections). How to setup websockify so that you can use encrypted connections from noVNC. + +* [Advanced Usage](https://github.com/kanaka/noVNC/wiki/Advanced-usage). Starting a VNC server, advanced websockify usage, etc. * [Integrating noVNC](https://github.com/kanaka/noVNC/wiki/Integration) into existing projects. @@ -87,7 +115,7 @@ ### Authors/Contributors * noVNC : Joel Martin (github.com/kanaka) - * New UI and Icons : Chris Gordon + * UI and Icons : Chris Gordon * Original Logo : Michael Sersen * tight encoding : Michael Tinglof (Mercuri.ca) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/debian/changelog new/noVNC-0.4/debian/changelog --- old/novnc-0.3/debian/changelog 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/debian/changelog 2012-09-15 00:00:56.000000000 +0200 @@ -1,3 +1,11 @@ +novnc (0.4) maverick; urgency=low + + * Clarify permissive licenses of HTML, CSS, images. + * Use render queue and requestAnimationFrame + * UltraVNC repeater support + + -- Joel Martin <[email protected]> Fri, 14 Sep 2012 05:00:00 -0600 + novnc (0.3) maverick; urgency=low * add tight encoding support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/docs/LICENSE.BSD-2-Clause new/noVNC-0.4/docs/LICENSE.BSD-2-Clause --- old/novnc-0.3/docs/LICENSE.BSD-2-Clause 1970-01-01 01:00:00.000000000 +0100 +++ new/noVNC-0.4/docs/LICENSE.BSD-2-Clause 2012-09-15 00:00:56.000000000 +0200 @@ -0,0 +1,22 @@ +Copyright (c) <year>, <copyright holder> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/docs/LICENSE.BSD-3-Clause new/noVNC-0.4/docs/LICENSE.BSD-3-Clause --- old/novnc-0.3/docs/LICENSE.BSD-3-Clause 1970-01-01 01:00:00.000000000 +0100 +++ new/noVNC-0.4/docs/LICENSE.BSD-3-Clause 2012-09-15 00:00:56.000000000 +0200 @@ -0,0 +1,24 @@ +Copyright (c) <year>, <copyright holder> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the <organization> nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/docs/LICENSE.MPL-2.0 new/noVNC-0.4/docs/LICENSE.MPL-2.0 --- old/novnc-0.3/docs/LICENSE.MPL-2.0 1970-01-01 01:00:00.000000000 +0100 +++ new/noVNC-0.4/docs/LICENSE.MPL-2.0 2012-09-15 00:00:56.000000000 +0200 @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/docs/LICENSE.zlib new/noVNC-0.4/docs/LICENSE.zlib --- old/novnc-0.3/docs/LICENSE.zlib 1970-01-01 01:00:00.000000000 +0100 +++ new/noVNC-0.4/docs/LICENSE.zlib 2012-09-15 00:00:56.000000000 +0200 @@ -0,0 +1,27 @@ +Copyright (c) <year>, <copyright holder> +All rights reserved. + +This software is provided 'as-is', without any express +or implied warranty. In no event will the authors be +held liable for any damages arising from the use of +this software. + +Permission is granted to anyone to use this software +for any purpose, including commercial applications, +and to alter it and redistribute it freely, subject to +the following restrictions: + +1. The origin of this software must not be + misrepresented; you must not claim that you + wrote the original software. If you use this + software in a product, an acknowledgment in + the product documentation would be appreciated + but is not required. + +2. Altered source versions must be plainly marked + as such, and must not be misrepresented as + being the original software. + +3. This notice may not be removed or altered from + any source distribution. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/docs/TODO new/noVNC-0.4/docs/TODO --- old/novnc-0.3/docs/TODO 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/docs/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -- Use requestAnimationFrame for frameBufferUpdate polling - -- Use WebSocket binary API when available. - -- Scaling support - ---- - -- IE 9 improvements. - - https://github.com/gimite/web-socket-js/issues#issue/41 - - try window.atob instead of decode for better performance - -- Keyboard menu/panel: - - Move CtrlAltDel button here - - direct text entry with Send/Paste button - - Ctrl Once/Lock, Alt Once/Lock, SysRq Once/Lock - - Highlight menu icon when keys are locked - -- zlib/tight support (even if slow) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/docs/VERSION new/noVNC-0.4/docs/VERSION --- old/novnc-0.3/docs/VERSION 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/docs/VERSION 2012-09-15 00:00:56.000000000 +0200 @@ -1 +1 @@ -0.3 +0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/docs/release.txt new/noVNC-0.4/docs/release.txt --- old/novnc-0.3/docs/release.txt 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/docs/release.txt 2012-09-15 00:00:56.000000000 +0200 @@ -1,7 +1,8 @@ - Update and commit docs/VERSION and debian/changelog - Create version tag and tarball from tag WVER=0.3 - git tag ${WVER} + git tag v${WVER} + git push origin master v${WVER} git archive --format=tar --prefix=novnc-${WVER}/ v${WVER} > novnc-${WVER}.tar gzip novnc-${WVER}.tar - Upload tarball to repo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/base.css new/noVNC-0.4/include/base.css --- old/novnc-0.3/include/base.css 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/base.css 2012-09-15 00:00:56.000000000 +0200 @@ -1,3 +1,10 @@ +/* + * noVNC base CSS + * Copyright (C) 2012 Joel Martin + * noVNC is licensed under the LGPL-3 (see LICENSE.txt) + * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). + */ + body { margin:0; padding:0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/black.css new/noVNC-0.4/include/black.css --- old/novnc-0.3/include/black.css 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/black.css 2012-09-15 00:00:56.000000000 +0200 @@ -1,3 +1,10 @@ +/* + * noVNC base CSS + * Copyright (C) 2012 Joel Martin + * noVNC is licensed under the LGPL-3 (see LICENSE.txt) + * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). + */ + #keyboardinput { background-color:#000; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/blue.css new/noVNC-0.4/include/blue.css --- old/novnc-0.3/include/blue.css 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/blue.css 2012-09-15 00:00:56.000000000 +0200 @@ -1,3 +1,9 @@ +/* + * noVNC base CSS + * Copyright (C) 2012 Joel Martin + * noVNC is licensed under the LGPL-3 (see LICENSE.txt) + * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). + */ #noVNC-control-bar { background-color:#04073d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/display.js new/noVNC-0.4/include/display.js --- old/novnc-0.3/include/display.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/display.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -19,9 +19,12 @@ c_ctx = null, c_forceCanvas = false, + // Queued drawing actions for in-order rendering + renderQ = [], + // Predefine function variables (jslint) imageDataGet, rgbImageData, bgrxImageData, cmapImageData, - setFillColor, rescale, + setFillColor, rescale, scan_renderQ, // The full frame buffer (logical canvas) size fb_width = 0, @@ -412,6 +415,8 @@ c_ctx.clearRect(0, 0, viewport.w, viewport.h); } + renderQ = []; + // No benefit over default ("source-over") in Chrome and firefox //c_ctx.globalCompositeOperation = "copy"; }; @@ -582,6 +587,52 @@ c_ctx.drawImage(img, x - viewport.x, y - viewport.y); }; +that.renderQ_push = function(action) { + renderQ.push(action); + if (renderQ.length === 1) { + // If this can be rendered immediately it will be, otherwise + // the scanner will start polling the queue (every + // requestAnimationFrame interval) + scan_renderQ(); + } +}; + +scan_renderQ = function() { + var a, ready = true; + while (ready && renderQ.length > 0) { + a = renderQ[0]; + switch (a.type) { + case 'copy': + that.copyImage(a.old_x, a.old_y, a.x, a.y, a.width, a.height); + break; + case 'fill': + that.fillRect(a.x, a.y, a.width, a.height, a.color); + break; + case 'blit': + that.blitImage(a.x, a.y, a.width, a.height, a.data, 0); + break; + case 'blitRgb': + that.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0); + break; + case 'img': + if (a.img.complete) { + that.drawImage(a.img, a.x, a.y); + } else { + // We need to wait for this image to 'load' + // to keep things in-order + ready = false; + } + break; + } + if (ready) { + a = renderQ.shift(); + } + } + if (renderQ.length > 0) { + requestAnimFrame(scan_renderQ); + } +}; + that.changeCursor = function(pixels, mask, hotx, hoty, w, h) { if (conf.cursor_uri === false) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/playback.js new/noVNC-0.4/include/playback.js --- old/novnc-0.3/include/playback.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/playback.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.LGPL-3) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/rfb.js new/noVNC-0.4/include/rfb.js --- old/novnc-0.3/include/rfb.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/rfb.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -26,7 +26,7 @@ pixelFormat, clientEncodings, fbUpdateRequest, fbUpdateRequests, keyEvent, pointerEvent, clientCutText, - getTightCLength, extract_data_uri, scan_tight_imgQ, + getTightCLength, extract_data_uri, keyPress, mouseButton, mouseMove, checkEvents, // Overridable for testing @@ -93,7 +93,6 @@ encoding : 0, subencoding : -1, background : null, - imgQ : [], // TIGHT_PNG image queue zlibs : [] // TIGHT zlib streams }, @@ -103,7 +102,6 @@ fb_height = 0, fb_name = "", - scan_imgQ_rate = 40, // 25 times per second or so last_req_time = 0, rre_chunk_sz = 100, @@ -144,6 +142,9 @@ ['connectTimeout', 'rw', 'int', def_con_timeout, 'Time (s) to wait for connection'], ['disconnectTimeout', 'rw', 'int', 3, 'Time (s) to wait for disconnection'], + // UltraVNC repeater ID to connect to + ['repeaterID', 'rw', 'str', '', 'RepeaterID to connect to'], + ['viewportDrag', 'rw', 'bool', false, 'Move the viewport on mouse drags'], ['check_rate', 'rw', 'int', 217, 'Timing (ms) of send/receive check'], @@ -314,7 +315,6 @@ FBU.subrects = 0; // RRE and HEXTILE FBU.lines = 0; // RAW FBU.tiles = 0; // HEXTILE - FBU.imgQ = []; // TIGHT_PNG image queue FBU.zlibs = []; // TIGHT zlib encoders mouse_buttonMask = 0; mouse_arr = []; @@ -662,10 +662,10 @@ init_msg = function() { //Util.Debug(">> init_msg [rfb_state '" + rfb_state + "']"); - var strlen, reason, length, sversion, cversion, + var strlen, reason, length, sversion, cversion, repeaterID, i, types, num_types, challenge, response, bpp, depth, big_endian, red_max, green_max, blue_max, red_shift, - green_shift, blue_shift, true_color, name_length; + green_shift, blue_shift, true_color, name_length, is_repeater; //Util.Debug("ws.rQ (" + ws.rQlen() + ") " + ws.rQslice(0)); switch (rfb_state) { @@ -676,7 +676,9 @@ } sversion = ws.rQshiftStr(12).substr(4,7); Util.Info("Server ProtocolVersion: " + sversion); + is_repeater = 0; switch (sversion) { + case "000.000": is_repeater = 1; break; // UltraVNC repeater case "003.003": rfb_version = 3.3; break; case "003.006": rfb_version = 3.3; break; // UltraVNC case "003.889": rfb_version = 3.3; break; // Apple Remote Desktop @@ -687,6 +689,14 @@ default: return fail("Invalid server version " + sversion); } + if (is_repeater) { + repeaterID = conf.repeaterID; + while (repeaterID.length < 250) { + repeaterID += "\0"; + } + ws.send_string(repeaterID); + break; + } if (rfb_version > rfb_max_version) { rfb_version = rfb_max_version; } @@ -884,11 +894,11 @@ response = response.concat(clientEncodings()); response = response.concat(fbUpdateRequests()); timing.fbu_rt_start = (new Date()).getTime(); + timing.pixels = 0; ws.send(response); /* Start pushing/polling */ setTimeout(checkEvents, conf.check_rate); - setTimeout(scan_tight_imgQ, scan_imgQ_rate); if (conf.encrypt) { updateState('normal', "Connected (encrypted) to: " + fb_name); @@ -1035,7 +1045,7 @@ timing.pixels += FBU.width * FBU.height; } - if (FBU.rects === 0 || (timing.pixels >= (fb_width * fb_height))) { + if (timing.pixels >= (fb_width * fb_height)) { if (((FBU.width === fb_width) && (FBU.height === fb_height)) || (timing.fbu_rt_start > 0)) { @@ -1113,9 +1123,14 @@ var old_x, old_y; if (ws.rQwait("COPYRECT", 4)) { return false; } - old_x = ws.rQshift16(); - old_y = ws.rQshift16(); - display.copyImage(old_x, old_y, FBU.x, FBU.y, FBU.width, FBU.height); + display.renderQ_push({ + 'type': 'copy', + 'old_x': ws.rQshift16(), + 'old_y': ws.rQshift16(), + 'x': FBU.x, + 'y': FBU.y, + 'width': FBU.width, + 'height': FBU.height}); FBU.rects -= 1; FBU.bytes = 0; return true; @@ -1409,9 +1424,9 @@ } } - FBU.imgQ.push({ - 'type': 'rgb', - 'img': {'complete': true, 'data': dest}, + display.renderQ_push({ + 'type': 'blitRgb', + 'data': dest, 'x': FBU.x, 'y': FBU.y, 'width': FBU.width, @@ -1440,9 +1455,9 @@ data = decompress(ws.rQshiftBytes(clength[1])); } - FBU.imgQ.push({ - 'type': 'rgb', - 'img': {'complete': true, 'data': data}, + display.renderQ_push({ + 'type': 'blitRgb', + 'data': data, 'x': FBU.x, 'y': FBU.y, 'width': FBU.width, @@ -1464,10 +1479,10 @@ else if (ctl === 0x0A) cmode = "png"; else if (ctl & 0x04) cmode = "filter"; else if (ctl < 0x04) cmode = "copy"; - else throw("Illegal tight compression received, ctl: " + ctl); + else return fail("Illegal tight compression received, ctl: " + ctl); if (isTightPNG && (cmode === "filter" || cmode === "copy")) { - throw("filter/copy received in tightPNG mode"); + return fail("filter/copy received in tightPNG mode"); } switch (cmode) { @@ -1489,9 +1504,8 @@ case "fill": ws.rQshift8(); // shift off ctl color = ws.rQshiftBytes(fb_depth); - FBU.imgQ.push({ + display.renderQ_push({ 'type': 'fill', - 'img': {'complete': true}, 'x': FBU.x, 'y': FBU.y, 'width': FBU.width, @@ -1509,14 +1523,13 @@ // clength[0] + ", clength[1]: " + clength[1]); ws.rQshiftBytes(1 + clength[0]); // shift off ctl + compact length img = new Image(); - //img.onload = scan_tight_imgQ; - FBU.imgQ.push({ + img.src = "data:image/" + cmode + + extract_data_uri(ws.rQshiftBytes(clength[1])); + display.renderQ_push({ 'type': 'img', 'img': img, 'x': FBU.x, 'y': FBU.y}); - img.src = "data:image/" + cmode + - extract_data_uri(ws.rQshiftBytes(clength[1])); img = null; break; case "filter": @@ -1550,32 +1563,13 @@ return ";base64," + Base64.encode(arr); }; -scan_tight_imgQ = function() { - var data, imgQ, ctx; - ctx = display.get_context(); - if (rfb_state === 'normal') { - imgQ = FBU.imgQ; - while ((imgQ.length > 0) && (imgQ[0].img.complete)) { - data = imgQ.shift(); - if (data.type === 'fill') { - display.fillRect(data.x, data.y, data.width, data.height, data.color); - } else if (data.type === 'rgb') { - display.blitRgbImage(data.x, data.y, data.width, data.height, data.img.data, 0); - } else { - display.drawImage(data.img, data.x, data.y); - } - } - setTimeout(scan_tight_imgQ, scan_imgQ_rate); - } -}; - encHandlers.TIGHT = function () { return display_tight(false); }; encHandlers.TIGHT_PNG = function () { return display_tight(true); }; encHandlers.last_rect = function last_rect() { - Util.Debug(">> set_desktopsize"); + //Util.Debug(">> last_rect"); FBU.rects = 0; - Util.Debug("<< set_desktopsize"); + //Util.Debug("<< last_rect"); return true; }; @@ -1597,7 +1591,7 @@ encHandlers.Cursor = function set_cursor() { var x, y, w, h, pixelslength, masklength; - //Util.Debug(">> set_cursor"); + Util.Debug(">> set_cursor"); x = FBU.x; // hotspot-x y = FBU.y; // hotspot-y w = FBU.width; @@ -1618,7 +1612,7 @@ FBU.bytes = 0; FBU.rects -= 1; - //Util.Debug("<< set_cursor"); + Util.Debug("<< set_cursor"); return true; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/ui.js new/noVNC-0.4/include/ui.js --- old/novnc-0.3/include/ui.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/ui.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -55,6 +55,7 @@ UI.initSetting('view_only', false); UI.initSetting('connectTimeout', 2); UI.initSetting('path', 'websockify'); + UI.initSetting('repeaterID', ''); UI.rfb = RFB({'target': $D('noVNC_canvas'), 'onUpdateState': UI.updateState, @@ -270,6 +271,7 @@ UI.updateSetting('view_only'); UI.updateSetting('connectTimeout'); UI.updateSetting('path'); + UI.updateSetting('repeaterID'); UI.updateSetting('stylesheet'); UI.updateSetting('logging'); @@ -313,6 +315,7 @@ UI.saveSetting('view_only'); UI.saveSetting('connectTimeout'); UI.saveSetting('path'); + UI.saveSetting('repeaterID'); UI.saveSetting('stylesheet'); UI.saveSetting('logging'); @@ -427,6 +430,7 @@ $D('noVNC_view_only').disabled = connected; $D('noVNC_connectTimeout').disabled = connected; $D('noVNC_path').disabled = connected; + $D('noVNC_repeaterID').disabled = connected; if (connected) { UI.setViewClip(); @@ -489,8 +493,10 @@ UI.rfb.set_shared(UI.getSetting('shared')); UI.rfb.set_view_only(UI.getSetting('view_only')); UI.rfb.set_connectTimeout(UI.getSetting('connectTimeout')); + UI.rfb.set_repeaterID(UI.getSetting('repeaterID')); UI.rfb.connect(host, port, password, path); + //Close dialog. setTimeout(UI.setBarPosition, 100); $D('noVNC_logo').style.display = "none"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/util.js new/noVNC-0.4/include/util.js --- old/novnc-0.3/include/util.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/util.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -57,6 +57,21 @@ }; } +// +// requestAnimationFrame shim with setTimeout fallback +// + +window.requestAnimFrame = (function(){ + return window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame || + function(callback){ + window.setTimeout(callback, 1000 / 60); + }; +})(); + /* * ------------------------------------------------------ * Namespaced in Util @@ -131,6 +146,8 @@ } } else if (type in {'integer':1, 'int':1}) { val = parseInt(val, 10); + } else if (type === 'str') { + val = String(val); } else if (type === 'func') { if (!val) { val = function () {}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/vnc.js new/noVNC-0.4/include/vnc.js --- old/novnc-0.3/include/vnc.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/vnc.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/web-socket-js/web_socket.js new/noVNC-0.4/include/web-socket-js/web_socket.js --- old/novnc-0.3/include/web-socket-js/web_socket.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/web-socket-js/web_socket.js 2012-09-15 00:00:56.000000000 +0200 @@ -5,7 +5,7 @@ (function() { - if (window.WebSocket) return; + if (window.WebSocket && !window.WEB_SOCKET_FORCE_FLASH) return; var console = window.console; if (!console || !console.log || !console.error) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/websock.js new/noVNC-0.4/include/websock.js --- old/novnc-0.3/include/websock.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/websock.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * Websock: high-performance binary WebSockets - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.txt) * * Websock is similar to the standard WebSocket object but Websock @@ -20,6 +20,11 @@ // Load Flash WebSocket emulator if needed +// To force WebSocket emulator even when native WebSocket available +//window.WEB_SOCKET_FORCE_FLASH = true; +// To enable WebSocket emulator debug: +//window.WEB_SOCKET_DEBUG=1; + if (window.WebSocket && !window.WEB_SOCKET_FORCE_FLASH) { Websock_native = true; } else if (window.MozWebSocket && !window.WEB_SOCKET_FORCE_FLASH) { @@ -28,9 +33,6 @@ } else { /* no builtin WebSocket so load web_socket.js */ - // To enable debug: - // window.WEB_SOCKET_DEBUG=1; - Websock_native = false; (function () { function get_INCLUDE_URI() { @@ -280,6 +282,8 @@ Util.Debug(">> WebSock.onopen"); if (websocket.protocol) { Util.Info("Server chose sub-protocol: " + websocket.protocol); + } else { + Util.Error("Server select no sub-protocol!: " + websocket.protocol); } eventHandlers.open(); Util.Debug("<< WebSock.onopen"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/include/webutil.js new/noVNC-0.4/include/webutil.js --- old/novnc-0.3/include/webutil.js 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/include/webutil.js 2012-09-15 00:00:56.000000000 +0200 @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin + * Copyright (C) 2012 Joel Martin * Licensed under LGPL-3 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/utils/launch.sh new/noVNC-0.4/utils/launch.sh --- old/novnc-0.3/utils/launch.sh 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/utils/launch.sh 2012-09-15 00:00:56.000000000 +0200 @@ -60,7 +60,7 @@ which netstat >/dev/null 2>&1 \ || die "Must have netstat installed" -netstat -ltn | grep -qs "${PORT}.*LISTEN" \ +netstat -ltn | grep -qs "${PORT} .*LISTEN" \ && die "Port ${PORT} in use. Try --listen PORT" trap "cleanup" TERM QUIT INT EXIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/utils/nova-novncproxy new/noVNC-0.4/utils/nova-novncproxy --- old/novnc-0.3/utils/nova-novncproxy 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/utils/nova-novncproxy 2012-09-15 00:00:56.000000000 +0200 @@ -30,9 +30,9 @@ from nova import context from nova import flags -from nova import rpc from nova import utils from nova.openstack.common import cfg +from nova.openstack.common import rpc opts = [ @@ -132,8 +132,7 @@ parser.error("SSL only and %s not found" % FLAGS.cert) # Setup flags - utils.default_flagfile() - FLAGS(sys.argv) + flags.parse_args(sys.argv) # Create and start the NovaWebSockets proxy server = NovaWebSocketProxy(listen_host=FLAGS.novncproxy_host, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/vnc.html new/noVNC-0.4/vnc.html --- old/novnc-0.3/vnc.html 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/vnc.html 2012-09-15 00:00:56.000000000 +0200 @@ -2,10 +2,11 @@ <html> <head> - <!-- + <!-- noVNC example: simple example using default UI - Copyright (C) 2011 Joel Martin - Licensed under LGPL-3 (see LICENSE.txt) + Copyright (C) 2012 Joel Martin + noVNC is licensed under the LGPL-3 (see LICENSE.txt) + This file is licensed under the 2-Clause BSD license (see LICENSE.txt). --> <title>noVNC</title> @@ -140,6 +141,7 @@ <li><input id="noVNC_view_only" type="checkbox"> View Only</li> <li><input id="noVNC_connectTimeout" type="input"> Connect Timeout (s)</li> <li><input id="noVNC_path" type="input" value="websockify"> Path</li> + <li><input id="noVNC_repeaterID" type="input" value=""> Repeater ID</li> <hr> <!-- Stylesheet selection dropdown --> <li><label><strong>Style: </strong> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novnc-0.3/vnc_auto.html new/noVNC-0.4/vnc_auto.html --- old/novnc-0.3/vnc_auto.html 2012-05-11 21:42:05.000000000 +0200 +++ new/noVNC-0.4/vnc_auto.html 2012-09-15 00:00:56.000000000 +0200 @@ -1,9 +1,10 @@ <!DOCTYPE html> <html> <!-- - noVNC Example: Automatically connect on page load. - Copyright (C) 2011 Joel Martin - Licensed under LGPL-3 (see LICENSE.txt) + noVNC example: simple example using default UI + Copyright (C) 2012 Joel Martin + noVNC is licensed under the LGPL-3 (see LICENSE.txt) + This file is licensed under the 2-Clause BSD license (see LICENSE.txt). Connect parameters are provided in query string: http://example.com/?host=HOST&port=PORT&encrypt=1&true_color=1 @@ -103,6 +104,7 @@ password = WebUtil.getQueryVar('password', ''); path = WebUtil.getQueryVar('path', 'websockify'); + if ((!host) || (!port)) { updateState('failed', "Must specify host and port in URL"); @@ -112,6 +114,7 @@ rfb = new RFB({'target': $D('noVNC_canvas'), 'encrypt': WebUtil.getQueryVar('encrypt', (window.location.protocol === "https:")), + 'repeaterID': WebUtil.getQueryVar('repeaterID', ''), 'true_color': WebUtil.getQueryVar('true_color', true), 'local_cursor': WebUtil.getQueryVar('cursor', true), 'shared': WebUtil.getQueryVar('shared', true), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
