Changeset 3038

Timestamp:

Jun 13, 2012 3:46:10 PM (12 years ago)

Author:

gah

Message:

intermediate updates for vtkcontourviewer

Location:

trunk

Files:

• configure (modified) (74 diffs)
• configure.in (modified) (1 diff)
• examples/zoo/Makefile.in (modified) (1 diff)
• gui/scripts/drawingentry.tcl (modified) (21 diffs)
• gui/scripts/images/hotspot_active.png (added)
• gui/scripts/images/hotspot_normal.png (added)
• gui/src/Makefile.in (modified) (1 diff)
• gui/src/RapptureGUI_Init.c (modified) (2 diffs)
• gui/src/RpCanvHotspot.c (modified) (40 diffs)

trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Rappture 1.1.
+# Generated by GNU Autoconf 2.69 for Rappture 1.1.
 #
 # Report bugs to <rappture@nanohub.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
@@ -137 +135 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
@@ -170 +193 @@
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
@@ -215 +239 @@
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-        # neutralization value for shells without unset; and this also
-        # works around shells that cannot unset nonexistent variables.
-        # Preserve -v and -x to the replacement shell.
-        BASH_ENV=/dev/null
-        ENV=/dev/null
-        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-        export CONFIG_SHELL
-        case $- in # ((((
-          *v*x* | *x*v* ) as_opts=-vx ;;
-          *v* ) as_opts=-v ;;
-          *x* ) as_opts=-x ;;
-          * ) as_opts= ;;
-        esac
-        exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
@@ -332 +360 @@
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
@@ -453 +489 @@
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -487 +527 @@
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
@@ -508 +548 @@
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-        case $1 in #(
-        -*)set "./$1";;
-        esac;
-        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-        ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
@@ -1269 +1289 @@
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1534 +1552 @@
   cat <<\_ACEOF
 Rappture configure 1.1
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
@@ -1767 +1785 @@
        } && test -s conftest$ac_exeext && {
          test "$cross_compiling" = yes ||
-         $as_test_x conftest$ac_exeext
+         test -x conftest$ac_exeext
        }; then :
   ac_retval=0
@@ -1880 +1898 @@
        } && test -s conftest$ac_exeext && {
          test "$cross_compiling" = yes ||
-         $as_test_x conftest$ac_exeext
+         test -x conftest$ac_exeext
        }; then :
   ac_retval=0
@@ -2184 +2202 @@
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
@@ -2200 +2219 @@
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
@@ -2226 +2246 @@
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
@@ -2242 +2263 @@
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
@@ -2276 +2298 @@
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
@@ -2349 +2372 @@
 
 It was created by Rappture $as_me 1.1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2799 +2822 @@
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-        if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+        if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
           if test $ac_prog = install &&
             grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
@@ -2873 +2896 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -2913 +2936 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -2972 +2995 @@
     for ac_prog in mkdir gmkdir; do
          for ac_exec_ext in '' $ac_executable_extensions; do
-           { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+           as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
            case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
              'mkdir (GNU coreutils) '* | \
@@ -3056 +3079 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -3096 +3119 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -3149 +3172 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -3190 +3213 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
@@ -3248 +3271 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -3292 +3315 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -3738 +3761 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
@@ -3852 +3874 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -3896 +3918 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -4105 +4127 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -4149 +4171 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -4456 +4478 @@
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
@@ -4522 +4544 @@
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
@@ -4959 +4981 @@
 
 else
-  as_fn_error $? "ncursers library missing?" "$LINENO" 5
+  as_fn_error $? "ncurses library missing?" "$LINENO" 5
 fi
 
@@ -5605 +5627 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7339 +7361 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7381 +7403 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7482 +7504 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MATLAB="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7524 +7546 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MATLAB="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7574 +7596 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MEX="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7614 +7636 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MEXEXT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7665 +7687 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MCC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7727 +7749 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_OCTAVE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7767 +7789 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MKOCTFILE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7854 +7876 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7914 +7936 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_mkoctfile2="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -7988 +8010 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8029 +8051 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XSUBPP="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8070 +8092 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8110 +8132 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XSUBPP="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8192 +8214 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8234 +8256 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8355 +8377 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8395 +8417 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8435 +8457 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8477 +8499 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8518 +8540 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8559 +8581 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8647 +8669 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8689 +8711 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8748 +8770 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8790 +8812 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -8840 +8862 @@
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -8925 +8947 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -10026 +10048 @@
 fi
 
+  for ac_func in sws_getCachedContext
+do :
+  ac_fn_cxx_check_func "$LINENO" "sws_getCachedContext" "ac_cv_func_sws_getCachedContext"
+if test "x$ac_cv_func_sws_getCachedContext" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_GETCACHEDCONTEXT 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in img_convert
+do :
+  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
+if test "x$ac_cv_func_img_convert" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IMG_CONVERT 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in sws_scale
+do :
+  ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
+if test "x$ac_cv_func_sws_scale" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_SCALE 1
+_ACEOF
+
+fi
+done
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10152 +10206 @@
 
 
-ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"
+ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -10562 +10616 @@
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
@@ -10631 +10685 @@
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-        case $1 in #(
-        -*)set "./$1";;
-        esac;
-        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-        ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
@@ -10674 +10716 @@
 ac_log="
 This file was extended by Rappture $as_me 1.1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10736 +10778 @@
 ac_cs_version="\\
 Rappture config.status 1.1
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
@@ -10830 +10872 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
@@ -10972 +11014 @@
     "examples/zoo/loader/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/loader/Makefile" ;;
     "examples/zoo/loader/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/loader/examples/Makefile" ;;
-    "examples/zoo/loadrun/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/loadrun/Makefile" ;;
     "examples/zoo/log/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/log/Makefile" ;;
     "examples/zoo/note/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/note/Makefile" ;;

trunk/configure.in

@@ -555 +555 @@
     examples/zoo/loader/Makefile
     examples/zoo/loader/examples/Makefile
-    examples/zoo/loadrun/Makefile
     examples/zoo/log/Makefile
     examples/zoo/note/Makefile

trunk/examples/zoo/Makefile.in

@@ -28 +28 @@
                 integer2 \
                 loader \
-                loadrun \
                 log \
                 note \

trunk/gui/scripts/drawingentry.tcl

@@ -70 +70 @@
     private method ScreenY { y } 
     private method XmlGet { path } 
+    private method XmlGetSubst { path } 
     private method Withdraw {} 
 }
@@ -227 +228 @@
     }
     # Coords
-    set xcoords [XmlGet $cpath.xcoords]
+    set xcoords [XmlGetSubst $cpath.xcoords]
     set xcoords [string trim $xcoords]
-    set ycoords [XmlGet $cpath.ycoords]
+    set ycoords [XmlGetSubst $cpath.ycoords]
     set ycoords [string trim $ycoords]
     if { $ycoords == "" } {
@@ -276 +277 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             set options($option) $value
         }
@@ -312 +313 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             set options($option) $value
         } elseif { [string match "controls*" $attr] } {
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             lappend _cname2controls($cname) $value
             $_owner xml put $value.hide 1
@@ -321 +322 @@
     }
     # Coordinates
-    set coords [XmlGet $cpath.coords]
+    set coords [XmlGetSubst $cpath.coords]
     set coords [ScreenCoords $coords]
     if { $coords == "" } {
@@ -360 +361 @@
     # Coords
     set coords {}
-    set coords [XmlGet $cpath.coords]
+    set coords [XmlGetSubst $cpath.coords]
     set coords [string trim $coords]
     if { $coords == "" } {
@@ -372 +373 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             set options($option) $value
         }
@@ -402 +403 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             set options($option) $value
         }
@@ -408 +409 @@
     # Coordinates
     set coords {}
-    set coords [XmlGet $cpath.coords]
+    set coords [XmlGetSubst $cpath.coords]
     set coords [string trim $coords]
     if { $coords == "" } {
@@ -433 +434 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             set options($option) $value
         }
     }
-    set contents [XmlGet $cpath.contents]
+    set contents [XmlGetSubst $cpath.contents]
     set img ""
     if { [string compare -length 5 $contents "file:"] == 0 } {
@@ -454 +455 @@
     }
     # Coordinates
-    set coords [XmlGet $cpath.coords]
+    set coords [XmlGetSubst $cpath.coords]
     set coords [ScreenCoords $coords]
     if { [llength $coords] == 2 } {
         foreach { x1 y1 } $coords break
-        set w [XmlGet $cpath.width]
+        set w [XmlGetSubst $cpath.width]
         if { $w == "" || ![string is number $w] || $w <= 0.0 } {
             set width [expr [image width $img] / 4]
@@ -464 +465 @@
             set width [expr [ScreenX $w] - [ScreenX 0]]
         }
-        set h [XmlGet $cpath.height]
+        set h [XmlGetSubst $cpath.height]
         if { $h == "" || ![string is number $h] || $h <= 0.0 } {
             set height [expr [image height $img] / 4]
@@ -528 +529 @@
     }
     # Coords
-    set coords [XmlGet $cpath.coords]
+    set coords [XmlGetSubst $cpath.coords]
     set coords [string trim $coords]
     if { $coords == "" } {
@@ -543 +544 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             set options($option) $value
         }
@@ -573 +574 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            set value [XmlGetSubst $cpath.$attr]
             set options($option) $value
         }
     }
     # Coordinates
-    set coords [XmlGet $cpath.coords]
+    set coords [XmlGetSubst $cpath.coords]
     set coords [string trim $coords]
     if { $coords == "" } {
@@ -594 +595 @@
     array set attr2option {
         "font"          "-font"
-        "color"         "-fill"
+        "color"         "-foreground"
         "text"          "-text"
         "anchor"        "-anchor"
@@ -604 +605 @@
         -font {Arial 8}
         -text {}
-        -fill black
+        -fill {}
         -anchor c
     }
@@ -610 +611 @@
         if { [info exists attr2option($attr)] } {
             set option $attr2option($attr)
-            set value [XmlGet $cpath.$attr]
+            if { $attr == "text" } {
+                set value [XmlGet $cpath.$attr]
+            } else {
+                set value [XmlGetSubst $cpath.$attr]
+            }
             set options($option) $value
         }
     }
     # Coords
