--- /usr/local/src/cdplayer-2.1/src/tkcd.in	Thu May 18 13:55:23 1995
+++ tkcd	Mon Mar 25 20:58:20 1996
@@ -557,8 +557,10 @@
     if {[fm_is_a_button $current_focus]} {
 	$current_focus configure -state normal
     }
-#   Use focus none to trigger any focus change events.    
-    focus none
+#   Use focus none to trigger any focus change events. 
+#   focus none   
+    focus [winfo parent $current_focus]
+    update
     focus $new_focus
 #   puts stdout $new_focus
     if {[fm_is_a_button $new_focus]} {
@@ -1483,7 +1485,8 @@
 #       It has a bad side-effect on dragging the scroll bar - any ideas?
 #
 #	puts "$save_focus $position"
-	focus none
+#	focus none
+	focus [winfo parent $save_focus]
 	update
 	focus $save_focus
     }
@@ -1692,6 +1695,11 @@
 
 #---- end inlined source of fm.tcl ----
 
+proc zap_leading_zero {str} {
+    regsub -all "^0(.)" $str "\\1" result
+    return $result
+}
+
 
 proc msg_warning {title message} {
     return [tk_dialog .tkcd_warn $title $message warning 0 "OK"]
@@ -2215,10 +2223,10 @@
 	   return
 	}
 #	puts "$track_secs"
-	set track_secs [expr [lindex $track_secs 0] * 60 +  [lindex $track_secs 1] + 1]
+	set track_secs [expr [lindex $track_secs 0] * 60 +  [string trimleft [lindex $track_secs 1] "0"] + 1]
 
 	set elapsed_secs [split $cd_status_elapsed ":"]
-	set elapsed_secs [expr [lindex $elapsed_secs 0] * 60 +  [lindex $elapsed_secs 1] + 1]
+	set elapsed_secs [expr [lindex $elapsed_secs 0] * 60 + [string trimleft [lindex $elapsed_secs 1] "0"] + 1]
 
 	set cd_status_elapsed [time_format [expr int($elapsed_secs / 60)] [expr int($elapsed_secs) % 60]]
 
@@ -2228,7 +2236,7 @@
         }
 
 	set total_elapsed_secs [split $cd_status_total_elapsed ":"]
-	set total_elapsed_secs [expr [lindex $total_elapsed_secs 0] * 60 +  [lindex $total_elapsed_secs 1] + 1]
+	set total_elapsed_secs [expr [lindex $total_elapsed_secs 0] * 60 +  [string trimleft [lindex $total_elapsed_secs 1] "0"] + 1]
 	set cd_status_total_elapsed [time_format [expr int($total_elapsed_secs / 60)] [expr int($total_elapsed_secs) % 60]]
     }