Changeset 5904 for branches

Timestamp:

Oct 9, 2015 10:56:09 AM (9 years ago)

Author:

gah

Message:

first pass on new build

Location:

branches/1.5/pkgs

Files:

• PdbToVtk/Makefile.in (added)
• PdbToVtk/pdbToVtk.c (moved) (moved from branches/1.5/gui/src/RpPdbToVtk.c) (4 diffs)
• PdbToVtk/pkgIndex.tcl.in (added)
• diffview/Makefile.in (added)
• diffview/diff.pdf (moved) (moved from branches/1.5/gui/src/diff.pdf) (1 prop)
• diffview/diffview.c (moved) (moved from branches/1.5/gui/src/RpDiffview.c) (2 diffs)
• diffview/pkgIndex.tcl.in (added)
• hotspot/Makefile.in (added)
• hotspot/hotspot.c (moved) (moved from branches/1.5/gui/src/RpCanvHotspot.c) (2 diffs)
• hotspot/pkgIndex.tcl.in (added)
• listbox/Makefile.in (added)
• listbox/listbox.c (moved) (moved from branches/1.5/gui/src/RpListbox.c) (16 diffs)
• listbox/pkgIndex.tcl.in (added)
• placard/Makefile.in (added)
• placard/pkgIndex.tcl.in (added)
• placard/placard.c (moved) (moved from branches/1.5/gui/src/RpCanvPlacard.c) (2 diffs)
• readpoints/Makefile.in (added)
• readpoints/pkgIndex.tcl.in (added)
• runner/Makefile.in (added)
• runner/pkgIndex.tcl.in (added)
• runner/scripts/Makefile.in (added)
• squeezer/Makefile.in (added)
• squeezer/pkgIndex.tcl.in (added)
• system/Makefile.in (added)
• system/pkgIndex.tcl.in (added)

branches/1.5/pkgs/PdbToVtk/pdbToVtk.c

@@ -191 +191 @@
     for (i = 0, hPtr = Tcl_FirstHashEntry(atomTablePtr, &iter); hPtr != NULL;
          hPtr = Tcl_NextHashEntry(&iter), i++) {
-        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
+        PdbAtom *atomPtr;
+
+        atomPtr = Tcl_GetHashValue(hPtr);
         array[i] = atomPtr;
     }
@@ -689 +691 @@
         Tcl_AppendToObj(objPtr, mesg, -1);
     }
-#if 0
     for (hPtr = Tcl_FirstHashEntry(&atomTable, &iter); hPtr != NULL;
          hPtr = Tcl_NextHashEntry(&iter)) {
-        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
+        PdbAtom *atomPtr;
+
+        atomPtr = Tcl_GetHashValue(hPtr);
         fprintf(stderr, "%d %s %d connections\n", atomPtr->ordinal,
                 elements[atomPtr->number].symbol, atomPtr->numConnections);
     }
-#endif
     sprintf(mesg, "POINT_DATA %d\n", atomTable.numEntries);
     Tcl_AppendToObj(objPtr, mesg, -1);
@@ -722 +724 @@
 /*
  * ------------------------------------------------------------------------
- *  RpPdbToVtk_Init --
+ *  Rappture_pdb_to_vtk_Init --
  *
  *  Invoked when the Rappture GUI library is being initialized
@@ -732 +734 @@
  */
 int
-RpPdbToVtk_Init(Tcl_Interp *interp)
+Rappture_pdb_to_vtk_Init(Tcl_Interp *interp)
 {
     /* install the widget command */

branches/1.5/pkgs/diffview/diffview.c

@@ -414 +414 @@
 };
 
