Changeset 2558
- Timestamp:
- Sep 21, 2011 9:37:11 PM (13 years ago)
- Location:
- branches/blt4
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4/gui/src/RpCanvPlacard.c
r2227 r2558 211 211 212 212 /* 213 * The record below describes a canvas widget. It is made available 214 * to the item procedures so they can access certain shared fields such 215 * as the overall displacement and scale factor for the canvas. 216 */ 217 218 typedef struct TkCanvas { 219 Tk_Window tkwin; /* Window that embodies the canvas. NULL 220 * means that the window has been destroyed 221 * but the data structures haven't yet been 222 * cleaned up.*/ 223 Display *display; /* Display containing widget; needed, among 224 * other things, to release resources after 225 * tkwin has already gone away. */ 226 Tcl_Interp *interp; /* Interpreter associated with canvas. */ 227 Tcl_Command widgetCmd; /* Token for canvas's widget command. */ 228 Tk_Item *firstItemPtr; /* First in list of all items in canvas, 229 * or NULL if canvas empty. */ 230 Tk_Item *lastItemPtr; /* Last in list of all items in canvas, 231 * or NULL if canvas empty. */ 232 233 /* 234 * Information used when displaying widget: 235 */ 236 237 int borderWidth; /* Width of 3-D border around window. */ 238 Tk_3DBorder bgBorder; /* Used for canvas background. */ 239 int relief; /* Indicates whether window as a whole is 240 * raised, sunken, or flat. */ 241 int highlightWidth; /* Width in pixels of highlight to draw 242 * around widget when it has the focus. 243 * <= 0 means don't draw a highlight. */ 244 XColor *highlightBgColorPtr; 245 /* Color for drawing traversal highlight 246 * area when highlight is off. */ 247 XColor *highlightColorPtr; /* Color for drawing traversal highlight. */ 248 int inset; /* Total width of all borders, including 249 * traversal highlight and 3-D border. 250 * Indicates how much interior stuff must 251 * be offset from outside edges to leave 252 * room for borders. */ 253 GC pixmapGC; /* Used to copy bits from a pixmap to the 254 * screen and also to clear the pixmap. */ 255 int width, height; /* Dimensions to request for canvas window, 256 * specified in pixels. */ 257 int redrawX1, redrawY1; /* Upper left corner of area to redraw, 258 * in pixel coordinates. Border pixels 259 * are included. Only valid if 260 * REDRAW_PENDING flag is set. */ 261 int redrawX2, redrawY2; /* Lower right corner of area to redraw, 262 * in integer canvas coordinates. Border 263 * pixels will *not* be redrawn. */ 264 int confine; /* Non-zero means constrain view to keep 265 * as much of canvas visible as possible. */ 266 267 /* 268 * Information used to manage the selection and insertion cursor: 269 */ 270 271 Tk_CanvasTextInfo textInfo; /* Contains lots of fields; see tk.h for 272 * details. This structure is shared with 273 * the code that implements individual items. */ 274 int insertOnTime; /* Number of milliseconds cursor should spend 275 * in "on" state for each blink. */ 276 int insertOffTime; /* Number of milliseconds cursor should spend 277 * in "off" state for each blink. */ 278 Tcl_TimerToken insertBlinkHandler; 279 /* Timer handler used to blink cursor on and 280 * off. */ 281 282 /* 283 * Transformation applied to canvas as a whole: to compute screen 284 * coordinates (X,Y) from canvas coordinates (x,y), do the following: 285 * 286 * X = x - xOrigin; 287 * Y = y - yOrigin; 288 */ 289 290 int xOrigin, yOrigin; /* Canvas coordinates corresponding to 291 * upper-left corner of window, given in 292 * canvas pixel units. */ 293 int drawableXOrigin, drawableYOrigin; 294 /* During redisplay, these fields give the 295 * canvas coordinates corresponding to 296 * the upper-left corner of the drawable 297 * where items are actually being drawn 298 * (typically a pixmap smaller than the 299 * whole window). */ 300 301 /* 302 * Information used for event bindings associated with items. 303 */ 304 305 Tk_BindingTable bindingTable; 306 /* Table of all bindings currently defined 307 * for this canvas. NULL means that no 308 * bindings exist, so the table hasn't been 309 * created. Each "object" used for this 310 * table is either a Tk_Uid for a tag or 311 * the address of an item named by id. */ 312 Tk_Item *currentItemPtr; /* The item currently containing the mouse 313 * pointer, or NULL if none. */ 314 Tk_Item *newCurrentPtr; /* The item that is about to become the 315 * current one, or NULL. This field is 316 * used to detect deletions of the new 317 * current item pointer that occur during 318 * Leave processing of the previous current 319 * item. */ 320 double closeEnough; /* The mouse is assumed to be inside an 321 * item if it is this close to it. */ 322 XEvent pickEvent; /* The event upon which the current choice 323 * of currentItem is based. Must be saved 324 * so that if the currentItem is deleted, 325 * can pick another. */ 326 int state; /* Last known modifier state. Used to 327 * defer picking a new current object 328 * while buttons are down. */ 329 330 /* 331 * Information used for managing scrollbars: 332 */ 333 334 char *xScrollCmd; /* Command prefix for communicating with 335 * horizontal scrollbar. NULL means no 336 * horizontal scrollbar. Malloc'ed*/ 337 char *yScrollCmd; /* Command prefix for communicating with 338 * vertical scrollbar. NULL means no 339 * vertical scrollbar. Malloc'ed*/ 340 int scrollX1, scrollY1, scrollX2, scrollY2; 341 /* These four coordinates define the region 342 * that is the 100% area for scrolling (i.e. 343 * these numbers determine the size and 344 * location of the sliders on scrollbars). 345 * Units are pixels in canvas coords. */ 346 char *regionString; /* The option string from which scrollX1 347 * etc. are derived. Malloc'ed. */ 348 int xScrollIncrement; /* If >0, defines a grid for horizontal 349 * scrolling. This is the size of the "unit", 350 * and the left edge of the screen will always 351 * lie on an even unit boundary. */ 352 int yScrollIncrement; /* If >0, defines a grid for horizontal 353 * scrolling. This is the size of the "unit", 354 * and the left edge of the screen will always 355 * lie on an even unit boundary. */ 356 357 /* 358 * Information used for scanning: 359 */ 360 361 int scanX; /* X-position at which scan started (e.g. 362 * button was pressed here). */ 363 int scanXOrigin; /* Value of xOrigin field when scan started. */ 364 int scanY; /* Y-position at which scan started (e.g. 365 * button was pressed here). */ 366 int scanYOrigin; /* Value of yOrigin field when scan started. */ 367 368 /* 369 * Information used to speed up searches by remembering the last item 370 * created or found with an item id search. 371 */ 372 373 Tk_Item *hotPtr; /* Pointer to "hot" item (one that's been 374 * recently used. NULL means there's no 375 * hot item. */ 376 Tk_Item *hotPrevPtr; /* Pointer to predecessor to hotPtr (NULL 377 * means item is first in list). This is 378 * only a hint and may not really be hotPtr's 379 * predecessor. */ 380 381 /* 382 * Miscellaneous information: 383 */ 384 385 Tk_Cursor cursor; /* Current cursor for window, or None. */ 386 char *takeFocus; /* Value of -takefocus option; not used in 387 * the C code, but used by keyboard traversal 388 * scripts. Malloc'ed, but may be NULL. */ 389 double pixelsPerMM; /* Scale factor between MM and pixels; 390 * used when converting coordinates. */ 391 int flags; /* Various flags; see below for 392 * definitions. */ 393 int nextId; /* Number to use as id for next item 394 * created in widget. */ 395 Tk_PostscriptInfo psInfo; 396 /* Pointer to information used for generating 397 * Postscript for the canvas. NULL means 398 * no Postscript is currently being 399 * generated. */ 400 Tcl_HashTable idTable; /* Table of integer indices. */ 401 /* 402 * Additional information, added by the 'dash'-patch 403 */ 404 VOID *reserved1; 405 Tk_State canvas_state; /* state of canvas */ 406 VOID *reserved2; 407 VOID *reserved3; 408 Tk_TSOffset tsoffset; 409 #ifndef USE_OLD_TAG_SEARCH 410 void *bindTagExprs; /* linked list of tag expressions used in bindings */ 411 #endif 412 } TkCanvas; 413 414 415 /* 213 416 * ------------------------------------------------------------------------ 214 417 * RpCanvPlacard_Init -- … … 1083 1286 { 1084 1287 PlacardItem *plPtr = (PlacardItem *) itemPtr; 1085 #ifdef notdef1086 1288 Tk_Window canvasWin = Tk_CanvasTkwin(canvas); 1087 #endif 1289 1088 1290 int x, y; 1089 1291 double xpos; … … 1120 1322 Tcl_AppendResult(interp, buffer, " translate\n", (char *) NULL); 1121 1323 } 1122 #ifdef notdef 1324 1123 1325 Tk_PostscriptImage(plPtr->imageLeft, interp, canvasWin, 1124 1326 ((TkCanvas*)canvas)->psInfo, 0, 0, 1125 1327 plPtr->imageLeftW, plPtr->imageLeftH, prepass); 1126 #endif 1328 1127 1329 if ( !prepass ) { 1128 1330 /* -
branches/blt4/packages/vizservers/configure
r2409 r2558 2632 2632 2633 2633 2634 with_vtk="yes"2635 with_vtk_libs=""2636 with_vtk_includes=""2637 with_rappture=""2638 with_tcllib=""2639 with_rappture="yes"2640 2641 2634 2642 2635 # Check whether --with-tcllib was given. … … 2662 2655 withval=$with_vtk_includes; with_vtk_includes=$withval 2663 2656 else 2664 with_vtk_includes= /usr/include/vtk-5.62657 with_vtk_includes="" 2665 2658 fi 2666 2659 … … 2671 2664 withval=$with_vtk_libs; with_vtk_libs=$withval 2672 2665 else 2673 with_vtk_libs= /usr/lib/vtk-5.62666 with_vtk_libs="" 2674 2667 fi 2675 2668 … … 8033 8026 fi 8034 8027 8035 RP2_INCL_DIR=""8036 8028 RP_DIR="" 8037 8029 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rappture" >&5 … … 8041 8033 if test -r "$dir/include/rappture2/rappture2.h" -a \ 8042 8034 -r "$dir/lib/librappture.a"; then 8043 RP_INCL_SPEC="-I$dir/include"8044 8035 RP_DIR="$dir" 8036 RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2" 8045 8037 RP_LIB_DIR="$dir/lib" 8046 8038 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5 … … 8050 8042 done 8051 8043 else 8052 if test -d "$with_rappture" ; then8044 if test ! -d "$with_rappture" ; then 8053 8045 as_fn_error $? "--with-rappture: no such directory $with_rappture" "$LINENO" 5 8054 8046 fi 8055 RP_ LIB=$with_rappture8056 RP_INC L_SPEC="-I$with_rappture/include"8047 RP_DIR=$with_rappture 8048 RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2" 8057 8049 RP_LIB_DIR="$with_rappture/lib" 8058 8050 fi … … 8089 8081 if test "x$with_vtk_libs" != "x"; then 8090 8082 VTK_LIB_DIR=$with_vtk_libs 8083 VTK_LIB_SPEC="-L$with_vtk_libs" 8091 8084 fi 8092 8085 … … 8493 8486 fi 8494 8487 8488 for ac_func in avformat_alloc_context 8489 do : 8490 ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context" 8491 if test "x$ac_cv_func_avformat_alloc_context" = xyes; then : 8492 cat >>confdefs.h <<_ACEOF 8493 #define HAVE_AVFORMAT_ALLOC_CONTEXT 1 8494 _ACEOF 8495 8496 fi 8497 done 8498 8495 8499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_free in -lavutil" >&5 8496 8500 $as_echo_n "checking for av_free in -lavutil... " >&6; } … … 8570 8574 CG_LIB_DIR="$dir/lib" 8571 8575 8572 echo CGDIR=$CG_DIR8573 8576 save_CPPFLAGS=$CPPFLAGS 8574 8577 CPPFLAGS="-I${CG_INC_DIR} $CPPFLAGS" -
branches/blt4/packages/vizservers/configure.in
r2542 r2558 132 132 fi 133 133 134 RP2_INCL_DIR=""135 134 RP_DIR="" 136 135 AC_MSG_CHECKING([for rappture]) … … 139 138 if test -r "$dir/include/rappture2/rappture2.h" -a \ 140 139 -r "$dir/lib/librappture.a"; then 141 RP_INCL_SPEC="-I$dir/include"142 140 RP_DIR="$dir" 141 RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2" 143 142 RP_LIB_DIR="$dir/lib" 144 143 AC_MSG_RESULT([$dir]) … … 150 149 AC_MSG_ERROR([--with-rappture: no such directory $with_rappture]) 151 150 fi 152 RP_ LIB=$with_rappture153 RP_INC L_SPEC="-I$with_rappture/include"151 RP_DIR=$with_rappture 152 RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2" 154 153 RP_LIB_DIR="$with_rappture/lib" 155 154 fi -
branches/blt4/packages/vizservers/nanoscale/Makefile.in
r2409 r2558 32 32 33 33 DEFINES = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" 34 INCLUDES = $(TCL_INC_SPEC)34 INCLUDES = -I. $(TCL_INC_SPEC) 35 35 LIBS = $(TCL_LIB_SPEC) \ 36 36 -Wl,-rpath,$(LD_RUN_PATH) -
branches/blt4/src/core/RpLibraryFInterface.cc
r2544 r2558 221 221 char* path, /* null terminated path */ 222 222 char* retText, /* return text buffer for fortran*/ 223 223 int path_len, 224 224 int retText_len) /* length of return text buffer */ 225 225 { … … 230 230 std::string inPath = ""; 231 231 232 inPath = null_terminate_str(path, path_len);232 inPath = null_terminate_str(path, path_len); 233 233 234 234 if ((handle) && (*handle != 0)) { … … 238 238 xmlText = lib->get(inPath); 239 239 if (!xmlText.empty()) { 240 fortranify(xmlText.c_str(),retText, retText_len);240 fortranify(xmlText.c_str(),retText, retText_len); 241 241 } 242 242
Note: See TracChangeset
for help on using the changeset viewer.