-    set coords [XmlGet $cpath.coords]
+    set coords [XmlGetSubst $cpath.coords]
     set coords [string trim $coords]
     if { $coords == "" } {
@@ -623 +628 @@
     }
     set options(-tags) $cname
-    set id [eval $itk_component(drawing) create text $coords]
+    set img [Rappture::icon hotspot_normal]
+    set options(-image) $img
+    set img [Rappture::icon hotspot_active]
+    set options(-activeimage) $img
+    set id [eval $itk_component(drawing) create hotspot $coords]
     set _cname2id($cname) $id
     eval $itk_component(drawing) itemconfigure $id [array get options]
@@ -899 +908 @@
         }
         $_parser eval [list set $name $value]
+        set ::$name $value
     }
 }
@@ -907 +917 @@
         return $value
     }
+    return $value
+}
+
+itcl::body Rappture::DrawingEntry::XmlGetSubst { path } {
+    set value [$_owner xml get $path]
+    if { $_parser == "" } {
+        return $value
+    }
     return [$_parser eval [list subst -nocommands $value]]
 }
-
-#
-# Rewrite --
-#
-#       Rewrite string into list of text and substitution variables.
-#       Also break on new lines.
-#
-itcl::body Rappture::DrawingEntry::ApplySubstitutions { string } {
-    set cursor 0
-    set list {}
-    set lines [split $string \n]
-    foreach line $lines {
-        while 1 {
-            set index [string first \$ $line $cursor]
-            if { $index == -1 } {
-                # Take the rest of the line
-                lappend list "text" [string range $line $cursor end]
-                break
-            }
-            # Find the end of the variable 
-            incr cursor 
-            set c [string index $line $cursor]
-            if { $c != "{" } {
-                lappend list "text" "\$" 
-                continue
-            }
-            set index [string first "\}" $string $cursor]
-            if { $index == -1 } {
-                error "missing } character in variable substitution."
-            }
-            set varName [string range $string $cursor [expr $index - 1]]
-            set cursor [expr $index  + 1]
-            # Check that it's a substitution variable
-            if { ![info exists _name2path($varName)] } {
-                error "no substitution \"$varName\" found"
-            }
-            set path $_name2path($name)
-            set w [$_owner widgetfor $path]
-            if { $w != "" } {
-                set value [$w value]
-            } else {
-                set value ""
-            }
-            lappend list "subst" $value
-        }
-        lappend list "text" "\n"
-    }
-    return $list
-}

trunk/gui/src/Makefile.in

@@ -51 +51 @@
 OBJS            = \
                 RapptureGUI_Init.o \
+                RpCanvHotspot.o \
                 RpCanvPlacard.o \
                 RpDiffview.o \

trunk/gui/src/RapptureGUI_Init.c

@@ -23 +23 @@
 
 extern Tcl_AppInitProc Rappturegui_Init;
+extern Tcl_AppInitProc RpCanvHotspot_Init;
 extern Tcl_AppInitProc RpCanvPlacard_Init;
+extern Tcl_AppInitProc RpConvertDxToVtk_Init;
 extern Tcl_AppInitProc RpDiffview_Init;
 
@@ -48 +50 @@
         return TCL_ERROR;
     }
+    if (RpCanvHotspot_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
     return TCL_OK;
 }

trunk/gui/src/RpCanvHotspot.c

@@ -39 +39 @@
 #define VAR_FLAGS (TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS)
 
+#define REDRAW_PENDING          (1<<0)
+#define LAYOUT_PENDING          (1<<1)
+#define SUBST_PENDING           (1<<2)
+
+#undef ROUND
+#define ROUND(x)        ((int)(((double)(x)) + (((x)<0.0) ? -0.5 : 0.5)))
+
+#define IMAGE_PAD       3
+
 typedef struct _ItemSegment ItemSegment;
+typedef struct _HotspotItem HotspotItem;
 
 /*
@@ -46 +56 @@
  */
 struct _ItemSegment {
+    HotspotItem *itemPtr;
     ItemSegment *nextPtr;
     int type;                           /* Image, normal text, or substituted
                                          * text. */
-    short int x, y;                     /* Location of image or text on
-                                         * canvas. */
+    short int x, y;                     /* Location of segment on canvas. */
+    short int width, height;            /* Dimension of segment. */
     Tk_TextLayout layout;               /* Layout of normal or substituted 
                                          * text */
     int length;                         /* # of bytes in below string. */
     int lineNum;                        /* Line where segment if located. */
-    const char *subst;                  /* Substitututed text. */
-    const char text[1];
+    char *subst;                        /* Substitututed text. */
+    char text[1];
 };
 
@@ -62 +73 @@
  * Record for each hotspot item:
  */
-typedef struct HotspotItem  {
-    Tk_Item header;                     /* Generic stuff that's the same for
+struct _HotspotItem  {
+    Tk_Item base;                       /* Generic stuff that's the same for
                                          * all types.  MUST BE FIRST IN
                                          * STRUCTURE. */
+    unsigned int flags;
     Tcl_Interp *interp;                 /* Interp that owns this item */
+    Display *display;
     Tk_Window tkwin;                    /* Window that represents this
                                          * canvas */
@@ -88 +101 @@
                                          * (x,y) */
     XColor *textColor;                  /* Color for normal text */
-    XColor *substTextColor;             /* Color for substitututed text */
+    XColor *substColor;                 /* Color for substitututed text */
     XColor *outlineColor;               /* Color for outline of rectangle */
     Tk_3DBorder border;                 /* If non-NULL, background color of
@@ -99 +112 @@
     Tk_Font substFont;                  /* Font for drawing substituted text. */
 
-    int width;                          /* Fixed width for hotspot (0 = not
-                                         * set) */
-    int maxWidth;                       /* Maximum overall width for
-                                         * hotspot */
-    int padding;                        /* Padding around text and images */
-
     const char *imageName;              /* Name of normal hotspot image. */
     const char *activeImageName;        /* Name of active hotspot image. */
@@ -115 +122 @@
      * configuration settings above:
      */
-    Tk_Image image;                     /* Normal hotspot icon. */
-    Tk_Image activeImage;               /* Active hotspot icon. */
     GC normalGC;                        /* Graphics context for drawing
                                          * text. */
-    GC rectGC;                          /* Graphics context for rectangle
-                                         * outline. */
     GC substGC;                         /* GC for substituted text. */
+    GC outlineGC;                       /* GC for outline? */
     ItemSegment *firstPtr, *lastPtr;    /* List of hotspot segments. */
     int width, height;                  /* Dimension of bounding box. */
-} HotspotItem;
+    ItemSegment *activePtr;             /* Active segment. */
+    short int maxImageWidth, maxImageHeight;
+    int numLines;
+};
 
 /*
@@ -136 +143 @@
 static Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_STRING, "-activeimage", "activeImage", (char*)NULL, (char*)NULL, 
-        Tk_Offset(HotspotItem, activeImage), TK_CONFIG_NULL_OK},
+        Tk_Offset(HotspotItem, activeImageName), TK_CONFIG_NULL_OK},
     {TK_CONFIG_ANCHOR, "-anchor", "anchor", (char*)NULL,
         "center", Tk_Offset(HotspotItem, anchor),
         TK_CONFIG_DONT_SET_DEFAULT},
-    {TK_CONFIG_BORDER, "-background", "background", (char*)NULL,
+    {TK_CONFIG_BORDER, "-background", (char *)NULL, (char*)NULL,
         "", Tk_Offset(HotspotItem, border), TK_CONFIG_NULL_OK},
     {TK_CONFIG_PIXELS, "-borderwidth", "borderWidth", (char*)NULL,
         "0", Tk_Offset(HotspotItem, borderWidth), 0},
-    {TK_CONFIG_SYNONYM, "-fill", "background", (char *) NULL, (char *) NULL, 
-        0, 0},
+    {TK_CONFIG_BORDER, "-fill", (char *)NULL, (char*)NULL,
+        "", Tk_Offset(HotspotItem, border), TK_CONFIG_NULL_OK},
     {TK_CONFIG_FONT, "-font", "font", (char*)NULL,
-        "helvetica -12", Tk_Offset(HotspotItem, tkfont), 0},
+        "helvetica -12", Tk_Offset(HotspotItem, font), 0},
     {TK_CONFIG_COLOR, "-foreground", "foreground", (char*)NULL,
         "black", Tk_Offset(HotspotItem, textColor), 0},
     {TK_CONFIG_FONT, "-substitutionfont", (char*)NULL, (char*)NULL,
-        "helvetica -12", Tk_Offset(HotspotItem, substFont), TK_CONFIG_NULL_OK},
+        "courier -12", Tk_Offset(HotspotItem, substFont), 0},
     {TK_CONFIG_COLOR, "-substitutionforeground", (char*)NULL, (char*)NULL,
-        "black", Tk_Offset(HotspotItem, substTextColor), TK_CONFIG_NULL_OK},
+        "blue", Tk_Offset(HotspotItem, substColor), 0},
     {TK_CONFIG_STRING, "-image", (char*)NULL, (char*)NULL, (char*)NULL, 
-        Tk_Offset(HotspotItem, image), 0},
+        Tk_Offset(HotspotItem, imageName), 0},
     {TK_CONFIG_COLOR, "-outline", (char*)NULL, (char*)NULL,
         "", Tk_Offset(HotspotItem, outlineColor), TK_CONFIG_NULL_OK},
@@ -171 +178 @@
  * Prototypes for procedures defined in this file
  */
