From 526b6c23fc83c86dd9f97f2cef72dbce29efbf4f Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Thu, 16 Jan 2014 18:28:48 +0100 Subject: [PATCH] Minor fixes commited from wsterm :) --- app/routes.py | 2 +- app/static/coffees/main.coffee | 2 +- app/static/sass/main.sass | 6 +++++- app/static/stylesheets/main.css | 7 ++++++- serve.py | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/routes.py b/app/routes.py index ae04666..c060aa0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -42,7 +42,7 @@ class TermWebSocket(Route, tornado.websocket.WebSocketHandler): env["TERM"] = "xterm" env["COLORTERM"] = "wsterm" command = os.getenv('SHELL') - env["SHELL"] = command[0] + env["SHELL"] = command p = Popen(command, env=env) p.wait() self.log.info('Exiting...') diff --git a/app/static/coffees/main.coffee b/app/static/coffees/main.coffee index 1d6d4a0..ccf4aeb 100644 --- a/app/static/coffees/main.coffee +++ b/app/static/coffees/main.coffee @@ -11,7 +11,7 @@ $ -> screenKeys: true ) term.on "data", (data) -> - ws.send 'SH|' + data + ws.send 'SH|' + data term.on "title", (title) -> document.title = title diff --git a/app/static/sass/main.sass b/app/static/sass/main.sass index 2c8a427..f1ade76 100644 --- a/app/static/sass/main.sass +++ b/app/static/sass/main.sass @@ -15,6 +15,10 @@ body .terminal /* margin: .5em flex: 1 - font-family: monospace + font-family: 'Droid Sans Mono', monospace outline: none color: $fg + + .terminal-cursor + color: $bg + background-color: $fg diff --git a/app/static/stylesheets/main.css b/app/static/stylesheets/main.css index 87b0b32..6f50cd4 100644 --- a/app/static/stylesheets/main.css +++ b/app/static/stylesheets/main.css @@ -17,7 +17,12 @@ body main { body main .terminal { /* margin: .5em */ flex: 1; - font-family: monospace; + font-family: "Droid Sans Mono", monospace; outline: none; color: #cccccc; } +/* line 22, ../sass/main.sass */ +body main .terminal-cursor { + color: #222222; + background-color: #cccccc; +} diff --git a/serve.py b/serve.py index cab20e9..5111710 100644 --- a/serve.py +++ b/serve.py @@ -10,7 +10,7 @@ import tornado.options import tornado.ioloop tornado.options.define("secret", default='secret', help="Secret") -tornado.options.define("debug", default=True, help="Debug mode") +tornado.options.define("debug", default=False, help="Debug mode") tornado.options.define("host", default='wsterm.l', help="Server host") tornado.options.define("port", default=11112, type=int, help="Server port")