From 1709ee3ab7e97f1587d0cd6b8291eb1de5aad951 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Wed, 28 Sep 2011 11:39:36 -0500
Subject: [PATCH] LICENSE.txt, docs/TODO: bring up to date.

- Add Orbitron info to LICENSE.txt

- Update TODO.
---
 LICENSE.txt | 10 +++++++---
 docs/TODO   | 54 ++++++++++-------------------------------------------
 2 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 389aac6d..e04046c0 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -5,25 +5,29 @@ 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:
+version 3 with the following exceptions (all LGPL compatible):
 
     include/input.js           : LGPL-2 or any later version
    
     include/base64.js          : Dual GPL-2 or LGPL-2.1
    
-    incluee/des.js             : Various BSD style licenses
+    include/des.js             : Various BSD style licenses
 
     include/web-socket-js/     : New BSD license. 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/
                                  Uses of the work must be attributed
                                  to the noVNC project.
 
-The LGPL-3 license text is included at:
+The LGPL-3 and OFL license texts are included at:
     docs/LICENSE.LGPL-3 and
     docs/LICENSE.GPL-3
+    docs/LICENSE.OFL-1.1
 
 Or alternatively the LGPL-3 license text may be found here:
     http://www.gnu.org/licenses/lgpl.html and
diff --git a/docs/TODO b/docs/TODO
index 9cb51be1..941e9e50 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,53 +1,19 @@
-Short Term:
+- Use requestAnimationFrame for frameBufferUpdate polling
 
-- Test normal arrays vs TypedArrays vs imageData arrays.
-    - Blog post about it.
+- Use WebSocket binary API when available.
 
-- VNC performance and regression playback suite.
-    - WebSockets
-        - expand latency test
-        - add absolute timers (every 500 packets)
-        - try 1 ms delay
-        - stop at 4000 packets
-        - small and large packets test
+- Scaling support
 
-    - JavaScript
-        - just base64 decode
-        - everything except Canvas
-
-    - Full test
-        - Without WebSockets
-        - With replay from python tester
-        - add higher-resolution multi test
-
-    - websockify test with echo and playback functionality
-      - choosen by client test page on connect
-
-
-- Keyboard layout/internationalization support
-    - convert keyCode into proper charCode
+---
 
 - IE 9 improvements.
     - https://github.com/gimite/web-socket-js/issues#issue/41
     - try window.atob instead of decode for better performance
 
-- Status bar menu/buttons:
-    - Explanatory hover text over buttons
+- 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
 
-    - Configuration menu:
-        - Tunable: speed vs. bandwidth selection
-        - Tunable: CPU use versus latency.
-        - Scaling
-
-    - Keyboard menu:
-        - Ctrl Lock, Alt Lock, SysRq Lock
-        - Highlight menu icon when keys are locked
-
-    - Clipboard button -> popup:
-        - text, clear and send buttons
-
-Medium Term:
-
-- Viewport support
-
-- Touchscreen testing/support.
+- zlib/tight support (even if slow)