-static Tk_ItemCofigureProc ConfigureProc;
+static Tk_ItemConfigureProc ConfigureProc;
 static Tk_ItemCreateProc CreateProc;
 static Tk_ItemDeleteProc DeleteProc;
@@ -177 +184 @@
 static Tk_ItemScaleProc ScaleProc;
 static Tk_ItemTranslateProc TranslateProc;
-static Tk_ItemCoordsProc CoordsProc;
+static Tk_ItemCoordProc CoordsProc;
 static Tk_ItemAreaProc AreaProc;
 static Tk_ItemPointProc PointProc;
-static Tk_ItemPostscriptproc PostscriptProc;
+static Tk_ItemPostscriptProc PostscriptProc;
 
 static Tk_ImageChangedProc ImageChangedProc;
@@ -187 +194 @@
  * The structures below defines the canvas item type:
  */
-Tk_ItemType rpHotspotType = {
+static Tk_ItemType hotspotType = {
     "hotspot",                          /* name */
     sizeof(HotspotItem),                /* itemSize */
@@ -412 +419 @@
 } TkCanvas;
 
+/* Forward declarations. */
+static void ComputeBbox(HotspotItem *itemPtr);
+
+
+static void
+EventuallyRedraw(HotspotItem *itemPtr)
+{
+    if ((itemPtr->flags & REDRAW_PENDING) == 0) {
+        itemPtr->flags |= REDRAW_PENDING;
+        Tk_CanvasEventuallyRedraw(itemPtr->canvas, itemPtr->base.x1, 
+                itemPtr->base.y1, itemPtr->base.x2, itemPtr->base.y2);
+    }
+}
+
+static int
+GetCoordFromObj(Tcl_Interp *interp, HotspotItem *itemPtr, Tcl_Obj *objPtr, 
+                double *valuePtr)
+{
+    const char *string;
+
+    string = Tcl_GetString(objPtr);
+    return Tk_CanvasGetCoord(interp, itemPtr->canvas, string, valuePtr);
+}
+
+
+
+/*
+ *---------------------------------------------------------------------------
+ * 
+ * TraceVarProc --
+ *
+ *      This procedure is invoked when someone changes the state variable
+ *      associated with a radiobutton or checkbutton entry.  The entry's
+ *      selected state is set to match the value of the variable.
+ *
+ * Results:
+ *      NULL is always returned.
+ *
+ * Side effects:
+ *      The combobox entry may become selected or deselected.
+ *
+ *---------------------------------------------------------------------------
+ */
+static char *
+TraceVarProc(
+    ClientData clientData,              /* Information about the item. */
+    Tcl_Interp *interp,                 /* Interpreter containing variable. */
+    const char *name1,                  /* First part of variable's name. */
+    const char *name2,                  /* Second part of variable's name. */
+    int flags)                          /* Describes what just happened. */
+{
+    HotspotItem *itemPtr = clientData;
+
+    if (flags & TCL_INTERP_DESTROYED) {
+        return NULL;                    /* Interpreter is going away. */
+
+    }
+    /*
+     * If the variable is being unset, then re-establish the trace.
+     */
+    if (flags & TCL_TRACE_UNSETS) {
+        if (flags & TCL_TRACE_DESTROYED) {
+            Tcl_TraceVar(interp, name1, VAR_FLAGS, TraceVarProc, itemPtr);
+        }
+    }
+    itemPtr->flags |= SUBST_PENDING;
+    EventuallyRedraw(itemPtr);
+    return NULL;                        /* Done. */
+}
+
+/*
+ * ----------------------------------------------------------------------
+ *
+ * ImageChangedProc --
+ *
+ *      This procedure is invoked by the image code whenever the manager
+ *      for an image does something that affects the image's size or
+ *      how it is displayed.
+ *
+ * Results:
+ *      None.
+ *
+ * Side effects:
+ *      Arranges for the canvas to get redisplayed.
+ *
+ * ----------------------------------------------------------------------
+ */
+static void
+ImageChangedProc(clientData, x, y, width, height, imgWidth, imgHeight)
+    ClientData clientData;              /* Pointer to canvas item for image. */
+    int x, y;                           /* Upper left pixel (within image)
+                                         * that must be redisplayed. */
+    int width, height;                  /* Dimensions of area to redisplay
+                                         * (may be <= 0). */
+    int imgWidth, imgHeight;            /* New dimensions of image. */
+{      
+    HotspotItem *itemPtr = (HotspotItem *) clientData;
+    
+    itemPtr->flags |= LAYOUT_PENDING;
+    EventuallyRedraw(itemPtr);
+    return;
+}
+
+static void
+AddTextSegment(HotspotItem *itemPtr, const char *text, int length)
+{
+    ItemSegment *segPtr;
+
+    segPtr = (ItemSegment *)Tcl_Alloc(sizeof(ItemSegment) + length + 1);
+    memset(segPtr, 0, sizeof(ItemSegment) + length + 1);
+    segPtr->itemPtr = itemPtr;
+    segPtr->lineNum = itemPtr->numLines;
+    segPtr->type = SEGMENT_TYPE_TEXT;
+    strncpy(segPtr->text, text, length);
+    segPtr->text[length] = '\0';
+    segPtr->length = length;
+    segPtr->x = segPtr->y = 0;
+    segPtr->nextPtr = NULL;
+    if (itemPtr->firstPtr == NULL) {
+        itemPtr->firstPtr = segPtr;
+    }
+    if (itemPtr->lastPtr == NULL) {
+        itemPtr->lastPtr = segPtr;
+    } else {
+        itemPtr->lastPtr->nextPtr = segPtr;
+        itemPtr->lastPtr = segPtr;
+    }
+}
+
+static void
+AddVariableSegment(HotspotItem *itemPtr, const char *varName, int length)
+{
+    ItemSegment *segPtr;
+    Tcl_Interp *interp;
+
+    segPtr = (ItemSegment *)Tcl_Alloc(sizeof(ItemSegment) + length + 1);
+    memset(segPtr, 0, sizeof(ItemSegment) + length + 1);
+    segPtr->itemPtr = itemPtr;
+    segPtr->lineNum = itemPtr->numLines;
+    segPtr->type = SEGMENT_TYPE_VARIABLE;
+    memcpy(segPtr->text, varName, length);
+    segPtr->text[length] = '\0';
+    segPtr->length = length;
+    interp = itemPtr->substInterp;
+    if (interp == NULL) {
+        interp = itemPtr->interp;
+    }
+    Tcl_TraceVar(interp, varName, VAR_FLAGS, TraceVarProc, itemPtr);
+    segPtr->subst = NULL;
+    segPtr->x = segPtr->y = 0;
+    segPtr->nextPtr = NULL;
+    if (itemPtr->firstPtr == NULL) {
+        itemPtr->firstPtr = segPtr;
+    }
+    if (itemPtr->lastPtr == NULL) {
+        itemPtr->lastPtr = segPtr;
+    } else {
+        itemPtr->lastPtr->nextPtr = segPtr;
+        itemPtr->lastPtr = segPtr;
+    }
+}
+
+static void
+AddHotspotSegment(HotspotItem *itemPtr)
+{
+    ItemSegment *segPtr;
+
+    segPtr = (ItemSegment *)Tcl_Alloc(sizeof(ItemSegment));
+    memset(segPtr, 0, sizeof(ItemSegment));
+    segPtr->itemPtr = itemPtr;
+    segPtr->lineNum = itemPtr->numLines;
+    segPtr->type = SEGMENT_TYPE_HOTSPOT;
+    segPtr->text[0] = '\0';
+    segPtr->length = 0;
+    segPtr->x = segPtr->y = 0;
+    segPtr->nextPtr = NULL;
+    if (itemPtr->firstPtr == NULL) {
+        itemPtr->firstPtr = segPtr;
+    }
+    if (itemPtr->lastPtr == NULL) {
+        itemPtr->lastPtr = segPtr;
+    } else {
+        itemPtr->lastPtr->nextPtr = segPtr;
+        itemPtr->lastPtr = segPtr;
+    }
+}
+
+static void
+DestroySegment(ItemSegment *segPtr)
+{
+    HotspotItem *itemPtr;
+
+    itemPtr = segPtr->itemPtr;
+    if (segPtr->layout != NULL) {
+        Tk_FreeTextLayout(segPtr->layout);
+    }
+    if (segPtr->type == SEGMENT_TYPE_VARIABLE) {
+        Tcl_UntraceVar(itemPtr->interp, segPtr->text, VAR_FLAGS, TraceVarProc, 
+                itemPtr);
+    }
+    if (segPtr->subst != NULL) {
+        Tcl_Free((char *)segPtr->subst);
+    }
+    Tcl_Free((char *)segPtr);
+}
+
+static void
+DestroySegments(HotspotItem *itemPtr)
+{
+    ItemSegment *segPtr, *nextPtr;
+
+    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = nextPtr) {
+        nextPtr = segPtr->nextPtr;
+        DestroySegment(segPtr);
+    }
+    itemPtr->firstPtr = itemPtr->lastPtr = NULL;
+}
+
+static void
+DoSubst(HotspotItem *itemPtr)
+{
+    ItemSegment *segPtr;
+    Tcl_Interp *interp;
+
+    itemPtr->flags &= ~SUBST_PENDING;
+    interp = itemPtr->substInterp;
+    if (interp == NULL) {
+        interp = itemPtr->interp;
+    }
+    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = segPtr->nextPtr) {
+        const char *value;
+
+        if (segPtr->type != SEGMENT_TYPE_VARIABLE) {
+            continue;
+        }
+        value = Tcl_GetVar(interp, segPtr->text, TCL_GLOBAL_ONLY);
+        if (value == NULL) {
+            value = "???";
+        }
+        if (segPtr->subst != NULL) {
+            Tcl_Free((char *)segPtr->subst);
+        }
+        segPtr->subst = Tcl_Alloc(strlen(value) + 1);
+        strcpy(segPtr->subst, value);
+    }
+    itemPtr->flags |= LAYOUT_PENDING;
+}
+
+static void
+ComputeGeometry(HotspotItem *itemPtr)
+{
+    int x, y, w, h;
+    ItemSegment *segPtr;
+    int imgWidth, imgHeight;
+    int maxWidth, maxHeight;
+    Tk_Font tkFont;
+    int justify;
+    int wrapLength;
+    int flags;
+
+    justify = TK_JUSTIFY_LEFT;
+    wrapLength = 0;
+    flags = 0;
+    /* Collect the individual segment sizes. */
+    imgWidth = itemPtr->maxImageWidth + 2 * IMAGE_PAD;
+    imgHeight = itemPtr->maxImageHeight + 2 * IMAGE_PAD;
+    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = segPtr->nextPtr) {
+        if (segPtr->layout != NULL) {
+            Tk_FreeTextLayout(segPtr->layout);
+        }
+        switch (segPtr->type) {
+        case SEGMENT_TYPE_HOTSPOT:
+            w = imgWidth, h = imgHeight;
+            break;
+        case SEGMENT_TYPE_VARIABLE:
+            tkFont = (itemPtr->substFont != NULL) ? 
+                itemPtr->substFont : itemPtr->font;
+            segPtr->layout = Tk_ComputeTextLayout(tkFont, segPtr->subst, 
+                -1, wrapLength, justify, flags, &w, &h);
+            break;
+        case SEGMENT_TYPE_TEXT:
+            segPtr->layout = Tk_ComputeTextLayout(itemPtr->font, 
+                segPtr->text, -1, wrapLength, justify, flags, 
+                &w, &h);
+            break;
+        default:
+            Tcl_Panic("unknown hotspot segment type");
+        }
+        segPtr->width = w;
+        segPtr->height = h;
+#ifdef notdef
+        fprintf(stderr, "ComputeGeometry: item=(%s) segment=%x (%s) type=%d w=%d h=%d lineNum=%d nextPtr=%x\n",
+                itemPtr->text, segPtr, segPtr->text, segPtr->type, segPtr->width, 
+                segPtr->height, segPtr->lineNum, segPtr->nextPtr);
+#endif
+    }
+    /* Compute the relative positions of the segments. */
+    x = y = 0;
+    maxWidth = maxHeight = 0;
+    for (segPtr = itemPtr->firstPtr; segPtr != NULL; /*empty*/) {
+        int maxHeight, lineNum;
+        ItemSegment *startPtr;
+
+        maxHeight = 0;
+        lineNum = segPtr->lineNum;
+        startPtr = segPtr;
+        x = 0;
+        while ((segPtr != NULL) && (segPtr->lineNum == lineNum)) {
+            if (segPtr->height > maxHeight) {
+                maxHeight = segPtr->height;
+            }
+            segPtr->x = x;
+            x += segPtr->width;
+            segPtr = segPtr->nextPtr;
+        }
+        if (x > maxWidth) {
+            maxWidth = x;
+        }
+        segPtr = startPtr;
+        while ((segPtr != NULL) && (segPtr->lineNum == lineNum)) {
+            segPtr->y = y + (maxHeight - segPtr->height) / 2;
+            segPtr = segPtr->nextPtr;
+        }
+        y += maxHeight;
+    }
+    itemPtr->width = maxWidth;
+    itemPtr->height = y;
+}
+
+static int
+ParseDescription(Tcl_Interp *interp, HotspotItem *itemPtr, 
+                const char *description)
+{
+    const char *p, *start;
+
+    if (itemPtr->firstPtr != NULL) {
+        DestroySegments(itemPtr);
+    }
+    start = description;
+    itemPtr->numLines = 1;
+    for (p = description; *p != '\0'; p++) {
+        if ((p[0] == '$') && (p[1] == '{')) {
+            const char *varName;
+            const char *q;
+
+            if (p > start) {
+                /* Save the leading text. */
+                AddTextSegment(itemPtr, start, p - start);
+                start = p;
+            }
+            /* Start of substitution variable. */
+            varName = p + 2;
+            for (q = varName; q != '\0'; q++) {
+                if (*q == '}') {
+                    AddVariableSegment(itemPtr, varName, q - varName);
+                    AddHotspotSegment(itemPtr);
+                    p = q;
+                    start = p + 1;
+                    goto next;
+                }
+            }
+            Tcl_AppendResult(interp, "back variable specification in \"",
+                             description, "\"", (char *)NULL);
+            return TCL_ERROR;
+        } else if (p[0] == '\n') {
+            if (p > start) {
+                AddTextSegment(itemPtr, start, p - start);
+                start = p + 1;
+                itemPtr->numLines++;
+            }
+        }
+    next:
+        ;
+    }
+    if (p > start) {
+        /* Save the trailing text. */
+        AddTextSegment(itemPtr, start, p - start);
+    }
+    itemPtr->flags |= SUBST_PENDING;
+    return TCL_OK;
+}
 
 /*
@@ -437 +825 @@
 {
     HotspotItem *itemPtr = (HotspotItem *)canvItemPtr;
-    int i;
     double x, y;
+    Tk_Window tkwin;
 
     tkwin = Tk_CanvasTkwin(canvas);
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"",
-            Tk_PathName(tkwin), " create ", itemPtr->typePtr->name,
+            Tk_PathName(tkwin), " create ", canvItemPtr->typePtr->name,
             " x y ?options?\"", (char *)NULL);
         return TCL_ERROR;
@@ -454 +842 @@
     itemPtr->activeImage = NULL;
     itemPtr->activeImageName = NULL;
+    itemPtr->activePtr = NULL;
     itemPtr->anchor = TK_ANCHOR_CENTER;
     itemPtr->border = NULL;
@@ -459 +848 @@
     itemPtr->canvas = canvas;
     itemPtr->display = Tk_Display(tkwin);
+    itemPtr->firstPtr = NULL;
     itemPtr->font = NULL;
+    itemPtr->height = 0;
     itemPtr->image = NULL;
     itemPtr->imageName  = NULL;
     itemPtr->interp = interp;
+    itemPtr->lastPtr = NULL;
+    itemPtr->maxImageWidth = itemPtr->maxImageHeight = 0;
     itemPtr->normalGC = None;
+    itemPtr->numLines = 0;
     itemPtr->outlineColor = NULL;
     itemPtr->outlineGC = None;
     itemPtr->relief = TK_RELIEF_FLAT;
+    itemPtr->substColor = NULL;
     itemPtr->substFont = NULL;
     itemPtr->substGC = None;
     itemPtr->substInterp = interp;
-    itemPtr->substTextColor = NULL;
+    itemPtr->text = NULL;
     itemPtr->textColor = NULL;
     itemPtr->tkwin = tkwin;
     itemPtr->width = 0;
+    itemPtr->x = itemPtr->y = 0.0;
 
     /* Process the arguments to fill in the item record. */
