Re: I wish....

[Tom Tromey <tromey at redhat dot com>]

Fernando> I believe Larry Smith has just fixed that.  If you get the
Fernando> current sources (or wait for gdb/insight 5.1) you'll get the
Fernando> vertical scrollbar and text will wrap around correctly.

Interesting -- I missed that.

Two nits on that code:

1. Choosing `wrap text in console window' in the global preferences
dialog doesn't affect an existing console window.  Instead you have to
close the console and reopen it.  That's a bit annoying.  Is there
some larger plan covering this decision?  I'm generally in favor of
"hot" GUIs, which update in place in response to user requests.  This
takes more work to implement, but I find it nicer as a user.

2. Console::_build_win chooses `-wrap word' for the underlying text
widget.  I think `char' would be more natural.  I expect the console
to work more or less like a terminal.  With word wrap enabled, the
console occasionally makes strange choices about where to place line
breaks.

Weirdly, #1 seems hard to implement.  Options in the global preference
window directly manipulate the underlying preference values.  This
rules out the obvious implementation of adding a preference hook to
the console window which dynamically tracks the underlying options.
(I actually think this is a bug in the preference window.)

Here's a patch that makes these changes.  However, until the
preference window is fixed I think the hook code in the constructor
and the destructor should be commented out, along with a comment
explaining why.

Comments?

2000-12-02  Tom Tromey  <tromey@redhat.com>

	* console.ith (_set_wrap): Declare.
	(_update_option): Likewise.
	* console.itb (Console::constructor): Install preference hooks.
	(Console::destructor): Remove preference hooks.
	(Console::_set_wrap): New method.
	(Console::_update_option): New method.
	(Console::_build_win): Use _set_wrap.

Tom

Index: console.itb
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/library/console.itb,v
retrieving revision 1.4
diff -u -r1.4 console.itb
--- console.itb	2000/11/01 22:15:37	1.4
+++ console.itb	2000/12/02 23:25:19
@@ -22,6 +22,12 @@
   add_hook gdb_busy_hook [list $this busy]
   add_hook gdb_idle_hook [list $this idle]
   add_hook gdb_no_inferior_hook [list $this idle]
+
+  foreach option {gdb/console/wrap gdb/console/prompt_fg \
+		    gdb/console/error_fg gdb/console/font} {
+    pref add_hook $option [code $this _update_option]
+  }
+
   set gdbtk_state(console) $this
 }
 
@@ -31,26 +37,20 @@
   remove_hook gdb_busy_hook [list $this busy]
   remove_hook gdb_idle_hook [list $this idle]
   remove_hook gdb_no_inferior_hook [list $this idle]
-}
-  
-body Console::_build_win {} {
-  set wrap [pref get gdb/console/wrap]
 
-  if { $wrap } {
-    set hsm none
-  } else {
-    set hsm dynamic
+  foreach option {gdb/console/wrap gdb/console/prompt_fg \
+		    gdb/console/error_fg gdb/console/font} {
+    pref remove_hook $option [code $this _update_option]
   }
-  iwidgets::scrolledtext $itk_interior.stext -hscrollmode $hsm \
+}
+
+body Console::_build_win {} {
+  iwidgets::scrolledtext $itk_interior.stext \
     -vscrollmode dynamic -textbackground white
 
   set _twin [$itk_interior.stext component text]
 
-  if {$wrap} {
-    $_twin configure -wrap word
-  } else {
-    $_twin configure -wrap none
-  }
+  _set_wrap [pref get gdb/console/wrap]
 
   $_twin tag configure prompt_tag -foreground [pref get gdb/console/prompt_fg]
   $_twin tag configure err_tag -foreground [pref get gdb/console/error_fg]
@@ -613,4 +613,44 @@
 body Console::_reset_tab {} {
   bind $_twin <KeyPress> {}
   set _saw_tab 0
+}
+
+
+# ------------------------------------------------------------------
+#  METHOD:  _set_wrap - Set wrap mode
+# ------------------------------------------------------------------
+body Console::_set_wrap {wrap} {
+  if { $wrap } {
+    set hsm none
+    set wv char
+  } else {
+    set hsm dynamic
+    set wv none
+  }
+
+  $itk_interior.stext configure -hscrollmode $hsm
+  $_twin configure -wrap $wv
+}
+
+# ------------------------------------------------------------------
+#  METHOD:  _update_option - Update in response to preference change
+# ------------------------------------------------------------------
+body Console::_update_option {name value} {
+  switch -- $name {
+    gdb/console/wrap {
+      _set_wrap $value
+    }
+
+    gdb/console/prompt_fg {
+      $_twin tag configure prompt_tag -foreground $value
+    }
+
+    gdb/console/error_fg {
+      $_twin tag configure err_tag -foreground $value
+    }
+
+    gdb/console/font {
+      $_twin configure -font $value
+    }
+  }
 }
Index: console.ith
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/library/console.ith,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 console.ith
--- console.ith	2000/02/07 00:19:42	1.1.1.1
+++ console.ith	2000/12/02 23:25:19
@@ -61,5 +61,7 @@
     method _search_history {}
     method _rsearch_history {}
     method _setprompt {{prompt {}}}
+    method _set_wrap {wrap}
+    method _update_option {name value}
   }
 }