-/*
- * ------------------------------------------------------------------------
- *  RpDiffview_Init --
- *
- *  Invoked when the Rappture GUI library is being initialized
- *  to install the "diffview" widget into the interpreter.
- *
- *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
- *  message in the interp) if anything goes wrong.
- * ------------------------------------------------------------------------
- */
-int
-RpDiffview_Init(interp)
-    Tcl_Interp *interp;         /* interpreter being initialized */
-{
-    static char *script = "source [file join $RapptureGUI::library scripts diffview.tcl]";
-
-    /* install the widget command */
-    Tcl_CreateObjCommand(interp, "Rappture::Diffview", DiffviewObjCmd,
-        NULL, NULL);
-
-    /* load the default bindings */
-    if (Tcl_Eval(interp, script) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    return TCL_OK;
-}
 
 /*
@@ -2796 +2768 @@
     }
 }
+
+/*
+ * ------------------------------------------------------------------------
+ *  Rappture_diffview_Init --
+ *
+ *  Invoked when the Rappture GUI library is being initialized
+ *  to install the "diffview" widget into the interpreter.
+ *
+ *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
+ *  message in the interp) if anything goes wrong.
+ * ------------------------------------------------------------------------
+ */
+int
+Rappture_diffview_Init(interp)
+    Tcl_Interp *interp;         /* interpreter being initialized */
+{
+    static char *script = "source [file join $RapptureGUI::library scripts diffview.tcl]";
+
+    /* install the widget command */
+    Tcl_CreateObjCommand(interp, "Rappture::diffview", DiffviewObjCmd,
+        NULL, NULL);
+
+    /* load the default bindings */
+    if (Tcl_Eval(interp, script) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}

branches/1.5/pkgs/hotspot/hotspot.c

@@ -1827 +1827 @@
 /*
  * ------------------------------------------------------------------------
- *  RpCanvHotspot_Init --
+ *  Rappture_canvas_hotspot_Init --
  *
  *  Invoked when the Rappture GUI library is being initialized
@@ -1837 +1837 @@
  */
 int
-RpCanvHotspot_Init(interp)
+Rappture_canvas_hotspot_Init(interp)
     Tcl_Interp *interp;         /* interpreter being initialized */
 {

branches/1.5/pkgs/listbox/listbox.c

@@ -33 +33 @@
  * RCS: @(#) $Id: tkListbox.c,v 1.29.2.5 2007/04/29 02:24:02 das Exp $
  */
-#include "tkPort.h"
-#include "default.h"
-#include "tkInt.h"
-
-#ifdef WIN32
-#include "tkWinInt.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <X11/Xatom.h>
+#include <X11/Xproto.h>
+
+#include <tcl.h>
+#include <tk.h>
+
+#define BLACK           "#000000"
+#define WHITE           "#ffffff"
+
+#define NORMAL_BG       "#d9d9d9"
+#define ACTIVE_BG       "#ececec"
+#define SELECT_BG       "#c3c3c3"
+#define DISABLED        "#a3a3a3"
+
+#define DEF_LISTBOX_BG_MONO             WHITE
+#define DEF_LISTBOX_BORDER_WIDTH        "1"
+#define DEF_LISTBOX_CURSOR              ""
+#define DEF_LISTBOX_DISABLED_FG         DISABLED
+#define DEF_LISTBOX_EXPORT_SELECTION    "1"
+#define DEF_LISTBOX_HEIGHT              "10"
+#define DEF_LISTBOX_HIGHLIGHT_BG        NORMAL_BG
+#define DEF_LISTBOX_LIST_VARIABLE       ""
+#define DEF_LISTBOX_SCROLL_COMMAND      ""
+#define DEF_LISTBOX_SELECT_BD           "0"
+#define DEF_LISTBOX_SELECT_COLOR        SELECT_BG
+#define DEF_LISTBOX_SELECT_FG_MONO      WHITE
+#define DEF_LISTBOX_SELECT_MODE         "browse"
+#define DEF_LISTBOX_SELECT_MONO         BLACK
+#define DEF_LISTBOX_SET_GRID            "0"
+#define DEF_LISTBOX_STATE               "normal"
+#define DEF_LISTBOX_TAKE_FOCUS          (char *) NULL
+#define DEF_LISTBOX_WIDTH               "20"
+
+#if defined(__WIN32__) || defined(_WIN32) || defined(__MINGW32__)
+#define DEF_LISTBOX_ACTIVE_STYLE        "underline"
+#define DEF_LISTBOX_BG_COLOR            "SystemWindow"
+#define DEF_LISTBOX_FG                  NORMAL_FG
+#define DEF_LISTBOX_FONT                "TkDefaultFont"
+#define DEF_LISTBOX_HIGHLIGHT           HIGHLIGHT
+#define DEF_LISTBOX_HIGHLIGHT_WIDTH     "1"
+#define DEF_LISTBOX_RELIEF              "sunken"
+#define DEF_LISTBOX_SELECT_FG_COLOR     SELECT_FG
+#else
+#   if defined(MAC_OSX_TK)
+#define DEF_LISTBOX_ACTIVE_STYLE        "dotbox"
+#define DEF_LISTBOX_BG_COLOR            WHITE
+#define DEF_LISTBOX_FG                  BLACK
+#define DEF_LISTBOX_FONT                "TkTextFont"
+#define DEF_LISTBOX_HIGHLIGHT           BLACK
+#define DEF_LISTBOX_HIGHLIGHT_WIDTH     "0"
+#define DEF_LISTBOX_RELIEF              "solid"
+#define DEF_LISTBOX_SELECT_FG_COLOR     SELECT_FG
+#   else
+#define DEF_LISTBOX_ACTIVE_STYLE        "dotbox"
+#define DEF_LISTBOX_BG_COLOR            WHITE
+#define DEF_LISTBOX_FG                  BLACK
+#define DEF_LISTBOX_FONT                "TkDefaultFont"
+#define DEF_LISTBOX_HIGHLIGHT           BLACK
+#define DEF_LISTBOX_HIGHLIGHT_WIDTH     "1"
+#define DEF_LISTBOX_RELIEF              "sunken"
+#define DEF_LISTBOX_SELECT_FG_COLOR     BLACK
+#   endif
 #endif
 
@@ -523 +582 @@
 /*
  * ------------------------------------------------------------------------
- *  RpListbox_Init --
- *
- *  Invoked when the Rappture GUI library is being initialized
+ *  Rappture_listbox_Init --
+ *
+ *  Invoked when the Rappture listbox library is being initialized
  *  to install the Rappture "listbox" widget.
  *
@@ -533 +592 @@
  */
 int
-RpListbox_Init(interp)
+Rappture_listbox_Init(interp)
     Tcl_Interp *interp;         /* interpreter being initialized */
 {
@@ -821 +880 @@
              */
             for (i = 0; i < listPtr->nElements; i++) {
-                if (Tcl_FindHashEntry(listPtr->selection, (char *)i) != NULL) {
+                long key;
+                key = index;
+                if (Tcl_FindHashEntry(listPtr->selection,(char *)key) != NULL) {
                     sprintf(indexStringRep, "%d", i);
                     Tcl_AppendElement(interp, indexStringRep);
@@ -1361 +1422 @@
         }
         case SELECTION_INCLUDES: {
+            long key = first;
             if (objc != 4) {
                 Tcl_WrongNumArgs(interp, 3, objv, "index");
@@ -1367 +1429 @@
             Tcl_SetObjResult(interp,
                     Tcl_NewBooleanObj((Tcl_FindHashEntry(listPtr->selection,
-                            (char *)first) != NULL)));
+                            (char *)key) != NULL)));
             result = TCL_OK;
             break;
@@ -1559 +1621 @@
     Tcl_HashEntry *entry;
     ItemAttr *attrs;
-
-    entry = Tcl_CreateHashEntry(listPtr->itemAttrTable, (char *)index, &new);
+    long key = index;
+
+    entry = Tcl_CreateHashEntry(listPtr->itemAttrTable, (char *)key, &new);
     if (new) {
         attrs = (ItemAttr *) ckalloc(sizeof(ItemAttr));
@@ -2065 +2128 @@
          */
         if (listPtr->state & STATE_NORMAL) {
-            if (Tcl_FindHashEntry(listPtr->selection, (char *)i) != NULL) {
+            long key = i;
+            if (Tcl_FindHashEntry(listPtr->selection, (char *)key) != NULL) {
                 /* Selected items are drawn differently. */
                 gc = listPtr->selTextGC;
@@ -2240 +2304 @@
             listPtr->borderWidth, listPtr->relief);
     if (listPtr->highlightWidth > 0) {
-        GC fgGC, bgGC;
-
+        GC bgGC;
+
+        /* There's no public stub for TkpDrawHighlightBorder, so fall back
+         * to Tk_DrawFocusHighlight.  Only on problem on the Mac.  */
         bgGC = Tk_GCForColor(listPtr->highlightBgColorPtr, pixmap);
-        if (listPtr->flags & GOT_FOCUS) {
-            fgGC = Tk_GCForColor(listPtr->highlightColorPtr, pixmap);
-            TkpDrawHighlightBorder(tkwin, fgGC, bgGC, 
-                    listPtr->highlightWidth, pixmap);
-        } else {
-            TkpDrawHighlightBorder(tkwin, bgGC, bgGC, 
-                    listPtr->highlightWidth, pixmap);
-        }
+        Tk_DrawFocusHighlight(tkwin, bgGC, listPtr->highlightWidth,
+                pixmap);
     }
 #ifndef TK_NO_DOUBLE_BUFFERING
@@ -2743 +2803 @@
      */
     for (i = first; i <= last; i++) {
+        long key = i;
         /* Remove selection information */
-        entry = Tcl_FindHashEntry(listPtr->selection, (char *)i);
+        entry = Tcl_FindHashEntry(listPtr->selection, (char *)key);
         if (entry != NULL) {
             listPtr->numSelected--;
@@ -2750 +2811 @@
         }
 
-        entry = Tcl_FindHashEntry(listPtr->itemAttrTable, (char *)i);
+        entry = Tcl_FindHashEntry(listPtr->itemAttrTable, (char *)key);
         if (entry != NULL) {
             ckfree((char *)Tcl_GetHashValue(entry));
@@ -3417 +3478 @@
      */
     for (i = first; i <= last; i++) {
-        entry = Tcl_FindHashEntry(listPtr->selection, (char *)i);
+        long key = i;
+        entry = Tcl_FindHashEntry(listPtr->selection, (char *)key);
         if (entry != NULL) {
             if (!select) {
@@ -3429 +3491 @@
             if (select) {
                 entry = Tcl_CreateHashEntry(listPtr->selection,
-                        (char *)i, &new);
+                        (char *)key, &new);
                 Tcl_SetHashValue(entry, (ClientData) NULL);
                 listPtr->numSelected++;
@@ -3505 +3567 @@
     Tcl_DStringInit(&selection);
     for (i = 0; i < listPtr->nElements; i++) {
-        entry = Tcl_FindHashEntry(listPtr->selection, (char *)i);
+        long key = i;
+        entry = Tcl_FindHashEntry(listPtr->selection, (char *)key);
         if (entry != NULL) {
             if (needNewline) {
@@ -3787 +3850 @@
     if (offset > 0) {
         for (i = last; i >= first; i--) {
-            entry = Tcl_FindHashEntry(table, (char *)i);
+            long key = i;
+            entry = Tcl_FindHashEntry(table, (char *)key);
             if (entry != NULL) {
                 clientData = Tcl_GetHashValue(entry);
                 Tcl_DeleteHashEntry(entry);
-                entry = Tcl_CreateHashEntry(table, (char *)(i + offset), &new);
+                entry = Tcl_CreateHashEntry(table, (char *)(key+offset), &new);
                 Tcl_SetHashValue(entry, clientData);
             }
@@ -3797 +3861 @@
     } else {
         for (i = first; i <= last; i++) {
-            entry = Tcl_FindHashEntry(table, (char *)i);
+            long key = i;
+            entry = Tcl_FindHashEntry(table, (char *)key);
             if (entry != NULL) {
                 clientData = Tcl_GetHashValue(entry);
                 Tcl_DeleteHashEntry(entry);
-                entry = Tcl_CreateHashEntry(table, (char *)(i + offset), &new);
+                entry = Tcl_CreateHashEntry(table, (char *)(key+offset), &new);
                 Tcl_SetHashValue(entry, clientData);
             }

branches/1.5/pkgs/placard/placard.c

@@ -413 +413 @@
 
 
-/*
- * ------------------------------------------------------------------------
- *  RpCanvPlacard_Init --
- *
- *  Invoked when the Rappture GUI library is being initialized
- *  to install the "placard" item on the Tk canvas widget.
- *
- *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
- *  message in the interp) if anything goes wrong.
- * ------------------------------------------------------------------------
- */
-int
-RpCanvPlacard_Init(interp)
-    Tcl_Interp *interp;         /* interpreter being initialized */
-{
-    Tk_CreateItemType(&rpPlacardType);
-
-    Tk_DefineBitmap(interp, Tk_GetUid("rp_ellipsis"),
-        (char*)ellipsis_bits, ellipsis_width, ellipsis_height);
-
-    return TCL_OK;
-}
 
 /*
@@ -1459 +1437 @@
     return;
 }
+
+/*
+ * ------------------------------------------------------------------------
+ *  Rappture_canvas_placard_Init --
+ *
+ *  Invoked when the Rappture GUI library is being initialized
+ *  to install the "placard" item on the Tk canvas widget.
+ *
+ *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
+ *  message in the interp) if anything goes wrong.
+ * ------------------------------------------------------------------------
+ */
+int
+Rappture_canvas_placard_Init(interp)
+    Tcl_Interp *interp;         /* interpreter being initialized */
+{
+    Tk_CreateItemType(&rpPlacardType);
+
+    Tk_DefineBitmap(interp, Tk_GetUid("rp_ellipsis"),
+        (char*)ellipsis_bits, ellipsis_width, ellipsis_height);
+
+    return TCL_OK;
+}