Changeset 2555

Timestamp:

Sep 21, 2011 9:19:27 PM (12 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure (modified) (6 diffs)
• configure.in (modified) (1 diff)
• gui/src/RpCanvPlacard.c (modified) (1 diff)
• src/core/RpLibraryFInterface.cc (modified) (2 diffs)

trunk/configure

@@ -672 +672 @@
 JAVA
 PYTHON
+XSUBPP
 PERL
 mkoctfile2
@@ -7376 +7377 @@
 
 
-with_matlab="yes"
 
 # Check whether --with-matlab was given.
@@ -7894 +7894 @@
 PERL_CCFlAGS=
 PERL_VERSION_RV=
+XSUBPP=
 PERL_LIBSPEC=
 if test "$with_perl" != "no" ; then
@@ -7938 +7939 @@
 
 
+    # Extract the first word of "xsubpp", so it can be a program name with args.
+set dummy xsubpp; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSUBPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSUBPP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSUBPP="$XSUBPP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$with_perl/bin:$with_perl"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  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
+    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
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSUBPP=$ac_cv_path_XSUBPP
+if test -n "$XSUBPP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSUBPP" >&5
+$as_echo "$XSUBPP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
   else
     # Extract the first word of "perl", so it can be a program name with args.
@@ -7973 +8015 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
 $as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    # Extract the first word of "xsubpp", so it can be a program name with args.
+set dummy xsubpp; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSUBPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSUBPP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSUBPP="$XSUBPP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  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
+    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
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSUBPP=$ac_cv_path_XSUBPP
+if test -n "$XSUBPP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSUBPP" >&5
+$as_echo "$XSUBPP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -9558 +9640 @@
 
 MAKE=${make_command}
+
 
 

trunk/configure.in

@@ -429 +429 @@
 AC_SUBST(TK_VERSION)
 AC_SUBST(VTKDIR)
+AC_SUBST(XSUBPP)
 
 ac_configure_args="--disable-threads --enable-shared"

trunk/gui/src/RpCanvPlacard.c

@@ -211 +211 @@
 
 /*
+ * The record below describes a canvas widget.  It is made available
+ * to the item procedures so they can access certain shared fields such
+ * as the overall displacement and scale factor for the canvas.
+ */
+
+typedef struct TkCanvas {
+    Tk_Window tkwin;            /* Window that embodies the canvas.  NULL
+                                 * means that the window has been destroyed
+                                 * but the data structures haven't yet been
+                                 * cleaned up.*/
+    Display *display;           /* Display containing widget;  needed, among
+                                 * other things, to release resources after
+                                 * tkwin has already gone away. */
+    Tcl_Interp *interp;         /* Interpreter associated with canvas. */
+    Tcl_Command widgetCmd;      /* Token for canvas's widget command. */
+    Tk_Item *firstItemPtr;      /* First in list of all items in canvas,
+                                 * or NULL if canvas empty. */
+    Tk_Item *lastItemPtr;       /* Last in list of all items in canvas,
+                                 * or NULL if canvas empty. */
+
+    /*
+     * Information used when displaying widget:
+     */
+
+    int borderWidth;            /* Width of 3-D border around window. */
+    Tk_3DBorder bgBorder;       /* Used for canvas background. */
+    int relief;                 /* Indicates whether window as a whole is
+                                 * raised, sunken, or flat. */
+    int highlightWidth;         /* Width in pixels of highlight to draw
+                                 * around widget when it has the focus.
+                                 * <= 0 means don't draw a highlight. */
+    XColor *highlightBgColorPtr;
+                                /* Color for drawing traversal highlight
+                                 * area when highlight is off. */
+    XColor *highlightColorPtr;  /* Color for drawing traversal highlight. */
+    int inset;                  /* Total width of all borders, including
+                                 * traversal highlight and 3-D border.
+                                 * Indicates how much interior stuff must
+                                 * be offset from outside edges to leave
+                                 * room for borders. */
+    GC pixmapGC;                /* Used to copy bits from a pixmap to the
+                                 * screen and also to clear the pixmap. */
+    int width, height;          /* Dimensions to request for canvas window,
+                                 * specified in pixels. */
+    int redrawX1, redrawY1;     /* Upper left corner of area to redraw,
+                                 * in pixel coordinates.  Border pixels
+                                 * are included.  Only valid if
+                                 * REDRAW_PENDING flag is set. */
+    int redrawX2, redrawY2;     /* Lower right corner of area to redraw,
+                                 * in integer canvas coordinates.  Border
+                                 * pixels will *not* be redrawn. */
+    int confine;                /* Non-zero means constrain view to keep
+                                 * as much of canvas visible as possible. */
+
+    /*
+     * Information used to manage the selection and insertion cursor:
+     */
+
+    Tk_CanvasTextInfo textInfo; /* Contains lots of fields;  see tk.h for
+                                 * details.  This structure is shared with
+                                 * the code that implements individual items. */
+    int insertOnTime;           /* Number of milliseconds cursor should spend
+                                 * in "on" state for each blink. */
+    int insertOffTime;          /* Number of milliseconds cursor should spend
+                                 * in "off" state for each blink. */
+    Tcl_TimerToken insertBlinkHandler;
+                                /* Timer handler used to blink cursor on and
+                                 * off. */
+
+    /*
+     * Transformation applied to canvas as a whole:  to compute screen
+     * coordinates (X,Y) from canvas coordinates (x,y), do the following:
+     *
+     * X = x - xOrigin;
+     * Y = y - yOrigin;
+     */
+
+    int xOrigin, yOrigin;       /* Canvas coordinates corresponding to
+                                 * upper-left corner of window, given in
+                                 * canvas pixel units. */
+    int drawableXOrigin, drawableYOrigin;
+                                /* During redisplay, these fields give the
+                                 * canvas coordinates corresponding to
+                                 * the upper-left corner of the drawable
+                                 * where items are actually being drawn
+                                 * (typically a pixmap smaller than the
+                                 * whole window). */
+
+    /*
+     * Information used for event bindings associated with items.
+     */
+
+    Tk_BindingTable bindingTable;
+                                /* Table of all bindings currently defined
+                                 * for this canvas.  NULL means that no
+                                 * bindings exist, so the table hasn't been
+                                 * created.  Each "object" used for this
+                                 * table is either a Tk_Uid for a tag or
+                                 * the address of an item named by id. */
+    Tk_Item *currentItemPtr;    /* The item currently containing the mouse
+                                 * pointer, or NULL if none. */
+    Tk_Item *newCurrentPtr;     /* The item that is about to become the
+                                 * current one, or NULL.  This field is
+                                 * used to detect deletions  of the new
+                                 * current item pointer that occur during
+                                 * Leave processing of the previous current
+                                 * item.  */
+    double closeEnough;         /* The mouse is assumed to be inside an
+                                 * item if it is this close to it. */
+    XEvent pickEvent;           /* The event upon which the current choice
+                                 * of currentItem is based.  Must be saved
+                                 * so that if the currentItem is deleted,
+                                 * can pick another. */
+    int state;                  /* Last known modifier state.  Used to
+                                 * defer picking a new current object
+                                 * while buttons are down. */
+
+    /*
+     * Information used for managing scrollbars:
+     */
+
+    char *xScrollCmd;           /* Command prefix for communicating with
+                                 * horizontal scrollbar.  NULL means no
+                                 * horizontal scrollbar.  Malloc'ed*/
+    char *yScrollCmd;           /* Command prefix for communicating with
+                                 * vertical scrollbar.  NULL means no
+                                 * vertical scrollbar.  Malloc'ed*/
+    int scrollX1, scrollY1, scrollX2, scrollY2;
+                                /* These four coordinates define the region
+                                 * that is the 100% area for scrolling (i.e.
+                                 * these numbers determine the size and
+                                 * location of the sliders on scrollbars).
+                                 * Units are pixels in canvas coords. */
+    char *regionString;         /* The option string from which scrollX1
+                                 * etc. are derived.  Malloc'ed. */
+    int xScrollIncrement;       /* If >0, defines a grid for horizontal
+                                 * scrolling.  This is the size of the "unit",
+                                 * and the left edge of the screen will always
+                                 * lie on an even unit boundary. */
+    int yScrollIncrement;       /* If >0, defines a grid for horizontal
+                                 * scrolling.  This is the size of the "unit",
+                                 * and the left edge of the screen will always
+                                 * lie on an even unit boundary. */
+
+    /*
+     * Information used for scanning:
+     */
+
+    int scanX;                  /* X-position at which scan started (e.g.
+                                 * button was pressed here). */
+    int scanXOrigin;            /* Value of xOrigin field when scan started. */
+    int scanY;                  /* Y-position at which scan started (e.g.
+                                 * button was pressed here). */
+    int scanYOrigin;            /* Value of yOrigin field when scan started. */
+
+    /*
+     * Information used to speed up searches by remembering the last item
+     * created or found with an item id search.
+     */
+
+    Tk_Item *hotPtr;            /* Pointer to "hot" item (one that's been
+                                 * recently used.  NULL means there's no
+                                 * hot item. */
+    Tk_Item *hotPrevPtr;        /* Pointer to predecessor to hotPtr (NULL
+                                 * means item is first in list).  This is
+                                 * only a hint and may not really be hotPtr's
+                                 * predecessor. */
+
+    /*
+     * Miscellaneous information:
+     */
+
+    Tk_Cursor cursor;           /* Current cursor for window, or None. */
+    char *takeFocus;            /* Value of -takefocus option;  not used in
+                                 * the C code, but used by keyboard traversal
+                                 * scripts.  Malloc'ed, but may be NULL. */
+    double pixelsPerMM;         /* Scale factor between MM and pixels;
+                                 * used when converting coordinates. */
+    int flags;                  /* Various flags;  see below for
+                                 * definitions. */
+    int nextId;                 /* Number to use as id for next item
+                                 * created in widget. */
+    Tk_PostscriptInfo psInfo;
+                                /* Pointer to information used for generating
+                                 * Postscript for the canvas.  NULL means
+                                 * no Postscript is currently being
+                                 * generated. */
+    Tcl_HashTable idTable;      /* Table of integer indices. */
+    /*
+     * Additional information, added by the 'dash'-patch
+     */
+    VOID *reserved1;
+    Tk_State canvas_state;      /* state of canvas */
+    VOID *reserved2;
+    VOID *reserved3;
+    Tk_TSOffset tsoffset;
+#ifndef USE_OLD_TAG_SEARCH
+    void *bindTagExprs; /* linked list of tag expressions used in bindings */
+#endif
+} TkCanvas;
+
+
+/*
  * ------------------------------------------------------------------------
  *  RpCanvPlacard_Init --

trunk/src/core/RpLibraryFInterface.cc

@@ -221 +221 @@
     char* path,                         /* null terminated path */
     char* retText,                      /* return text buffer for fortran*/
-
+    int path_len,
     int retText_len)                    /* length of return text buffer */
 {
@@ -230 +230 @@
     std::string inPath = "";
 
-    inPath = null_terminate_str(path,path_len);
+    inPath = null_terminate_str(path, path_len);
 
     if ((handle) && (*handle != 0)) {