Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | sync nmakehlp.c with Tcl version
purge spaces at end of lines clean-up unix/Makefile.in after carbon removal |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-5-branch |
Files: | files | file ages | folders |
SHA1: |
9e2fc38c590d8787989d6ef3108eeeb0 |
User & Date: | jan.nijtmans 2012-10-23 13:28:32 |
2012-10-24
| ||
19:03 | 3574893 Add overlooked toplevel ref count maintenance in the [wm manage|forget] operations that could cause segfaults due to premature free of structs. check-in: 0e4d8eb0 user: dgp tags: core-8-5-branch | |
2012-10-23
| ||
13:37 |
sync nmakehlp.c with Tcl version
purge spaces at end of lines clean-up unix/Makefile.in after carbon removal check-in: e67c5c61 user: jan.nijtmans tags: trunk | |
13:28 |
sync nmakehlp.c with Tcl version
purge spaces at end of lines clean-up unix/Makefile.in after carbon removal check-in: 9e2fc38c user: jan.nijtmans tags: core-8-5-branch | |
13:26 | sync nmakehlp.c with Tcl version check-in: d6caa983 user: jan.nijtmans tags: core-8-4-branch | |
09:01 | remove tkMacOSXCarbonEvents.c check-in: 6069d587 user: jan.nijtmans tags: core-8-5-branch | |
Changes to ChangeLog.
︙ | ︙ | |||
422 423 424 425 426 427 428 | * generic/tkText.c: [Bug-3021557]: Moving the cursor in * tests/text.test: elided text freezes Tk 2011-12-22 Don Porter <[email protected]> * win/tkWinMenu.c: [Bug 3235256] Keep menu entry IDs out of system | | | 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | * generic/tkText.c: [Bug-3021557]: Moving the cursor in * tests/text.test: elided text freezes Tk 2011-12-22 Don Porter <[email protected]> * win/tkWinMenu.c: [Bug 3235256] Keep menu entry IDs out of system values. Thanks Colin McDonald. 2011-11-22 Jan Nijtmans <[email protected]> * doc/wish.1: Use the same shebang comment everywhere. * library/demos/hello * library/demos/rmt * library/demos/square |
︙ | ︙ |
Changes to changes.
︙ | ︙ | |||
3249 3250 3251 3252 3253 3254 3255 | ----------------- Released 4.2b1, 8/30/96 ----------------------- 9/5/96 (bug fixes) Fixed several bugs in file dialogs: individual files could be listed twice, if a long list of files were shown, and the view scrolled to the right, and then a different file file was shown, the scrollregion on the canvas wasn't being reset, so the file dialog was broken from then on, added an update idletasks so that the watch | | | 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 | ----------------- Released 4.2b1, 8/30/96 ----------------------- 9/5/96 (bug fixes) Fixed several bugs in file dialogs: individual files could be listed twice, if a long list of files were shown, and the view scrolled to the right, and then a different file file was shown, the scrollregion on the canvas wasn't being reset, so the file dialog was broken from then on, added an update idletasks so that the watch cursor was shown when the dialog was thinking. For the motif file dialog, fixed the weights for resizing. On the clrpicker, fixed the finalColor variable which caused problems when the OK button was "clicked" before the dialog was mapped (in the test suite). Added Ioi's last changes from before he left. For message boxes, if a single button message box is shown (currently only 'ok'), it is set to be the default even if not specified. (KC) |
︙ | ︙ | |||
3297 3298 3299 3300 3301 3302 3303 | 9/26/96 (bug fix) The tests for the common dialogs still used the 'testevent' function. I updated these calls in clrpick.test, msgbox.test, filebox.test to use the new event gereating mechanism. 9/18/96 (bug fix) Long-standing bug in bind where <Button-1><Button-1> was reported as <Double-Button-1>, but <Double-Key-a> was reported as "aa". (CS) | | | | | | 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 | 9/26/96 (bug fix) The tests for the common dialogs still used the 'testevent' function. I updated these calls in clrpick.test, msgbox.test, filebox.test to use the new event gereating mechanism. 9/18/96 (bug fix) Long-standing bug in bind where <Button-1><Button-1> was reported as <Double-Button-1>, but <Double-Key-a> was reported as "aa". (CS) 9/27/96 (bug fix) Bindings didn't work on 64-bit machines due to changes made for virtual events. (CS) 9/30/96 (feature change) Binding for new virtual events included both lower and upper-case, e.g., <<Copy>> was defined as <Control-c> and <Control-C>. Previously, widgets were directly bound to only lower-case bindings. The upper-case binding caused incompatibility with some existing Tcl programs, so the upper case bindings for <<Cut>>, <<Copy>>, and <<Paste>> were removed. (CS) 9/30/96 (bug fix) The postscript code in the canvas widget now uses channels to get and write .ps files which fixed a bug on the Mac where an output file would have mixed EOL characters. In addition, I added the ability for the prolog to come from the Tk shared library on the |
︙ | ︙ | |||
3329 3330 3331 3332 3333 3334 3335 | 10/1/96 (feature change) "grid {column,row}configure <master> <index>" returns a list of option value pairs for all of the row or column constraints. It used to return an error. (SAU) 10/1/96 (bug fix) "The way grid handles '^' short-cuts was re-written to eliminate core dumps. (SAU) | | | 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 | 10/1/96 (feature change) "grid {column,row}configure <master> <index>" returns a list of option value pairs for all of the row or column constraints. It used to return an error. (SAU) 10/1/96 (bug fix) "The way grid handles '^' short-cuts was re-written to eliminate core dumps. (SAU) 10/3/96 (feature change) A virtual event binding associated with a given physical event is now considered less specific than a binding for that same physical event, all other things being equal. (CS). 10/3/96 (bug fix) Under Windows text placed on the clipboard did not undergo CRLF translation when delivered to other applications. (SS) 10/3/96 (bug fix) Copying an image onto itself with a zoom factor that |
︙ | ︙ | |||
3374 3375 3376 3377 3378 3379 3380 | error due to a misplaced common in library/menu.tcl. (JO) 10/23/96 (bug fix) Errors in files sourced by the Macintosh "Source..." menu are now correctly reported via the background error mechanism. (RJ) 10/23/96 (bug fix) Fixed a bug in the Mac subwindow implementation | | | | 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 | error due to a misplaced common in library/menu.tcl. (JO) 10/23/96 (bug fix) Errors in files sourced by the Macintosh "Source..." menu are now correctly reported via the background error mechanism. (RJ) 10/23/96 (bug fix) Fixed a bug in the Mac subwindow implementation that caused refreshes to not occur for canvases with embedded windows. (RJ) 10/24/96 (bug fix) Provided workaround for Apple bug that doesn't handle zooming correctly for floating windows. (RJ) 10/24/96 (bug fix) Macintosh tearoff menus are now correctly displayed as Mac floating windows. (RJ) 11/1/96 (bug fix) Restored manual page for procedures like Tk_CreateWindowFromPath and Tk_DestroyWindow; was accidentally deleted when Tk_CreateMainWindow procedure was decommissioned. (JO) 11/19/96 (bug fix) Fixed bugs in postscript code that would cause the |
︙ | ︙ | |||
3482 3483 3484 3485 3486 3487 3488 | if their master was destroyed, even if the transient window was not a child of the master. (SS) 10/18/96 (new features) A -menu option has been added to the toplevel widget command, which allows a menu to operate as a menubar. On the Macintosh, the menubar is displayed accross the top of the main monitor, just like with other applications. Under Windows and Unix, the menu is | | | | | 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 | if their master was destroyed, even if the transient window was not a child of the master. (SS) 10/18/96 (new features) A -menu option has been added to the toplevel widget command, which allows a menu to operate as a menubar. On the Macintosh, the menubar is displayed accross the top of the main monitor, just like with other applications. Under Windows and Unix, the menu is attached to the toplevel window. Also, changed some semantics. Tearoff menus will now reflect changes to the menu it was torn off from, and are deleted when the master menu is deleted. Tearoffs also reflect more look-and-feel of the platforms they are running on. (SRP) 10/31/96 (bug fix) Under Windows, missing system cursors would generate an error instead of falling through to the Tk cursor of the same name. (SS) 11/7/96 (feature change) Under Unix, default borderwidth is now 1 to |
︙ | ︙ | |||
3571 3572 3573 3574 3575 3576 3577 | 12/17/96 (bug fix) Under Windows, command line was not being parsed correctly if it contained the literal characters \" (CS) 12/17/96 (feature change) Native Windows labels do not get a focus-ring border. (CS) | | | | 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 | 12/17/96 (bug fix) Under Windows, command line was not being parsed correctly if it contained the literal characters \" (CS) 12/17/96 (feature change) Native Windows labels do not get a focus-ring border. (CS) 12/17/96 (bug fix) Under Windows, colors specified as "#XXYYZZ" where XX, YY, or ZZ were not valid hex digits were getting a random color value instead of being an error. (CS) ----------------- Released 8.0a1, 12/17/96 ----------------------- 12/23/96 (bug fix) Fixed two menu bugs: - Menus could get stacked below other windows so that they weren't visible when posted (especially under olvwm and fvwm). - Under olvwm if you pressed button 1 over an entry in a new-style |
︙ | ︙ | |||
3595 3596 3597 3598 3599 3600 3601 | 1/6/97 (bug fix) Under Windows, the console was appearing even for non-interactive applications. This was a side effect of a general problem with the wm state of windows that were being mapped for the first time. (SS) 1/6/97 (bug fix) Under Windows, the initialization code was not looking in the right directory for the Tk libraries when the program | | | | | 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 | 1/6/97 (bug fix) Under Windows, the console was appearing even for non-interactive applications. This was a side effect of a general problem with the wm state of windows that were being mapped for the first time. (SS) 1/6/97 (bug fix) Under Windows, the initialization code was not looking in the right directory for the Tk libraries when the program being run was not in the Tcl installation heirarchy. (SS) 1/8/97 (bug fix) Under Windows, the windows were not being unmapped properly, which led to strange packer behavior. (SS) 1/8/97 (bug fix) The "winfo containing" command (and the Tk_CoordsToWindow procedure) didn't work properly on Unix in the presence of embedding or menubars. (JO) 1/15/97 (bug fix) Invoking "destroy ." as the command from a menu would cause Tk to crash because TkMainInfo was freed before menu released its resources. This bug had already been fixed for scrollbars and buttons. (CS) 1/15/97 (bug fix) Tk is now working under Win32s again, including Win32 version 1.25. Fixed separate problems in fonts and dialogs. (CS) 1/15/97 (feature change) Under Windows, font sizes are now specified in points, not pixels. The mapping between pointsize and pixels depends on Windows having accurate metrics for the monitor (plug&play helps). Font metrics are still reported in pixels. (CS) 1/21/97 (bug fix) Grid no longer reports rows or columns "out of range" when requesting their constraints. (SAU) |
︙ | ︙ | |||
3756 3757 3758 3759 3760 3761 3762 | 4/23/97 (feature change) Loosened the rules on parsing font names so that unix-centric fonts in scripts don't break when run on Windows or Mac. (1) Previously, an XLFD had to specify font name, weight, slant, and size; now, a minimal XLFD (such as "*-times-*") will be accepted, and all unspecified attributes will be given default values. (2) Previously, in the {name size style ...} format, only the style was optional; now both the size | | | 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 | 4/23/97 (feature change) Loosened the rules on parsing font names so that unix-centric fonts in scripts don't break when run on Windows or Mac. (1) Previously, an XLFD had to specify font name, weight, slant, and size; now, a minimal XLFD (such as "*-times-*") will be accepted, and all unspecified attributes will be given default values. (2) Previously, in the {name size style ...} format, only the style was optional; now both the size and the style are optional; this solves the problem of old scripts that contain specifications of the form "-font fixed" or "-font times". (CCS) 5/7/97 (new feature) Menus now send a virtual event <<MenuSelect>> when an item is highlighted in a menu. Applications can use this to implement context-sensitive help. (SRP) 5/14/97 (bug fix) Fixed a race condition in the focus code where focus |
︙ | ︙ | |||
3791 3792 3793 3794 3795 3796 3797 | 5/30/97 (bug fix) Made the options to the grid command shortcut-able. Ie. You can now use -stick, in addition to -sticky. (RJ) 6/2/97 (bug fix) Fixed bug in startup code that caused a problem in finding the library files when they are installed in a directory containing a space in the name. (SS) | | | 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 | 5/30/97 (bug fix) Made the options to the grid command shortcut-able. Ie. You can now use -stick, in addition to -sticky. (RJ) 6/2/97 (bug fix) Fixed bug in startup code that caused a problem in finding the library files when they are installed in a directory containing a space in the name. (SS) 6/2/97 (bug fix) Virtual events associated with <Enter>/<Leave> in text widget tag caused panic. (CCS) 6/6/97 (bug fix) On some systems, struct timeval.tv_sec is unsigned. (SS) 6/6/97 (feature change) Changed -default option on buttons to take three states: normal, active, disabled. This allows apps to have a row of buttons where the default ring moves between buttons without |
︙ | ︙ | |||
3822 3823 3824 3825 3826 3827 3828 | 6/13/97 (bug fixes) In canvas text item: the insertion cursor wasn't shown if insertion point was at end of text item, it was impossible to click to position the insertion point after the last character, and @x,y indices were computed incorrectly if -scrollregion had been specified and canvas was scrolled. (CCS) | | | 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 | 6/13/97 (bug fixes) In canvas text item: the insertion cursor wasn't shown if insertion point was at end of text item, it was impossible to click to position the insertion point after the last character, and @x,y indices were computed incorrectly if -scrollregion had been specified and canvas was scrolled. (CCS) 6/13/97 (bug fix) Hitting up/down arrows in a text widget packed in a toplevel window created with the "-screen" option would cause an error dialog to pop up. (CCS) 6/12/97 (bug fix) Fixed bug in canvas text items where multi-line selections were not highlighted properly. This bug existed only in earlier releases of Tk 8.0. (JO) |
︙ | ︙ | |||
3895 3896 3897 3898 3899 3900 3901 | 7/11/97 (new feature) On the Mac, menus that are too big for the screen will now scroll. This is part of the interface on the Mac, impossible under Windows, and is not done for Unix. (SRP) 7/21/97 (bug fix) After fixing the bug that in canvas text item the insertion cursor wasn't shown if insertion point was at end of text item, introduced a different bug in where clicking in entry widget with 0 characters would | | | 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 | 7/11/97 (new feature) On the Mac, menus that are too big for the screen will now scroll. This is part of the interface on the Mac, impossible under Windows, and is not done for Unix. (SRP) 7/21/97 (bug fix) After fixing the bug that in canvas text item the insertion cursor wasn't shown if insertion point was at end of text item, introduced a different bug in where clicking in entry widget with 0 characters would crash or display garbage. (CCS) 7/22/97 (bug fix) If there were a whole bunch of returns or tabs in a row in a canvas text item, then the temporary buffer used when outputting postscript could overflow and overwrite the stack. (CCS) 7/23/97 (feature change) Reenabled "tkwait" in the Safe Tk base. (JL) |
︙ | ︙ | |||
3930 3931 3932 3933 3934 3935 3936 | 8/4/97 (bug fix) Fixed problem under USENIX where raising a toplevel window could cause an X error if the window had just been withdrawn. (JO) 8/4/97 (feature change) tkerror and bgerror are not anymore hard links maintained by the Tcl core. The implementation of bgerror provided by Tk tries, for backward compatibility only, to to call "tkerror" and | | | 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 | 8/4/97 (bug fix) Fixed problem under USENIX where raising a toplevel window could cause an X error if the window had just been withdrawn. (JO) 8/4/97 (feature change) tkerror and bgerror are not anymore hard links maintained by the Tcl core. The implementation of bgerror provided by Tk tries, for backward compatibility only, to to call "tkerror" and if that fails, falls back to the usual dialog and stack trace option posting. You can thus still use either "bgerror" or "tkerror" as your application error handling proc, but using "bgerror" is strongly recommended as support for "tkerror" will eventually vanish in upcoming releases. (DL) *** POTENTIAL INCOMPATIBILITY with scripts that were using the actual hardlink implementation 'features' and with scripts (if any) that would be calling the default "tkerror" to |
︙ | ︙ | |||
3952 3953 3954 3955 3956 3957 3958 | 8/7/97 (bug fix) Fixed focus to deal with embedding when there is no window manager. (BW) 8/8/97 (bug fix) Fixed bug in photo image code where photo images from different interpreters could get confused if they had the same name. (JO) 8/8/97 (new feature) Added new procedure Tk_GetImageMasterData for | | | 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 | 8/7/97 (bug fix) Fixed focus to deal with embedding when there is no window manager. (BW) 8/8/97 (bug fix) Fixed bug in photo image code where photo images from different interpreters could get confused if they had the same name. (JO) 8/8/97 (new feature) Added new procedure Tk_GetImageMasterData for mapping image names to master data. (JO) 8/8/97 (feature change) Modified Tk_FindPhoto procedure to require extra "interp" argument (needed for bug fix above). (JO) *** POTENTIAL INCOMPATIBILITY *** 8/8/97 (bug fix) Fixed problems under Windows renaming toplevels with menubars. Fixed problems on all platforms renaming menu widgets and |
︙ | ︙ | |||
4014 4015 4016 4017 4018 4019 4020 | 10/9/97 (bug fix) Image code could cause crashes during "exit" under some conditions (such as an image named "place"). (JO) 10/9/97 (bug fix) Fixed bug that sometimes prevented listboxes from scrolling far enough horizontally to see the rightmost character. (JO) | | | | | 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 | 10/9/97 (bug fix) Image code could cause crashes during "exit" under some conditions (such as an image named "place"). (JO) 10/9/97 (bug fix) Fixed bug that sometimes prevented listboxes from scrolling far enough horizontally to see the rightmost character. (JO) 10/10/97 (bug fix) In canvas text items, if the text ended with a \n, it was not counted in the bbox height, as it did in tk4.2. This caused "hello\n" to be the same height as "hello" and you couldn't see the cursor positioned on the next line. (CCS) 10/10/97 (bug fix) The grid geometry manager didn't always properly forget about windows after a "grid forget" or "grid remove" command: the windows could reappear on the screen later. (JO) 10/13/97 (bug fix) Selection could not be restored to a text widget |
︙ | ︙ | |||
4064 4065 4066 4067 4068 4069 4070 | different set of added items would crash. On all platforms, a command menu entry that caused the entry to be deleted, another one created in its place, and the replacement deleted would cause a panic. On Unix, <<MenuSelect>> event bindings were firing every time the mouse moved, instead of everytime the active menu item changed. (SRP) 10/27/97 (bug fix) If a particular race condition occurred under Windows, | | | | | | | 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 | different set of added items would crash. On all platforms, a command menu entry that caused the entry to be deleted, another one created in its place, and the replacement deleted would cause a panic. On Unix, <<MenuSelect>> event bindings were firing every time the mouse moved, instead of everytime the active menu item changed. (SRP) 10/27/97 (bug fix) If a particular race condition occurred under Windows, Tk would crash complaining about trying to free a color that wasn't allocated. (SS) 10/28/97 (bug fix) Under Windows, button grabs did not report motion events that occurred outside of Tk windows. (SS) 10/28/97 (bug fix) Fixed incorrect display of transparent images on the Macintosh. (JI) 10/29/97 (bug fix) Reworked the handling of out-of-range indices in the widget command for listboxes: there were all sorts of quirks before (e.g., ".l delete -1" actually deleted the first element of the listbox). (JO) 10/29/97 (bug fix) Fixed crash on the Macintosh that could occur if a window is moved before it is mapped where the X window was created but the Macintosh port was not. (RJ) 10/29/97 (bug fix) Fixed several errors in how wm state was maintained on the Macintosh. Tk now also will iconify a toplevel window on the Mac if the new Appearance Manager is present. (RJ) 10/28/97 (bug fixes) In canvas' postscript command: User name information was leaked in safe interpreters on Unix (security fix). Errors while reading prolog.ps were not propagated and the error message was mixed with partial data. Note: postscript output does not work in safe interpreters on unix and windows. (DL) 10/28/97 (bug fix) Safe Tk interps on unix were leaking env(DISPLAY). (DL) 10/31/97 (bug fix) Fixed problems related to the input focus when one application had windows open simultaneously on several displays. (JO) 10/31/97 (bug fix) Fixed several problems with traversal of menus via the keyboard under Unix. (SRP) 11/4/97 (bug fix) Fixed various word-size related problems for 64-bit architectures. (SS) 11/5/97 (bug fix) Embedding on Windows was using freed data (crashing in safe.test with TCL_MEM_DEBUG). NB: Embedding is still not fully implemented on Windows ! (It works mostly when Tk is embeded into it's own Tk frame (safe::loadTk case), but not well with respect to resizing with a toplevel container or with an external process). (DL) ----------------- Released 8.0p1, 11/7/97 ----------------------- 11/20/97 (bug fix) Fixed bug on the Mac where the "package require" |
︙ | ︙ | |||
4136 4137 4138 4139 4140 4141 4142 | 12/3/97 (bug fix/optimization) Removed unneeded and potentially dangerous instances of double evaluations if "if" and "expr" statements from the library files. It is recommended that unless you need a double evaluation you always use "expr {...}" instead of "expr ..." and "if {...} ..." instead of "if ... ...". It will also be faster thanks to the byte compiler. (DL) | | | | | 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 | 12/3/97 (bug fix/optimization) Removed unneeded and potentially dangerous instances of double evaluations if "if" and "expr" statements from the library files. It is recommended that unless you need a double evaluation you always use "expr {...}" instead of "expr ..." and "if {...} ..." instead of "if ... ...". It will also be faster thanks to the byte compiler. (DL) 12/3/97 (new feature) Added support for browser/plugin style embedding, and made various other fixes to get the plugin working on the Mac. (JI) 12/8/97 (bug fix) on Windows, using "winfo pathname" before "." was mapped was crashing. (DL) ---- Shipped as part of the plugin2.0b5 as 8.0p2Plugin1, Dec 8th 97 ---- 12/97 (bug fix) more Macintosh embeding fixes needed for the plugin. (JI) Jan/9/98 (improvement) Allow applications to have custom init script without having to patch the Tk core: Tk_Init will use an existing "tkInit" proc if one exists in the interp where one tries to install Tk instead of defining it's own (tkInit is the transient proc defined in generic/tkInitScript.h that searches and sources tk.tcl and defines the 'correct' tk_library). (DL) ---- Shipped as part of the plugin2.0 as 8.0p2Plugin2, Jan 15th 98 ---- 6/3/98 (bug fix) Fixed bugs in the tk_getOpenFile under Unix. 1) If the -initialdir option was "." the result would be "././foo.tcl" instead of an absolute path, like the Windows interface. 2) There is a traceVar on the data(selectPath) where the script was assumes the window exists. (BS) 6/12/98 (feature change) Focus -force now sets the foreground window on Windows platforms in addition to moving the focus. (SS) 6/12/98 (bug fix) Fixed bug in Windows font measurement that did not |
︙ | ︙ | |||
4201 4202 4203 4204 4205 4206 4207 | comment at the top of generic/tkInitScript.h for more details. (SS) 7/27/98 (bug fix) The bbox for coords in the canvas were incorrectly including the center of the coord as part of the bound area. (RJ) 8/4/98 (bug fix) Fixed memory leak in Windows menu code. (SS) | | | | 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 | comment at the top of generic/tkInitScript.h for more details. (SS) 7/27/98 (bug fix) The bbox for coords in the canvas were incorrectly including the center of the coord as part of the bound area. (RJ) 8/4/98 (bug fix) Fixed memory leak in Windows menu code. (SS) 8/4/98 (bug fix) Fixed bug where bgerror's were not being generated from menu callbacks on Windows. (SS) 8/4/98 (bug fix) Alt-key bindings were not being handled properly under Windows, resulting in annoying beeps. (SS) 8/4/98 (bug fix) Fixed bug in Windows menubar handling that allowed a shared menubar to be deleted when any window using it was deleted. (SS) 8/4/98 (feature change) Introduced TkReadBitmapFile to replace XReadBitmapFile so that all Tk file opens go through the Tcl channel |
︙ | ︙ | |||
4349 4350 4351 4352 4353 4354 4355 | 1/16/98 (new feature) Tk now supports international characters sets: - Font display mechanism overhauled to display Unicode strings containing full set of international characters. You do not need Unicode fonts on your system in order to use tk or see international characters. For those familiar with the Japanese or Chinese patches, there is no "-kanjifont" option. Characters from any available fonts will automatically be used if the widget's originally selected font is | | | | 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 | 1/16/98 (new feature) Tk now supports international characters sets: - Font display mechanism overhauled to display Unicode strings containing full set of international characters. You do not need Unicode fonts on your system in order to use tk or see international characters. For those familiar with the Japanese or Chinese patches, there is no "-kanjifont" option. Characters from any available fonts will automatically be used if the widget's originally selected font is not capable of displaying a given character. - Textual widgets are international aware. For instance, cursor positioning commands would now move the cursor forwards/back by 1 international character, not by 1 byte. - Input Method Editors (IMEs) work on Mac and Windows. Unix is still in progress. 7/7/97 (new feature) The send command now works for Microsoft Windows. It is implemented using Dynamic Data Exchange, and a new command, dde, allows Tk to send more generic DDE commands to other applications. (SRP) |
︙ | ︙ | |||
4640 4641 4642 4643 4644 4645 4646 | 7/22/99 (bug fix) Applied patch from Jeff Hobbs to fix library/menu.tcl. [Bug: 2425] (redman) 7/22/99 (bug fix) Make install-sh have executable permissions before calling from the Makefile. [Bug: 2413] (redman) 7/22/99 (bug fix) Block out sys/stat.h include with #if to allow | | | | 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 | 7/22/99 (bug fix) Applied patch from Jeff Hobbs to fix library/menu.tcl. [Bug: 2425] (redman) 7/22/99 (bug fix) Make install-sh have executable permissions before calling from the Makefile. [Bug: 2413] (redman) 7/22/99 (bug fix) Block out sys/stat.h include with #if to allow extension writers to use the MetroWerks compiler on Windows. [Bug: 2385] (redman) 7/29/99 (bug fix) Allow tcl to opn CON and NUL on Windows, moved check to Tk Console code instead. [Bug: 2393 2392 2209 2458] (redman) 7/30/99 (bug fix) corrected the Windows build of threaded Tk from both sets of makefiles (nmake and gmake). (redman) 7/30/99 (bug fix) Added XFillRectangle to stub table, patch from Jan Njitmans. [Bug: 2446] (hobbs) 8/1/99 (bug fix) Wrapped #define of panic() inside #ifndef blocks to avoid compiler errors on Macintosh. Patch from Vince Darley. [Bug: 2389] (hobbs) --------------- Released 8.2b2, August 5, 1999 ---------------------- 8/13/99 (Mac) Rearranged the projects in the tkMacProjects.sea.hqx so that the build directory is separate from the sources. Fixed bug in Tk_DrawChars(). (Jim Ingham) |
︙ | ︙ | |||
5117 5118 5119 5120 5121 5122 5123 | 2001-10-17 (bug fix) updated Mac build support. (steffen) --- Released 8.3.4, October 19, 2001 --- See ChangeLog for details --- 2001-08-14 (bug fix)[450545] Tk's Tcl_ObjTypes now registered (fellows) | | | 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 | 2001-10-17 (bug fix) updated Mac build support. (steffen) --- Released 8.3.4, October 19, 2001 --- See ChangeLog for details --- 2001-08-14 (bug fix)[450545] Tk's Tcl_ObjTypes now registered (fellows) 2001-08-20 (performance enhancement) internal use of a "window" Tcl_ObjType (fellows) 2001-08-20 (performance enhancement) Obj-ified [grid] and [pack] (spjuth) 2001-09-26 (new feature)[TIP 18] add labels to frames, update geometry managers (spjuth) |
︙ | ︙ | |||
5883 5884 5885 5886 5887 5888 5889 | Updated test suite, documentation, and demos. --- Released 8.5a2, December 7, 2004 --- See ChangeLog for details --- 2004-12-09 (performance)[1081966] BMP, JPG image load speed (fellows) | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 | Updated test suite, documentation, and demos. --- Released 8.5a2, December 7, 2004 --- See ChangeLog for details --- 2004-12-09 (performance)[1081966] BMP, JPG image load speed (fellows) 2004-12-17 (feature change) Modified DisplayFrame to draw a container's background when the embedded window is NULL (chengyemao) 2004-12-17 (bug fix)[842945][831627] Fixed a bug in ContainerEventProc to handle ConfigureNotify event properly; Changed CleanupContainList to TkWinCleanupContainerList to be invoked in TkWinXCleanup; Changed Intialize and CreateTopLevelWindow to create the DeleteWindowsExitProc after TkpInit so that finalization will be done in a proper sequence (to avoid painics and potential crashes in exit). (chengyemao) 2004-12-17 (platform support) Added TkWinClenupContainerList into stublib. (chengyemao) 2004-12-18 (buf fix)[222677] Close the embedded window (of a different process) when its container is destroyed. (chengyemao) 2004-12-19 (Windows feature implementation of embedded/embedding Tk and bug fix) Implemented container identification, focus, raise, set title of and move window so that an embedded widget is able to identify a container, to get focus and to receive key press input. Fixed bugs include [1024364][1096047] and an incorrect wm overrideredirect for an embedded window. (chengyemao) 2004-12-20 (Windows feature implementation of embedded/embedding Tk) Implemented overrideredirect for an embedded toplevel; correctly updated a frame's upper left x and y of an embedded toplevel after its container (of another process) moved. (chengyemao) 2004-12-28 (feature implementatoin of embedded/embedding Tk of Windows) Implemented embedded/embedding toplevel menu. A menu may be embedded in a container of either the same process or a different process. Working fine with Windows 98. But having a problem when invoked with a mouse click (Windows XP): if an embedded menu is in a different process, the menu items may show as a blank window at the pull-down time and require the mouse moves over the menu items to complete display. (chengyemao) 2004-12-29 (platform support)[1092952,1091967] MSVC7, gcc OPT compiles (hobbs) 2005-01-03 (feature implementation of embedded/embedding Tk of Windows) Added a separated window handler for an embedded menu; solved the problem of a blank menu display with a mouse click in XP. (chengyemao) 2005-01-07 (feature implementation of embedded/embedding Tk of Window) Added TK_STATE message (Windows) to support {wm state} for embedded windows; forced redraw of container after the embedded window detached; removed unnecessary panic in using embedded window; embeded toplevel menu of an embedded window automatically in wrapper updating. Modified and added functions: WmStateCmd, UpdateWrapper, TkpWmGetState (added) in tkWinWm.c; TkpUseWindow, TkWinEmbeddedEventProc in tkWinEmbed.c; TkWinChildProc in tkWinX.c. (chengyemao) 2005-01-08 (bug fix)[1098625] Wrong toplevel geometry when created with a menu; [637653] Deleting a popup menu crashes wish (chengyemao) 2005-01-09 (feature implementation of embedded/embedding Tk of Windows) Changed FrameWidgetObjCmd (tkFrame.c), TkpUseWindow (tkMacOSXEmbed.c, tkUnixEmbed.c, tkWinEmbed.c) to make implementation ready for a |
︙ | ︙ | |||
6277 6278 6279 6280 6281 6282 6283 | ".sl") (hobbs) 2007-04-10 (platform support) Correctly handle theming on Vista/Aero (english) 2007-04-23 (enhancement) Allow empty value for -selectforeground opt (steffen) 2007-04-23 (platform support) Aqua: remove Tk-internal double buffering that is | | | 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 | ".sl") (hobbs) 2007-04-10 (platform support) Correctly handle theming on Vista/Aero (english) 2007-04-23 (enhancement) Allow empty value for -selectforeground opt (steffen) 2007-04-23 (platform support) Aqua: remove Tk-internal double buffering that is wasteful on Aqua; allows direct-to-window CoreGraphics drawing (e.g. adding support for colors with alpha) (steffen) 2007-04-23 (platform support) Aqua: add all OS theme colors/brushes (patterns) as system colors (steffen) 2007-04-23 (platform support) Aqua: tk_dialog & bgerror use OS theme (steffen) |
︙ | ︙ | |||
6438 6439 6440 6441 6442 6443 6444 | 2007-11-14 (bug fix)[1831803] sv.msg catalog for "sv" locale (fellows) Many significant improvements to the documentation and demos (fellows, hobbs, steffen, kupries) --- Released 8.5b3, Novemeber 19, 2007 --- See ChangeLog for details --- | | | 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 | 2007-11-14 (bug fix)[1831803] sv.msg catalog for "sv" locale (fellows) Many significant improvements to the documentation and demos (fellows, hobbs, steffen, kupries) --- Released 8.5b3, Novemeber 19, 2007 --- See ChangeLog for details --- 2007-11-25 (bug fix)[1343984] ttk::notebook bugs (english,boudaillier) 2007-11-26 (bug fix)[1822391] [photo put] segfault w/ PPM data (kenny) 2007-11-26 (bug fix)[1822076] [tk_saveFile] and path w/spaces (bauer,kenny) 2007-12-04 (new feature)[1844143] Danish message catalog (berg) |
︙ | ︙ |
Changes to compat/unistd.h.
︙ | ︙ | |||
21 22 23 24 25 26 27 | # include "tcl.h" #endif #ifndef NULL #define NULL 0 #endif | | | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | # include "tcl.h" #endif #ifndef NULL #define NULL 0 #endif /* * Strict POSIX stuff goes here. Extensions go down below, in the * ifndef _POSIX_SOURCE section. */ extern void _exit _ANSI_ARGS_((int status)); extern int access _ANSI_ARGS_((CONST char *path, int mode)); extern int chdir _ANSI_ARGS_((CONST char *path)); extern int chown _ANSI_ARGS_((CONST char *path, uid_t owner, gid_t group)); |
︙ | ︙ |
Changes to generic/tkInt.decls.
︙ | ︙ | |||
868 869 870 871 872 873 874 | declare 22 aqua { int TkMacOSXIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar) } declare 23 aqua { void TkMacOSXMakeRealWindowExist(TkWindow *winPtr) } declare 24 aqua { | | | 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 | declare 22 aqua { int TkMacOSXIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar) } declare 23 aqua { void TkMacOSXMakeRealWindowExist(TkWindow *winPtr) } declare 24 aqua { void *TkMacOSXMakeStippleMap(Drawable d1, Drawable d2) } declare 25 aqua { void TkMacOSXMenuClick(void) } declare 26 aqua { void TkMacOSXRegisterOffScreenWindow(Window window, void *portPtr) } |
︙ | ︙ |
Changes to license.terms.
︙ | ︙ | |||
24 25 26 27 28 29 30 | FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" in the software and related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf of the Department of Defense, the software shall be classified as "Commercial Computer Software" and the Government shall have only "Restricted Rights" as defined in Clause 252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the authors grant the U.S. Government and others acting in its behalf permission to use and distribute the software in accordance with the |
︙ | ︙ |
Changes to macosx/README.
1 2 3 4 5 | Tcl/Tk Mac OS X README ---------------------- This is the README file for the Mac OS X/Darwin version of Tcl/Tk. | < | | < < < < < | | 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 28 29 30 | Tcl/Tk Mac OS X README ---------------------- This is the README file for the Mac OS X/Darwin version of Tcl/Tk. 1. Where to go for support -------------------------- - The tcl-mac mailing list on sourceforge is the best place to ask questions specific to Tcl & Tk on Mac OS X: http://lists.sourceforge.net/lists/listinfo/tcl-mac (this page also has a link to searchable archives of the list, please check them before asking on the list, many questions have already been answered). - For general Tcl/Tk questions, the newsgroup comp.lang.tcl is your best bet: http://groups.google.com/group/comp.lang.tcl/ - The Tcl'ers Wiki also has many pages dealing with Tcl & Tk on Mac OS X, see http://wiki.tcl.tk/_/ref?N=3753 http://wiki.tcl.tk/_/ref?N=8361 - Please report bugs with Tcl or Tk on Mac OS X to the sourceforge bug trackers: http://tcl.sourceforge.net/ 2. Using Tcl/Tk on Mac OS X --------------------------- - There are two versions of Tk available on Mac OS X: TkAqua using the native aqua widgets and look&feel, and TkX11 using the traditional unix X11 wigets. TkX11 requires an X11 server to be installed, such as Apple's X11 (which is |
︙ | ︙ | |||
175 176 177 178 179 180 181 | The command has the following syntax: tk::unsupported::MacWindowStyle style window ?class? ?attributes? The 2 argument form returns a list of the current class and attributes for the given window. The 3 argument form sets the class for the given window using the default attributes for that class. The 4 argument form sets the class and the list of attributes for the given window. Window class names: | > > | > | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | The command has the following syntax: tk::unsupported::MacWindowStyle style window ?class? ?attributes? The 2 argument form returns a list of the current class and attributes for the given window. The 3 argument form sets the class for the given window using the default attributes for that class. The 4 argument form sets the class and the list of attributes for the given window. Window class names: document, modal, floating, utility, toolbar, simple, help, overlay Window attribute names: standardDocument, standardFloating, resizable, fullZoom, horizontalZoom, verticalZoom, closeBox, collapseBox, toolbarButton, sideTitlebar, noTitleBar, unifiedTitleAndToolbar, metal, hud, noShadow, doesNotCycle, noActivates, hideOnSuspend, inWindowMenu, ignoreClicks, doesNotHide, canJoinAllSpaces, moveToActiveSpace, nonActivating, black, dark, light, gray, red, green, blue, cyan, yellow, magenta, orange, purple, brown, clear, opacity Note that not all attributes are valid for all window classes. Support for the 3 argument form was added with the Cocoa-based Tk 8.5.7, at the same time support for some legacy Carbon-specific classes and attributes was removed (they are still accepted by the command but no longer have any effect). The color window attributes (black, dark, red, etc.) and the "opacity" allow one to set the background and opacity of a textured ("metal") window. This allows a Tk window to implement a window without the dividing line between the titlebar and the rest of the window, or the "unified toolbar" effect, which is increasingly standard in Mac applications. An example: |
︙ | ︙ | |||
282 283 284 285 286 287 288 | ReleaseUniversal10.5SDK: build against the 10.5 SDK (with 10.5 deployment target). Note that the non-SDK configurations have their deployment target set to 10.5 (Tk.xcode) resp. 10.6 (Tk.xcodeproj). The Xcode projects refer to the toplevel tcl and tk source directories via the the TCL_SRCROOT and TK_SRCROOT user build settings, by default these are set to the project-relative paths '../../tcl' and '../../tk', if your source | | | 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 | ReleaseUniversal10.5SDK: build against the 10.5 SDK (with 10.5 deployment target). Note that the non-SDK configurations have their deployment target set to 10.5 (Tk.xcode) resp. 10.6 (Tk.xcodeproj). The Xcode projects refer to the toplevel tcl and tk source directories via the the TCL_SRCROOT and TK_SRCROOT user build settings, by default these are set to the project-relative paths '../../tcl' and '../../tk', if your source directories are named differently, e.g. '../../tcl8.5' and '../../tk8.5', you need to manually change the TCL_SRCROOT and TK_SRCROOT settings by editing your ${USER}.pbxuser file (located inside the Tk.xcodeproj bundle directory) with a text editor. - To build universal binaries outside of the Xcode IDE, set CFLAGS as follows: export CFLAGS="-arch i386 -arch x86_64 -arch ppc" This requires Mac OS X 10.4 and Xcode 2.4 (or Xcode 2.2 if -arch x86_64 is |
︙ | ︙ | |||
318 319 320 321 322 323 324 | [ create the following symbolic link for the build to work as setup by default ] [ ln -fs /path_to_tcl/build /path_to_tk/build ] [ (where /path_to_{tcl,tk} is the directory containing the tcl resp. tk tree) ] [ or you can pass an argument of BUILD_DIR=/somewhere to the tcl and tk make. ] - The following instructions assume the Tcl and Tk source trees are named "tcl${ver}" and "tk${ver}" (where ${ver} is a shell variable containing the | | | | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | [ create the following symbolic link for the build to work as setup by default ] [ ln -fs /path_to_tcl/build /path_to_tk/build ] [ (where /path_to_{tcl,tk} is the directory containing the tcl resp. tk tree) ] [ or you can pass an argument of BUILD_DIR=/somewhere to the tcl and tk make. ] - The following instructions assume the Tcl and Tk source trees are named "tcl${ver}" and "tk${ver}" (where ${ver} is a shell variable containing the Tcl/Tk version number, e.g. '8.5'). Setup this shell variable as follows: ver="8.5" If you are building from CVS, omit this step (CVS source tree names usually do not contain a version number). - Setup environment variables as desired, e.g. for a universal build on 10.5: CFLAGS="-arch i386 -arch x86_64 -arch ppc -mmacosx-version-min=10.5" export CFLAGS |
︙ | ︙ |
Changes to unix/Makefile.in.
︙ | ︙ | |||
151 152 153 154 155 156 157 | X11_INCLUDES = @XINCLUDES@ AQUA_INCLUDES = -I$(MAC_OSX_DIR) -I$(XLIB_DIR) # Linker switch(es) to use to link with the X11 library archive (the # configure script will try to set this value automatically, but you # can override it). | | | 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | X11_INCLUDES = @XINCLUDES@ AQUA_INCLUDES = -I$(MAC_OSX_DIR) -I$(XLIB_DIR) # Linker switch(es) to use to link with the X11 library archive (the # configure script will try to set this value automatically, but you # can override it). X11_LIB_SWITCHES = $(XFT_LIBS) @XLIBSW@ # To turn off the security checks that disallow incoming sends when # the X server appears to be insecure, reverse the comments on the # following lines: SECURITY_FLAGS = #SECURITY_FLAGS = -DTK_NO_SECURITY |
︙ | ︙ | |||
196 197 198 199 200 201 202 | # BUILD_TCLSH is the fully qualified path name of the tclsh shell # in the Tcl build directory. Test that need to be run in the # version of tclsh that we are building against should use this # path. Targets that need an installed tclsh should not depend # on this variable. | | > | | | 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 | # BUILD_TCLSH is the fully qualified path name of the tclsh shell # in the Tcl build directory. Test that need to be run in the # version of tclsh that we are building against should use this # path. Targets that need an installed tclsh should not depend # on this variable. BUILD_TCLSH = @BUILD_TCLSH@ # TCL_EXE is the name of a tclsh executable that is available *BEFORE* # running make for the first time. Certain build targets (make genstubs) # need it to be available on the PATH. This executable should *NOT* be # required just to do a normal build although it can be required to run # make dist. This variable is set to "" if no tclsh is available. EXE_SUFFIX = @EXEEXT@ TCL_EXE = @TCLSH_PROG@ WISH_EXE = wish${EXE_SUFFIX} TKTEST_EXE = tktest${EXE_SUFFIX} # Tk used to let the configure script choose which program to use # for installing, but there are just too many different versions of # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. INSTALL_STRIP_PROGRAM = -s |
︙ | ︙ | |||
322 323 324 325 326 327 328 | CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \ ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \ ${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ | | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 | CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \ ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \ ${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@ DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} \ ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \ ${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ |
︙ | ︙ | |||
350 351 352 353 354 355 356 | IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPPM.o tkImgPhoto.o TEXT_OBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \ tkTextMark.o tkTextTag.o tkTextWind.o # either tkUnixFont.o (default) or tkUnixRFont.o (if --enable-xft) | | | 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPPM.o tkImgPhoto.o TEXT_OBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \ tkTextMark.o tkTextTag.o tkTextWind.o # either tkUnixFont.o (default) or tkUnixRFont.o (if --enable-xft) # FONT_OBJS = @UNIX_FONT_OBJS@ GENERIC_OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkClipboard.o \ tkCmds.o tkColor.o tkConfig.o tkConsole.o tkCursor.o tkError.o \ tkEvent.o tkFocus.o tkFont.o tkGet.o tkGC.o tkGeometry.o tkGrab.o \ tkGrid.o tkMain.o tkObj.o tkOldConfig.o tkOption.o tkPack.o tkPlace.o \ tkSelect.o tkStyle.o tkUndo.o tkUtil.o tkVisual.o tkWindow.o |
︙ | ︙ | |||
662 663 664 665 666 667 668 | valgrind: $(TKTEST_EXE) $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(TEST_DIR)/all.tcl -geometry +0+0 -singleproc 1 $(TESTFLAGS) valgrindshell: $(TKTEST_EXE) $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT) | | > > > > > > | 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 | valgrind: $(TKTEST_EXE) $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(TEST_DIR)/all.tcl -geometry +0+0 -singleproc 1 $(TESTFLAGS) valgrindshell: $(TKTEST_EXE) $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT) INSTALL_BASE_TARGETS = install-binaries install-libraries INSTALL_DOC_TARGETS = install-doc INSTALL_DEV_TARGETS = install-headers INSTALL_DEMO_TARGETS = install-demos INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ $(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS) install: $(INSTALL_TARGETS) install-strip: $(MAKE) $(INSTALL_TARGETS) \ INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \ INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}" |
︙ | ︙ | |||
689 690 691 692 693 694 695 | else true; \ fi; \ done; @if test "x$(TK_SHARED_BUILD)" = "x1"; then \ echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ (\ | | | | | < < < | < < < < < < < < < | | | 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 | else true; \ fi; \ done; @if test "x$(TK_SHARED_BUILD)" = "x1"; then \ echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ (\ echo "if {[catch {package present Tcl 8.5.0}]} return";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \ echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ else \ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ echo "} else {";\ echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ echo "}";\ fi \ ) > "$(PKG_INDEX)"; \ fi @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ fi @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ install-libraries: libraries @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ "$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \ do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ $(INSTALL_DATA_DIR) "$$i"; \ else true; \ fi; \ done; @echo "Installing Tk library files to $(SCRIPT_INSTALL_DIR)/"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ $(UNIX_DIR)/tkAppInit.c; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ done; @echo "Installing Ttk library files to $(SCRIPT_INSTALL_DIR)/ttk/"; @for i in $(TOP_DIR)/library/ttk/*.tcl; \ do \ if [ -f $$i ] ; then \ |
︙ | ︙ | |||
824 825 826 827 828 829 830 831 832 | @for i in $(TOP_DIR)/doc/*.3; do \ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ done @echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/"; @for i in $(TOP_DIR)/doc/*.n; do \ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ done # Optional target to install private headers | > > > > > > > > > > > > > > > > > > > > > | | 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 | @for i in $(TOP_DIR)/doc/*.3; do \ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ done @echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/"; @for i in $(TOP_DIR)/doc/*.n; do \ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ done install-headers: @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \ do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ $(INSTALL_DATA_DIR) "$$i"; \ else true; \ fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; @for i in $(PUBLIC_HDRS); \ do \ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ done; @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ do \ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \ done; # Optional target to install private headers install-private-headers: @for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ $(INSTALL_DATA_DIR) "$$i"; \ else true; \ fi; \ |
︙ | ︙ | |||
1634 1635 1636 1637 1638 1639 1640 | TCLSH="$(TCL_EXE)"; fi ;\ "$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) # # Targets to build Solaris package of the distribution for the current # architecture. To build stream packages for both sun4 and i86pc | | | 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 | TCLSH="$(TCL_EXE)"; fi ;\ "$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) # # Targets to build Solaris package of the distribution for the current # architecture. To build stream packages for both sun4 and i86pc # architectures: # # On the sun4 machine, execute the following: # make distclean; ./configure # make DISTDIR=<distdir> package # # Once the build is complete, execute the following on the i86pc # machine: |
︙ | ︙ | |||
1690 1691 1692 1693 1694 1695 1696 | > $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION) chmod 755 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION) # # Build and install the architecture specific files in the dist directory. # | | | 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 | > $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION) chmod 755 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION) # # Build and install the architecture specific files in the dist directory. # package-binaries: cd $(DISTDIR)/unix/`arch`; \ $(MAKE); \ $(MAKE) install-binaries prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \ exec_prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch` # # Generate a package from the installed files in the dist directory for the |
︙ | ︙ |
Changes to unix/tk.spec.
︙ | ︙ | |||
28 29 30 31 32 33 34 | %build cd unix CFLAGS="%optflags" ./configure \ --prefix=%{directory} \ --exec-prefix=%{directory} \ --libdir=%{directory}/%{_lib} | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | %build cd unix CFLAGS="%optflags" ./configure \ --prefix=%{directory} \ --exec-prefix=%{directory} \ --libdir=%{directory}/%{_lib} make %install cd unix make INSTALL_ROOT=%buildroot install %clean rm -rf %buildroot |
︙ | ︙ |
Changes to unix/tkConfig.sh.in.
1 | # tkConfig.sh -- | | | 1 2 3 4 5 6 7 8 9 | # tkConfig.sh -- # # This shell script (for sh) is generated automatically by Tk's # configure script. It will create shell variables for most of # the configuration options discovered by the configure script. # This script is intended to be included by the configure scripts # for Tk extensions so that they don't have to figure this all # out for themselves. This file does not duplicate information # already provided by tclConfig.sh, so you may need to use that |
︙ | ︙ |
Changes to unix/tkUnixConfig.c.
|
| | | 1 2 3 4 5 6 7 8 | /* * tkUnixConfig.c -- * * This module implements the Unix system defaults for the configuration * package. * * Copyright (c) 1997 by Sun Microsystems, Inc. * |
︙ | ︙ |
Changes to unix/tkUnixKey.c.
︙ | ︙ | |||
38 39 40 41 42 43 44 | { TkWindow *winPtr = (TkWindow *) tkwin; TkDisplay *dispPtr = winPtr->dispPtr; if ( dispPtr->caret.winPtr == winPtr && dispPtr->caret.x == x && dispPtr->caret.y == y | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | { TkWindow *winPtr = (TkWindow *) tkwin; TkDisplay *dispPtr = winPtr->dispPtr; if ( dispPtr->caret.winPtr == winPtr && dispPtr->caret.x == x && dispPtr->caret.y == y && dispPtr->caret.height == height) { return; } dispPtr->caret.winPtr = winPtr; dispPtr->caret.x = x; dispPtr->caret.y = y; |
︙ | ︙ | |||
112 113 114 115 116 117 118 | (unsigned) kePtr->charValueLen+1); return Tcl_DStringValue(dsPtr); } #ifdef TK_USE_INPUT_METHODS if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM) && (winPtr->inputContext != NULL) | | | | | 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 | (unsigned) kePtr->charValueLen+1); return Tcl_DStringValue(dsPtr); } #ifdef TK_USE_INPUT_METHODS if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM) && (winPtr->inputContext != NULL) && (eventPtr->type == KeyPress)) { Status status; #if X_HAVE_UTF8_STRING Tcl_DStringSetLength(dsPtr, TCL_DSTRING_STATIC_SIZE-1); len = Xutf8LookupString(winPtr->inputContext, &eventPtr->xkey, Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr), &kePtr->keysym, &status); if (status == XBufferOverflow) { /* Expand buffer and try again */ Tcl_DStringSetLength(dsPtr, len); len = Xutf8LookupString(winPtr->inputContext, &eventPtr->xkey, Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr), &kePtr->keysym, &status); } if ((status != XLookupChars) && (status != XLookupBoth)) { len = 0; } Tcl_DStringSetLength(dsPtr, len); #else /* !X_HAVE_UTF8_STRING */ /* * Overallocate the dstring to the maximum stack amount. */ Tcl_DStringInit(&buf); Tcl_DStringSetLength(&buf, TCL_DSTRING_STATIC_SIZE-1); len = XmbLookupString(winPtr->inputContext, &eventPtr->xkey, Tcl_DStringValue(&buf), Tcl_DStringLength(&buf), &kePtr->keysym, &status); /* * If the buffer wasn't big enough, grow the buffer and try again. */ if (status == XBufferOverflow) { |
︙ | ︙ | |||
277 278 279 280 281 282 283 | XEvent *eventPtr) /* Description of X event. */ { KeySym sym; int index; TkKeyEvent* kePtr = (TkKeyEvent*) eventPtr; #ifdef TK_USE_INPUT_METHODS | | | 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 | XEvent *eventPtr) /* Description of X event. */ { KeySym sym; int index; TkKeyEvent* kePtr = (TkKeyEvent*) eventPtr; #ifdef TK_USE_INPUT_METHODS /* * If input methods are active, we may already have determined a keysym. * Return it. */ if (eventPtr->type == KeyPress && dispPtr && (dispPtr->flags & TK_DISPLAY_USE_IM)) { if (kePtr->charValuePtr == NULL) { |
︙ | ︙ |
Changes to unix/tkUnixWm.c.
︙ | ︙ | |||
378 379 380 381 382 383 384 | Tcl_Obj *CONST objv[]); static int WmDeiconifyCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmFocusmodelCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); | | | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | Tcl_Obj *CONST objv[]); static int WmDeiconifyCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmFocusmodelCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmForgetCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmFrameCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmGeometryCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, |
︙ | ︙ | |||
414 415 416 417 418 419 420 | Tcl_Obj *CONST objv[]); static int WmIconpositionCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmIconwindowCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); | | | 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 | Tcl_Obj *CONST objv[]); static int WmIconpositionCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmIconwindowCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmManageCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmMaxsizeCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); static int WmMinsizeCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, |
︙ | ︙ | |||
984 985 986 987 988 989 990 | } /* *---------------------------------------------------------------------- * * Tk_WmObjCmd -- * | | | 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 | } /* *---------------------------------------------------------------------- * * Tk_WmObjCmd -- * * This function is invoked to process the "wm" Tcl command. * *---------------------------------------------------------------------- */ /* ARGSUSED */ int Tk_WmObjCmd( |
︙ | ︙ | |||
5407 5408 5409 5410 5411 5412 5413 | /* *---------------------------------------------------------------------- * * GetNetWmType -- * * Read the extended window manager type hint from a window | | | 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 | /* *---------------------------------------------------------------------- * * GetNetWmType -- * * Read the extended window manager type hint from a window * and return as a list of names suitable for use with * SetNetWmType. * *---------------------------------------------------------------------- */ static Tcl_Obj * GetNetWmType(TkWindow *winPtr) |
︙ | ︙ | |||
6345 6346 6347 6348 6349 6350 6351 | for (i = 0; i < numChildren; i++) { hPtr = Tcl_FindHashEntry(&table, (char *) children[i]); if (hPtr != NULL) { childWinPtr = (TkWindow *) Tcl_GetHashValue(hPtr); *window_ptr++ = childWinPtr; } } | | | 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 | for (i = 0; i < numChildren; i++) { hPtr = Tcl_FindHashEntry(&table, (char *) children[i]); if (hPtr != NULL) { childWinPtr = (TkWindow *) Tcl_GetHashValue(hPtr); *window_ptr++ = childWinPtr; } } /* ASSERT: window_ptr - windows == table.numEntries * (#matched toplevel windows == #children) [Bug 1789819] */ *window_ptr = NULL; if (numChildren) { XFree((char *) children); } } |
︙ | ︙ | |||
7302 7303 7304 7305 7306 7307 7308 | * * Side effects: * keeps windowing system (X11) happy * *---------------------------------------------------------------------- */ | | | 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 | * * Side effects: * keeps windowing system (X11) happy * *---------------------------------------------------------------------- */ static void RemapWindows(winPtr, parentPtr) TkWindow *winPtr; TkWindow *parentPtr; { XWindowAttributes win_attr; if (winPtr->window) { |
︙ | ︙ |
Changes to win/Makefile.in.
︙ | ︙ | |||
141 142 143 144 145 146 147 | WISH = wish$(VER)${EXESUFFIX} TKTEST = tktest${EXEEXT} CAT32 = cat32$(EXEEXT) MAN2TCL = man2tcl$(EXEEXT) @SET_MAKE@ | | | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | WISH = wish$(VER)${EXESUFFIX} TKTEST = tktest${EXEEXT} CAT32 = cat32$(EXEEXT) MAN2TCL = man2tcl$(EXEEXT) @SET_MAKE@ # Setting the VPATH variable to a list of paths will cause the # makefile to look into these paths when resolving .c to .obj # dependencies. VPATH = $(GENERIC_DIR):$(TTK_DIR):$(WIN_DIR):$(UNIX_DIR):$(XLIB_DIR):$(RC_DIR) # warning flags CFLAGS_WARNING = @CFLAGS_WARNING@ |
︙ | ︙ | |||
402 403 404 405 406 407 408 | DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget SHELL_ENV = \ @TCL_LIBRARY="$(TCL_SRC_DIR_NATIVE)/library"; export TCL_LIBRARY; \ TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \ PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; | | | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 | DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget SHELL_ENV = \ @TCL_LIBRARY="$(TCL_SRC_DIR_NATIVE)/library"; export TCL_LIBRARY; \ TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \ PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; # Main targets. The default target -- all -- builds the binaries, # performs any post processing on libraries or documents. all: binaries libraries doc binaries: @LIBRARIES@ $(WISH) libraries: |
︙ | ︙ | |||
477 478 479 480 481 482 483 | @for i in $(TK_DLL_FILE) $(WISH); \ do \ if [ -f $$i ]; then \ echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \ $(COPY) $$i "$(BIN_INSTALL_DIR)"; \ fi; \ done | | | 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 | @for i in $(TK_DLL_FILE) $(WISH); \ do \ if [ -f $$i ]; then \ echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \ $(COPY) $$i "$(BIN_INSTALL_DIR)"; \ fi; \ done @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ echo "if {[catch {package present Tcl $(TCLVERSION).0}]} return";\ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\ echo "} else {";\ |
︙ | ︙ |
Changes to win/nmakehlp.c.
︙ | ︙ | |||
494 495 496 497 498 499 500 | while (fgets(szBuffer, cbBuffer, fp) != NULL) { LPSTR p, q; p = strstr(szBuffer, match); if (p != NULL) { /* | | > | 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | while (fgets(szBuffer, cbBuffer, fp) != NULL) { LPSTR p, q; p = strstr(szBuffer, match); if (p != NULL) { /* * Skip to first digit after the match. */ p += strlen(match); while (*p && !isdigit(*p)) { ++p; } /* * Find ending whitespace. */ |
︙ | ︙ | |||
626 627 628 629 630 631 632 | int n = 0; list_item_t *p = NULL; for (p = substPtr; p != NULL; p = p->nextPtr, ++n) { fprintf(stderr, "% 3d '%s' => '%s'\n", n, p->key, p->value); } } #endif | | | | | 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 | int n = 0; list_item_t *p = NULL; for (p = substPtr; p != NULL; p = p->nextPtr, ++n) { fprintf(stderr, "% 3d '%s' => '%s'\n", n, p->key, p->value); } } #endif /* * Run the substitutions over each line of the input */ while (fgets(szBuffer, cbBuffer, fp) != NULL) { list_item_t *p = NULL; for (p = substPtr; p != NULL; p = p->nextPtr) { char *m = strstr(szBuffer, p->key); if (m) { char *cp, *op, *sp; cp = szCopy; op = szBuffer; while (op != m) *cp++ = *op++; sp = p->value; while (sp && *sp) *cp++ = *sp++; op += strlen(p->key); while (*op) *cp++ = *op++; *cp = 0; memcpy(szBuffer, szCopy, sizeof(szCopy)); } } printf(szBuffer); } list_free(&substPtr); } fclose(fp); return 0; } /* |
︙ | ︙ |
Changes to xlib/X11/X.h.
︙ | ︙ | |||
9 10 11 12 13 14 15 | /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved | | | | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS |
︙ | ︙ | |||
96 97 98 99 100 101 102 | #define AllTemporary 0L /* special Resource ID passed to KillClient */ #define CurrentTime 0L /* special Time */ #define NoSymbol 0L /* special KeySym */ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | #define AllTemporary 0L /* special Resource ID passed to KillClient */ #define CurrentTime 0L /* special Time */ #define NoSymbol 0L /* special KeySym */ /***************************************************************** * EVENT DEFINITIONS *****************************************************************/ /* Input Event Masks. Used as event-mask window attribute and as arguments to Grab requests. Not to be confused with event names. */ #define NoEventMask 0L #define KeyPressMask (1L<<0) #define KeyReleaseMask (1L<<1) #define ButtonPressMask (1L<<2) #define ButtonReleaseMask (1L<<3) #define EnterWindowMask (1L<<4) #define LeaveWindowMask (1L<<5) #define PointerMotionMask (1L<<6) #define PointerMotionHintMask (1L<<7) #define Button1MotionMask (1L<<8) #define Button2MotionMask (1L<<9) #define Button3MotionMask (1L<<10) #define Button4MotionMask (1L<<11) #define Button5MotionMask (1L<<12) #define ButtonMotionMask (1L<<13) #define KeymapStateMask (1L<<14) #define ExposureMask (1L<<15) #define VisibilityChangeMask (1L<<16) #define StructureNotifyMask (1L<<17) #define ResizeRedirectMask (1L<<18) #define SubstructureNotifyMask (1L<<19) #define SubstructureRedirectMask (1L<<20) #define FocusChangeMask (1L<<21) #define PropertyChangeMask (1L<<22) #define ColormapChangeMask (1L<<23) #define OwnerGrabButtonMask (1L<<24) /* Event names. Used in "type" field in XEvent structures. Not to be confused with event masks above. They start from 2 because 0 and 1 are reserved in the protocol for errors and replies. */ #define KeyPress 2 #define KeyRelease 3 |
︙ | ︙ | |||
225 226 227 228 229 230 231 | #define NotifyNormal 0 #define NotifyGrab 1 #define NotifyUngrab 2 #define NotifyWhileGrabbed 3 #define NotifyHint 1 /* for MotionNotify events */ | | | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | #define NotifyNormal 0 #define NotifyGrab 1 #define NotifyUngrab 2 #define NotifyWhileGrabbed 3 #define NotifyHint 1 /* for MotionNotify events */ /* Notify detail */ #define NotifyAncestor 0 #define NotifyVirtual 1 #define NotifyInferior 2 #define NotifyNonlinear 3 #define NotifyNonlinearVirtual 4 |
︙ | ︙ | |||
295 296 297 298 299 300 301 | /* Used in SetInputFocus, GetInputFocus */ #define RevertToNone (int)None #define RevertToPointerRoot (int)PointerRoot #define RevertToParent 2 /***************************************************************** | | | | | | | 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 | /* Used in SetInputFocus, GetInputFocus */ #define RevertToNone (int)None #define RevertToPointerRoot (int)PointerRoot #define RevertToParent 2 /***************************************************************** * ERROR CODES *****************************************************************/ #define Success 0 /* everything's okay */ #define BadRequest 1 /* bad request code */ #define BadValue 2 /* int parameter out of range */ #define BadWindow 3 /* parameter not a Window */ #define BadPixmap 4 /* parameter not a Pixmap */ #define BadAtom 5 /* parameter not an Atom */ #define BadCursor 6 /* parameter not a Cursor */ #define BadFont 7 /* parameter not a Font */ #define BadMatch 8 /* parameter mismatch */ #define BadDrawable 9 /* parameter not a Pixmap or Window */ #define BadAccess 10 /* depending on context: - key/button already grabbed - attempt to free an illegal cmap entry - attempt to store into a read-only color map entry. - attempt to modify the access control list from other than the local host. */ #define BadAlloc 11 /* insufficient resources */ #define BadColor 12 /* no such colormap */ #define BadGC 13 /* parameter not a GC */ #define BadIDChoice 14 /* choice not in range or already used */ #define BadName 15 /* font or color name doesn't exist */ #define BadLength 16 /* Request length incorrect */ #define BadImplementation 17 /* server is defective */ #define FirstExtensionError 128 #define LastExtensionError 255 /***************************************************************** * WINDOW DEFINITIONS *****************************************************************/ /* Window classes used by CreateWindow */ /* Note that CopyFromParent is already defined as 0 above */ #define InputOutput 1 #define InputOnly 2 |
︙ | ︙ | |||
521 522 523 524 525 526 527 | #define GCForeground (1L<<2) #define GCBackground (1L<<3) #define GCLineWidth (1L<<4) #define GCLineStyle (1L<<5) #define GCCapStyle (1L<<6) #define GCJoinStyle (1L<<7) #define GCFillStyle (1L<<8) | | | | | | 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 | #define GCForeground (1L<<2) #define GCBackground (1L<<3) #define GCLineWidth (1L<<4) #define GCLineStyle (1L<<5) #define GCCapStyle (1L<<6) #define GCJoinStyle (1L<<7) #define GCFillStyle (1L<<8) #define GCFillRule (1L<<9) #define GCTile (1L<<10) #define GCStipple (1L<<11) #define GCTileStipXOrigin (1L<<12) #define GCTileStipYOrigin (1L<<13) #define GCFont (1L<<14) #define GCSubwindowMode (1L<<15) #define GCGraphicsExposures (1L<<16) #define GCClipXOrigin (1L<<17) #define GCClipYOrigin (1L<<18) #define GCClipMask (1L<<19) #define GCDashOffset (1L<<20) #define GCDashList (1L<<21) #define GCArcMode (1L<<22) #define GCLastBit 22 /***************************************************************** * FONTS *****************************************************************/ /* used in QueryFont -- draw direction */ #define FontLeftToRight 0 #define FontRightToLeft 1 #define FontChange 255 /***************************************************************** * IMAGING *****************************************************************/ /* ImageFormat -- PutImage, GetImage */ #define XYBitmap 0 /* depth 1, XYFormat */ #define XYPixmap 1 /* depth == drawable depth */ #define ZPixmap 2 /* depth == drawable depth */ /***************************************************************** * COLOR MAP STUFF *****************************************************************/ /* For CreateColormap */ #define AllocNone 0 /* create map with no entries */ #define AllocAll 1 /* allocate entire map writeable */ |
︙ | ︙ | |||
584 585 586 587 588 589 590 | /* QueryBestSize Class */ #define CursorShape 0 /* largest size that can be displayed */ #define TileShape 1 /* size tiled fastest */ #define StippleShape 2 /* size stippled fastest */ | | | 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 | /* QueryBestSize Class */ #define CursorShape 0 /* largest size that can be displayed */ #define TileShape 1 /* size tiled fastest */ #define StippleShape 2 /* size stippled fastest */ /***************************************************************** * KEYBOARD/POINTER STUFF *****************************************************************/ #define AutoRepeatModeOff 0 #define AutoRepeatModeOn 1 #define AutoRepeatModeDefault 2 |
︙ | ︙ | |||
615 616 617 618 619 620 621 | #define MappingFailed 2 #define MappingModifier 0 #define MappingKeyboard 1 #define MappingPointer 2 /***************************************************************** | | | 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 | #define MappingFailed 2 #define MappingModifier 0 #define MappingKeyboard 1 #define MappingPointer 2 /***************************************************************** * SCREEN SAVER STUFF *****************************************************************/ #define DontPreferBlanking 0 #define PreferBlanking 1 #define DefaultBlanking 2 #define DisableScreenSaver 0 |
︙ | ︙ | |||
645 646 647 648 649 650 651 | /* for ChangeHosts */ #define HostInsert 0 #define HostDelete 1 /* for ChangeAccessControl */ | | | | 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 | /* for ChangeHosts */ #define HostInsert 0 #define HostDelete 1 /* for ChangeAccessControl */ #define EnableAccess 1 #define DisableAccess 0 /* Display classes used in opening the connection * Note that the statically allocated ones are even numbered and the * dynamically changeable ones are odd numbered */ #define StaticGray 0 #define GrayScale 1 #define StaticColor 2 #define PseudoColor 3 |
︙ | ︙ |
Changes to xlib/X11/Xfuncproto.h.
1 | /* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */ | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | /* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */ /* * Copyright 1989, 1991 by the Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, provided * that the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation, and that the name of M.I.T. not be used in advertising * or publicity pertaining to distribution of the software without specific, * written prior permission. M.I.T. makes no representations about the * suitability of this software for any purpose. It is provided "as is" * without express or implied warranty. * */ /* Definitions to make function prototypes manageable */ |
︙ | ︙ |
Changes to xlib/X11/Xlib.h.
1 | /* $XConsortium: Xlib.h,v 11.221 93/07/02 14:13:28 gildea Exp $ */ | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | /* $XConsortium: Xlib.h,v 11.221 93/07/02 14:13:28 gildea Exp $ */ /* * Copyright 1985, 1986, 1987, 1991 by the Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, provided * that the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation, and that the name of M.I.T. not be used in advertising * or publicity pertaining to distribution of the software without specific, * written prior permission. M.I.T. makes no representations about the * suitability of this software for any purpose. It is provided "as is" * without express or implied warranty. * * X Window System is a Trademark of MIT. * */ |
︙ | ︙ | |||
159 160 161 162 163 164 165 | typedef struct { int function; /* logical operation */ unsigned long plane_mask;/* plane mask */ unsigned long foreground;/* foreground pixel */ unsigned long background;/* background pixel */ int line_width; /* line width */ int line_style; /* LineSolid, LineOnOffDash, LineDoubleDash */ | | | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | typedef struct { int function; /* logical operation */ unsigned long plane_mask;/* plane mask */ unsigned long foreground;/* foreground pixel */ unsigned long background;/* background pixel */ int line_width; /* line width */ int line_style; /* LineSolid, LineOnOffDash, LineDoubleDash */ int cap_style; /* CapNotLast, CapButt, CapRound, CapProjecting */ int join_style; /* JoinMiter, JoinRound, JoinBevel */ int fill_style; /* FillSolid, FillTiled, FillStippled, FillOpaeueStippled */ int fill_rule; /* EvenOddRule, WindingRule */ int arc_mode; /* ArcChord, ArcPieSlice */ Pixmap tile; /* tile pixmap for tiling operations */ Pixmap stipple; /* stipple 1 plane pixmap for stipping */ int ts_x_origin; /* offset for tile or stipple operations */ int ts_y_origin; |
︙ | ︙ | |||
205 206 207 208 209 210 211 | unsigned long red_mask, green_mask, blue_mask; /* mask values */ int bits_per_rgb; /* log base 2 of distinct color values */ int map_entries; /* color map entries */ } Visual; /* * Depth structure; contains information for each possible depth. | | | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | unsigned long red_mask, green_mask, blue_mask; /* mask values */ int bits_per_rgb; /* log base 2 of distinct color values */ int map_entries; /* color map entries */ } Visual; /* * Depth structure; contains information for each possible depth. */ typedef struct { int depth; /* this depth (Z) of the depth */ int nvisuals; /* number of Visual types at this depth */ Visual *visuals; /* list of visuals possible at this depth */ } Depth; /* |
︙ | ︙ | |||
233 234 235 236 237 238 239 | Visual *root_visual; /* root visual */ GC default_gc; /* GC for the root root visual */ Colormap cmap; /* default color map */ unsigned long white_pixel; unsigned long black_pixel; /* White and Black pixel values */ int max_maps, min_maps; /* max and min color maps */ int backing_store; /* Never, WhenMapped, Always */ | | | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 | Visual *root_visual; /* root visual */ GC default_gc; /* GC for the root root visual */ Colormap cmap; /* default color map */ unsigned long white_pixel; unsigned long black_pixel; /* White and Black pixel values */ int max_maps, min_maps; /* max and min color maps */ int backing_store; /* Never, WhenMapped, Always */ Bool save_unders; long root_input_mask; /* initial root input mask */ } Screen; /* * Format structure; describes ZFormat data the screen will understand. */ typedef struct { |
︙ | ︙ | |||
344 345 346 347 348 349 350 | int (*put_pixel)(); struct _XImage *(*sub_image)(); int (*add_pixel)(); #endif } f; } XImage; | | | | | | 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 | int (*put_pixel)(); struct _XImage *(*sub_image)(); int (*add_pixel)(); #endif } f; } XImage; /* * Data structure for XReconfigureWindow */ typedef struct { int x, y; int width, height; int border_width; Window sibling; int stack_mode; } XWindowChanges; /* * Data structure used by color operations */ typedef struct { unsigned long pixel; unsigned short red, green, blue; char flags; /* do_red, do_green, do_blue */ char pad; } XColor; /* * Data structures for graphics operations. On most machines, these are * congruent with the wire protocol structures, so reformatting the data * can be avoided on these architectures. */ typedef struct { short x1, y1, x2, y2; } XSegment; typedef struct { short x, y; } XPoint; typedef struct { short x, y; unsigned short width, height; } XRectangle; typedef struct { short x, y; unsigned short width, height; short angle1, angle2; } XArc; |
︙ | ︙ | |||
483 484 485 486 487 488 489 | char *xdefaults; /* contents of defaults from server */ char *scratch_buffer; /* place to hang scratch buffer */ unsigned long scratch_length; /* length of scratch buffer */ int ext_number; /* extension number on this display */ struct _XExten *ext_procs; /* extensions initialized on this display */ /* * the following can be fixed size, as the protocol defines how | | | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 | char *xdefaults; /* contents of defaults from server */ char *scratch_buffer; /* place to hang scratch buffer */ unsigned long scratch_length; /* length of scratch buffer */ int ext_number; /* extension number on this display */ struct _XExten *ext_procs; /* extensions initialized on this display */ /* * the following can be fixed size, as the protocol defines how * much address space is available. * While this could be done using the extension vector, there * may be MANY events processed, so a search through the extension * list to find the right procedure for each event might be * expensive if many extensions are being used. */ Bool (*event_vec[128])(); /* vector for wire to event */ Status (*wire_vec[128])(); /* vector for event to wire */ |
︙ | ︙ | |||
598 599 600 601 602 603 604 | Window subwindow; /* child window */ Time time; /* milliseconds */ int x, y; /* pointer x, y coordinates in event window */ int x_root, y_root; /* coordinates relative to root */ int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */ int detail; /* | | | | | | 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 | Window subwindow; /* child window */ Time time; /* milliseconds */ int x, y; /* pointer x, y coordinates in event window */ int x_root, y_root; /* coordinates relative to root */ int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */ int detail; /* * NotifyAncestor, NotifyVirtual, NotifyInferior, * NotifyNonlinear,NotifyNonlinearVirtual */ Bool same_screen; /* same screen flag */ Bool focus; /* boolean focus */ unsigned int state; /* key or button mask */ } XCrossingEvent; typedef XCrossingEvent XEnterWindowEvent; typedef XCrossingEvent XLeaveWindowEvent; typedef struct { int type; /* FocusIn or FocusOut */ unsigned long serial; /* # of last request processed by server */ Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* window of event */ int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */ int detail; /* * NotifyAncestor, NotifyVirtual, NotifyInferior, * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer, * NotifyPointerRoot, NotifyDetailNone */ } XFocusChangeEvent; typedef XFocusChangeEvent XFocusInEvent; typedef XFocusChangeEvent XFocusOutEvent; /* generated on EnterWindow and FocusIn when KeyMapState selected */ typedef struct { int type; unsigned long serial; /* # of last request processed by server */ Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; char key_vector[32]; } XKeymapEvent; typedef struct { int type; unsigned long serial; /* # of last request processed by server */ Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; |
︙ | ︙ | |||
1120 1121 1122 1123 1124 1125 1126 | XPointer client_data; XIMProc callback; } XIMCallback; typedef unsigned long XIMFeedback; #define XIMReverse 1 | | | | | | | | 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 | XPointer client_data; XIMProc callback; } XIMCallback; typedef unsigned long XIMFeedback; #define XIMReverse 1 #define XIMUnderline (1<<1) #define XIMHighlight (1<<2) #define XIMPrimary (1<<5) #define XIMSecondary (1<<6) #define XIMTertiary (1<<7) typedef struct _XIMText { unsigned short length; XIMFeedback *feedback; Bool encoding_is_wchar; union { char *multi_byte; wchar_t *wide_char; } string; } XIMText; typedef struct _XIMPreeditDrawCallbackStruct { int caret; /* Cursor offset within pre-edit string */ int chg_first; /* Starting change position */ int chg_length; /* Length of the change in character count */ XIMText *text; } XIMPreeditDrawCallbackStruct; typedef enum { XIMForwardChar, XIMBackwardChar, XIMForwardWord, XIMBackwardWord, XIMCaretUp, XIMCaretDown, XIMNextLine, XIMPreviousLine, XIMLineStart, XIMLineEnd, XIMAbsolutePosition, XIMDontChange } XIMCaretDirection; typedef enum { XIMIsInvisible, /* Disable caret feedback */ XIMIsPrimary, /* UI defined caret feedback */ XIMIsSecondary /* UI defined caret feedback */ } XIMCaretStyle; typedef struct _XIMPreeditCaretCallbackStruct { int position; /* Caret offset within pre-edit string */ XIMCaretDirection direction; /* Caret moves direction */ XIMCaretStyle style; /* Feedback of the caret */ } XIMPreeditCaretCallbackStruct; typedef enum { XIMTextType, XIMBitmapType } XIMStatusDataType; typedef struct _XIMStatusDrawCallbackStruct { XIMStatusDataType type; union { XIMText *text; Pixmap bitmap; } data; } XIMStatusDrawCallbackStruct; |
︙ | ︙ |
Changes to xlib/X11/Xutil.h.
1 2 3 4 5 6 7 8 | /* $XConsortium: Xutil.h,v 11.73 91/07/30 16:21:37 rws Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved | | | | | | | 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 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | /* $XConsortium: Xutil.h,v 11.73 91/07/30 16:21:37 rws Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ #ifndef _XUTIL_H_ #define _XUTIL_H_ /* You must include <X11/Xlib.h> before including this file */ #if defined(MAC_OSX_TK) # define Region XRegion #endif /* * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding * value (x, y, width, height) was found in the parsed string. */ #define NoValue 0x0000 #define XValue 0x0001 #define YValue 0x0002 #define WidthValue 0x0004 |
︙ | ︙ | |||
124 125 126 127 128 129 130 | #define DontCareState 0 /* don't know or care */ #define ZoomState 2 /* application wants to start zoomed */ #define InactiveState 4 /* application believes it is seldom used; */ /* some wm's may put it on inactive menu */ /* | | | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | #define DontCareState 0 /* don't know or care */ #define ZoomState 2 /* application wants to start zoomed */ #define InactiveState 4 /* application believes it is seldom used; */ /* some wm's may put it on inactive menu */ /* * new structure for manipulating TEXT properties; used with WM_NAME, * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND. */ typedef struct { unsigned char *value; /* same as Property routines */ Atom encoding; /* prop type */ int format; /* prop data format: 8, 16, or 32 */ unsigned long nitems; /* number of data items in value */ |
︙ | ︙ | |||
202 203 204 205 206 207 208 | (((unsigned)(keysym) >= XK_Select) && ((unsigned)(keysym) <= XK_Break)) #define IsModifierKey(keysym) \ ((((unsigned)(keysym) >= XK_Shift_L) && ((unsigned)(keysym) <= XK_Hyper_R)) \ || ((unsigned)(keysym) == XK_Mode_switch) \ || ((unsigned)(keysym) == XK_Num_Lock)) /* | | | | | | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 | (((unsigned)(keysym) >= XK_Select) && ((unsigned)(keysym) <= XK_Break)) #define IsModifierKey(keysym) \ ((((unsigned)(keysym) >= XK_Shift_L) && ((unsigned)(keysym) <= XK_Hyper_R)) \ || ((unsigned)(keysym) == XK_Mode_switch) \ || ((unsigned)(keysym) == XK_Num_Lock)) /* * opaque reference to Region data type */ typedef struct _XRegion *Region; /* Return values from XRectInRegion() */ #define RectangleOut 0 #define RectangleIn 1 #define RectanglePart 2 /* * Information used by the visual utility routines to find desired visual * type from the many visuals a display may support. */ typedef struct { |
︙ | ︙ | |||
431 432 433 434 435 436 437 | ); extern Status XGetStandardColormap( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | ); extern Status XGetStandardColormap( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, Atom /* property */ #endif ); extern Status XGetTextProperty( #if NeedFunctionPrototypes Display* /* display */, Window /* window */, |
︙ | ︙ | |||
456 457 458 459 460 461 462 | XTextProperty* /* text_prop_return */ #endif ); extern XWMHints *XGetWMHints( #if NeedFunctionPrototypes Display* /* display */, | | | 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | XTextProperty* /* text_prop_return */ #endif ); extern XWMHints *XGetWMHints( #if NeedFunctionPrototypes Display* /* display */, Window /* w */ #endif ); extern Status XGetWMIconName( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, |
︙ | ︙ | |||
481 482 483 484 485 486 487 | ); extern Status XGetWMNormalHints( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, | | | 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 | ); extern Status XGetWMNormalHints( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */ #endif ); extern Status XGetWMSizeHints( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, |
︙ | ︙ | |||
587 588 589 590 591 592 593 | ); extern void XSetIconSizes( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, XIconSize* /* size_list */, | | | 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 | ); extern void XSetIconSizes( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, XIconSize* /* size_list */, int /* count */ #endif ); extern void XSetNormalHints( #if NeedFunctionPrototypes Display* /* display */, Window /* w */, |
︙ | ︙ |
Changes to xlib/X11/keysym.h.
1 2 3 4 5 6 7 8 | /* $XConsortium: keysym.h,v 1.13 91/03/13 20:09:49 rws Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | /* $XConsortium: keysym.h,v 1.13 91/03/13 20:09:49 rws Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS |
︙ | ︙ |
Changes to xlib/xgc.c.
︙ | ︙ | |||
130 131 132 133 134 135 136 | } #define InitField(name,maskbit,default) \ (gp->name = (mask & (maskbit)) ? values->name : (default)) InitField(function, GCFunction, GXcopy); InitField(plane_mask, GCPlaneMask, (unsigned long)(~0)); | | | | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | } #define InitField(name,maskbit,default) \ (gp->name = (mask & (maskbit)) ? values->name : (default)) InitField(function, GCFunction, GXcopy); InitField(plane_mask, GCPlaneMask, (unsigned long)(~0)); InitField(foreground, GCForeground, BlackPixelOfScreen(DefaultScreenOfDisplay(display))); InitField(background, GCBackground, WhitePixelOfScreen(DefaultScreenOfDisplay(display))); InitField(line_width, GCLineWidth, 1); InitField(line_style, GCLineStyle, LineSolid); InitField(cap_style, GCCapStyle, 0); InitField(join_style, GCJoinStyle, 0); InitField(fill_style, GCFillStyle, FillSolid); InitField(fill_rule, GCFillRule, WindingRule); |
︙ | ︙ |