From: Jason Stubbs <jstubbs@gentoo.org>
Date: Sun, 25 Dec 2005 07:42:00 +0000 (-0000)
Subject: Use the env's PROMPT_COMMAND for resetting xterm titles when available.
X-Git-Tag: v2.1_pre3~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b3131da61a07d55f06938378a6be38f9cbd69381;p=portage.git

Use the env's PROMPT_COMMAND for resetting xterm titles when available.
Otherwise use ${user}@${hostname}:${cwd}.

svn path=/main/trunk/; revision=2454
---

diff --git a/pym/output.py b/pym/output.py
index 69dcb5390..ec538f273 100644
--- a/pym/output.py
+++ b/pym/output.py
@@ -3,7 +3,7 @@
 # $Id: /var/cvsroot/gentoo-src/portage/pym/output.py,v 1.24.2.4 2005/04/17 09:01:55 jstubbs Exp $
 
 
-import os,sys,re
+import commands,os,sys,re
 
 havecolor=1
 dotitles=1
@@ -102,11 +102,12 @@ def xtermTitle(mystr):
 				sys.stderr.flush()
 				break
 
-def xtermTitleReset():
-	if havecolor and dotitles and os.environ.has_key("TERM"):
-		myt=os.environ["TERM"]
-		xtermTitle(os.environ["TERM"])
+prompt_command = os.getenv("PROMPT_COMMAND", 'echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"')
+default_xterm_title = commands.getoutput(prompt_command)
+del prompt_command
 
+def xtermTitleReset():
+	xtermTitle(default_xterm_title)
 
 def notitles():
 	"turn off title setting"