X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/79ced6f1d611919e0068ac2e7e8855d873f9e677..da9ce2ab933917db7d4d59606ae6845d78f35a98:/webclient/rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index 8aeae37..ff78fc0 100644
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -1,26 +1,87 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+ reliable-chat - multipath chat
+ Copyright (C) 2012  Scott Worley <sworley@chkno.net>
+ Copyright (C) 2012  Jason Hibbs <skitch@gmail.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <head>
  <title>Reliable Chat</title>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/
-	html, body, #outer-table, #history { width: 99.9%; height: 100%; margin: 0; padding: 0 }
-	#status { background-color: #eef }
+	html, body {
+		width: 99.9%;
+		height: 100%;
+		margin: 0;
+		padding: 0;
+		background-color: #293134;
+		color: silver;
+		font-family: monospace;
+	}
+	#container {
+		height: 100%;
+	}
+	#status {
+		width: 100%;
+		text-align: right;
+		background-color: #293134;
+		padding: 5px 5px 5px 0px;
+	}
+	#client {
+		width: 98.5%;
+		padding: 0px 0px 0px 5px;
+		height: 50px;
+		position: fixed;
+		bottom: 0;
+	}
+	#input {
+		width: 100%;
+		background-color: #293134;
+	}
 	#say { width: 100% }
-	#history { vertical-align: bottom }
+	#history {
+		padding: 0px 5px 55px 5px;
+		vertical-align: bottom
+	}
 	img { width: 1px; height: 1px; }
 	iframe { display: none }
-	#status span { margin-right: 2em }
-	#status span.sad { background-color: #fee }
-	#status span.happy { background-color: #efe }
+	#status span { margin-right: 10px; }
+	#status span.sad {
+		background-color: #f00;
+		color: #fff;
+		border: 1px solid black;
+		border-radius: 5px;
+		padding-left: 5px;
+		padding-right: 5px;
+	}
+	#status span.happy {
+		background-color: #0f0;
+		color: #000;
+		border: 1px solid black;
+		border-radius: 5px;
+		padding-left: 5px;
+		padding-right: 5px;
+	}
   /*]]>*/--></style>
   <script type="text/javascript"><!--//--><![CDATA[//><!--
 	var servers = ['chkno.net', 'rc2.chkno.net', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
 
-	var session = Math.random();
-	var since = {};
-	var seen = {};
+	var session = Math.random();  // For outgoing message IDs
+	var since = {};  // server -> time: For fetch?since=
+	var seen = {};  // seen_key -> true
 
 	function rcnick() {
 		var nick = localStorage.getItem("nick");
@@ -91,7 +152,6 @@
 						var messages = JSON.parse(rtxt);
 						if (messages != null) {
 							rcreceivemessages(server, messages);
-							window.parent.postMessage(rtxt, "*");
 							delay = 40;
 							if (messages.length >= 1 && "Time" in messages[messages.length-1]) {
 								since[server] = messages[messages.length-1]["Time"];
@@ -119,9 +179,6 @@
 			status_indicator.setAttribute("class", "sad");
 			document.getElementById("status").appendChild(status_indicator);
 		}
-		if (rcnick() == 'anonymous') {
-			rcaddmessagetohistory("-!- Set your nick with /nick");
-		}
 	}
 
 	function rcsend(d, message) {
@@ -138,30 +195,28 @@
 		}
 	}
 
+	function rcinput(input) {
+		var message;
+		var re = /^\/([a-z]+) (.*)/
+		var match = re.exec(input);
+		if (match && match[1] == 'me') {
+			message = "* " + rcnick() + "  " + match[2];
+		} else if (match && match[1] == 'nick') {
+			message = "*** " + rcnick() + " is now known as " + match[2];
+			rcsetnick(match[2]);
+		} else {
+			message = "<" + rcnick() + "> " + input;
+		}
+
+		var d = rcaddmessagetohistory(message);
+		rcsend(d, message);
+	}
+
 	function rckeydown(event) {
 		if (event.keyCode == 13) {
-			var input = document.input.say.value;
+			rcinput(document.input.say.value);
 			document.input.say.value = "";
 			
-			// Check nick change
-			var message;
-			var re = /^\/nick (.*)/;
-			var match = re.exec(input);
-			if (match) {
-				message = "*** " + rcnick() + " is now known as " + match[1];
-				rcsetnick(match[1]);
-			} else {
-				message = "<" + rcnick() + "> " + input;
-			}
-
-			// Say the message
-			var d = rcaddmessagetohistory(message);
-			rcsend(d, message);
-
-			// Remind people to set their nick
-			if (rcnick() == 'anonymous') {
-				rcaddmessagetohistory("-!- Set your nick with /nick");
-			}
 		}
 	}
   //--><!]]></script>
@@ -169,12 +224,15 @@
 </head>
 
 <body onload="rcconnect()">
-	<table id="outer-table">
-		<tr><td id="history"></td></tr>
-		<tr><td id="status">&nbsp;</td></tr>
-		<tr><td><form name="input" onsubmit="return false" autocomplete="off">
-			<input id="say" onkeydown="return rckeydown(event)" autocomplete="off"></input>
-			</form></td></tr>
-	</table>
+	<div id="container">
+		<div id="history"></div>
+		<div id="client">
+			<div id="input">
+				<form name="input" onsubmit="return false" autocomplete="off">
+					<input id="say" onkeydown="return rckeydown(event)" autocomplete="off" autofocus="autofocus"></input>
+				</form></div>
+			<div id="status">&nbsp;</div>
+		</div>
+	</div>
 </body>
 </html>