Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | Change XChangeWindowAttributes signature and many others to match Xorg, needed for Cygwin |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5ed597c56aa73e9847d66f10a80ab1b7 |
User & Date: | jan.nijtmans 2012-06-08 22:47:55 |
2012-06-08
| ||
22:50 | merge-mark check-in: 33ff53a1 user: jan.nijtmans tags: trunk | |
22:47 | Change XChangeWindowAttributes signature and many others to match Xorg, needed for Cygwin check-in: 5ed597c5 user: jan.nijtmans tags: trunk | |
21:22 | Implement TkCygwinMainEx for loading Cygwin's Tk_MainEx from the Tk dll check-in: 3db2e9c6 user: jan.nijtmans tags: core-8-5-branch | |
2012-06-06
| ||
09:11 | [Bug 3532186] pkgIndex.tcl file complexity check-in: 60bd3f4f user: jan.nijtmans tags: trunk | |
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2012-06-06 Jan Nijtmans <[email protected]> * unix/Makefile.in: [Bug 3532186] pkgIndex.tcl file complexity * win/Makefile.in: 2012-05-31 Jan Nijtmans <[email protected]> | > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | 2012-06-08 Jan Nijtmans <[email protected]> * generic/tkMain.c: Implement TkCygwinMainEx for loading * generic/tkWindow.c: Cygwin's Tk_MainEx from the Tk dll. * generic/tkInt.decls: Change XChangeWindowAttributes signature and * generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for Cygwin. 2012-06-06 Jan Nijtmans <[email protected]> * unix/Makefile.in: [Bug 3532186] pkgIndex.tcl file complexity * win/Makefile.in: 2012-05-31 Jan Nijtmans <[email protected]> |
︙ | ︙ |
Changes to carbon/tkMacOSXClipboard.c.
︙ | ︙ | |||
155 156 157 158 159 160 161 | * * Side effects: * None. * *---------------------------------------------------------------------- */ | | | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 | * * Side effects: * None. * *---------------------------------------------------------------------- */ int XSetSelectionOwner( Display *display, /* X Display. */ Atom selection, /* What selection to own. */ Window owner, /* Window to be the owner. */ Time time) /* The current time? */ { Tk_Window tkwin; |
︙ | ︙ | |||
180 181 182 183 184 185 186 | /* * Only claim and empty the clipboard if we aren't already the owner * of the clipboard. */ dispPtr = TkGetMainInfoList()->winPtr->dispPtr; if (dispPtr->clipboardActive) { | | > | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | /* * Only claim and empty the clipboard if we aren't already the owner * of the clipboard. */ dispPtr = TkGetMainInfoList()->winPtr->dispPtr; if (dispPtr->clipboardActive) { return Success; } ClearCurrentScrap(); } return Success; } /* *---------------------------------------------------------------------- * * TkSelUpdateClipboard -- * |
︙ | ︙ |
Changes to carbon/tkMacOSXColor.c.
︙ | ︙ | |||
709 710 711 712 713 714 715 | /* * Just return a new value each time. */ return index++; } | | > | > | 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 | /* * Just return a new value each time. */ return index++; } int XFreeColormap( Display* display, /* Display. */ Colormap colormap) /* Colormap. */ { return Success; } int XFreeColors( Display* display, /* Display. */ Colormap colormap, /* Colormap. */ unsigned long* pixels, /* Array of pixels. */ int npixels, /* Number of pixels. */ unsigned long planes) /* Number of pixel planes. */ { /* * The Macintosh version of Tk uses TrueColor. Nothing * needs to be done to release colors as there really is * no colormap in the Tk sense. */ return Success; } |
Changes to carbon/tkMacOSXDraw.c.
︙ | ︙ | |||
334 335 336 337 338 339 340 | * * Side effects: * Draws the image on the specified drawable. * *---------------------------------------------------------------------- */ | | | | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 | * * Side effects: * Draws the image on the specified drawable. * *---------------------------------------------------------------------- */ int TkPutImage( unsigned long *colors, /* Unused on Macintosh. */ int ncolors, /* Unused on Macintosh. */ Display* display, /* Display. */ Drawable d, /* Drawable to place image on. */ GC gc, /* GC to use. */ XImage* image, /* Image to place. */ int src_x, /* Source X & Y. */ int src_y, int dest_x, /* Destination X & Y. */ int dest_y, unsigned int width, /* Same width & height for both */ unsigned int height) /* distination and source. */ { TkMacOSXDrawingContext dc; MacDrawable *dstDraw = (MacDrawable *) d; display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 0, &dc)) { return BadDrawable; } if (dc.context) { TkMacOSXDbgMsg("Ignored CG drawing of XImage"); } else { Rect srcRect, dstRect, *srcPtr = &srcRect, *dstPtr = &dstRect; const BitMap *dstBit; RGBColor black = {0, 0, 0}, white = {0xffff, 0xffff, 0xffff}; |
︙ | ︙ | |||
526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 | pixmap.baseAddr = image->data + image->xoffset; pixmap.rowBytes = rowBytes | 0x8000; CopyBits((BitMap*) &pixmap, dstBit, srcPtr, dstPtr, srcCopy, NULL); } } } TkMacOSXRestoreDrawingContext(&dc); } /* *---------------------------------------------------------------------- * * XDrawLines -- * * Draw connected lines. * * Results: * None. * * Side effects: * Renders a series of connected lines. * *---------------------------------------------------------------------- */ | > | < < < < | | | 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 | pixmap.baseAddr = image->data + image->xoffset; pixmap.rowBytes = rowBytes | 0x8000; CopyBits((BitMap*) &pixmap, dstBit, srcPtr, dstPtr, srcCopy, NULL); } } } TkMacOSXRestoreDrawingContext(&dc); return Success; } /* *---------------------------------------------------------------------- * * XDrawLines -- * * Draw connected lines. * * Results: * None. * * Side effects: * Renders a series of connected lines. * *---------------------------------------------------------------------- */ int XDrawLines( Display *display, /* Display. */ Drawable d, /* Draw on this. */ GC gc, /* Use this GC. */ XPoint *points, /* Array of points. */ int npoints, /* Number of points. */ int mode) /* Line drawing mode. */ { MacDrawable *macWin = (MacDrawable *) d; TkMacOSXDrawingContext dc; int i, lw = gc->line_width; if (npoints < 2) { return BadValue; } display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, tkMacOSXUseCGDrawing, &dc)) { return BadDrawable; } if (dc.context) { double prevx, prevy; double o = (lw % 2) ? .5 : 0; CGContextBeginPath(dc.context); prevx = macWin->xOff + points[0].x + o; |
︙ | ︙ | |||
608 609 610 611 612 613 614 615 616 617 618 619 620 621 | (short) (macWin->yOff + points[i].y + o)); } else { Line((short) points[i].x, (short) points[i].y); } } } TkMacOSXRestoreDrawingContext(&dc); } /* *---------------------------------------------------------------------- * * XDrawSegments -- * | > | 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | (short) (macWin->yOff + points[i].y + o)); } else { Line((short) points[i].x, (short) points[i].y); } } } TkMacOSXRestoreDrawingContext(&dc); return Success; } /* *---------------------------------------------------------------------- * * XDrawSegments -- * |
︙ | ︙ | |||
896 897 898 899 900 901 902 | * * Side effects: * Draws onto the specified drawable. * *---------------------------------------------------------------------- */ | | | | 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 920 921 922 923 | * * Side effects: * Draws onto the specified drawable. * *---------------------------------------------------------------------- */ int XFillRectangles( Display* display, /* Display. */ Drawable d, /* Draw on this. */ GC gc, /* Use this GC. */ XRectangle *rectangles, /* Rectangle array. */ int n_rectangles) /* Number of rectangles. */ { MacDrawable *macWin = (MacDrawable *) d; TkMacOSXDrawingContext dc; XRectangle * rectPtr; int i; display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, tkMacOSXUseCGDrawing, &dc)) { return BadDrawable; } if (dc.context) { CGRect rect; for (i = 0, rectPtr = rectangles; i < n_rectangles; i++, rectPtr++) { if (rectPtr->width == 0 || rectPtr->height == 0) { continue; |
︙ | ︙ | |||
938 939 940 941 942 943 944 945 946 947 948 949 950 951 | theRect.top = (short) (macWin->yOff + rectPtr->y); theRect.right = (short) (theRect.left + rectPtr->width); theRect.bottom = (short) (theRect.top + rectPtr->height); FillCRect(&theRect, dc.penPat); } } TkMacOSXRestoreDrawingContext(&dc); } /* *---------------------------------------------------------------------- * * XDrawArc -- * | > | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 | theRect.top = (short) (macWin->yOff + rectPtr->y); theRect.right = (short) (theRect.left + rectPtr->width); theRect.bottom = (short) (theRect.top + rectPtr->height); FillCRect(&theRect, dc.penPat); } } TkMacOSXRestoreDrawingContext(&dc); return Success; } /* *---------------------------------------------------------------------- * * XDrawArc -- * |
︙ | ︙ |
Changes to carbon/tkMacOSXKeyboard.c.
︙ | ︙ | |||
388 389 390 391 392 393 394 | * * Side effects: * Frees the datastructure referenced by modmap. * *---------------------------------------------------------------------- */ | | > | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | * * Side effects: * Frees the datastructure referenced by modmap. * *---------------------------------------------------------------------- */ int XFreeModifiermap( XModifierKeymap *modmap) { if (modmap->modifiermap != NULL) { ckfree(modmap->modifiermap); } ckfree(modmap); return Success; } /* *---------------------------------------------------------------------- * * XKeysymToString, XStringToKeysym -- * |
︙ | ︙ |
Changes to carbon/tkMacOSXXStubs.c.
︙ | ︙ | |||
438 439 440 441 442 443 444 | Display* display, Window w, long event_mask) { Debugger(); } | | > | 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 | Display* display, Window w, long event_mask) { Debugger(); } int XBell( Display* display, int percent) { SysBeep(percent); return Success; } #if 0 void XSetWMNormalHints( Display* display, Window w, |
︙ | ︙ | |||
523 524 525 526 527 528 529 | XPoint* points, int npoints, int mode) { } */ | | > | 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 | XPoint* points, int npoints, int mode) { } */ 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) { return Success; } void XQueryColor( Display* display, Colormap colormap, XColor* def_in_out) |
︙ | ︙ |
Changes to generic/tkInt.decls.
︙ | ︙ | |||
1040 1041 1042 1043 1044 1045 1046 | interface tkIntXlib ################################ # X functions for Windows declare 0 win { | | | 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 | interface tkIntXlib ################################ # X functions for Windows declare 0 win { int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n) } declare 1 win { XModifierKeymap *XGetModifierMapping(Display *d) } declare 2 win { XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, |
︙ | ︙ | |||
1070 1071 1072 1073 1074 1075 1076 | } declare 7 win { Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2) } declare 8 win { Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, | | > | 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 | } declare 7 win { Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2) } declare 8 win { Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2) } declare 9 win { GContext XGContextFromGC(GC g) } declare 10 win { XHostAddress *XListHosts(Display *d, int *i, Bool *b) } |
︙ | ︙ | |||
1104 1105 1106 1107 1108 1109 1110 | declare 17 win { Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip) } declare 18 win { Status XAllocColor(Display *d, Colormap c, XColor *xp) } declare 19 win { | | | | | | | | | | | | | | | | | | | | | | | | | | 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 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 | declare 17 win { Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip) } declare 18 win { Status XAllocColor(Display *d, Colormap c, XColor *xp) } declare 19 win { int XBell(Display *d, int i) } declare 20 win { int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3) } declare 21 win { int XChangeWindowAttributes(Display *d, Window w, unsigned long ul, XSetWindowAttributes *x) } declare 22 win { int XClearWindow(Display *d, Window w) } declare 23 win { int XConfigureWindow(Display *d, Window w, unsigned int i, XWindowChanges *x) } declare 24 win { int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } declare 25 win { int XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul) } declare 26 win { Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height) } declare 27 win { int XDefineCursor(Display *d, Window w, Cursor c) } declare 28 win { int XDeleteProperty(Display *d, Window w, Atom a) } declare 29 win { int XDestroyWindow(Display *d, Window w) } declare 30 win { int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } declare 31 win { int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } declare 32 win { int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } declare 33 win { int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } declare 34 win { int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } declare 35 win { int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } declare 36 win { int XForceScreenSaver(Display *d, int i) } declare 37 win { int XFreeColormap(Display *d, Colormap c) } declare 38 win { int XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul) } declare 39 win { int XFreeCursor(Display *d, Cursor c) } declare 40 win { int XFreeModifiermap(XModifierKeymap *x) } declare 41 win { Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4) } declare 42 win { int XGetInputFocus(Display *d, Window *w, int *i) } declare 43 win { int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp) } declare 44 win { |
︙ | ︙ | |||
1212 1213 1214 1215 1216 1217 1218 | KeyCode XKeysymToKeycode(Display *d, KeySym k) } declare 48 win { Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2) } declare 49 win { | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > | < < < | | 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 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 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 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 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 | KeyCode XKeysymToKeycode(Display *d, KeySym k) } declare 48 win { Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2) } declare 49 win { int XMapWindow(Display *d, Window w) } declare 50 win { int XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2) } declare 51 win { int XMoveWindow(Display *d, Window w, int i1, int i2) } declare 52 win { int XNextEvent(Display *d, XEvent *x) } declare 53 win { int XPutBackEvent(Display *d, XEvent *x) } declare 54 win { int XQueryColors(Display *d, Colormap c, XColor *x, int i) } declare 55 win { Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui) } declare 56 win { Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui) } declare 57 win { int XRaiseWindow(Display *d, Window w) } declare 58 win { int XRefreshKeyboardMapping(XMappingEvent *x) } declare 59 win { int XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2) } declare 60 win { int XSelectInput(Display *d, Window w, long l) } declare 61 win { Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) } declare 62 win { int XSetCommand(Display *d, Window w, char **c, int i) } declare 63 win { int XSetIconName(Display *d, Window w, _Xconst char *c) } declare 64 win { int XSetInputFocus(Display *d, Window w, int i, Time t) } declare 65 win { int XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } declare 66 win { int XSetWindowBackground(Display *d, Window w, unsigned long ul) } declare 67 win { int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } declare 68 win { int XSetWindowBorder(Display *d, Window w, unsigned long ul) } declare 69 win { int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) } declare 70 win { int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) } declare 71 win { int XSetWindowColormap(Display *d, Window w, Colormap c) } declare 72 win { Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3) } declare 73 win { int XUngrabKeyboard(Display *d, Time t) } declare 74 win { int XUngrabPointer(Display *d, Time t) } declare 75 win { int XUnmapWindow(Display *d, Window w) } declare 76 win { int XWindowEvent(Display *d, Window w, long l, XEvent *x) } declare 77 win { void XDestroyIC(XIC x) } declare 78 win { Bool XFilterEvent(XEvent *x, Window w) } declare 79 win { int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s) } declare 80 win { int TkPutImage(unsigned long *colors, int ncolors, 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) } # This slot is reserved for use by the clipping rectangle patch: # declare 81 win { # XSetClipRectangles(Display *display, GC gc, int clip_x_origin, # int clip_y_origin, XRectangle rectangles[], int n, int ordering) # } declare 82 win { Status XParseColor(Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr) } declare 83 win { GC XCreateGC(Display *display, Drawable d, unsigned long valuemask, XGCValues *values) } declare 84 win { int XFreeGC(Display *display, GC gc) } declare 85 win { Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } declare 86 win { int XSetBackground(Display *display, GC gc, unsigned long foreground) } declare 87 win { int XSetForeground(Display *display, GC gc, unsigned long foreground) } declare 88 win { int XSetClipMask(Display *display, GC gc, Pixmap pixmap) } declare 89 win { int XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } declare 90 win { int XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } declare 91 win { int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } declare 92 win { int XSetFont(Display *display, GC gc, Font font) } declare 93 win { int XSetArcMode(Display *display, GC gc, int arc_mode) } declare 94 win { int XSetStipple(Display *display, GC gc, Pixmap stipple) } declare 95 win { int XSetFillRule(Display *display, GC gc, int fill_rule) } declare 96 win { int XSetFillStyle(Display *display, GC gc, int fill_style) } declare 97 win { int XSetFunction(Display *display, GC gc, int function) } declare 98 win { int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style) } declare 99 win { int _XInitImageFuncPtrs(XImage *image) } declare 100 win { XIC XCreateIC(XIM xim, ...) } declare 101 win { XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return) } declare 102 win { void XSetWMClientMachine(Display *display, Window w, XTextProperty *text_prop) } declare 103 win { Status XStringListToTextProperty(char **list, int count, XTextProperty *text_prop_return) } declare 104 win { int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } declare 105 win { int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy) } declare 106 win { int XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } # New in Tk 8.6 declare 107 win { int XFlush(Display *display) } declare 108 win { int XGrabServer(Display *display) } |
︙ | ︙ | |||
1438 1439 1440 1441 1442 1443 1444 | VisualID XVisualIDFromVisual(Visual *visual) } ################################ # X functions for Aqua declare 0 aqua { | | | 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 | VisualID XVisualIDFromVisual(Visual *visual) } ################################ # X functions for Aqua declare 0 aqua { int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n) } declare 1 aqua { XModifierKeymap *XGetModifierMapping(Display *d) } declare 2 aqua { XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, |
︙ | ︙ | |||
1481 1482 1483 1484 1485 1486 1487 | declare 11 aqua { XErrorHandler XSetErrorHandler(XErrorHandler x) } declare 12 aqua { Status XAllocColor(Display *d, Colormap c, XColor *xp) } declare 13 aqua { | | | 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 | declare 11 aqua { XErrorHandler XSetErrorHandler(XErrorHandler x) } declare 12 aqua { Status XAllocColor(Display *d, Colormap c, XColor *xp) } declare 13 aqua { int XBell(Display *d, int i) } declare 14 aqua { void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3) } declare 15 aqua { void XChangeWindowAttributes(Display *d, Window w, unsigned long ul, |
︙ | ︙ | |||
1509 1510 1511 1512 1513 1514 1515 | unsigned int ui2, int i3, int i4, unsigned long ul) } declare 19 aqua { Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height) } declare 20 aqua { | | | | | | | | 1511 1512 1513 1514 1515 1516 1517 1518 1519 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 | unsigned int ui2, int i3, int i4, unsigned long ul) } declare 19 aqua { Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height) } declare 20 aqua { int XDefineCursor(Display *d, Window w, Cursor c) } declare 21 aqua { void XDestroyWindow(Display *d, Window w) } declare 22 aqua { void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } declare 23 aqua { int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } declare 24 aqua { void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } declare 25 aqua { void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } declare 26 aqua { void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } declare 27 aqua { int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } declare 28 aqua { int XFreeColormap(Display *d, Colormap c) } declare 29 aqua { int XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul) } declare 30 aqua { int XFreeModifiermap(XModifierKeymap *x) } declare 31 aqua { Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4) } declare 32 aqua { |
︙ | ︙ | |||
1603 1604 1605 1606 1607 1608 1609 | declare 45 aqua { void XSetIconName(Display *d, Window w, _Xconst char *c) } declare 46 aqua { void XSetInputFocus(Display *d, Window w, int i, Time t) } declare 47 aqua { | | | 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 | declare 45 aqua { void XSetIconName(Display *d, Window w, _Xconst char *c) } declare 46 aqua { void XSetInputFocus(Display *d, Window w, int i, Time t) } declare 47 aqua { int XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } declare 48 aqua { void XSetWindowBackground(Display *d, Window w, unsigned long ul) } declare 49 aqua { void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } |
︙ | ︙ | |||
1627 1628 1629 1630 1631 1632 1633 | declare 53 aqua { void XSetWindowColormap(Display *d, Window w, Colormap c) } declare 54 aqua { void XUngrabKeyboard(Display *d, Time t) } declare 55 aqua { | | | | | | | | | | | | | | | | | < | | 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 | declare 53 aqua { void XSetWindowColormap(Display *d, Window w, Colormap c) } declare 54 aqua { void XUngrabKeyboard(Display *d, Time t) } declare 55 aqua { int XUngrabPointer(Display *d, Time t) } declare 56 aqua { void XUnmapWindow(Display *d, Window w) } declare 57 aqua { int TkPutImage(unsigned long *colors, int ncolors, 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) } declare 58 aqua { Status XParseColor(Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr) } declare 59 aqua { GC XCreateGC(Display *display, Drawable d, unsigned long valuemask, XGCValues *values) } declare 60 aqua { int XFreeGC(Display *display, GC gc) } declare 61 aqua { Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } declare 62 aqua { int XSetBackground(Display *display, GC gc, unsigned long foreground) } declare 63 aqua { int XSetForeground(Display *display, GC gc, unsigned long foreground) } declare 64 aqua { int XSetClipMask(Display *display, GC gc, Pixmap pixmap) } declare 65 aqua { int XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } declare 66 aqua { int XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } declare 67 aqua { int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } declare 68 aqua { int XSetFont(Display *display, GC gc, Font font) } declare 69 aqua { int XSetArcMode(Display *display, GC gc, int arc_mode) } declare 70 aqua { int XSetStipple(Display *display, GC gc, Pixmap stipple) } declare 71 aqua { int XSetFillRule(Display *display, GC gc, int fill_rule) } declare 72 aqua { int XSetFillStyle(Display *display, GC gc, int fill_style) } declare 73 aqua { int XSetFunction(Display *display, GC gc, int function) } declare 74 aqua { int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style) } declare 75 aqua { int _XInitImageFuncPtrs(XImage *image) } declare 76 aqua { XIC XCreateIC(void) } |
︙ | ︙ | |||
1721 1722 1723 1724 1725 1726 1727 | void XDrawSegments(Display *display, Drawable d, GC gc, XSegment *segments, int nsegments) } declare 81 aqua { void XForceScreenSaver(Display *display, int mode) } declare 82 aqua { | | | | | 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 | void XDrawSegments(Display *display, Drawable d, GC gc, XSegment *segments, int nsegments) } declare 81 aqua { void XForceScreenSaver(Display *display, int mode) } declare 82 aqua { int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } declare 83 aqua { int XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } declare 84 aqua { void XClearWindow(Display *d, Window w) } declare 85 aqua { void XDrawPoint(Display *display, Drawable d, GC gc, int x, int y) } declare 86 aqua { void XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode) } declare 87 aqua { 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) } declare 88 aqua { void XQueryColor(Display *display, Colormap colormap, XColor *def_in_out) } declare 89 aqua { |
︙ | ︙ |
Changes to generic/tkIntXlibDecls.h.
︙ | ︙ | |||
32 33 34 35 36 37 38 | /* !BEGIN!: Do not edit below this line. */ /* * Exported function declarations: */ | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | /* !BEGIN!: Do not edit below this line. */ /* * Exported function declarations: */ #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ /* 0 */ EXTERN int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 1 */ EXTERN XModifierKeymap * XGetModifierMapping(Display *d); /* 2 */ EXTERN XImage * XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); |
︙ | ︙ | |||
60 61 62 63 64 65 66 | /* 7 */ EXTERN Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 8 */ EXTERN Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | /* 7 */ EXTERN Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 8 */ EXTERN Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 9 */ EXTERN GContext XGContextFromGC(GC g); /* 10 */ EXTERN XHostAddress * XListHosts(Display *d, int *i, Bool *b); /* 11 */ EXTERN KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i); /* 12 */ |
︙ | ︙ | |||
83 84 85 86 87 88 89 | EXTERN Status XWithdrawWindow(Display *d, Window w, int i); /* 17 */ EXTERN Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip); /* 18 */ EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp); /* 19 */ | | | | | | | | | | | | | | | | | | | | | | | | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | EXTERN Status XWithdrawWindow(Display *d, Window w, int i); /* 17 */ EXTERN Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip); /* 18 */ EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp); /* 19 */ EXTERN int XBell(Display *d, int i); /* 20 */ EXTERN int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 21 */ EXTERN int XChangeWindowAttributes(Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 22 */ EXTERN int XClearWindow(Display *d, Window w); /* 23 */ EXTERN int XConfigureWindow(Display *d, Window w, unsigned int i, XWindowChanges *x); /* 24 */ EXTERN int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */ EXTERN int XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 26 */ EXTERN Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 27 */ EXTERN int XDefineCursor(Display *d, Window w, Cursor c); /* 28 */ EXTERN int XDeleteProperty(Display *d, Window w, Atom a); /* 29 */ EXTERN int XDestroyWindow(Display *d, Window w); /* 30 */ EXTERN int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 31 */ EXTERN int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 32 */ EXTERN int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 33 */ EXTERN int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 34 */ EXTERN int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 35 */ EXTERN int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 36 */ EXTERN int XForceScreenSaver(Display *d, int i); /* 37 */ EXTERN int XFreeColormap(Display *d, Colormap c); /* 38 */ EXTERN int XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 39 */ EXTERN int XFreeCursor(Display *d, Cursor c); /* 40 */ EXTERN int XFreeModifiermap(XModifierKeymap *x); /* 41 */ EXTERN Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 42 */ EXTERN int XGetInputFocus(Display *d, Window *w, int *i); /* 43 */ EXTERN int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp); /* 44 */ EXTERN Status XGetWindowAttributes(Display *d, Window w, |
︙ | ︙ | |||
174 175 176 177 178 179 180 | Cursor c, Time t); /* 47 */ EXTERN KeyCode XKeysymToKeycode(Display *d, KeySym k); /* 48 */ EXTERN Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 49 */ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 174 175 176 177 178 179 180 181 182 183 184 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 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | Cursor c, Time t); /* 47 */ EXTERN KeyCode XKeysymToKeycode(Display *d, KeySym k); /* 48 */ EXTERN Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 49 */ EXTERN int XMapWindow(Display *d, Window w); /* 50 */ EXTERN int XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 51 */ EXTERN int XMoveWindow(Display *d, Window w, int i1, int i2); /* 52 */ EXTERN int XNextEvent(Display *d, XEvent *x); /* 53 */ EXTERN int XPutBackEvent(Display *d, XEvent *x); /* 54 */ EXTERN int XQueryColors(Display *d, Colormap c, XColor *x, int i); /* 55 */ EXTERN Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 56 */ EXTERN Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 57 */ EXTERN int XRaiseWindow(Display *d, Window w); /* 58 */ EXTERN int XRefreshKeyboardMapping(XMappingEvent *x); /* 59 */ EXTERN int XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 60 */ EXTERN int XSelectInput(Display *d, Window w, long l); /* 61 */ EXTERN Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x); /* 62 */ EXTERN int XSetCommand(Display *d, Window w, char **c, int i); /* 63 */ EXTERN int XSetIconName(Display *d, Window w, _Xconst char *c); /* 64 */ EXTERN int XSetInputFocus(Display *d, Window w, int i, Time t); /* 65 */ EXTERN int XSetSelectionOwner(Display *d, Atom a, Window w, Time t); /* 66 */ EXTERN int XSetWindowBackground(Display *d, Window w, unsigned long ul); /* 67 */ EXTERN int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p); /* 68 */ EXTERN int XSetWindowBorder(Display *d, Window w, unsigned long ul); /* 69 */ EXTERN int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p); /* 70 */ EXTERN int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui); /* 71 */ EXTERN int XSetWindowColormap(Display *d, Window w, Colormap c); /* 72 */ EXTERN Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 73 */ EXTERN int XUngrabKeyboard(Display *d, Time t); /* 74 */ EXTERN int XUngrabPointer(Display *d, Time t); /* 75 */ EXTERN int XUnmapWindow(Display *d, Window w); /* 76 */ EXTERN int XWindowEvent(Display *d, Window w, long l, XEvent *x); /* 77 */ EXTERN void XDestroyIC(XIC x); /* 78 */ EXTERN Bool XFilterEvent(XEvent *x, Window w); /* 79 */ EXTERN int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 80 */ EXTERN int TkPutImage(unsigned long *colors, int ncolors, 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); /* Slot 81 is reserved */ /* 82 */ EXTERN Status XParseColor(Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 83 */ EXTERN GC XCreateGC(Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 84 */ EXTERN int XFreeGC(Display *display, GC gc); /* 85 */ EXTERN Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 86 */ EXTERN int XSetBackground(Display *display, GC gc, unsigned long foreground); /* 87 */ EXTERN int XSetForeground(Display *display, GC gc, unsigned long foreground); /* 88 */ EXTERN int XSetClipMask(Display *display, GC gc, Pixmap pixmap); /* 89 */ EXTERN int XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 90 */ EXTERN int XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 91 */ EXTERN int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values); /* 92 */ EXTERN int XSetFont(Display *display, GC gc, Font font); /* 93 */ EXTERN int XSetArcMode(Display *display, GC gc, int arc_mode); /* 94 */ EXTERN int XSetStipple(Display *display, GC gc, Pixmap stipple); /* 95 */ EXTERN int XSetFillRule(Display *display, GC gc, int fill_rule); /* 96 */ EXTERN int XSetFillStyle(Display *display, GC gc, int fill_style); /* 97 */ EXTERN int XSetFunction(Display *display, GC gc, int function); /* 98 */ EXTERN int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 99 */ EXTERN int _XInitImageFuncPtrs(XImage *image); /* 100 */ EXTERN XIC XCreateIC(XIM xim, ...); /* 101 */ EXTERN XVisualInfo * XGetVisualInfo(Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 102 */ EXTERN void XSetWMClientMachine(Display *display, Window w, XTextProperty *text_prop); /* 103 */ EXTERN Status XStringListToTextProperty(char **list, int count, XTextProperty *text_prop_return); /* 104 */ EXTERN int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 105 */ EXTERN int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 106 */ EXTERN int XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 107 */ EXTERN int XFlush(Display *display); /* 108 */ EXTERN int XGrabServer(Display *display); /* 109 */ |
︙ | ︙ | |||
347 348 349 350 351 352 353 | /* 113 */ EXTERN int XSync(Display *display, Bool discard); /* 114 */ EXTERN VisualID XVisualIDFromVisual(Visual *visual); #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ /* 0 */ | | | 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 | /* 113 */ EXTERN int XSync(Display *display, Bool discard); /* 114 */ EXTERN VisualID XVisualIDFromVisual(Visual *visual); #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ /* 0 */ EXTERN int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 1 */ EXTERN XModifierKeymap * XGetModifierMapping(Display *d); /* 2 */ EXTERN XImage * XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); |
︙ | ︙ | |||
379 380 381 382 383 384 385 | /* 10 */ EXTERN Window XRootWindow(Display *d, int i); /* 11 */ EXTERN XErrorHandler XSetErrorHandler(XErrorHandler x); /* 12 */ EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp); /* 13 */ | | | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | /* 10 */ EXTERN Window XRootWindow(Display *d, int i); /* 11 */ EXTERN XErrorHandler XSetErrorHandler(XErrorHandler x); /* 12 */ EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp); /* 13 */ EXTERN int XBell(Display *d, int i); /* 14 */ EXTERN void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 15 */ EXTERN void XChangeWindowAttributes(Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); |
︙ | ︙ | |||
404 405 406 407 408 409 410 | unsigned int ui2, int i3, int i4, unsigned long ul); /* 19 */ EXTERN Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 20 */ | | | | | | | | 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 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | unsigned int ui2, int i3, int i4, unsigned long ul); /* 19 */ EXTERN Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 20 */ EXTERN int XDefineCursor(Display *d, Window w, Cursor c); /* 21 */ EXTERN void XDestroyWindow(Display *d, Window w); /* 22 */ EXTERN void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 23 */ EXTERN int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 24 */ EXTERN void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 25 */ EXTERN void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 26 */ EXTERN void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 27 */ EXTERN int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 28 */ EXTERN int XFreeColormap(Display *d, Colormap c); /* 29 */ EXTERN int XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 30 */ EXTERN int XFreeModifiermap(XModifierKeymap *x); /* 31 */ EXTERN Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 32 */ EXTERN int XGetWindowProperty(Display *d, Window w, Atom a1, |
︙ | ︙ | |||
481 482 483 484 485 486 487 | EXTERN Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x); /* 45 */ EXTERN void XSetIconName(Display *d, Window w, _Xconst char *c); /* 46 */ EXTERN void XSetInputFocus(Display *d, Window w, int i, Time t); /* 47 */ | | | 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 | EXTERN Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x); /* 45 */ EXTERN void XSetIconName(Display *d, Window w, _Xconst char *c); /* 46 */ EXTERN void XSetInputFocus(Display *d, Window w, int i, Time t); /* 47 */ EXTERN int XSetSelectionOwner(Display *d, Atom a, Window w, Time t); /* 48 */ EXTERN void XSetWindowBackground(Display *d, Window w, unsigned long ul); /* 49 */ EXTERN void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p); |
︙ | ︙ | |||
503 504 505 506 507 508 509 | EXTERN void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui); /* 53 */ EXTERN void XSetWindowColormap(Display *d, Window w, Colormap c); /* 54 */ EXTERN void XUngrabKeyboard(Display *d, Time t); /* 55 */ | | | | | | | | | | | | | | | | | | 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 | EXTERN void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui); /* 53 */ EXTERN void XSetWindowColormap(Display *d, Window w, Colormap c); /* 54 */ EXTERN void XUngrabKeyboard(Display *d, Time t); /* 55 */ EXTERN int XUngrabPointer(Display *d, Time t); /* 56 */ EXTERN void XUnmapWindow(Display *d, Window w); /* 57 */ EXTERN int TkPutImage(unsigned long *colors, int ncolors, 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); /* 58 */ EXTERN Status XParseColor(Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 59 */ EXTERN GC XCreateGC(Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 60 */ EXTERN int XFreeGC(Display *display, GC gc); /* 61 */ EXTERN Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 62 */ EXTERN int XSetBackground(Display *display, GC gc, unsigned long foreground); /* 63 */ EXTERN int XSetForeground(Display *display, GC gc, unsigned long foreground); /* 64 */ EXTERN int XSetClipMask(Display *display, GC gc, Pixmap pixmap); /* 65 */ EXTERN int XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 66 */ EXTERN int XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 67 */ EXTERN int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values); /* 68 */ EXTERN int XSetFont(Display *display, GC gc, Font font); /* 69 */ EXTERN int XSetArcMode(Display *display, GC gc, int arc_mode); /* 70 */ EXTERN int XSetStipple(Display *display, GC gc, Pixmap stipple); /* 71 */ EXTERN int XSetFillRule(Display *display, GC gc, int fill_rule); /* 72 */ EXTERN int XSetFillStyle(Display *display, GC gc, int fill_style); /* 73 */ EXTERN int XSetFunction(Display *display, GC gc, int function); /* 74 */ EXTERN int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 75 */ EXTERN int _XInitImageFuncPtrs(XImage *image); /* 76 */ EXTERN XIC XCreateIC(void); /* 77 */ |
︙ | ︙ | |||
577 578 579 580 581 582 583 | XTextProperty *text_prop_return); /* 80 */ EXTERN void XDrawSegments(Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 81 */ EXTERN void XForceScreenSaver(Display *display, int mode); /* 82 */ | | | | | 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 | XTextProperty *text_prop_return); /* 80 */ EXTERN void XDrawSegments(Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 81 */ EXTERN void XForceScreenSaver(Display *display, int mode); /* 82 */ EXTERN int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 83 */ EXTERN int XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 84 */ EXTERN void XClearWindow(Display *d, Window w); /* 85 */ EXTERN void XDrawPoint(Display *display, Drawable d, GC gc, int x, int y); /* 86 */ EXTERN void XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 87 */ EXTERN 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); /* 88 */ EXTERN void XQueryColor(Display *display, Colormap colormap, XColor *def_in_out); |
︙ | ︙ | |||
614 615 616 617 618 619 620 | EXTERN int XSync(Display *display, Bool flag); #endif /* AQUA */ typedef struct TkIntXlibStubs { int magic; const struct TkIntXlibStubHooks *hooks; | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 | EXTERN int XSync(Display *display, Bool flag); #endif /* AQUA */ typedef struct TkIntXlibStubs { int magic; const struct TkIntXlibStubHooks *hooks; #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */ XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */ XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */ XImage * (*xGetImage) (Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3); /* 3 */ char * (*xGetAtomName) (Display *d, Atom a); /* 4 */ char * (*xKeysymToString) (KeySym k); /* 5 */ Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */ Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 7 */ Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 8 */ GContext (*xGContextFromGC) (GC g); /* 9 */ XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 10 */ KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 11 */ KeySym (*xStringToKeysym) (_Xconst char *c); /* 12 */ Window (*xRootWindow) (Display *d, int i); /* 13 */ XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 14 */ Status (*xIconifyWindow) (Display *d, Window w, int i); /* 15 */ Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 16 */ Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 17 */ Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 18 */ int (*xBell) (Display *d, int i); /* 19 */ int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 20 */ int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 21 */ int (*xClearWindow) (Display *d, Window w); /* 22 */ int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 23 */ int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 24 */ int (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 25 */ Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 26 */ int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 27 */ int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 28 */ int (*xDestroyWindow) (Display *d, Window w); /* 29 */ int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 30 */ int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 31 */ int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 32 */ int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 33 */ int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 34 */ int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 35 */ int (*xForceScreenSaver) (Display *d, int i); /* 36 */ int (*xFreeColormap) (Display *d, Colormap c); /* 37 */ int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 38 */ int (*xFreeCursor) (Display *d, Cursor c); /* 39 */ int (*xFreeModifiermap) (XModifierKeymap *x); /* 40 */ Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 41 */ int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 42 */ int (*xGetWindowProperty) (Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp); /* 43 */ Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 44 */ int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 45 */ int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 46 */ KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 47 */ Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 48 */ int (*xMapWindow) (Display *d, Window w); /* 49 */ int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 50 */ int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 51 */ int (*xNextEvent) (Display *d, XEvent *x); /* 52 */ int (*xPutBackEvent) (Display *d, XEvent *x); /* 53 */ int (*xQueryColors) (Display *d, Colormap c, XColor *x, int i); /* 54 */ Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 55 */ Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 56 */ int (*xRaiseWindow) (Display *d, Window w); /* 57 */ int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 58 */ int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */ int (*xSelectInput) (Display *d, Window w, long l); /* 60 */ Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 61 */ int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 62 */ int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 63 */ int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 64 */ int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 65 */ int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 66 */ int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 67 */ int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 68 */ int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 69 */ int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 70 */ int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 71 */ Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 72 */ int (*xUngrabKeyboard) (Display *d, Time t); /* 73 */ int (*xUngrabPointer) (Display *d, Time t); /* 74 */ int (*xUnmapWindow) (Display *d, Window w); /* 75 */ int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 76 */ void (*xDestroyIC) (XIC x); /* 77 */ Bool (*xFilterEvent) (XEvent *x, Window w); /* 78 */ int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 79 */ int (*tkPutImage) (unsigned long *colors, int ncolors, 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); /* 80 */ void (*reserved81)(void); Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 82 */ GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 83 */ int (*xFreeGC) (Display *display, GC gc); /* 84 */ Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 85 */ int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 86 */ int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 87 */ int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 88 */ int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 89 */ int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 90 */ int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 91 */ int (*xSetFont) (Display *display, GC gc, Font font); /* 92 */ int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 93 */ int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 94 */ int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 95 */ int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 96 */ int (*xSetFunction) (Display *display, GC gc, int function); /* 97 */ int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 98 */ int (*_XInitImageFuncPtrs) (XImage *image); /* 99 */ XIC (*xCreateIC) (XIM xim, ...); /* 100 */ XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 101 */ void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 102 */ Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 103 */ int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */ int (*xWarpPointer) (Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */ int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 106 */ int (*xFlush) (Display *display); /* 107 */ int (*xGrabServer) (Display *display); /* 108 */ int (*xUngrabServer) (Display *display); /* 109 */ int (*xFree) (void *data); /* 110 */ int (*xNoOp) (Display *display); /* 111 */ int (*xSynchronize) (Display *display, Bool onoff); /* 112 */ int (*xSync) (Display *display, Bool discard); /* 113 */ VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */ XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */ XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */ XImage * (*xGetImage) (Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3); /* 3 */ char * (*xGetAtomName) (Display *d, Atom a); /* 4 */ char * (*xKeysymToString) (KeySym k); /* 5 */ Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */ GContext (*xGContextFromGC) (GC g); /* 7 */ KeySym (*xKeycodeToKeysym) (Display *d, KeyCode k, int i); /* 8 */ KeySym (*xStringToKeysym) (_Xconst char *c); /* 9 */ Window (*xRootWindow) (Display *d, int i); /* 10 */ XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 11 */ Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 12 */ int (*xBell) (Display *d, int i); /* 13 */ void (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */ void (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */ void (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */ void (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */ void (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 18 */ Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 19 */ int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */ void (*xDestroyWindow) (Display *d, Window w); /* 21 */ void (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */ int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */ void (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */ void (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */ void (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */ int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 27 */ int (*xFreeColormap) (Display *d, Colormap c); /* 28 */ int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 29 */ int (*xFreeModifiermap) (XModifierKeymap *x); /* 30 */ Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 31 */ int (*xGetWindowProperty) (Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp); /* 32 */ int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 33 */ int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 34 */ KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 35 */ void (*xMapWindow) (Display *d, Window w); /* 36 */ void (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 37 */ void (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 38 */ Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 39 */ void (*xRaiseWindow) (Display *d, Window w); /* 40 */ void (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 41 */ void (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 42 */ void (*xSelectInput) (Display *d, Window w, long l); /* 43 */ Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 44 */ void (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */ void (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */ int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */ void (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */ void (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */ void (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */ void (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 51 */ void (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */ void (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */ void (*xUngrabKeyboard) (Display *d, Time t); /* 54 */ int (*xUngrabPointer) (Display *d, Time t); /* 55 */ void (*xUnmapWindow) (Display *d, Window w); /* 56 */ int (*tkPutImage) (unsigned long *colors, int ncolors, 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); /* 57 */ Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 58 */ GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 59 */ int (*xFreeGC) (Display *display, GC gc); /* 60 */ Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 61 */ int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 62 */ int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 63 */ int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 64 */ int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 65 */ int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 66 */ int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 67 */ int (*xSetFont) (Display *display, GC gc, Font font); /* 68 */ int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 69 */ int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 70 */ int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 71 */ int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 72 */ int (*xSetFunction) (Display *display, GC gc, int function); /* 73 */ int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 74 */ int (*_XInitImageFuncPtrs) (XImage *image); /* 75 */ XIC (*xCreateIC) (void); /* 76 */ XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */ void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 78 */ Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */ void (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */ void (*xForceScreenSaver) (Display *display, int mode); /* 81 */ int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */ int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */ void (*xClearWindow) (Display *d, Window w); /* 84 */ void (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */ void (*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 */ void (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */ void (*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; |
︙ | ︙ | |||
841 842 843 844 845 846 847 | #if defined(USE_TK_STUBS) /* * Inline function declarations: */ | | | 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 | #if defined(USE_TK_STUBS) /* * Inline function declarations: */ #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #define XSetDashes \ (tkIntXlibStubsPtr->xSetDashes) /* 0 */ #define XGetModifierMapping \ (tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */ #define XCreateImage \ (tkIntXlibStubsPtr->xCreateImage) /* 2 */ #define XGetImage \ |
︙ | ︙ |
Changes to generic/tkMain.c.
︙ | ︙ | |||
35 36 37 38 39 40 41 42 43 44 45 46 47 48 | #include "tkInt.h" #ifdef NO_STDLIB_H # include "../compat/stdlib.h" #else # include <stdlib.h> #endif /* * The default prompt used when the user has not overridden it. */ #define DEFAULT_PRIMARY_PROMPT "% " /* | > > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | #include "tkInt.h" #ifdef NO_STDLIB_H # include "../compat/stdlib.h" #else # include <stdlib.h> #endif extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); /* * The default prompt used when the user has not overridden it. */ #define DEFAULT_PRIMARY_PROMPT "% " /* |
︙ | ︙ | |||
186 187 188 189 190 191 192 | * only an issue when Tk is loaded dynamically. */ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { abort(); } | | > | | > | > > | 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 | * only an issue when Tk is loaded dynamically. */ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { abort(); } #if defined(__WIN32__) && !defined(__WIN64__) && !defined(UNICODE) && !defined(STATIC_BUILD) if (tclStubsPtr->reserved9) { /* We are running win32 Tk under Cygwin, so let's check * whether the env("DISPLAY") variable or the -display * argument is set. If so, we really want to run the * Tk_MainEx function of libtk8.?.dll, not this one. */ if (Tcl_GetVar2(interp, "env", "DISPLAY", TCL_GLOBAL_ONLY)) { loadCygwinTk: if (TkCygwinMainEx(argc, argv, appInitProc, interp)) { /* Should never reach here. */ return; } } else { int i; for (i = 1; i < argc; ++i) { if (!_tcscmp(argv[i], TEXT("-display"))) { goto loadCygwinTk; } |
︙ | ︙ |
Changes to generic/tkPointer.c.
︙ | ︙ | |||
462 463 464 465 466 467 468 | * * Side effects: * Releases the mouse capture. * *---------------------------------------------------------------------- */ | | > | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | * * Side effects: * Releases the mouse capture. * *---------------------------------------------------------------------- */ int XUngrabPointer( Display *display, Time time) { ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); display->request++; tsdPtr->grabWinPtr = NULL; tsdPtr->restrictWinPtr = NULL; TkpSetCapture(NULL); UpdateCursor(tsdPtr->lastWinPtr); return Success; } /* *---------------------------------------------------------------------- * * TkPointerDeadWindow -- * |
︙ | ︙ | |||
575 576 577 578 579 580 581 | * * Side effects: * May update the cursor. * *---------------------------------------------------------------------- */ | | > | 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 | * * Side effects: * May update the cursor. * *---------------------------------------------------------------------- */ int XDefineCursor( Display *display, Window w, Cursor cursor) { TkWindow *winPtr = (TkWindow *) Tk_IdToWindow(display, w); ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (tsdPtr->cursorWinPtr == winPtr) { UpdateCursor(winPtr); } display->request++; return Success; } /* *---------------------------------------------------------------------- * * TkGenerateActivateEvents -- * |
︙ | ︙ |
Changes to generic/tkStubInit.c.
︙ | ︙ | |||
48 49 50 51 52 53 54 | } void TkpSync(Display *display) { /* dummy implementation, no need to do anything */ } | > | > > > > | | | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | } void TkpSync(Display *display) { /* dummy implementation, no need to do anything */ } void TkCreateXEventSource(void) { 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__ */ /* * Make sure that extensions which call XParseColor through the stub * table, call TkParseColor instead. [Bug 3486474] */ # define XParseColor TkParseColor # ifdef __CYGWIN__ TkIntStubs tkIntStubs; /* * Trick, so we don't have to include <windows.h> here, which in any * case lacks this function anyway. */ #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x00000004 |
︙ | ︙ | |||
101 102 103 104 105 106 107 | char *buf, /* Pointer to string large enough to hold * the hex representation of a pointer. */ Window window) /* Window to be printed into buffer. */ { sprintf(buf, "%#08lx", (unsigned long) (window)); } | | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | char *buf, /* Pointer to string large enough to hold * the hex representation of a pointer. */ Window window) /* Window to be printed into buffer. */ { sprintf(buf, "%#08lx", (unsigned long) (window)); } int TkPutImage( unsigned long *colors, /* Array of pixel values used by this image. * May be NULL. */ int ncolors, /* Number of colors used, or 0. */ 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 XPutImage(display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height); } TkRegion TkCreateRegion() { return (TkRegion) XCreateRegion(); } |
︙ | ︙ | |||
158 159 160 161 162 163 164 | } void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c) { XSubtractRegion((Region) a, (Region) b, (Region) c); } | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 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 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | } void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c) { XSubtractRegion((Region) a, (Region) b, (Region) c); } /* TODO: To be implemented for Cygwin */ # define Tk_AttachHWND 0 # define Tk_GetHWND 0 # define Tk_HWNDToWindow 0 # define Tk_PointerEvent 0 # define Tk_TranslateWinEvent 0 # define TkAlignImageData 0 # define TkGenerateActivateEvents 0 # define TkpGetMS 0 # define TkPointerDeadWindow 0 # define TkpSetCapture 0 # define TkpSetCursor 0 # define TkWinCancelMouseTimer 0 # define TkWinClipboardRender 0 # define TkWinEmbeddedEventProc 0 # define TkWinFillRect 0 # define TkWinGetBorderPixels 0 # define TkWinGetDrawableDC 0 # define TkWinGetModifierState 0 # define TkWinGetSystemPalette 0 # define TkWinGetWrapperWindow 0 # define TkWinHandleMenuEvent 0 # define TkWinIndexOfColor 0 # define TkWinReleaseDrawableDC 0 # define TkWinResendEvent 0 # define TkWinSelectPalette 0 # define TkWinSetMenu 0 # define TkWinSetWindowPos 0 # define TkWinWmCleanup 0 # define TkWinXCleanup 0 # define TkWinXInit 0 # define TkWinSetForegroundWindow 0 # define TkWinDialogDebug 0 # define TkWinGetMenuSystemDefault 0 # define TkWinGetPlatformId 0 # define TkWinSetHINSTANCE 0 # define TkWinGetPlatformTheme 0 # define TkWinChildProc 0 # elif !defined(MAC_OSX_TK) /* UNIX */ # undef TkClipBox # undef TkCreateRegion # undef TkDestroyRegion # undef TkIntersectRegion # undef TkRectInRegion # undef TkSetRegion # undef TkUnionRectWithRegion # undef TkSubtractRegion # define TkClipBox (void (*) (TkRegion, XRectangle *)) XClipBox # define TkCreateRegion (TkRegion (*) ()) XCreateRegion # define TkDestroyRegion (void (*) (TkRegion)) XDestroyRegion # define TkIntersectRegion (void (*) (TkRegion, TkRegion, TkRegion)) XIntersectRegion # define TkRectInRegion (int (*) (TkRegion, int, int, unsigned int, unsigned int)) XRectInRegion # define TkSetRegion (void (*) (Display *, GC, TkRegion)) XSetRegion # define TkUnionRectWithRegion (void (*) (XRectangle *, TkRegion, TkRegion)) XUnionRectWithRegion # define TkSubtractRegion (void (*) (TkRegion, TkRegion, TkRegion)) XSubtractRegion # endif #endif /* !__WIN32__ */ /* * WARNING: The contents of this file is automatically generated by the * tools/genStubs.tcl script. Any modifications to the function declarations * below should be made in the generic/tk.decls script. |
︙ | ︙ | |||
574 575 576 577 578 579 580 | TkpTestsendCmd, /* 13 */ #endif /* X11 */ }; static const TkIntXlibStubs tkIntXlibStubs = { TCL_STUB_MAGIC, 0, | | | 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 | TkpTestsendCmd, /* 13 */ #endif /* X11 */ }; static const TkIntXlibStubs tkIntXlibStubs = { TCL_STUB_MAGIC, 0, #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ XSetDashes, /* 0 */ XGetModifierMapping, /* 1 */ XCreateImage, /* 2 */ XGetImage, /* 3 */ XGetAtomName, /* 4 */ XKeysymToString, /* 5 */ XCreateColormap, /* 6 */ |
︙ | ︙ |
Changes to generic/tkWindow.c.
︙ | ︙ | |||
2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 | } tsdPtr->numMainWindows = 0; tsdPtr->mainWindowList = NULL; tsdPtr->initialized = 0; } /* *---------------------------------------------------------------------- * * Tk_Init -- * * This function is invoked to add Tk to an interpreter. It incorporates * all of Tk's commands into the interpreter and creates the main window | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 | } tsdPtr->numMainWindows = 0; tsdPtr->mainWindowList = NULL; tsdPtr->initialized = 0; } #if defined(__WIN32__) && !defined(__WIN64__) static HMODULE tkcygwindll = NULL; /* * Run Tk_MainEx from libtk8.?.dll * * This function is only ever called from wish8.4.exe, the cygwin * port of Tcl. This means that the system encoding is utf-8, * so we don't have to do any encoding conversions. */ int TkCygwinMainEx(argc, argv, appInitProc, interp) int argc; /* Number of arguments. */ char **argv; /* Array of argument strings. */ Tcl_AppInitProc *appInitProc; /* Application-specific initialization * procedure to call after most * initialization but before starting * to execute commands. */ Tcl_Interp *interp; { TCHAR name[MAX_PATH]; int len; void (*sym)(int, char **, Tcl_AppInitProc *, Tcl_Interp *); /* construct "<path>/libtk8.?.dll", from "<path>/tk8?.dll" */ len = GetModuleFileNameW(Tk_GetHINSTANCE(), name, MAX_PATH); name[len-2] = TEXT('.'); name[len-1] = name[len-5]; _tcscpy(name+len, TEXT(".dll")); memcpy(name+len-8, TEXT("libtk8"), 6 * sizeof(TCHAR)); tkcygwindll = LoadLibrary(name); if (!tkcygwindll) { /* dll is not present */ return 0; } sym = (void (*)(int, char **, Tcl_AppInitProc *, Tcl_Interp *)) GetProcAddress(tkcygwindll, "Tk_MainEx"); if (!sym) { return 0; } sym(argc, argv, appInitProc, interp); return 1; } #endif /* *---------------------------------------------------------------------- * * Tk_Init -- * * This function is invoked to add Tk to an interpreter. It incorporates * all of Tk's commands into the interpreter and creates the main window |
︙ | ︙ | |||
2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 | *---------------------------------------------------------------------- */ int Tk_Init( Tcl_Interp *interp) /* Interpreter to initialize. */ { return Initialize(interp); } /* *---------------------------------------------------------------------- * * Tk_SafeInit -- | > > > > > > > > > > | 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 | *---------------------------------------------------------------------- */ int Tk_Init( Tcl_Interp *interp) /* Interpreter to initialize. */ { #if defined(__WIN32__) && !defined(__WIN64__) if (tkcygwindll) { int (*sym)(Tcl_Interp *); sym = (int (*)(Tcl_Interp *)) GetProcAddress(tkcygwindll, "Tk_Init"); if (sym) { return sym(interp); } } #endif return Initialize(interp); } /* *---------------------------------------------------------------------- * * Tk_SafeInit -- |
︙ | ︙ | |||
2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 | * - No CPU time limit, no memory allocation limits, no color limits. * CPU time limits can be imposed by an unsafe master interpreter. * * The actual code called is the same as Tk_Init but Tcl_IsSafe() is * checked at several places to differentiate the two initialisations. */ return Initialize(interp); } MODULE_SCOPE const TkStubs tkStubs; /* *---------------------------------------------------------------------- | > > > > > > > > > > | 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 | * - No CPU time limit, no memory allocation limits, no color limits. * CPU time limits can be imposed by an unsafe master interpreter. * * The actual code called is the same as Tk_Init but Tcl_IsSafe() is * checked at several places to differentiate the two initialisations. */ #if defined(__WIN32__) && !defined(__WIN64__) if (tkcygwindll) { int (*sym)(Tcl_Interp *); sym = (int (*)(Tcl_Interp *)) GetProcAddress(tkcygwindll, "Tk_SafeInit"); if (sym) { return sym(interp); } } #endif return Initialize(interp); } MODULE_SCOPE const TkStubs tkStubs; /* *---------------------------------------------------------------------- |
︙ | ︙ |
Changes to macosx/tkMacOSXClipboard.c.
︙ | ︙ | |||
157 158 159 160 161 162 163 | * * Side effects: * None. * *---------------------------------------------------------------------- */ | | > | > | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 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 | * * Side effects: * None. * *---------------------------------------------------------------------- */ int XSetSelectionOwner( Display *display, /* X Display. */ Atom selection, /* What selection to own. */ Window owner, /* Window to be the owner. */ Time time) /* The current time? */ { TkDisplay *dispPtr = TkGetDisplayList(); if (dispPtr && selection == dispPtr->clipboardAtom) { clipboardOwner = owner ? Tk_IdToWindow(display, owner) : NULL; if (!dispPtr->clipboardActive) { NSPasteboard *pb = [NSPasteboard generalPasteboard]; changeCount = [pb declareTypes:[NSArray array] owner:NSApp]; } } return Success; } /* *---------------------------------------------------------------------- * * TkMacOSXSelDeadWindow -- * * This function is invoked just before a TkWindow is deleted. It * performs selection-related cleanup. * * Results: * None. * * Side effects: * clipboardOwner is cleared. * *---------------------------------------------------------------------- */ int TkMacOSXSelDeadWindow( TkWindow *winPtr) { if (winPtr && winPtr == (TkWindow *)clipboardOwner) { clipboardOwner = NULL; } return Success; } /* *---------------------------------------------------------------------- * * TkSelUpdateClipboard -- * |
︙ | ︙ |
Changes to macosx/tkMacOSXColor.c.
︙ | ︙ | |||
695 696 697 698 699 700 701 | /* * Just return a new value each time. */ return index++; } | | > | > | 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 | /* * Just return a new value each time. */ return index++; } int XFreeColormap( Display* display, /* Display. */ Colormap colormap) /* Colormap. */ { return Success; } int XFreeColors( Display* display, /* Display. */ Colormap colormap, /* Colormap. */ unsigned long* pixels, /* Array of pixels. */ int npixels, /* Number of pixels. */ unsigned long planes) /* Number of pixel planes. */ { /* * The Macintosh version of Tk uses TrueColor. Nothing * needs to be done to release colors as there really is * no colormap in the Tk sense. */ return Success; } /* * Local Variables: * mode: objc * c-basic-offset: 4 * fill-column: 79 |
︙ | ︙ |
Changes to macosx/tkMacOSXDraw.c.
︙ | ︙ | |||
307 308 309 310 311 312 313 | * * Side effects: * Draws the image on the specified drawable. * *---------------------------------------------------------------------- */ | | | | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | * * Side effects: * Draws the image on the specified drawable. * *---------------------------------------------------------------------- */ int TkPutImage( unsigned long *colors, /* Unused on Macintosh. */ int ncolors, /* Unused on Macintosh. */ Display* display, /* Display. */ Drawable d, /* Drawable to place image on. */ GC gc, /* GC to use. */ XImage* image, /* Image to place. */ int src_x, /* Source X & Y. */ int src_y, int dest_x, /* Destination X & Y. */ int dest_y, unsigned int width, /* Same width & height for both */ unsigned int height) /* distination and source. */ { TkMacOSXDrawingContext dc; display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) { return BadDrawable; } if (dc.context) { CGImageRef img = CreateCGImageWithXImage(image); if (img) { DrawCGImage(d, gc, dc.context, img, gc->foreground, gc->background, CGRectMake(0, 0, image->width, image->height), |
︙ | ︙ | |||
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 | }*/ if (subImage) { CFRelease(subImage); } } else { TkMacOSXDbgMsg("Drawing of empty CGImage requested"); } } /* *---------------------------------------------------------------------- * * XDrawLines -- * * Draw connected lines. * * Results: * None. * * Side effects: * Renders a series of connected lines. * *---------------------------------------------------------------------- */ | > | < < < < | | | 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 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 | }*/ if (subImage) { CFRelease(subImage); } } else { TkMacOSXDbgMsg("Drawing of empty CGImage requested"); } return Success; } /* *---------------------------------------------------------------------- * * XDrawLines -- * * Draw connected lines. * * Results: * None. * * Side effects: * Renders a series of connected lines. * *---------------------------------------------------------------------- */ int XDrawLines( Display *display, /* Display. */ Drawable d, /* Draw on this. */ GC gc, /* Use this GC. */ XPoint *points, /* Array of points. */ int npoints, /* Number of points. */ int mode) /* Line drawing mode. */ { MacDrawable *macWin = (MacDrawable *) d; TkMacOSXDrawingContext dc; int i, lw = gc->line_width; if (npoints < 2) { return BadValue; } display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) { return BadDrawable; } if (dc.context) { double prevx, prevy; double o = (lw % 2) ? .5 : 0; CGContextBeginPath(dc.context); prevx = macWin->xOff + points[0].x + o; |
︙ | ︙ | |||
806 807 808 809 810 811 812 813 814 815 816 817 818 819 | prevy += points[i].y; CGContextAddLineToPoint(dc.context, prevx, prevy); } } CGContextStrokePath(dc.context); } TkMacOSXRestoreDrawingContext(&dc); } /* *---------------------------------------------------------------------- * * XDrawSegments -- * | > | 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 | prevy += points[i].y; CGContextAddLineToPoint(dc.context, prevx, prevy); } } CGContextStrokePath(dc.context); } TkMacOSXRestoreDrawingContext(&dc); return Success; } /* *---------------------------------------------------------------------- * * XDrawSegments -- * |
︙ | ︙ | |||
1044 1045 1046 1047 1048 1049 1050 | * * Side effects: * Draws onto the specified drawable. * *---------------------------------------------------------------------- */ | | | > | 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 | * * Side effects: * Draws onto the specified drawable. * *---------------------------------------------------------------------- */ int XFillRectangles( Display* display, /* Display. */ Drawable d, /* Draw on this. */ GC gc, /* Use this GC. */ XRectangle *rectangles, /* Rectangle array. */ int n_rectangles) /* Number of rectangles. */ { MacDrawable *macWin = (MacDrawable *) d; TkMacOSXDrawingContext dc; XRectangle * rectPtr; int i; display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) { return BadDrawable; } if (dc.context) { CGRect rect; for (i = 0, rectPtr = rectangles; i < n_rectangles; i++, rectPtr++) { if (rectPtr->width == 0 || rectPtr->height == 0) { continue; } rect = CGRectMake( macWin->xOff + rectPtr->x, macWin->yOff + rectPtr->y, rectPtr->width, rectPtr->height); CGContextFillRect(dc.context, rect); } } TkMacOSXRestoreDrawingContext(&dc); return Success; } /* *---------------------------------------------------------------------- * * XDrawArc -- * |
︙ | ︙ |
Changes to macosx/tkMacOSXKeyboard.c.
︙ | ︙ | |||
476 477 478 479 480 481 482 | * * Side effects: * Frees the datastructure referenced by modmap. * *---------------------------------------------------------------------- */ | | > | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | * * Side effects: * Frees the datastructure referenced by modmap. * *---------------------------------------------------------------------- */ int XFreeModifiermap( XModifierKeymap *modmap) { if (modmap->modifiermap != NULL) { ckfree(modmap->modifiermap); } ckfree(modmap); return Success; } /* *---------------------------------------------------------------------- * * XKeysymToString, XStringToKeysym -- * |
︙ | ︙ |
Changes to macosx/tkMacOSXXStubs.c.
︙ | ︙ | |||
447 448 449 450 451 452 453 | Display* display, Window w, long event_mask) { Debugger(); } | | > | 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 | Display* display, Window w, long event_mask) { Debugger(); } int XBell( Display* display, int percent) { NSBeep(); return Success; } #if 0 void XSetWMNormalHints( Display* display, Window w, |
︙ | ︙ | |||
532 533 534 535 536 537 538 | XPoint* points, int npoints, int mode) { } */ | | > | 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 | XPoint* points, int npoints, int mode) { } */ 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) { return Success; } void XQueryColor( Display* display, Colormap colormap, XColor* def_in_out) |
︙ | ︙ |
Changes to unix/tkUnixPort.h.
︙ | ︙ | |||
122 123 124 125 126 127 128 | # define HMENU void * # define TkWinDCState void # define HPALETTE void * # define WNDPROC void * # define WPARAM void * # define LPARAM void * # define LRESULT void * | | | | | | | | | > | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | # define HMENU void * # define TkWinDCState void # define HPALETTE void * # define WNDPROC void * # define WPARAM void * # define LPARAM void * # define LRESULT void * #else /* !__CYGWIN__ */ /* * The TkPutImage macro strips off the color table information, which isn't * needed for X. */ # define TkPutImage(colors, ncolors, display, pixels, gc, image, srcx, srcy, destx, desty, width, height) \ XPutImage(display, pixels, gc, image, srcx, srcy, destx, \ desty, width, height); #endif /* !__CYGWIN__ */ /* * Supply macros for seek offsets, if they're not already provided by * an include file. */ #ifndef SEEK_SET |
︙ | ︙ |
Changes to win/stubs.c.
1 2 3 4 5 6 7 8 9 10 | #include "tk.h" /* * Undocumented Xlib internal function */ int _XInitImageFuncPtrs( XImage *image) { | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | #include "tk.h" /* * Undocumented Xlib internal function */ int _XInitImageFuncPtrs( XImage *image) { return Success; } /* * From Xutil.h */ void |
︙ | ︙ | |||
32 33 34 35 36 37 38 | return (Status) 0; } /* * From Xlib.h */ | | > | | | | > | > | > | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | return (Status) 0; } /* * From Xlib.h */ int XChangeProperty( Display *display, Window w, Atom property, Atom type, int format, int mode, _Xconst unsigned char *data, int nelements) { return Success; } Cursor XCreateGlyphCursor( Display *display, Font source_font, Font mask_font, unsigned int source_char, unsigned int mask_char, XColor _Xconst *foreground_color, XColor _Xconst *background_color) { return 1; } XIC XCreateIC(XIM xim, ...) { return NULL; } Cursor XCreatePixmapCursor( Display *display, Pixmap source, Pixmap mask, XColor *foreground_color, XColor *background_color, unsigned int x, unsigned int y) { return (Cursor) NULL; } int XDeleteProperty( Display *display, Window w, Atom property) { return Success; } void XDestroyIC( XIC ic) { } Bool XFilterEvent( XEvent *event, Window window) { return 0; } int XForceScreenSaver( Display *display, int mode) { return Success; } int XFreeCursor( Display *display, Cursor cursor) { return Success; } GContext XGContextFromGC( GC gc) { return (GContext) NULL; |
︙ | ︙ | |||
134 135 136 137 138 139 140 | int XGetWindowAttributes( Display *display, Window w, XWindowAttributes *window_attributes_return) { | | | | | > | > | > | | > | > | | > | > | > | > | > | > | > | > | > | | | 138 139 140 141 142 143 144 145 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 179 180 181 182 183 184 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 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 | int XGetWindowAttributes( Display *display, Window w, XWindowAttributes *window_attributes_return) { return Success; } Status XGetWMColormapWindows( Display *display, Window w, Window **windows_return, int *count_return) { return (Status) 0; } int XIconifyWindow( Display *display, Window w, int screen_number) { return Success; } XHostAddress * XListHosts( Display *display, int *nhosts_return, Bool *state_return) { return NULL; } int XLookupColor( Display *display, Colormap colormap, _Xconst char *color_name, XColor *exact_def_return, XColor *screen_def_return) { return Success; } int XNextEvent( Display *display, XEvent *event_return) { return Success; } int XPutBackEvent( Display *display, XEvent *event) { return Success; } int XQueryColors( Display *display, Colormap colormap, XColor *defs_in_out, int ncolors) { return Success; } int XQueryTree( Display *display, Window w, Window *root_return, Window *parent_return, Window **children_return, unsigned int *nchildren_return) { return Success; } int XRefreshKeyboardMapping( XMappingEvent *event_map) { return Success; } Window XRootWindow( Display *display, int screen_number) { return (Window) NULL; } int XSelectInput( Display *display, Window w, long event_mask) { return Success; } int XSendEvent( Display *display, Window w, Bool propagate, long event_mask, XEvent *event_send) { return Success; } int XSetCommand( Display *display, Window w, char **argv, int argc) { return Success; } XErrorHandler XSetErrorHandler( XErrorHandler handler) { return NULL; } int XSetIconName( Display *display, Window w, _Xconst char *icon_name) { return Success; } int XSetWindowBackground( Display *display, Window w, unsigned long background_pixel) { return Success; } int XSetWindowBackgroundPixmap( Display *display, Window w, Pixmap background_pixmap) { return Success; } int XSetWindowBorder( Display *display, Window w, unsigned long border_pixel) { return Success; } int XSetWindowBorderPixmap( Display *display, Window w, Pixmap border_pixmap) { return Success; } int XSetWindowBorderWidth( Display *display, Window w, unsigned int width) { return Success; } int XSetWindowColormap( Display *display, Window w, Colormap colormap) { return Success; } Bool XTranslateCoordinates( Display *display, Window src_w, Window dest_w, int src_x, int src_y, int *dest_x_return, int *dest_y_return, Window *child_return) { return 0; } int XWindowEvent( Display *display, Window w, long event_mask, XEvent *event_return) { return Success; } int XWithdrawWindow( Display *display, Window w, int screen_number) { return Success; } int XmbLookupString( XIC ic, XKeyPressedEvent *event, char *buffer_return, int bytes_buffer, KeySym *keysym_return, Status *status_return) { return Success; } int XGetWindowProperty( Display *display, Window w, Atom property, |
︙ | ︙ |
Changes to win/tkWinClipboard.c.
︙ | ︙ | |||
181 182 183 184 185 186 187 | * * Side effects: * Empties the system clipboard, and claims ownership. * *---------------------------------------------------------------------- */ | | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | * * Side effects: * Empties the system clipboard, and claims ownership. * *---------------------------------------------------------------------- */ int XSetSelectionOwner( Display *display, Atom selection, Window owner, Time time) { HWND hwnd = owner ? TkWinGetHWND(owner) : NULL; |
︙ | ︙ | |||
208 209 210 211 212 213 214 215 216 217 218 219 220 221 | * of the clipboard. */ if (GetClipboardOwner() != hwnd) { UpdateClipboard(hwnd); } } } /* *---------------------------------------------------------------------- * * TkWinClipboardRender -- * | > | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | * of the clipboard. */ if (GetClipboardOwner() != hwnd) { UpdateClipboard(hwnd); } } return Success; } /* *---------------------------------------------------------------------- * * TkWinClipboardRender -- * |
︙ | ︙ |
Changes to win/tkWinColor.c.
︙ | ︙ | |||
402 403 404 405 406 407 408 | * Side effects: * Removes entries for the current palette and compacts the remaining * set. * *---------------------------------------------------------------------- */ | | | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 | * Side effects: * Removes entries for the current palette and compacts the remaining * set. * *---------------------------------------------------------------------- */ int XFreeColors( Display *display, Colormap colormap, unsigned long *pixels, int npixels, unsigned long planes) { |
︙ | ︙ | |||
454 455 456 457 458 459 460 461 462 463 464 465 466 467 | Tcl_DeleteHashEntry(entryPtr); } else { Tcl_SetHashValue(entryPtr, INT2PTR(refCount)); } } } ReleaseDC(NULL, dc); } /* *---------------------------------------------------------------------- * * XCreateColormap -- * | > | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 | Tcl_DeleteHashEntry(entryPtr); } else { Tcl_SetHashValue(entryPtr, INT2PTR(refCount)); } } } ReleaseDC(NULL, dc); return Success; } /* *---------------------------------------------------------------------- * * XCreateColormap -- * |
︙ | ︙ | |||
535 536 537 538 539 540 541 | * Side effects: * Deletes the palette associated with the colormap. Note that the * palette must not be selected into a device context when this occurs. * *---------------------------------------------------------------------- */ | | > | 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 | * Side effects: * Deletes the palette associated with the colormap. Note that the * palette must not be selected into a device context when this occurs. * *---------------------------------------------------------------------- */ int XFreeColormap( Display *display, Colormap colormap) { TkWinColormap *cmap = (TkWinColormap *) colormap; if (!DeleteObject(cmap->palette)) { Tcl_Panic("Unable to free colormap, palette is still selected"); } Tcl_DeleteHashTable(&cmap->refCounts); ckfree(cmap); return Success; } /* *---------------------------------------------------------------------- * * TkWinSelectPalette -- * |
︙ | ︙ |
Changes to win/tkWinDraw.c.
︙ | ︙ | |||
111 112 113 114 115 116 117 | /* * Forward declarations for functions defined in this file: */ static POINT * ConvertPoints(XPoint *points, int npoints, int mode, RECT *bbox); | | | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | /* * Forward declarations for functions defined in this file: */ static POINT * ConvertPoints(XPoint *points, int npoints, int mode, RECT *bbox); static int DrawOrFillArc(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent, int fill); static void RenderObject(HDC dc, GC gc, XPoint* points, int npoints, int mode, HPEN pen, WinDrawFunc func); static HPEN SetUpGraphicsPort(GC gc); |
︙ | ︙ | |||
292 293 294 295 296 297 298 | * * Side effects: * Data is moved from a window or bitmap to a second window or bitmap. * *---------------------------------------------------------------------- */ | | | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | * * Side effects: * Data is moved from a window or bitmap to a second window or bitmap. * *---------------------------------------------------------------------- */ int XCopyArea( Display *display, Drawable src, Drawable dest, GC gc, int src_x, int src_y, unsigned int width, unsigned int height, |
︙ | ︙ | |||
328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 | SelectClipRgn(destDC, NULL); if (src != dest) { TkWinReleaseDrawableDC(dest, destDC, &destState); } TkWinReleaseDrawableDC(src, srcDC, &srcState); } /* *---------------------------------------------------------------------- * * XCopyPlane -- * * Copies a bitmap from a source drawable to a destination drawable. The * plane argument specifies which bit plane of the source contains the * bitmap. Note that this implementation ignores the gc->function. * * Results: * None. * * Side effects: * Changes the destination drawable. * *---------------------------------------------------------------------- */ | > | | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | SelectClipRgn(destDC, NULL); if (src != dest) { TkWinReleaseDrawableDC(dest, destDC, &destState); } TkWinReleaseDrawableDC(src, srcDC, &srcState); return Success; } /* *---------------------------------------------------------------------- * * XCopyPlane -- * * Copies a bitmap from a source drawable to a destination drawable. The * plane argument specifies which bit plane of the source contains the * bitmap. Note that this implementation ignores the gc->function. * * Results: * None. * * Side effects: * Changes the destination drawable. * *---------------------------------------------------------------------- */ int XCopyPlane( Display *display, Drawable src, Drawable dest, GC gc, int src_x, int src_y, unsigned int width, unsigned int height, |
︙ | ︙ | |||
475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | DeleteObject(bgBrush); } } if (src != dest) { TkWinReleaseDrawableDC(dest, destDC, &destState); } TkWinReleaseDrawableDC(src, srcDC, &srcState); } /* *---------------------------------------------------------------------- * * TkPutImage -- * * Copies a subimage from an in-memory image to a rectangle of of the * specified drawable. * * Results: * None. * * Side effects: * Draws the image on the specified drawable. * *---------------------------------------------------------------------- */ | > | | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 | DeleteObject(bgBrush); } } if (src != dest) { TkWinReleaseDrawableDC(dest, destDC, &destState); } TkWinReleaseDrawableDC(src, srcDC, &srcState); return Success; } /* *---------------------------------------------------------------------- * * TkPutImage -- * * Copies a subimage from an in-memory image to a rectangle of of the * specified drawable. * * Results: * None. * * Side effects: * Draws the image on the specified drawable. * *---------------------------------------------------------------------- */ int TkPutImage( unsigned long *colors, /* Array of pixel values used by this image. * May be NULL. */ int ncolors, /* Number of colors used, or 0. */ Display *display, Drawable d, /* Destination drawable. */ GC gc, |
︙ | ︙ | |||
583 584 585 586 587 588 589 | image->data, infoPtr, DIB_RGB_COLORS); ckfree(infoPtr); } if (!bitmap) { Tcl_Panic("Fail to allocate bitmap"); DeleteDC(dcMem); TkWinReleaseDrawableDC(d, dc, &state); | | > | | | 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 | image->data, infoPtr, DIB_RGB_COLORS); ckfree(infoPtr); } if (!bitmap) { Tcl_Panic("Fail to allocate bitmap"); DeleteDC(dcMem); TkWinReleaseDrawableDC(d, dc, &state); return BadValue; } bitmap = SelectObject(dcMem, bitmap); BitBlt(dc, dest_x, dest_y, (int) width, (int) height, dcMem, src_x, src_y, SRCCOPY); DeleteObject(SelectObject(dcMem, bitmap)); DeleteDC(dcMem); TkWinReleaseDrawableDC(d, dc, &state); return Success; } /* *---------------------------------------------------------------------- * * XFillRectangles -- * * Fill multiple rectangular areas in the given drawable. * * Results: * None. * * Side effects: * Draws onto the specified drawable. * *---------------------------------------------------------------------- */ int XFillRectangles( Display *display, Drawable d, GC gc, XRectangle *rectangles, int nrectangles) { HDC dc; int i; RECT rect; TkWinDCState state; HBRUSH brush, oldBrush; if (d == None) { return BadDrawable; } dc = TkWinGetDrawableDC(display, d, &state); SetROP2(dc, tkpWinRopModes[gc->function]); brush = CreateSolidBrush(gc->foreground); if ((gc->fill_style == FillStippled |
︙ | ︙ | |||
711 712 713 714 715 716 717 718 719 720 721 722 723 724 | SelectObject(dc, oldBrush); SelectObject(dc, oldPen); DeleteObject(newPen); } } DeleteObject(brush); TkWinReleaseDrawableDC(d, dc, &state); } /* *---------------------------------------------------------------------- * * RenderObject -- * | > | 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 | SelectObject(dc, oldBrush); SelectObject(dc, oldPen); DeleteObject(newPen); } } DeleteObject(brush); TkWinReleaseDrawableDC(d, dc, &state); return Success; } /* *---------------------------------------------------------------------- * * RenderObject -- * |
︙ | ︙ | |||
858 859 860 861 862 863 864 | * * Side effects: * Renders a series of connected lines. * *---------------------------------------------------------------------- */ | | | > | | > | | > | | | | | | | 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 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 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 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 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 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 | * * Side effects: * Renders a series of connected lines. * *---------------------------------------------------------------------- */ int XDrawLines( Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode) { HPEN pen; TkWinDCState state; HDC dc; if (d == None) { return BadDrawable; } dc = TkWinGetDrawableDC(display, d, &state); pen = SetUpGraphicsPort(gc); SetBkMode(dc, TRANSPARENT); RenderObject(dc, gc, points, npoints, mode, pen, Polyline); DeleteObject(pen); TkWinReleaseDrawableDC(d, dc, &state); return Success; } /* *---------------------------------------------------------------------- * * XFillPolygon -- * * Draws a filled polygon. * * Results: * None. * * Side effects: * Draws a filled polygon on the specified drawable. * *---------------------------------------------------------------------- */ int XFillPolygon( Display *display, Drawable d, GC gc, XPoint *points, int npoints, int shape, int mode) { HPEN pen; TkWinDCState state; HDC dc; if (d == None) { return BadDrawable; } dc = TkWinGetDrawableDC(display, d, &state); pen = GetStockObject(NULL_PEN); RenderObject(dc, gc, points, npoints, mode, pen, Polygon); TkWinReleaseDrawableDC(d, dc, &state); return Success; } /* *---------------------------------------------------------------------- * * XDrawRectangle -- * * Draws a rectangle. * * Results: * None. * * Side effects: * Draws a rectangle on the specified drawable. * *---------------------------------------------------------------------- */ int XDrawRectangle( Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) { HPEN pen, oldPen; TkWinDCState state; HBRUSH oldBrush; HDC dc; if (d == None) { return BadDrawable; } dc = TkWinGetDrawableDC(display, d, &state); pen = SetUpGraphicsPort(gc); SetBkMode(dc, TRANSPARENT); oldPen = SelectObject(dc, pen); oldBrush = SelectObject(dc, GetStockObject(NULL_BRUSH)); SetROP2(dc, tkpWinRopModes[gc->function]); Rectangle(dc, x, y, (int) x+width+1, (int) y+height+1); DeleteObject(SelectObject(dc, oldPen)); SelectObject(dc, oldBrush); TkWinReleaseDrawableDC(d, dc, &state); return Success; } /* *---------------------------------------------------------------------- * * XDrawArc -- * * Draw an arc. * * Results: * None. * * Side effects: * Draws an arc on the specified drawable. * *---------------------------------------------------------------------- */ int XDrawArc( Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent) { display->request++; return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 0); } /* *---------------------------------------------------------------------- * * XFillArc -- * * Draw a filled arc. * * Results: * None. * * Side effects: * Draws a filled arc on the specified drawable. * *---------------------------------------------------------------------- */ int XFillArc( Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent) { display->request++; return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 1); } /* *---------------------------------------------------------------------- * * DrawOrFillArc -- * * This function handles the rendering of drawn or filled arcs and * chords. * * Results: * None. * * Side effects: * Renders the requested arc. * *---------------------------------------------------------------------- */ static int DrawOrFillArc( Display *display, Drawable d, GC gc, int x, int y, /* left top */ unsigned int width, unsigned int height, int start, /* start: three-o'clock (deg*64) */ int extent, /* extent: relative (deg*64) */ int fill) /* ==0 draw, !=0 fill */ { HDC dc; HBRUSH brush, oldBrush; HPEN pen, oldPen; TkWinDCState state; int clockwise = (extent < 0); /* non-zero if clockwise */ int xstart, ystart, xend, yend; double radian_start, radian_end, xr, yr; if (d == None) { return BadDrawable; } dc = TkWinGetDrawableDC(display, d, &state); SetROP2(dc, tkpWinRopModes[gc->function]); /* |
︙ | ︙ | |||
1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 | Pie(dc, x, y, (int) (x+width+1), (int) (y+height+1), xstart, ystart, xend, yend); } DeleteObject(SelectObject(dc, oldBrush)); } DeleteObject(SelectObject(dc, oldPen)); TkWinReleaseDrawableDC(d, dc, &state); } /* *---------------------------------------------------------------------- * * SetUpGraphicsPort -- * | > | 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 | Pie(dc, x, y, (int) (x+width+1), (int) (y+height+1), xstart, ystart, xend, yend); } DeleteObject(SelectObject(dc, oldBrush)); } DeleteObject(SelectObject(dc, oldPen)); TkWinReleaseDrawableDC(d, dc, &state); return Success; } /* *---------------------------------------------------------------------- * * SetUpGraphicsPort -- * |
︙ | ︙ |
Changes to win/tkWinKey.c.
︙ | ︙ | |||
685 686 687 688 689 690 691 | * * Side effects: * Frees the datastructure referenced by modmap. * *---------------------------------------------------------------------- */ | | > | 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 | * * Side effects: * Frees the datastructure referenced by modmap. * *---------------------------------------------------------------------- */ int XFreeModifiermap( XModifierKeymap *modmap) { ckfree(modmap->modifiermap); ckfree(modmap); return Success; } /* *---------------------------------------------------------------------- * * XStringToKeysym -- * |
︙ | ︙ |
Changes to win/tkWinPointer.c.
︙ | ︙ | |||
189 190 191 192 193 194 195 | * * Side effects: * Sets the keyboard focus back to the value before the grab. * *---------------------------------------------------------------------- */ | | > | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 | * * Side effects: * Sets the keyboard focus back to the value before the grab. * *---------------------------------------------------------------------- */ int XUngrabKeyboard( Display *display, Time time) { keyboardWinPtr = NULL; return Success; } /* *---------------------------------------------------------------------- * * MouseTimerProc -- * |
︙ | ︙ | |||
339 340 341 342 343 344 345 | * * Side effects: * Mouse pointer changes position on screen. * *---------------------------------------------------------------------- */ | | > | 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | * * Side effects: * Mouse pointer changes position on screen. * *---------------------------------------------------------------------- */ 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) { RECT r; GetWindowRect(Tk_GetHWND(dest_w), &r); SetCursorPos(r.left+dest_x, r.top+dest_y); return Success; } void TkpWarpPointer( TkDisplay *dispPtr) { if (dispPtr->warpWindow) { |
︙ | ︙ | |||
387 388 389 390 391 392 393 | * * Side effects: * None. * *---------------------------------------------------------------------- */ | | > | > | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 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 433 434 435 436 437 438 439 440 441 442 443 444 445 | * * Side effects: * None. * *---------------------------------------------------------------------- */ int XGetInputFocus( Display *display, Window *focus_return, int *revert_to_return) { Tk_Window tkwin = Tk_HWNDToWindow(GetFocus()); *focus_return = tkwin ? Tk_WindowId(tkwin) : None; *revert_to_return = RevertToParent; display->request++; return Success; } /* *---------------------------------------------------------------------- * * XSetInputFocus -- * * Set the current focus window. * * Results: * None. * * Side effects: * Changes the keyboard focus and causes the selected window to * be activated. * *---------------------------------------------------------------------- */ int XSetInputFocus( Display *display, Window focus, int revert_to, Time time) { display->request++; if (focus != None) { SetFocus(Tk_GetHWND(focus)); } return Success; } /* *---------------------------------------------------------------------- * * TkpChangeFocus -- * |
︙ | ︙ |
Changes to win/tkWinRegion.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * tkWinRegion.c -- * * Tk Region emulation code. * * Copyright (c) 1995 Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkWinInt.h" /* *---------------------------------------------------------------------- * * TkCreateRegion -- * * Construct an empty region. | > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | /* * tkWinRegion.c -- * * Tk Region emulation code. * * Copyright (c) 1995 Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkWinInt.h" #undef TkCreateRegion #undef TkDestroyRegion #undef TkClipBox #undef TkIntersectRegion #undef TkUnionRectWithRegion #undef TkRectInRegion #undef TkSubtractRegion /* *---------------------------------------------------------------------- * * TkCreateRegion -- * * Construct an empty region. |
︙ | ︙ |
Changes to win/tkWinWindow.c.
︙ | ︙ | |||
298 299 300 301 302 303 304 | * Side effects: * Sends the WM_DESTROY message to the window and then destroys it the * Win32 resources associated with the window. * *---------------------------------------------------------------------- */ | | | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | * Side effects: * Sends the WM_DESTROY message to the window and then destroys it the * Win32 resources associated with the window. * *---------------------------------------------------------------------- */ int XDestroyWindow( Display *display, Window w) { Tcl_HashEntry *entryPtr; TkWinDrawable *twdPtr = (TkWinDrawable *)w; TkWindow *winPtr = TkWinGetWinPtr(w); |
︙ | ︙ | |||
334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | * Don't bother destroying the window if we are going to destroy the * parent later. */ if (hwnd != NULL && !(winPtr->flags & TK_DONT_DESTROY_WINDOW)) { DestroyWindow(hwnd); } } /* *---------------------------------------------------------------------- * * XMapWindow -- * * Cause the given window to become visible. * * Results: * None * * Side effects: * Causes the window state to change, and generates a MapNotify event. * *---------------------------------------------------------------------- */ | > | | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 | * Don't bother destroying the window if we are going to destroy the * parent later. */ if (hwnd != NULL && !(winPtr->flags & TK_DONT_DESTROY_WINDOW)) { DestroyWindow(hwnd); } return Success; } /* *---------------------------------------------------------------------- * * XMapWindow -- * * Cause the given window to become visible. * * Results: * None * * Side effects: * Causes the window state to change, and generates a MapNotify event. * *---------------------------------------------------------------------- */ int XMapWindow( Display *display, Window w) { XEvent event; TkWindow *parentPtr; TkWindow *winPtr = TkWinGetWinPtr(w); |
︙ | ︙ | |||
376 377 378 379 380 381 382 | * mapped children have just become visible. */ if (!(winPtr->flags & TK_TOP_HIERARCHY)) { for (parentPtr = winPtr->parentPtr; ; parentPtr = parentPtr->parentPtr) { if ((parentPtr == NULL) || !(parentPtr->flags & TK_MAPPED)) { | | | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 | * mapped children have just become visible. */ if (!(winPtr->flags & TK_TOP_HIERARCHY)) { for (parentPtr = winPtr->parentPtr; ; parentPtr = parentPtr->parentPtr) { if ((parentPtr == NULL) || !(parentPtr->flags & TK_MAPPED)) { return Success; } if (parentPtr->flags & TK_TOP_HIERARCHY) { break; } } } else { event.type = MapNotify; |
︙ | ︙ | |||
405 406 407 408 409 410 411 412 413 414 415 416 417 418 | event.type = VisibilityNotify; event.xvisibility.serial = display->request; event.xvisibility.send_event = False; event.xvisibility.display = display; event.xvisibility.window = winPtr->window; event.xvisibility.state = VisibilityUnobscured; NotifyVisibility(&event, winPtr); } /* *---------------------------------------------------------------------- * * NotifyVisibility -- * | > | 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 | event.type = VisibilityNotify; event.xvisibility.serial = display->request; event.xvisibility.send_event = False; event.xvisibility.display = display; event.xvisibility.window = winPtr->window; event.xvisibility.state = VisibilityUnobscured; NotifyVisibility(&event, winPtr); return Success; } /* *---------------------------------------------------------------------- * * NotifyVisibility -- * |
︙ | ︙ | |||
460 461 462 463 464 465 466 | * * Side effects: * Causes the window state to change, and generates an UnmapNotify event. * *---------------------------------------------------------------------- */ | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | * * Side effects: * Causes the window state to change, and generates an UnmapNotify event. * *---------------------------------------------------------------------- */ int XUnmapWindow( Display *display, Window w) { XEvent event; TkWindow *winPtr = TkWinGetWinPtr(w); |
︙ | ︙ | |||
488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 | event.xunmap.send_event = False; event.xunmap.display = display; event.xunmap.event = winPtr->window; event.xunmap.window = winPtr->window; event.xunmap.from_configure = False; Tk_HandleEvent(&event); } } /* *---------------------------------------------------------------------- * * XMoveResizeWindow -- * * Move and resize a window relative to its parent. * * Results: * None. * * Side effects: * Repositions and resizes the specified window. * *---------------------------------------------------------------------- */ | > | > | > | > | > | 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 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 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 | event.xunmap.send_event = False; event.xunmap.display = display; event.xunmap.event = winPtr->window; event.xunmap.window = winPtr->window; event.xunmap.from_configure = False; Tk_HandleEvent(&event); } return Success; } /* *---------------------------------------------------------------------- * * XMoveResizeWindow -- * * Move and resize a window relative to its parent. * * Results: * None. * * Side effects: * Repositions and resizes the specified window. * *---------------------------------------------------------------------- */ int XMoveResizeWindow( Display *display, Window w, int x, int y, /* Position relative to parent. */ unsigned int width, unsigned int height) { display->request++; MoveWindow(Tk_GetHWND(w), x, y, (int) width, (int) height, TRUE); return Success; } /* *---------------------------------------------------------------------- * * XMoveWindow -- * * Move a window relative to its parent. * * Results: * None. * * Side effects: * Repositions the specified window. * *---------------------------------------------------------------------- */ int XMoveWindow( Display *display, Window w, int x, int y) /* Position relative to parent */ { TkWindow *winPtr = TkWinGetWinPtr(w); display->request++; MoveWindow(Tk_GetHWND(w), x, y, winPtr->changes.width, winPtr->changes.height, TRUE); return Success; } /* *---------------------------------------------------------------------- * * XResizeWindow -- * * Resize a window. * * Results: * None. * * Side effects: * Resizes the specified window. * *---------------------------------------------------------------------- */ int XResizeWindow( Display *display, Window w, unsigned int width, unsigned int height) { TkWindow *winPtr = TkWinGetWinPtr(w); display->request++; MoveWindow(Tk_GetHWND(w), winPtr->changes.x, winPtr->changes.y, (int)width, (int)height, TRUE); return Success; } /* *---------------------------------------------------------------------- * * XRaiseWindow -- * * Change the stacking order of a window. * * Results: * None. * * Side effects: * Changes the stacking order of the specified window. * *---------------------------------------------------------------------- */ int XRaiseWindow( Display *display, Window w) { HWND window = Tk_GetHWND(w); display->request++; SetWindowPos(window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); return Success; } /* *---------------------------------------------------------------------- * * XConfigureWindow -- * |
︙ | ︙ | |||
623 624 625 626 627 628 629 | * Changes the attributes of the specified window. Note that we ignore * the passed in values and use the values stored in the TkWindow data * structure. * *---------------------------------------------------------------------- */ | | | 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 | * Changes the attributes of the specified window. Note that we ignore * the passed in values and use the values stored in the TkWindow data * structure. * *---------------------------------------------------------------------- */ int XConfigureWindow( Display *display, Window w, unsigned int valueMask, XWindowChanges *values) { TkWindow *winPtr = TkWinGetWinPtr(w); |
︙ | ︙ | |||
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 | if ((valueMask & CWSibling) && (values->sibling != None)) { sibling = Tk_GetHWND(values->sibling); } else { sibling = NULL; } TkWinSetWindowPos(hwnd, sibling, values->stack_mode); } } /* *---------------------------------------------------------------------- * * XClearWindow -- * * Clears the entire window to the current background color. * * Results: * None. * * Side effects: * Erases the current contents of the window. * *---------------------------------------------------------------------- */ | > | | 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 | if ((valueMask & CWSibling) && (values->sibling != None)) { sibling = Tk_GetHWND(values->sibling); } else { sibling = NULL; } TkWinSetWindowPos(hwnd, sibling, values->stack_mode); } return Success; } /* *---------------------------------------------------------------------- * * XClearWindow -- * * Clears the entire window to the current background color. * * Results: * None. * * Side effects: * Erases the current contents of the window. * *---------------------------------------------------------------------- */ int XClearWindow( Display *display, Window w) { RECT rc; HBRUSH brush; HPALETTE oldPalette, palette; |
︙ | ︙ | |||
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 | rc.bottom = rc.bottom - rc.top; rc.left = rc.top = 0; FillRect(dc, &rc, brush); DeleteObject(brush); SelectPalette(dc, oldPalette, TRUE); ReleaseDC(hwnd, dc); } /* *---------------------------------------------------------------------- * * XChangeWindowAttributes -- * * This function is called when the attributes on a window are updated. * Since Tk maintains all of the window state, the only relevant value is * the cursor. * * Results: * None. * * Side effects: * May cause the mouse position to be updated. * *---------------------------------------------------------------------- */ | > | > | 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 | rc.bottom = rc.bottom - rc.top; rc.left = rc.top = 0; FillRect(dc, &rc, brush); DeleteObject(brush); SelectPalette(dc, oldPalette, TRUE); ReleaseDC(hwnd, dc); return Success; } /* *---------------------------------------------------------------------- * * XChangeWindowAttributes -- * * This function is called when the attributes on a window are updated. * Since Tk maintains all of the window state, the only relevant value is * the cursor. * * Results: * None. * * Side effects: * May cause the mouse position to be updated. * *---------------------------------------------------------------------- */ int XChangeWindowAttributes( Display *display, Window w, unsigned long valueMask, XSetWindowAttributes* attributes) { if (valueMask & CWCursor) { XDefineCursor(display, w, attributes->cursor); } return Success; } /* *---------------------------------------------------------------------- * * TkWinSetWindowPos -- * |
︙ | ︙ |
Changes to win/tkWinX.c.
︙ | ︙ | |||
712 713 714 715 716 717 718 | * * Side effects: * Plays a sounds out the system speakers. * *---------------------------------------------------------------------- */ | | > | 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 | * * Side effects: * Plays a sounds out the system speakers. * *---------------------------------------------------------------------- */ int XBell( Display *display, int percent) { MessageBeep(MB_OK); return Success; } /* *---------------------------------------------------------------------- * * TkWinChildProc -- * |
︙ | ︙ |
Changes to xlib/xdraw.c.
︙ | ︙ | |||
23 24 25 26 27 28 29 | * * Side effects: * Draws a single line segment. * *---------------------------------------------------------------------- */ | | | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | * * Side effects: * Draws a single line segment. * *---------------------------------------------------------------------- */ int XDrawLine( Display *display, Drawable d, GC gc, int x1, int y1, int x2, int y2) /* Coordinates of line segment. */ { XPoint points[2]; points[0].x = x1; points[0].y = y1; points[1].x = x2; points[1].y = y2; return XDrawLines(display, d, gc, points, 2, CoordModeOrigin); } /* *---------------------------------------------------------------------- * * XFillRectangle -- * * Fills a rectangular area in the given drawable. This procedure is * implemented as a call to XFillRectangles. * * Results: * None * * Side effects: * Fills the specified rectangle. * *---------------------------------------------------------------------- */ int XFillRectangle( Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) { XRectangle rectangle; rectangle.x = x; rectangle.y = y; rectangle.width = width; rectangle.height = height; return XFillRectangles(display, d, gc, &rectangle, 1); } /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ |
Changes to xlib/xgc.c.
︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | # include <X11/Xlib.h> # include <X11/X.h> # define Cursor XCursor # define Region XRegion # define gcCacheSize sizeof(TkpGCCache) #endif /* *---------------------------------------------------------------------- * * AllocClipMask -- * * Static helper proc to allocate new or clear existing TkpClipMask. * * Results: * Returns ptr to the new/cleared TkpClipMask. * * Side effects: * None. * *---------------------------------------------------------------------- */ static TkpClipMask *AllocClipMask(GC gc) { TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask; | > | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | # include <X11/Xlib.h> # include <X11/X.h> # define Cursor XCursor # define Region XRegion # define gcCacheSize sizeof(TkpGCCache) #endif #undef TkSetRegion /* *---------------------------------------------------------------------- * * AllocClipMask -- * * Static helper proc to allocate new or clear existing TkpClipMask. * * Results: * Returns ptr to the new/cleared TkpClipMask. * * Side effects: * None. * *---------------------------------------------------------------------- */ static TkpClipMask *AllocClipMask(GC gc) { TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask; if (clip_mask == None) { clip_mask = ckalloc(sizeof(TkpClipMask)); gc->clip_mask = (Pixmap) clip_mask; #ifdef MAC_OSX_TK } else if (clip_mask->type == TKP_CLIP_REGION) { TkpReleaseRegion(clip_mask->value.region); #endif |
︙ | ︙ | |||
155 156 157 158 159 160 161 | InitField(dash_offset, GCDashOffset, 0); InitField(dashes, GCDashList, 4); (&(gp->dashes))[1] = 0; gp->clip_mask = None; if (mask & GCClipMask) { TkpClipMask *clip_mask = AllocClipMask(gp); | | | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | InitField(dash_offset, GCDashOffset, 0); InitField(dashes, GCDashList, 4); (&(gp->dashes))[1] = 0; gp->clip_mask = None; if (mask & GCClipMask) { TkpClipMask *clip_mask = AllocClipMask(gp); clip_mask->type = TKP_CLIP_PIXMAP; clip_mask->value.pixmap = values->clip_mask; } TkpInitGCCache(gp); return gp; } |
︙ | ︙ | |||
202 203 204 205 206 207 208 | * * Side effects: * Updates the specified GC. * *---------------------------------------------------------------------- */ | | | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | * * Side effects: * Updates the specified GC. * *---------------------------------------------------------------------- */ int XChangeGC( Display *d, GC gc, unsigned long mask, XGCValues *values) { #define ModifyField(name,maskbit) \ |
︙ | ︙ | |||
240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 | if (mask & GCClipMask) { XSetClipMask(d, gc, values->clip_mask); } if (mask & GCDashList) { gc->dashes = values->dashes; (&(gc->dashes))[1] = 0; } } /* *---------------------------------------------------------------------- * * XFreeGC -- * * Deallocates the specified graphics context. * * Results: * None. * * Side effects: * None. * *---------------------------------------------------------------------- */ | > | > | > | > | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | if (mask & GCClipMask) { XSetClipMask(d, gc, values->clip_mask); } if (mask & GCDashList) { gc->dashes = values->dashes; (&(gc->dashes))[1] = 0; } return Success; } /* *---------------------------------------------------------------------- * * XFreeGC -- * * Deallocates the specified graphics context. * * Results: * None. * * Side effects: * None. * *---------------------------------------------------------------------- */ int XFreeGC( Display *d, GC gc) { if (gc != None) { FreeClipMask(gc); TkpFreeGCCache(gc); ckfree(gc); } return Success; } /* *---------------------------------------------------------------------- * * XSetForeground, etc. -- * * The following functions are simply accessor functions for the GC * slots. * * Results: * None. * * Side effects: * Each function sets some slot in the GC. * *---------------------------------------------------------------------- */ int XSetForeground( Display *display, GC gc, unsigned long foreground) { gc->foreground = foreground; return Success; } int XSetBackground( Display *display, GC gc, unsigned long background) { gc->background = background; return Success; } int XSetDashes( Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n) { |
︙ | ︙ | |||
326 327 328 329 330 331 332 333 334 | #endif gc->dash_offset = dash_offset; if (n > MAX_DASH_LIST_SIZE) n = MAX_DASH_LIST_SIZE; while (n-- > 0) { *p++ = *dash_list++; } *p = 0; } | > | > | > | > | > | > | > | > | > | > | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 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 433 434 435 436 437 438 439 440 441 442 443 444 | #endif gc->dash_offset = dash_offset; if (n > MAX_DASH_LIST_SIZE) n = MAX_DASH_LIST_SIZE; while (n-- > 0) { *p++ = *dash_list++; } *p = 0; return Success; } int XSetFunction( Display *display, GC gc, int function) { gc->function = function; return Success; } int XSetFillRule( Display *display, GC gc, int fill_rule) { gc->fill_rule = fill_rule; return Success; } int XSetFillStyle( Display *display, GC gc, int fill_style) { gc->fill_style = fill_style; return Success; } int XSetTSOrigin( Display *display, GC gc, int x, int y) { gc->ts_x_origin = x; gc->ts_y_origin = y; return Success; } int XSetFont( Display *display, GC gc, Font font) { gc->font = font; return Success; } int XSetArcMode( Display *display, GC gc, int arc_mode) { gc->arc_mode = arc_mode; return Success; } int XSetStipple( Display *display, GC gc, Pixmap stipple) { gc->stipple = stipple; return Success; } int XSetLineAttributes( Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style) { gc->line_width = line_width; gc->line_style = line_style; gc->cap_style = cap_style; gc->join_style = join_style; return Success; } int XSetClipOrigin( Display *display, GC gc, int clip_x_origin, int clip_y_origin) { gc->clip_x_origin = clip_x_origin; gc->clip_y_origin = clip_y_origin; return Success; } /* *---------------------------------------------------------------------- * * TkSetRegion, XSetClipMask -- * |
︙ | ︙ | |||
458 459 460 461 462 463 464 | clip_mask->value.region = r; #ifdef MAC_OSX_TK TkpRetainRegion(r); #endif } } | | > | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 | clip_mask->value.region = r; #ifdef MAC_OSX_TK TkpRetainRegion(r); #endif } } int XSetClipMask( Display *display, GC gc, Pixmap pixmap) { if (pixmap == None) { FreeClipMask(gc); } else { TkpClipMask *clip_mask = AllocClipMask(gc); clip_mask->type = TKP_CLIP_PIXMAP; clip_mask->value.pixmap = pixmap; } return Success; } /* * Some additional dummy functions (hopefully implemented soon). */ #if 0 |
︙ | ︙ |