-    if ((Tk_CanvasGetCoord(interp, canvas, objv[0], &x) != TCL_OK) ||
-        (Tk_CanvasGetCoord(interp, canvas, objv[1], &y) != TCL_OK)) {
-        DeleteProc(canvas, itemPtr, itemPtr->display);
+    if ((GetCoordFromObj(interp, itemPtr, objv[0], &x) != TCL_OK) ||
+        (GetCoordFromObj(interp, itemPtr, objv[1], &y) != TCL_OK)) {
+        DeleteProc(canvas, canvItemPtr, itemPtr->display);
         return TCL_ERROR;
     }
     itemPtr->x = x;
     itemPtr->y = y;
-    ComputeBbox(canvas, itemPtr);
+    ComputeBbox(itemPtr);
     if (ConfigureProc(interp, canvas, canvItemPtr, objc - 2, objv + 2, 0) 
         != TCL_OK) {
-        DeleteProc(canvas, itemPtr, itemPtr->display);
+        DeleteProc(canvas, canvItemPtr, itemPtr->display);
         return TCL_ERROR;
     }
@@ -520 +916 @@
 
         listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-        Tcl_ListObjAppendElement(interp, obj, Tcl_NewDoubleObj(itemPtr->x));
-        Tcl_ListObjAppendElement(interp, obj, Tcl_NewDoubleObj(itemPtr->y));
+        Tcl_ListObjAppendElement(interp, listObjPtr,
+                Tcl_NewDoubleObj(itemPtr->x));
+        Tcl_ListObjAppendElement(interp, listObjPtr,
+                Tcl_NewDoubleObj(itemPtr->y));
         Tcl_SetObjResult(interp, listObjPtr);
         return TCL_OK;
@@ -532 +930 @@
             return TCL_ERROR;
         }
-        if ((Tk_CanvasGetCoordFromObj(interp, canvas, elv[0], &x) != TCL_OK) || 
-            (Tk_CanvasGetCoordFromObj(interp, canvas, elv[1], &y) != TCL_OK)) {
+        if ((GetCoordFromObj(interp, itemPtr, elv[0], &x) != TCL_OK) || 
+            (GetCoordFromObj(interp, itemPtr, elv[1], &y) != TCL_OK)) {
             return TCL_ERROR;
         }
-    } else (objc == 3) {
-        if ((Tk_CanvasGetCoordFromObj(interp, canvas, objv[0], &x) != TCL_OK) ||
-            (Tk_CanvasGetCoordFromObj(interp, canvas, objv[1], &y) != TCL_OK)) {
+    } else if (objc == 3) {
+        if ((GetCoordFromObj(interp, itemPtr, objv[0], &x) != TCL_OK) ||
+            (GetCoordFromObj(interp, itemPtr, objv[1], &y) != TCL_OK)) {
             return TCL_ERROR;
         }
@@ -550 +948 @@
     itemPtr->x = x;
     itemPtr->y = y;
-    ComputeBbox(canvas, itemPtr);
+    ComputeBbox(itemPtr);
     return TCL_OK;
 }
@@ -597 +995 @@
     itemPtr->normalGC = newGC;
 
-    /* Rectangle GC */
-    mask = GCLineWidth | GCForeground;
-    gcValues.foreground = itemPtr->lineColor->pixel;
-    gcValues.line_width = 1;
-    newGC = Tk_GetGC(tkwin, mask, &gcValues);
-    if (itemPtr->rectGC != None) {
-        Tk_FreeGC(Tk_Display(tkwin), itemPtr->rectGC);
-    }
-    itemPtr->rectGC = newGC;
+    /* Outline GC */
+    if (itemPtr->outlineColor != NULL) {
+        mask = GCLineWidth | GCForeground;
+        gcValues.foreground = itemPtr->outlineColor->pixel;
+        gcValues.line_width = 1;
+        newGC = Tk_GetGC(tkwin, mask, &gcValues);
+        if (itemPtr->outlineGC != None) {
+            Tk_FreeGC(Tk_Display(tkwin), itemPtr->outlineGC);
+        }
+        itemPtr->outlineGC = newGC;
+    }
 
     /* Substituted text GC. */
@@ -614 +1014 @@
         gcValues.font = Tk_FontId(itemPtr->font);
     }
