From c48beaa1c666a98631c744c40fe60f4bed8a3244 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 4 Jan 2013 22:10:59 +0000
Subject: [PATCH] Small adjustments and bug fixes in xorriso-tcltk

---
 libisoburn/trunk/frontend/xorriso-tcltk      | 37 +++++++++-----------
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/libisoburn/trunk/frontend/xorriso-tcltk b/libisoburn/trunk/frontend/xorriso-tcltk
index 18686226..84207587 100755
--- a/libisoburn/trunk/frontend/xorriso-tcltk
+++ b/libisoburn/trunk/frontend/xorriso-tcltk
@@ -66,7 +66,7 @@ proc print_usage {argv0} {
   puts stderr "     The log lines will be appended. Path \"-\" means stderr."
   puts stderr " --script_log_file path"
   puts stderr "     Set a file address for logging of major xorriso commands"
-  puts stderr "     and immediately enable this logging."
+  puts stderr "     and enable this logging."
   puts stderr "     The log lines will be appended. Path \"-\" means stderr."
   puts stderr ""
   puts stderr "If neither --stdio nor --named_pipes is given, then this script"
@@ -800,10 +800,11 @@ proc setup_xorriso {} {
   set cmd "$cmd -iso_rr_pattern off"
   set cmd "$cmd -disk_pattern off"
 
+  set cmd "$cmd -for_backup"
+  set cmd "$cmd -hardlinks off"
+  set cmd "$cmd -follow mount:limit=100"
+
   send_marked_cmd $cmd
-
-  send_marked_cmd [xorriso_loggable_init_cmds]
-
   inquire_severity_list
 }
 
@@ -2602,7 +2603,8 @@ proc browse_tree_populate {which_fs} {
   global browse_disk_window_var browse_iso_window_var
   global browse_iso_window_is_active browse_disk_window_is_active
   global extract_to_adr insert_from_adr burn_write_image_adr isodir_adr
-  global isomanip_move_target indev_adr outdev_adr
+  global isomanip_move_target indev_adr outdev_adr cmd_log_target
+  global debug_log_file execute_script_adr
 
   if {$which_fs == "isofs"} {
     if {$browse_iso_window_is_active == 0} {return ""}
@@ -2798,9 +2800,10 @@ proc browse_tree {adr_var which_fs} {
       scrollbar $w.treescroll_y_r -command "$w.tree yview"
       scrollbar $w.treescroll_x -orient horizontal -command "$w.tree xview "
       pack $w.tree -in $w.tree_frame_x -side top  -expand 1 -fill both
-      pack $w.treescroll_x -in $w.tree_frame_x -side top -fill x
-      pack $w.treescroll_y_l $w.tree_frame_x $w.treescroll_y_r \
-           -in $w.tree_frame -side left -expand 1 -fill both
+      pack $w.treescroll_x -in $w.tree_frame_x -side top  -expand 1 -fill x
+      pack $w.treescroll_y_l -in $w.tree_frame -side left -expand 1 -fill y
+      pack $w.tree_frame_x   -in $w.tree_frame -side left -expand 1 -fill both
+      pack $w.treescroll_y_r -in $w.tree_frame -side left -expand 1 -fill y
 
       frame $w.button_line
       button $w.accept -text "Accept" -width $tree_window_button_width \
@@ -2815,17 +2818,10 @@ proc browse_tree {adr_var which_fs} {
       button $w.down -text "Down" -width $tree_window_button_width \
                      -command "browse_tree_down $adr_var $w.tree $which_fs"
       bind_help $w.down "Down (browse tree)"
-      button $w.help -text "Help" -width $tree_window_button_width \
-                     -command {window_help "Browse tree" grey}
-      bind_help $w.help "Browse tree"
-      button $w.close -text "Close" -width $tree_window_button_width \
-                      -command "$destroy_cmd $w" \
-                      -background $button_color
-      bind_help $w.close "Close (browse tree)"
-      pack $w.up $w.down $w.accept $w.to_field $w.help $w.close \
+      pack $w.up $w.down $w.accept $w.to_field \
            -in $w.button_line -side left -expand 0
 
-      pack $w.tree_frame -side top -anchor w
+      pack $w.tree_frame -side top -anchor w -expand 1 -fill both
     } else {
       frame $w.button_line
       button $w.accept -text "Accept" -width $tree_window_button_width \
@@ -2843,7 +2839,7 @@ proc browse_tree {adr_var which_fs} {
     pack $w.help $w.close \
          -in $w.button_line -side left -expand 0
 
-    pack $w.button_line -side top -anchor w
+    pack $w.button_line -side top -anchor center
 
     frame $w.text_frame
     label $w.topic -text "[browse_tree_topic $adr_var]"
@@ -2885,7 +2881,7 @@ proc display_msg {msg} {
     if {[.msglist index end] > $msglist_max_fill} {
       .msglist delete 0 0
     }
-    .msglist insert end $msg
+    .msglist insert end [escape_newline $msg]
     .msglist see [expr "[.msglist index end]-1"]
     update idletasks
   }
@@ -3578,7 +3574,7 @@ proc init_msgbox {} {
   bind_help .msglist "message box"
   set msglist_running 1
   foreach i $pre_msglist {
-    display_msg $i
+    display_msg [escape_newline $i]
   }
   scrollbar .msgscroll -command ".msglist yview"
   pack .msglist   -in .msgbox -side left  -expand 1 -fill both
@@ -5391,6 +5387,7 @@ proc debug_log_puts {text} {
 
   if {$debug_logging == 1} {
     puts $debug_log_conn $text
+    flush $debug_log_conn
   }
 }
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 82c6530d..47e6484d 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2013.01.04.204305"
+#define Xorriso_timestamP "2013.01.04.221013"