Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Implementation of TIP 655 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | 655 |
Files: | files | file ages | folders |
SHA3-256: |
2e788489230dc6ff0b93807bed656004 |
User & Date: | culler 2023-01-28 21:17:09.229 |
Context
2023-01-30
| ||
03:08 | Add demo script check-in: eeb5495b user: culler tags: 655 | |
2023-01-28
| ||
21:17 | Implementation of TIP 655 check-in: 2e788489 user: culler tags: 655 | |
2023-01-26
| ||
05:30 | Make classic check and radio buttons screen scaling aware. Thanks to Csaba for this contribution. check-in: 200cd8dc user: griffin tags: trunk, main | |
Changes
Changes to library/demos/widget.
︙ | ︙ | |||
331 332 333 334 335 336 337 338 339 340 341 342 343 344 | @@demo ttkbut The simple Themed Tk widgets } if {[tk windowingsystem] eq "aqua"} { addFormattedText { @@new @@demo mac_styles Special widgets for macOS } } addFormattedText { @@subtitle Listboxes and Trees @@demo states The 50 states @@demo colors Colors: change the color scheme for the application @@demo sayings A collection of famous and infamous sayings @@demo mclist A multi-column list of countries | > > > > > > | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 | @@demo ttkbut The simple Themed Tk widgets } if {[tk windowingsystem] eq "aqua"} { addFormattedText { @@new @@demo mac_styles Special widgets for macOS } } if {[tk windowingsystem] eq "aqua"} { addFormattedText { @@new @@demo mac_wm Window styles for macOS } } addFormattedText { @@subtitle Listboxes and Trees @@demo states The 50 states @@demo colors Colors: change the color scheme for the application @@demo sayings A collection of famous and infamous sayings @@demo mclist A multi-column list of countries |
︙ | ︙ |
Changes to macosx/tkMacOSXMouseEvent.c.
︙ | ︙ | |||
84 85 86 87 88 89 90 | - (NSEvent *) tkProcessMouseEvent: (NSEvent *) theEvent { NSWindow *eventWindow = [theEvent window]; NSEventType eventType = [theEvent type]; TKContentView *contentView = [eventWindow contentView]; NSPoint location = [theEvent locationInWindow]; | | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | - (NSEvent *) tkProcessMouseEvent: (NSEvent *) theEvent { NSWindow *eventWindow = [theEvent window]; NSEventType eventType = [theEvent type]; TKContentView *contentView = [eventWindow contentView]; NSPoint location = [theEvent locationInWindow]; //NSPoint viewLocation = [contentView convertPoint:location fromView:nil]; TkWindow *winPtr = NULL, *grabWinPtr, *scrollTarget = NULL; Tk_Window tkwin = NULL, capture, target; NSPoint local, global; NSInteger button; TkWindow *newFocus = NULL; int win_x, win_y; unsigned int buttonState = 0; |
︙ | ︙ | |||
113 114 115 116 117 118 119 | * passed up the responder chain. However, there is are two exceptions. * One is for synthesized events, which are used in testing. Those events * are recognized by having their timestamp set to 0. The other is for * motion events sent by the local event monitor, which will have their * window attribute set to nil. */ | | > | | 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 | * passed up the responder chain. However, there is are two exceptions. * One is for synthesized events, which are used in testing. Those events * are recognized by having their timestamp set to 0. The other is for * motion events sent by the local event monitor, which will have their * window attribute set to nil. */ if (![eventWindow isMemberOfClass:[TKWindow class]] && ![eventWindow isMemberOfClass:[TKPanel class]]) { if ([theEvent timestamp] == 0) { isTestingEvent = YES; eventWindow = [NSApp keyWindow]; } if (eventType == NSLeftMouseDragged || eventType == NSMouseMoved) { eventWindow = [NSApp keyWindow]; isMotionEvent = YES; } if (!isTestingEvent && !isMotionEvent) { return theEvent; } } else if (!NSPointInRect(location, [contentView bounds])) { isOutside = YES; } button = [theEvent buttonNumber] + Button1; if ((button & -2) == Button2) { button ^= 1; /* Swap buttons 2/3 */ } switch (eventType) { |
︙ | ︙ | |||
242 243 244 245 246 247 248 | ignoreUpDown = YES; } } if (!isTestingEvent) { NSRect bounds = [contentView bounds]; NSRect grip = NSMakeRect(bounds.size.width - 10, 0, 10, 10); bounds = NSInsetRect(bounds, 2.0, 2.0); | | | | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 | ignoreUpDown = YES; } } if (!isTestingEvent) { NSRect bounds = [contentView bounds]; NSRect grip = NSMakeRect(bounds.size.width - 10, 0, 10, 10); bounds = NSInsetRect(bounds, 2.0, 2.0); if (!NSPointInRect(location, bounds)) { return theEvent; } if (NSPointInRect(location, grip)) { return theEvent; } if ([NSApp tkLiveResizeEnded]) { [NSApp setTkLiveResizeEnded:NO]; return theEvent; } } |
︙ | ︙ |
Changes to macosx/tkMacOSXPrivate.h.
︙ | ︙ | |||
461 462 463 464 465 466 467 468 469 470 471 472 473 474 | @interface TKPanel : NSPanel { } @property Window tkWindow; @end #pragma mark NSMenu & NSMenuItem Utilities @interface NSMenu(TKUtils) + (id)menuWithTitle:(NSString *)title; + (id)menuWithTitle:(NSString *)title menuItems:(NSArray *)items; + (id)menuWithTitle:(NSString *)title submenus:(NSArray *)submenus; - (NSMenuItem *)itemWithSubmenu:(NSMenu *)submenu; | > > > | 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | @interface TKPanel : NSPanel { } @property Window tkWindow; @end @interface TKPanel(TKWm) - (void) tkLayoutChanged; @end #pragma mark NSMenu & NSMenuItem Utilities @interface NSMenu(TKUtils) + (id)menuWithTitle:(NSString *)title; + (id)menuWithTitle:(NSString *)title menuItems:(NSArray *)items; + (id)menuWithTitle:(NSString *)title submenus:(NSArray *)submenus; - (NSMenuItem *)itemWithSubmenu:(NSMenu *)submenu; |
︙ | ︙ |
Changes to macosx/tkMacOSXSubwindows.c.
︙ | ︙ | |||
399 400 401 402 403 404 405 | LastKnownRequestProcessed(display)++; if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) { TKWindow *w = (TKWindow *)macWin->winPtr->wmInfoPtr->window; if (w) { if ([w styleMask] & NSFullScreenWindowMask) { | | | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 | LastKnownRequestProcessed(display)++; if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) { TKWindow *w = (TKWindow *)macWin->winPtr->wmInfoPtr->window; if (w) { if ([w styleMask] & NSFullScreenWindowMask) { [(TKWindow *)w tkLayoutChanged]; } else { NSRect r = [w contentRectForFrameRect:[w frame]]; r.origin.y += r.size.height - height; r.size.width = width; r.size.height = height; [w setFrame:[w frameRectForContentRect:r] display:NO]; |
︙ | ︙ |
Changes to macosx/tkMacOSXWm.c.
︙ | ︙ | |||
33 34 35 36 37 38 39 | /* #ifdef TK_MAC_DEBUG #define TK_MAC_DEBUG_WINDOWS #endif */ /* | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | /* #ifdef TK_MAC_DEBUG #define TK_MAC_DEBUG_WINDOWS #endif */ /* * Carbon window attributes and classes. */ #define WM_NSMASK_SHIFT 36 #define tkWindowDoesNotHideAttribute \ ((UInt64) 1 << kHIWindowBitDoesNotHide) #define tkCanJoinAllSpacesAttribute \ ((UInt64) NSWindowCollectionBehaviorCanJoinAllSpaces << 34) |
︙ | ︙ | |||
146 147 148 149 150 151 152 | }; #define ForceAttributes(attributes, class) \ ((attributes) & (~macClassAttrs[(class)].forceOffAttrs | \ (macClassAttrs[(class)].forceOnAttrs & ~kWindowResizableAttribute))) /* | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | | | | | < | 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 | }; #define ForceAttributes(attributes, class) \ ((attributes) & (~macClassAttrs[(class)].forceOffAttrs | \ (macClassAttrs[(class)].forceOnAttrs & ~kWindowResizableAttribute))) /* * Structures and data for the wm attributes command (macOS 10.12 and later): */ enum NSWindowSubclass { subclassNSWindow = 0, subclassNSPanel = 1 }; /* This array must be indexed by the enum above.*/ static const char *subclassNames[] = {"nswindow", "nspanel", NULL}; static Tcl_HashTable pathnameToSubclass; typedef struct buttonField_t { unsigned zoom: 1; unsigned miniaturize: 1; unsigned close: 1; } buttonField; /* The order of these names must match the order of the bits above! */ static const char *buttonNames[] = {"zoom", "miniaturize", "close", NULL}; typedef union windowButtonState_t { int intvalue; buttonField bits; } windowButtonState; #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 enum NSWindowClass { NSWindowClass_any = 0, NSWindowClass_window = 1, NSWindowClass_panel = 2 }; typedef struct styleMaskBit_t { const char *bitname; unsigned long bitvalue; enum NSWindowClass allowed; } styleMaskBit; static const styleMaskBit styleMaskBits[] = { /* Make the titlebar visible and use round corners. */ {"titled", NSWindowStyleMaskTitled, NSWindowClass_window}, /* Enable the close button. */ {"closable", NSWindowStyleMaskClosable, NSWindowClass_window}, /* Enable the miniaturize button. */ {"miniaturizable", NSWindowStyleMaskMiniaturizable, NSWindowClass_window}, /* Allow the user to resize the window. */ {"resizable", NSWindowStyleMaskResizable, NSWindowClass_window}, /* * Make the content view extend under the titlebar. We force * titlebarAppearsTransparent when this bit is set. Otherwise it is * pretty useless. */ {"fullsizecontentview", NSWindowStyleMaskFullSizeContentView, NSWindowClass_window}, /* Rounded corners, cannot have a titlebar (overrides titled bit). */ {"docmodal", NSWindowStyleMaskDocModalWindow, NSWindowClass_any}, /* ============================================ * The following bits are only valid for panels. */ /* Make the title bar thinner. */ {"utility", NSWindowStyleMaskUtilityWindow, NSWindowClass_panel}, /* Do not activate the app when the window is activated. */ {"nonactivatingpanel", NSWindowStyleMaskNonactivatingPanel, NSWindowClass_panel}, /* * Requires utility. Cannot be resizable. Close button is an X; no other buttons. * Cannot be a docmodal. */ {"HUDwindow", NSWindowStyleMaskHUDWindow, NSWindowClass_panel}, {NULL, 0, 0} }; #endif typedef enum { WMATT_ALPHA, WMATT_BUTTONS, WMATT_FULLSCREEN, WMATT_MODIFIED, WMATT_NOTIFY, WMATT_TITLEPATH, WMATT_TOPMOST, WMATT_TRANSPARENT, WMATT_STYLEMASK, WMATT_TYPE, _WMATT_LAST_ATTRIBUTE } WmAttribute; static const char *const WmAttributeNames[] = { "-alpha", "-buttons", "-fullscreen", "-modified", "-notify", "-titlepath", "-topmost", "-transparent", "-stylemask", "-type", NULL }; /* * The variable below is used to enable or disable tracing in this module. If * tracing is enabled, then information is printed on standard output about * interesting interactions with the window manager. */ |
︙ | ︙ | |||
189 190 191 192 193 194 195 | /* * The following keeps state for Aqua dock icon bounce notification. */ static int tkMacOSXWmAttrNotifyVal = 0; /* | | | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | /* * The following keeps state for Aqua dock icon bounce notification. */ static int tkMacOSXWmAttrNotifyVal = 0; /* * Declarations of static functions defined in this file: */ static NSRect InitialWindowBounds(TkWindow *winPtr, NSWindow *macWindow); static int ParseGeometry(Tcl_Interp *interp, char *string, TkWindow *winPtr); static void TopLevelEventProc(ClientData clientData, |
︙ | ︙ | |||
341 342 343 344 345 346 347 348 349 350 351 352 353 | } #else - (NSPoint) tkConvertPointToScreen: (NSPoint) point { NSRect pointrect = {point, {0,0}}; return [self convertRectToScreen:pointrect].origin; } - (NSPoint) tkConvertPointFromScreen: (NSPoint)point { NSRect pointrect = {point, {0,0}}; return [self convertRectFromScreen:pointrect].origin; } #endif | > > > > > > > > > > > > > > > > > > > > > > > > > > < > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 | } #else - (NSPoint) tkConvertPointToScreen: (NSPoint) point { NSRect pointrect = {point, {0,0}}; return [self convertRectToScreen:pointrect].origin; } /* * This method synchronizes Tk's understanding of the bounds of a contentView * with the window's. It is needed because there are situations when the * window manager can change the layout of an NSWindow without having been * requested to do so by Tk. Examples are when a window goes FullScreen or * shows a tab bar. NSWindow methods which involve such layout changes should * be overridden or protected by methods which call this. */ - (void) tkLayoutChanged { TkWindow *winPtr = TkMacOSXGetTkWindow(self); if (winPtr) { NSRect frameRect; frameRect = [NSWindow frameRectForContentRect:NSZeroRect styleMask:[self styleMask]]; WmInfo *wmPtr = winPtr->wmInfoPtr; // The parent included the titlebar and window frame. wmPtr->xInParent = -frameRect.origin.x; wmPtr->yInParent = frameRect.origin.y + frameRect.size.height; wmPtr->parentWidth = winPtr->changes.width + frameRect.size.width; wmPtr->parentHeight = winPtr->changes.height + frameRect.size.height; } } - (NSPoint) tkConvertPointFromScreen: (NSPoint)point { NSRect pointrect = {point, {0,0}}; return [self convertRectFromScreen:pointrect].origin; } #endif @end #pragma mark - @implementation TKPanel: NSPanel @synthesize tkWindow = _tkWindow; /* * This method synchronizes Tk's understanding of the bounds of a contentView * with the window's. It is needed because there are situations when the * window manager can change the layout of an NSWindow without having been * requested to do so by Tk. Examples are when a window goes FullScreen or * shows a tab bar. NSWindow methods which involve such layout changes should * be overridden or protected by methods which call this. */ - (void) tkLayoutChanged { TkWindow *winPtr = TkMacOSXGetTkWindow(self); if (winPtr) { NSRect frameRect; frameRect = [NSWindow frameRectForContentRect:NSZeroRect styleMask:[self styleMask]]; WmInfo *wmPtr = winPtr->wmInfoPtr; // The parent included the titlebar and window frame. wmPtr->xInParent = -frameRect.origin.x; wmPtr->yInParent = frameRect.origin.y + frameRect.size.height; wmPtr->parentWidth = winPtr->changes.width + frameRect.size.width; wmPtr->parentHeight = winPtr->changes.height + frameRect.size.height; } } @end @implementation TKDrawerWindow: NSWindow @synthesize tkWindow = _tkWindow; @end @implementation TKWindow: NSWindow |
︙ | ︙ | |||
383 384 385 386 387 388 389 | - (void) tkLayoutChanged { TkWindow *winPtr = TkMacOSXGetTkWindow(self); if (winPtr) { NSRect frameRect; | < < < < < < < | < < < < > | 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 | - (void) tkLayoutChanged { TkWindow *winPtr = TkMacOSXGetTkWindow(self); if (winPtr) { NSRect frameRect; frameRect = [NSWindow frameRectForContentRect:NSZeroRect styleMask:[self styleMask]]; WmInfo *wmPtr = winPtr->wmInfoPtr; // The parent included the titlebar and window frame. wmPtr->xInParent = -frameRect.origin.x; wmPtr->yInParent = frameRect.origin.y + frameRect.size.height; wmPtr->parentWidth = winPtr->changes.width + frameRect.size.width; wmPtr->parentHeight = winPtr->changes.height + frameRect.size.height; } } |
︙ | ︙ | |||
722 723 724 725 726 727 728 729 730 731 732 733 734 735 | wmPtr->flags = WM_NEVER_MAPPED; wmPtr->macClass = kDocumentWindowClass; wmPtr->attributes = macClassAttrs[kDocumentWindowClass].defaultAttrs; wmPtr->scrollWinPtr = NULL; wmPtr->menuPtr = NULL; wmPtr->window = nil; winPtr->wmInfoPtr = wmPtr; UpdateVRootGeometry(wmPtr); /* * Tk must monitor structure events for top-level windows, in order to * detect size and position changes caused by window managers. */ | > > | 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 | wmPtr->flags = WM_NEVER_MAPPED; wmPtr->macClass = kDocumentWindowClass; wmPtr->attributes = macClassAttrs[kDocumentWindowClass].defaultAttrs; wmPtr->scrollWinPtr = NULL; wmPtr->menuPtr = NULL; wmPtr->window = nil; winPtr->wmInfoPtr = wmPtr; // initialize wmPtr->NSWindowSubclass here UpdateVRootGeometry(wmPtr); /* * Tk must monitor structure events for top-level windows, in order to * detect size and position changes caused by window managers. */ |
︙ | ︙ | |||
1209 1210 1211 1212 1213 1214 1215 | return TCL_ERROR; } if (objc < 3) { goto wrongNumArgs; } | > > > > > > > > > > > > > > > | | | | 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 | return TCL_ERROR; } if (objc < 3) { goto wrongNumArgs; } if (index == WMOPT_ATTRIBUTES && objc == 5 && strcmp(Tcl_GetString(objv[3]), "-type") == 0) { if (TkGetWindowFromObj(NULL, tkwin, objv[2], (Tk_Window *) &winPtr) == TCL_OK) { if (winPtr->wmInfoPtr->window != NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "Cannot change type after the mac window is created.",-1)); Tcl_SetErrorCode(interp, "TK", "TYPE_CHANGE", NULL); return TCL_ERROR; } else { fprintf(stderr, "Setting type for %s\n", Tk_PathName(winPtr)); } } else { winPtr = NULL; } } else if (TkGetWindowFromObj(interp, tkwin, objv[2], (Tk_Window *) &winPtr) != TCL_OK) { return TCL_ERROR; } if (winPtr && !Tk_IsTopLevel(winPtr) && (index != WMOPT_MANAGE) && (index != WMOPT_FORGET)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "window \"%s\" isn't a top-level window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "TOPLEVEL", winPtr->pathName, NULL); return TCL_ERROR; } |
︙ | ︙ | |||
1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 | dval = 0.0; } else if (dval > 1.0) { dval = 1.0; } [macWindow setAlphaValue:dval]; break; } case WMATT_FULLSCREEN: if (Tcl_GetBooleanFromObj(interp, value, &boolean) != TCL_OK) { return TCL_ERROR; } if (boolean != (([macWindow styleMask] & NSFullScreenWindowMask) != 0)) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 [macWindow toggleFullScreen:macWindow]; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 | dval = 0.0; } else if (dval > 1.0) { dval = 1.0; } [macWindow setAlphaValue:dval]; break; } case WMATT_BUTTONS: { windowButtonState state = {0}; Tcl_Obj **elements; Tcl_Size nElements, i; if (Tcl_ListObjGetElements(interp, value, &nElements, &elements) == TCL_OK) { int index = 0; for (i = 0; i < nElements; i++) { if (Tcl_GetIndexFromObjStruct(interp, elements[i], buttonNames, sizeof(char *), "window button name", 0, &index) != TCL_OK) { return TCL_ERROR; } else { state.intvalue |= (1 << index); } } } else if (Tcl_GetIntFromObj(interp, value, &state.intvalue) != TCL_OK) { return TCL_ERROR; } NSButton *closer = [macWindow standardWindowButton: NSWindowCloseButton]; NSButton *miniaturizer = [macWindow standardWindowButton: NSWindowMiniaturizeButton]; NSButton *zoomer = [macWindow standardWindowButton: NSWindowZoomButton]; closer.enabled = (state.bits.close != 0); miniaturizer.enabled = (state.bits.miniaturize != 0); zoomer.enabled = (state.bits.zoom != 0); break; } case WMATT_FULLSCREEN: if (Tcl_GetBooleanFromObj(interp, value, &boolean) != TCL_OK) { return TCL_ERROR; } if (boolean != (([macWindow styleMask] & NSFullScreenWindowMask) != 0)) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 [macWindow toggleFullScreen:macWindow]; |
︙ | ︙ | |||
1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 | } if (boolean) { request = [NSApp requestUserAttention:NSCriticalRequest]; } tkMacOSXWmAttrNotifyVal = boolean; } break; case WMATT_TITLEPATH: { const char *path = (const char *)Tcl_FSGetNativePath(value); NSString *filename = @""; if (path && *path) { filename = [NSString stringWithUTF8String:path]; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 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 | } if (boolean) { request = [NSApp requestUserAttention:NSCriticalRequest]; } tkMacOSXWmAttrNotifyVal = boolean; } break; case WMATT_STYLEMASK: { unsigned long styleMaskValue = 0; Tcl_Obj **elements; Tcl_Size nElements, i; if (Tcl_ListObjGetElements(interp, value, &nElements, &elements) == TCL_OK) { int index; for (i = 0; i < nElements; i++) { if (Tcl_GetIndexFromObjStruct(interp, elements[i], styleMaskBits, sizeof(styleMaskBit), "styleMask bit", 0, &index) != TCL_OK) { return TCL_ERROR; } else if (![macWindow isKindOfClass: [NSPanel class]] && styleMaskBits[index].allowed == NSWindowClass_panel) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "styleMask bit \"%s\" can only be used with an NSPanel", styleMaskBits[index].bitname)); Tcl_SetErrorCode(interp, "TK", "INVALID_STYLEMASK_BIT", NULL); return TCL_ERROR; } else { styleMaskValue |= styleMaskBits[index].bitvalue; } } if ([macWindow isKindOfClass: [NSPanel class]]) { /* * We always make NSPanels titled, nonactivating utility windows, * even if these bits are not requested in the command. */ if (!(styleMaskValue & NSWindowStyleMaskTitled) ) { styleMaskValue |= NSWindowStyleMaskTitled; styleMaskValue |= NSWindowStyleMaskUtilityWindow; styleMaskValue |= NSWindowStyleMaskNonactivatingPanel; } } if (styleMaskValue & NSWindowStyleMaskFullSizeContentView) { macWindow.titlebarAppearsTransparent = YES; } else { macWindow.titlebarAppearsTransparent = NO; } } else { return TCL_ERROR; } NSRect oldFrame = [macWindow frame]; #if DEBUG fprintf(stderr, "Current styleMask: %lx\n", [macWindow styleMask]); fprintf(stderr, "Setting styleMask to %lx\n", styleMaskValue); #endif macWindow.styleMask = (unsigned long) styleMaskValue; NSRect newFrame = [macWindow frame]; int heightDiff = newFrame.size.height - oldFrame.size.height; int newHeight = heightDiff < 0 ? newFrame.size.height : newFrame.size.height - heightDiff; if ([macWindow respondsToSelector: @selector (tkLayoutChanged)]) { [(TKWindow *)macWindow tkLayoutChanged]; } if (heightDiff) { //Calling XMoveResizeWindow twice is a hack to force a relayout //of the window. XMoveResizeWindow(winPtr->display, winPtr->window, winPtr->changes.x, winPtr->changes.y, newFrame.size.width, newHeight - 1); XMoveResizeWindow(winPtr->display, winPtr->window, winPtr->changes.x, winPtr->changes.y, newFrame.size.width, newHeight); } break; } case WMATT_TITLEPATH: { const char *path = (const char *)Tcl_FSGetNativePath(value); NSString *filename = @""; if (path && *path) { filename = [NSString stringWithUTF8String:path]; } |
︙ | ︙ | |||
1500 1501 1502 1503 1504 1505 1506 | oldFlags, 1, 0); [macWindow setBackgroundColor:boolean ? [NSColor clearColor] : nil]; [macWindow setOpaque:!boolean]; TkMacOSXInvalidateWindow((MacDrawable *)winPtr->window, TK_PARENT_WINDOW); } break; | | | > > | 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 | oldFlags, 1, 0); [macWindow setBackgroundColor:boolean ? [NSColor clearColor] : nil]; [macWindow setOpaque:!boolean]; TkMacOSXInvalidateWindow((MacDrawable *)winPtr->window, TK_PARENT_WINDOW); } break; case WMATT_TYPE: { char *subclass = Tcl_GetString(value); fprintf(stderr, "Setting subclass %s for %s\n", subclass, Tk_PathName(winPtr)); break; } case _WMATT_LAST_ATTRIBUTE: default: return TCL_ERROR; } return TCL_OK; } |
︙ | ︙ | |||
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 | Tcl_Obj *result = NULL; WmInfo *wmPtr = winPtr->wmInfoPtr; switch (attribute) { case WMATT_ALPHA: result = Tcl_NewDoubleObj([macWindow alphaValue]); break; case WMATT_FULLSCREEN: result = Tcl_NewBooleanObj([macWindow styleMask] & NSFullScreenWindowMask); break; case WMATT_MODIFIED: result = Tcl_NewBooleanObj([macWindow isDocumentEdited]); break; case WMATT_NOTIFY: result = Tcl_NewBooleanObj(tkMacOSXWmAttrNotifyVal); break; case WMATT_TITLEPATH: result = Tcl_NewStringObj([[macWindow representedFilename] UTF8String], -1); break; case WMATT_TOPMOST: result = Tcl_NewBooleanObj(wmPtr->flags & WM_TOPMOST); break; case WMATT_TRANSPARENT: result = Tcl_NewBooleanObj(wmPtr->flags & WM_TRANSPARENT); break; case WMATT_TYPE: | > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > | 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 | Tcl_Obj *result = NULL; WmInfo *wmPtr = winPtr->wmInfoPtr; switch (attribute) { case WMATT_ALPHA: result = Tcl_NewDoubleObj([macWindow alphaValue]); break; case WMATT_BUTTONS: { result = Tcl_NewListObj(3, NULL); if ([macWindow standardWindowButton:NSWindowCloseButton].enabled) { Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj("close", -1)); } if ([macWindow standardWindowButton:NSWindowMiniaturizeButton].enabled) { Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj("miniaturize", -1)); } if ([macWindow standardWindowButton:NSWindowZoomButton].enabled) { Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj("zoom", -1)); } break; } case WMATT_FULLSCREEN: result = Tcl_NewBooleanObj([macWindow styleMask] & NSFullScreenWindowMask); break; case WMATT_MODIFIED: result = Tcl_NewBooleanObj([macWindow isDocumentEdited]); break; case WMATT_NOTIFY: result = Tcl_NewBooleanObj(tkMacOSXWmAttrNotifyVal); break; case WMATT_STYLEMASK: { unsigned long styleMaskValue = [macWindow styleMask]; const styleMaskBit *bit; result = Tcl_NewListObj(9, NULL); for (bit = styleMaskBits; bit->bitname != NULL; bit++) { if (styleMaskValue & bit->bitvalue) { Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj(bit->bitname, -1)); } } break; } case WMATT_TITLEPATH: result = Tcl_NewStringObj([[macWindow representedFilename] UTF8String], -1); break; case WMATT_TOPMOST: result = Tcl_NewBooleanObj(wmPtr->flags & WM_TOPMOST); break; case WMATT_TRANSPARENT: result = Tcl_NewBooleanObj(wmPtr->flags & WM_TRANSPARENT); break; case WMATT_TYPE: if ([macWindow isKindOfClass:[NSPanel class]]) { result = Tcl_NewStringObj(subclassNames[subclassNSPanel], -1); } else { result = Tcl_NewStringObj(subclassNames[subclassNSWindow], -1); } break; case _WMATT_LAST_ATTRIBUTE: default: break; } return result; } |
︙ | ︙ | |||
1582 1583 1584 1585 1586 1587 1588 | * See the user documentation. * *---------------------------------------------------------------------- */ static int WmAttributesCmd( | | > > > > > > > > > > > | > > > > > > > | 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 | * See the user documentation. * *---------------------------------------------------------------------- */ static int WmAttributesCmd( TCL_UNUSED(Tk_Window), /* Main window of the application. */ TkWindow *winPtr, /* Toplevel to work with */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int attribute = 0; NSWindow *macWindow; if (winPtr == NULL && objc == 5 && strcmp(Tcl_GetString(objv[3]), "-type") == 0) { /* * We are setting the type of a future window. We just save the type * in a hash table so we can look it up when the window is actually * created. */ int index, isNew = 0; if (Tcl_GetIndexFromObjStruct(interp, objv[4], subclassNames, sizeof(char *), "NSWindow subclass", 0, &index) != TCL_OK) { return TCL_ERROR; } Tcl_HashEntry *hPtr = Tcl_CreateHashEntry(&pathnameToSubclass, Tcl_GetString(objv[2]), &isNew); if (hPtr) { Tcl_SetHashValue(hPtr, INT2PTR(index)); return TCL_OK; } } if (winPtr->window == None) { Tk_MakeWindowExist((Tk_Window)winPtr); } if (!TkMacOSXHostToplevelExists(winPtr)) { TkMacOSXMakeRealWindowExist(winPtr); } macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window); |
︙ | ︙ | |||
3092 3093 3094 3095 3096 3097 3098 | * See the user documentation. * *---------------------------------------------------------------------- */ static int WmOverrideredirectCmd( | | | 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 | * See the user documentation. * *---------------------------------------------------------------------- */ static int WmOverrideredirectCmd( TCL_UNUSED(Tk_Window), /* Main window of the application. */ TkWindow *winPtr, /* Toplevel to work with */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int flag; XSetWindowAttributes atts; |
︙ | ︙ | |||
3118 3119 3120 3121 3122 3123 3124 | } if (Tcl_GetBooleanFromObj(interp, objv[3], &flag) != TCL_OK) { return TCL_ERROR; } atts.override_redirect = flag ? True : False; Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts); | > > > > > > > | > | 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 | } if (Tcl_GetBooleanFromObj(interp, objv[3], &flag) != TCL_OK) { return TCL_ERROR; } atts.override_redirect = flag ? True : False; Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts); if ([NSApp macOSVersion] >= 101200) { if (flag) { win.styleMask |= NSWindowStyleMaskDocModalWindow; } else { win.styleMask &= ~NSWindowStyleMaskDocModalWindow; } } else { ApplyContainerOverrideChanges(winPtr, win); } return TCL_OK; } /* *---------------------------------------------------------------------- * * WmPositionfromCmd -- |
︙ | ︙ | |||
6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 | void TkMacOSXMakeRealWindowExist( TkWindow *winPtr) /* Tk window. */ { WmInfo *wmPtr = winPtr->wmInfoPtr; MacDrawable *macWin; WindowClass macClass; Bool overrideRedirect = Tk_Attributes((Tk_Window)winPtr)->override_redirect; if (TkMacOSXHostToplevelExists(winPtr)) { return; } | > > > > | | 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 | void TkMacOSXMakeRealWindowExist( TkWindow *winPtr) /* Tk window. */ { WmInfo *wmPtr = winPtr->wmInfoPtr; MacDrawable *macWin; WindowClass macClass; Class winClass = nil; Bool overrideRedirect = Tk_Attributes((Tk_Window)winPtr)->override_redirect; Tcl_HashEntry *hPtr = NULL; NSUInteger styleMask; static int initialized = 0; if (TkMacOSXHostToplevelExists(winPtr)) { return; } macWin = (MacDrawable *)winPtr->window; /* * If this is embedded, make sure its container's toplevel exists, then * return... */ |
︙ | ︙ | |||
6213 6214 6215 6216 6217 6218 6219 | return; /* * TODO: Here we should handle out of process embedding. */ } | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > | 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 | return; /* * TODO: Here we should handle out of process embedding. */ } if ([NSApp macOSVersion] >= 101200) { /* * Prior to macOS 10.12 the styleMask was readonly. From macOS 10.12 * onward, the styleMask can replace the Carbon window classes and * attributes. */ int index; if (!initialized) { Tcl_InitHashTable(&pathnameToSubclass, TCL_STRING_KEYS); initialized = 1; } hPtr = Tcl_FindHashEntry(&pathnameToSubclass, Tk_PathName(winPtr)); index = hPtr ? PTR2INT(Tcl_GetHashValue(hPtr)) : subclassNSWindow; switch(index) { case subclassNSPanel: winClass = [TKPanel class]; styleMask = (NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskNonactivatingPanel ); break; default: winClass = [TKWindow class]; styleMask = (NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable ); break; } if (overrideRedirect) { styleMask |= NSWindowStyleMaskDocModalWindow; } if (hPtr) { Tcl_DeleteHashEntry(hPtr); } } else { /* * If this is an override-redirect window, the NSWindow is created first as * a document window then converted to a simple window. */ if (overrideRedirect) { wmPtr->macClass = kDocumentWindowClass; } macClass = wmPtr->macClass; wmPtr->attributes &= (tkAlwaysValidAttributes | macClassAttrs[macClass].validAttrs); wmPtr->flags |= macClassAttrs[macClass].flags | ((wmPtr->attributes & kWindowResizableAttribute) ? 0 : WM_WIDTH_NOT_RESIZABLE|WM_HEIGHT_NOT_RESIZABLE); UInt64 attributes = (wmPtr->attributes & ~macClassAttrs[macClass].forceOffAttrs) | macClassAttrs[macClass].forceOnAttrs; styleMask = macClassAttrs[macClass].styleMask | ((attributes & kWindowNoTitleBarAttribute) ? 0 : NSTitledWindowMask) | ((attributes & kWindowCloseBoxAttribute) ? NSClosableWindowMask : 0) | ((attributes & kWindowCollapseBoxAttribute) ? NSMiniaturizableWindowMask : 0) | ((attributes & kWindowResizableAttribute) ? NSResizableWindowMask : 0) | ((attributes & kWindowMetalAttribute) ? NSTexturedBackgroundWindowMask : 0) | ((attributes & kWindowUnifiedTitleAndToolbarAttribute) ? NSUnifiedTitleAndToolbarWindowMask : 0) | ((attributes & kWindowSideTitlebarAttribute) ? 1 << 9 : 0) | (attributes >> WM_NSMASK_SHIFT); winClass = (macClass == kDrawerWindowClass ? [TKDrawerWindow class] : (styleMask & (NSUtilityWindowMask|NSDocModalWindowMask| NSNonactivatingPanelMask|NSHUDWindowMask)) ? [TKPanel class] : [TKWindow class]); } NSRect structureRect = [winClass frameRectForContentRect:NSZeroRect styleMask:styleMask]; NSRect contentRect = NSMakeRect(5 - structureRect.origin.x, TkMacOSXZeroScreenHeight() - (TkMacOSXZeroScreenTop() + 5 + structureRect.origin.y + structureRect.size.height + 200), 200, 200); if (wmPtr->hints.initial_state == WithdrawnState) { //// ??????? } TKWindow *window = [[winClass alloc] initWithContentRect:contentRect styleMask:styleMask backing:NSBackingStoreBuffered defer:YES]; if (!window) { Tcl_Panic("couldn't allocate new Mac window"); } TKContentView *contentView = [[TKContentView alloc] initWithFrame:NSZeroRect]; [window setContentView:contentView]; [contentView release]; |
︙ | ︙ | |||
6294 6295 6296 6297 6298 6299 6300 | macWin->flags |= TK_HOST_EXISTS; if (overrideRedirect) { XSetWindowAttributes atts; atts.override_redirect = True; Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts); | > > > | > | 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 | macWin->flags |= TK_HOST_EXISTS; if (overrideRedirect) { XSetWindowAttributes atts; atts.override_redirect = True; Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts); if ([NSApp macOSVersion] >= 101200) { window.styleMask |= NSWindowStyleMaskDocModalWindow; } else { ApplyContainerOverrideChanges(winPtr, NULL); } } [window display]; } /* *---------------------------------------------------------------------- * |
︙ | ︙ |