-    if (itemPtr->substTextColor != NULL) {
-        gcValues.foreground = itemPtr->substTextColor->pixel;
+    if (itemPtr->substColor != NULL) {
+        gcValues.foreground = itemPtr->substColor->pixel;
     } else {
         gcValues.foreground = itemPtr->textColor->pixel;
     }
     newGC = Tk_GetGC(tkwin, mask, &gcValues);
-    if (itemPtr->normalGC != None) {
+    if (itemPtr->substGC != None) {
         Tk_FreeGC(Tk_Display(tkwin), itemPtr->substGC);
     }
@@ -675 +1075 @@
     itemPtr->activeImage = tkImage;
 
-    Tk_SizeOfImage(itemPtr->image, &imgWidth, &ingHeight);
-
     if (itemPtr->text != NULL) {
-        ParseDescription(itemPtr, itemPtr->text);
-    }
-    ComputeBbox(canvas, itemPtr);
+        if (ParseDescription(interp, itemPtr, itemPtr->text) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
+    ComputeBbox(itemPtr);
     return TCL_OK;
 }
@@ -706 +1106 @@
         Tk_FreeColor(itemPtr->textColor);
     }
-    if (itemPtr->substTextColor != NULL) {
-        Tk_FreeColor(itemPtr->substTextColor);
+    if (itemPtr->substColor != NULL) {
+        Tk_FreeColor(itemPtr->substColor);
     }
     if (itemPtr->outlineColor != NULL) {
@@ -713 +1113 @@
     }
     if (itemPtr->text != NULL) {
-        Tcl_Free(itemPtr->text);
-    }
-    if (itemPtr->substText != NULL) {
-        Tcl_Free(itemPtr->substText);
+        Tcl_Free((char *)itemPtr->text);
     }
     if (itemPtr->imageName != NULL) {
-        Tcl_Free(itemPtr->imageName);
+        Tcl_Free((char *)itemPtr->imageName);
     }
     if (itemPtr->activeImageName != NULL) {
-        Tcl_Free(itemPtr->activeImageName);
+        Tcl_Free((char *)itemPtr->activeImageName);
     }
     if (itemPtr->image != NULL ) {
@@ -739 +1136 @@
         Tk_FreeGC(display, itemPtr->normalGC);
     }
-    if (itemPtr->rectGC != None) {
-        Tk_FreeGC(display, itemPtr->rectGC);
-    }
-    if (itemPtr->rectGC != None) {
-        Tk_FreeGC(display, itemPtr->rectGC);
+    if (itemPtr->outlineGC != None) {
+        Tk_FreeGC(display, itemPtr->outlineGC);
     }
     if (itemPtr->substGC != None) {
@@ -751 +1145 @@
 }
 
-/*
- * ------------------------------------------------------------------------
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * TranslateAnchor --
+ *
+ *      Translate the coordinates of a given bounding box based upon the
+ *      anchor specified.  The anchor indicates where the given xy position
+ *      is in relation to the bounding box.
+ *
+ *              nw --- n --- ne
+ *              |            |     x,y ---+
+ *              w   center   e      |     |
+ *              |            |      +-----+
+ *              sw --- s --- se
+ *
+ * Results:
+ *      The translated coordinates of the bounding box are returned.
+ *
+ *---------------------------------------------------------------------------
+ */
+static void
+TranslateAnchor(HotspotItem *itemPtr, int *xPtr, int *yPtr)
+{
+    int x, y;
+
+    x = *xPtr, y = *yPtr;
+    switch (itemPtr->anchor) {
+    case TK_ANCHOR_NW:          /* Upper left corner */
+        break;
+    case TK_ANCHOR_W:           /* Left center */
+        y -= (itemPtr->height / 2);
+        break;
+    case TK_ANCHOR_SW:          /* Lower left corner */
+        y -= itemPtr->height;
+        break;
+    case TK_ANCHOR_N:           /* Top center */
+        x -= (itemPtr->width / 2);
+        break;
+    case TK_ANCHOR_CENTER:      /* Centered */
+        x -= (itemPtr->width / 2);
+        y -= (itemPtr->height / 2);
+        break;
+    case TK_ANCHOR_S:           /* Bottom center */
+        x -= (itemPtr->width / 2);
+        y -= itemPtr->height;
+        break;
+    case TK_ANCHOR_NE:          /* Upper right corner */
+        x -= itemPtr->width;
+        break;
+    case TK_ANCHOR_E:           /* Right center */
+        x -= itemPtr->width;
+        y -= (itemPtr->height / 2);
+        break;
+    case TK_ANCHOR_SE:          /* Lower right corner */
+        x -= itemPtr->width;
+        y -= itemPtr->height;
+        break;
+    }
+    *xPtr = x;
+    *yPtr = y;
+}
+
+/*
+ * ------------------------------------------------------------------------
+ *
  *  ComputeBbox --
  *
- *    This procedure is invoked to compute the bounding box of
- *    all the pixels that may be drawn as part of a text item.
- *    In addition, it recomputes all of the geometry information
- *    used to display a text item or check for mouse hits.
+ *    This procedure is invoked to compute the bounding box of all the pixels
+ *    that may be drawn as part of a text item.  In addition, it recomputes
+ *    all of the geometry information used to display a text item or check for
+ *    mouse hits.
  *
  *  Results:
@@ -764 +1222 @@
  *
  *  Side effects:
- *    The fields x1, y1, x2, and y2 are updated in the header
+ *    The fields x1, y1, x2, and y2 are updated in the base structure
  *    for itemPtr, and the linePtr structure is regenerated
  *    for itemPtr.
+ *
  * ------------------------------------------------------------------------
  */
 static void
-ComputeBbox(Tk_Canvas canvas, HotspotItem *itemPtr)
-{
-    int leftX, topY, width, height, maxwidth, ellw, ellh;
-
-    /*
-     * Get the layout for the hotspot text.
-     */
-    itemPtr->textDrawChars = itemPtr->textNumChars;
-
-    Tk_FreeTextLayout(itemPtr->textLayout);
-    itemPtr->textLayout = Tk_ComputeTextLayout(itemPtr->tkfont,
-            itemPtr->text, itemPtr->textNumChars, -1,
-            TK_JUSTIFY_LEFT, 0, &width, &height);
-
-    itemPtr->textWidth = width;
-
-    if (itemPtr->textColor == NULL) {
-        width = height = 0;
+ComputeBbox(HotspotItem *itemPtr)
+{
+    int x, y;
+
+    x = ROUND(itemPtr->x);
+    y = ROUND(itemPtr->y);
+    TranslateAnchor(itemPtr,&x, &y);
+    itemPtr->base.x1 = x;
+    itemPtr->base.y1 = y;
+    itemPtr->base.x2 = x + itemPtr->width;
+    itemPtr->base.y2 = y + itemPtr->height;
+}
+
+static void 
+DrawSegment(ItemSegment *segPtr, Drawable drawable, int x, int y)
+{
+    HotspotItem *itemPtr;
+
+    itemPtr = segPtr->itemPtr;
+    if (segPtr->type == SEGMENT_TYPE_HOTSPOT) {
+        Tk_Image tkImage;
+        int w, h;
+
+        tkImage = NULL;
+        if (itemPtr->activePtr == segPtr) {
+            tkImage = itemPtr->activeImage;
+        }
+        if (tkImage == NULL) {
+            tkImage = itemPtr->image;
+        }
+        Tk_SizeOfImage(tkImage, &w, &h);
+        Tk_RedrawImage(tkImage, 0, 0, w, h, drawable, x + segPtr->x + IMAGE_PAD, 
+                y + segPtr->y + IMAGE_PAD);
     } else {
-        width += 2*itemPtr->padding;
-        height += 2*itemPtr->padding;
-    }
-
-    /*
-     * If the current value has an image, add on its width.
-     */
-    if (itemPtr->imageLeft) {
-        width += itemPtr->imageLeftW;
-        if (itemPtr->textWidth > 0) {
-            width += itemPtr->padding;
-        }
-        if (itemPtr->imageLeftH > height) {
-            height = itemPtr->imageLeftH;
-        }
-    }
-    if (itemPtr->imageRight) {
-        width += itemPtr->imageRightW;
-        if (itemPtr->textWidth > 0) {
-            width += itemPtr->padding;
-        }
-        if (itemPtr->imageRightH > height) {
-            height = itemPtr->imageRightH;
-        }
-    }
-
-    /*
-     * Add on extra size for the 3D border (if there is one).
-     */
-    if (itemPtr->borderWidth > 0) {
-        width += 2*itemPtr->borderWidth;
-        height += 2*itemPtr->borderWidth;
-    }
-
-    /*
-     * If the overall width exceeds the -maxwidth, then we must
-     * truncate the text to make it fit.
-     */
-    maxwidth = 0;
-    if (itemPtr->maxWidth > 0 && itemPtr->width > 0) {
-        maxwidth = (itemPtr->width < itemPtr->maxWidth) ? itemPtr->width : itemPtr->maxWidth;
-    } else if (itemPtr->maxWidth > 0) {
-        maxwidth = itemPtr->maxWidth;
-    } else if (itemPtr->width > 0) {
-        maxwidth = itemPtr->width;
-    }
-
-    if (maxwidth > 0 && width > maxwidth) {
-        Tk_SizeOfBitmap(Tk_Display(itemPtr->tkwin), itemPtr->dots, &ellw, &ellh);
-        width = maxwidth - 2*itemPtr->padding - 2*itemPtr->borderWidth - ellw;
-        if (itemPtr->imageLeft) {
-            width -= itemPtr->imageLeftW + itemPtr->padding;
-        }
-        if (itemPtr->imageRight) {
-            width -= itemPtr->imageRightW + itemPtr->padding;
-        }
-        if (width < 0) { width = 0; }
-
-        itemPtr->textDrawChars = Tk_MeasureChars(itemPtr->tkfont,
-            itemPtr->text, itemPtr->textNumChars, width, /*flags*/ 0,
-            &itemPtr->textWidth);
-
-        /* recompute layout for truncated text */
-        Tk_FreeTextLayout(itemPtr->textLayout);
-        itemPtr->textLayout = Tk_ComputeTextLayout(itemPtr->tkfont,
-                itemPtr->text, itemPtr->textDrawChars, -1,
-                TK_JUSTIFY_LEFT, 0, NULL, NULL);
-
-        width = maxwidth;  /* fit everything in this width */
-    }
-
-    /*
-     * If there's a fixed -width, then use that instead.
-     */
-    if (itemPtr->width > 0) {
-        width = itemPtr->width;
-    }
-
-    /*
-     * Use overall geometry information to compute the top-left corner
-     * of the bounding box for the text item.
-     */
-    leftX = (int) (itemPtr->x + 0.5);
-    topY = (int) (itemPtr->y + 0.5);
-    switch (itemPtr->anchor) {
-        case TK_ANCHOR_NW:
-        case TK_ANCHOR_N:
-        case TK_ANCHOR_NE:
-            break;
-
-        case TK_ANCHOR_W:
-        case TK_ANCHOR_CENTER:
-        case TK_ANCHOR_E:
-            topY -= height / 2;
-            break;
-
-        case TK_ANCHOR_SW:
-        case TK_ANCHOR_S:
-        case TK_ANCHOR_SE:
-            topY -= height;
-            break;
-    }
-    switch (itemPtr->anchor) {
-        case TK_ANCHOR_NW:
-        case TK_ANCHOR_W:
-        case TK_ANCHOR_SW:
-            break;
-
-        case TK_ANCHOR_N:
-        case TK_ANCHOR_CENTER:
-        case TK_ANCHOR_S:
-            leftX -= width / 2;
-            break;
-
-        case TK_ANCHOR_NE:
-        case TK_ANCHOR_E:
-        case TK_ANCHOR_SE:
-            leftX -= width;
-            break;
-    }
-
-    itemPtr->leftEdge  = leftX;
-    itemPtr->rightEdge = leftX + width;
-
-    /*
-     * Last of all, update the bounding box for the item.
-     */
-    itemPtr->header.x1 = leftX;
-    itemPtr->header.y1 = topY;
-    itemPtr->header.x2 = leftX + width;
-    itemPtr->header.y2 = topY + height;
+        GC gc;
+
+        gc = (segPtr->type == SEGMENT_TYPE_VARIABLE) ? 
+            itemPtr->substGC : itemPtr->normalGC;
+        Tk_DrawTextLayout(Tk_Display(itemPtr->tkwin), drawable, gc,
+                segPtr->layout, x + segPtr->x, y + segPtr->y, 0, -1);
+    }
 }
 
@@ -943 +1293 @@
 {
     HotspotItem *itemPtr = (HotspotItem *) canvItemPtr;
-    int imagew, delta, ellx, elly, ellw, ellh;
-    short drawableX, drawableY;
-    Tk_FontMetrics fm;
-
-    if (itemPtr->gcText == None) {
-        return;
-    }
-    Tk_CanvasDrawableCoords(canvas, (double)itemPtr->leftEdge,
-            (double)itemPtr->header.y1, &canvasX, &canvasY);
-
-    /*
-     * If there's a background rectangle, draw it first.
-     */
+    ItemSegment *segPtr;
+    short int cx, cy;
+
+    itemPtr->flags &= ~REDRAW_PENDING;
+    if (itemPtr->flags & SUBST_PENDING) {
+        DoSubst(itemPtr);
+    }
+    if (itemPtr->flags & LAYOUT_PENDING) {
+        ComputeGeometry(itemPtr);
+    }
+    Tk_CanvasDrawableCoords(canvas, itemPtr->x, itemPtr->y, &cx, &cy);
+    x = cx, y = cy;
+    TranslateAnchor(itemPtr, &x, &y);
+
     if (itemPtr->border != NULL) {
-        Tk_Fill3DRectangle(itemPtr->tkwin, drawable, itemPtr->border,
-            (int)canvasX, (int)canvasY,
-            (int)(itemPtr->rightEdge - itemPtr->leftEdge),
-            (int)(itemPtr->header.y2 - itemPtr->header.y1),
-            itemPtr->borderWidth, itemPtr->relief);
-    }
-
-    if (itemPtr->outline != NULL) {
-        XDrawRectangle(display, drawable, itemPtr->outlineGC,
-            (int)canvasX, (int)canvasY,
-            (unsigned int)(itemPtr->rightEdge - itemPtr->leftEdge - 1),
-            (unsigned int)(itemPtr->header.y2 - itemPtr->header.y1 - 1));
-    }
-
-    /*
-     * If there's a right-hand image, draw it first.
-     */
-    imagew = 0;
-    if (itemPtr->imageRight) {
-        Tk_CanvasDrawableCoords(canvas, (double)itemPtr->rightEdge,
-                (double)itemPtr->header.y1, &drawableX, &drawableY);
-
-        delta = (itemPtr->header.y2 - itemPtr->header.y1)/2 - itemPtr->imageRightH/2;
-        drawableX -= itemPtr->imageRightW + itemPtr->padding + itemPtr->borderWidth;
-        Tk_RedrawImage(itemPtr->imageRight, 0, 0,
-                       itemPtr->imageRightW, itemPtr->imageRightH,
-                       drawable,
-                       (int)drawableX, (int)(drawableY+delta));
-        imagew += itemPtr->imageRightW;
-    }
-
-    /*
-     * If there's a left-hand image, draw it next.
-     */
-    Tk_CanvasDrawableCoords(canvas, (double)itemPtr->leftEdge,
-            (double)itemPtr->header.y1, &drawableX, &drawableY);
-
-    drawableX += itemPtr->padding + itemPtr->borderWidth;
-    drawableY += itemPtr->padding + itemPtr->borderWidth;
-
-    if (itemPtr->imageLeft) {
-        delta = (itemPtr->header.y2 - itemPtr->header.y1)/2
-                       - itemPtr->imageLeftH/2 - itemPtr->padding
-                       - itemPtr->borderWidth;
-
-        Tk_RedrawImage(itemPtr->imageLeft, 0, 0,
-                       itemPtr->imageLeftW, itemPtr->imageLeftH,
-                       drawable,
-                       (int)drawableX, (int)(drawableY+delta));
-        drawableX += itemPtr->imageLeftW + itemPtr->padding;
-        imagew += itemPtr->imageLeftW;
-    }
-
-    /*
-     * Draw the text.
-     */
-    Tk_DrawTextLayout(display, drawable, itemPtr->gcText, itemPtr->textLayout,
-            drawableX, drawableY, 0, -1);
-
-    if (itemPtr->textDrawChars < itemPtr->textNumChars
-          && itemPtr->rightEdge - itemPtr->leftEdge - imagew > ellw) {
-        Tk_SizeOfBitmap(Tk_Display(itemPtr->tkwin), itemPtr->dots, &ellw, &ellh);
-        Tk_GetFontMetrics(itemPtr->tkfont, &fm);
-        ellx = drawableX+itemPtr->textWidth;
-        elly = drawableY+fm.ascent-1;
-
-        XSetClipMask(display, itemPtr->gcText, itemPtr->dots);
-        XSetClipOrigin(display, itemPtr->gcText, ellx, elly);
-
-        XCopyPlane(display, itemPtr->dots, drawable, itemPtr->gcText, 0, 0,
-            (unsigned int)ellw, (unsigned int)ellh, ellx, elly, 1);
-
-        XSetClipOrigin(display, itemPtr->gcText, 0, 0);
-        XSetClipMask(display, itemPtr->gcText, None);
+        Tk_Fill3DRectangle(itemPtr->tkwin, drawable, itemPtr->border, x, y, 
+                itemPtr->width, itemPtr->height, itemPtr->borderWidth, 
+                itemPtr->relief);
+    }
+    if (itemPtr->outlineColor != NULL) {
+        XDrawRectangle(display, drawable, itemPtr->outlineGC, x, y, 
+                itemPtr->width, itemPtr->height);
+    }
+    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = segPtr->nextPtr) {
+        fprintf(stderr, "Display: segment=(%s) type=%d x=%d y=%d (x=%d y=%d w=%d h=%d) lineNum=%d nextPtr=%x\n",
+                segPtr->text, segPtr->type, x, y, segPtr->x, segPtr->y,
+                segPtr->width, segPtr->height, segPtr->lineNum, segPtr->nextPtr);
+        DrawSegment(segPtr, drawable, x, y);
     }
 }
@@ -1039 +1329 @@
  *  PointProc --
  *
- *    Computes the distance from a given point to a given hotspot
- *    item, in canvas units.
+ *    Computes the distance from a given point to a given hotspot item, in
+ *    canvas units.
  *
  *  Results:
@@ -1057 +1347 @@
 {
     HotspotItem *itemPtr = (HotspotItem *)canvItemPtr;
-    double value, x1, y1, x2, y2, dx, dy;
-
-    x1 = itemPtr->header.x1;
-    y1 = itemPtr->header.y1;
-    x2 = itemPtr->header.x2;
-    y2 = itemPtr->header.y2;
-    if (pointPtr[0] < x0) {
-        dx = x0 - pointPtr[0];
-    } else if (pointPtr[0] >= x1)  {
-        dx = pointPtr[0] + 1 - x1;
+    double x1, y1, x2, y2, dx, dy;
+
+    x1 = itemPtr->x;
+    y1 = itemPtr->y;
+    x2 = itemPtr->x + itemPtr->width;
+    y2 = itemPtr->y + itemPtr->height;
+    if (pointPtr[0] < x1) {
+        dx = x1 - pointPtr[0];
+    } else if (pointPtr[0] >= x2)  {
+        dx = pointPtr[0] + 1 - x2;
     } else {
         dx = 0;
     }
-    if (pointPtr[1] < y0) {
-        dy = y0 - pointPtr[1];
-    } else if (pointPtr[1] >= y1)  {
-        dy = pointPtr[1] + 1 - y1;
+    if (pointPtr[1] < y1) {
+        dy = y1 - pointPtr[1];
+    } else if (pointPtr[1] >= y2)  {
+        dy = pointPtr[1] + 1 - y2;
     } else {
         dy = 0;
@@ -1103 +1393 @@
 {
     HotspotItem *itemPtr = (HotspotItem *)canvItemPtr;
-    int x0, y0, x1, y1;
-
-    if ((itemPtr->border != NULL) || itemPtr->lineColor) {
-        /* have a rectangle -- compare directly against that */
-        x0 = itemPtr->leftEdge;
-        y0 = itemPtr->header.y1;
-        x1 = itemPtr->rightEdge;
-        y1 = itemPtr->header.y2;
-    }
-    else if (itemPtr->imageLeft || itemPtr->imageRight) {
-        /* have images -- compare against a rectangle around image/text */
-        x0 = itemPtr->leftEdge + itemPtr->padding + itemPtr->borderWidth;
-        y0 = itemPtr->header.y1 + itemPtr->padding + itemPtr->borderWidth;
-        x1 = itemPtr->rightEdge - itemPtr->padding - itemPtr->borderWidth;
-        y1 = itemPtr->header.y2 - itemPtr->padding - itemPtr->borderWidth;
-    }
-    else {
-        /* have only text -- compare against text layout */
-        return Tk_IntersectTextLayout(itemPtr->textLayout,
-            (int) (rectPtr[0] + 0.5) - (itemPtr->leftEdge + itemPtr->padding + itemPtr->borderWidth),
-            (int) (rectPtr[1] + 0.5) - (itemPtr->header.y1 + itemPtr->padding + itemPtr->borderWidth),
-            (int) (rectPtr[2] - rectPtr[0] + 0.5),
-            (int) (rectPtr[3] - rectPtr[1] + 0.5));
-    }
-
-    /* compare against rectangle... */
-    if ((rectPtr[0] > x1) || (rectPtr[1] > y1) || 
-        (rectPtr[2] < x0) || (rectPtr[3] < y0)) {
-        return -1;                      /* completely outside */
-    }
-    if ((rectPtr[0] >= x0) && (rectPtr[1] >= y0) && 
-        (rectPtr[2] <= x1) && (rectPtr[3] <= y1)) {
-        return 1;                       /* completely inside */
-    }
-    return 0;                           /* must be overlapping */
+
+    /* Compare against bounding box... */
+    if ((rectPtr[0] > itemPtr->base.x2) || (rectPtr[1] > itemPtr->base.y2) || 
+        (rectPtr[2] < itemPtr->base.x1) || (rectPtr[3] < itemPtr->base.y1)) {
+        return -1;                      /* Completely outside. */
+    }
+    if ((rectPtr[0] >= itemPtr->base.x1) && (rectPtr[1] >= itemPtr->base.y1) && 
+        (rectPtr[2] <= itemPtr->base.x2) && (rectPtr[3] <= itemPtr->base.y2)) {
+        return 1;                       /* Completely inside. */
+    }
+    return 0;                           /* Must be overlapping */
 }
 
@@ -1163 +1429 @@
     HotspotItem *itemPtr = (HotspotItem *)canvItemPtr;
 
-    itemPtr->x = x + scaleX * (itemPtr->x - x);
-    itemPtr->y = y + scaleY * (itemPtr->y - y);
-    ComputeBbox(canvas, itemPtr);
+    itemPtr->x += scaleX * (itemPtr->x - x);
+    itemPtr->y += scaleY * (itemPtr->y - y);
+    ComputeBbox(itemPtr);
     return;
 }
@@ -1171 +1437 @@
 /*
  * ------------------------------------------------------------------------
+ *
  *  TranslateProc --
  *
@@ -1182 +1449 @@
  *    and the bounding box is updated in the generic part of the
  *    item structure.
+ *
  * ------------------------------------------------------------------------
  */
@@ -1191 +1459 @@
     itemPtr->x += dx;
     itemPtr->y += dy;
-    ComputeBbox(canvas, itemPtr);
+    ComputeBbox(itemPtr);
 }
 
@@ -1209 +1477 @@
  *  Side effects:
  *    None.
+ *
  * ------------------------------------------------------------------------
  */
@@ -1218 +1487 @@
     Tk_Window canvasWin = Tk_CanvasTkwin(canvas);
 
+#ifdef notdef
     int x, y;
     double xpos;
@@ -1230 +1500 @@
     }
 
-    if (Tk_CanvasPsFont(interp, canvas, itemPtr->tkfont) != TCL_OK) {
+    if (Tk_CanvasPsFont(interp, canvas, itemPtr->font) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -1247 +1517 @@
     if (itemPtr->imageLeft) {
       if(!prepass) {
-        delta = (itemPtr->header.y2 - itemPtr->header.y1)/2 - itemPtr->imageLeftH/2;
+        delta = (itemPtr->base.y2 - itemPtr->base.y1)/2 - itemPtr->imageLeftH/2;
         sprintf(buffer, "%.15g %.15g", xpos,
                 Tk_CanvasPsY(canvas, itemPtr->y+delta+2));
@@ -1280 +1550 @@
 
     if ( itemPtr->imageLeft ){
-      if (Tk_CanvasPsFont(interp, canvas, itemPtr->tkfont) != TCL_OK) {
+      if (Tk_CanvasPsFont(interp, canvas, itemPtr->font) != TCL_OK) {
         return TCL_ERROR;
       }
@@ -1313 +1583 @@
     justify = "0"; /* TK_JUSTIFY_LEFT */
 
-    Tk_GetFontMetrics(itemPtr->tkfont, &fm);
+    Tk_GetFontMetrics(itemPtr->font, &fm);
     sprintf(buffer, "] %d %g %g %s %s DrawText\n",
             fm.linespace, x / -2.0, y / 2.0, justify,
             "false" /* stipple */);
     Tcl_AppendResult(interp, buffer, (char *) NULL);
-
-    return TCL_OK;
-}
-
-/*
- * ----------------------------------------------------------------------
- *
- * ImageChangedProc --
- *
- *      This procedure is invoked by the image code whenever the manager
- *      for an image does something that affects the image's size or
- *      how it is displayed.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      Arranges for the canvas to get redisplayed.
- *
- * ----------------------------------------------------------------------
- */
-static void
-ImageChangedProc(clientData, x, y, width, height, imgWidth, imgHeight)
-    ClientData clientData;              /* Pointer to canvas item for image. */
-    int x, y;                           /* Upper left pixel (within image)
-                                         * that must be redisplayed. */
-    int width, height;                  /* Dimensions of area to redisplay
-                                         * (may be <= 0). */
-    int imgWidth, imgHeight;            /* New dimensions of image. */
-{      
-    HotspotItem *itemPtr = (HotspotItem *) clientData;
-    
-    ComputeGeometry(itemPtr);
-    Tk_CanvasEventuallyRedraw(itemPtr->canvas, itemPtr->header.x1, 
-        itemPtr->header.y1, itemPtr->header.x2, itemPtr->header.y2);
-    return;
-}
-
-static int
-AddTextSegment(HotspotItem *itemPtr, const char *text, int length)
-{
-    ItemSegment *segPtr;
-
-    segPtr = Tcl_Alloc(sizeof(ItemSegment) + length + 1);
-    if (segPtr == NULL) {
-        Tcl_Panic("can't allocate text segent for hotspot");
-    }
-    segPtr->itemPtr = itemPtr;
-    segPtr->lineNum = itemPtr->numLines;
-    segPtr->type = SEGMENT_TYPE_TEXT;
-    memcpy(segPtr->text, text, length);
-    segPtr->text[length] = '\0';
-    segPtr->length = length;
-    segPtr->x = segPtr->y = 0;
-    segPtr->nextPtr = NULL;
-    if (itemPtr->firstPtr == NULL) {
-        itemPtr->firstPtr = segPtr;
-    }
-    if (itemPtr->lastPtr == NULL) {
-        itemPtr->lastPtr = segPtr;
-    } else {
-        itemPtr->lastPtr->nextPtr = segPtr;
-    }
-}
-
-static int
-AddVariableSegment(HotspotItem *itemPtr, const char *varName, int length)
-{
-    ItemSegment *segPtr;
-    Tcl_Interp *interp;
-
-    segPtr = Tcl_Alloc(sizeof(ItemSegment) + length + 1);
-    if (segPtr == NULL) {
-        Tcl_Panic("can't allocate variable segent for hotspot");
-    }
-    segPtr->itemPtr = itemPtr;
-    segPtr->lineNum = itemPtr->numLines;
-    segPtr->type = SEGMENT_TYPE_VARIABLE;
-    memcpy(segPtr->text, varName, length);
-    segPtr->text[length] = '\0';
-    segPtr->length = length;
-    interp = itemPtr->substInterp;
-    if (interp == NULL) {
-        interp = itemPtr->interp;
-    }
-    Tcl_TraceVar(interp, varName, VAR_FLAGS, TraceVarProc, itemPtr);
-    segPtr->subst = NULL;
-    segPtr->x = segPtr->y = 0;
-    segPtr->nextPtr = NULL;
-    if (itemPtr->firstPtr == NULL) {
-        itemPtr->firstPtr = segPtr;
-    }
-    if (itemPtr->lastPtr == NULL) {
-        itemPtr->lastPtr = segPtr;
-    } else {
-        itemPtr->lastPtr->nextPtr = segPtr;
-    }
-}
-
-static int
-AddHotspotSegment(HotspotItem *itemPtr)
-{
-    ItemSegment *segPtr;
-
-    segPtr = Tcl_Alloc(sizeof(ItemSegment));
-    if (segPtr == NULL) {
-        Tcl_Panic("can't allocate hotspot segent for hotspot");
-    }
-    segPtr->itemPtr = itemPtr;
-    segPtr->lineNum = itemPtr->numLines;
-    segPtr->type = SEGMENT_TYPE_HOTSPOT;
-    segPtr->text[0] = '\0';
-    segPtr->length = 0;
-    segPtr->x = segPtr->y = 0;
-    segPtr->nextPtr = NULL;
-    if (itemPtr->firstPtr == NULL) {
-        itemPtr->firstPtr = segPtr;
-    }
-    if (itemPtr->lastPtr == NULL) {
-        itemPtr->lastPtr = segPtr;
-    } else {
-        itemPtr->lastPtr->nextPtr = segPtr;
-    }
-}
-
-static void
-DestroySegment(HotspotItem *itemPtr, ItemSegment *segPtr)
-{
-    if (segPtr->layout != NULL) {
-        Tk_FreeLayout(segPtr->layout);
-    }
-    if (segPtr->type == SEGMENT_TYPE_VARIABLE) {
-        Tcl_UntraceVar(itemPtr->interp, segPtr->text, flags, TraceVarProc, 
-                itemPtr);
-    }
-    if (segPtr->substText != NULL) {
-        Tcl_Free(segPtr->substText);
-    }
-    Tcl_Free(segPtr);
-}
-
-static void
-DestroySegments(HotspotItem *itemPtr)
-{
-    ItemSegment *segPtr, nextPtr;
-
-    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = nextPtr) {
-        nextPtr = segPtr->nextPtr;
-        DestroySegment(segPtr);
-    }
-    itemPtr->firstPtr = itemPtr->lastPtr = NULL;
-}
-
-static int
-DoSubst(HotspotItem *itemPtr, const char *varName)
-{
-    ItemSegment *segptr;
-
-    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = segPtr->nextPtr) {
-        const char *value;
-
-        if (segPtr->type != SEGMENT_TYPE_VARIABLE) {
-            continue;
-        }
-        if ((varName != NULL) && (strcmp(segPtr->text, varName) != 0)) {
-            continue;
-        }
-
-        value = Tcl_GetVar(itemPtr->substInterp, segPtr->text, TCL_GLOBAL_ONLY);
-        if (value == NULL) {
-            value = "???";
-        }
-        if (segPtr->subst != NULL) {
-            Tcl_Free(segPtr->subst);
-        }
-        segPtr->subst = Tcl_Alloc(strlen(value) + 1);
-        strcpy(segPtr->subst, value);
-    }
-}
-
-static int
-ComputeGeometry(HotspotItem *itemPtr)
-{
-    int x, y, w, h;
-    ItemSegment *segPtr;
-    int imgWidth, imgHeight;
-    int maxWidth, maxHeight;
-
-    /* Collect the individual segment sizes. */
-    imgWidth = itemPtr->maxImageWidth + 2 * IMAGE_PAD;
-    imgHeight = itemPtr->maxImageHeight + 2 * IMAGE_PAD;
-    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = segPtr->nextPtr) {
-        if (segPtr->layout != NULL) {
-            Tk_FreeTextLayout(segPtr->layout);
-        }
-        switch (segPtr->type) {
-        case SEGMENT_TYPE_HOTSPOT:
-            w = imgWidth, h = imgHeight;
-            break;
-        case SEGMENT_TYPE_VARIABLE:
-            segPtr->layout = Tk_ComputeTextLayout(segPtr->substFont, 
-                segPtr->subst, segPtr->length, wrapLength, justify, flags, 
-                &w, &h);
-            break;
-        case SEGMENT_TYPE_TEXT:
-            segPtr->layout = Tk_ComputeTextLayout(segPtr->textFont, 
-                segPtr->text, segPtr->length, wrapLength, justify, flags, 
-                &w, &h);
-            break;
-        default:
-            Tcl_Panic("unknown hotspot segment type");
-        }
-        segPtr->width = w;
-        segPtr->height = h;
-    }
-    /* Compute the relative positions of the segments. */
-    x = y = 0;
-    maxWidth = maxHeight = 0;
-    for (segPtr = itemPtr->firstPtr; segPtr != NULL; segPtr = segPtr->nextPtr) {
-        int maxHeight, lineNum;
-        ItemSegment *startPtr;
-
-        maxHeight = 0;
-        lineNum = segPtr->lineNum;
-        startPtr = segPtr;
-        x = 0;
-        while ((segPtr->lineNum == lineNum) && (segPtr != NULL)) {
-            if (segPtr->height > segPtr->maxHeight) {
-                segPtr->maxHeight = segPtr->height;
-            }
-            segPtr = segPtr->nextPtr;
-            segPtr->x = x;
-            x += segPtr->width;
-        }
-        if (x > maxWidth) {
-            maxWidth = x;
-        }
-        segPtr = startPtr;
-        while ((segPtr->lineNum == lineNum) && (segPtr != NULL)) {
-            segPtr->y = (maxHeight - segPtr->height) / 2;
-        }
-        y += maxHeight;
-    }
-    itemPtr->width = maxWidth;
-    itemPtr->height = y;
-}
-
-/*
- *---------------------------------------------------------------------------
- * 
- * TraceVarProc --
- *
- *      This procedure is invoked when someone changes the state variable
- *      associated with a radiobutton or checkbutton entry.  The entry's
- *      selected state is set to match the value of the variable.
- *
- * Results:
- *      NULL is always returned.
- *
- * Side effects:
- *      The combobox entry may become selected or deselected.
- *
- *---------------------------------------------------------------------------
- */
-static char *
-TraceVarProc(
-    ClientData clientData,              /* Information about the item. */
-    Tcl_Interp *interp,                 /* Interpreter containing variable. */
-    const char *name1,                  /* First part of variable's name. */
-    const char *name2,                  /* Second part of variable's name. */
-    int flags)                          /* Describes what just happened. */
-{
-    HotspotItem *itemPtr = clientData;
-    Tcl_Obj *objPtr;
-    int bool;
-
-    if (flags & TCL_INTERP_DESTROYED) {
-        return NULL;                    /* Interpreter is going away. */
-
-    }
-    /*
-     * If the variable is being unset, then re-establish the trace.
-     */
-    if (flags & TCL_TRACE_UNSETS) {
-        if (flags & TCL_TRACE_DESTROYED) {
-            Tcl_TraceVar(interp, name1, VAR_FLAGS, TraceVarProc, itemPtr);
-        }
-        goto done;
-    }
-    DoSubst(itemPtr, name1);
-    ComputeGeometry(itemPtr);
-    Tk_CanvasEventuallyRedraw(itemPtr->canvas, itemPtr->header.x1, 
-        itemPtr->header.y1, itemPtr->header.x2, itemPtr->header.y2);
-    return NULL;                        /* Done. */
-}
-
-static int
-ParseDescription(HotspotItem *itemPtr, const char *description, int length)
-{
-    const char *p, *pend, *start;
-
-    if (itemPtr->firstPtr != NULL) {
-        DestroySegments(itemPtr);
-    }
-    start = description;
-    itemPtr->numLines = 1;
-    for (p = description, pend = p + length; p < pend; p++) {
-        if ((p[0] == '$') && (p[1] == '{')) {
-            const char *varName;
-            const char q;
-
-            if (p > start) {
-                /* Save the leading text. */
-                AddTextSegment(itemPtr, start, p - start);
-                start = p;
-            }
-            /* Start of substitution variable. */
-            varName = p + 2;
-            for (q = varName; q < pend; q++) {
-                if (*q == '}') {
-                    AddVariableSegment(itemPtr, varName, q - varName);
-                    AddHotspotSegment(itemPtr);
-                    p = q;
-                    goto next;
-                }
-            }
-            Tcl_AppendResult(interp, "back variable specification in \"",
-                             description, "\"", (char *)NULL);
-            return TCL_ERROR;
-        } else if (p[0] == '\n') {
-            if (p > start) {
-                AddTextSegment(itemPtr, start, p - start);
-                start = p + 1;
-                itemPtr->numLines++;
-            }
-        }
-    next:
-    }
-    if (p > start) {
-        /* Save the trailing text. */
-        AddTextSegment(itemPtr, start, p - start);
-    }
-    DoSubst(itemPtr, NULL);
-    ComputeGeometry(itemPtr);
+#endif
     return TCL_OK;
 }
@@ -1680 +1607 @@
     Tcl_Interp *interp;         /* interpreter being initialized */
 {
-    Tk_CreateItemType(&rpHotspotType);
+    Tk_CreateItemType(&hotspotType);
     return TCL_OK;
 }