Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge trunk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | revised_text | tip-466 |
| Files: | files | file ages | folders |
| SHA3-256: |
0034ff9918f0026c562e24f4a70f2d86 |
| User & Date: | fvogel 2019-08-23 19:06:29 |
Context
|
2019-08-28
| ||
| 20:22 | merge trunk check-in: c303dd4f user: fvogel tags: revised_text, tip-466 | |
|
2019-08-23
| ||
| 19:06 | merge trunk check-in: 0034ff99 user: fvogel tags: revised_text, tip-466 | |
| 19:06 | Fix numbering of bind-25.* tests newly added check-in: e4027e44 user: fvogel tags: trunk | |
|
2019-08-21
| ||
| 19:21 | merge mark check-in: dd2dd99d user: fvogel tags: revised_text, tip-466 | |
Changes
Changes to doc/grid.n.
453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 |
.PP Three widgets of equal width, despite their different .QW natural widths: .PP .CS button .b \-text "Foo" entry .e \-variable foo label .l \-text "This is a fairly long piece of text" \fBgrid\fR .b .e .l \-sticky ew \fBgrid columnconfigure\fR . "all" \-uniform allTheSame .CE .SH "SEE ALSO" pack(n), place(n) .SH KEYWORDS geometry manager, location, grid, cell, propagation, size, pack '\" Local Variables: '\" mode: nroff '\" End: |
| |
453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 |
.PP Three widgets of equal width, despite their different .QW natural widths: .PP .CS button .b \-text "Foo" entry .e \-textvariable foo ; set foo "Hello World!" label .l \-text "This is a fairly long piece of text" \fBgrid\fR .b .e .l \-sticky ew \fBgrid columnconfigure\fR . "all" \-uniform allTheSame .CE .SH "SEE ALSO" pack(n), place(n) .SH KEYWORDS geometry manager, location, grid, cell, propagation, size, pack '\" Local Variables: '\" mode: nroff '\" End: |
Changes to generic/tkBind.c.
384 385 386 387 388 389 390 391 392 393 394 395 396 397 |
{"Button2", Button2Mask, 0},
{"B3", Button3Mask, 0},
{"Button3", Button3Mask, 0},
{"B4", Button4Mask, 0},
{"Button4", Button4Mask, 0},
{"B5", Button5Mask, 0},
{"Button5", Button5Mask, 0},
{"Mod1", Mod1Mask, 0},
{"M1", Mod1Mask, 0},
{"Command", Mod1Mask, 0},
{"Mod2", Mod2Mask, 0},
{"M2", Mod2Mask, 0},
{"Option", Mod2Mask, 0},
{"Mod3", Mod3Mask, 0},
|
> > > > > > > > |
384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 |
{"Button2", Button2Mask, 0},
{"B3", Button3Mask, 0},
{"Button3", Button3Mask, 0},
{"B4", Button4Mask, 0},
{"Button4", Button4Mask, 0},
{"B5", Button5Mask, 0},
{"Button5", Button5Mask, 0},
{"B6", Button6Mask, 0},
{"Button6", Button6Mask, 0},
{"B7", Button7Mask, 0},
{"Button7", Button7Mask, 0},
{"B8", Button8Mask, 0},
{"Button8", Button8Mask, 0},
{"B9", Button9Mask, 0},
{"Button9", Button9Mask, 0},
{"Mod1", Mod1Mask, 0},
{"M1", Mod1Mask, 0},
{"Command", Mod1Mask, 0},
{"Mod2", Mod2Mask, 0},
{"M2", Mod2Mask, 0},
{"Option", Mod2Mask, 0},
{"Mod3", Mod3Mask, 0},
|
Changes to generic/tkInt.decls.
1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 |
declare 90 aqua {
Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
Window **w4, unsigned int *ui)
}
declare 91 aqua {
int XSync(Display *display, Bool flag)
}
# Local Variables:
# mode: tcl
# End:
|
> > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
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 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 |
declare 90 aqua {
Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
Window **w4, unsigned int *ui)
}
declare 91 aqua {
int XSync(Display *display, Bool flag)
}
declare 120 aqua {
int XOffsetRegion(Region rgn, int dx, int dy)
}
declare 121 aqua {
int XUnionRegion(Region srca, Region srcb, Region dr_return)
}
declare 122 aqua {
Window XCreateWindow(Display *display, Window parent, int x, int y,
unsigned int width, unsigned int height,
unsigned int border_width, int depth, unsigned int clazz,
Visual *visual, unsigned long value_mask,
XSetWindowAttributes *attributes)
}
declare 130 aqua {
int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
}
declare 131 aqua {
int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
}
declare 132 aqua {
int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n)
}
declare 136 aqua {
int XReparentWindow(Display *d, Window w, Window p, int x, int y)
}
declare 137 aqua {
int XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
int sx, int sy, int dx, int dy,
unsigned int w, unsigned int h)
}
declare 138 aqua {
Region XPolygonRegion(XPoint *pts, int n, int rule)
}
declare 139 aqua {
int XPointInRegion(Region rgn, int x, int y)
}
# Local Variables:
# mode: tcl
# End:
|
Changes to generic/tkIntXlibDecls.h.
30 31 32 33 34 35 36 37 38 39 40 41 42 43 ... 685 686 687 688 689 690 691 692 693 694 695 696 697 698 ... 926 927 928 929 930 931 932 933 934 935 936 937 938 939 .... 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 |
/* Some (older) versions of X11/Xutil.h have a wrong signature of those two functions, so move them out of the way temporarly. */ #define XOffsetRegion _XOffsetRegion #define XUnionRegion _XUnionRegion #include "X11/Xutil.h" #undef XOffsetRegion #undef XUnionRegion #ifdef BUILD_tk # undef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLEXPORT #else # ifndef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLIMPORT ................................................................................ EXTERN int XQueryColors(Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 90 */ EXTERN Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 91 */ EXTERN int XSync(Display *display, Bool flag); #endif /* AQUA */ typedef struct TkIntXlibStubs { int magic; void *hooks; #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ ................................................................................ int (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */ int (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */ int (*xWarpPointer) (Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y); /* 87 */ int (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */ int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */ Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */ int (*xSync) (Display *display, Bool flag); /* 91 */ #endif /* AQUA */ } TkIntXlibStubs; extern const TkIntXlibStubs *tkIntXlibStubsPtr; #ifdef __cplusplus } ................................................................................ (tkIntXlibStubsPtr->xQueryColor) /* 88 */ #define XQueryColors \ (tkIntXlibStubsPtr->xQueryColors) /* 89 */ #define XQueryTree \ (tkIntXlibStubsPtr->xQueryTree) /* 90 */ #define XSync \ (tkIntXlibStubsPtr->xSync) /* 91 */ #endif /* AQUA */ #endif /* defined(USE_TK_STUBS) */ /* !END!: Do not edit above this line. */ #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT #endif /* _TKINTXLIBDECLS */ |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 ... 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 .... 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 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 .... 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 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 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 |
/* Some (older) versions of X11/Xutil.h have a wrong signature of those two functions, so move them out of the way temporarly. */ #define XOffsetRegion _XOffsetRegion #define XUnionRegion _XUnionRegion #include "X11/Xutil.h" #undef XOffsetRegion #undef XUnionRegion #if defined(MAC_OSX_TK) # define Cursor XCursor # define Region XRegion #endif #ifdef BUILD_tk # undef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLEXPORT #else # ifndef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLIMPORT ................................................................................ EXTERN int XQueryColors(Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 90 */ EXTERN Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 91 */ EXTERN int XSync(Display *display, Bool flag); /* Slot 92 is reserved */ /* Slot 93 is reserved */ /* Slot 94 is reserved */ /* Slot 95 is reserved */ /* Slot 96 is reserved */ /* Slot 97 is reserved */ /* Slot 98 is reserved */ /* Slot 99 is reserved */ /* Slot 100 is reserved */ /* Slot 101 is reserved */ /* Slot 102 is reserved */ /* Slot 103 is reserved */ /* Slot 104 is reserved */ /* Slot 105 is reserved */ /* Slot 106 is reserved */ /* Slot 107 is reserved */ /* Slot 108 is reserved */ /* Slot 109 is reserved */ /* Slot 110 is reserved */ /* Slot 111 is reserved */ /* Slot 112 is reserved */ /* Slot 113 is reserved */ /* Slot 114 is reserved */ /* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ /* Slot 118 is reserved */ /* Slot 119 is reserved */ /* 120 */ EXTERN int XOffsetRegion(Region rgn, int dx, int dy); /* 121 */ EXTERN int XUnionRegion(Region srca, Region srcb, Region dr_return); /* 122 */ EXTERN Window XCreateWindow(Display *display, Window parent, int x, int y, unsigned int width, unsigned int height, unsigned int border_width, int depth, unsigned int clazz, Visual *visual, unsigned long value_mask, XSetWindowAttributes *attributes); /* Slot 123 is reserved */ /* Slot 124 is reserved */ /* Slot 125 is reserved */ /* Slot 126 is reserved */ /* Slot 127 is reserved */ /* Slot 128 is reserved */ /* Slot 129 is reserved */ /* 130 */ EXTERN int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n); /* 131 */ EXTERN int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, int n); /* 132 */ EXTERN int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n); /* Slot 133 is reserved */ /* Slot 134 is reserved */ /* Slot 135 is reserved */ /* 136 */ EXTERN int XReparentWindow(Display *d, Window w, Window p, int x, int y); /* 137 */ EXTERN int XPutImage(Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); /* 138 */ EXTERN Region XPolygonRegion(XPoint *pts, int n, int rule); /* 139 */ EXTERN int XPointInRegion(Region rgn, int x, int y); #endif /* AQUA */ typedef struct TkIntXlibStubs { int magic; void *hooks; #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ ................................................................................ int (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */ int (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */ int (*xWarpPointer) (Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y); /* 87 */ int (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */ int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */ Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */ int (*xSync) (Display *display, Bool flag); /* 91 */ void (*reserved92)(void); void (*reserved93)(void); void (*reserved94)(void); void (*reserved95)(void); void (*reserved96)(void); void (*reserved97)(void); void (*reserved98)(void); void (*reserved99)(void); void (*reserved100)(void); void (*reserved101)(void); void (*reserved102)(void); void (*reserved103)(void); void (*reserved104)(void); void (*reserved105)(void); void (*reserved106)(void); void (*reserved107)(void); void (*reserved108)(void); void (*reserved109)(void); void (*reserved110)(void); void (*reserved111)(void); void (*reserved112)(void); void (*reserved113)(void); void (*reserved114)(void); void (*reserved115)(void); void (*reserved116)(void); void (*reserved117)(void); void (*reserved118)(void); void (*reserved119)(void); int (*xOffsetRegion) (Region rgn, int dx, int dy); /* 120 */ int (*xUnionRegion) (Region srca, Region srcb, Region dr_return); /* 121 */ Window (*xCreateWindow) (Display *display, Window parent, int x, int y, unsigned int width, unsigned int height, unsigned int border_width, int depth, unsigned int clazz, Visual *visual, unsigned long value_mask, XSetWindowAttributes *attributes); /* 122 */ void (*reserved123)(void); void (*reserved124)(void); void (*reserved125)(void); void (*reserved126)(void); void (*reserved127)(void); void (*reserved128)(void); void (*reserved129)(void); int (*xFillArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 130 */ int (*xDrawArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 131 */ int (*xDrawRectangles) (Display *d, Drawable dr, GC gc, XRectangle *r, int n); /* 132 */ void (*reserved133)(void); void (*reserved134)(void); void (*reserved135)(void); int (*xReparentWindow) (Display *d, Window w, Window p, int x, int y); /* 136 */ int (*xPutImage) (Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); /* 137 */ Region (*xPolygonRegion) (XPoint *pts, int n, int rule); /* 138 */ int (*xPointInRegion) (Region rgn, int x, int y); /* 139 */ #endif /* AQUA */ } TkIntXlibStubs; extern const TkIntXlibStubs *tkIntXlibStubsPtr; #ifdef __cplusplus } ................................................................................ (tkIntXlibStubsPtr->xQueryColor) /* 88 */ #define XQueryColors \ (tkIntXlibStubsPtr->xQueryColors) /* 89 */ #define XQueryTree \ (tkIntXlibStubsPtr->xQueryTree) /* 90 */ #define XSync \ (tkIntXlibStubsPtr->xSync) /* 91 */ /* Slot 92 is reserved */ /* Slot 93 is reserved */ /* Slot 94 is reserved */ /* Slot 95 is reserved */ /* Slot 96 is reserved */ /* Slot 97 is reserved */ /* Slot 98 is reserved */ /* Slot 99 is reserved */ /* Slot 100 is reserved */ /* Slot 101 is reserved */ /* Slot 102 is reserved */ /* Slot 103 is reserved */ /* Slot 104 is reserved */ /* Slot 105 is reserved */ /* Slot 106 is reserved */ /* Slot 107 is reserved */ /* Slot 108 is reserved */ /* Slot 109 is reserved */ /* Slot 110 is reserved */ /* Slot 111 is reserved */ /* Slot 112 is reserved */ /* Slot 113 is reserved */ /* Slot 114 is reserved */ /* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ /* Slot 118 is reserved */ /* Slot 119 is reserved */ #define XOffsetRegion \ (tkIntXlibStubsPtr->xOffsetRegion) /* 120 */ #define XUnionRegion \ (tkIntXlibStubsPtr->xUnionRegion) /* 121 */ #define XCreateWindow \ (tkIntXlibStubsPtr->xCreateWindow) /* 122 */ /* Slot 123 is reserved */ /* Slot 124 is reserved */ /* Slot 125 is reserved */ /* Slot 126 is reserved */ /* Slot 127 is reserved */ /* Slot 128 is reserved */ /* Slot 129 is reserved */ #define XFillArcs \ (tkIntXlibStubsPtr->xFillArcs) /* 130 */ #define XDrawArcs \ (tkIntXlibStubsPtr->xDrawArcs) /* 131 */ #define XDrawRectangles \ (tkIntXlibStubsPtr->xDrawRectangles) /* 132 */ /* Slot 133 is reserved */ /* Slot 134 is reserved */ /* Slot 135 is reserved */ #define XReparentWindow \ (tkIntXlibStubsPtr->xReparentWindow) /* 136 */ #define XPutImage \ (tkIntXlibStubsPtr->xPutImage) /* 137 */ #define XPolygonRegion \ (tkIntXlibStubsPtr->xPolygonRegion) /* 138 */ #define XPointInRegion \ (tkIntXlibStubsPtr->xPointInRegion) /* 139 */ #endif /* AQUA */ #endif /* defined(USE_TK_STUBS) */ /* !END!: Do not edit above this line. */ #if defined(MAC_OSX_TK) # undef Cursor # undef Region #endif #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT #endif /* _TKINTXLIBDECLS */ |
Changes to generic/tkStubInit.c.
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
...
863
864
865
866
867
868
869
870
871
872
873
874
875
876
|
{
TkWinXInit(Tk_GetHINSTANCE());
}
# define TkUnixContainerId 0
# define TkUnixDoOneXEvent 0
# define TkUnixSetMenubar 0
# define XCreateWindow 0
# define XOffsetRegion 0
# define XUnionRegion 0
# define XPolygonRegion 0
# define XPointInRegion 0
# define TkWmCleanup (void (*)(TkDisplay *)) TkpSync
# define TkSendCleanup (void (*)(TkDisplay *)) TkpSync
# define TkpTestsendCmd 0
#else /* !_WIN32 */
/*
................................................................................
XDrawPoint, /* 85 */
XDrawPoints, /* 86 */
XWarpPointer, /* 87 */
XQueryColor, /* 88 */
XQueryColors, /* 89 */
XQueryTree, /* 90 */
XSync, /* 91 */
#endif /* AQUA */
};
static const TkPlatStubs tkPlatStubs = {
TCL_STUB_MAGIC,
0,
#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
|
<
<
<
<
<
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
95
96
97
98
99
100
101
102
103
104
105
106
107
108
...
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
|
{
TkWinXInit(Tk_GetHINSTANCE());
}
# define TkUnixContainerId 0
# define TkUnixDoOneXEvent 0
# define TkUnixSetMenubar 0
# define TkWmCleanup (void (*)(TkDisplay *)) TkpSync
# define TkSendCleanup (void (*)(TkDisplay *)) TkpSync
# define TkpTestsendCmd 0
#else /* !_WIN32 */
/*
................................................................................
XDrawPoint, /* 85 */
XDrawPoints, /* 86 */
XWarpPointer, /* 87 */
XQueryColor, /* 88 */
XQueryColors, /* 89 */
XQueryTree, /* 90 */
XSync, /* 91 */
0, /* 92 */
0, /* 93 */
0, /* 94 */
0, /* 95 */
0, /* 96 */
0, /* 97 */
0, /* 98 */
0, /* 99 */
0, /* 100 */
0, /* 101 */
0, /* 102 */
0, /* 103 */
0, /* 104 */
0, /* 105 */
0, /* 106 */
0, /* 107 */
0, /* 108 */
0, /* 109 */
0, /* 110 */
0, /* 111 */
0, /* 112 */
0, /* 113 */
0, /* 114 */
0, /* 115 */
0, /* 116 */
0, /* 117 */
0, /* 118 */
0, /* 119 */
XOffsetRegion, /* 120 */
XUnionRegion, /* 121 */
XCreateWindow, /* 122 */
0, /* 123 */
0, /* 124 */
0, /* 125 */
0, /* 126 */
0, /* 127 */
0, /* 128 */
0, /* 129 */
XFillArcs, /* 130 */
XDrawArcs, /* 131 */
XDrawRectangles, /* 132 */
0, /* 133 */
0, /* 134 */
0, /* 135 */
XReparentWindow, /* 136 */
XPutImage, /* 137 */
XPolygonRegion, /* 138 */
XPointInRegion, /* 139 */
#endif /* AQUA */
};
static const TkPlatStubs tkPlatStubs = {
TCL_STUB_MAGIC,
0,
#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
|
Changes to macosx/tkMacOSXDraw.c.
939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 ... 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 ... 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 .... 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 .... 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 .... 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 .... 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 .... 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 .... 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 |
width, height);
CGContextStrokeRect(dc.context, rect);
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
#ifdef TK_MACOSXDRAW_UNUSED
/*
*----------------------------------------------------------------------
*
* XDrawRectangles --
*
* Draws the outlines of the specified rectangles as if a five-point
* PolyLine protocol request were specified for each rectangle:
................................................................................
*
* Side effects:
* Draws rectangles on the specified drawable.
*
*----------------------------------------------------------------------
*/
void
XDrawRectangles(
Display *display,
Drawable drawable,
GC gc,
XRectangle *rectArr,
int nRects)
{
MacDrawable *macWin = (MacDrawable *) drawable;
TkMacOSXDrawingContext dc;
XRectangle * rectPtr;
int i, lw = gc->line_width;
display->request++;
if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
return;
}
if (dc.context) {
CGRect rect;
double o = (lw % 2) ? .5 : 0;
for (i = 0, rectPtr = rectArr; i < nRects; i++, rectPtr++) {
if (rectPtr->width == 0 || rectPtr->height == 0) {
................................................................................
macWin->xOff + rectPtr->x + o,
macWin->yOff + rectPtr->y + o,
rectPtr->width, rectPtr->height);
CGContextStrokeRect(dc.context, rect);
}
}
TkMacOSXRestoreDrawingContext(&dc);
}
#endif
/*
*----------------------------------------------------------------------
*
* XFillRectangles --
*
* Fill multiple rectangular areas in the given drawable.
................................................................................
CGContextStrokePath(dc.context);
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
#ifdef TK_MACOSXDRAW_UNUSED
/*
*----------------------------------------------------------------------
*
* XDrawArcs --
*
* Draws multiple circular or elliptical arcs. Each arc is specified by a
* rectangle and two angles. The center of the circle or ellipse is the
................................................................................
CGContextStrokePath(dc.context);
}
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
#endif
/*
*----------------------------------------------------------------------
*
* XFillArc --
*
* Draw a filled arc.
................................................................................
CGContextFillPath(dc.context);
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
#ifdef TK_MACOSXDRAW_UNUSED
/*
*----------------------------------------------------------------------
*
* XFillArcs --
*
* Draw a filled arc.
*
................................................................................
*
* Side effects:
* Draws a filled arc for each array element on the specified drawable.
*
*----------------------------------------------------------------------
*/
void
XFillArcs(
Display *display,
Drawable d,
GC gc,
XArc *arcArr,
int nArcs)
{
................................................................................
MacDrawable *macWin = (MacDrawable *) d;
TkMacOSXDrawingContext dc;
XArc * arcPtr;
int i, lw = gc->line_width;
display->request++;
if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
return;
}
if (dc.context) {
CGRect rect;
double o = (lw % 2) ? .5 : 0, u = 0;
if (notAA(lw)) {
o += NON_AA_CG_OFFSET/2;
................................................................................
CGContextAddPath(dc.context, p);
CGPathRelease(p);
CGContextFillPath(dc.context);
}
}
}
TkMacOSXRestoreDrawingContext(&dc);
}
#endif
#ifdef TK_MACOSXDRAW_UNUSED
/*
*----------------------------------------------------------------------
*
* XMaxRequestSize --
*
*----------------------------------------------------------------------
*/
long
XMaxRequestSize(
Display *display)
{
return (SHRT_MAX / 4);
}
#endif
/*
*----------------------------------------------------------------------
*
* TkpDrawingIsDisabled --
*
* Query whether the given window is disabled, in this case drawing
|
< | | | > < < < < | | < < < < < < < < < < < < < < < < | < |
939 940 941 942 943 944 945 946 947 948 949 950 951 952 ... 963 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 ... 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 .... 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 .... 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 .... 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 .... 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 .... 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 .... 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 |
width, height);
CGContextStrokeRect(dc.context, rect);
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
/*
*----------------------------------------------------------------------
*
* XDrawRectangles --
*
* Draws the outlines of the specified rectangles as if a five-point
* PolyLine protocol request were specified for each rectangle:
................................................................................
*
* Side effects:
* Draws rectangles on the specified drawable.
*
*----------------------------------------------------------------------
*/
int
XDrawRectangles(
Display *display,
Drawable drawable,
GC gc,
XRectangle *rectArr,
int nRects)
{
MacDrawable *macWin = (MacDrawable *) drawable;
TkMacOSXDrawingContext dc;
XRectangle * rectPtr;
int i, lw = gc->line_width;
display->request++;
if (!TkMacOSXSetupDrawingContext(drawable, gc, 1, &dc)) {
return BadDrawable;
}
if (dc.context) {
CGRect rect;
double o = (lw % 2) ? .5 : 0;
for (i = 0, rectPtr = rectArr; i < nRects; i++, rectPtr++) {
if (rectPtr->width == 0 || rectPtr->height == 0) {
................................................................................
macWin->xOff + rectPtr->x + o,
macWin->yOff + rectPtr->y + o,
rectPtr->width, rectPtr->height);
CGContextStrokeRect(dc.context, rect);
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
/*
*----------------------------------------------------------------------
*
* XFillRectangles --
*
* Fill multiple rectangular areas in the given drawable.
................................................................................
CGContextStrokePath(dc.context);
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
/*
*----------------------------------------------------------------------
*
* XDrawArcs --
*
* Draws multiple circular or elliptical arcs. Each arc is specified by a
* rectangle and two angles. The center of the circle or ellipse is the
................................................................................
CGContextStrokePath(dc.context);
}
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
/*
*----------------------------------------------------------------------
*
* XFillArc --
*
* Draw a filled arc.
................................................................................
CGContextFillPath(dc.context);
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
/*
*----------------------------------------------------------------------
*
* XFillArcs --
*
* Draw a filled arc.
*
................................................................................
*
* Side effects:
* Draws a filled arc for each array element on the specified drawable.
*
*----------------------------------------------------------------------
*/
int
XFillArcs(
Display *display,
Drawable d,
GC gc,
XArc *arcArr,
int nArcs)
{
................................................................................
MacDrawable *macWin = (MacDrawable *) d;
TkMacOSXDrawingContext dc;
XArc * arcPtr;
int i, lw = gc->line_width;
display->request++;
if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
return BadDrawable;
}
if (dc.context) {
CGRect rect;
double o = (lw % 2) ? .5 : 0, u = 0;
if (notAA(lw)) {
o += NON_AA_CG_OFFSET/2;
................................................................................
CGContextAddPath(dc.context, p);
CGPathRelease(p);
CGContextFillPath(dc.context);
}
}
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
/*
*----------------------------------------------------------------------
*
* TkpDrawingIsDisabled --
*
* Query whether the given window is disabled, in this case drawing
|
Changes to macosx/tkMacOSXImage.c.
587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 |
}
} else {
TkMacOSXDbgMsg("Invalid destination drawable");
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
/*
* Local Variables:
* mode: objc
* c-basic-offset: 4
* fill-column: 79
* coding: utf-8
* End:
*/
|
> > > > > > > > > > > > > > > > |
587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 |
}
} else {
TkMacOSXDbgMsg("Invalid destination drawable");
}
TkMacOSXRestoreDrawingContext(&dc);
return Success;
}
int
XPutImage(
Display *display,
Drawable d, /* Destination drawable. */
GC gc,
XImage *image, /* Source image. */
int src_x, int src_y, /* Offset of subimage. */
int dest_x, int dest_y, /* Position of subimage origin in drawable. */
unsigned int width, unsigned int height)
/* Dimensions of subimage. */
{
return TkPutImage(NULL, 0, display, d, gc, image,
src_x, src_y, dest_x, dest_y, width, height);
}
/*
* Local Variables:
* mode: objc
* c-basic-offset: 4
* fill-column: 79
* coding: utf-8
* End:
*/
|
Changes to tests/bind.test.
5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 |
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <Extended-Return> foo
bind .t.f
} -cleanup {
destroy .t.f
} -result <Extended-Key-Return>
test bind-26.1 {event names} -setup {
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <FocusIn> {nothing}
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 |
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <Extended-Return> foo
bind .t.f
} -cleanup {
destroy .t.f
} -result <Extended-Key-Return>
test bind-25.50 {modifier names} -setup {
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <Button6-a> foo
bind .t.f
} -cleanup {
destroy .t.f
} -result <B6-Key-a>
test bind-25.51 {modifier names} -setup {
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <Button7-a> foo
bind .t.f
} -cleanup {
destroy .t.f
} -result <B7-Key-a>
test bind-25.52 {modifier names} -setup {
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <Button8-a> foo
bind .t.f
} -cleanup {
destroy .t.f
} -result <B8-Key-a>
test bind-25.53 {modifier names} -setup {
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <Button9-a> foo
bind .t.f
} -cleanup {
destroy .t.f
} -result <B9-Key-a>
test bind-26.1 {event names} -setup {
frame .t.f -class Test -width 150 -height 100
} -body {
bind .t.f <FocusIn> {nothing}
|
Changes to tests/constraints.tcl.
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 |
([tk windowingsystem] eq "win32") || [testConstraint aqua]
}]
testConstraint userInteraction 0
testConstraint nonUnixUserInteraction [expr {
[testConstraint userInteraction] ||
([testConstraint unix] && [testConstraint notAqua])
}]
testConstraint haveDISPLAY [info exists env(DISPLAY)]
testConstraint altDisplay [info exists env(TK_ALT_DISPLAY)]
testConstraint noExceed [expr {
![testConstraint unix] || [catch {font actual "\{xyz"}]
}]
# constraints for testing facilities defined in the tktest executable...
testConstraint testImageType [expr {[lsearch [image types] test] >= 0}]
|
| |
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 |
([tk windowingsystem] eq "win32") || [testConstraint aqua]
}]
testConstraint userInteraction 0
testConstraint nonUnixUserInteraction [expr {
[testConstraint userInteraction] ||
([testConstraint unix] && [testConstraint notAqua])
}]
testConstraint haveDISPLAY [expr {[info exists env(DISPLAY)] && [testConstraint x11]}]
testConstraint altDisplay [info exists env(TK_ALT_DISPLAY)]
testConstraint noExceed [expr {
![testConstraint unix] || [catch {font actual "\{xyz"}]
}]
# constraints for testing facilities defined in the tktest executable...
testConstraint testImageType [expr {[lsearch [image types] test] >= 0}]
|
Changes to win/tkWinWindow.c.
757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 |
XSetWindowAttributes* attributes)
{
if (valueMask & CWCursor) {
XDefineCursor(display, w, attributes->cursor);
}
return Success;
}
/*
*----------------------------------------------------------------------
*
* XReparentWindow --
*
* TODO: currently placeholder to satisfy Xlib stubs.
*
* Results:
* None.
*
* Side effects:
* TODO.
*
*----------------------------------------------------------------------
*/
int
XReparentWindow(
Display *display,
Window w,
Window parent,
int x,
int y)
{
return BadWindow;
}
/*
*----------------------------------------------------------------------
*
* TkWinSetWindowPos --
*
* Adjust the stacking order of a window relative to a second window (or
|
< < < < < < < < < < < < < < < < < < < < < < < < < < < |
757 758 759 760 761 762 763 764 765 766 767 768 769 770 |
XSetWindowAttributes* attributes)
{
if (valueMask & CWCursor) {
XDefineCursor(display, w, attributes->cursor);
}
return Success;
}
/*
*----------------------------------------------------------------------
*
* TkWinSetWindowPos --
*
* Adjust the stacking order of a window relative to a second window (or
|
Changes to xlib/xgc.c.
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
...
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
|
XSegment *segments,
int nsegments)
{
return BadDrawable;
}
#endif
#if 0
char *
XFetchBuffer(
Display *display,
int *nbytes_return,
int buffer)
{
return (char *) 0;
................................................................................
Status
XFetchName(
Display *display,
Window w,
char **window_name_return)
{
return (Status) 0;
}
Atom *
XListProperties(
Display* display,
Window w,
int *num_prop_return)
{
return (Atom *) 0;
}
void
XMapRaised(
Display *display,
Window w)
{
}
void
XPutImage(
Display *display,
Drawable d,
GC gc,
XImage *image,
int src_x,
int src_y,
int dest_x,
int dest_y,
unsigned int width,
unsigned int height)
{
}
void
XQueryTextExtents(
Display *display,
XID font_ID,
_Xconst char *string,
int nchars,
int *direction_return,
int *font_ascent_return,
int *font_descent_return,
XCharStruct *overall_return)
{
}
void
XReparentWindow(
Display *display,
Window w,
Window parent,
int x,
int y)
{
}
void
XRotateBuffers(
Display *display,
int rotate)
{
}
void
XStoreBuffer(
Display *display,
_Xconst char *bytes,
int nbytes,
int buffer)
{
}
void
XUndefineCursor(
Display *display,
Window w)
{
}
#endif
/*
* Local Variables:
* mode: c
* c-basic-offset: 4
* fill-column: 78
* End:
*/
|
<
|
|
>
<
>
>
>
>
<
>
>
<
>
>
<
<
>
>
<
>
>
<
<
>
>
<
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
|
>
<
<
<
<
>
>
>
>
>
>
<
>
>
|
560
561
562
563
564
565
566
567
568
569
570
571
572
573
...
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
|
XSegment *segments,
int nsegments)
{
return BadDrawable;
}
#endif
char *
XFetchBuffer(
Display *display,
int *nbytes_return,
int buffer)
{
return (char *) 0;
................................................................................
Status
XFetchName(
Display *display,
Window w,
char **window_name_return)
{
return Success;
}
Atom *
XListProperties(
Display* display,
Window w,
int *num_prop_return)
{
return (Atom *) 0;
}
int
XMapRaised(
Display *display,
Window w)
{
return Success;
}
#if 0
int
XPutImage(
Display *display,
Drawable d,
GC gc,
XImage *image,
int src_x,
int src_y,
int dest_x,
int dest_y,
unsigned int width,
unsigned int height)
{
return 0;
}
#endif
int
XQueryTextExtents(
Display *display,
XID font_ID,
_Xconst char *string,
int nchars,
int *direction_return,
int *font_ascent_return,
int *font_descent_return,
XCharStruct *overall_return)
{
return Success;
}
int
XReparentWindow(
Display *display,
Window w,
Window parent,
int x,
int y)
{
return BadWindow;
}
int
XUndefineCursor(
Display *display,
Window w)
{
return Success;
}
Window
XCreateWindow(
Display *display,
Window parent,
int x,
int y,
unsigned int width,
unsigned int height,
unsigned int border_width,
int depth,
unsigned int clazz,
Visual *visual,
unsigned long value_mask,
XSetWindowAttributes *attributes)
{
return 0;
}
int
XPointInRegion(
Region rgn,
int x,
int y)
{
return 0;
}
int
XUnionRegion(
Region srca,
Region srcb,
Region dr_return)
{
return 0;
}
Region
XPolygonRegion(
XPoint *pts,
int n,
int rule)
{
return 0;
}
int
XOffsetRegion(
Region rgn,
int dx,
int dy)
{
return 0;
}
/*
* Local Variables:
* mode: c
* c-basic-offset: 4
* fill-column: 78
* End:
*/
|