--- cplay-original	2006-01-01 11:52:54.000000000 -0200
+++ cplay	2006-01-01 12:19:25.000000000 -0200
@@ -62,7 +62,7 @@
     def _(s): return s
 
 # ------------------------------------------
-XTERM = re.search("rxvt|xterm", os.environ["TERM"])
+XTERM = re.match("xterm|Eterm|aterm|rxvt|screen|kterm", os.environ["TERM"])
 CONTROL_FIFO = "/var/tmp/cplay_control"
 
 # ------------------------------------------
@@ -239,7 +239,9 @@
     def set_default_status(self, message):
         if self.current_message == self.default_message: self.status(message)
         self.default_message = message
-        XTERM and sys.stderr.write("\033]0;%s\a" % (message or "cplay"))
+        if XTERM:
+            sys.stderr.write("\033]0;%s\a" % (message or "cplay"))
+            sys.stderr.flush()
 
     def restore_default_status(self):
         self.status(self.default_message)
@@ -1416,7 +1418,9 @@
     def cleanup(self):
         try: curses.endwin()
         except curses.error: return
-        XTERM and sys.stderr.write("\033]0;%s\a" % "xterm")
+        if XTERM:
+            sys.stderr.write("\033]0;%s\a" % os.environ["TERM"])
+            sys.stderr.flush()
         tty and tty.tcsetattr(sys.stdin.fileno(), tty.TCSADRAIN, self.tcattr)
         print