insight/256: Breakpoint window should display breakpoint condition

[jon@beniston.com]

>Number:         256
>Category:       insight
>Synopsis:       Breakpoint window should display breakpoint condition
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    unassigned
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Mar 30 11:33:02 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     jon@beniston.com
>Release:        6.0
>Organization:
>Environment:
Cygwin
>Description:
The breakpoints window should display the breakpoint condition for conditional breakpoints.
>How-To-Repeat:
break file:line if cond
View/Breakpoints
>Fix:
The attached patch should be applied to gdb/gdbtk/library/bpwin.itb
>Release-Note:
>Audit-Trail:
>Unformatted:
----gnatsweb-attachment----
Content-Type: text/plain; name="bpwin.patch"
Content-Disposition: inline; filename="bpwin.patch"

--- bpwin.itb	2003-10-27 21:49:14.000000000 +0000
+++ /usr/local/excess/share/insight1.0/bpwin.itb	2004-03-30 12:15:41.218750000 +0100
@@ -74,23 +74,27 @@ itcl::body BpWin::build_win {} {
     -font global/fixed
   label $twin.func0 -text "Function" -relief raised -bd 2 -anchor center \
     -font global/fixed
+  label $twin.cond0 -text "Condition" -relief raised -bd 2 -anchor center \
+    -font global/fixed
 
   if {$tracepoints} {
     label $twin.pass0 -text "PassCount" -relief raised -borderwidth 2 \
       -anchor center -font global/fixed
-    grid x $twin.num0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 $twin.pass0 \
-      -sticky new
+    grid x $twin.num0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 \
+      $twin.cond0 $twin.pass0 -sticky new
   } else {
     if {$show_threads} {
-      grid x $twin.thread0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
-      # Let the File and Function columns expand; no others.
+      grid x $twin.thread0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 $twin.cond0 -sticky new
+      # Let the File, Function and Condition columns expand; no others.
       grid columnconfigure $twin 3 -weight 1
       grid columnconfigure $twin 5 -weight 1
+      grid columnconfigure $twin 6 -weight 1
     } else {
-      grid x $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
-      # Let the File and Function columns expand; no others.
+      grid x $twin.addr0 $twin.file0 $twin.line0 $twin.func0 $twin.cond0 -sticky new
+      # Let the File, Function and Condition columns expand; no others.
       grid columnconfigure $twin 2 -weight 1
       grid columnconfigure $twin 4 -weight 1
+      grid columnconfigure $twin 5 -weight 1
     }
   }
 
@@ -253,6 +257,7 @@ itcl::body BpWin::bp_add {bp_event {trac
   label $twin.file$i -text "$file " -relief flat -anchor w -font global/fixed 
   label $twin.line$i -text "[$bp_event get line] " -relief flat -anchor w -font global/fixed
   label $twin.func$i -text "[$bp_event get function] " -relief flat -anchor w -font global/fixed 
+  label $twin.cond$i -text "[$bp_event get condition] " -relief flat -anchor w -font global/fixed 
   if {$tracepoints} {
     label $twin.pass$i -text "[$bp_event get pass_count] " -relief flat -anchor w -font global/fixed
   }
@@ -270,14 +275,14 @@ itcl::body BpWin::bp_add {bp_event {trac
 
   if {$tracepoints} {
     grid $twin.en$i $twin.num$i $twin.addr$i $twin.file$i $twin.line$i \
-      $twin.func$i $twin.pass$i -sticky new -ipadx 4 -ipady 2
+      $twin.func$i $twin.cond$i $twin.pass$i -sticky new -ipadx 4 -ipady 2
   } else {
     if {$show_threads} {
       grid $twin.en$i $twin.thread$i $twin.addr$i $twin.file$i $twin.line$i \
-	$twin.func$i -sticky new -ipadx 4 -ipady 2
+	$twin.func$i $twin.cond$i -sticky new -ipadx 4 -ipady 2
     } else {
       grid $twin.en$i $twin.addr$i $twin.file$i $twin.line$i \
-	$twin.func$i -sticky new -ipadx 4 -ipady 2
+	$twin.func$i $twin.cond$i -sticky new -ipadx 4 -ipady 2
     }
   }
 
@@ -587,16 +592,18 @@ itcl::body BpWin::bp_delete {bp_event} {
     if { $number == $index_to_bpnum($i) } {
       if {$tracepoints} {
 	grid forget $twin.en$i $twin.num$i $twin.addr$i $twin.file$i \
-	  $twin.line$i $twin.func$i $twin.pass$i
+	  $twin.line$i $twin.func$i $twin.cond$i $twin.pass$i
 	destroy $twin.en$i $twin.num$i $twin.addr$i $twin.file$i \
-	  $twin.line$i $twin.func$i $twin.pass$i
+	  $twin.line$i $twin.func$i $twin.cond$i $twin.pass$i
       } else {
 	if {$show_threads} {
 	  grid forget $twin.thread$i
 	  destroy $twin.thread$i
 	}
-	grid forget $twin.en$i $twin.addr$i $twin.file$i $twin.line$i $twin.func$i
-	destroy $twin.en$i $twin.addr$i $twin.file$i $twin.line$i $twin.func$i
+	grid forget $twin.en$i $twin.addr$i $twin.file$i $twin.line$i $twin.func$i \
+	  $twin.cond$i
+	destroy $twin.en$i $twin.addr$i $twin.file$i $twin.line$i $twin.func$i \
+	  $twin.cond$i
       }
       if {$selected == $i} {
 	set selected 0