Changeset 5903


Ignore:
Timestamp:
Oct 8, 2015 1:56:45 PM (8 years ago)
Author:
gah
Message:

first pass on new build

Location:
branches/1.5
Files:
1 added
1 deleted
24 moved

Legend:

Unmodified
Added
Removed

  • branches/1.5/pkgs/readpoints/readPoints.c

    r5902 r5903  
    8888    return TCL_OK;
    8989}
    90 
     90   
    9191/*
    9292 *  ReadPoints string dimVar pointsVar
    … …  
    167167/*
    168168 * ------------------------------------------------------------------------
    169  *  RpReadPoints_Init --
     169 *  Rappture_readpoints_Init --
    170170 *
    171171 *  Invoked when the Rappture GUI library is being initialized
    172  *  to install the "ConvertDxToVtk" command into the interpreter.
     172 *  to install the "readpoints" command into the interpreter.
    173173 *
    174174 *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
    … …  
    177177 */
    178178int
    179 RpReadPoints_Init(Tcl_Interp *interp)
     179Rappture_readpoints_Init(Tcl_Interp *interp)
    180180{
    181181    /* install the widget command */
    182     Tcl_CreateObjCommand(interp, "Rappture::ReadPoints", ReadPoints,
     182    Tcl_CreateObjCommand(interp, "Rappture::readpoints", ReadPoints,
    183183        NULL, NULL);
    184184    return TCL_OK;

  • branches/1.5/pkgs/squeezer/RpSqueezer.c

    r5902 r5903  
    3030    Tcl_Interp *interp, int argc, CONST char **argv));
    3131
    32 /*
    33  * ------------------------------------------------------------------------
    34  *  RpSqueezer_Init --
    35  *
    36  *  Installs the "squeezer" command in a Tcl interpreter.
    37  *
    38  *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
    39  *  message in the interp) if anything goes wrong.
    40  * ------------------------------------------------------------------------
    41  */
    42 int
    43 RpSqueezer_Init(interp)
    44     Tcl_Interp *interp;         /* interpreter being initialized */
    45 {
    46     /* install the widget command */
    47     Tcl_CreateCommand(interp, "squeezer", RpSqueezerCmd,
    48         NULL, NULL);
    49 
    50     return TCL_OK;
    51 }
    5232
    5333/*
    … …  
    199179        }
    200180    }
     181#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5)
     182    if (Tk_PhotoSetSize(interp, destPhoto, destw, srch) != TCL_OK) {
     183        return TCL_ERROR;
     184    }
     185    if (Tk_PhotoPutBlock(interp, destPhoto, &destBlock, 0, 0, destBlock.width,
     186                destBlock.height, TK_PHOTO_COMPOSITE_SET) != TCL_OK) {
     187        return TCL_ERROR;
     188    }
     189#else
    201190    Tk_PhotoSetSize(destPhoto, destw, srch);
    202191    Tk_PhotoPutBlock(destPhoto, &destBlock, 0, 0,
    203192        destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET);
    204 
     193#endif
    205194    ckfree((char*)destBlock.pixelPtr);
    206195    return TCL_OK;
    207196}
     197
     198/*
     199 * ------------------------------------------------------------------------
     200 *  RapptureSqueezer_Init --
     201 *
     202 *  Installs the "squeezer" command in a Tcl interpreter.
     203 *
     204 *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
     205 *  message in the interp) if anything goes wrong.
     206 * ------------------------------------------------------------------------
     207 */
     208int
     209Rappture_squeezer_Init(interp)
     210    Tcl_Interp *interp;         /* interpreter being initialized */
     211{
     212    /* install the widget command */
     213    Tcl_CreateCommand(interp, "squeezer", RpSqueezerCmd,
     214        NULL, NULL);
     215
     216    return TCL_OK;
     217}

  • branches/1.5/pkgs/system/curses.c

    r5902 r5903  
    2222 * ======================================================================
    2323 */
     24#include "config.h"
    2425#include "tcl.h"
    2526#include <string.h>

  • branches/1.5/pkgs/system/init.c

    r5902 r5903  
    2222#endif
    2323
    24 extern Tcl_AppInitProc Rappture_Init;
     24extern Tcl_AppInitProc RapptureSystem_Init;
    2525extern Tcl_AppInitProc RpRlimit_Init;
    2626extern Tcl_AppInitProc RpRusage_Init;
    … …  
    3131extern Tcl_AppInitProc RpCurses_Init;
    3232
    33 #ifdef notdef
    34 extern Tcl_AppInitProc RpLibrary_Init;
    35 #endif
    36 extern Tcl_AppInitProc RpUnits_Init;
    37 extern Tcl_AppInitProc RpEncoding_Init;
    38 extern Tcl_AppInitProc RpUtils_Init;
    39 
    4033#ifdef BUILD_Rappture
    4134__declspec( dllexport )
    4235#endif
    4336int
    44 Rappture_Init( Tcl_Interp * interp)
     37Rappture_system_Init( Tcl_Interp * interp)
    4538{
    4639#ifdef _WIN32
    4740    rpWinInitJob();
    4841#endif
    49     if (Tcl_InitStubs(interp, "8.4", 0) == NULL) {
    50         return TCL_ERROR;
    51     }
    52     if (Tcl_PkgProvide(interp, "Rappture", RAPPTURE_VERSION) != TCL_OK) {
    53         return TCL_ERROR;
    54     }
    55 #ifdef notdef
    56     if (RpLibrary_Init(interp) != TCL_OK) {
    57         return TCL_ERROR;
    58     }
    59 #endif
    60     if (RpUnits_Init(interp) != TCL_OK) {
    61         return TCL_ERROR;
    62     }
    63     if (RpEncoding_Init(interp) != TCL_OK) {
    64         return TCL_ERROR;
    65     }
    66     if (RpUtils_Init(interp) != TCL_OK) {
    67         return TCL_ERROR;
    68     }
    6942    if (RpRlimit_Init(interp) != TCL_OK) {
    7043        return TCL_ERROR;
    … …  
    8558        return TCL_ERROR;
    8659    }
     60#ifdef HAVE_LIBNCURSES
    8761    if (RpCurses_Init(interp) != TCL_OK) {
    8862        return TCL_ERROR;
    8963    }
     64#endif
    9065    return TCL_OK;
    9166}

  • branches/1.5/pkgs/system/op.c

    r5902 r5903  
    11
    22/*
    3  * RpOp.c --
     3 * op.c --
    44 *
    55 * This module implements utility procedures for the BLT toolkit.
    … …  
    3232#include <tcl.h>
    3333#include <string.h>
    34 #include "RpOp.h"
     34#include "op.h"
    3535/*
    3636 *---------------------------------------------------------------------------

  • branches/1.5/pkgs/system/rlimit.c

    r5902 r5903  
    2525
    2626#include <errno.h>
    27 #include "RpOp.h"
     27#include "op.h"
    2828
    2929static Tcl_ObjCmdProc RpRlimitCmd;

  • branches/1.5/pkgs/system/rusage.c

    r5902 r5903  
    2424#endif
    2525
    26 #include "RpOp.h"
     26#include "op.h"
    2727
    2828/*

  • branches/1.5/pkgs/system/switch.c

    r5902 r5903  
    3434#include <stdlib.h>
    3535#include <tcl.h>
    36 #include "Switch.h"
     36#include "switch.h"
    3737
    3838static void
Note: See TracChangeset for help on using the changeset viewer.