screenxtv 0.0.4 → 0.0.5

data/lib/screenxtv.rb

@@ -6,6 +6,11 @@ require 'json'
 require 'yaml'
 require 'optparse'
 require 'readline'
+require 'tempfile'
+
+
+
+
 
 if ENV['SCREENXTV_BROADCASTING']
   print "cannot broadcast inside broadcasting screen\n"
@@ -40,12 +45,10 @@ def kvconnect(host,port)
   socket
 end
 
-@sttyoption=`stty -g`
 def stop msg
   height,width=STDOUT.winsize
-  print "\e[?1l\e[>\e[1;#{height}r\e[#{height};1H"
-  system "stty "+@sttyoption
-  print msg+"\n"
+  print "\e[?1l\e[>\e[1;#{height}r\e[#{height};1H\e[K"
+  print msg+"\r\n"
   exit
 end
 
@@ -55,7 +58,7 @@ conf_scan=[
     key:"url",
     msg:"Create a new URL. If given \"foo\", your URL will be \"http://screenx.tv/foo\".",
     value:"",
-    match:/^[a-zA-Z0-9]*$/,
+    match:/^[_a-zA-Z0-9]*$/,
     errmsg:'You can use only alphabets, numbers and underscore.'
   },
   {key:"screen",value:"screenxtv"},
@@ -108,7 +111,7 @@ conf_scan.each do |item|
     end
   end
 end
-conf['url'].gsub! /[^a-zA-Z0-9_]/,""
+conf['url'].gsub! /[^_a-zA-Z0-9]/,""
 conf['color'].downcase!
 File.write conf_file,conf.to_yaml
 
@@ -138,6 +141,20 @@ print "Your url is http://screenx.tv/"+conf['url'].split("#")[0]+"\n\n";
 print "Press Enter to start broadcasting\n"
 readline
 
+screenrc=Tempfile.new("screenrc");
+begin
+  begin
+    File.open("#{ENV['HOME']}/.screenrc"){|file|
+      screenrc.write "#{file.read}\n"
+    }
+  rescue
+  end
+  screenrc.write "hardstatus alwayslastline 'http://screenx.tv/#{conf['url']}'\n"
+  screenrc.flush
+rescue
+end
+p ENV['SCREENRC']=screenrc.path
+
 Thread.new{
   begin
     loop do
@@ -149,7 +166,6 @@ Thread.new{
 }
 
 begin
-  system "stty raw"
   master,slave=PTY.open
   ENV['TERM']='vt100'
   ENV['LANG']='en_US.UTF-8'
@@ -160,11 +176,21 @@ begin
     socket.send 'winch',{width:width,height:height}.to_json
   }
   winsize.call
-  Signal.trap(:SIGWINCH){Thread.new{winsize.call}}
+  resized=false
+  Thread.new{
+    loop do
+      sleep 0.1
+      if resized
+        resized=false
+        winsize.call
+      end
+    end
+  }
+  Signal.trap(:SIGWINCH){resized=true}
   Signal.trap(:SIGCHLD){stop "broadcast end"}
   Thread.new{
     loop do
-      master.write STDIN.getc
+      master.write STDIN.getch
     end
   }
   while(data=master.readpartial 1024)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screenxtv
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console