Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | [e9a842a3c5] Nataraja's changes, as far as I could reconstruct them from the truncated tar.gz file. Doesn't compile. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | rfe-e9a842a3c5 |
Files: | files | file ages | folders |
SHA1: |
a47459c6e6fe5a035c993f1c73204d7c |
User & Date: | jan.nijtmans 2013-09-13 23:23:05 |
Original Comment: | Nataraja's changes, as far as I could reconstruct them from the truncated tar.gz file. Doesn't compile. |
Context
2013-09-13
| ||
23:23 | [e9a842a3c5] Nataraja's changes, as far as I could reconstruct them from the truncated tar.gz file. Doesn't compile. Closed-Leaf check-in: a47459c6 user: jan.nijtmans tags: rfe-e9a842a3c5 | |
2013-08-26
| ||
11:00 | Bug [c597acdab3]: Call [$pb step] in tail position in ttk::progressbar::Autoincrement, so that the widget is in a consistent state when any write traces on the linked -variable are fired check-in: 35fd9c96 user: jan.nijtmans tags: core-8-5-branch | |
Changes
Changes to generic/tk.h.
︙ | ︙ | |||
116 117 118 119 120 121 122 123 124 125 126 127 128 129 | typedef struct Tk_PostscriptInfo_ *Tk_PostscriptInfo; typedef struct Tk_TextLayout_ *Tk_TextLayout; typedef struct Tk_Window_ *Tk_Window; typedef struct Tk_3DBorder_ *Tk_3DBorder; typedef struct Tk_Style_ *Tk_Style; typedef struct Tk_StyleEngine_ *Tk_StyleEngine; typedef struct Tk_StyledElement_ *Tk_StyledElement; /* * Additional types exported to clients. */ typedef const char *Tk_Uid; | > | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | typedef struct Tk_PostscriptInfo_ *Tk_PostscriptInfo; typedef struct Tk_TextLayout_ *Tk_TextLayout; typedef struct Tk_Window_ *Tk_Window; typedef struct Tk_3DBorder_ *Tk_3DBorder; typedef struct Tk_Style_ *Tk_Style; typedef struct Tk_StyleEngine_ *Tk_StyleEngine; typedef struct Tk_StyledElement_ *Tk_StyledElement; typedef struct Tk_BgTile_ *Tk_BgTile; /* * Additional types exported to clients. */ typedef const char *Tk_Uid; |
︙ | ︙ | |||
685 686 687 688 689 690 691 | Bool send_event; /* True if this came from a SendEvent * request. */ Display *display; /* Display the event was read from. */ Window window; /* Window in which event occurred. */ } XActivateDeactivateEvent; typedef XActivateDeactivateEvent XActivateEvent; typedef XActivateDeactivateEvent XDeactivateEvent; | | | 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 | Bool send_event; /* True if this came from a SendEvent * request. */ Display *display; /* Display the event was read from. */ Window window; /* Window in which event occurred. */ } XActivateDeactivateEvent; typedef XActivateDeactivateEvent XActivateEvent; typedef XActivateDeactivateEvent XDeactivateEvent; /* *---------------------------------------------------------------------- * * Macros for querying Tk_Window structures. See the manual entries for * documentation. * *---------------------------------------------------------------------- |
︙ | ︙ | |||
728 729 730 731 732 733 734 735 736 737 738 739 740 741 | (((Tk_FakeWin *) (tkwin))->flags & TK_HAS_WRAPPER) #define Tk_WinManaged(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_WIN_MANAGED) #define Tk_TopWinHierarchy(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY) #define Tk_IsManageable(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE) #define Tk_ReqWidth(tkwin) (((Tk_FakeWin *) (tkwin))->reqWidth) #define Tk_ReqHeight(tkwin) (((Tk_FakeWin *) (tkwin))->reqHeight) /* Tk_InternalBorderWidth is deprecated */ #define Tk_InternalBorderWidth(tkwin) \ (((Tk_FakeWin *) (tkwin))->internalBorderLeft) #define Tk_InternalBorderLeft(tkwin) \ (((Tk_FakeWin *) (tkwin))->internalBorderLeft) | > > > > | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 | (((Tk_FakeWin *) (tkwin))->flags & TK_HAS_WRAPPER) #define Tk_WinManaged(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_WIN_MANAGED) #define Tk_TopWinHierarchy(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY) #define Tk_IsManageable(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE) #define Tk_IsBgTileTop(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_BGTILE_TOP) #define Tk_IsResizeYes(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_RESIZE_YES) #define Tk_ReqWidth(tkwin) (((Tk_FakeWin *) (tkwin))->reqWidth) #define Tk_ReqHeight(tkwin) (((Tk_FakeWin *) (tkwin))->reqHeight) /* Tk_InternalBorderWidth is deprecated */ #define Tk_InternalBorderWidth(tkwin) \ (((Tk_FakeWin *) (tkwin))->internalBorderLeft) #define Tk_InternalBorderLeft(tkwin) \ (((Tk_FakeWin *) (tkwin))->internalBorderLeft) |
︙ | ︙ | |||
864 865 866 867 868 869 870 871 872 873 874 875 876 877 | * window hierarchy within this process, i.e. the * window's parent either doesn't exist or is not * owned by this Tk application. * TK_PROP_PROPCHANGE 1 means that PropertyNotify events in the * window's children should propagate up to this * window. * TK_WM_MANAGEABLE 1 marks a window as capable of being converted * into a toplevel using [wm manage]. */ #define TK_MAPPED 1 #define TK_TOP_LEVEL 2 #define TK_ALREADY_DEAD 4 #define TK_NEED_CONFIG_NOTIFY 8 | > > > | 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 | * window hierarchy within this process, i.e. the * window's parent either doesn't exist or is not * owned by this Tk application. * TK_PROP_PROPCHANGE 1 means that PropertyNotify events in the * window's children should propagate up to this * window. * TK_WM_MANAGEABLE 1 marks a window as capable of being converted * TK_BGTILE_TOP 1 means that a Frame is top of a bg tile hierarchy. * TK_RESIZE_YES 1 on toplevel means grid/pack always resizes. * Needed for bgtile resize to redisplay correctly. * into a toplevel using [wm manage]. */ #define TK_MAPPED 1 #define TK_TOP_LEVEL 2 #define TK_ALREADY_DEAD 4 #define TK_NEED_CONFIG_NOTIFY 8 |
︙ | ︙ | |||
887 888 889 890 891 892 893 | #define TK_REPARENTED 0x2000 #define TK_ANONYMOUS_WINDOW 0x4000 #define TK_HAS_WRAPPER 0x8000 #define TK_WIN_MANAGED 0x10000 #define TK_TOP_HIERARCHY 0x20000 #define TK_PROP_PROPCHANGE 0x40000 #define TK_WM_MANAGEABLE 0x80000 | > > | | 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 | #define TK_REPARENTED 0x2000 #define TK_ANONYMOUS_WINDOW 0x4000 #define TK_HAS_WRAPPER 0x8000 #define TK_WIN_MANAGED 0x10000 #define TK_TOP_HIERARCHY 0x20000 #define TK_PROP_PROPCHANGE 0x40000 #define TK_WM_MANAGEABLE 0x80000 #define TK_BGTILE_TOP 0x80000 #define TK_RESIZE_YES 0x100000 /* *---------------------------------------------------------------------- * * Procedure prototypes and structures used for defining new canvas items: * *---------------------------------------------------------------------- */ |
︙ | ︙ | |||
945 946 947 948 949 950 951 | * guaranteed to contain every pixel drawn in * item. Item area includes x1 and y1 but not * x2 and y2. */ struct Tk_Item *prevPtr; /* Previous in display list of all items in * this canvas. Later items in list are drawn * just below earlier ones. */ Tk_State state; /* State of item. */ | < | > > > | 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 | * guaranteed to contain every pixel drawn in * item. Item area includes x1 and y1 but not * x2 and y2. */ struct Tk_Item *prevPtr; /* Previous in display list of all items in * this canvas. Later items in list are drawn * just below earlier ones. */ Tk_State state; /* State of item. */ int redraw_flags; /* Some flags used in the canvas */ int dis; /* *------------------------------------------------------------------ * Starting here is additional type-specific stuff; see the declarations * for individual types to see what is part of each type. The actual space * below is determined by the "itemInfoSize" of the type's Tk_ItemType * record. *------------------------------------------------------------------ */ struct Tk_Item *nextPtr1; struct Tk_Item *prevPtr1; struct Tk_Item *next_obj; } Tk_Item; /* * Flag bits for canvases (redraw_flags): * * TK_ITEM_STATE_DEPENDANT - 1 means that object needs to be redrawn if the * canvas state changes. |
︙ | ︙ | |||
1184 1185 1186 1187 1188 1189 1190 | XColor *disabledColor; /* Outline color if state is disabled. */ Pixmap stipple; /* Outline Stipple pattern. */ Pixmap activeStipple; /* Outline Stipple pattern if state is * active. */ Pixmap disabledStipple; /* Outline Stipple pattern if state is * disabled. */ } Tk_Outline; | | | 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 | XColor *disabledColor; /* Outline color if state is disabled. */ Pixmap stipple; /* Outline Stipple pattern. */ Pixmap activeStipple; /* Outline Stipple pattern if state is * active. */ Pixmap disabledStipple; /* Outline Stipple pattern if state is * disabled. */ } Tk_Outline; /* *---------------------------------------------------------------------- * * Procedure prototypes and structures used for managing images: * *---------------------------------------------------------------------- */ |
︙ | ︙ | |||
1369 1370 1371 1372 1373 1374 1375 | * representation of the data in a photo * image.*/ struct Tk_PhotoImageFormat *nextPtr; /* Next in list of all photo image formats * currently known. Filled in by Tk, not by * image format handler. */ }; | | | 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 | * representation of the data in a photo * image.*/ struct Tk_PhotoImageFormat *nextPtr; /* Next in list of all photo image formats * currently known. Filled in by Tk, not by * image format handler. */ }; /* *---------------------------------------------------------------------- * * Procedure prototypes and structures used for managing styles: * *---------------------------------------------------------------------- */ |
︙ | ︙ | |||
1437 1438 1439 1440 1441 1442 1443 | * Element state flags. Can be OR'ed. */ #define TK_ELEMENT_STATE_ACTIVE 1<<0 #define TK_ELEMENT_STATE_DISABLED 1<<1 #define TK_ELEMENT_STATE_FOCUS 1<<2 #define TK_ELEMENT_STATE_PRESSED 1<<3 | | | 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 | * Element state flags. Can be OR'ed. */ #define TK_ELEMENT_STATE_ACTIVE 1<<0 #define TK_ELEMENT_STATE_DISABLED 1<<1 #define TK_ELEMENT_STATE_FOCUS 1<<2 #define TK_ELEMENT_STATE_PRESSED 1<<3 /* *---------------------------------------------------------------------- * * The definitions below provide backward compatibility for functions and * types related to event handling that used to be in Tk but have moved to * Tcl. * |
︙ | ︙ | |||
1497 1498 1499 1500 1501 1502 1503 | #ifndef USE_TK_STUBS #define Tk_InitStubs(interp, version, exact) \ Tk_PkgInitStubsCheck(interp, version, exact) #endif /* USE_TK_STUBS */ #define Tk_InitImageArgs(interp, argc, argv) /**/ | | | 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 | #ifndef USE_TK_STUBS #define Tk_InitStubs(interp, version, exact) \ Tk_PkgInitStubsCheck(interp, version, exact) #endif /* USE_TK_STUBS */ #define Tk_InitImageArgs(interp, argc, argv) /**/ /* *---------------------------------------------------------------------- * * Additional procedure types defined by Tk. * *---------------------------------------------------------------------- */ |
︙ | ︙ | |||
1596 1597 1598 1599 1600 1601 1602 | */ #ifdef __cplusplus } #endif #endif /* _TK */ | | | 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 | */ #ifdef __cplusplus } #endif #endif /* _TK */ /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ |
Changes to generic/tkCanvas.c.
|
| | < | | 1 2 3 4 5 6 7 8 9 | /* * * This module implements canvas widgets for the Tk toolkit. A canvas * displays a background and a collection of graphical objects such as * rectangles, lines, and texts. * * Copyright (c) 1991-1994 The Regents of the University of California. * Copyright (c) 1994-1997 Sun Microsystems, Inc. * Copyright (c) 1998-1999 by Scriptics Corporation. |
︙ | ︙ | |||
147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | DEF_CANVAS_INSERT_BG, Tk_Offset(TkCanvas, textInfo.insertBorder), 0}, {TK_CONFIG_PIXELS, "-insertborderwidth", "insertBorderWidth", "BorderWidth", DEF_CANVAS_INSERT_BD_COLOR, Tk_Offset(TkCanvas, textInfo.insertBorderWidth), TK_CONFIG_COLOR_ONLY}, {TK_CONFIG_PIXELS, "-insertborderwidth", "insertBorderWidth", "BorderWidth", DEF_CANVAS_INSERT_BD_MONO, Tk_Offset(TkCanvas, textInfo.insertBorderWidth), TK_CONFIG_MONO_ONLY}, {TK_CONFIG_INT, "-insertofftime", "insertOffTime", "OffTime", DEF_CANVAS_INSERT_OFF_TIME, Tk_Offset(TkCanvas, insertOffTime), 0}, {TK_CONFIG_INT, "-insertontime", "insertOnTime", "OnTime", DEF_CANVAS_INSERT_ON_TIME, Tk_Offset(TkCanvas, insertOnTime), 0}, {TK_CONFIG_PIXELS, "-insertwidth", "insertWidth", "InsertWidth", DEF_CANVAS_INSERT_WIDTH, Tk_Offset(TkCanvas, textInfo.insertWidth), 0}, {TK_CONFIG_CUSTOM, "-offset", "offset", "Offset", "0,0", Tk_Offset(TkCanvas, tsoffset),TK_CONFIG_DONT_SET_DEFAULT, &offsetOption}, {TK_CONFIG_RELIEF, "-relief", "relief", "Relief", DEF_CANVAS_RELIEF, Tk_Offset(TkCanvas, relief), 0}, {TK_CONFIG_STRING, "-scrollregion", "scrollRegion", "ScrollRegion", DEF_CANVAS_SCROLL_REGION, Tk_Offset(TkCanvas, regionString), TK_CONFIG_NULL_OK}, {TK_CONFIG_BORDER, "-selectbackground", "selectBackground", "Foreground", DEF_CANVAS_SELECT_COLOR, Tk_Offset(TkCanvas, textInfo.selBorder), TK_CONFIG_COLOR_ONLY}, {TK_CONFIG_BORDER, "-selectbackground", "selectBackground", "Foreground", DEF_CANVAS_SELECT_MONO, Tk_Offset(TkCanvas, textInfo.selBorder), TK_CONFIG_MONO_ONLY}, {TK_CONFIG_PIXELS, "-selectborderwidth", "selectBorderWidth", "BorderWidth", | > > > > > | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | DEF_CANVAS_INSERT_BG, Tk_Offset(TkCanvas, textInfo.insertBorder), 0}, {TK_CONFIG_PIXELS, "-insertborderwidth", "insertBorderWidth", "BorderWidth", DEF_CANVAS_INSERT_BD_COLOR, Tk_Offset(TkCanvas, textInfo.insertBorderWidth), TK_CONFIG_COLOR_ONLY}, {TK_CONFIG_PIXELS, "-insertborderwidth", "insertBorderWidth", "BorderWidth", DEF_CANVAS_INSERT_BD_MONO, Tk_Offset(TkCanvas, textInfo.insertBorderWidth), TK_CONFIG_MONO_ONLY}, {TK_CONFIG_INT, "-datatype", "datatype", "datatype", DEF_CANVAS_INSERT_OFF_TIME, Tk_Offset(TkCanvas, datatype), 0}, {TK_CONFIG_INT, "-insertofftime", "insertOffTime", "OffTime", DEF_CANVAS_INSERT_OFF_TIME, Tk_Offset(TkCanvas, insertOffTime), 0}, {TK_CONFIG_INT, "-insertontime", "insertOnTime", "OnTime", DEF_CANVAS_INSERT_ON_TIME, Tk_Offset(TkCanvas, insertOnTime), 0}, {TK_CONFIG_PIXELS, "-insertwidth", "insertWidth", "InsertWidth", DEF_CANVAS_INSERT_WIDTH, Tk_Offset(TkCanvas, textInfo.insertWidth), 0}, {TK_CONFIG_CUSTOM, "-offset", "offset", "Offset", "0,0", Tk_Offset(TkCanvas, tsoffset),TK_CONFIG_DONT_SET_DEFAULT, &offsetOption}, {TK_CONFIG_RELIEF, "-relief", "relief", "Relief", DEF_CANVAS_RELIEF, Tk_Offset(TkCanvas, relief), 0}, {TK_CONFIG_STRING, "-scrollregion", "scrollRegion", "ScrollRegion", DEF_CANVAS_SCROLL_REGION, Tk_Offset(TkCanvas, regionString), TK_CONFIG_NULL_OK}, TK_BGTILESCROLL_CONFIG(TkCanvas) {TK_CONFIG_BORDER, "-selectbackground", "selectBackground", "Foreground", DEF_CANVAS_SELECT_COLOR, Tk_Offset(TkCanvas, textInfo.selBorder), TK_CONFIG_COLOR_ONLY}, {TK_CONFIG_BORDER, "-selectbackground", "selectBackground", "Foreground", DEF_CANVAS_SELECT_MONO, Tk_Offset(TkCanvas, textInfo.selBorder), TK_CONFIG_MONO_ONLY}, {TK_CONFIG_PIXELS, "-selectborderwidth", "selectBorderWidth", "BorderWidth", |
︙ | ︙ | |||
185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | TK_CONFIG_MONO_ONLY|TK_CONFIG_NULL_OK}, {TK_CONFIG_CUSTOM, "-state", "state", "State", "normal", Tk_Offset(TkCanvas, canvas_state), TK_CONFIG_DONT_SET_DEFAULT, &stateOption}, {TK_CONFIG_STRING, "-takefocus", "takeFocus", "TakeFocus", DEF_CANVAS_TAKE_FOCUS, Tk_Offset(TkCanvas, takeFocus), TK_CONFIG_NULL_OK}, {TK_CONFIG_PIXELS, "-width", "width", "Width", DEF_CANVAS_WIDTH, Tk_Offset(TkCanvas, width), 0}, {TK_CONFIG_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand", DEF_CANVAS_X_SCROLL_CMD, Tk_Offset(TkCanvas, xScrollCmd), TK_CONFIG_NULL_OK}, {TK_CONFIG_PIXELS, "-xscrollincrement", "xScrollIncrement", "ScrollIncrement", DEF_CANVAS_X_SCROLL_INCREMENT, Tk_Offset(TkCanvas, xScrollIncrement), 0}, {TK_CONFIG_STRING, "-yscrollcommand", "yScrollCommand", "ScrollCommand", DEF_CANVAS_Y_SCROLL_CMD, Tk_Offset(TkCanvas, yScrollCmd), TK_CONFIG_NULL_OK}, {TK_CONFIG_PIXELS, "-yscrollincrement", "yScrollIncrement", "ScrollIncrement", DEF_CANVAS_Y_SCROLL_INCREMENT, Tk_Offset(TkCanvas, yScrollIncrement), 0}, {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0} }; /* * List of all the item types known at present. This is *global* and is * protected by typeListMutex. */ static Tk_ItemType *typeList = NULL; /* NULL means initialization hasn't | > > > | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | TK_CONFIG_MONO_ONLY|TK_CONFIG_NULL_OK}, {TK_CONFIG_CUSTOM, "-state", "state", "State", "normal", Tk_Offset(TkCanvas, canvas_state), TK_CONFIG_DONT_SET_DEFAULT, &stateOption}, {TK_CONFIG_STRING, "-takefocus", "takeFocus", "TakeFocus", DEF_CANVAS_TAKE_FOCUS, Tk_Offset(TkCanvas, takeFocus), TK_CONFIG_NULL_OK}, TK_BGTILE_CONFIG(TkCanvas) {TK_CONFIG_PIXELS, "-width", "width", "Width", DEF_CANVAS_WIDTH, Tk_Offset(TkCanvas, width), 0}, {TK_CONFIG_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand", DEF_CANVAS_X_SCROLL_CMD, Tk_Offset(TkCanvas, xScrollCmd), TK_CONFIG_NULL_OK}, {TK_CONFIG_PIXELS, "-xscrollincrement", "xScrollIncrement", "ScrollIncrement", DEF_CANVAS_X_SCROLL_INCREMENT, Tk_Offset(TkCanvas, xScrollIncrement), 0}, {TK_CONFIG_STRING, "-yscrollcommand", "yScrollCommand", "ScrollCommand", DEF_CANVAS_Y_SCROLL_CMD, Tk_Offset(TkCanvas, yScrollCmd), TK_CONFIG_NULL_OK}, {TK_CONFIG_PIXELS, "-yscrollincrement", "yScrollIncrement", "ScrollIncrement", DEF_CANVAS_Y_SCROLL_INCREMENT, Tk_Offset(TkCanvas, yScrollIncrement), 0}, {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0} }; Tk_Canvas *canvas_global; /* * List of all the item types known at present. This is *global* and is * protected by typeListMutex. */ static Tk_ItemType *typeList = NULL; /* NULL means initialization hasn't |
︙ | ︙ | |||
267 268 269 270 271 272 273 274 275 276 277 278 279 280 | Tcl_Obj *CONST *argv); static void CanvasWorldChanged( ClientData instanceData); static int ConfigureCanvas(Tcl_Interp *interp, TkCanvas *canvasPtr, int argc, Tcl_Obj *CONST *argv, int flags); static void DestroyCanvas(char *memPtr); static void DisplayCanvas(ClientData clientData); static void DoItem(Tcl_Interp *interp, Tk_Item *itemPtr, Tk_Uid tag); static void EventuallyRedrawItem(Tk_Canvas canvas, Tk_Item *itemPtr); #ifdef USE_OLD_TAG_SEARCH static int FindItems(Tcl_Interp *interp, TkCanvas *canvasPtr, | > | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 | Tcl_Obj *CONST *argv); static void CanvasWorldChanged( ClientData instanceData); static int ConfigureCanvas(Tcl_Interp *interp, TkCanvas *canvasPtr, int argc, Tcl_Obj *CONST *argv, int flags); static void DestroyCanvas(char *memPtr); static void DisplayCanvas_clone(ClientData clientData,int dis,double scale); static void DisplayCanvas(ClientData clientData); static void DoItem(Tcl_Interp *interp, Tk_Item *itemPtr, Tk_Uid tag); static void EventuallyRedrawItem(Tk_Canvas canvas, Tk_Item *itemPtr); #ifdef USE_OLD_TAG_SEARCH static int FindItems(Tcl_Interp *interp, TkCanvas *canvasPtr, |
︙ | ︙ | |||
348 349 350 351 352 353 354 | if ((result=TagSearchScan(canvasPtr,(objPtr),(searchPtrPtr))) != TCL_OK){ \ errorExitClause; \ } \ for (itemPtr = TagSearchFirst(*(searchPtrPtr)); \ itemPtr != NULL; itemPtr = TagSearchNext(*(searchPtrPtr))) #endif /* USE_OLD_TAG_SEARCH */ | | | 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | if ((result=TagSearchScan(canvasPtr,(objPtr),(searchPtrPtr))) != TCL_OK){ \ errorExitClause; \ } \ for (itemPtr = TagSearchFirst(*(searchPtrPtr)); \ itemPtr != NULL; itemPtr = TagSearchNext(*(searchPtrPtr))) #endif /* USE_OLD_TAG_SEARCH */ /* *-------------------------------------------------------------- * * Tk_CanvasObjCmd -- * * This function is invoked to process the "canvas" Tcl command. See the * user documentation for details on what it does. |
︙ | ︙ | |||
396 397 398 399 400 401 402 | } /* * Initialize fields that won't be initialized by ConfigureCanvas, or * which ConfigureCanvas expects to have reasonable values (e.g. resource * pointers). */ | | > > > > > | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 | } /* * Initialize fields that won't be initialized by ConfigureCanvas, or * which ConfigureCanvas expects to have reasonable values (e.g. resource * pointers). */ //printf("started 1\n"); canvasPtr = (TkCanvas *) ckalloc(sizeof(TkCanvas)); canvas_global = canvasPtr; printf("%p %p\n",canvasPtr,canvas_global); canvasPtr->tkwin = newWin; canvasPtr->display = Tk_Display(newWin); canvasPtr->interp = interp; canvasPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(canvasPtr->tkwin), CanvasWidgetCmd, (ClientData) canvasPtr, CanvasCmdDeletedProc); canvasPtr->scanall = 1; canvasPtr->firstItemPtr1 = NULL; canvasPtr->firstItemPtr = NULL; canvasPtr->lastItemPtr = NULL; canvasPtr->lastItemPtr1 = NULL; canvasPtr->borderWidth = 0; canvasPtr->bgBorder = NULL; canvasPtr->relief = TK_RELIEF_FLAT; canvasPtr->highlightWidth = 0; canvasPtr->highlightBgColorPtr = NULL; canvasPtr->highlightColorPtr = NULL; canvasPtr->inset = 0; |
︙ | ︙ | |||
470 471 472 473 474 475 476 477 478 479 480 481 482 483 | canvasPtr->flags = 0; canvasPtr->nextId = 1; canvasPtr->psInfo = NULL; canvasPtr->canvas_state = TK_STATE_NORMAL; canvasPtr->tsoffset.flags = 0; canvasPtr->tsoffset.xoffset = 0; canvasPtr->tsoffset.yoffset = 0; #ifndef USE_OLD_TAG_SEARCH canvasPtr->bindTagExprs = NULL; #endif Tcl_InitHashTable(&canvasPtr->idTable, TCL_ONE_WORD_KEYS); Tk_SetClass(canvasPtr->tkwin, "Canvas"); Tk_SetClassProcs(canvasPtr->tkwin, &canvasClass, (ClientData) canvasPtr); | > | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 | canvasPtr->flags = 0; canvasPtr->nextId = 1; canvasPtr->psInfo = NULL; canvasPtr->canvas_state = TK_STATE_NORMAL; canvasPtr->tsoffset.flags = 0; canvasPtr->tsoffset.xoffset = 0; canvasPtr->tsoffset.yoffset = 0; canvasPtr->bgTile = NULL; #ifndef USE_OLD_TAG_SEARCH canvasPtr->bindTagExprs = NULL; #endif Tcl_InitHashTable(&canvasPtr->idTable, TCL_ONE_WORD_KEYS); Tk_SetClass(canvasPtr->tkwin, "Canvas"); Tk_SetClassProcs(canvasPtr->tkwin, &canvasClass, (ClientData) canvasPtr); |
︙ | ︙ | |||
497 498 499 500 501 502 503 | Tcl_SetResult(interp, Tk_PathName(canvasPtr->tkwin), TCL_STATIC); return TCL_OK; error: Tk_DestroyWindow(canvasPtr->tkwin); return TCL_ERROR; } | | | 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 | Tcl_SetResult(interp, Tk_PathName(canvasPtr->tkwin), TCL_STATIC); return TCL_OK; error: Tk_DestroyWindow(canvasPtr->tkwin); return TCL_ERROR; } /* *-------------------------------------------------------------- * * CanvasWidgetCmd -- * * This function is invoked to process the Tcl command that corresponds * to a widget managed by this module. See the user documentation for |
︙ | ︙ | |||
543 544 545 546 547 548 549 | "addtag", "bbox", "bind", "canvasx", "canvasy", "cget", "configure", "coords", "create", "dchars", "delete", "dtag", "find", "focus", "gettags", "icursor", "index", "insert", "itemcget", "itemconfigure", "lower", "move", "postscript", "raise", "scale", "scan", "select", "type", | | | | | 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 | "addtag", "bbox", "bind", "canvasx", "canvasy", "cget", "configure", "coords", "create", "dchars", "delete", "dtag", "find", "focus", "gettags", "icursor", "index", "insert", "itemcget", "itemconfigure", "lower", "move", "postscript", "raise", "scale", "scan", "select", "type", "xview", "yview", "scanall" , "scancur", NULL }; enum options { CANV_ADDTAG, CANV_BBOX, CANV_BIND, CANV_CANVASX, CANV_CANVASY, CANV_CGET, CANV_CONFIGURE, CANV_COORDS, CANV_CREATE, CANV_DCHARS, CANV_DELETE, CANV_DTAG, CANV_FIND, CANV_FOCUS, CANV_GETTAGS, CANV_ICURSOR, CANV_INDEX, CANV_INSERT, CANV_ITEMCGET, CANV_ITEMCONFIGURE, CANV_LOWER, CANV_MOVE, CANV_POSTSCRIPT,CANV_RAISE, CANV_SCALE, CANV_SCAN, CANV_SELECT, CANV_TYPE, CANV_XVIEW, CANV_YVIEW , CANV_SCANALL , CANV_SCANCUR }; //printf("started 2\n"); if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; |
︙ | ︙ | |||
964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 | typePtr = matchPtr; itemPtr = (Tk_Item *) ckalloc((unsigned) typePtr->itemSize); itemPtr->id = canvasPtr->nextId; canvasPtr->nextId++; itemPtr->tagPtr = itemPtr->staticTagSpace; itemPtr->tagSpace = TK_TAG_SPACE; itemPtr->numTags = 0; itemPtr->typePtr = typePtr; itemPtr->state = TK_STATE_NULL; itemPtr->redraw_flags = 0; if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) { result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, objv+3); } else { CONST char **args = TkGetStringsFromObjs(objc-3, objv+3); result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, (Tcl_Obj **) args); if (args != NULL) { ckfree((char *) args); } } if (result != TCL_OK) { ckfree((char *) itemPtr); result = TCL_ERROR; goto done; } itemPtr->nextPtr = NULL; entryPtr = Tcl_CreateHashEntry(&canvasPtr->idTable, (char *) INT2PTR(itemPtr->id), &isNew); Tcl_SetHashValue(entryPtr, itemPtr); itemPtr->prevPtr = canvasPtr->lastItemPtr; canvasPtr->hotPtr = itemPtr; | > > > > | > > > > > > > > > > > | 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 | typePtr = matchPtr; itemPtr = (Tk_Item *) ckalloc((unsigned) typePtr->itemSize); itemPtr->id = canvasPtr->nextId; canvasPtr->nextId++; itemPtr->tagPtr = itemPtr->staticTagSpace; itemPtr->tagSpace = TK_TAG_SPACE; itemPtr->numTags = 0; itemPtr->dis = 1; itemPtr->typePtr = typePtr; itemPtr->state = TK_STATE_NULL; itemPtr->redraw_flags = 0; if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) { result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, objv+3); } else { CONST char **args = TkGetStringsFromObjs(objc-3, objv+3); result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, (Tcl_Obj **) args); if (args != NULL) { ckfree((char *) args); } } if (result != TCL_OK) { ckfree((char *) itemPtr); result = TCL_ERROR; goto done; } itemPtr->nextPtr = NULL; itemPtr->nextPtr1 = NULL; entryPtr = Tcl_CreateHashEntry(&canvasPtr->idTable, (char *) INT2PTR(itemPtr->id), &isNew); Tcl_SetHashValue(entryPtr, itemPtr); // Modified by nataraja itemPtr->prevPtr1 = canvasPtr->lastItemPtr1; itemPtr->prevPtr = canvasPtr->lastItemPtr; canvasPtr->hotPtr = itemPtr; canvasPtr->hotPrevPtr = canvasPtr->lastItemPtr1; if (canvasPtr->lastItemPtr == NULL) { canvasPtr->firstItemPtr = itemPtr; } else { canvasPtr->lastItemPtr->nextPtr = itemPtr; } if (canvasPtr->lastItemPtr1 == NULL) { canvasPtr->firstItemPtr1 = itemPtr; } else { canvasPtr->lastItemPtr1->nextPtr1 = itemPtr; } canvasPtr->lastItemPtr = itemPtr; canvasPtr->lastItemPtr1 = itemPtr; /////////////////////////////////// itemPtr->redraw_flags |= FORCE_REDRAW; EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr); canvasPtr->flags |= REPICK_NEEDED; sprintf(buf, "%d", itemPtr->id); Tcl_SetResult(interp, buf, TCL_VOLATILE); break; } |
︙ | ︙ | |||
1070 1071 1072 1073 1074 1075 1076 | itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW; } break; } case CANV_DELETE: { int i; Tcl_HashEntry *entryPtr; | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 | itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW; } break; } case CANV_DELETE: { int i; Tcl_HashEntry *entryPtr; for (i = 2; i < objc; i++) { FOR_EVERY_CANVAS_ITEM_MATCHING(objv[i], &searchPtr, goto done) { EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr); if (canvasPtr->bindingTable != NULL) { Tk_DeleteAllBindings(canvasPtr->bindingTable, (ClientData) itemPtr); } (*itemPtr->typePtr->deleteProc)((Tk_Canvas) canvasPtr, itemPtr, canvasPtr->display); if (itemPtr->tagPtr != itemPtr->staticTagSpace) { ckfree((char *) itemPtr->tagPtr); } entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable, (char *) INT2PTR(itemPtr->id)); Tcl_DeleteHashEntry(entryPtr); // modified by nataraja //printf("%p %p %p",itemPtr,itemPtr->nextPtr1,itemPtr->prevPtr1); if (itemPtr->nextPtr != NULL) { itemPtr->nextPtr->prevPtr = itemPtr->prevPtr; } if (itemPtr->nextPtr1 != NULL) { itemPtr->nextPtr1->prevPtr1 = itemPtr->prevPtr1; } if (itemPtr->prevPtr != NULL) { itemPtr->prevPtr->nextPtr = itemPtr->nextPtr; } if (itemPtr->prevPtr1 != NULL) { itemPtr->prevPtr1->nextPtr1 = itemPtr->nextPtr1; } if (canvasPtr->firstItemPtr == itemPtr) { canvasPtr->firstItemPtr = itemPtr->nextPtr; if (canvasPtr->firstItemPtr == NULL) { canvasPtr->lastItemPtr = NULL; } } if (canvasPtr->firstItemPtr1 == itemPtr) { canvasPtr->firstItemPtr1 = itemPtr->nextPtr1; if (canvasPtr->firstItemPtr1 == NULL) { canvasPtr->lastItemPtr1 = NULL; } } if (canvasPtr->lastItemPtr == itemPtr) { canvasPtr->lastItemPtr = itemPtr->prevPtr; } if (canvasPtr->lastItemPtr1 == itemPtr) { canvasPtr->lastItemPtr1 = itemPtr->prevPtr1; } //printf("Freeing pointer %p\n",itemPtr); //////////////////////////////// ckfree((char *) itemPtr); if (itemPtr == canvasPtr->currentItemPtr) { canvasPtr->currentItemPtr = NULL; canvasPtr->flags |= REPICK_NEEDED; } if (itemPtr == canvasPtr->newCurrentPtr) { canvasPtr->newCurrentPtr = NULL; |
︙ | ︙ | |||
1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 | } if ((itemPtr == canvasPtr->hotPtr) || (itemPtr == canvasPtr->hotPrevPtr)) { canvasPtr->hotPtr = NULL; } } } break; } case CANV_DTAG: { Tk_Uid tag; int i; if ((objc != 3) && (objc != 4)) { | > | 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 | } if ((itemPtr == canvasPtr->hotPtr) || (itemPtr == canvasPtr->hotPrevPtr)) { canvasPtr->hotPtr = NULL; } } } //printf("END delete \n"); break; } case CANV_DTAG: { Tk_Uid tag; int i; if ((objc != 3) && (objc != 4)) { |
︙ | ︙ | |||
1482 1483 1484 1485 1486 1487 1488 1489 | RelinkItems(canvasPtr, objv[2], prevPtr); #else /* USE_OLD_TAG_SEARCH */ result = RelinkItems(canvasPtr, objv[2], prevPtr, &searchPtr); #endif /* USE_OLD_TAG_SEARCH */ break; } case CANV_SCALE: { double xOrigin, yOrigin, xScale, yScale; | > < | | | | | | < > > > > | 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 | RelinkItems(canvasPtr, objv[2], prevPtr); #else /* USE_OLD_TAG_SEARCH */ result = RelinkItems(canvasPtr, objv[2], prevPtr, &searchPtr); #endif /* USE_OLD_TAG_SEARCH */ break; } case CANV_SCALE: { //printf("Started Scaling \n"); double xOrigin, yOrigin, xScale, yScale; if (objc != 7) { Tcl_WrongNumArgs(interp, 2, objv, "tagOrId xOrigin yOrigin xScale yScale"); result = TCL_ERROR; goto done; } if ((Tk_CanvasGetCoordFromObj(interp, (Tk_Canvas) canvasPtr, objv[3], &xOrigin) != TCL_OK) || (Tk_CanvasGetCoordFromObj(interp, (Tk_Canvas) canvasPtr, objv[4], &yOrigin) != TCL_OK) || (Tcl_GetDoubleFromObj(interp, objv[5], &xScale) != TCL_OK) || (Tcl_GetDoubleFromObj(interp, objv[6], &yScale) != TCL_OK)) { result = TCL_ERROR; goto done; } if ((xScale == 0.0) || (yScale == 0.0)) { Tcl_SetResult(interp, "scale factor cannot be zero", TCL_STATIC); result = TCL_ERROR; goto done; } //for (itemPtr = canvasPtr->firstItemPtr1; itemPtr != NULL; itemPtr = itemPtr->nextPtr1) { // EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr); // (void) (*itemPtr->typePtr->scaleProc)((Tk_Canvas) canvasPtr, // itemPtr, xOrigin, yOrigin, xScale, yScale); // EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr); // canvasPtr->flags |= REPICK_NEEDED; //} //printf("Endede Scaling \n"); //printf("%f %f %f %f\n",xOrigin, yOrigin, xScale, yScale); DisplayCanvas_clone((ClientData) canvasPtr,0,xScale); break; } case CANV_SCAN: { int x, y, gain = 10; static CONST char *optionStrings[] = { "mark", "dragto", NULL }; |
︙ | ︙ | |||
1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 | } break; case CANV_XVIEW: { int count, type; int newX = 0; /* Initialization needed only to prevent * gcc warnings. */ double fraction; if (objc == 2) { Tcl_SetObjResult(interp, ScrollFractions( canvasPtr->xOrigin + canvasPtr->inset, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin) - canvasPtr->inset, canvasPtr->scrollX1, canvasPtr->scrollX2)); | > > > > > > > | 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 | } break; case CANV_XVIEW: { int count, type; int newX = 0; /* Initialization needed only to prevent * gcc warnings. */ double fraction; // canvasPtr->lastItemPtr = canvasPtr->lastItemPtr1 ; // canvasPtr->firstItemPtr = canvasPtr->firstItemPtr1; // for (itemPtr = canvasPtr->firstItemPtr1; itemPtr != NULL; itemPtr = itemPtr->nextPtr1) { // itemPtr->nextPtr=itemPtr->nextPtr1; // itemPtr->prevPtr=itemPtr->prevPtr1; // } if (objc == 2) { Tcl_SetObjResult(interp, ScrollFractions( canvasPtr->xOrigin + canvasPtr->inset, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin) - canvasPtr->inset, canvasPtr->scrollX1, canvasPtr->scrollX2)); |
︙ | ︙ | |||
1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 | * (Tk_Width(canvasPtr->tkwin) - 2*canvasPtr->inset)); } break; } CanvasSetOrigin(canvasPtr, newX, canvasPtr->yOrigin); } break; } case CANV_YVIEW: { int count, type; int newY = 0; /* Initialization needed only to prevent * gcc warnings. */ double fraction; if (objc == 2) { Tcl_SetObjResult(interp, ScrollFractions( canvasPtr->yOrigin + canvasPtr->inset, canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin) - canvasPtr->inset, canvasPtr->scrollY1, canvasPtr->scrollY2)); | > > > > > > > > > > | 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 | * (Tk_Width(canvasPtr->tkwin) - 2*canvasPtr->inset)); } break; } CanvasSetOrigin(canvasPtr, newX, canvasPtr->yOrigin); } if ( canvasPtr->scanall == 1 ) { // DisplayCanvas_clone((ClientData) canvasPtr,1,1); } break; } case CANV_YVIEW: { int count, type; int newY = 0; /* Initialization needed only to prevent * gcc warnings. */ double fraction; //canvasPtr->lastItemPtr = canvasPtr->lastItemPtr1 ; //canvasPtr->firstItemPtr = canvasPtr->firstItemPtr1; //for (itemPtr = canvasPtr->firstItemPtr1; itemPtr != NULL; itemPtr = itemPtr->nextPtr1) { // itemPtr->nextPtr=itemPtr->nextPtr1; // itemPtr->prevPtr=itemPtr->prevPtr1; //} if (objc == 2) { Tcl_SetObjResult(interp, ScrollFractions( canvasPtr->yOrigin + canvasPtr->inset, canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin) - canvasPtr->inset, canvasPtr->scrollY1, canvasPtr->scrollY2)); |
︙ | ︙ | |||
1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 | * (Tk_Height(canvasPtr->tkwin) - 2*canvasPtr->inset)); } break; } CanvasSetOrigin(canvasPtr, canvasPtr->xOrigin, newY); } break; } } done: #ifndef USE_OLD_TAG_SEARCH TagSearchDestroy(searchPtr); #endif /* not USE_OLD_TAG_SEARCH */ Tcl_Release((ClientData) canvasPtr); return result; } | > > > > > > > > > > > > > > | | 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 | * (Tk_Height(canvasPtr->tkwin) - 2*canvasPtr->inset)); } break; } CanvasSetOrigin(canvasPtr, canvasPtr->xOrigin, newY); } if ( canvasPtr->scanall == 1 ) { //DisplayCanvas_clone((ClientData) canvasPtr,1,1); } break; } case CANV_SCANALL : { canvasPtr->scanall = 1; break; } case CANV_SCANCUR : { canvasPtr->scanall = 0; break; } } done: // Update Our list //printf("started DOne \n"); #ifndef USE_OLD_TAG_SEARCH TagSearchDestroy(searchPtr); #endif /* not USE_OLD_TAG_SEARCH */ Tcl_Release((ClientData) canvasPtr); return result; } /* *---------------------------------------------------------------------- * * DestroyCanvas -- * * This function is invoked by Tcl_EventuallyFree or Tcl_Release to clean * up the internal structure of a canvas at a safe time (when no-one is |
︙ | ︙ | |||
1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 | #ifndef USE_OLD_TAG_SEARCH TagSearchExpr *expr, *next; #endif /* * Free up all of the items in the canvas. */ for (itemPtr = canvasPtr->firstItemPtr; itemPtr != NULL; itemPtr = canvasPtr->firstItemPtr) { canvasPtr->firstItemPtr = itemPtr->nextPtr; (*itemPtr->typePtr->deleteProc)((Tk_Canvas) canvasPtr, itemPtr, canvasPtr->display); if (itemPtr->tagPtr != itemPtr->staticTagSpace) { ckfree((char *) itemPtr->tagPtr); } ckfree((char *) itemPtr); } /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ Tcl_DeleteHashTable(&canvasPtr->idTable); if (canvasPtr->pixmapGC != None) { Tk_FreeGC(canvasPtr->display, canvasPtr->pixmapGC); } #ifndef USE_OLD_TAG_SEARCH expr = canvasPtr->bindTagExprs; while (expr) { next = expr->next; TagSearchExprDestroy(expr); expr = next; } #endif /* USE_OLD_TAG_SEARCH */ Tcl_DeleteTimerHandler(canvasPtr->insertBlinkHandler); if (canvasPtr->bindingTable != NULL) { Tk_DeleteBindingTable(canvasPtr->bindingTable); } Tk_FreeOptions(configSpecs, (char *) canvasPtr, canvasPtr->display, 0); canvasPtr->tkwin = NULL; ckfree((char *) canvasPtr); } | > > > | | 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 | #ifndef USE_OLD_TAG_SEARCH TagSearchExpr *expr, *next; #endif /* * Free up all of the items in the canvas. */ //printf("started 3\n"); for (itemPtr = canvasPtr->firstItemPtr; itemPtr != NULL; itemPtr = canvasPtr->firstItemPtr) { canvasPtr->firstItemPtr = itemPtr->nextPtr; (*itemPtr->typePtr->deleteProc)((Tk_Canvas) canvasPtr, itemPtr, canvasPtr->display); if (itemPtr->tagPtr != itemPtr->staticTagSpace) { ckfree((char *) itemPtr->tagPtr); } ckfree((char *) itemPtr); } /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ Tcl_DeleteHashTable(&canvasPtr->idTable); if (canvasPtr->pixmapGC != None) { Tk_FreeGC(canvasPtr->display, canvasPtr->pixmapGC); canvasPtr->pixmapGC = None; } #ifndef USE_OLD_TAG_SEARCH expr = canvasPtr->bindTagExprs; while (expr) { next = expr->next; TagSearchExprDestroy(expr); expr = next; } #endif /* USE_OLD_TAG_SEARCH */ Tcl_DeleteTimerHandler(canvasPtr->insertBlinkHandler); if (canvasPtr->bindingTable != NULL) { Tk_DeleteBindingTable(canvasPtr->bindingTable); } Tk_TileDone(canvasPtr->bgTile); Tk_FreeOptions(configSpecs, (char *) canvasPtr, canvasPtr->display, 0); canvasPtr->tkwin = NULL; ckfree((char *) canvasPtr); } /* *---------------------------------------------------------------------- * * ConfigureCanvas -- * * This function is called to process an objv/objc list, plus the Tk * option database, in order to configure (or reconfigure) a canvas |
︙ | ︙ | |||
1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 | Tcl_Obj *CONST objv[], /* Argument objects. */ int flags) /* Flags to pass to Tk_ConfigureWidget. */ { XGCValues gcValues; GC newGC; Tk_State old_canvas_state=canvasPtr->canvas_state; if (Tk_ConfigureWidget(interp, canvasPtr->tkwin, configSpecs, objc, (CONST char **) objv, (char *) canvasPtr, flags|TK_CONFIG_OBJS) != TCL_OK) { return TCL_ERROR; } /* * A few options need special processing, such as setting the background * from a 3-D border and creating a GC for copying bits to the screen. */ Tk_SetBackgroundFromBorder(canvasPtr->tkwin, canvasPtr->bgBorder); | > > | 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 | Tcl_Obj *CONST objv[], /* Argument objects. */ int flags) /* Flags to pass to Tk_ConfigureWidget. */ { XGCValues gcValues; GC newGC; Tk_State old_canvas_state=canvasPtr->canvas_state; //printf("started 4\n"); if (Tk_ConfigureWidget(interp, canvasPtr->tkwin, configSpecs, objc, (CONST char **) objv, (char *) canvasPtr, flags|TK_CONFIG_OBJS) != TCL_OK) { return TCL_ERROR; } Tk_SetTileChangedProc(canvasPtr->bgTile, CanvasWorldChanged , canvasPtr); /* * A few options need special processing, such as setting the background * from a 3-D border and creating a GC for copying bits to the screen. */ Tk_SetBackgroundFromBorder(canvasPtr->tkwin, canvasPtr->bgBorder); |
︙ | ︙ | |||
2015 2016 2017 2018 2019 2020 2021 | canvasPtr->flags |= UPDATE_SCROLLBARS|REDRAW_BORDERS; Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr, canvasPtr->xOrigin, canvasPtr->yOrigin, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin), canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin)); return TCL_OK; } | | | 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 | canvasPtr->flags |= UPDATE_SCROLLBARS|REDRAW_BORDERS; Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr, canvasPtr->xOrigin, canvasPtr->yOrigin, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin), canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin)); return TCL_OK; } /* *--------------------------------------------------------------------------- * * CanvasWorldChanged -- * * This function is called when the world has changed in some way and the * widget needs to recompute all its graphics contexts and determine its |
︙ | ︙ | |||
2060 2061 2062 2063 2064 2065 2066 | } canvasPtr->flags |= REPICK_NEEDED; Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr, canvasPtr->xOrigin, canvasPtr->yOrigin, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin), canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin)); } | | | 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 | } canvasPtr->flags |= REPICK_NEEDED; Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr, canvasPtr->xOrigin, canvasPtr->yOrigin, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin), canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin)); } /* *-------------------------------------------------------------- * * DisplayCanvas -- * * This function redraws the contents of a canvas window. It is invoked * as a do-when-idle handler, so it only runs when there's nothing else |
︙ | ︙ | |||
2300 2301 2302 2303 2304 2305 2306 | canvasPtr->flags &= ~(REDRAW_PENDING|BBOX_NOT_EMPTY); canvasPtr->redrawX1 = canvasPtr->redrawX2 = 0; canvasPtr->redrawY1 = canvasPtr->redrawY2 = 0; if (canvasPtr->flags & UPDATE_SCROLLBARS) { CanvasUpdateScrollbars(canvasPtr); } } | | | 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 | canvasPtr->flags &= ~(REDRAW_PENDING|BBOX_NOT_EMPTY); canvasPtr->redrawX1 = canvasPtr->redrawX2 = 0; canvasPtr->redrawY1 = canvasPtr->redrawY2 = 0; if (canvasPtr->flags & UPDATE_SCROLLBARS) { CanvasUpdateScrollbars(canvasPtr); } } /* *-------------------------------------------------------------- * * CanvasEventProc -- * * This function is invoked by the Tk dispatcher for various events on * canvases. |
︙ | ︙ | |||
2393 2394 2395 2396 2397 2398 2399 | if (itemPtr->typePtr->alwaysRedraw & 1) { (*itemPtr->typePtr->displayProc)((Tk_Canvas) canvasPtr, itemPtr, canvasPtr->display, None, 0, 0, 0, 0); } } } } | | | 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 | if (itemPtr->typePtr->alwaysRedraw & 1) { (*itemPtr->typePtr->displayProc)((Tk_Canvas) canvasPtr, itemPtr, canvasPtr->display, None, 0, 0, 0, 0); } } } } /* *---------------------------------------------------------------------- * * CanvasCmdDeletedProc -- * * This function is invoked when a widget command is deleted. If the * widget isn't already in the process of being destroyed, this command |
︙ | ︙ | |||
2431 2432 2433 2434 2435 2436 2437 | */ if (tkwin != NULL) { canvasPtr->tkwin = NULL; Tk_DestroyWindow(tkwin); } } | | | 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 | */ if (tkwin != NULL) { canvasPtr->tkwin = NULL; Tk_DestroyWindow(tkwin); } } /* *-------------------------------------------------------------- * * Tk_CanvasEventuallyRedraw -- * * Arrange for part or all of a canvas widget to redrawn at some * convenient time in the future. |
︙ | ︙ | |||
2499 2500 2501 2502 2503 2504 2505 | canvasPtr->flags |= BBOX_NOT_EMPTY; } if (!(canvasPtr->flags & REDRAW_PENDING)) { Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr); canvasPtr->flags |= REDRAW_PENDING; } } | | | 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 | canvasPtr->flags |= BBOX_NOT_EMPTY; } if (!(canvasPtr->flags & REDRAW_PENDING)) { Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr); canvasPtr->flags |= REDRAW_PENDING; } } /* *-------------------------------------------------------------- * * EventuallyRedrawItem -- * * Arrange for part or all of a canvas widget to redrawn at some * convenient time in the future. |
︙ | ︙ | |||
2560 2561 2562 2563 2564 2565 2566 | itemPtr->redraw_flags |= FORCE_REDRAW; } if (!(canvasPtr->flags & REDRAW_PENDING)) { Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr); canvasPtr->flags |= REDRAW_PENDING; } } | | | 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 | itemPtr->redraw_flags |= FORCE_REDRAW; } if (!(canvasPtr->flags & REDRAW_PENDING)) { Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr); canvasPtr->flags |= REDRAW_PENDING; } } /* *-------------------------------------------------------------- * * Tk_CreateItemType -- * * This function may be invoked to add a new kind of canvas element to * the core item types supported by Tk. |
︙ | ︙ | |||
2613 2614 2615 2616 2617 2618 2619 | break; } } typePtr->nextPtr = typeList; typeList = typePtr; Tcl_MutexUnlock(&typeListMutex); } | | | 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 | break; } } typePtr->nextPtr = typeList; typeList = typePtr; Tcl_MutexUnlock(&typeListMutex); } /* *---------------------------------------------------------------------- * * Tk_GetItemTypes -- * * This function returns a pointer to the list of all item types. Note * that this is inherently thread-unsafe, but since item types are only |
︙ | ︙ | |||
2642 2643 2644 2645 2646 2647 2648 | Tk_GetItemTypes(void) { if (typeList == NULL) { InitCanvas(); } return typeList; } | | | 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 | Tk_GetItemTypes(void) { if (typeList == NULL) { InitCanvas(); } return typeList; } /* *---------------------------------------------------------------------- * * InitCanvas -- * * This function is invoked to perform once-only-ever initialization for * the module, such as setting up the type table. |
︙ | ︙ | |||
2680 2681 2682 2683 2684 2685 2686 | tkImageType.nextPtr = &tkOvalType; tkOvalType.nextPtr = &tkBitmapType; tkBitmapType.nextPtr = &tkArcType; tkArcType.nextPtr = &tkWindowType; tkWindowType.nextPtr = NULL; Tcl_MutexUnlock(&typeListMutex); } | | | 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 | tkImageType.nextPtr = &tkOvalType; tkOvalType.nextPtr = &tkBitmapType; tkBitmapType.nextPtr = &tkArcType; tkArcType.nextPtr = &tkWindowType; tkWindowType.nextPtr = NULL; Tcl_MutexUnlock(&typeListMutex); } #ifdef USE_OLD_TAG_SEARCH /* *-------------------------------------------------------------- * * StartTagSearch -- * * This function is called to initiate an enumeration of all items in a |
︙ | ︙ | |||
2797 2798 2799 2800 2801 2802 2803 | } } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } | | | 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 | } } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } /* *-------------------------------------------------------------- * * NextItem -- * * This function returns successive items that match a given tag; it * should be called only after StartTagSearch has been used to begin a |
︙ | ︙ | |||
2884 2885 2886 2887 2888 2889 2890 | } } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } | | | 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 | } } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } #else /* !USE_OLD_TAG_SEARCH */ /* *---------------------------------------------------------------------- * * GetStaticUids -- * * This function is invoked to return a structure filled with the Uids |
︙ | ︙ | |||
2925 2926 2927 2928 2929 2930 2931 | searchUids->endparenUid = Tk_GetUid(")"); searchUids->negparenUid = Tk_GetUid("!("); searchUids->tagvalUid = Tk_GetUid("!!"); searchUids->negtagvalUid = Tk_GetUid("!"); } return searchUids; } | | | 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 | searchUids->endparenUid = Tk_GetUid(")"); searchUids->negparenUid = Tk_GetUid("!("); searchUids->tagvalUid = Tk_GetUid("!!"); searchUids->negtagvalUid = Tk_GetUid("!"); } return searchUids; } /* *-------------------------------------------------------------- * * TagSearchExprInit -- * * This function allocates and initializes one TagSearchExpr struct. * |
︙ | ︙ | |||
2957 2958 2959 2960 2961 2962 2963 | expr->next = NULL; } expr->uid = NULL; expr->index = 0; expr->length = 0; *exprPtrPtr = expr; } | | | 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 | expr->next = NULL; } expr->uid = NULL; expr->index = 0; expr->length = 0; *exprPtrPtr = expr; } /* *-------------------------------------------------------------- * * TagSearchExprDestroy -- * * This function destroys one TagSearchExpr structure. * |
︙ | ︙ | |||
2983 2984 2985 2986 2987 2988 2989 | if (expr) { if (expr->uids) { ckfree((char *)expr->uids); } ckfree((char *)expr); } } | | | 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 | if (expr) { if (expr->uids) { ckfree((char *)expr->uids); } ckfree((char *)expr); } } /* *-------------------------------------------------------------- * * TagSearchScan -- * * This function is called to initiate an enumeration of all items in a * given canvas that contain a tag that matches the tagOrId expression. |
︙ | ︙ | |||
3157 3158 3159 3160 3161 3162 3163 | * Optimized single-tag search */ searchPtr->type = SEARCH_TYPE_TAG; } return TCL_OK; } | | | 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 | * Optimized single-tag search */ searchPtr->type = SEARCH_TYPE_TAG; } return TCL_OK; } /* *-------------------------------------------------------------- * * TagSearchDestroy -- * * This function destroys any dynamic structures that may have been * allocated by TagSearchScan. |
︙ | ︙ | |||
3185 3186 3187 3188 3189 3190 3191 | { if (searchPtr) { TagSearchExprDestroy(searchPtr->expr); ckfree((char *)searchPtr->rewritebuffer); ckfree((char *)searchPtr); } } | | | 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 | { if (searchPtr) { TagSearchExprDestroy(searchPtr->expr); ckfree((char *)searchPtr->rewritebuffer); ckfree((char *)searchPtr); } } /* *-------------------------------------------------------------- * * TagSearchScanExpr -- * * This recursive function is called to scan a tag expression and compile * it into an array of Tk_Uids. |
︙ | ︙ | |||
3435 3436 3437 3438 3439 3440 3441 | breakwhile: if (found_tag && ! looking_for_tag) { return TCL_OK; } Tcl_AppendResult(interp, "Missing tag in tag search expression", NULL); return TCL_ERROR; } | | | 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 | breakwhile: if (found_tag && ! looking_for_tag) { return TCL_OK; } Tcl_AppendResult(interp, "Missing tag in tag search expression", NULL); return TCL_ERROR; } /* *-------------------------------------------------------------- * * TagSearchEvalExpr -- * * This recursive function is called to eval a tag expression. * |
︙ | ︙ | |||
3595 3596 3597 3598 3599 3600 3601 | } } /* * assert(! looking_for_tag); */ return result; } | | | 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 | } } /* * assert(! looking_for_tag); */ return result; } /* *-------------------------------------------------------------- * * TagSearchFirst -- * * This function is called to get the first item item that matches a * preestablished search predicate that was set by TagSearchScan. |
︙ | ︙ | |||
3710 3711 3712 3713 3714 3715 3716 | } } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } | | | 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 | } } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } /* *-------------------------------------------------------------- * * TagSearchNext -- * * This function returns successive items that match a given tag; it * should be called only after TagSearchFirst has been used to begin a |
︙ | ︙ | |||
3815 3816 3817 3818 3819 3820 3821 | } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } #endif /* USE_OLD_TAG_SEARCH */ | | | 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 | } } searchPtr->lastPtr = lastPtr; searchPtr->searchOver = 1; return NULL; } #endif /* USE_OLD_TAG_SEARCH */ /* *-------------------------------------------------------------- * * DoItem -- * * This is a utility function called by FindItems. It either adds * itemPtr's id to the result forming in interp, or it adds a new tag to |
︙ | ︙ | |||
3891 3892 3893 3894 3895 3896 3897 | /* * Add in the new tag. */ *tagPtr = tag; itemPtr->numTags++; } | | | 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 | /* * Add in the new tag. */ *tagPtr = tag; itemPtr->numTags++; } /* *-------------------------------------------------------------- * * FindItems -- * * This function does all the work of implementing the "find" and * "addtag" options of the canvas widget command, which locate items that |
︙ | ︙ | |||
4141 4142 4143 4144 4145 4146 4147 | FOR_EVERY_CANVAS_ITEM_MATCHING(objv[first+1], searchPtrPtr, return TCL_ERROR) { DoItem(interp, itemPtr, uid); } } return TCL_OK; } | | | 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 | FOR_EVERY_CANVAS_ITEM_MATCHING(objv[first+1], searchPtrPtr, return TCL_ERROR) { DoItem(interp, itemPtr, uid); } } return TCL_OK; } /* *-------------------------------------------------------------- * * FindArea -- * * This function implements area searches for the "find" and "addtag" * options. |
︙ | ︙ | |||
4226 4227 4228 4229 4230 4231 4232 | if ((*itemPtr->typePtr->areaProc)((Tk_Canvas) canvasPtr, itemPtr, rect) >= enclosed) { DoItem(interp, itemPtr, uid); } } return TCL_OK; } | | | 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 | if ((*itemPtr->typePtr->areaProc)((Tk_Canvas) canvasPtr, itemPtr, rect) >= enclosed) { DoItem(interp, itemPtr, uid); } } return TCL_OK; } /* *-------------------------------------------------------------- * * RelinkItems -- * * Move one or more items to a different place in the display order for a * canvas. |
︙ | ︙ | |||
4351 4352 4353 4354 4355 4356 4357 | if (canvasPtr->lastItemPtr == prevPtr) { canvasPtr->lastItemPtr = lastMovePtr; } #ifndef USE_OLD_TAG_SEARCH return TCL_OK; #endif /* not USE_OLD_TAG_SEARCH */ } | | | 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 | if (canvasPtr->lastItemPtr == prevPtr) { canvasPtr->lastItemPtr = lastMovePtr; } #ifndef USE_OLD_TAG_SEARCH return TCL_OK; #endif /* not USE_OLD_TAG_SEARCH */ } /* *-------------------------------------------------------------- * * CanvasBindProc -- * * This function is invoked by the Tk dispatcher to handle events * associated with bindings on items. |
︙ | ︙ | |||
4456 4457 4458 4459 4460 4461 4462 | PickCurrentItem(canvasPtr, eventPtr); } CanvasDoEvent(canvasPtr, eventPtr); done: Tcl_Release((ClientData) canvasPtr); } | | | 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 | PickCurrentItem(canvasPtr, eventPtr); } CanvasDoEvent(canvasPtr, eventPtr); done: Tcl_Release((ClientData) canvasPtr); } /* *-------------------------------------------------------------- * * PickCurrentItem -- * * Find the topmost item in a canvas that contains a given location and * mark the the current item. If the current item has changed, generate a |
︙ | ︙ | |||
4678 4679 4680 4681 4682 4683 4684 | } event = canvasPtr->pickEvent; event.type = EnterNotify; event.xcrossing.detail = NotifyAncestor; CanvasDoEvent(canvasPtr, &event); } } | | | 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 | } event = canvasPtr->pickEvent; event.type = EnterNotify; event.xcrossing.detail = NotifyAncestor; CanvasDoEvent(canvasPtr, &event); } } /* *---------------------------------------------------------------------- * * CanvasFindClosest -- * * Given x and y coordinates, find the topmost canvas item that is * "close" to the coordinates. Canvas items that are hidden or disabled |
︙ | ︙ | |||
4732 4733 4734 4735 4736 4737 4738 | if ((*itemPtr->typePtr->pointProc)((Tk_Canvas) canvasPtr, itemPtr, coords) <= canvasPtr->closeEnough) { bestPtr = itemPtr; } } return bestPtr; } | | | 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 | if ((*itemPtr->typePtr->pointProc)((Tk_Canvas) canvasPtr, itemPtr, coords) <= canvasPtr->closeEnough) { bestPtr = itemPtr; } } return bestPtr; } /* *-------------------------------------------------------------- * * CanvasDoEvent -- * * This function is called to invoke binding processing for a new event * that is associated with the current item for a canvas. |
︙ | ︙ | |||
4864 4865 4866 4867 4868 4869 4870 | Tk_BindEvent(canvasPtr->bindingTable, eventPtr, canvasPtr->tkwin, numObjects, objectPtr); } if (objectPtr != staticObjects) { ckfree((char *) objectPtr); } } | | | 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 | Tk_BindEvent(canvasPtr->bindingTable, eventPtr, canvasPtr->tkwin, numObjects, objectPtr); } if (objectPtr != staticObjects) { ckfree((char *) objectPtr); } } /* *---------------------------------------------------------------------- * * CanvasBlinkProc -- * * This function is called as a timer handler to blink the insertion * cursor off and on. |
︙ | ︙ | |||
4908 4909 4910 4911 4912 4913 4914 | (ClientData) canvasPtr); } if (canvasPtr->textInfo.focusItemPtr != NULL) { EventuallyRedrawItem((Tk_Canvas) canvasPtr, canvasPtr->textInfo.focusItemPtr); } } | | | 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 | (ClientData) canvasPtr); } if (canvasPtr->textInfo.focusItemPtr != NULL) { EventuallyRedrawItem((Tk_Canvas) canvasPtr, canvasPtr->textInfo.focusItemPtr); } } /* *---------------------------------------------------------------------- * * CanvasFocusProc -- * * This function is called whenever a canvas gets or loses the input * focus. It's also called whenever the window is reconfigured while it |
︙ | ︙ | |||
4959 4960 4961 4962 4963 4964 4965 | canvasPtr->flags |= REDRAW_BORDERS; if (!(canvasPtr->flags & REDRAW_PENDING)) { Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr); canvasPtr->flags |= REDRAW_PENDING; } } } | | | 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 | canvasPtr->flags |= REDRAW_BORDERS; if (!(canvasPtr->flags & REDRAW_PENDING)) { Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr); canvasPtr->flags |= REDRAW_PENDING; } } } /* *---------------------------------------------------------------------- * * CanvasSelectTo -- * * Modify the selection by moving its un-anchored end. This could make * the selection either larger or smaller. |
︙ | ︙ | |||
5021 5022 5023 5024 5025 5026 5027 | } if ((canvasPtr->textInfo.selectFirst != oldFirst) || (canvasPtr->textInfo.selectLast != oldLast) || (itemPtr != oldSelPtr)) { EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr); } } | | | 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 | } if ((canvasPtr->textInfo.selectFirst != oldFirst) || (canvasPtr->textInfo.selectLast != oldLast) || (itemPtr != oldSelPtr)) { EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr); } } /* *-------------------------------------------------------------- * * CanvasFetchSelection -- * * This function is invoked by Tk to return part or all of the selection, * when the selection is in a canvas widget. This function always returns |
︙ | ︙ | |||
5065 5066 5067 5068 5069 5070 5071 | if (canvasPtr->textInfo.selItemPtr->typePtr->selectionProc == NULL) { return -1; } return (*canvasPtr->textInfo.selItemPtr->typePtr->selectionProc)( (Tk_Canvas) canvasPtr, canvasPtr->textInfo.selItemPtr, offset, buffer, maxBytes); } | | | 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 | if (canvasPtr->textInfo.selItemPtr->typePtr->selectionProc == NULL) { return -1; } return (*canvasPtr->textInfo.selItemPtr->typePtr->selectionProc)( (Tk_Canvas) canvasPtr, canvasPtr->textInfo.selItemPtr, offset, buffer, maxBytes); } /* *---------------------------------------------------------------------- * * CanvasLostSelection -- * * This function is called back by Tk when the selection is grabbed away * from a canvas widget. |
︙ | ︙ | |||
5096 5097 5098 5099 5100 5101 5102 | if (canvasPtr->textInfo.selItemPtr != NULL) { EventuallyRedrawItem((Tk_Canvas) canvasPtr, canvasPtr->textInfo.selItemPtr); } canvasPtr->textInfo.selItemPtr = NULL; } | | | 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 | if (canvasPtr->textInfo.selItemPtr != NULL) { EventuallyRedrawItem((Tk_Canvas) canvasPtr, canvasPtr->textInfo.selItemPtr); } canvasPtr->textInfo.selItemPtr = NULL; } /* *-------------------------------------------------------------- * * GridAlign -- * * Given a coordinate and a grid spacing, this function computes the * location of the nearest grid line to the coordinate. |
︙ | ︙ | |||
5128 5129 5130 5131 5132 5133 5134 | return coord; } if (coord < 0) { return -((int) ((-coord)/spacing + 0.5)) * spacing; } return ((int) (coord/spacing + 0.5)) * spacing; } | | | 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 | return coord; } if (coord < 0) { return -((int) ((-coord)/spacing + 0.5)) * spacing; } return ((int) (coord/spacing + 0.5)) * spacing; } /* *---------------------------------------------------------------------- * * ScrollFractions -- * * Given the range that's visible in the window and the "100% range" for * what's in the canvas, return a list of two doubles representing the |
︙ | ︙ | |||
5180 5181 5182 5183 5184 5185 5186 | f2 = f1; } } buffer[0] = Tcl_NewDoubleObj(f1); buffer[1] = Tcl_NewDoubleObj(f2); return Tcl_NewListObj(2, buffer); } | | | 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 | f2 = f1; } } buffer[0] = Tcl_NewDoubleObj(f1); buffer[1] = Tcl_NewDoubleObj(f2); return Tcl_NewListObj(2, buffer); } /* *-------------------------------------------------------------- * * CanvasUpdateScrollbars -- * * This function is invoked whenever a canvas has changed in a way that * requires scrollbars to be redisplayed (e.g. the view in the canvas has |
︙ | ︙ | |||
5263 5264 5265 5266 5267 5268 5269 | Tcl_BackgroundError(interp); } Tcl_ResetResult(interp); Tcl_Release((ClientData) yScrollCmd); } Tcl_Release((ClientData) interp); } | | | 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 | Tcl_BackgroundError(interp); } Tcl_ResetResult(interp); Tcl_Release((ClientData) yScrollCmd); } Tcl_Release((ClientData) interp); } /* *-------------------------------------------------------------- * * CanvasSetOrigin -- * * This function is invoked to change the mapping between canvas * coordinates and screen coordinates in the canvas window. |
︙ | ︙ | |||
5393 5394 5395 5396 5397 5398 5399 | canvasPtr->yOrigin = yOrigin; canvasPtr->flags |= UPDATE_SCROLLBARS; Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr, canvasPtr->xOrigin, canvasPtr->yOrigin, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin), canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin)); } | | | 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 | canvasPtr->yOrigin = yOrigin; canvasPtr->flags |= UPDATE_SCROLLBARS; Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr, canvasPtr->xOrigin, canvasPtr->yOrigin, canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin), canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin)); } /* *---------------------------------------------------------------------- * * TkGetStringsFromObjs -- * * Results: * Converts object list into string list. |
︙ | ︙ | |||
5427 5428 5429 5430 5431 5432 5433 | argv = (CONST char **) ckalloc((objc+1) * sizeof(char *)); for (i = 0; i < objc; i++) { argv[i] = Tcl_GetString(objv[i]); } argv[objc] = 0; return argv; } | | | 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 | argv = (CONST char **) ckalloc((objc+1) * sizeof(char *)); for (i = 0; i < objc; i++) { argv[i] = Tcl_GetString(objv[i]); } argv[objc] = 0; return argv; } /* *-------------------------------------------------------------- * * Tk_CanvasPsColor -- * * This function is called by individual canvas items when they want to * set a color value for output. Given information about an X color, this |
︙ | ︙ | |||
5459 5460 5461 5462 5463 5464 5465 | * error message. */ Tk_Canvas canvas, /* Information about canvas. */ XColor *colorPtr) /* Information about color. */ { return Tk_PostscriptColor(interp, ((TkCanvas *) canvas)->psInfo, colorPtr); } | | | 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 | * error message. */ Tk_Canvas canvas, /* Information about canvas. */ XColor *colorPtr) /* Information about color. */ { return Tk_PostscriptColor(interp, ((TkCanvas *) canvas)->psInfo, colorPtr); } /* *-------------------------------------------------------------- * * Tk_CanvasPsFont -- * * This function is called by individual canvas items when they want to * output text. Given information about an X font, this function will |
︙ | ︙ | |||
5492 5493 5494 5495 5496 5497 5498 | * error message. */ Tk_Canvas canvas, /* Information about canvas. */ Tk_Font tkfont) /* Information about font in which text is to * be printed. */ { return Tk_PostscriptFont(interp, ((TkCanvas *) canvas)->psInfo, tkfont); } | | | 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 | * error message. */ Tk_Canvas canvas, /* Information about canvas. */ Tk_Font tkfont) /* Information about font in which text is to * be printed. */ { return Tk_PostscriptFont(interp, ((TkCanvas *) canvas)->psInfo, tkfont); } /* *-------------------------------------------------------------- * * Tk_CanvasPsBitmap -- * * This function is called to output the contents of a sub-region of a * bitmap in proper image data format for Postscript (i.e. data between |
︙ | ︙ | |||
5527 5528 5529 5530 5531 5532 5533 | * rectangular region to output. */ int width, int height) /* Size of rectangular region. */ { return Tk_PostscriptBitmap(interp, ((TkCanvas *) canvas)->tkwin, ((TkCanvas *) canvas)->psInfo, bitmap, startX, startY, width, height); } | | | 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 | * rectangular region to output. */ int width, int height) /* Size of rectangular region. */ { return Tk_PostscriptBitmap(interp, ((TkCanvas *) canvas)->tkwin, ((TkCanvas *) canvas)->psInfo, bitmap, startX, startY, width, height); } /* *-------------------------------------------------------------- * * Tk_CanvasPsStipple -- * * This function is called by individual canvas items when they have * created a path that they'd like to be filled with a stipple pattern. |
︙ | ︙ | |||
5560 5561 5562 5563 5564 5565 5566 | * error message. */ Tk_Canvas canvas, /* Information about canvas. */ Pixmap bitmap) /* Bitmap to use for stippling. */ { return Tk_PostscriptStipple(interp, ((TkCanvas *) canvas)->tkwin, ((TkCanvas *) canvas)->psInfo, bitmap); } | | | 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 | * error message. */ Tk_Canvas canvas, /* Information about canvas. */ Pixmap bitmap) /* Bitmap to use for stippling. */ { return Tk_PostscriptStipple(interp, ((TkCanvas *) canvas)->tkwin, ((TkCanvas *) canvas)->psInfo, bitmap); } /* *-------------------------------------------------------------- * * Tk_CanvasPsY -- * * Given a y-coordinate in canvas coordinates, this function returns a * y-coordinate to use for Postscript output. |
︙ | ︙ | |||
5586 5587 5588 5589 5590 5591 5592 | Tk_CanvasPsY( Tk_Canvas canvas, /* Token for canvas on whose behalf Postscript * is being generated. */ double y) /* Y-coordinate in canvas coords. */ { return Tk_PostscriptY(y, ((TkCanvas *) canvas)->psInfo); } | | | 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 | Tk_CanvasPsY( Tk_Canvas canvas, /* Token for canvas on whose behalf Postscript * is being generated. */ double y) /* Y-coordinate in canvas coords. */ { return Tk_PostscriptY(y, ((TkCanvas *) canvas)->psInfo); } /* *-------------------------------------------------------------- * * Tk_CanvasPsPath -- * * Given an array of points for a path, generate Postscript commands to * create the path. |
︙ | ︙ | |||
5617 5618 5619 5620 5621 5622 5623 | double *coordPtr, /* Pointer to first in array of 2*numPoints * coordinates giving points for path. */ int numPoints) /* Number of points at *coordPtr. */ { Tk_PostscriptPath(interp, ((TkCanvas *) canvas)->psInfo, coordPtr, numPoints); } | | > | 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 | double *coordPtr, /* Pointer to first in array of 2*numPoints * coordinates giving points for path. */ int numPoints) /* Number of points at *coordPtr. */ { Tk_PostscriptPath(interp, ((TkCanvas *) canvas)->psInfo, coordPtr, numPoints); } /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ * |
Changes to generic/tkCanvas.h.
︙ | ︙ | |||
230 231 232 233 234 235 236 237 238 239 240 241 242 243 | void *reserved2; void *reserved3; Tk_TSOffset tsoffset; #ifndef USE_OLD_TAG_SEARCH TagSearchExpr *bindTagExprs;/* Linked list of tag expressions used in * bindings. */ #endif } TkCanvas; /* * Flag bits for canvases: * * REDRAW_PENDING - 1 means a DoWhenIdle handler has already been * created to redraw some or all of the canvas. | > > > > > > | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | void *reserved2; void *reserved3; Tk_TSOffset tsoffset; #ifndef USE_OLD_TAG_SEARCH TagSearchExpr *bindTagExprs;/* Linked list of tag expressions used in * bindings. */ #endif TkBgTileInfo bgTile; /* Tile background. */ int scrollTile; Tk_Item *firstItemPtr1; Tk_Item *lastItemPtr1; unsigned int scanall; int datatype ; // 0 - cell 1 -cell term } TkCanvas; /* * Flag bits for canvases: * * REDRAW_PENDING - 1 means a DoWhenIdle handler has already been * created to redraw some or all of the canvas. |
︙ | ︙ |
Changes to generic/tkRectOval.c.
︙ | ︙ | |||
206 207 208 209 210 211 212 | NULL, /* indexProc */ NULL, /* cursorProc */ NULL, /* selectionProc */ NULL, /* insertProc */ NULL, /* dTextProc */ NULL, /* nextPtr */ }; | | | 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | NULL, /* indexProc */ NULL, /* cursorProc */ NULL, /* selectionProc */ NULL, /* insertProc */ NULL, /* dTextProc */ NULL, /* nextPtr */ }; /* *-------------------------------------------------------------- * * CreateRectOval -- * * This function is invoked to create a new rectangle or oval item in a * canvas. |
︙ | ︙ | |||
283 284 285 286 287 288 289 | return TCL_OK; } error: DeleteRectOval(canvas, itemPtr, Tk_Display(Tk_CanvasTkwin(canvas))); return TCL_ERROR; } | | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | return TCL_OK; } error: DeleteRectOval(canvas, itemPtr, Tk_Display(Tk_CanvasTkwin(canvas))); return TCL_ERROR; } /* *-------------------------------------------------------------- * * RectOvalCoords -- * * This function is invoked to process the "coords" widget command on * rectangles and ovals. See the user documentation for details on what |
︙ | ︙ | |||
372 373 374 375 376 377 378 | || (Tk_CanvasGetCoordFromObj(interp, canvas, objv[3], &rectOvalPtr->bbox[3]) != TCL_OK)) { return TCL_ERROR; } ComputeRectOvalBbox(canvas, rectOvalPtr); return TCL_OK; } | | | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | || (Tk_CanvasGetCoordFromObj(interp, canvas, objv[3], &rectOvalPtr->bbox[3]) != TCL_OK)) { return TCL_ERROR; } ComputeRectOvalBbox(canvas, rectOvalPtr); return TCL_OK; } /* *-------------------------------------------------------------- * * ConfigureRectOval -- * * This function is invoked to configure various aspects of a rectangle * or oval item, such as its border and background colors. |
︙ | ︙ | |||
552 553 554 555 556 557 558 | tsoffset->yoffset = (int) (rectOvalPtr->bbox[3] + 0.5); } ComputeRectOvalBbox(canvas, rectOvalPtr); return TCL_OK; } | | | 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 | tsoffset->yoffset = (int) (rectOvalPtr->bbox[3] + 0.5); } ComputeRectOvalBbox(canvas, rectOvalPtr); return TCL_OK; } /* *-------------------------------------------------------------- * * DeleteRectOval -- * * This function is called to clean up the data structure associated with * a rectangle or oval item. |
︙ | ︙ | |||
601 602 603 604 605 606 607 | if (rectOvalPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, rectOvalPtr->disabledFillStipple); } if (rectOvalPtr->fillGC != None) { Tk_FreeGC(display, rectOvalPtr->fillGC); } } | | | 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 | if (rectOvalPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, rectOvalPtr->disabledFillStipple); } if (rectOvalPtr->fillGC != None) { Tk_FreeGC(display, rectOvalPtr->fillGC); } } /* *-------------------------------------------------------------- * * ComputeRectOvalBbox -- * * This function is invoked to compute the bounding box of all the pixels * that may be drawn as part of a rectangle or oval. |
︙ | ︙ | |||
717 718 719 720 721 722 723 | dtmp = rectOvalPtr->bbox[3]; if (dtmp < (rectOvalPtr->bbox[1] + 1)) { dtmp = rectOvalPtr->bbox[1] + 1; } tmp = (int) ((dtmp >= 0) ? dtmp + .5 : dtmp - .5); rectOvalPtr->header.y2 = tmp + bloat; } | | | 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 | dtmp = rectOvalPtr->bbox[3]; if (dtmp < (rectOvalPtr->bbox[1] + 1)) { dtmp = rectOvalPtr->bbox[1] + 1; } tmp = (int) ((dtmp >= 0) ? dtmp + .5 : dtmp - .5); rectOvalPtr->header.y2 = tmp + bloat; } /* *-------------------------------------------------------------- * * DisplayRectOval -- * * This function is invoked to draw a rectangle or oval item in a given * drawable. |
︙ | ︙ | |||
844 845 846 847 848 849 850 | } else { XDrawArc(display, drawable, rectOvalPtr->outline.gc, x1, y1, (unsigned) (x2-x1), (unsigned) (y2-y1), 0, 360*64); } Tk_ResetOutlineGC(canvas, itemPtr, &(rectOvalPtr->outline)); } } | | | 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 | } else { XDrawArc(display, drawable, rectOvalPtr->outline.gc, x1, y1, (unsigned) (x2-x1), (unsigned) (y2-y1), 0, 360*64); } Tk_ResetOutlineGC(canvas, itemPtr, &(rectOvalPtr->outline)); } } /* *-------------------------------------------------------------- * * RectToPoint -- * * Computes the distance from a given point to a given rectangle, in * canvas units. |
︙ | ︙ | |||
964 965 966 967 968 969 970 | yDiff = pointPtr[1] - y2; } else { yDiff = 0; } return hypot(xDiff, yDiff); } | | | 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 | yDiff = pointPtr[1] - y2; } else { yDiff = 0; } return hypot(xDiff, yDiff); } /* *-------------------------------------------------------------- * * OvalToPoint -- * * Computes the distance from a given point to a given oval, in canvas * units. |
︙ | ︙ | |||
1022 1023 1024 1025 1026 1027 1028 | filled = ovalPtr->fillGC != None; if (ovalPtr->outline.gc == None) { width = 0.0; filled = 1; } return TkOvalToPoint(ovalPtr->bbox, width, filled, pointPtr); } | | | 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 | filled = ovalPtr->fillGC != None; if (ovalPtr->outline.gc == None) { width = 0.0; filled = 1; } return TkOvalToPoint(ovalPtr->bbox, width, filled, pointPtr); } /* *-------------------------------------------------------------- * * RectToArea -- * * This function is called to determine whether an item lies entirely * inside, entirely outside, or overlapping a given rectangle. |
︙ | ︙ | |||
1096 1097 1098 1099 1100 1101 1102 | && (areaPtr[1] <= (rectPtr->bbox[1] - halfWidth)) && (areaPtr[2] >= (rectPtr->bbox[2] + halfWidth)) && (areaPtr[3] >= (rectPtr->bbox[3] + halfWidth))) { return 1; } return 0; } | | | 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 | && (areaPtr[1] <= (rectPtr->bbox[1] - halfWidth)) && (areaPtr[2] >= (rectPtr->bbox[2] + halfWidth)) && (areaPtr[3] >= (rectPtr->bbox[3] + halfWidth))) { return 1; } return 0; } /* *-------------------------------------------------------------- * * OvalToArea -- * * This function is called to determine whether an item lies entirely * inside, entirely outside, or overlapping a given rectangular area. |
︙ | ︙ | |||
1193 1194 1195 1196 1197 1198 1199 | && ((xDelta2 + yDelta1) < 1.0) && ((xDelta2 + yDelta2) < 1.0)) { return -1; } } return result; } | | | 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 | && ((xDelta2 + yDelta1) < 1.0) && ((xDelta2 + yDelta2) < 1.0)) { return -1; } } return result; } /* *-------------------------------------------------------------- * * ScaleRectOval -- * * This function is invoked to rescale a rectangle or oval item. * |
︙ | ︙ | |||
1228 1229 1230 1231 1232 1233 1234 1235 1236 | { RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; rectOvalPtr->bbox[0] = originX + scaleX*(rectOvalPtr->bbox[0] - originX); rectOvalPtr->bbox[1] = originY + scaleY*(rectOvalPtr->bbox[1] - originY); rectOvalPtr->bbox[2] = originX + scaleX*(rectOvalPtr->bbox[2] - originX); rectOvalPtr->bbox[3] = originY + scaleY*(rectOvalPtr->bbox[3] - originY); ComputeRectOvalBbox(canvas, rectOvalPtr); } | > > > > > > > > | | 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 | { RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; rectOvalPtr->bbox[0] = originX + scaleX*(rectOvalPtr->bbox[0] - originX); rectOvalPtr->bbox[1] = originY + scaleY*(rectOvalPtr->bbox[1] - originY); rectOvalPtr->bbox[2] = originX + scaleX*(rectOvalPtr->bbox[2] - originX); rectOvalPtr->bbox[3] = originY + scaleY*(rectOvalPtr->bbox[3] - originY); if ( (rectOvalPtr->bbox[2] - rectOvalPtr->bbox[0] ) < 2 || (rectOvalPtr->bbox[3] - rectOvalPtr->bbox[1] ) < 2 ) { itemPtr->dis = 0 ; //TK_STATE_HIDDEN; // printf("hidden %lf %lf \n",(rectOvalPtr->bbox[2] - rectOvalPtr->bbox[0] ),(rectOvalPtr->bbox[3] - rectOvalPtr->bbox[1] )); } else { itemPtr->dis = 1 ; // itemPtr->state = TK_STATE_ACTIVE; } ComputeRectOvalBbox(canvas, rectOvalPtr); } /* *-------------------------------------------------------------- * * TranslateRectOval -- * * This function is called to move a rectangle or oval by a given amount. * |
︙ | ︙ | |||
1264 1265 1266 1267 1268 1269 1270 | rectOvalPtr->bbox[0] += deltaX; rectOvalPtr->bbox[1] += deltaY; rectOvalPtr->bbox[2] += deltaX; rectOvalPtr->bbox[3] += deltaY; ComputeRectOvalBbox(canvas, rectOvalPtr); } | | | 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 | rectOvalPtr->bbox[0] += deltaX; rectOvalPtr->bbox[1] += deltaY; rectOvalPtr->bbox[2] += deltaX; rectOvalPtr->bbox[3] += deltaY; ComputeRectOvalBbox(canvas, rectOvalPtr); } /* *-------------------------------------------------------------- * * RectOvalToPostscript -- * * This function is called to generate Postscript for rectangle and oval * items. |
︙ | ︙ | |||
1385 1386 1387 1388 1389 1390 1391 | if (Tk_CanvasPsOutline(canvas, itemPtr, &(rectOvalPtr->outline))!= TCL_OK) { return TCL_ERROR; } } return TCL_OK; } | | | 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 | if (Tk_CanvasPsOutline(canvas, itemPtr, &(rectOvalPtr->outline))!= TCL_OK) { return TCL_ERROR; } } return TCL_OK; } /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ |