screenxtv 0.0.9 → 0.0.10

data/lib/screenxtv.rb

@@ -140,7 +140,7 @@ conf_scan=[
     match:/^[_a-zA-Z0-9]*$/,
     errmsg:'You can use only alphabets, numbers and underscore.'
   },
-  {key:"screen",value:"screenxtv"},
+  {key:"screen",value:"screenxtv_public"},
   {key:"screen_private",value:"screenxtv_private"},
   {
     key:"color",msg:"Terminal Color [BLACK/white/green/novel]",
@@ -253,7 +253,7 @@ File.write conf_file,conf.to_yaml
 info={
   'url'=>url,
   'authorized'=>conf['urlhash']==url+"/"+(conf['auth_key']||''),
-  'private'=>argv[:private] 
+  'private'=>argv[:private]
 }
 ENV['SCREENXTV_BROADCASTING']=info.to_json
 show_info(info)
@@ -269,6 +269,7 @@ begin
     }
   rescue
   end
+  screenrc.write "term xterm-256color\n"
   screenrc.write "hardstatus alwayslastline 'http://#{HOST}/#{url}'\n"
   screenrc.flush
 rescue
@@ -286,37 +287,58 @@ Thread.new{
 }
 
 begin
-  master,slave=PTY.open
-  ENV['TERM']='vt100'
   ENV['LANG']='en_US.UTF-8'
-  master.winsize=STDOUT.winsize
   screen_name=argv[:private] ? conf['screen_private'] : conf['screen']
-  rr,ww,pid = PTY::getpty("screen -x #{screen_name} -R",in:slave,out:master)
-  winsize=->{
-    height,width=master.winsize=rr.winsize=STDOUT.winsize
-    socket.send 'winch',{width:width,height:height}.to_json
-  }
-  winsize.call
-  resized=false
-  Thread.new{
-    loop do
-      sleep 0.1
-      if resized
-        resized=false
-        winsize.call
+  PTY::getpty "screen -x #{screen_name} -R" do |rr,ww|
+    winsize=->{
+      height,width=ww.winsize=rr.winsize=STDOUT.winsize
+      socket.send 'winch',{width:width,height:height}.to_json
+    }
+    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
+        ww.write STDIN.getch
+      end
+    }
+    data=''
+    while(data+=rr.readpartial 1024)
+      ncount=code=0
+      [4,data.length].min.times do
+        c=data[data.length-ncount-1]
+        code=c.ord
+        ncount+=1
+        break if code&0x80==0 or code&0x40!=0
+      end
+      if code&0x80==0 or code&0x40==0
+        ncount=0
+      elsif code&0x20==0
+        ncount=0 if ncount==2
+      elsif code&0x10==0
+        ncount=0 if ncount==3
+      elsif code&0x08==0
+        ncount=0 if ncount==4
+      elsif code&0x04==0
+        ncount=0 if ncount==5
+      elsif code&0x02==0
+        ncount=0 if ncount==6
+      end
+      odata=data[0,data.size-ncount]
+      print odata
+      socket.send 'data',odata
+      data=data[data.size-ncount,ncount]
     end
-  }
-  Signal.trap(:SIGWINCH){resized=true}
-  Signal.trap(:SIGCHLD){stop "broadcast end"}
-  Thread.new{
-    loop do
-      master.write STDIN.getch
-    end
-  }
-  while(data=master.readpartial 1024)
-    print data
-    socket.send 'data',data
   end
 rescue
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screenxtv
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json