From 856eac8d97c7e492ba137470a763de67f326ef6b Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Mon, 9 Sep 2013 14:23:42 +0900
Subject: [PATCH] update my_ps1_scale with stty

---
 bashrc  | 5 ++++-
 xinitrc | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/bashrc b/bashrc
index b1ac3bd..7f0aaaa 100755
--- a/bashrc
+++ b/bashrc
@@ -810,7 +810,10 @@ test -n "$SSH_CONNECTION" && __my_ps1_ssh_str="${__my_c5}SSH${__my_cdef} "
 
 __my_ps1_scale(){
     local last=$?
-    printf "${LINES}x${COLUMNS}"
+    if null type stty && ! iswindows
+    then
+        stty size | tr -d $'\n' | tr " " x
+    fi
     return $last
 }
 
diff --git a/xinitrc b/xinitrc
index 68f3893..4d2e6ba 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,7 +1,15 @@
+#!/bin/sh
+
 test -n "$DISPLAY" || return
 test -z "$ROXTERM_PID" || return
 test -z "$SSH_CONNECTION" || return
 
+case "$TERM" in
+    xterm*) return;;
+esac
+
+unset TMUX
+
 setxkbmap -layout "jp"
 test "`hostname`" == "arch-aspireone" &&
 setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first