Commit e6491ef42fe0e2328f61f9b321f6426922162042 - tk8.6

+834

-155

ChangeLog less more

0		2008-10-10 Don Porter <dgp@users.sourceforge.net>
	0	2008-12-19 Don Porter <dgp@users.sourceforge.net>
	1
	2	* 8.6b1 TAGGED FOR RELEASE *
	3
	4	* changes: Updates for 8.6b1 release.
	5
	6	* tests/clrpick.test: Eliminate duplicate test names.
	7	* tests/embed.test:
	8	* tests/text.test:
	9	* tests/textMark.test:
	10
	11	* README: Bump version number to 8.6b1
	12	* generic/tk.h:
	13	* library/tk.tcl:
	14	* unix/configure.in:
	15	* unix/tk.spec:
	16	* win/configure.in:
	17
	18	* unix/configure: autoconf-2.59
	19	* win/configure:
	20
	21	2008-12-18 Don Porter <dgp@users.sourceforge.net>
	22
	23	* library/msgs/de.msg: Updated German messages. Thanks to Ruediger
	24	Haertel. [Patch 2442309].
	25
	26	2008-12-17 Jan Nijtmans <nijtmans@users.sf.net>
	27
	28	* generic/tk.h: VOID --> void
	29	* unix/tkUnixPort.h:
	30	* macosx/tkMacOSXPort.h:
	31
	32	2008-12-17 Donal K. Fellows <dkf@users.sf.net>
	33
	34	* doc/selection.n: Assorted small fixes. [Bugs 2441817,2441884]
	35
	36	2008-12-16 Jan Nijtmans <nijtmans@users.sf.net>
	37
	38	* win/tkWinDialog.c: Remove unused variables
	39
	40	2008-12-15 Don Porter <dgp@users.sourceforge.net>
	41
	42	TIP #338 IMPLEMENTATION
	43
	44	* doc/Tk_Main.c: Removed the last two '#include "tclInt.h"'.
	45	* generic/tkMain.c: Tk is now limited to Tcl's public interface.
	46	* macosx/tkMacOSXInit.c:
	47
	48	2008-12-12 Pat Thoyts <patthoyts@users.sourceforge.net>
	49
	50	* library/demos/fontchoose.tcl: Simple fontchooser demo
	51	* library/demos/widget:
	52
	53	2008-12-11 Jan Nijtmans <nijtmans@users.sf.net>
	54
	55	* generic/tk3d.c: Make error message from Tk_GetRelief the same as
	56	for Tk_GetReliefFromObj.
	57	* tests/canvas.test Adapt test cases for changed error message.
	58	* tests/scrollbar.test
	59	* tests/textTag.test
	60
	61	2008-12-11 Joe English <jenglish@users.sourceforge.net>
	62
	63	* library/demos/*.tcl: Omit contraindicated [package require Ttk].
	64	Remove logic that switches [ttk::scrollbar]s to [tk::scrollbar]s
	65	based on [tk windowingsystem]; this is already handled in
	66	library/ttk/scrollbar.tcl.
	67
	68	2008-12-10 Daniel Steffen <das@users.sourceforge.net>
	69
	70	TIP #324 IMPLEMENTATION
	71
	72	* generic/tkCmds.c: Implementation of [tk fontchooser] as
	73	* generic/tkInt.h: a Ttk dialog for X11 and as a native
	74	* win/tkWinDialog.c: platform dialog on Mac OS X & Windows.
	75	* win/tkWinInt.h: (thoyts, vetter, robert, steffen)
	76	* win/tkWinTest.c: [Patch 1477426]
	77	* win/tkWinX.c:
	78	* macosx/tkMacOSXCarbonEvents.c:
	79	* macosx/tkMacOSXDialog.c:
	80	* macosx/tkMacOSXEvent.c:
	81	* macosx/tkMacOSXEvent.h:
	82	* macosx/tkMacOSXFont.c:
	83	* macosx/tkMacOSXFont.h:
	84	* macosx/Wish.xcodeproj/project.pbxproj:
	85	* library/fontchooser.tcl (new):
	86	* library/tclIndex:
	87	* library/msgs/de.msg:
	88	* library/msgs/en.msg:
	89	* tests/fontchooser.test (new):
	90	* tests/winDialog.test:
	91	* doc/fontchooser.n (new):
	92	* doc/tk.n:
	93
	94	* library/console.tcl: Let user select console font via
	95	[tk fontchooser].
	96	* library/demos/text.tcl: Add [tk fontchooser] demo.
	97
	98	* generic/tkUtil.c: Add TkBackgroundEvalObjv() and
	99	TkSendVirtualEvent() utility functions
	100	(used by TIP #324 code).
	101
	102	* generic/tkInt.h: Turn [tk] into an ensemble.
	103	* generic/tkBusy.c: (thoyts, steffen)
	104	* generic/tkCmds.c:
	105	* generic/tkWindow.c:
	106
	107	* macosx/tkMacOSXInit.c (TkpInit): Unconditionally show Tk console
	108	if TK_CONSOLE env var is set.
	109
	110	2008-12-09 Don Porter <dgp@users.sourceforge.net>
	111
	112	TIP #337 IMPLEMENTATION
	113
	114	* generic/tkBind.c: Updated callers of Tcl_BackgroundError()
	115	* generic/tkCanvas.c: to use the new routine
	116	* generic/tkEntry.c: Tcl_BackgroundException() as appropriate.
	117	* generic/tkImgBmap.c:
	118	* generic/tkListbox.c:
	119	* generic/tkSelect.c:
	120	* generic/tkTextDisp.c:
	121	* generic/tkTextWind.c:
	122	* macosx/tkMacOSXHLEvents.c:
	123	* macosx/tkMacOSXMenu.c:
	124	* macosx/tkMacOSXMenus.c:
	125	* macosx/tkMacOSXScale.c:
	126	* macosx/tkMacOSXWindowEvent.c:
	127	* unix/tkUnixScale.c:
	128	* unix/tkUnixWm.c:
	129	* win/tkWinButton.c:
	130	* win/tkWinMenu.c:
	131	* win/tkWinScrlbr.c:
	132	* win/tkWinWm.c:
	133
	134	2008-12-07 Joe English <jenglish@users.sourceforge.net>
	135
	136	* macosx/ttkMacOSXTheme.c: Add native aqua elements for
	137	ttk::spinbox [Bug 2219588]
	138	* generic/ttk/ttkEntry.c, library/ttk/spinbox.tcl,
	139	* tests/ttk/spinbox.test: Moved most spinbox "business logic" out of
	140	ttkEntry.c into Tcl bindings.
	141	* library/ttk/clamTheme.tcl: Minor spinbox appearance improvements.
	142	* library/ttk/combobox.tcl, library/ttk/utils.tcl:
	143	Factor out ttk::bindMouseWheel procedure.
	144	* library/ttk/spinbox.tcl: Add cross-platform MouseWheel bindings.
	145
	146	2008-12-06 Donal K. Fellows <dkf@users.sf.net>
	147
	148	TIP #197 IMPLEMENTATION
	149
	150	* generic/tkText.c (insertUnfocussedStrings, optionSpecs):
	151	* generic/tkText.h (TkText, TkTextInsertUnfocussed):
	152	* doc/text.n, tests/text.test:
	153	Added definitions/tests/docs for "-insertunfocussed" field.
	154	* generic/tkTextMark.c (TkTextInsertDisplayProc):
	155	* generic/tkText.c (TextBlinkProc):
	156	Added user-controlledrendering of insertion cursor when focus is not
	157	in the text widget.
	158
	159	2008-12-05 Pat Thoyts <patthoyts@users.sourceforge.net>
	160
	161	* library/ttk/ttk.tcl: Added vista theme to iron out the visual
	162	* library/ttk/vistaTheme.tcl: differences between vista and XP.
	163	* library/ttk/xpTheme.tcl:
	164	* win/ttkWinXPTheme.c:
	165
	166	2008-12-05 Donal K. Fellows <dkf@users.sf.net>
	167
	168	* generic/tkCanvPs.c (Tk_PostscriptFont): Ensure that font sizes can
	169	ever be negative; it triggers a really strange case that is definitely
	170	not what is wanted. [Bug 2107938]
	171	* library/mkpsenc.tcl: Corrected and improved generation of postscript
	172	* library/prolog.ps: prolog. Removed prolog.ps, which wasn't used and
	173	was misleading.
	174
	175	2008-12-04 Jan Nijtmans <nijtmans@users.sf.net>
	176
	177	* generic/tkInt.decls: Move 10 functions from tkText.h to
	178	* generic/tkText.h: stub table [Feature Request 220906]
	179	* generic/tkStubInit.c (regenerated)
	180	* generic/tkIntDecls.h (regenerated)
	181
	182	2008-12-04 Donal K. Fellows <dkf@users.sf.net>
	183
	184	* doc/ttk_button.n, doc/ttk_checkbutton.n, doc/ttk_menubutton.n:
	185	* doc/ttk_radiobutton.n: Added mention of the Toolbutton style to all
	186	widgets that can sensibly make use of it.
	187
	188	2008-12-03 Joe English <jenglish@users.sourceforge.net>
	189
	190	* generic/ttk/ttkState.c, generic/ttk/ttkTheme.h,
	191	* generic/ttk/ttkWidget.c, doc/ttk_widget.n:
	192	Add new "hover" state (patch from Pat Thoyts; needed to support proper
	193	visual feedback on Vista).
	194
	195	2008-11-29 Pat Thoyts <patthoyts@users.sourceforge.net>
	196
	197	* library/ttk/altTheme.tcl: Use a styled frame around the popdown
	198	* library/ttk/clamTheme.tcl: listbox so we can adjust the border
	199	* library/ttk/classicTheme.tcl: for each theme as needed.
	200	* library/ttk/combobox.tcl:
	201	* library/ttk/defaults.tcl:
	202	* library/ttk/winTheme.tcl:
	203	* library/ttk/xpTheme.tcl:
	204	* tests/ttk/combobox.test:
	205
	206	2008-11-28 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
	207
	208	* generic/tkCanvUtil.c: Millimeter patch. Fixes [1813597,2218964]
	209	* generic/tkInt.h: by eliminating the functional redundancy
	210	* generic/tkObj.c: and unnecessary loss of precision of the
	211	* generic/tkText.c: {pixel,mm}ObjType tandem.
	212
	213	2008-11-27 Jan Nijtmans <nijtmans@users.sf.net>
	214
	215	* generic/tkCanvLine.c: Replace Tcl_SetResult(interp, NULL, ....)
	216	* generic/tkEntry.c: calls with Tcl_ResetResult(interp)
	217	* generic/tkMenu.c
	218	* generic/tkOldConfig.c
	219	* win/tkWinTest.c: Eliminate warning: unused variable 'tkwin'
	220
	221	2008-11-23 Pat Thoyts <patthoyts@users.sourceforge.net>
	222
	223	* generic/tkBind.c: [Bug 1389270] event generate silently ignored
	224	* generic/tkFocus.c: focus events. These can now be generated.
	225	* generic/tkGrab.c:
	226	* generic/tkInt.h:
	227	* tests/bind.test: Fixed some locale dependencies in various
	228	tests to reduce the noise on non-English windows systems.
	229
	230	2008-11-22 Donal K. Fellows <dkf@users.sf.net>
	231
	232	* library/demos/ctext.tcl: Extended to show off what you can do with
	233	angled text; there is now a pie selector to change the orientation.
	234
	235	2008-11-22 Pat Thoyts <patthoyts@users.sourceforge.net>
	236
	237	* library/ttk/combobox.tcl: [Bug 1939129,1991930] combobox dropdown
	238	was drawn behind topmost toplevels.
	239	* generic/tkCanvText.c: Fixed up complaints from MSVC engendered
	240	* generic/tkFont.c: by the last commit. In particular replaced
	241	* win/tkWinDraw.c: round() which is a C99 function.
	242	* win/tkWinFont.c:
	243
	244	2008-11-22 Donal K. Fellows <dkf@users.sf.net>
	245
	246	TIP #119 IMPLEMENTATION
	247
	248	* generic/tkCanvText.c: Added -angle configuration option to canvas
	249	* generic/tkFont.c: text items. This required reengineering the
	250	* library/prolog.ps: whole text rendering engine to be able to
	251	* macosx/tkMacOSXFont.c: handle an angle! No change to any external
	252	* unix/tkUnixFont.c: API. Note, this feature was originally
	253	* unix/tkUnixRFont.c: approved for Tk 8.5, but it has proved much
	254	* win/tkWinFont.c: harder to implement than originally
	255	* generic/tkInt.h: estimated. [Patch 1611359]
	256	* tests/canvText.test:
	257
	258	2008-11-22 Pat Thoyts <patthoyts@users.sourceforge.net>
	259
	260	* test/winDialog.test: Avoid some locale-dependent failures by using
	261	* win/tkWinTest.c: id's or an english constraint. [Bug 2307837]
	262
	263	2008-11-19 Joe English <jenglish@users.sourceforge.net>
	264
	265	* doc/ttk_panedwindow.n: Remove inoperative text stating that slave
	266	windows must be direct children of the master. [Bug 1824996]
	267
	268	2008-11-19 Jan Nijtmans <nijtmans@users.sf.net>
	269
	270	* generic/tkImgPhoto.c Minor simplification in fix for [Bug 2312027]
	271	no need to malloc and copy photo type name
	272	because it is a constant to begin with.
	273	* generic/tkOldConfig.c Convert Tcl_SetResult(......, TCL_DYNAMIC) to
	274	* mac/tkMacOSXWm.c Tcl_SetResult(......, TCL_VOLATILE), in
	275	* unix/tkUnixWm.c preparation for TIP #340
	276	* unix/tkUnixSend.c
	277	* win/tkWinWm.c
	278
	279	2008-11-16 Joe English <jenglish@users.sourceforge.net>
	280
	281	* generic/ttk/ttkWidget.c: Widget self-destruction is not necessarily
	282	an error. [Bug 2298720]
	283
	284	2008-11-16 Donal K. Fellows <dkf@users.sf.net>
	285
	286	* doc/wm.n: Added note about [wm overrideredirect] so that users will
	287	avoid making unwarranted assumptions about how magical it is.
	288	Triggered by [Bug 2282861] discussion.
	289
	290	2008-11-14 Pat Thoyts <patthoyts@users.sourceforge.net>
	291
	292	* generic/tk.h: The TIP 125 implementation permits the
	293	* generic/tkFrame.c: [wm manage] command to manage any widget but
	294	* macosx/tkMacOSXWm.c: only those with Frame instance data should be
	295	* unix/tkUnixWm.c: permitted. We now check for the suitability and
	296	* win/tkWinWm.c: raise an error for non-frame widgets. Updated
	297	* test/wm.test: the tests and documentation. See also [Bug
	298	* doc/wm.n: 2239034]
	299
	300	2008-11-12 Joe English <jenglish@users.sourceforge.net>
	301
	302	* generic/ttk/ttkWidget.c: Reworked widget construction and
	303	destruction sequence; fixes [Bug 2207435] and several other problems
	304	discovered during investigation of same.
	305	* generic/ttk/ttkButton.c (CheckbuttonInitialize): Account for
	306	initializeProc being called earlier in the construction sequence now.
	307	* tests/ttk/ttk.test: Updated test suite.
	308
	309	2008-11-12 Pat Thoyts <patthoyts@users.sourceforge.net>
	310
	311	* library/text.tcl: Handle windows with funky names by avoiding use of
	312	* test/text.test: the window path for anchors. [Bug 1777362]
	313
	314	2008-11-11 Jan Nijtmans <nijtmans@users.sf.net>
	315
	316	* generic/tkImgPhoto.c Fix [Bug 2265860] new test failures
	317
	318	2008-11-11 Joe English <jenglish@users.sourceforge.net>
	319
	320	* generic/ttk/ttkWidget.c(BeginDrawing): Don't crash when application
	321	uses nondefault visual. [Bug 2264732]
	322
	323	2008-11-11 Jan Nijtmans <nijtmans@users.sf.net>
	324
	325	* win/tcl.m4: Reverted change from 2008-11-06 (was under the
	326	impression that "-Wno-implicit-int" added an extra
	327	warning)
	328	* win/configure (regenerated)
	329	* unix/tcl.m4: Use -O2 as gcc optimization compiler flag, and get
	330	rid of -Wno-implicit-int for UNIX
	331	* unix/configure (regenerated)
	332
	333	* generic/tk.decls Modify Tk_Create(Old)ImageType signature,
	334	* generic/tk.h relaxing the constraint that every Tk_ImageType
	335	* generic/tkImage.c can only be passed to this function once. This
	336	* generic/tkImgBmap.c lets tkImg be loaded in multiple interpreters
	337	* generic/tkImgPhoto.c in a thread-enabled build of Tk. [Bug 2312027]
	338	* generic/tkTest.c This CONSTification complies with TIP #27. It
	339	* doc/CrtImgType.3 is binary compatible with the old interface,
	340	but not fully source compatible (although tkImg
	341	does not suffer).
	342	* generic/tkDecls.h (regenerated)
	343
	344	* POTENTIAL INCOMPATIBILITY *
	345
	346	2008-11-09 Joe English <jenglish@users.sourceforge.net>
	347
	348	* generic/ttk/ttkWidget.c: Remove unnecessary casts.
	349
	350	* generic/ttk/ttkWidget.h, generic/ttk/ttkWidget.c: Ttk widget
	351	initializeProc()s now return void instead of a status code, and are no
	352	longer allowed to fail. (Fix for [Bug 2207435] in progress).
	353
	354	* generic/ttk/ttkButton.c, generic/ttk/ttkEntry.c,
	355	* generic/ttk/ttkFrame.c, generic/ttk/ttkNotebook.c,
	356	* generic/ttk/ttkPanedwindow.c, generic/ttk/ttkProgress.c,
	357	* generic/ttk/ttkScale.c, generic/ttk/ttkScrollbar.c,
	358	* generic/ttk/ttkTreeview.c: Adjustments for the above.
	359
	360	2008-11-09 Jan Nijtmans <nijtmans@users.sf.net>
	361
	362	* generic/tkCanvas.c: Make all Tk_CustomOption tables const and
	363	* generic/tkCanvBmap.c: remove unnecessary type cast.
	364	* generic/tkCanvImg.c:
	365	* generic/tkCanvPoly.c:
	366	* generic/tkCanvText.c:
	367	* generic/tkCanvWind.c:
	368	* generic/tkRectOval.c:
	369	* generic/tkScrollbar.c:
	370	* generic/tk.decls: Two more (hopefully the last) signature
	371	* generic/tkInt.h: changes in Tk_CreateSmoothMethod and
	372	* generic/tkCanvLine.c: Tk_CreatePhotoImageFormat
	373	* generic/tkCanvUtil.c:
	374	* generic/tkImgPhoto.c:
	375	* generic/tkDecls.h: (regenerated)
	376	* doc/CrtImgType.3: doc updates
	377	* doc/CrtPhImgFmt.3:
	378
	379	2008-11-06 Jan Nijtmans <nijtmans@users.sf.net>
	380
	381	* win/tcl.m4: Add "-Wno-implicit-int" flag for gcc, as on UNIX
	382	* win/configure: (regenerated)
	383	* generic/default.h: Use tkUnixDefault.h under CygWin. With this
	384	change, at least the X11 version of Tk can be
	385	built with cygwin.
	386
	387	2008-11-06 Donal K. Fellows <dkf@users.sf.net>
	388
	389	* unix/configure.in: Work around the fact that the HP-UX system
	390	compiler cannot handle 'inline'. [Bug 2229999]
	391
	392	2008-11-05 Jan Nijtmans <nijtmans@users.sf.net>
	393
	394	* unix/tkUnixFont.c: Fix [Bug 2226093] const changes not all correct
	395	* unix/tkUnixButton.c: More internal -Wwrite-strings warning fixes
	396	* unix/tkUnixCursor.c:
	397	* unix/tkUnixSend.c:
	398	* unix/tkUnixRFont.c:
	399	* generic/tkInt.h: No need to use CONST in internal header files
	400	* generic/tkFont.h
	401	* generic/tkInt.decls: CONSTify string and fileName parameters of
	402	* generic/tkImgBmap.c: TkGetBitmapData
	403	* generic/tkBitmap.c: Remove unneccessary type cast
	404	* generic/tkIntDecls.h: (regenerated)
	405	* doc/GetCursor.3: Fix documentation about obsolete X10 bitmaps
	406	* doc/GetBitmap.3: [Bug 1866774] Remove X10 references from docs
	407
	408	2008-11-03 Jan Nijtmans <nijtmans@users.sf.net>
	409
	410	* generic/ttk/ttkEntry.c: Fix warning: unused variable `currentValue'
	411	* generic/tkOldTest.c: Fix warning: assignment discards qualifiers
	412	* win/tkWinTest.c: from pointer target type
	413
	414	2008-11-03 Pat Thoyts <patthoyts@users.sourceforge.net>
	415
	416	* tests/winClipboard.test: testclipboard no longer returns strings
	417	with embedded \r but now returns Tcl strings
	418	* tests/winfo.test: Fixed embedding test broken during upgrade
	419	* tests/busy.test: Default wait cursor on windows is 'wait'
	420	* win/tkWinFont.c: const fixes for the windows code.
	421
	422	2008-11-02 Jan Nijtmans <nijtmans@users.sf.net>
	423
	424	* generic/tkFont.h: More internal -Wwrite-strings warning fixes
	425	* generic/tkFont.c
	426	* generic/ttk/ttkTheme.h
	427	* generic/ttk/ttkDefaultTheme.c
	428	* generic/ttk/ttkState.c
	429	* macosx/tkMacOSXFont.c
	430	* unix/tkUnixFont.c
	431	* win/tkWinFont.c
	432
	433	2008-11-01 Donal K. Fellows <dkf@users.sf.net>
	434
	435	TIP #97 IMPLEMENTATION
	436
	437	* generic/tkCanvas.c (CanvasWidgetCmd): Implementation of the 'imove'
	438	and 'rchars' subcommands.
	439	* generic/tk.h (TK_MOVABLE_POINTS): New flag to allow items to state
	440	whether they support finding and moving individual coordinates.
	441	* doc/canvas.n, tests/canvas.test: Docs 'n' tests.
	442
	443	2008-11-01 Pat Thoyts <patthoyts@users.sourceforge.net>
	444
	445	* generic/ttk/ttkEntry.c: Implemented the themed spinbox
	446	* library/ttk/altTheme.tcl: widget.
	447	* library/ttk/clamTheme.tcl:
	448	* library/ttk/classicTheme.tcl:
	449	* library/ttk/defaults.tcl:
	450	* library/ttk/entry.tcl:
	451	* library/ttk/ttk.tcl:
	452	* library/ttk/winTheme.tcl:
	453	* library/ttk/xpTheme.tcl:
	454	* library/ttk/spinbox.tcl:
	455	* win/ttkWinTheme.c:
	456	* win/ttkWinXPTheme.c:
	457	* doc/ttk_spinbox.n:
	458	* tests/ttk/spinbox.test:
	459
	460	2008-10-31 Joe English <jenglish@users.sourceforge.net>
	461
	462	* generic/widget.c: Temporary workaround for [Bug 2207435]
	463
	464	2008-10-30 Jan Nijtmans <nijtmans@users.sf.net>
	465
	466	* generic/tkAtom.c: more internal -Wwrite-strings warning fixes
	467	* generic/tkBusy.c
	468	* generic/tkButton.c
	469	* generic/tkCanvPoly.c
	470	* generic/tkCanvText.c
	471	* generic/tkCmds.c
	472	* generic/tkListbox.c
	473	* generic/tkMenu.c
	474	* generic/tkOldConfig.c
	475	* generic/tkOption.c
	476	* generic/tkPanedWindow.c
	477	* generic/tkPlace.c
	478	* generic/tkScale.c
	479	* generic/tkTest.c
	480	* generic/tkText.c
	481	* generic/tkTextImage.c
	482
	483	2008-10-30 Don Porter <dgp@users.sourceforge.net>
	484
	485	* tests/unixSelect.test: Revise the unixSelect-1.* tests so that
	486	they test the ability of Tk's selection mechanism to faithfully pass
	487	valid Tcl values without corruption, and stop testing details of
	488	Tcl's internal encoding scheme. With this change, the Tk test suite
	489	no longer uses the identity encoding or [string bytelength].
	490
	491	2008-10-30 Jan Nijtmans <nijtmans@users.sf.net>
	492
	493	* generic/tk.h: CONSTify return value of
	494	* generic/tkInt.h Tk_OptionPrintProc, and customPtr
	495	* generic/tk.decls field of Tk_ConfigSpec.
	496	* generic/tkCanvArc.c See [Bug 2190619]: Warnings due to
	497	* generic/tkCanvLine.c Tk_SmoothMethod name constness change
	498	* generic/tkCanvUtil.c
	499	* generic/tkUtil.c
	500	* generic/tkDecls.h: (regenerated)
	501
	502	2008-10-29 Joe English <jenglish@users.sourceforge.net>
	503
	504	* generic/tkAtom.c(Tk_GetAtomName): Remove incorrect 'const' qualifier.
	505	Remove useless 'register' declarations too, while we're at it.
	506
	507	2008-10-28 Jan Nijtmans <nijtmans@users.sf.net>
	508
	509	* generic/tk.h: Add "const" to a few struct member fields.
	510	* generic/tkInt.h: CONSTify TkPrintPadAmount
	511	* generic/tkSelect.h: move TkSelGetSelection to tkInt.decls
	512	* generic/tk.decls: CONSTify Tk_ParseArgv
	513	* generic/tkInt.decls: CONSTify TkCreateFrame and TkCreateMainWindow
	514	* generic/tkDecls.h: (regenerated)
	515	* generic/tkIntDecls.h: (regenerated)
	516	* generic/tkArgv.c:
	517	* generic/tkAtom.c:
	518	* generic/tkEntry.c:
	519	* generic/tkFrame.c:
	520	* generic/tkImgPhoto.c:
	521	* generic/tkPack.c:
	522	* generic/tkSelect.c:
	523	* generic/tkVisual.c:
	524	* generic/tkWindow.c:
	525	* win/tkWinTest.c: fix compilation under mingw32
	526
	527	2008-10-28 Joe English <jenglish@users.sourceforge.net>
	528
	529	* library/ttk/cursors.tcl, library/ttk/combobox.tcl,
	530	library/ttk/entry.tcl, library/ttk/paned.tcl, library/ttk/sizegrip.tcl,
	531	library/treeview.tcl:
	532	Add correct platform-specific cursors for OSX [Bug 2054562]
	533	Expanded set of symbolic cursors. Use correct cursor for
	534	ttk::entry and ttk::combobox widgets [Bug 1534835]
	535
	536	2008-10-28 Don Porter <dgp@users.sourceforge.net>
	537
	538	* win/tkWinTest.c: Revise [testclipboard] to form that
	539	* tests/winClipboard.test: handles encodings. [Bug 2191960]
	540	* tests/constraints.tcl: [tcltest::bytestring] no longer used.
	541
	542	2008-10-24 Joe English <jenglish@users.sourceforge.net>
	543
	544	* tests/ttk/ttk.test: Disable test ttk-6.3, it's not applicable. [Bug
	545	2175411]
	546
	547	* generic/ttk/ttkTheme.c: Use different Tcl_AssocData key so the tile
	548	extension can be loaded into an 8.6 interp, in the off-chance that
	549	anyone wants to do this.
	550
	551	2008-10-24 Donal K. Fellows <dkf@users.sf.net>
	552
	553	* generic/tkCanvUtil.c (TkSmoothPrintProc): Corrected 'const'ness to
	554	quell warning. [Bug 2190619]
	555
	556	2008-10-23 Don Porter <dgp@users.sourceforge.net>
	557
	558	* README: Bump version number to 8.6a4
	559	* generic/tk.h:
	560	* library/tk.tcl:
	561	* unix/configure.in:
	562	* unix/tk.spec:
	563	* win/configure.in:
	564
	565	* unix/configure: autoconf-2.59
	566	* win/configure:
	567
	568	2008-10-22 Jan Nijtmans <nijtmans@users.sf.net>
	569
	570	* generic/tk.h: CONST -> const and white-spacing
	571	* generic/tk.decls
	572	* generic/tkInt.decls
	573	* generic/tkDecls.h: (regenerated)
	574	* generic/tkIntDecls.h: (regenerated)
	575	* generic/tkIntPlatDecls.h: (regenerated)
	576	* generic/tkIntXlibDecls.h: (regenerated)
	577	* generic/tkPlatDecls.h: (regenerated)
	578	* generic/ttk/tk.decls
	579	* generic/ttk/ttkDecls.h (regenerated)
	580	* generic/ttk/ttkGenStubs.tcl
	581
	582	2008-10-20 Donal K. Fellows <dkf@users.sf.net>
	583
	584	* generic/tkBusy.c, macosx/tkMacOSXEmbed.c, unix/tkUnixEmbed.c:
	585	* win/tkWinWindow.c: Factor out the platform-specific parts into the
	586	platform directories. [Bug 2180919]
	587
	588	2008-10-18 Donal K. Fellows <dkf@users.sf.net>
	589
	590	TIP #321 IMPLEMENTATION
	591
	592	* generic/tkBusy.c, doc/busy.n, tests/busy.test: Implementation of the
	593	[tk busy] command. [Patch 1997907]
	594
	595	2008-10-18 Pat Thoyts <patthoyts@users.sourceforge.net>
	596
	597	* win/tkWinFont.c: [Bug 1825353] To fix a problem with tiny fonts on
	598	Russian versions of Windows we will avoid removing the internal
	599	leading for fixed width fonts.
	600
	601	2008-10-15 Jan Nijtmans <nijtmans@users.sf.net>
	602
	603	* generic/tk.h: Add "const" to many internal const tables, so
	604	* generic/tkBind.c: those will be put by the C-compiler in the
	605	* generic/tkButton.c: TEXT segment instead of the DATA segment.
	606	* generic/tkCanvas.c: This makes those tables as being shareable in
	607	* generic/tkClipboard.c: shared libraries.
	608	* generic/tkCmds.c:
	609	* generic/tkConsole.c:
	610	* generic/tkEntry.c:
	611	* generic/tkFocus.c:
	612	* generic/tkFrame.c:
	613	* generic/tkGet.c:
	614	* generic/tkGrab.c:
	615	* generic/tkGrid.c:
	616	* generic/tkImage.c:
	617	* generic/tkImgBmap.c:
	618	* generic/tkImgGIF.c:
	619	* generic/tkImgPhoto.c:
	620	* generic/tkListbox.c:
	621	* generic/tkMenu.c:
	622	* generic/tkMenu.h:
	623	* generic/tkMenubutton.c:
	624	* generic/tkMessage.c:
	625	* generic/tkOption.c:
	626	* generic/tkPack.c:
	627	* generic/tkPanedWindow.c:
	628	* generic/tkPlace.c:
	629	* generic/tkScale.c:
	630	* generic/tkSelect.c:
	631	* generic/tkSquare.c:
	632	* generic/tkTest.c:
	633	* generic/tkText.c:
	634	* generic/tkTextDisp.c:
	635	* generic/tkTextMark.c:
	636	* generic/tkTextTag.c:
	637	* generic/tkTextWind.c:
	638	* macosx/tkMacOSXDialog.c:
	639	* macosx/tkMacOSXSend.c:
	640	* macosx/tkMacOSXWin.c:
	641	* unix/tkUnixFont.c:
	642	* unix/tkUnixWm.c:
	643	* win/tkWinButton.c:
	644	* win/tkWinColor.c:
	645	* win/tkWinDialog.c:
	646	* win/tkWinMenu.c:
	647	* win/tkWinSend.c:
	648	* win/tkWinWm.c:
	649	* xlib/xcolors.c:
	650
	651	2008-10-17 Pat Thoyts <patthoyts@users.sourceforge.net>
	652
	653	* library/ttk/scale.tcl: Implemented keyboard bindings for ttk::scale
	654
	655	2008-10-15 Jan Nijtmans <nijtmans@users.sf.net>
	656
	657	* generic/tkInt.h: Add "const" to many internal const tables, so
	658	* generic/tk3d.c: those will be put by the C-compiler in the
	659	* generic/tkBitmap.c: TEXT segment instead of the DATA segment.
	660	* generic/tkColor.c: This makes those tables as being shareable in
	661	* generic/tkConfig.c: shared libraries.
	662	* generic/tkCursor.c:
	663	* generic/tkFont.c:
	664	* generic/tkObj.c:
	665	* generic/tkStyle.c:
	666	* generic/tkTextIndex.c:
	667	* generic/tkUtil.c:
	668
	669	2008-10-14 Donal K. Fellows <dkf@users.sf.net>
	670
	671	* generic/tkObj.c (TkNewWindowObj): Added utility function for making
	672	a Tcl_Obj from a Tk_Window reference. Candidate for future exposure to
	673	third-party code I suppose, but useful internal to Tk for sure.
	674
	675	2008-10-11 Donal K. Fellows <donal.k.fellows@man.ac.uk>
	676
	677	* generic/tkCanvas.c (CanvasWidgetCmd): Corrected result generation.
	678
	679	2008-10-10 Don Porter <dgp@users.sourceforge.net>
1	680
2	681	* 8.6a3 TAGGED FOR RELEASE *
3	682
4	683	* changes: Updates for 8.6a3 release.
5	684
6		2008-10-09 Don Porter <dgp@users.sourceforge.net>
	685	2008-10-09 Don Porter <dgp@users.sourceforge.net>
7	686
8	687	* generic/tkListbox.c: Make literal return values consistent with
9	688	those generated by Tcl_PrintDouble().

14	693
15	694	2008-10-08 Jan Nijtmans <nijtmans@users.sf.net>
16	695
17		* unix/tcl.m4: fix for bug [2073255]
18		* unix/configure: regenerated
19
20		2008-10-08 Don Porter <dgp@users.sourceforge.net>
21
22		* tests/textDisp.test (textDisp-16.34): Update test that tested
23		string equality of double values based on an assumption of
24		tcl_precision==12. Test now does its own formatting.
25
26		* tests/scrollbar.test: Revised testing of the cget subcommand so
27		that it tests consistency with the configure subcommand and not
28		agreement with a hardcoded value that will change as tastes in
29		GUIs evolve.
30
31		* tests/canvText.test (canvText-17.1): Update expected result to
32		match revised PostScript output due to more predictable formatting
33		of floating point values.
	696	* unix/tcl.m4: Fix for bug [2073255]
	697	* unix/configure: regenerated
	698
	699	2008-10-08 Don Porter <dgp@users.sourceforge.net>
	700
	701	* tests/textDisp.test (textDisp-16.34): Update test that tested string
	702	equality of double values based on an assumption of tcl_precision==12.
	703	Test now does its own formatting.
	704
	705	* tests/scrollbar.test: Revised testing of the cget subcommand so that
	706	it tests consistency with the configure subcommand and not agreement
	707	with a hardcoded value that will change as tastes in GUIs evolve.
	708
	709	* tests/canvText.test (canvText-17.1): Update expected result to match
	710	revised PostScript output due to more predictable formatting of
	711	floating point values.
34	712
35	713	* unix/tkUnixWm.c: Restored consistency of error messages from
36	714	* macosx/tkMacOSXWm.c: [wm iconphoto] with the test suite and across
37		* tests/unixWm.test: all platforms. [Bug 2021443]
38
39		2008-10-07 Pat Thoyts <patthoyts@users.sourceforge.net>
	715	* tests/unixWm.test: all platforms. [Bug 2021443]
	716
	717	2008-10-07 Pat Thoyts <patthoyts@users.sourceforge.net>
40	718
41	719	* tests/canvImg.test: Removed dependency on precision in results
42	720	* tests/canvRect.test:
43		* tests/canvText.test:
44		* tests/entry.test:
45		* tests/listbox.test:
46		* tests/scrollbar.test:
	721	* tests/canvText.test:
	722	* tests/entry.test:
	723	* tests/listbox.test:
	724	* tests/scrollbar.test:
47	725	* tests/spinbox.test:
48	726	* tests/winWm.test: Fixed incorrect error strings
49		* tests/wm.test:
50
51		2008-10-06 Pat Thoyts <patthoyts@users.sourceforge.net>
	727	* tests/wm.test:
	728
	729	2008-10-06 Pat Thoyts <patthoyts@users.sourceforge.net>
52	730
53	731	* tests/winDialog.test: Fixed tests for Vista+
54	732	* win/tkWinWm.c: corrected some errors from the previous commit

56	734	2008-10-05 Donal K. Fellows <dkf@users.sf.net>
57	735
58	736	* win/tkWinWm.c (WmAttributesCmd, WmOverrideredirectCmd)
59		(WmStackorderCmd):
60		* win/tkWinSendCom.c (Async):
61		* win/tkWinSend.c (Tk_SendObjCmd):
62		* win/tkWinFont.c (TkpGetFontFamilies, TkpGetSubFonts):
63		* unix/tkUnixWm.c (WmOverrideredirectCmd, WmStackorderCmd):
64		* unix/tkUnixFont.c (TkpGetFontFamilies, TkpGetSubFonts):
65		* macosx/tkMacOSXWm.c (WmOverrideredirectCmd, WmStackorderCmd):
66		* generic/tkTextIndex.c (SetTextIndexFromAny):
67		* generic/tkTest.c (TrivialConfigObjCmd):
68		* generic/tkSelect.c (HandleTclCommand):
	737	(WmStackorderCmd):
	738	* win/tkWinSendCom.c (Async):
	739	* win/tkWinSend.c (Tk_SendObjCmd):
	740	* win/tkWinFont.c (TkpGetFontFamilies, TkpGetSubFonts):
	741	* unix/tkUnixWm.c (WmOverrideredirectCmd, WmStackorderCmd):
	742	* unix/tkUnixFont.c (TkpGetFontFamilies, TkpGetSubFonts):
	743	* macosx/tkMacOSXWm.c (WmOverrideredirectCmd, WmStackorderCmd):
	744	* generic/tkTextIndex.c (SetTextIndexFromAny):
	745	* generic/tkTest.c (TrivialConfigObjCmd):
	746	* generic/tkSelect.c (HandleTclCommand):
69	747	* generic/tkPanedWindow.c (Tk_PanedWindowObjCmd)
70		(PanedWindowSashCommand, PanedWindowProxyCommand):
71		* generic/tkMenubutton.c (Tk_MenubuttonObjCmd):
72		* generic/tkMenu.c (MenuWidgetObjCmd):
73		* generic/tkListbox.c (ListboxWidgetObjCmd):
	748	(PanedWindowSashCommand, PanedWindowProxyCommand):
	749	* generic/tkMenubutton.c (Tk_MenubuttonObjCmd):
	750	* generic/tkMenu.c (MenuWidgetObjCmd):
	751	* generic/tkListbox.c (ListboxWidgetObjCmd):
74	752	* generic/tkImgPhoto.c (ImgPhotoCmd): (mostly)
75		* generic/tkImage.c (Tk_ImageObjCmd):
76		* generic/tkFont.c (Tk_FontObjCmd, GetAttributeInfoObj):
77		* generic/tkEntry.c (EntryWidgetObjCmd, SpinboxWidgetObjCmd):
78		* generic/tkConfig.c (SetOptionFromAny, Tk_SetOptions):
79		* generic/tkCmds.c (Tk_TkObjCmd, Tk_WinfoObjCmd, TkGetDisplayOf):
	753	* generic/tkImage.c (Tk_ImageObjCmd):
	754	* generic/tkFont.c (Tk_FontObjCmd, GetAttributeInfoObj):
	755	* generic/tkEntry.c (EntryWidgetObjCmd, SpinboxWidgetObjCmd):
	756	* generic/tkConfig.c (SetOptionFromAny, Tk_SetOptions):
	757	* generic/tkCmds.c (Tk_TkObjCmd, Tk_WinfoObjCmd, TkGetDisplayOf):
80	758	* generic/tkButton.c (ButtonCreate): Get rid of code that insists on
81	759	non-idiomatically writing to the object in the interpreter result.
82	760

118	796
119	797	* doc/menu.n: Fix typo in docs. [Bug 2098425]
120	798
121		2008-09-03 Don Porter <dgp@users.sourceforge.net>
	799	2008-09-03 Don Porter <dgp@users.sourceforge.net>
122	800
123	801	* generic/tk.h: Dropped use of _ANSI_ARGS_ macro to preserve
124	802	* generic/tkSelect.h: Tk's TCL_NO_DEPRECATED build.

139	817	* tests/winMsbox.test:
140	818	* tests/winWm.test:
141	819
142		2008-08-28 Don Porter <dgp@users.sourceforge.net>
143
144		* unix/tkConfig.sh.in: Added @XFT_LIBS@ to the definition of TK_LIBS
	820	2008-08-28 Don Porter <dgp@users.sourceforge.net>
	821
	822	* unix/tkConfig.sh.in: Added @XFT_LIBS@ to the definition of TK_LIBS
145	823	to avoid link failures when a "big wish" program links against a
146	824	--disable-shared build of libtk. (Discovered building expectTk.)
147	825

216	894	the interaction with the script level) and the photo instances (which
217	895	handle display).
218	896
219		2008-08-22 Don Porter <dgp@users.sourceforge.net>
	897	2008-08-22 Don Porter <dgp@users.sourceforge.net>
220	898
221	899	* 8.6a2 TAGGED FOR RELEASE *
222	900

262	940	* win/tkWinWindow.c: Remove TkpWindowWasRecentlyDeleted.
263	941	* tests/id.test: Remove this unnecessary test.
264	942
265		2008-08-19 Joe English <jenglish@users.sourceforge.net>
	943	2008-08-19 Joe English <jenglish@users.sourceforge.net>
266	944
267	945	* generic/ttk/ttkScroll.c: Don't use sprintf "%g" to format floating
268	946	point numbers in -[xy]scrollcommand callbacks or [xy]view methods.

315	993
316	994	2008-08-14 Daniel Steffen <das@users.sourceforge.net>
317	995
318		* unix/tcl.m4 (SC_PATH_X): check for libX11.dylib in addition to
	996	* unix/tcl.m4 (SC_PATH_X): Check for libX11.dylib in addition to
319	997	libX11.so et al.
320	998
321		* unix/configure: autoconf-2.59
	999	* unix/configure: autoconf-2.59
322	1000
323	1001	2008-08-12 Ania Pawelczyk <aniap@users.sourceforge.net>
324	1002

327	1005	* tests/embed.test:
328	1006	* tests/main.test:
329	1007
330		2008-08-12 Don Porter <dgp@users.sourceforge.net>
	1008	2008-08-12 Don Porter <dgp@users.sourceforge.net>
331	1009
332	1010	* README: Bump version number to 8.6a2
333	1011	* generic/tk.h:

354	1032	* tests/config.test:
355	1033	* tests/canvas.test:
356	1034
357		2008-08-05 Joe English <jenglish@users.sourceforge.net>
	1035	2008-08-05 Joe English <jenglish@users.sourceforge.net>
358	1036
359	1037	* generic/tk.h, generic/tkEvent.c: Fix for [Bug 2010422] "no event
360	1038	type or button # or keysym while executing "bind Listbox

367	1045	* tests/get.test:
368	1046	* tests/text.test: Update to tcltest2; report: 33.11 fails
369	1047
370		2008-08-01 Pat Thoyts <patthoyts@users.sourceforge.net>
	1048	2008-08-01 Pat Thoyts <patthoyts@users.sourceforge.net>
371	1049
372	1050	* win/tkWinWm.c: Check wmPtr is valid in TopLevelReqProc to fix
373	1051	* tests/wm.test: [Bug 2028703]
374	1052
375		2008-07-31 Don Porter <dgp@users.sourceforge.net>
	1053	2008-07-31 Don Porter <dgp@users.sourceforge.net>
376	1054
377	1055	* generic/tk.h: Added missing EXTERN for the Tcl_PkgInitStubsCheck
378	1056	declaration to fix inability to embed non-stub-enabled Tk on Windows.

387	1065	* tests/cursor.test: Update to tcltest2
388	1066	* tests/message.test:
389	1067
390		2008-07-26 Pat Thoyts <patthoyts@users.sourceforge.net>
	1068	2008-07-26 Pat Thoyts <patthoyts@users.sourceforge.net>
391	1069
392	1070	* doc/options.n: Direct to the font manual for -font. [Bug 1686012]
393	1071
394	1072	* tests/constraints.tcl: Add a nonwin contraint.
395		* tests/listbox.test: Conform to testing policy. [Bug 2024753]
	1073	* tests/listbox.test: Conform to testing policy. [Bug 2024753]
396	1074
397	1075	* win/tkWinWm.c: Check that the parent has been mapped before
398	1076	* tests/wm.test: calling RemapWindows. [Bug 2009788]

405	1083
406	1084	2008-07-24 Jan Nijtmans <nijtmans@users.sf.net>
407	1085
408		* generic/*.c: fix inconsistant "wrong # args" messages. [Bug 2021443]
	1086	* generic/*.c: Fix inconsistant "wrong # args" messages. [Bug 2021443]
409	1087	* macosx/tkMacOSXSend.c
410	1088	* macosx/tkMacOSXWm.c
411	1089	* unix/tkUnixSend.c

427	1105	* library/ttk/aquaTheme.tcl: Use system color names and TIP145 named
428	1106	font instead of hardcoded color values and deprecated native font name
429	1107
430		* macosx/tkMacOSXHLEvents.c: factor out common code; formatting.
431
432		2008-07-08 Pat Thoyts <patthoyts@users.sourceforge.net>
	1108	* macosx/tkMacOSXHLEvents.c: Factor out common code; formatting.
	1109
	1110	2008-07-08 Pat Thoyts <patthoyts@users.sourceforge.net>
433	1111
434	1112	* doc/*.n: Fixed broken line endings from last doc commit.
435	1113
436		2008-07-04 Joe English <jenglish@users.sourceforge.net>
	1114	2008-07-04 Joe English <jenglish@users.sourceforge.net>
437	1115
438	1116	* generic/ttk/ttkDefaultTheme.c, generic/ttk/ttkClamTheme.c,
439	1117	* generic/ttk/ttkClassicTheme.c, generic/ttk/ttkElements.c: Audit:

450	1128	* doc/.1, doc/.3, doc/*.n: Remove out of date changebars, make
451	1129	formatting of typedefs consistent, other small changes.
452	1130
453		2008-06-25 Don Porter <dgp@users.sourceforge.net>
	1131	2008-06-25 Don Porter <dgp@users.sourceforge.net>
454	1132
455	1133	* 8.6a1 TAGGED FOR RELEASE *
456	1134
457	1135	* changes: Updates for 8.6a1 release.
458	1136
459		2008-06-24 Pat Thoyts <patthoyts@users.sourceforge.net>
	1137	2008-06-24 Pat Thoyts <patthoyts@users.sourceforge.net>
460	1138
461	1139	* library/demos/ttkpane.tcl: Work around missing timezones
462	1140	* doc/text.n: Fix documentation of text tag options. [Bug 1997293]
463	1141
464		2008-06-19 Don Porter <dgp@users.sourceforge.net>
	1142	2008-06-19 Don Porter <dgp@users.sourceforge.net>
465	1143
466	1144	* changes: Updates for 8.6a1 release.
467	1145

505	1183	incorrect conversion to points of font sizes already in points; factor
506	1184	out retrieval of font family name from font family ID.
507	1185
508		2008-06-13 Jeff Hobbs <jeffh@ActiveState.com>
	1186	2008-06-13 Jeff Hobbs <jeffh@ActiveState.com>
509	1187
510	1188	* win/configure, win/configure.in (TK_WIN_VERSION): Fix handling of
511	1189	interim a/b versioning for manifest usage.

521	1199
522	1200	2008-06-12 Daniel Steffen <das@users.sourceforge.net>
523	1201
524		* generic/tkPointer.c (Tk_UpdatePointer): fix failure to restore a
	1202	* generic/tkPointer.c (Tk_UpdatePointer): Fix failure to restore a
525	1203	global grab capture and to release the restrict window capture when
526	1204	releasing a button grab. Fixes segfault due to dangling reference to
527	1205	restrict window inside TkpSetCapture() implementation. [Bug 1991932]
528	1206
529		* generic/ttk/ttkTreeview.c: fix warning.
530
531		* unix/tcl.m4 (SunOS-5.11): fix 64bit amd64 support with gcc & Sun cc.
	1207	* generic/ttk/ttkTreeview.c: Fix warning.
	1208
	1209	* unix/tcl.m4 (SunOS-5.11): Fix 64bit amd64 support with gcc & Sun cc.
532	1210	* unix/configure: autoconf-2.59
533	1211
534		* macosx/tkMacOSXXStubs.c (Tk_ResetUserInactiveTime): use UsrActivity
	1212	* macosx/tkMacOSXXStubs.c (Tk_ResetUserInactiveTime): Use UsrActivity
535	1213	instead of OverallAct (which may be ignored in some circumstances).
536	1214
537		* macosx/Wish.xcodeproj/project.pbxproj: add tclIORTrans.c; add tclOO
	1215	* macosx/Wish.xcodeproj/project.pbxproj: Add tclIORTrans.c; add tclOO
538	1216	* macosx/Wish.xcodeproj/default.pbxuser: files to tktest-X11 target;
539	1217	add debug configs for 64bit and with corefoundation disabled; updates
540	1218	and cleanup for Xcode 3.1 and for Leopard; sync with Tcl.xcodeproj.
541		* macosx/Wish.xcode/project.pbxproj: sync Wish.xcodeproj changes.
	1219	* macosx/Wish.xcode/project.pbxproj: Sync Wish.xcodeproj changes.
542	1220	* macosx/Wish.xcode/default.pbxuser:
543		* macosx/README: document new build configs.
544
545		2008-06-10 Joe English <jenglish@users.sourceforge.net>
	1221	* macosx/README: Document new build configs.
	1222
	1223	2008-06-10 Joe English <jenglish@users.sourceforge.net>
546	1224
547	1225	* unix/tkUnixKey.c: Use Xutf8LookupString if available. This should
548	1226	fix problems (like [Bug 1908443]) where Xlib's idea of the system

554	1232	* macosx/README: debug configs with gcov;
555	1233	update to Xcode 3.1.
556	1234
557		2008-05-27 Pat Thoyts <patthoyts@users.sourceforge.net>
	1235	2008-05-27 Pat Thoyts <patthoyts@users.sourceforge.net>
558	1236
559	1237	* generic/ttk/ttkTheme.c: [ttk::style theme use] without an argument
560	1238	* doc/ttk_style.n: now returns the current theme.
561	1239
562		2008-05-23 Joe English <jenglish@users.sourceforge.net>
	1240	2008-05-23 Joe English <jenglish@users.sourceforge.net>
563	1241
564	1242	* doc/ttk_treeview.n, generic/ttk/ttkTreeview.c,
565	1243	* generic/ttk/ttkTagSet.c, generic/ttk/ttkLayout.c,

577	1255	Don't need separate 'Item', 'Cell', and 'Row' style settings anymore,
578	1256	only the base "Treeview" style is used.
579	1257
580		2008-05-23 Joe English <jenglish@users.sourceforge.net>
	1258	2008-05-23 Joe English <jenglish@users.sourceforge.net>
581	1259
582	1260	* generic/ttk/ttkLabel.c: Avoid passing width or height <= 0 to
583	1261	Tk_RedrawImage, as this leads to a panic on Windows. [Bug 1967576]
584	1262
585		2008-05-16 Pat Thoyts <patthoyts@users.sourceforge.net>
	1263	2008-05-16 Pat Thoyts <patthoyts@users.sourceforge.net>
586	1264
587	1265	* library/ttk/xpTheme.tcl: Add correct border to combobox on Vista
588	1266
589		2008-05-15 Pat Thoyts <patthoyts@users.sourceforge.net>
	1267	2008-05-15 Pat Thoyts <patthoyts@users.sourceforge.net>
590	1268
591	1269	* win/makefile.vc: We should use the thread allocator for threaded
592	1270	* win/rules.vc: builds. Added 'tclalloc' option to disable.

597	1275	(DisplayPanedWindow): Ensure that a zero width never gets fed to the
598	1276	underlying window system. [Bug 1639824]
599	1277
600		2008-05-13 Pat Thoyts <patthoyts@users.sourceforge.net>
	1278	2008-05-13 Pat Thoyts <patthoyts@users.sourceforge.net>
601	1279
602	1280	* library/console.tcl: Support pixel sized font in +/- keybinding.
603	1281	* tests/listbox.test: -activestyle default is underline on windows.
604	1282	* tests/winDialog.test: Fixed hanging tk_chooseColor tests.
605	1283
606		2008-05-11 Pat Thoyts <patthoyts@users.sourceforge.net>
	1284	2008-05-11 Pat Thoyts <patthoyts@users.sourceforge.net>
607	1285
608	1286	* library/tk.tcl: Support for ttk widgets in AmpWidget
609	1287	* doc/button.n: Note negative widths for button. [Patch 1883418]
610	1288
611		2008-05-09 Pat Thoyts <patthoyts@users.sourceforge.net>
	1289	2008-05-09 Pat Thoyts <patthoyts@users.sourceforge.net>
612	1290
613	1291	* doc/ttk_*: 'identify' widget command is on all ttk widgets.
614	1292
615		2008-05-04 Joe English <jenglish@users.sourceforge.net>
	1293	2008-05-04 Joe English <jenglish@users.sourceforge.net>
616	1294
617	1295	* macosx/ttkMacOSAquaTheme.c: "default" and "focus" adornments should
618	1296	not be disjoint [Bug 1942785]

625	1303	files allow building things that link against Tcl with really ancient
626	1304	compilers still; the requirement is just when building Tcl itself.)
627	1305
628		2008-04-25 Joe English <jenglish@users.sourceforge.net>
	1306	2008-04-25 Joe English <jenglish@users.sourceforge.net>
629	1307
630	1308	* library/ttk/treeview.tcl: BUGFIX: [$tv selection] takes a list of
631	1309	items, not a single item. [Bug 1951733]
632	1310
633		2008-04-20 Pat Thoyts <patthoyts@users.sourceforge.net>
	1311	2008-04-20 Pat Thoyts <patthoyts@users.sourceforge.net>
634	1312
635	1313	* win/makefile.vc: Include ws2_32 in the link list. [Bug 1900872]
636	1314	* doc/menu.n: Minor change regarding the system menu. [Bug 1887169]

641	1319	* doc/text.n: Correct description of when -relief option is ignored on
642	1320	a tag. Thanks to emiliano for spotting.
643	1321
644		2008-04-17 Don Porter <dgp@users.sourceforge.net>
	1322	2008-04-17 Don Porter <dgp@users.sourceforge.net>
645	1323
646	1324	* generic/tkCanvas.c: Fix logic that determines when canvas item
647	1325	<Enter> event should fire. Thanks to Sebastian Wangnick. [Bug 1327482]

652	1330	* generic/tkWindow.c (Initialize): and export only a module-scope
653	1331	pointer to to the main stubs table (for package init). [Patch 1938497]
654	1332
655		2008-04-14 Pat Thoyts <patthoyts@users.sourceforge.net>
	1333	2008-04-14 Pat Thoyts <patthoyts@users.sourceforge.net>
656	1334
657	1335	* win/tkWinDialog.c: Fix [tk_chooseColor -title]. [Bug 1941740]
658	1336	* win/tkWinTest.c: Added parent to testgetwininfo

662	1340
663	1341	* generic/tkImgGIF.c: Let the GIF writer use a real LZW compressor.
664	1342
665		2008-04-08 Pat Thoyts <patthoyts@users.sourceforge.net>
666
667		* win/ttkWinXpTheme.c: Provide a visual-styles API element engine
	1343	2008-04-08 Pat Thoyts <patthoyts@users.sourceforge.net>
	1344
	1345	* win/ttkWinXpTheme.c: Provide a visual-styles API element engine
668	1346	* tests/ttk/vsapi.test: to permit scripts to create any available
669	1347	* doc/ttk_vsapi.n: windows xp/vista element. Plus basic tests.
670	1348

676	1354	* generic/tkIntXlibDecls.h:
677	1355	* generic/tkPlatDecls.h:
678	1356
679		2008-04-08 Kevin Kenny <kennykb@acm.org>
680
681		* tkWinEmbed.c: Removed #if 0 code. Trust the revision control system,
682		if you need it again, you can find it.
683
684		* tkWinSend.c: Added conditional compilation to silence several
685		compiler warnings.
686
687		2008-04-07 Jeff Hobbs <jeffh@ActiveState.com>
	1357	2008-04-08 Kevin Kenny <kennykb@acm.org>
	1358
	1359	* tkWinEmbed.c: Removed #if 0 code. Trust the revision control
	1360	system, if you need it again, you can find it.
	1361
	1362	* tkWinSend.c: Added conditional compilation to silence several
	1363	compiler warnings.
	1364
	1365	2008-04-07 Jeff Hobbs <jeffh@ActiveState.com>
688	1366
689	1367	* generic/tkWindow.c (Initialize): Fix double-free on Tk_ParseArgv
690	1368	* tests/main.test (main-3.*): error. [Bug 1937135]
691	1369
692		* generic/tkArgv.c: fix -help mem explosion. [Bug 1936238] (kenny)
693
694		2008-04-04 Pat Thoyts <patthoyts@users.sourceforge.net>
	1370	* generic/tkArgv.c: Fix -help mem explosion. [Bug 1936238] (kenny)
	1371
	1372	2008-04-04 Pat Thoyts <patthoyts@users.sourceforge.net>
695	1373
696	1374	* library/ttk/sizegrip.tcl: Don't resize if the toplevel is not
697	1375	resizable or the sizegrip has been disabled.
698	1376
699		2008-04-03 Pat Thoyts <patthoyts@users.sourceforge.net>
	1377	2008-04-03 Pat Thoyts <patthoyts@users.sourceforge.net>
700	1378
701	1379	* win/makefile.vc: Fixed stubs usage
702	1380	* library/ttk/xpTheme.tcl: fix the colour of labelframe in xp

726	1404
727	1405	* unix/configure: autoconf-2.59
728	1406
729		2008-04-01 Don Porter <dgp@users.sourceforge.net>
	1407	2008-04-01 Don Porter <dgp@users.sourceforge.net>
730	1408
731	1409	* generic/tkStubLib.c (Tk_InitStubs): Added missing error
732	1410	* generic/tkWindow.c (Tk_PkgInitStubsCheck): message and removed

761	1439	* generic/tkIntXlibDecls.h:
762	1440	* generic/tkPlatDecls.h:
763	1441
764		2008-03-28 Don Porter <dgp@users.sourceforge.net>
	1442	2008-03-28 Don Porter <dgp@users.sourceforge.net>
765	1443
766	1444	* 8.5.2 TAGGED FOR RELEASE *
767	1445

777	1455
778	1456	* changes: Updates for 8.5.2 release.
779	1457
780		2008-03-27 Jeff Hobbs <jeffh@ActiveState.com>
781
782		* library/safetk.tcl (::safe::tkInterpInit): make sure tk_library and
	1458	2008-03-27 Jeff Hobbs <jeffh@ActiveState.com>
	1459
	1460	* library/safetk.tcl (::safe::tkInterpInit): Make sure tk_library and
783	1461	its subdirs (eg, ttk) are on the "safe" access path.
784	1462
785	1463	2008-03-27 Daniel Steffen <das@users.sourceforge.net>
786	1464
787		* unix/tcl.m4 (SunOS-5.1x): fix 64bit support for Sun cc. [Bug 1921166]
	1465	* unix/tcl.m4 (SunOS-5.1x): Fix 64bit support for Sun cc. [Bug
	1466	1921166]
788	1467
789	1468	* unix/configure: autoconf-2.59
790	1469

795	1474	* generic/ttk/ttkDecls.h: Fix incorrect number of arguments in
796	1475	Ttk_InitStubs macro definition.
797	1476
798		2008-03-26 Don Porter <dgp@users.sourceforge.net>
	1477	2008-03-26 Don Porter <dgp@users.sourceforge.net>
799	1478
800	1479	* changes: Updates for 8.5.2 release.
801	1480
802	1481	* unix/tkUnixCursor.c: Stop crash in [. configure -cursor] on X11.
803	1482	Thanks to emiliano gavilán. [Bug 1922466]
804	1483
805		2008-03-26 Joe English <jenglish@users.sourceforge.net>
	1484	2008-03-26 Joe English <jenglish@users.sourceforge.net>
806	1485
807	1486	* generic/tkInt.h, generic/tkEvent.c, unix/tkUnixEvent.c,
808	1487	* unix/tkUnixKey.c: XIM reorganization and cleanup; see
809	1488	[Patch 1919791] for details.
810	1489
811		2008-03-21 Joe English <jenglish@users.sourceforge.net>
	1490	2008-03-21 Joe English <jenglish@users.sourceforge.net>
812	1491
813	1492	* generic/tk.decls, generic/ttk/ttkStubLib.c, unix/Makefile.in: Keep
814	1493	ttkStubLib.o in libtkstub instead of libtk. [Bug 1920030]

823	1502
824	1503	* doc/GetClrmap.3: Documented Tk_PreserveColormap. [Bug 220809]
825	1504
826		2008-03-17 Joe English <jenglish@users.sourceforge.net>
	1505	2008-03-17 Joe English <jenglish@users.sourceforge.net>
827	1506
828	1507	* unix/Makefile.in, win/Makefile.in, win/makefile.vc: Put ttkStubLib.o
829	1508	in libtkstub instead of libtk. [Bug 1863007]

835	1514
836	1515	2008-03-13 Daniel Steffen <das@users.sourceforge.net>
837	1516
838		* unix/configure.in: Use backslash-quoting instead of double-quoting
839		* unix/tcl.m4: for lib paths in tkConfig.sh. [Bug 1913622]
840		* unix/configure: autoconf-2.59
841
842		2008-03-13 Don Porter <dgp@users.sourceforge.net>
	1517	* unix/configure.in: Use backslash-quoting instead of double-quoting
	1518	* unix/tcl.m4: for lib paths in tkConfig.sh. [Bug 1913622]
	1519	* unix/configure: autoconf-2.59
	1520
	1521	2008-03-13 Don Porter <dgp@users.sourceforge.net>
843	1522
844	1523	* changes: Updates for 8.5.2 release.
845	1524

849	1528	* macosx/Wish.xcodeproj/default.pbxuser: CODE_SIGN_IDENTITY and
850	1529	* macosx/Wish-Common.xcconfig: 'xcodebuild install'.
851	1530
852		2008-03-12 Joe English <jenglish@users.sourceforge.net>
	1531	2008-03-12 Joe English <jenglish@users.sourceforge.net>
853	1532
854	1533	* unix/tkUnixRFont.c: Try a fallback font if XftFontOpenPattern()
855	1534	fails in GetFont (workaround for [Bug 1090382]).

877	1556	* unix/Makefile.in (install-strip): Strip non-global symbols from
878	1557	dynamic library.
879	1558
880		2008-03-10 Don Porter <dgp@users.sourceforge.net>
	1559	2008-03-10 Don Porter <dgp@users.sourceforge.net>
881	1560
882	1561	* changes: Updates for 8.5.2 release.
883	1562

885	1564
886	1565	* doc/colors.n: Reworked to produce nicer HTML output.
887	1566
888		2008-03-06 Joe English <jenglish@users.sourceforge.net>
	1567	2008-03-06 Joe English <jenglish@users.sourceforge.net>
889	1568
890	1569	* doc/ttk_notebook.n: Move "TAB IDENTIFIERS" section above "WIDGET
891	1570	COMMAND" section. [Bug 1882011]
892	1571
893		2008-02-29 Pat Thoyts <patthoyts@users.sourceforge.net>
894
895		* library/demos/widget: Added a Knight's tour canvas demo.
	1572	2008-02-29 Pat Thoyts <patthoyts@users.sourceforge.net>
	1573
	1574	* library/demos/widget: Added a Knight's tour canvas demo.
896	1575	* library/demos/knightstour.tcl:
897	1576
898	1577	2008-02-27 Daniel Steffen <das@users.sourceforge.net>
899	1578
900		* macosx/tkMacOSXDraw.c: workaround leak in Carbon SetPortPenPixPat()
	1579	* macosx/tkMacOSXDraw.c: Workaround leak in Carbon SetPortPenPixPat()
901	1580	API [Bug 1863346]; avoid repeated PixPat allocation/deallocation.
902	1581
903		2008-02-23 Joe English <jenglish@users.sourceforge.net>
	1582	2008-02-23 Joe English <jenglish@users.sourceforge.net>
904	1583
905	1584	* library/ttk/combobox.tcl, doc/ttk_combobox.n,
906	1585	* tests/ttk/combobox.test: Arrange to deliver <<ComboboxSelected>>
907	1586	event after listbox is unposted, as intended [Bug 1890211]. Clarified
908	1587	documentation.
909	1588
910		2008-02-23 Joe English <jenglish@users.sourceforge.net>
	1589	2008-02-23 Joe English <jenglish@users.sourceforge.net>
911	1590
912	1591	* generic/ttk/ttkPanedWindow.c: Don't enforce minimum sash thickness
913	1592	of 5 pixels, just use 5 as a default. [FR 1898288]

920	1599
921	1600	* doc/ttk_scale.n (new file): Added basic documentation. [Bug 1881925]
922	1601
923		2008-02-04 Don Porter <dgp@users.sourceforge.net>
	1602	2008-02-04 Don Porter <dgp@users.sourceforge.net>
924	1603
925	1604	* 8.5.1 TAGGED FOR RELEASE *
926	1605

940	1619
941	1620	2008-02-02 Daniel Steffen <das@users.sourceforge.net>
942	1621
943		* macosx/Wish-Info.plist.in: add CFBundleLocalizations key, listing
944		* unix/configure.in (Darwin): all library/msgs locales.
945
946		* unix/configure.in (Darwin): correct Info.plist year substitution in
947		non-framework builds.
	1622	* macosx/Wish-Info.plist.in: Add CFBundleLocalizations key, listing
	1623	* unix/configure.in (Darwin): all library/msgs locales.
	1624
	1625	* unix/configure.in (Darwin): Correct Info.plist year substitution
	1626	in non-framework builds.
948	1627
949	1628	* unix/configure: autoconf-2.59
950	1629
951		2008-02-01 Don Porter <dgp@users.sourceforge.net>
	1630	2008-02-01 Don Porter <dgp@users.sourceforge.net>
952	1631
953	1632	* changes: Updates for 8.5.1 release.
954	1633

957	1636	* generic/tkImgGIF.c: Fixed a buffer overflow (CVE-2008-0553).
958	1637	* tests/imgPhoto.test: Added a test for the above.
959	1638
960		2008-01-31 Jeff Hobbs <jeffh@ActiveState.com>
961
962		* library/msgbox.tcl (::tk::MessageBox): don't use ttk::label in low
	1639	2008-01-31 Jeff Hobbs <jeffh@ActiveState.com>
	1640
	1641	* library/msgbox.tcl (::tk::MessageBox): Don't use ttk::label in low
963	1642	depth/aqua fallback, as it doesn't support -bitmap.
964	1643
965		* win/tkWinDialog.c (Tk_MessageBoxObjCmd): pass "" instead of NULL
	1644	* win/tkWinDialog.c (Tk_MessageBoxObjCmd): Pass "" instead of NULL
966	1645	when -title isn't set. [Bug 1881892]
967	1646
968	1647	2008-01-31 Donal K. Fellows <donal.k.fellows@man.ac.uk>

975	1654	* doc/canvas.n, doc/listbox.n, doc/message.n: Fix erroneous listing of
976	1655	"standard" options. [Bug 1882495]
977	1656
978		2008-01-29 Joe English <jenglish@users.sourceforge.net>
	1657	2008-01-29 Joe English <jenglish@users.sourceforge.net>
979	1658
980	1659	* library/treeview.tcl: Fix bug in Shift-ButtonPress-1 binding (error
981	1660	if no current focus item; reported on c.l.t.)

986	1665	Ttk manual pages so that they are documented in the correct location.
987	1666	[Bug 1876493]
988	1667
989		2008-01-28 Joe English <jenglish@users.sourceforge.net>
	1668	2008-01-28 Joe English <jenglish@users.sourceforge.net>
990	1669
991	1670	* unix/tkUnixRFont.c: Re-fix strict-aliasing warnings reintroduced by
992	1671	last patch.
993	1672
994		2008-01-27 Joe English <jenglish@users.sourceforge.net>
	1673	2008-01-27 Joe English <jenglish@users.sourceforge.net>
995	1674
996	1675	* generic/ttk/ttkNotebook.c: Make sure to schedule a redisplay when
997	1676	adding and/or hiding tabs. [Bug 1878298]
998	1677
999		2008-01-27 Joe English <jenglish@users.sourceforge.net>
	1678	2008-01-27 Joe English <jenglish@users.sourceforge.net>
1000	1679
1001	1680	* unix/tkUnixRFont.c: Merged common code from InitFont() and
1002	1681	TkpGetFontAttrsForChar(), factored into GetTkFontAttributes() and

1005	1684	TkFontAttributes.family member is a Tk_Uid, as specified. Use
1006	1685	FcTypeDouble for XFT_SIZE attribute. Finally: fix [Bug 1835848]
1007	1686
1008		2008-01-25 Don Porter <dgp@users.sourceforge.net>
	1687	2008-01-25 Don Porter <dgp@users.sourceforge.net>
1009	1688
1010	1689	* changes: Updates for 8.5.1 release.
1011	1690
1012		2008-01-08 Joe English <jenglish@users.sourceforge.net>
	1691	2008-01-08 Joe English <jenglish@users.sourceforge.net>
1013	1692
1014	1693	* generic/ttk/ttkFrame.c: BUGFIX: fix crash in [ttk::labelframe] when
1015	1694	-style option specified. [Bug 1867122]
1016	1695
1017		2008-01-08 Joe English <jenglish@users.sourceforge.net>
	1696	2008-01-08 Joe English <jenglish@users.sourceforge.net>
1018	1697
1019	1698	* win/ttkWinTheme.c: Add tristate support to checkbuttons and
1020	1699	radiobuttons. [Bug 1865898]
1021	1700	Fix check and radio indicator size. [Bug 1679067]
1022	1701
1023		2008-01-06 Joe English <jenglish@users.sourceforge.net>
	1702	2008-01-06 Joe English <jenglish@users.sourceforge.net>
1024	1703
1025	1704	* generic/ttk/ttkWidget.c, generic/ttk/ttkWidget.h: Call
1026	1705	Tk_MakeWindowExist() in widget constructor. Removed now-unnecessary
1027	1706	initial ConfigureNotify processing.
1028	1707
1029		2008-01-06 Joe English <jenglish@users.sourceforge.net>
	1708	2008-01-06 Joe English <jenglish@users.sourceforge.net>
1030	1709
1031	1710	* library/ttk/treeview.tcl, library/ttk/utils.tcl: Fix MouseWheel
1032	1711	bindings for ttk::treeview widget. [Bugs 1442006, 1821939, 1862692]
1033	1712
1034		2008-01-02 Don Porter <dgp@users.sourceforge.net>
	1713	2008-01-02 Don Porter <dgp@users.sourceforge.net>
1035	1714
1036	1715	* generic/tk.h: Bump version number to 8.5.1b1 to distinguish
1037	1716	* library/tk.tcl: CVS development snapshots from the 8.5.0 and

+2

-2

README less more

0	0	README: Tk
1		This is the Tk 8.6a3 source distribution.
	1	This is the Tk 8.6b1 source distribution.
2	2	Tcl/Tk is also available through NetCVS:
3	3	http://tcl.sourceforge.net/
4	4	You can get any source release of Tcl from the file distributions
5	5	link at the above URL.
6	6
7		RCS: @(#) $Id: README,v 1.57 2008/08/28 16:29:34 dgp Exp $
	7	RCS: @(#) $Id: README,v 1.59 2008/12/19 14:32:25 dgp Exp $
8	8
9	9	1. Introduction
10	10	---------------

+52

-1

changes less more

1	1	released on March 13, 1991. Changes that aren't backward compatible
2	2	are marked specially.
3	3
4		RCS: @(#) $Id: changes,v 1.136 2008/10/10 21:30:21 dgp Exp $
	4	RCS: @(#) $Id: changes,v 1.137 2008/12/19 19:58:50 dgp Exp $
5	5
6	6	3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
7	7	the interpreter when the main window is deleted (otherwise there will

6573	6573	* POTENTIAL INCOMPATIBILITY *
6574	6574
6575	6575	--- Released 8.6a3, October 10, 2008 --- See ChangeLog for details ---
	6576
	6577	2008-10-17 (enhancement) keyboard bindings for ttk::scale (thoyts)
	6578
	6579	2008-10-18 (bug fix)[1825353] Russian Windows tiny fonts problem (thoyts)
	6580
	6581	2008-10-18 (new feature)[TIP 321] [tk busy] (decoster,fellows)
	6582
	6583	2008-10-28 (bug fix)[1534835,2054562] use of more correct cursors (english)
	6584
	6585	2008-11-01 (new feature) New [ttk::spinbox] widget (thoyts)
	6586
	6587	2008-11-01 (new feature)[TIP 97] [$canvas imove] [$canvas rchars] (fellows)
	6588
	6589	2008-11-09 (bug fix)[2207435] [ttk::entry .t -textvar ::noexist::x] (english)
	6590
	6591	2008-11-11 (bug fix)[2312027] Tk_Create*ImageType() thread safety (nijtmans)
	6592
	6593	2008-11-11 (bug fix)[2264732] crash using nondefault visual (english)
	6594
	6595	2008-11-12 (bug fix)[1777362] permit [text] names containing "-" (thoyts)
	6596
	6597	2008-11-14 (bug fix)[2239034] limit [wm manage] to Frames (thoyts)
	6598
	6599	2008-11-22 (new feature)[TIP 119] -angle option for canvas text items (fellows)
	6600
	6601	2008-11-22 (bug fix)[1939129,1991930] combobox behind other windows (thoyts)
	6602
	6603	2008-11-22 (new feature) Demo ctext.tcl now demos angled text (fellows)
	6604
	6605	2008-11-23 (bug fix)[1389270] made [event generate <Focus*>] work (thoyts)
	6606
	6607	2008-11-28 (bug fix)[1813597,2218964] eliminate unnecessary units conversion
	6608	in screen distances, reducing precision loss (ferrieux)
	6609
	6610	2008-12-03 (enhancement) new "hover" state for proper Vista visuals (thoyts)
	6611
	6612	2008-12-05 (bug fix)[2107938] no negative font size in PS (fellows)
	6613
	6614	2008-12-05 (enhancement) new "vista" theme (thoyts)
	6615
	6616	2008-12-06 (new feature)[TIP 197] [$text -insertunfocussed] (edwards,fellows)
	6617
	6618	2008-12-06 (new feature)[TIP 337] handle non-error bg exceptions (porter)
	6619
	6620	2008-12-10 (new feature)[TIP 324] [tk fontchooser](thoyts,vetter,robert,steffen)
	6621
	6622	2008-12-12 (new feature) Demo fontchoose.tcl demos [tk fontchooser] (thoyts)
	6623
	6624	2008-12-18 (enhancement)[24442309] Updated German messages (haertel)
	6625
	6626	--- Released 8.6b1, December 19, 2008 --- See ChangeLog for details ---

+3

-2

doc/CanvTkwin.3 less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: CanvTkwin.3,v 1.8 2008/06/30 22:57:00 dkf Exp $
	6	'\" RCS: @(#) $Id: CanvTkwin.3,v 1.9 2008/11/01 12:25:14 dkf Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH Tk_CanvasTkwin 3 4.1 Tk "Tk Library Procedures"

86	86	If \fIstring\fR is a valid coordinate description then \fBTk_CanvasGetCoord\fR
87	87	stores the corresponding canvas coordinate at *\fIdoublePtr\fR
88	88	and returns \fBTCL_OK\fR.
89		Otherwise it stores an error message in \fIinterp->result\fR and
	89	Otherwise it stores an error message in the interpreter result and
90	90	returns \fBTCL_ERROR\fR.
91	91	.PP
92	92	\fBTk_CanvasDrawableCoords\fR is called by type managers during

142	142	directly, but will use their addresses to create a \fBTk_CustomOption\fR
143	143	structure for the \fB\-tags\fR option. The code typically looks
144	144	like this:
	145	.PP
145	146	.CS
146	147	static Tk_CustomOption tagsOption = {Tk_CanvasTagsParseProc,
147	148	Tk_CanvasTagsPrintProc, (ClientData) NULL

+3

-3

doc/ConfigWidg.3 less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: ConfigWidg.3,v 1.21 2008/06/30 22:57:00 dkf Exp $
	7	'\" RCS: @(#) $Id: ConfigWidg.3,v 1.22 2008/10/30 21:39:16 nijtmans Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH Tk_ConfigureWidget 3 4.1 Tk "Tk Library Procedures"

110	110	char *\fIdefValue\fR;
111	111	int \fIoffset\fR;
112	112	int \fIspecFlags\fR;
113		Tk_CustomOption *\fIcustomPtr\fR;
	113	const Tk_CustomOption *\fIcustomPtr\fR;
114	114	} \fBTk_ConfigSpec\fR;
115	115	.CE
116	116	The \fItype\fR field indicates what type of configuration option this is

556	556	char *\fIwidgRec\fR,
557	557	int \fIoffset\fR);
558	558
559		typedef char *\fBTk_OptionPrintProc\fR(
	559	typedef const char *\fBTk_OptionPrintProc\fR(
560	560	ClientData \fIclientData\fR,
561	561	Tk_Window \fItkwin\fR,
562	562	char *\fIwidgRec\fR,

+8

-7

doc/CrtImgType.3 less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: CrtImgType.3,v 1.14 2008/06/30 22:57:01 dkf Exp $
	7	'\" RCS: @(#) $Id: CrtImgType.3,v 1.16 2008/11/12 00:15:26 nijtmans Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH Tk_CreateImageType 3 8.5 Tk "Tk Library Procedures"

22	22	.sp
23	23	\fBTk_InitImageArgs\fR(\fIinterp, argc, argvPtr\fR)
24	24	.SH ARGUMENTS
25		.AS Tk_ImageType *typePtrPtr
26		.AP Tk_ImageType *typePtr in
	25	.AS "const Tk_ImageType" *typePtrPtr
	26	.AP "const Tk_ImageType" *typePtr in
27	27	Structure that defines the new type of image.
28		Must be static: a
	28	For Tk 8.4 and earlier this must be static: a
29	29	pointer to this structure is retained by the image code.
	30	In Tk 8.5, this limitation was relaxed.
30	31	.AP Tcl_Interp *interp in
31	32	Interpreter in which image was created.
32	33	.AP "const char" *name in

59	60	by the image manager to deal with images of this type:
60	61	.CS
61	62	typedef struct Tk_ImageType {
62		char *\fIname\fR;
	63	const char *\fIname\fR;
63	64	Tk_ImageCreateProc *\fIcreateProc\fR;
64	65	Tk_ImageGetProc *\fIgetProc\fR;
65	66	Tk_ImageDisplayProc *\fIdisplayProc\fR;

109	110	.CS
110	111	typedef int \fBTk_ImageCreateProc\fR(
111	112	Tcl_Interp *\fIinterp\fR,
112		char *\fIname\fR,
	113	const char *\fIname\fR,
113	114	int \fIobjc\fR,
114	115	Tcl_Obj *const \fIobjv\fR[],
115		Tk_ImageType *\fItypePtr\fR,
	116	const Tk_ImageType *\fItypePtr\fR,
116	117	Tk_ImageMaster \fImaster\fR,
117	118	ClientData *\fImasterDataPtr\fR);
118	119	.CE

+175

-86

doc/CrtItemType.3 less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: CrtItemType.3,v 1.13 2008/06/30 22:57:01 dkf Exp $
	6	'\" RCS: @(#) $Id: CrtItemType.3,v 1.14 2008/11/01 17:26:36 dkf Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH Tk_CreateItemType 3 4.0 Tk "Tk Library Procedures"

45	45	.PP
46	46	You may find it easier to understand the rest of this manual entry
47	47	by looking at the code for an existing canvas item type such as
48		bitmap (file tkCanvBmap.c) or text (tkCanvText.c).
	48	bitmap (in the file tkCanvBmap.c) or text (tkCanvText.c).
49	49	The easiest way to create a new type manager is to copy the code
50	50	for an existing type and modify it for the new type.
51	51	.PP

61	61	The first data structure is a Tk_ItemType; it contains
62	62	information such as the name of the type and pointers to
63	63	the standard procedures implemented by the type manager:
	64	.PP
64	65	.CS
65	66	typedef struct Tk_ItemType {
66	67	char *\fIname\fR;

93	94	except \fInextPtr\fR, which Tk sets to link all the types together
94	95	into a list.
95	96	The structure must be in permanent memory (either statically
96		allocated or dynamically allocated but never freed); Tk retains
	97	allocated or dynamically allocated but never freed); Tk retains
97	98	a pointer to this structure.
98	99	.PP
99	100	The second data structure manipulated by a type manager is an

103	104	the same structure, but different types usually have different
104	105	formats for their item records.
105	106	The first part of each item record is a header with a standard structure
106		defined by Tk via the type Tk_Item; the rest of the item
	107	defined by Tk via the type Tk_Item; the rest of the item
107	108	record is defined by the type manager.
108	109	A type manager must define its item records with a Tk_Item as
109	110	the first field.
110	111	For example, the item record for bitmap items is defined as follows:
	112	.PP
111	113	.CS
112	114	typedef struct BitmapItem {
113	115	Tk_Item \fIheader\fR;

119	121	GC \fIgc\fR;
120	122	} \fBBitmapItem\fR;
121	123	.CE
	124	.PP
122	125	The \fIheader\fR substructure contains information used by Tk
123	126	to manage the item, such as its identifier, its tags, its type,
124	127	and its bounding box.

128	131	fields in the header except for four fields
129	132	whose names are \fIx1\fR, \fIy1\fR, \fIx2\fR, and \fIy2\fR.
130	133	These fields give a bounding box for the items using integer
131		canvas coordinates: the item should not cover any pixels
	134	canvas coordinates: the item should not cover any pixels
132	135	with x-coordinate lower than \fIx1\fR or y-coordinate
133	136	lower than \fIy1\fR, nor should it cover any pixels with
134	137	x-coordinate greater than or equal to \fIx2\fR or y-coordinate

138	141	.PP
139	142	Whenever Tk calls a procedure in a type manager it passes in a pointer
140	143	to an item record.
141		The argument is always passed as a pointer to a Tk_Item; the type
	144	The argument is always passed as a pointer to a Tk_Item; the type
142	145	manager will typically cast this into a pointer to its own specific
143	146	type, such as BitmapItem.
144	147	.PP
145	148	The third data structure used by type managers has type
146		Tk_Canvas; it serves as an opaque handle for the canvas widget
	149	Tk_Canvas; it serves as an opaque handle for the canvas widget
147	150	as a whole.
148	151	Type managers need not know anything about the contents of this
149	152	structure.

151	154	procedures of a type manager, and the type manager can pass the
152	155	handle back to library procedures such as Tk_CanvasTkwin
153	156	to fetch information about the canvas.
	157	.SH "TK_ITEMTYPE FIELDS"
154	158	.SS NAME
155	159	.PP
156	160	This section and the ones that follow describe each of the fields

161	165	type.
162	166	If there already existed an item type by this name then
163	167	the new item type replaces the old one.
	168	.SS "FLAGS (IN ALWAYSREDRAW)"
	169	.PP
	170	The \fItypePtr\->alwaysRedraw\fR field (so named for historic reasons)
	171	contains a collection of flag bits that modify how the canvas core interacts
	172	with the item. The following bits are defined:
	173	.TP
	174	\fB1\fR
	175	.
	176	Indicates that the item should always be redrawn when any part of the canvas
	177	is redrawn, rather than only when the bounding box of the item overlaps the
	178	area being redrawn. This is used by window items, for example, which need to
	179	unmap subwindows that are not on the screen.
	180	.TP
	181	\fBTK_CONFIG_OBJS\fR
	182	.
	183	Indicates that operations which would otherwise take a string (or array of
	184	strings) actually take a Tcl_Obj reference (or an array of such references).
	185	The operations to which this applies are the \fIconfigProc\fR, the
	186	\fIcoordProc\fR, the \fIcreateProc\fR, the \fIindexProc\fR and the
	187	\fIinsertProc\fR.
	188	.TP
	189	\fBTK_MOVABLE_POINTS\fR
	190	.VS 8.6
	191	Indicates that the item supports the \fIdCharsProc\fR, \fIindexProc\fR and
	192	\fIinsertProc\fR with the same semantics as Tk's built-in line and polygon
	193	types, and that hence individual coordinate points can be moved. Must not be
	194	set if any of the above methods is NULL.
	195	.VE 8.6
164	196	.SS ITEMSIZE
165	197	.PP
166		\fItypePtr->itemSize\fR gives the size in bytes of item records
	198	\fItypePtr\->itemSize\fR gives the size in bytes of item records
167	199	of this type, including the Tk_Item header.
168	200	Tk uses this size to allocate memory space for items of the type.
169	201	All of the item records for a given type must have the same size.

172	204	object of variable length and keep a pointer to it in the item record.
173	205	.SS CREATEPROC
174	206	.PP
175		\fItypePtr->createProc\fR points to a procedure for
	207	\fItypePtr\->createProc\fR points to a procedure for
176	208	Tk to call whenever a new item of this type is created.
177		\fItypePtr->createProc\fR must match the following prototype:
	209	\fItypePtr\->createProc\fR must match the following prototype:
	210	.PP
178	211	.CS
179	212	typedef int \fBTk_ItemCreateProc\fR(
180	213	Tcl_Interp *\fIinterp\fR,
181	214	Tk_Canvas \fIcanvas\fR,
182	215	Tk_Item *\fIitemPtr\fR,
183	216	int \fIobjc\fR,
184		Tcl_Obj* const \fIobjv\fR[]);
185		.CE
	217	Tcl_Obj *const \fIobjv\fR[]);
	218	.CE
	219	.PP
186	220	The \fIinterp\fR argument is the interpreter in which the canvas's
187	221	\fBcreate\fR widget command was invoked, and \fIcanvas\fR is a
188	222	handle for the canvas widget.
189	223	\fIitemPtr\fR is a pointer to a newly-allocated item of
190		size \fItypePtr->itemSize\fR.
	224	size \fItypePtr\->itemSize\fR.
191	225	Tk has already initialized the item's header (the first
192	226	\fBsizeof(Tk_ItemType)\fR bytes).
193	227	The \fIobjc\fR and \fIobjv\fR arguments describe all of the
194	228	arguments to the \fBcreate\fR command after the \fItype\fR
195	229	argument.
196		For example, in the widget command
	230	Note that if \fBTK_CONFIG_OBJS\fR is not set in the
	231	\fItypePtr\->alwaysRedraw\fR field, the \fIobjv\fR parameter will actually
	232	contain a pointer to an array of constant strings.
	233	For example, in the widget command:
	234	.PP
197	235	.CS
198	236	\fB\&.c create rectangle 10 20 50 50 \-fill black\fR
199	237	.CE
	238	.PP
200	239	\fIobjc\fR will be \fB6\fR and \fIobjv\fR[0] will contain the
201	240	integer object \fB10\fR.
202	241	.PP

204	243	the type-specific parts of the item record and set an initial value
205	244	for the bounding box in the item's header.
206	245	It should return a standard Tcl completion code and leave an
207		error message in \fIinterp->result\fR if an error occurs.
	246	error message in the interpreter result if an error occurs.
208	247	If an error occurs Tk will free the item record, so \fIcreateProc\fR
209	248	must be sure to leave the item record in a clean state if it returns an error
210	249	(e.g., it must free any additional memory that it allocated for

214	253	Each type manager must provide a standard table describing its
215	254	configuration options, in a form suitable for use with
216	255	\fBTk_ConfigureWidget\fR.
217		This table will normally be used by \fItypePtr->createProc\fR
218		and \fItypePtr->configProc\fR, but Tk also uses it directly
	256	This table will normally be used by \fItypePtr\->createProc\fR
	257	and \fItypePtr\->configProc\fR, but Tk also uses it directly
219	258	to retrieve option information in the \fBitemcget\fR and
220	259	\fBitemconfigure\fR widget commands.
221		\fItypePtr->configSpecs\fR must point to the configuration table
	260	\fItypePtr\->configSpecs\fR must point to the configuration table
222	261	for this type.
223	262	Note: Tk provides a custom option type \fBtk_CanvasTagsOption\fR
224		for implementing the \fB\-tags\fR option; see an existing type
	263	for implementing the \fB\-tags\fR option; see an existing type
225	264	manager for an example of how to use it in \fIconfigSpecs\fR.
226	265	.SS CONFIGPROC
227	266	.PP
228		\fItypePtr->configProc\fR is called by Tk whenever the
	267	\fItypePtr\->configProc\fR is called by Tk whenever the
229	268	\fBitemconfigure\fR widget command is invoked to change the
230	269	configuration options for a canvas item.
231	270	This procedure must match the following prototype:
	271	.PP
232	272	.CS
233	273	typedef int \fBTk_ItemConfigureProc\fR(
234	274	Tcl_Interp *\fIinterp\fR,
235	275	Tk_Canvas \fIcanvas\fR,
236	276	Tk_Item *\fIitemPtr\fR,
237	277	int \fIobjc\fR,
238		Tcl_Obj* const \fIobjv\fR[],
	278	Tcl_Obj *const \fIobjv\fR[],
239	279	int \fIflags\fR);
240	280	.CE
	281	.PP
241	282	The \fIinterp\fR objument identifies the interpreter in which the
242		widget command was invoked, \fIcanvas\fR is a handle for the canvas
	283	widget command was invoked, \fIcanvas\fR is a handle for the canvas
243	284	widget, and \fIitemPtr\fR is a pointer to the item being configured.
244		\fIobjc\fR and \fIobjv\fR contain the configuration options. For
245		example, if the following command is invoked:
	285	\fIobjc\fR and \fIobjv\fR contain the configuration options.
	286	Note that if \fBTK_CONFIG_OBJS\fR is not set in the
	287	\fItypePtr\->alwaysRedraw\fR field, the \fIobjv\fR parameter will actually
	288	contain a pointer to an array of constant strings.
	289	For example, if the following command is invoked:
	290	.PP
246	291	.CS
247	292	\fB\&.c itemconfigure 2 \-fill red \-outline black\fR
248	293	.CE
	294	.PP
249	295	\fIobjc\fR is \fB4\fR and \fIobjv\fR contains the string objects \fB\-fill\fR
250	296	through \fBblack\fR.
251	297	\fIobjc\fR will always be an even value.
252		The \fIflags\fR argument contains flags to pass to \fBTk_ConfigureWidget\fR;
	298	The \fIflags\fR argument contains flags to pass to \fBTk_ConfigureWidget\fR;
253	299	currently this value is always \fBTK_CONFIG_ARGV_ONLY\fR when Tk
254		invokes \fItypePtr->configProc\fR, but the type manager's \fIcreateProc\fR
	300	invokes \fItypePtr\->configProc\fR, but the type manager's \fIcreateProc\fR
255	301	procedure will usually invoke \fIconfigProc\fR with different flag values.
256	302	.PP
257		\fItypePtr->configProc\fR returns a standard Tcl completion code and
258		leaves an error message in \fIinterp->result\fR if an error occurs.
	303	\fItypePtr\->configProc\fR returns a standard Tcl completion code and
	304	leaves an error message in the interpreter result if an error occurs.
259	305	It must update the item's bounding box to reflect the new configuration
260	306	options.
261	307	.SS COORDPROC
262	308	.PP
263		\fItypePtr->coordProc\fR is invoked by Tk to implement the \fBcoords\fR
	309	\fItypePtr\->coordProc\fR is invoked by Tk to implement the \fBcoords\fR
264	310	widget command for an item.
265	311	It must match the following prototype:
	312	.PP
266	313	.CS
267	314	typedef int \fBTk_ItemCoordProc\fR(
268	315	Tcl_Interp *\fIinterp\fR,
269	316	Tk_Canvas \fIcanvas\fR,
270	317	Tk_Item *\fIitemPtr\fR,
271	318	int \fIobjc\fR,
272		Tcl_Obj* const \fIobjv\fR[]);
273		.CE
	319	Tcl_Obj *const \fIobjv\fR[]);
	320	.CE
	321	.PP
274	322	The arguments \fIinterp\fR, \fIcanvas\fR, and \fIitemPtr\fR
275	323	all have the standard meanings, and \fIobjc\fR and \fIobjv\fR
276	324	describe the coordinate arguments.
	325	Note that if \fBTK_CONFIG_OBJS\fR is not set in the
	326	\fItypePtr\->alwaysRedraw\fR field, the \fIobjv\fR parameter will actually
	327	contain a pointer to an array of constant strings.
277	328	For example, if the following widget command is invoked:
	329	.PP
278	330	.CS
279	331	\fB\&.c coords 2 30 90\fR
280	332	.CE
	333	.PP
281	334	\fIobjc\fR will be \fB2\fR and \fBobjv\fR will contain the integer objects
282	335	\fB30\fR and \fB90\fR.
283	336	.PP

286	339	box in the item's header), and return a standard Tcl completion
287	340	code.
288	341	If an error occurs, \fIcoordProc\fR must leave an error message in
289		\fIinterp->result\fR.
	342	the interpreter result.
290	343	.SS DELETEPROC
291	344	.PP
292		\fItypePtr->deleteProc\fR is invoked by Tk to delete an item
	345	\fItypePtr\->deleteProc\fR is invoked by Tk to delete an item
293	346	and free any resources allocated to it.
294	347	It must match the following prototype:
	348	.PP
295	349	.CS
296	350	typedef void \fBTk_ItemDeleteProc\fR(
297	351	Tk_Canvas \fIcanvas\fR,
298	352	Tk_Item *\fIitemPtr\fR,
299	353	Display *\fIdisplay\fR);
300	354	.CE
	355	.PP
301	356	The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual
302	357	interpretations, and \fIdisplay\fR identifies the X display containing
303	358	the canvas.
304	359	\fIdeleteProc\fR must free up any resources allocated for the item,
305	360	so that Tk can free the item record.
306		\fIdeleteProc\fR should not actually free the item record; this will
	361	\fIdeleteProc\fR should not actually free the item record; this will
307	362	be done by Tk when \fIdeleteProc\fR returns.
308		.SS "DISPLAYPROC AND ALWAYSREDRAW"
309		.PP
310		\fItypePtr->displayProc\fR is invoked by Tk to redraw an item
	363	.SS "DISPLAYPROC"
	364	.PP
	365	\fItypePtr\->displayProc\fR is invoked by Tk to redraw an item
311	366	on the screen.
312	367	It must match the following prototype:
	368	.PP
313	369	.CS
314	370	typedef void \fBTk_ItemDisplayProc\fR(
315	371	Tk_Canvas \fIcanvas\fR,

321	377	int \fIwidth\fR,
322	378	int \fIheight\fR);
323	379	.CE
	380	.PP
324	381	The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual meaning.
325	382	\fIdisplay\fR identifies the display containing the canvas, and
326	383	\fIdst\fR specifies a drawable in which the item should be rendered;

342	399	.PP
343	400	Normally an item's \fIdisplayProc\fR is only invoked if the item
344	401	overlaps the area being displayed.
345		However, if \fItypePtr->alwaysRedraw\fR has a non-zero value, then
346		\fIdisplayProc\fR is invoked during every redisplay operation,
347		even if the item does not overlap the area of redisplay.
348		\fIalwaysRedraw\fR should normally be set to 0; it is only
349		set to 1 in special cases such as window items that need to be
350		unmapped when they are off-screen.
	402	However, if bit zero of \fItypePtr\->alwaysRedraw\fR is 1,
	403	(i.e.\\|
	404	.QW "\fItypePtr\->alwaysRedraw & 1 == 1\fR" )
	405	then \fIdisplayProc\fR is invoked during every redisplay operation,
	406	even if the item does not overlap the area of redisplay; this is useful for
	407	cases such as window items, where the subwindow needs to be unmapped when it
	408	is off the screen.
351	409	.SS POINTPROC
352	410	.PP
353		\fItypePtr->pointProc\fR is invoked by Tk to find out how close
	411	\fItypePtr\->pointProc\fR is invoked by Tk to find out how close
354	412	a given point is to a canvas item.
355	413	Tk uses this procedure for purposes such as locating the item
356	414	under the mouse or finding the closest item to a given point.
357	415	The procedure must match the following prototype:
	416	.PP
358	417	.CS
359	418	typedef double \fBTk_ItemPointProc\fR(
360	419	Tk_Canvas \fIcanvas\fR,
361	420	Tk_Item *\fIitemPtr\fR,
362	421	double *\fIpointPtr\fR);
363	422	.CE
	423	.PP
364	424	\fIcanvas\fR and \fIitemPtr\fR have the usual meaning.
365	425	\fIpointPtr\fR points to an array of two numbers giving
366	426	the x and y coordinates of a point.

369	429	the item.
370	430	.SS AREAPROC
371	431	.PP
372		\fItypePtr->areaProc\fR is invoked by Tk to find out the relationship
	432	\fItypePtr\->areaProc\fR is invoked by Tk to find out the relationship
373	433	between an item and a rectangular area.
374	434	It must match the following prototype:
	435	.PP
375	436	.CS
376	437	typedef int \fBTk_ItemAreaProc\fR(
377	438	Tk_Canvas \fIcanvas\fR,
378	439	Tk_Item *\fIitemPtr\fR,
379	440	double *\fIrectPtr\fR);
380	441	.CE
	442	.PP
381	443	\fIcanvas\fR and \fIitemPtr\fR have the usual meaning.
382	444	\fIrectPtr\fR points to an array of four real numbers;
383	445	the first two give the x and y coordinates of the upper left

388	450	outside the area, and 1 if it lies entirely inside the area.
389	451	.SS POSTSCRIPTPROC
390	452	.PP
391		\fItypePtr->postscriptProc\fR is invoked by Tk to generate
	453	\fItypePtr\->postscriptProc\fR is invoked by Tk to generate
392	454	Postscript for an item during the \fBpostscript\fR widget command.
393	455	If the type manager is not capable of generating Postscript then
394		\fItypePtr->postscriptProc\fR should be NULL.
395		The procedure must match the following prototype:
	456	\fItypePtr\->postscriptProc\fR should be NULL.
	457	The procedure must match the following prototype:
	458	.PP
396	459	.CS
397	460	typedef int \fBTk_ItemPostscriptProc\fR(
398	461	Tcl_Interp *\fIinterp\fR,

400	463	Tk_Item *\fIitemPtr\fR,
401	464	int \fIprepass\fR);
402	465	.CE
	466	.PP
403	467	The \fIinterp\fR, \fIcanvas\fR, and \fIitemPtr\fR arguments all have
404		standard meanings; \fIprepass\fR will be described below.
	468	standard meanings; \fIprepass\fR will be described below.
405	469	If \fIpostscriptProc\fR completes successfully, it should append
406		Postscript for the item to the information in \fIinterp->result\fR
	470	Postscript for the item to the information in the interpreter result
407	471	(e.g. by calling \fBTcl_AppendResult\fR, not \fBTcl_SetResult\fR)
408	472	and return \fBTCL_OK\fR.
409	473	If an error occurs, \fIpostscriptProc\fR should clear the result
410		and replace its contents with an error message; then it should
	474	and replace its contents with an error message; then it should
411	475	return \fBTCL_ERROR\fR.
412	476	.PP
413	477	Tk provides a collection of utility procedures to simplify

429	493	Structuring Conventions, Tk actually generates Postscript in two passes.
430	494	It calls each item's \fIpostscriptProc\fR in each pass.
431	495	The only purpose of the first pass is to collect font information
432		(which is done by \fBTk_CanvasPsFont\fR); the actual Postscript is
	496	(which is done by \fBTk_CanvasPsFont\fR); the actual Postscript is
433	497	discarded.
434	498	Tk sets the \fIprepass\fR argument to \fIpostscriptProc\fR to 1
435		during the first pass; the type manager can use \fIprepass\fR to skip
	499	during the first pass; the type manager can use \fIprepass\fR to skip
436	500	all Postscript generation except for calls to \fBTk_CanvasPsFont\fR.
437	501	During the second pass \fIprepass\fR will be 0, so the type manager
438	502	must generate complete Postscript.
439	503	.SS SCALEPROC
440	504	.PP
441		\fItypePtr->scaleProc\fR is invoked by Tk to rescale a canvas item
	505	\fItypePtr\->scaleProc\fR is invoked by Tk to rescale a canvas item
442	506	during the \fBscale\fR widget command.
443	507	The procedure must match the following prototype:
	508	.PP
444	509	.CS
445	510	typedef void \fBTk_ItemScaleProc\fR(
446	511	Tk_Canvas \fIcanvas\fR,

450	515	double \fIscaleX\fR,
451	516	double \fIscaleY\fR);
452	517	.CE
	518	.PP
453	519	The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual meaning.
454	520	\fIoriginX\fR and \fIoriginY\fR specify an origin relative to which
455	521	the item is to be scaled, and \fIscaleX\fR and \fIscaleY\fR give the

457	523	The item should adjust its coordinates so that a point in the item
458	524	that used to have coordinates \fIx\fR and \fIy\fR will have new
459	525	coordinates \fIx\(fm\fR and \fIy\(fm\fR, where
460		.CS
461		\fIx\(fm = originX + scaleX*(x-originX)
462		y\(fm = originY + scaleY*(y-originY)\fR
463		.CE
	526	.PP
	527	.CS
	528	\fIx\(fm\fR = \fIoriginX\fR + \fIscaleX\fR \(mu (\fIx\fR \(mi \fIoriginX\fR)
	529	\fIy\(fm\fR = \fIoriginY\fR + \fIscaleY\fR \(mu (\fIy\fR \(mi \fIoriginY\fR)
	530	.CE
	531	.PP
464	532	\fIscaleProc\fR must also update the bounding box in the item's
465	533	header.
466	534	.SS TRANSLATEPROC
467	535	.PP
468		\fItypePtr->translateProc\fR is invoked by Tk to translate a canvas item
	536	\fItypePtr\->translateProc\fR is invoked by Tk to translate a canvas item
469	537	during the \fBmove\fR widget command.
470	538	The procedure must match the following prototype:
	539	.PP
471	540	.CS
472	541	typedef void \fBTk_ItemTranslateProc\fR(
473	542	Tk_Canvas \fIcanvas\fR,

475	544	double \fIdeltaX\fR,
476	545	double \fIdeltaY\fR);
477	546	.CE
	547	.PP
478	548	The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual meaning,
479	549	and \fIdeltaX\fR and \fIdeltaY\fR give the amounts that should be
480	550	added to each x and y coordinate within the item.

482	552	update the bounding box in the item's header.
483	553	.SS INDEXPROC
484	554	.PP
485		\fItypePtr->indexProc\fR is invoked by Tk to translate a string
	555	\fItypePtr\->indexProc\fR is invoked by Tk to translate a string
486	556	index specification into a numerical index, for example during the
487	557	\fBindex\fR widget command.
488		It is only relevant for item types that support indexable text;
489		\fItypePtr->indexProc\fR may be specified as NULL for non-textual
490		item types.
491		The procedure must match the following prototype:
	558	It is only relevant for item types that support indexable text or coordinates;
	559	\fItypePtr\->indexProc\fR may be specified as NULL for non-textual
	560	item types if they do not support detailed coordinate addressing.
	561	The procedure must match the following prototype:
	562	.PP
492	563	.CS
493	564	typedef int \fBTk_ItemIndexProc\fR(
494	565	Tcl_Interp *\fIinterp\fR,
495	566	Tk_Canvas \fIcanvas\fR,
496	567	Tk_Item *\fIitemPtr\fR,
497		char \fIindexString\fR,
	568	char *\fIindexString\fR,
498	569	int *\fIindexPtr\fR);
499	570	.CE
	571	.PP
500	572	The \fIinterp\fR, \fIcanvas\fR, and \fIitemPtr\fR arguments all
501	573	have the usual meaning.
502	574	\fIindexString\fR contains a textual description of an index,
503	575	and \fIindexPtr\fR points to an integer value that should be
504	576	filled in with a numerical index.
	577	Note that if \fBTK_CONFIG_OBJS\fR is set in the
	578	\fItypePtr\->alwaysRedraw\fR field, the \fIindexString\fR parameter will
	579	actually contain a Tcl_Obj reference.
505	580	It is up to the type manager to decide what forms of index
506		are supported (e.g., numbers, \fBinsert\fR, \fBsel.first\fR,
	581	are supported (e.g., numbers, \fBinsert\fR, \fBsel.first\fR,
507	582	\fBend\fR, etc.).
508	583	\fIindexProc\fR should return a Tcl completion code and set
509		\fIinterp->result\fR in the event of an error.
	584	the interpreter result in the event of an error.
510	585	.SS ICURSORPROC
511	586	.PP
512		\fItypePtr->icursorProc\fR is invoked by Tk during
	587	\fItypePtr\->icursorProc\fR is invoked by Tk during
513	588	the \fBicursor\fR widget command to set the position of the
514	589	insertion cursor in a textual item.
515	590	It is only relevant for item types that support an insertion cursor;
516		\fItypePtr->icursorProc\fR may be specified as NULL for item types
	591	\fItypePtr\->icursorProc\fR may be specified as NULL for item types
517	592	that do not support an insertion cursor.
518	593	The procedure must match the following prototype:
	594	.PP
519	595	.CS
520	596	typedef void \fBTk_ItemCursorProc\fR(
521	597	Tk_Canvas \fIcanvas\fR,
522	598	Tk_Item *\fIitemPtr\fR,
523	599	int \fIindex\fR);
524	600	.CE
	601	.PP
525	602	\fIcanvas\fR and \fIitemPtr\fR have the usual meanings, and
526	603	\fIindex\fR is an index into the item's text, as returned by a
527		previous call to \fItypePtr->insertProc\fR.
	604	previous call to \fItypePtr\->insertProc\fR.
528	605	The type manager should position the insertion cursor in the
529	606	item just before the character given by \fIindex\fR.
530	607	Whether or not to actually display the insertion cursor is
531	608	determined by other information provided by \fBTk_CanvasGetTextInfo\fR.
532	609	.SS SELECTIONPROC
533	610	.PP
534		\fItypePtr->selectionProc\fR is invoked by Tk during selection
535		retrievals; it must return part or all of the selected text in
	611	\fItypePtr\->selectionProc\fR is invoked by Tk during selection
	612	retrievals; it must return part or all of the selected text in
536	613	the item (if any).
537	614	It is only relevant for item types that support text;
538		\fItypePtr->selectionProc\fR may be specified as NULL for non-textual
	615	\fItypePtr\->selectionProc\fR may be specified as NULL for non-textual
539	616	item types.
540	617	The procedure must match the following prototype:
	618	.PP
541	619	.CS
542	620	typedef int \fBTk_ItemSelectionProc\fR(
543	621	Tk_Canvas \fIcanvas\fR,

546	624	char *\fIbuffer\fR,
547	625	int \fImaxBytes\fR);
548	626	.CE
	627	.PP
549	628	\fIcanvas\fR and \fIitemPtr\fR have the usual meanings.
550	629	\fIoffset\fR is an offset in bytes into the selection where 0 refers
551		to the first byte of the selection; it identifies
	630	to the first byte of the selection; it identifies
552	631	the first character that is to be returned in this call.
553	632	\fIbuffer\fR points to an area of memory in which to store the
554	633	requested bytes, and \fImaxBytes\fR specifies the maximum number
555	634	of bytes to return.
556	635	\fIselectionProc\fR should extract up to \fImaxBytes\fR characters
557		from the selection and copy them to \fImaxBytes\fR; it should
	636	from the selection and copy them to \fImaxBytes\fR; it should
558	637	return a count of the number of bytes actually copied, which may
559	638	be less than \fImaxBytes\fR if there are not \fIoffset+maxBytes\fR bytes
560	639	in the selection.
561	640	.SS INSERTPROC
562	641	.PP
563		\fItypePtr->insertProc\fR is invoked by Tk during
564		the \fBinsert\fR widget command to insert new text into a
	642	\fItypePtr\->insertProc\fR is invoked by Tk during
	643	the \fBinsert\fR widget command to insert new text or coordinates into a
565	644	canvas item.
566		It is only relevant for item types that support text;
567		\fItypePtr->insertProc\fR may be specified as NULL for non-textual
	645	It is only relevant for item types that support the \fBinsert\fR method;
	646	\fItypePtr\->insertProc\fR may be specified as NULL for other
568	647	item types.
569	648	The procedure must match the following prototype:
	649	.PP
570	650	.CS
571	651	typedef void \fBTk_ItemInsertProc\fR(
572	652	Tk_Canvas \fIcanvas\fR,

574	654	int \fIindex\fR,
575	655	char *\fIstring\fR);
576	656	.CE
	657	.PP
577	658	\fIcanvas\fR and \fIitemPtr\fR have the usual meanings.
578	659	\fIindex\fR is an index into the item's text, as returned by a
579		previous call to \fItypePtr->insertProc\fR, and \fIstring\fR
	660	previous call to \fItypePtr\->insertProc\fR, and \fIstring\fR
580	661	contains new text to insert just before the character given
581	662	by \fIindex\fR.
	663	Note that if \fBTK_CONFIG_OBJS\fR is set in the
	664	\fItypePtr\->alwaysRedraw\fR field, the \fIstring\fR parameter will
	665	actually contain a Tcl_Obj reference to the string to insert.
	666	If the item supports modification of the coordinates list by this
	667	.PP
582	668	The type manager should insert the text and recompute the bounding
583	669	box in the item's header.
584	670	.SS DCHARSPROC
585	671	.PP
586		\fItypePtr->dCharsProc\fR is invoked by Tk during the \fBdchars\fR
587		widget command to delete a range of text from a canvas item.
	672	\fItypePtr\->dCharsProc\fR is invoked by Tk during the \fBdchars\fR
	673	widget command to delete a range of text from a canvas item or a range of
	674	coordinates from a pathed item.
588	675	It is only relevant for item types that support text;
589		\fItypePtr->dCharsProc\fR may be specified as NULL for non-textual
590		item types.
591		The procedure must match the following prototype:
	676	\fItypePtr\->dCharsProc\fR may be specified as NULL for non-textual
	677	item types that do not want to support coordinate deletion.
	678	The procedure must match the following prototype:
	679	.PP
592	680	.CS
593	681	typedef void \fBTk_ItemDCharsProc\fR(
594	682	Tk_Canvas \fIcanvas\fR,

596	684	int \fIfirst\fR,
597	685	int \fIlast\fR);
598	686	.CE
	687	.PP
599	688	\fIcanvas\fR and \fIitemPtr\fR have the usual meanings.
600	689	\fIfirst\fR and \fIlast\fR give the indices of the first and last bytes
601		to be deleted, as returned by previous calls to \fItypePtr->indexProc\fR.
	690	to be deleted, as returned by previous calls to \fItypePtr\->indexProc\fR.
602	691	The type manager should delete the specified characters and update
603	692	the bounding box in the item's header.
604	693	.SH "SEE ALSO"

+4

-4

doc/CrtPhImgFmt.3 less more

8	8	'\" Department of Computer Science,
9	9	'\" Australian National University.
10	10	'\"
11		'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.11 2008/06/30 22:57:01 dkf Exp $
	11	'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.12 2008/11/09 23:16:56 nijtmans Exp $
12	12	'\"
13	13	.so man.macros
14	14	.TH Tk_CreatePhotoImageFormat 3 8.5 Tk "Tk Library Procedures"

21	21	.sp
22	22	\fBTk_CreatePhotoImageFormat\fR(\fIformatPtr\fR)
23	23	.SH ARGUMENTS
24		.AS Tk_PhotoImageFormat *formatPtr
25		.AP Tk_PhotoImageFormat *formatPtr in
	24	.AS "const Tk_PhotoImageFormat" *formatPtr
	25	.AP "const Tk_PhotoImageFormat" *formatPtr in
26	26	Structure that defines the new file format.
27	27	.BE
28	28	.SH DESCRIPTION

46	46	Tk_PhotoImageFormat structure contains the following fields:
47	47	.CS
48	48	typedef struct Tk_PhotoImageFormat {
49		char *\fIname\fR;
	49	const char *\fIname\fR;
50	50	Tk_ImageFileMatchProc *\fIfileMatchProc\fR;
51	51	Tk_ImageStringMatchProc *\fIstringMatchProc\fR;
52	52	Tk_ImageFileReadProc *\fIfileReadProc\fR;

+2

-2

doc/GetBitmap.3 less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: GetBitmap.3,v 1.15 2008/06/30 22:57:01 dkf Exp $
	7	'\" RCS: @(#) $Id: GetBitmap.3,v 1.16 2008/11/05 22:58:30 nijtmans Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH Tk_AllocBitmapFromObj 3 8.1 Tk "Tk Library Procedures"

82	82	.TP 20
83	83	\fB@\fIfileName\fR
84	84	\fIFileName\fR must be the name of a file containing a bitmap
85		description in the standard X11 or X10 format.
	85	description in the standard X11 format.
86	86	.TP 20
87	87	\fIname\fR
88	88	\fIName\fR must be the name of a bitmap defined previously with

+2

-2

doc/GetCursor.3 less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: GetCursor.3,v 1.14 2008/06/30 22:57:01 dkf Exp $
	7	'\" RCS: @(#) $Id: GetCursor.3,v 1.15 2008/11/05 22:58:29 nijtmans Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH Tk_AllocCursorFromObj 3 8.1 Tk "Tk Library Procedures"

118	118	\fB@\fIsourceName\0maskName\0fgColor\0bgColor\fR
119	119	In this form, \fIsourceName\fR and \fImaskName\fR are the names of
120	120	files describing cursors for the cursor's source bits and mask.
121		Each file must be in standard X11 or X10 cursor format.
	121	Each file must be in standard X11 cursor format.
122	122	\fIFgColor\fR and \fIbgColor\fR
123	123	indicate the colors to use for the
124	124	cursor, in any of the forms acceptable to \fBTk_GetColor\fR. This

+7

-1

doc/Tk_Main.3 less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: Tk_Main.3,v 1.7 2008/06/30 22:57:02 dkf Exp $
	7	'\" RCS: @(#) $Id: Tk_Main.3,v 1.8 2008/12/15 16:17:18 dgp Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH Tk_Main 3 4.0 Tk "Tk Library Procedures"

56	56	\fIAppInitProc\fR is almost always a pointer to \fBTcl_AppInit\fR;
57	57	for more details on this procedure, see the documentation
58	58	for \fBTcl_AppInit\fR.
	59	.PP
	60	\fBTk_Main\fR functions much the same as \fBTcl_Main\fR. In particular,
	61	\fBTk_Main\fR supports both an interactive mode and a startup script
	62	mode, with the file name and encoding of a startup script under the
	63	control of the \fBTcl_SetStartupScript\fR and \fBTcl_GetStartupScript\fR
	64	routines.
59	65	.SH KEYWORDS
60	66	application-specific initialization, command-line arguments, main program

+268

-0

doc/busy.n less more

	0	'\"
	1	'\" Copyright (c) 1993-1998 Lucent Technologies, Inc.
	2	'\" Copyright (c) 2008 Jos Decoster
	3	'\"
	4	'\" Permission to use, copy, modify, and distribute this software and its
	5	'\" documentation for any purpose and without fee is hereby granted, provided
	6	'\" that the above copyright notice appear in all copies and that both that
	7	'\" the copyright notice and warranty disclaimer appear in supporting
	8	'\" documentation, and that the names of Lucent Technologies any of their
	9	'\" entities not be used in advertising or publicity pertaining to
	10	'\" distribution of the software without specific, written prior permission.
	11	'\"
	12	'\" Lucent Technologies disclaims all warranties with regard to this software,
	13	'\" including all implied warranties of merchantability and fitness. In no
	14	'\" event shall Lucent Technologies be liable for any special, indirect or
	15	'\" consequential damages or any damages whatsoever resulting from loss of
	16	'\" use, data or profits, whether in an action of contract, negligence or
	17	'\" other tortuous action, arising out of or in connection with the use or
	18	'\" performance of this software.
	19	'\"
	20	'\" BLT::busy command created by George Howlett.
	21	'\"
	22	'\" See the file "license.terms" for information on usage and redistribution
	23	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
	24	'\"
	25	'\" RCS: @(#) $Id: busy.n,v 1.2 2008/11/24 09:56:44 dkf Exp $
	26	'\"
	27	.so man.macros
	28	.TH busy n "" Tk "Tk Built-In Commands"
	29	'\" Note: do not modify the .SH NAME line immediately below!
	30	.SH NAME
	31	busy \- confine pointer and keyboard events to a window sub-tree
	32	.SH SYNOPSIS
	33	\fBtk busy\fR \fIwindow \fR?\fIoptions\fR?
	34	.sp
	35	\fBtk busy hold\fR \fIwindow \fR?\fIoptions\fR?
	36	.sp
	37	\fBtk busy configure \fIwindow\fR ?\fIoption value\fR?...
	38	.sp
	39	\fBtk busy forget\fR \fIwindow \fR?\fIwindow \fR?...
	40	.sp
	41	\fBtk busy current\fR ?\fIpattern\fR?
	42	.sp
	43	\fBtk busy status \fIwindow\fR
	44	.BE
	45	.SH DESCRIPTION
	46	.PP
	47	The \fBtk busy\fR command provides a simple means to block keyboard, button,
	48	and pointer events from Tk widgets, while overriding the widget's cursor with
	49	a configurable busy cursor.
	50	.SH INTRODUCTION
	51	.PP
	52	There are many times in applications where you want to temporarily restrict
	53	what actions the user can take. For example, an application could have a
	54	.QW Run
	55	button that when pressed causes some processing to occur. But while the
	56	application is busy processing, you probably don't want the the user to be
	57	able to click the
	58	.QW Run
	59	button again. You may also want restrict the user from other tasks such as
	60	clicking a
	61	.QW Print
	62	button.
	63	.PP
	64	The \fBtk busy\fR command lets you make Tk widgets busy. This means that user
	65	interactions such as button clicks, moving the mouse, typing at the keyboard,
	66	etc.\0are ignored by the widget. You can set a special cursor (like a watch)
	67	that overrides the widget's normal cursor, providing feedback that the
	68	application (widget) is temporarily busy.
	69	.PP
	70	When a widget is made busy, the widget and all of its descendents will ignore
	71	events. It's easy to make an entire panel of widgets busy. You can simply make
	72	the toplevel widget (such as
	73	.QW . )
	74	busy. This is easier and far much more efficient than recursively traversing
	75	the widget hierarchy, disabling each widget and re-configuring its cursor.
	76	.PP
	77	Often, the \fBtk busy\fR command can be used instead of Tk's \fBgrab\fR
	78	command. Unlike \fBgrab\fR which restricts all user interactions to one
	79	widget, with the \fBtk busy\fR command you can have more than one widget
	80	active (for example, a
	81	.QW Cancel
	82	dialog and a
	83	.QW Help
	84	button).
	85	.SS EXAMPLE
	86	.PP
	87	You can make several widgets busy by simply making its ancestor widget busy
	88	using the \fBhold\fR operation.
	89	.PP
	90	.CS
	91	frame .top
	92	button .top.button; canvas .top.canvas
	93	pack .top.button .top.canvas
	94	pack .top
	95	# . . .
	96	\fBtk busy\fR hold .top
	97	update
	98	.CE
	99	.PP
	100	All the widgets within \fB.top\fR (including \fB.top\fR) are now busy. Using
	101	\fBupdate\fR insures that \fBtk busy\fR command will take effect before any
	102	other user events can occur.
	103	.PP
	104	When the application is no longer busy processing, you can allow user
	105	interactions again and free any resources it allocated by the \fBforget\fR
	106	operation.
	107	.PP
	108	.CS
	109	\fBtk busy\fR forget .top
	110	.CE
	111	.PP
	112	The busy window has a configurable cursor. You can change the busy cursor
	113	using the \fBconfigure\fR operation.
	114	.PP
	115	.CS
	116	\fBtk busy\fR configure .top \-cursor "watch"
	117	.CE
	118	.PP
	119	Destroying the widget will also clean up any resources allocated by the \fBtk
	120	busy\fR command.
	121	.PP
	122	.SH OPERATIONS
	123	.PP
	124	The following operations are available for the \fBtk busy\fR command:
	125	.TP
	126	\fBtk busy \fIwindow\fR ?\fIoption value\fR?...
	127	.
	128	Shortcut for \fBtk busy hold\fR command.
	129	.TP
	130	\fBtk busy hold \fIwindow\fR ?\fIoption value\fR?...
	131	.
	132	Makes the specified \fIwindow\fR (and its descendants in the Tk window
	133	hierarchy) appear busy. \fIWindow\fR must be a valid path name of a Tk widget.
	134	A transparent window is put in front of the specified window. This transparent
	135	window is mapped the next time idle tasks are processed, and the specified
	136	window and its descendants will be blocked from user interactions. Normally
	137	\fBupdate\fR should be called immediately afterward to insure that the hold
	138	operation is in effect before the application starts its processing. The
	139	following configuration options are valid:
	140	.RS
	141	.TP
	142	\fB\-cursor \fIcursorName\fR
	143	.
	144	Specifies the cursor to be displayed when the widget is made busy.
	145	\fICursorName\fR can be in any form accepted by \fBTk_GetCursor\fR. The
	146	default cursor is \fBwait\fR on Windows and \fBwatch\fR on other platforms.
	147	.RE
	148	.TP
	149	\fBtk busy cget \fIwindow\fR \fIoption\fR
	150	.
	151	Queries the \fBtk busy\fR command configuration options for \fIwindow\fR.
	152	\fIWindow\fR must be the path name of a widget previously made busy by the
	153	\fBhold\fR operation. The command returns the present value of the specified
	154	\fIoption\fR. \fIOption\fR may have any of the values accepted by the
	155	\fBhold\fR operation.
	156	.TP
	157	\fBtk busy configure \fIwindow\fR ?\fIoption value\fR?...
	158	.
	159	Queries or modifies the \fBtk busy\fR command configuration options for
	160	\fIwindow\fR. \fIWindow\fR must be the path name of a widget previously made
	161	busy by the \fBhold\fR operation. If no options are specified, a list
	162	describing all of the available options for \fIwindow\fR (see
	163	\fBTk_ConfigureInfo\fR for information on the format of this list) is
	164	returned. If \fIoption\fR is specified with no \fIvalue\fR, then the command
	165	returns a list describing the one named option (this list will be identical to
	166	the corresponding sublist of the value returned if no \fIoption\fR is
	167	specified). If one or more \fIoption\-value\fR pairs are specified, then the
	168	command modifies the given widget option(s) to have the given value(s); in
	169	this case the command returns the empty string. \fIOption\fR may have any of
	170	the values accepted by the \fBhold\fR operation.
	171	.RS
	172	.PP
	173	Please note that the option database is referenced through \fIwindow\fR. For
	174	example, if the widget \fB.frame\fR is to be made busy, the busy cursor can be
	175	specified for it by either \fBoption\fR command:
	176	.PP
	177	.CS
	178	option add *frame.busyCursor gumby
	179	option add *Frame.BusyCursor gumby
	180	.CE
	181	.RE
	182	.TP
	183	\fBtk busy forget \fIwindow\fR ?\fIwindow\fR?...
	184	.
	185	Releases resources allocated by the \fBtk busy\fR command for \fIwindow\fR,
	186	including the transparent window. User events will again be received by
	187	\fIwindow\fR. Resources are also released when \fIwindow\fR is destroyed.
	188	\fIWindow\fR must be the name of a widget specified in the \fBhold\fR
	189	operation, otherwise an error is reported.
	190	.TP
	191	\fBtk busy current \fR?\fIpattern\fR?
	192	.
	193	Returns the pathnames of all widgets that are currently busy. If a
	194	\fIpattern\fR is given, only the path names of busy widgets matching
	195	\fIpattern\fR are returned.
	196	.TP
	197	\fBtk busy status \fIwindow\fR
	198	.
	199	Returns the status of a widget \fIwindow\fR. If \fIwindow\fR presently can not
	200	receive user interactions, \fB1\fR is returned, otherwise \fB0\fR.
	201	.SH "EVENT HANDLING"
	202	.SS BINDINGS
	203	.PP
	204	The event blocking feature is implemented by creating and mapping a
	205	transparent window that completely covers the widget. When the busy window is
	206	mapped, it invisibly shields the widget and its hierarchy from all events that
	207	may be sent. Like Tk widgets, busy windows have widget names in the Tk window
	208	hierarchy. This means that you can use the \fBbind\fR command, to handle
	209	events in the busy window.
	210	.PP
	211	.CS
	212	\fBtk busy\fR hold .frame.canvas
	213	bind .frame.canvas_Busy <Enter> { ... }
	214	.CE
	215	.PP
	216	Normally the busy window is a sibling of the widget. The name of the busy
	217	window is
	218	.QW \fIwidget\fB_Busy\fR
	219	where \fIwidget\fR is the name of the widget to be made busy. In the previous
	220	example, the pathname of the busy window is
	221	.QW \fB.frame.canvas_Busy\fR .
	222	The exception is when the widget is a toplevel widget (such as
	223	.QW . )
	224	where the busy window can't be made a sibling. The busy window is then a child
	225	of the widget named
	226	.QW \fIwidget\fB._Busy\fR
	227	where \fIwidget\fR is the name of the toplevel widget. In the following
	228	example, the pathname of the busy window is
	229	.QW \fB._Busy\fR .
	230	.PP
	231	.CS
	232	\fBtk busy\fR hold .
	233	bind ._Busy <Enter> { ... }
	234	.CE
	235	.SS "ENTER/LEAVE EVENTS"
	236	.PP
	237	Mapping and unmapping busy windows generates Enter/Leave events for all
	238	widgets they cover. Please note this if you are tracking Enter/Leave events in
	239	widgets.
	240	.SS "KEYBOARD EVENTS"
	241	.PP
	242	When a widget is made busy, the widget is prevented from gaining the keyboard
	243	focus by the busy window. But if the widget already had focus, it still may
	244	received keyboard events. To prevent this, you must move focus to another
	245	window.
	246	.PP
	247	.CS
	248	\fBtk busy\fR hold .frame
	249	label .dummy
	250	focus .dummy
	251	update
	252	.CE
	253	.PP
	254	The above example moves the focus from .frame immediately after invoking the
	255	\fBhold\fR so that no keyboard events will be sent to \fB.frame\fR or any of
	256	its descendants.
	257	.SH PORTABILITY
	258	.PP
	259	Note that the \fBtk busy\fR command does not currently have any effect on OSX
	260	when Tk is built using Aqua support.
	261	.SH "SEE ALSO"
	262	grab(n)
	263	.SH KEYWORDS
	264	busy, keyboard events, pointer events, window
	265	'\" Local Variables:
	266	'\" mode: nroff
	267	'\" End:

+33

-3

doc/canvas.n less more

5	5	'\" See the file "license.terms" for information on usage and redistribution
6	6	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
7	7	'\"
8		'\" RCS: @(#) $Id: canvas.n,v 1.38 2008/10/02 19:13:35 mistachkin Exp $
	8	'\" RCS: @(#) $Id: canvas.n,v 1.40 2008/11/22 20:16:43 dkf Exp $
9	9	'\"
10	10	.so man.macros
11	11	.TH canvas n 8.3 Tk "Tk Built-In Commands"

567	567	For each item given by \fItagOrId\fR, delete the characters, or coordinates,
568	568	in the range given by \fIfirst\fR and \fIlast\fR, inclusive.
569	569	If some of the items given by \fItagOrId\fR do not support
570		indexing operations then they ignore dchars.
	570	indexing operations then they ignore this operation.
571	571	Text items interpret \fIfirst\fR and \fIlast\fR as indices to a character,
572		line and polygon items interpret them indices to a coordinate (an x,y pair).
	572	line and polygon items interpret them as indices to a coordinate (an x,y pair).
573	573	Indices are described in \fBINDICES\fR above.
574	574	If \fIlast\fR is omitted, it defaults to \fIfirst\fR.
575	575	This command returns an empty string.

649	649	command \fBfocus\fR, below), but the cursor position may
650	650	be set even when the item does not have the focus.
651	651	This command returns an empty string.
	652	.TP
	653	\fIpathName \fBimove \fItagOrId index x y\fR
	654	.VS 8.6
	655	This command causes the \fIindex\fR'th coordinate of each of the items
	656	indicated by \fItagOrId\fR to be relocated to the location (\fIx\fR,\fIy\fR).
	657	Each item interprets \fIindex\fR independently according to the rules
	658	described in \fBINDICES\fR above. Out of the standard set of items, only line
	659	and polygon items may have their coordinates relocated this way.
	660	.VE 8.6
652	661	.TP
653	662	\fIpathName \fBindex \fItagOrId index\fR
654	663	.

917	926	\fBraise\fR and \fBlower\fR widget commands for canvases.
918	927	This command returns an empty string.
919	928	.TP
	929	\fIpathName \fBrchars \fItagOrId first last string\fR
	930	.VS 8.6
	931	This command causes the text or coordinates between \fIfirst\fR and \fIlast\fR
	932	for each of the items indicated by \fItagOrId\fR to be replaced by
	933	\fIstring\fR. Each item interprets \fIfirst\fR and \fIlast\fR independently
	934	according to the rules described in \fBINDICES\fR above. Out of the standard
	935	set of items, text items support this operation by altering their text as
	936	directed, and line and polygon items support this operation by altering their
	937	coordinate list (in which case \fIstring\fR should be a list of coordinates to
	938	use as a replacement). The other items ignore this operation.
	939	.VE 8.6
	940	.TP
920	941	\fIpathName \fBscale \fItagOrId xOrigin yOrigin xScale yScale\fR
921	942	.
922	943	Rescale all of the items given by \fItagOrId\fR in canvas coordinate

1797	1818	text will be at the positioning point.
1798	1819	This option defaults to \fBcenter\fR.
1799	1820	.TP
	1821	\fB\-angle \fIrotationDegrees\fR
	1822	.VS 8.6
	1823	\fIRotationDegrees\fR tells how many degrees to rotate the text anticlockwise
	1824	about the positioning point for the text; it may have any floating-point value
	1825	from 0.0 to 360.0. For example, if \fIrotationDegrees\fR is \fB90\fR, then the
	1826	text will be drawn vertically from bottom to top.
	1827	This option defaults to \fB0.0\fR.
	1828	.VE 8.6
	1829	.TP
1800	1830	\fB\-font \fIfontName\fR
1801	1831	Specifies the font to use for the text item.
1802	1832	\fIFontName\fR may be any string acceptable to \fBTk_GetFont\fR.

+183

-0

doc/fontchooser.n less more

	0	'\"
	1	'\" Copyright (c) 2008 Daniel A. Steffen <das@users.sourceforge.net>
	2	'\"
	3	'\" See the file "license.terms" for information on usage and redistribution
	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
	5	'\"
	6	'\" RCS: @(#) $Id: fontchooser.n,v 1.1 2008/12/10 05:02:40 das Exp $
	7	'\"
	8	.so man.macros
	9	.TH fontchooser n "" Tk "Tk Built-In Commands"
	10	.BS
	11	'\" Note: do not modify the .SH NAME line immediately below!
	12	.SH NAME
	13	fontchooser \- control font selection dialog
	14	.SH SYNOPSIS
	15	\fBtk fontchooser\fR \fBconfigure\fR ?\fI\-option value \-option value ...\fR?
	16	.sp
	17	\fBtk fontchooser\fR \fBshow\fR
	18	.sp
	19	\fBtk fontchooser\fR \fBhide\fR
	20	.BE
	21	.SH DESCRIPTION
	22	.PP
	23	The \fBtk fontchooser\fR command controls the Tk font selection dialog. It uses
	24	the native platform font selection dialog where available, or a dialog
	25	implemented in Tcl otherwise.
	26	.PP
	27	Unlike most of the other Tk dialog commands, \fBtk fontchooser\fR does not
	28	return an immediate result, as on some platforms (Mac OS X) the standard font
	29	dialog is modeless while on others (Windows) it is modal. To accommodate this
	30	difference, all user interaction with the dialog will be communicated to the
	31	caller via callbacks or virtual events.
	32	.PP
	33	The \fBtk fontchooser\fR command can have one of the following forms:
	34	.TP
	35	\fBtk fontchooser\fR \fBconfigure \fR?\fI\-option value \-option value ...\fR?
	36	.
	37	Set or query one or more of the configurations options below (analogous to Tk
	38	widget configuration).
	39	.TP
	40	\fBtk fontchooser\fR \fBshow\fR
	41	.
	42	Show the font selection dialog. Depending on the platform, may return
	43	immediately or only once the dialog has been withdrawn.
	44	.TP
	45	\fBtk fontchooser\fR \fBhide\fR
	46	.
	47	Hide the font selection dialog if it is visible and cause any pending
	48	\fBtk fontchooser\fR \fBshow\fR command to return.
	49	.PP
	50	.SH "CONFIGURATION OPTIONS"
	51	.TP
	52	\fB\-parent\fR
	53	Specifies/returns the logical parent window of the font selection dialog
	54	(similar to the \fB\-parent\fR option to other dialogs). The font selection
	55	dialog is hidden if it is visible when the parent window is destroyed.
	56	.TP
	57	\fB\-title\fR
	58	Specifies/returns the title of the dialog. Has no effect on platforms where the
	59	font selection dialog does not support titles.
	60	.TP
	61	\fB\-font\fR
	62	Specifies/returns the font that is currently selected in the dialog if it is
	63	visible, or that will be initially selected when the dialog is shown (if
	64	supported by the platform). Can be set to the empty string to indicate that no
	65	font should be selected. Fonts can be specified in any form given by the "FONT
	66	DESCRIPTION" section in the \fBfont\fR manual page.
	67	.TP
	68	\fB\-command\fR
	69	Specifies/returns the command prefix to be called when a font selection has
	70	been made by the user. The command prefix is evaluated at the global level
	71	after having the specification of the selected font appended. On platforms
	72	where the font selection dialog offers the user control of further font
	73	attributes (such as color), additional key/value pairs may be appended before
	74	evaluation. Can be set to the empty string to indicate that no callback should
	75	be invoked. Fonts are specified by a list of form [3] of the "FONT DESCRIPTION"
	76	section in the \fBfont\fR manual page (i.e. a list of the form
	77	\fI{family size style ?style ...?}\fR).
	78	.TP
	79	\fB\-visible\fR
	80	Read-only option that returns a boolean indicating whether the font selection
	81	dialog is currently visible. Attempting to set this option results in an error.
	82
	83	.PP
	84	.SH "VIRTUAL EVENTS"
	85	.TP
	86	\fB<<TkFontchooserVisibility>>\fR
	87	Sent to the dialog parent whenever the visibility of the font selection dialog
	88	changes, both as a result of user action (e.g. disposing of the dialog via
	89	OK/Cancel button or close box) and of the \fBtk fontchooser\fR
	90	\fBshow\fR/\fBhide\fR commands being called. Binding scripts can determine the
	91	current visibility of the dialog by querying the \fB\-visible\fR configuration
	92	option.
	93	.TP
	94	\fB<<TkFontchooserFontChanged>>\fR
	95	Sent to the dialog parent whenever the font selection dialog is visible and the
	96	selected font changes, both as a result of user action and of the \fB\-font\fR
	97	configuration option being set. Binding scripts can determine the currently
	98	selected font by querying the \fB\-font\fR configuration option.
	99	.PP
	100	.SH NOTES
	101	.PP
	102	Callers should not expect a result from \fBtk fontchooser\fR \fBshow\fR and may
	103	not assume that the dialog has been withdrawn or closed when the command
	104	returns. All user interaction with the dialog is communicated to the caller via
	105	the \fB\-command\fR callback and the \fB<<TkFontchooser*>>\fR virtual events.
	106	It is implementation dependent which exact user actions result in the callback
	107	being called resp. the virtual events being sent. Where an Apply or OK button
	108	is present in the dialog, that button will trigger the \fB\-command\fR callback
	109	and \fB<<TkFontchooserFontChanged>>\fR virtual event. On some implementations
	110	other user actions may also have that effect; on Mac OS X for instance, the
	111	standard font selection dialog immediately reflects all user choices to the
	112	caller.
	113	.PP
	114	In the presence of multiple widgets intended to be influenced by the font
	115	selection dialog, care needs to be taken to correctly handle focus changes: the
	116	font selected in the dialog should always match the current font of the widget
	117	with the focus, and the \fB\-command\fR callback should only act on the widget
	118	with the focus. The recommended practice is to set font dialog \fB\-font\fR and
	119	\fB\-command\fR configuration options in per\-widget \fB<FocusIn>\fR handlers
	120	(and if necessary to unset them \- i.e. set to the empty string \- in
	121	corresponding \fB<FocusOut>\fR handlers). This is particularly important for
	122	implementors of library code using the font selection dialog, to avoid
	123	conflicting with application code that may also want to use the dialog.
	124	.PP
	125	Because the font selection dialog is application-global, in the presence of
	126	multiple interpreters calling \fBtk fontchooser\fR, only the \fB\-command\fR
	127	callback set by the interpreter that most recently called \fBtk fontchooser\fR
	128	\fBconfigure\fR or \fBtk fontchooser\fR \fBshow\fR will be invoked in response
	129	to user action and only the \fB\-parent\fR set by that interpreter will receive
	130	\fB<<TkFontchooser*>>\fR virtual events.
	131	.PP
	132	The font dialog implementation may only store (and return) \fBfont\fR
	133	\fBactual\fR data as the value of the \fB\-font\fR configuration option. This
	134	can be an issue when \fB\-font\fR is set to a named font, if that font is
	135	subsequently changed, the font dialog \fB\-font\fR option needs to be set again
	136	to ensure its selected font matches the new value of the named font.
	137	.PP
	138	.SH EXAMPLE
	139	.PP
	140	.CS
	141	proc fontchooserDemo {} {
	142	wm title . "Font Chooser Demo"
	143	\fBtk fontchooser\fR \fBconfigure\fR \-parent .
	144	button .b \-command fontchooserToggle \-takefocus 0
	145	fontchooserVisibility .b
	146	bind . \fB<<TkFontchooserVisibility>>\fR \\
	147	[list fontchooserVisibility .b]
	148	foreach w {.t1 .t2} {
	149	text $w \-width 20 \-height 4 \-borderwidth 1 \-relief solid
	150	bind $w <FocusIn> [list fontchooserFocus $w]
	151	$w insert end "Text Widget $w"
	152	}
	153	.t1 configure \-font {Courier 14}
	154	.t2 configure \-font {Times 16}
	155	pack .b .t1 .t2; focus .t1
	156	}
	157	proc fontchooserToggle {} {
	158	\fBtk fontchooser\fR [expr {
	159	[\fBtk fontchooser\fR \fBconfigure\fR \-visible] ?
	160	"\fBhide\fR" : "\fBshow\fR"}]
	161	}
	162	proc fontchooserVisibility {w} {
	163	$w configure \-text [expr {
	164	[\fBtk fontchooser\fR \fBconfigure\fR \-visible] ?
	165	"Hide Font Dialog" : "Show Font Dialog"}]
	166	}
	167	proc fontchooserFocus {w} {
	168	\fBtk fontchooser\fR \fBconfigure\fR \-font [$w cget \-font] \\
	169	\-command [list fontchooserFontSelection $w]
	170	}
	171	proc fontchooserFontSelection {w font args} {
	172	$w configure \-font [font actual $font]
	173	}
	174	fontchooserDemo
	175	.CE
	176	.SH "SEE ALSO"
	177	font(n), tk(n)
	178	.SH KEYWORDS
	179	dialog, font, font selection, font chooser, font panel
	180	'\" Local Variables:
	181	'\" mode: nroff
	182	'\" End:

+3

-1

doc/grab.n less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: grab.n,v 1.10 2008/09/23 13:36:40 dkf Exp $
	7	'\" RCS: @(#) $Id: grab.n,v 1.11 2008/10/18 14:22:21 dkf Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH grab n "" Tk "Tk Built-In Commands"

132	132	pack [button .b3 \-text "Click me! #3" \-command {destroy .b3}]
133	133	\fBgrab\fR .b2
134	134	.CE
	135	.SH "SEE ALSO"
	136	busy(n)
135	137	.SH KEYWORDS
136	138	grab, keyboard events, pointer events, window
137	139	'\" Local Variables:

+5

-3

doc/selection.n less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: selection.n,v 1.14 2008/09/23 13:36:54 dkf Exp $
	7	'\" RCS: @(#) $Id: selection.n,v 1.15 2008/12/17 22:36:46 dkf Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH selection n 8.1 Tk "Tk Built-In Commands"

128	128	application owns the selection. \fISelection\fR defaults to PRIMARY and
129	129	\fIwindow\fR defaults to
130	130	.QW . .
	131	.RS
131	132	.PP
132	133	The second form of \fBselection own\fR causes \fIwindow\fR to become
133	134	the new owner of \fIselection\fR on \fIwindow\fR's display, returning

136	137	If \fIcommand\fR is specified, it is a Tcl script to execute when
137	138	some other window claims ownership of the selection away from
138	139	\fIwindow\fR. \fISelection\fR defaults to PRIMARY.
	140	.RE
139	141	.SH EXAMPLES
140	142	.PP
141	143	On X11 platforms, one of the standard selections available is the

154	156	.CE
155	157	.PP
156	158	To claim the selection, you must first set up a handler to supply the
157		data for the selection. Then you have to claim the selection...
	159	data for the selection. Then you have to claim the selection...
158	160	.CS
159	161	# Set up the data handler ready for incoming requests
160	162	set foo "This is a string with some data in it... blah blah"
161	163	\fBselection handle\fR \-selection SECONDARY . getData
162	164	proc getData {offset maxChars} {
163	165	puts "Retrieving selection starting at $offset"
164		return [string range $::foo $offset [expr {$offset+$maxChars}]]
	166	return [string range $::foo $offset [expr {$offset+$maxChars-1}]]
165	167	}
166	168
167	169	# Now we grab the selection itself

+9

-1

doc/text.n less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: text.n,v 1.57 2008/09/23 13:36:55 dkf Exp $
	7	'\" RCS: @(#) $Id: text.n,v 1.58 2008/12/06 10:48:29 dkf Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH text n 8.5 Tk "Tk Built-In Commands"

50	50	Specifies the colour to use for the selection (the \fBsel\fR tag) when the
51	51	window does not have the input focus. If empty, \fB{}\fR, then no selection is
52	52	shown when the window does not have the focus.
	53	.OP \-insertunfocussed insertUnfocussed InsertUnfocussed
	54	.VS 8.6
	55	Specifies how to display the insertion cursor when the widget does not have
	56	the focus. Must be \fBnone\fR (the default) which means to not display the
	57	cursor, \fBhollow\fR which means to display a hollow box, or \fBsolid\fR which
	58	means to display a solid box. Note that \fBhollow\fR and \fBsolid\fR will
	59	appear very similar when the \fB\-blockcursor\fR option is false.
	60	.VE 8.6
53	61	.OP \-maxundo maxUndo MaxUndo
54	62	Specifies the maximum number of compound undo actions on the undo stack. A
55	63	zero or a negative value imply an unlimited undo stack.

+38

-27

doc/tk.n less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: tk.n,v 1.19 2008/09/23 13:36:55 dkf Exp $
	7	'\" RCS: @(#) $Id: tk.n,v 1.21 2008/12/10 05:02:40 das Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH tk n 8.4 Tk "Tk Built-In Commands"

46	46	this command will reenable them and recreate the \fBsend\fR
47	47	command.
48	48	.TP
	49	\fBtk busy \fIsubcommand\fR ...
	50	.
	51	This command controls the marking of window hierarchies as
	52	.QW busy ,
	53	rendering them non-interactive while some other operation is proceeding. For
	54	more details see the \fBbusy\fR manual page.
	55	.TP
49	56	\fBtk caret window \fR?\fB\-x \fIx\fR? ?\fB\-y \fIy\fR? ?\fB\-height \fIheight\fR?
50	57	.
51	58	Sets and queries the caret location for the display of the specified

57	64	format. \fI\-x\fR and \fI\-y\fR represent window-relative coordinates, and
58	65	\fI\-height\fR is the height of the current cursor location, or the height
59	66	of the specified \fIwindow\fR if none is given.
60		.TP
61		\fBtk scaling \fR?\fB\-displayof \fIwindow\fR? ?\fInumber\fR?
62		.
63		Sets and queries the current scaling factor used by Tk to convert between
64		physical units (for example, points, inches, or millimeters) and pixels. The
65		\fInumber\fR argument is a floating point number that specifies the number of
66		pixels per point on \fIwindow\fR's display. If the \fIwindow\fR argument is
67		omitted, it defaults to the main window. If the \fInumber\fR argument is
68		omitted, the current value of the scaling factor is returned.
69		.RS
70		.PP
71		A
72		.QW point
73		is a unit of measurement equal to 1/72 inch. A scaling factor
74		of 1.0 corresponds to 1 pixel per point, which is equivalent to a standard
75		72 dpi monitor. A scaling factor of 1.25 would mean 1.25 pixels per point,
76		which is the setting for a 90 dpi monitor; setting the scaling factor to
77		1.25 on a 72 dpi monitor would cause everything in the application to be
78		displayed 1.25 times as large as normal. The initial value for the scaling
79		factor is set when the application starts, based on properties of the
80		installed monitor, but it can be changed at any time. Measurements made
81		after the scaling factor is changed will use the new scaling factor, but it
82		is undefined whether existing widgets will resize themselves dynamically to
83		accommodate the new scaling factor.
84		.RE
85	67	.TP
86	68	\fBtk inactive \fR?\fB\-displayof \fIwindow\fR? ?\fBreset\fR?
87	69	.

101	83	error if tried.
102	84	.RE
103	85	.TP
	86	\fBtk fontchooser \fIsubcommand\fR ...
	87	Controls the Tk font selection dialog. For more details see the
	88	\fBfontchooser\fR manual page.
	89	.TP
	90	\fBtk scaling \fR?\fB\-displayof \fIwindow\fR? ?\fInumber\fR?
	91	.
	92	Sets and queries the current scaling factor used by Tk to convert between
	93	physical units (for example, points, inches, or millimeters) and pixels. The
	94	\fInumber\fR argument is a floating point number that specifies the number of
	95	pixels per point on \fIwindow\fR's display. If the \fIwindow\fR argument is
	96	omitted, it defaults to the main window. If the \fInumber\fR argument is
	97	omitted, the current value of the scaling factor is returned.
	98	.RS
	99	.PP
	100	A
	101	.QW point
	102	is a unit of measurement equal to 1/72 inch. A scaling factor
	103	of 1.0 corresponds to 1 pixel per point, which is equivalent to a standard
	104	72 dpi monitor. A scaling factor of 1.25 would mean 1.25 pixels per point,
	105	which is the setting for a 90 dpi monitor; setting the scaling factor to
	106	1.25 on a 72 dpi monitor would cause everything in the application to be
	107	displayed 1.25 times as large as normal. The initial value for the scaling
	108	factor is set when the application starts, based on properties of the
	109	installed monitor, but it can be changed at any time. Measurements made
	110	after the scaling factor is changed will use the new scaling factor, but it
	111	is undefined whether existing widgets will resize themselves dynamically to
	112	accommodate the new scaling factor.
	113	.RE
	114	.TP
104	115	\fBtk useinputmethods \fR?\fB\-displayof \fIwindow\fR? ?\fIboolean\fR?
105	116	.
106	117	Sets and queries the state of whether Tk should use XIM (X Input Methods)

117	128	\fBx11\fR (X11-based), \fBwin32\fR (MS Windows),
118	129	or \fBaqua\fR (Mac OS X Aqua).
119	130	.SH "SEE ALSO"
120		send(n), winfo(n)
	131	busy(n), fontchooser(n), send(n), winfo(n)
121	132	.SH KEYWORDS
122	133	application name, send
123	134	'\" Local Variables:

+5

-1

doc/ttk_button.n less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: ttk_button.n,v 1.14 2008/09/23 13:36:56 dkf Exp $
	6	'\" RCS: @(#) $Id: ttk_button.n,v 1.15 2008/12/04 15:47:22 dkf Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH ttk::button n 8.5 Tk "Tk Themed Widget"

63	63	.TP
64	64	\fIpathName \fBinvoke\fR
65	65	Invokes the command associated with the button.
	66	.SH "STANDARD STYLES"
	67	.PP
	68	\fBTtk::button\fR widgets support the \fBToolbutton\fR style in all standard
	69	themes, which is useful for creating widgets for toolbars.
66	70	.SH "COMPATIBILITY OPTIONS"
67	71	.OP \-state state State
68	72	May be set to \fBnormal\fR or \fBdisabled\fR to control the

+5

-1

doc/ttk_checkbutton.n less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: ttk_checkbutton.n,v 1.15 2008/09/23 13:36:56 dkf Exp $
	6	'\" RCS: @(#) $Id: ttk_checkbutton.n,v 1.16 2008/12/04 15:47:22 dkf Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH ttk::checkbutton n 8.5 Tk "Tk Themed Widget"

65	65	or
66	66	.QW indeterminate
67	67	selection.)
	68	.SH "STANDARD STYLES"
	69	.PP
	70	\fBTtk::checkbutton\fR widgets support the \fBToolbutton\fR style in all
	71	standard themes, which is useful for creating widgets for toolbars.
68	72	.SH "SEE ALSO"
69	73	ttk::widget(n), ttk::radiobutton(n), checkbutton(n)
70	74	.SH "KEYWORDS"

+33

-24

doc/ttk_combobox.n less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: ttk_combobox.n,v 1.18 2008/09/23 13:36:56 dkf Exp $
	6	'\" RCS: @(#) $Id: ttk_combobox.n,v 1.19 2008/10/27 13:38:51 dkf Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH ttk::combobox n 8.5 Tk "Tk Themed Widget"

29	29	If set, the widget selection is linked to the X selection.
30	30	.OP \-justify justify Justify
31	31	Specifies how the text is aligned within the widget.
32		One of \fBleft\fR, \fBcenter\fR, or \fBright\fR.
	32	Must be one of \fBleft\fR, \fBcenter\fR, or \fBright\fR.
33	33	.OP \-height height Height
34	34	Specifies the height of the pop-down listbox, in rows.
35	35	.OP \-postcommand postCommand PostCommand

55	55	Specifies an integer value indicating the desired width of the entry window,
56	56	in average-size characters of the widget's font.
57	57	.SH "WIDGET COMMAND"
58		.TP
59		\fIpathName \fBcget\fR \fIoption\fR
60		Returns the current value of the specified \fIoption\fR.
61		See \fIttk::widget(n)\fR.
62		.TP
63		\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
64		Modify or query widget options.
65		See \fIttk::widget(n)\fR.
	58	.PP
	59	The following subcommands are possible for combobox widgets:
	60	'\".TP
	61	'\"\fIpathName \fBcget\fR \fIoption\fR
	62	'\"Returns the current value of the specified \fIoption\fR.
	63	'\"See \fIttk::widget(n)\fR.
	64	'\".TP
	65	'\"\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
	66	'\"Modify or query widget options.
	67	'\"See \fIttk::widget(n)\fR.
66	68	.TP
67	69	\fIpathName \fBcurrent\fR ?\fInewIndex\fR?
68	70	If \fInewIndex\fR is supplied, sets the combobox value

72	74	.TP
73	75	\fIpathName \fBget\fR
74	76	Returns the current value of the combobox.
75		.TP
76		\fIpathName \fBidentify \fIx y\fR
77		Returns the name of the element at position \fIx\fR, \fIy\fR.
78		See \fIttk::widget(n)\fR.
79		.TP
80		\fIpathName \fBinstate \fIstateSpec\fR ?\fIscript\fR?
81		Test the widget state.
82		See \fIttk::widget(n)\fR.
	77	'\".TP
	78	'\"\fIpathName \fBidentify \fIx y\fR
	79	'\"Returns the name of the element at position \fIx\fR, \fIy\fR.
	80	'\"See \fIttk::widget(n)\fR.
	81	'\".TP
	82	'\"\fIpathName \fBinstate \fIstateSpec\fR ?\fIscript\fR?
	83	'\"Test the widget state.
	84	'\"See \fIttk::widget(n)\fR.
83	85	.TP
84	86	\fIpathName \fBset\fR \fIvalue\fR
85	87	Sets the value of the combobox to \fIvalue\fR.
86		.TP
87		\fIpathName \fBstate\fR ?\fIstateSpec\fR?
88		Modify or query the widget state.
89		See \fIttk::widget(n)\fR.
	88	'\".TP
	89	'\"\fIpathName \fBstate\fR ?\fIstateSpec\fR?
	90	'\"Modify or query the widget state.
	91	'\"See \fIttk::widget(n)\fR.
90	92	.PP
91		The combobox widget also supports the following \fIttk::entry\fR
92		widget commands (see \fIttk::entry(n)\fR for details):
	93	The combobox widget also supports the following \fBttk::entry\fR
	94	widget subcommands (see \fIttk::entry(n)\fR for details):
93	95	.DS
94	96	.ta 5.5c 11c
95	97	\fBbbox\fR \fBdelete\fR \fBicursor\fR
96	98	\fBindex\fR \fBinsert\fR \fBselection\fR
97	99	\fBxview\fR
	100	.DE
	101	The combobox widget also supports the following generic \fBttk::widget\fR
	102	widget subcommands (see \fIttk::widget(n)\fR for details):
	103	.DS
	104	.ta 5.5c 11c
	105	\fBcget\fR \fBconfigure\fR \fBidentify\fR
	106	\fBinstate\fR \fBstate\fR
98	107	.DE
99	108	.SH "VIRTUAL EVENTS"
100	109	.PP

+60

-47

doc/ttk_entry.n less more

6	6	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
7	7	'\"
8	8	'\" SOURCE: entry.n, r1.12
9		'\" RCS: @(#) $Id: ttk_entry.n,v 1.13 2008/09/23 13:36:56 dkf Exp $
	9	'\" RCS: @(#) $Id: ttk_entry.n,v 1.15 2008/11/24 09:56:44 dkf Exp $
10	10	'\"
11	11	.so man.macros
12	12	.TH ttk::entry n 8.5 Tk "Tk Themed Widget"

133	133	It is an error to use this form if the selection is not in the
134	134	entry window.
135	135	.LP
136		Abbreviations may be used for any of the forms above, e.g.
	136	Abbreviations may be used for any of the forms above, e.g.\\|
137	137	.QW \fBe\fR
138	138	or
139		.QW \fBsel.f\fR .
	139	.QW \fBsel.l\fR .
140	140	In general, out-of-range indices are automatically rounded to the
141	141	nearest legal value.
142	142	.SH "WIDGET COMMAND"
143	143	.PP
144		The following commands are possible for entry widgets:
	144	The following subcommands are possible for entry widgets:
145	145	.TP
146	146	\fIpathName \fBbbox \fIindex\fR
147	147	Returns a list of four numbers describing the bounding box of the

152	152	the width and height of the character, in pixels.
153	153	The bounding box may refer to a region outside the visible area
154	154	of the window.
155		.TP
156		\fIpathName \fBcget\fR \fIoption\fR
157		Returns the current value of the specified \fIoption\fR.
158		See \fIttk::widget(n)\fR.
159		.TP
160		\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
161		Modify or query widget options.
162		See \fIttk::widget(n)\fR.
	155	'\".TP
	156	'\"\fIpathName \fBcget\fR \fIoption\fR
	157	'\"Returns the current value of the specified \fIoption\fR.
	158	'\"See \fIttk::widget(n)\fR.
	159	'\".TP
	160	'\"\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
	161	'\"Modify or query widget options.
	162	'\"See \fIttk::widget(n)\fR.
163	163	.TP
164	164	\fIpathName \fBdelete \fIfirst \fR?\fIlast\fR?
165	165	Delete one or more elements of the entry.

176	176	\fIpathName \fBicursor \fIindex\fR
177	177	Arrange for the insert cursor to be displayed just before the character
178	178	given by \fIindex\fR. Returns the empty string.
179		.TP
180		\fIpathName \fBidentify \fIx y\fR
181		Returns the name of the element at position \fIx\fR, \fIy\fR,
182		or the empty string if the coordinates are outside the window.
	179	'\".TP
	180	'\"\fIpathName \fBidentify \fIx y\fR
	181	'\"Returns the name of the element at position \fIx\fR, \fIy\fR,
	182	'\"or the empty string if the coordinates are outside the window.
183	183	.TP
184	184	\fIpathName \fBindex\fI index\fR
185	185	Returns the numerical index corresponding to \fIindex\fR.

187	187	\fIpathName \fBinsert \fIindex string\fR
188	188	Insert \fIstring\fR just before the character
189	189	indicated by \fIindex\fR. Returns the empty string.
190		.TP
191		\fIpathName \fBinstate \fIstatespec\fR ?\fIscript\fR?
192		Test the widget state.
193		See \fIttk::widget(n)\fR.
	190	'\".TP
	191	'\"\fIpathName \fBinstate \fIstatespec\fR ?\fIscript\fR?
	192	'\"Test the widget state.
	193	'\"See \fIttk::widget(n)\fR.
194	194	.TP
195	195	\fIpathName \fBselection \fIoption arg\fR
196	196	This command is used to adjust the selection within an entry. It

213	213	If \fIend\fR refers to the same character as \fIstart\fR or an
214	214	earlier one, then the entry's selection is cleared.
215	215	.RE
216		.TP
217		\fIpathName \fBstate\fR ?\fIstateSpec\fR?
218		Modify or query the widget state.
219		See \fIttk::widget(n)\fR.
	216	'\".TP
	217	'\"\fIpathName \fBstate\fR ?\fIstateSpec\fR?
	218	'\"Modify or query the widget state.
	219	'\"See \fIttk::widget(n)\fR.
220	220	.TP
221	221	\fIpathName \fBvalidate\fR
222	222	Force revalidation, independent of the conditions specified
223	223	by the \fB\-validate\fR option.
224	224	Returns 0 if validation fails, 1 if it succeeds.
225	225	Sets or clears the \fBinvalid\fR state accordingly.
	226	See \fBVALIDATION\fR below for more details.
226	227	.TP
227	228	\fIpathName \fBxview \fIargs\fR
228	229	This command is used to query and change the horizontal position of the

262	263	become visible; if it is positive then characters farther to the right
263	264	become visible.
264	265	.RE
	266	.PP
	267	The entry widget also supports the following generic \fBttk::widget\fR
	268	widget subcommands (see \fIttk::widget(n)\fR for details):
	269	.DS
	270	.ta 5.5c 11c
	271	\fBcget\fR \fBconfigure\fR \fBidentify\fR
	272	\fBinstate\fR \fBstate\fR
	273	.DE
265	274	.SH VALIDATION
266	275	.PP
267	276	The \fB\-validate\fR, \fB\-validatecommand\fR, and \fB\-invalidcommand\fR

277	286	.PP
278	287	The \fB\-validate\fR option determines when validation occurs;
279	288	it may be set to any of the following values:
	289	.RS
280	290	.IP \fBnone\fR
281	291	Default. This means validation will only occur when
282	292	specifically requested by the \fBvalidate\fR widget command.

293	303	The entry is revalidated when the entry loses focus.
294	304	.IP \fBall\fR
295	305	Validation is performed for all above conditions.
	306	.RE
296	307	.PP
297	308	The \fB\-invalidcommand\fR is evaluated whenever
298	309	the \fB\-validatecommand\fR returns a false value.

310	321	.SS "VALIDATION SCRIPT SUBSTITUTIONS"
311	322	.PP
312	323	It is possible to perform percent substitutions on the
313		\fB\-validatecommand\fR and \fBinvalidCommand\fR,
	324	\fB\-validatecommand\fR and \fB\-invalidcommand\fR,
314	325	just as in a \fBbind\fR script.
315	326	The following substitutions are recognized:
	327	.RS
316	328	.IP \fB%d\fR
317	329	Type of action: 1 for \fBinsert\fR prevalidation,
318	330	0 for \fBdelete\fR prevalidation,

333	345	(\fBkey\fR, \fBfocusin\fR, \fBfocusout\fR, or \fBforced\fR).
334	346	.IP \fB%W\fR
335	347	The name of the entry widget.
	348	.RE
336	349	.SS "DIFFERENCES FROM TK ENTRY WIDGET VALIDATION"
337		.IP \(bu
	350	.PP
338	351	The standard Tk entry widget automatically disables validation
339	352	(by setting \fB\-validate\fR to \fBnone\fR)
340	353	if the \fB\-validatecommand\fR or \fB\-invalidcommand\fR modifies

342	355	The Tk themed entry widget only disables validation if one
343	356	of the validation scripts raises an error, or if \fB\-validatecommand\fR
344	357	does not return a valid boolean value.
345		(Thus, it is not necessary to reenable validation after
	358	(Thus, it is not necessary to re-enable validation after
346	359	modifying the entry value in a validation script).
347		.IP \(bu
348		The standard entry widget invokes validation whenever the linked
	360	.PP
	361	In addition, the standard entry widget invokes validation whenever the linked
349	362	\fB\-textvariable\fR is modified; the Tk themed entry widget does not.
350	363	.SH "DEFAULT BINDINGS"
351	364	.PP

355	368	refers to a contiguous group of letters, digits, or
356	369	.QW _
357	370	characters, or any single character other than these.
358		.IP \(bu
	371	.IP \0\(bu 4
359	372	Clicking mouse button 1 positions the insert cursor
360	373	just before the character underneath the mouse cursor, sets the
361	374	input focus to this widget, and clears any selection in the widget.
362	375	Dragging with mouse button 1 down strokes out a selection between
363	376	the insert cursor and the character under the mouse.
364		.IP \(bu
	377	.IP \0\(bu 4
365	378	Double-clicking with mouse button 1 selects the word under the mouse
366	379	and positions the insert cursor at the end of the word.
367	380	Dragging after a double click strokes out a selection consisting
368	381	of whole words.
369		.IP \(bu
	382	.IP \0\(bu 4
370	383	Triple-clicking with mouse button 1 selects all of the text in the
371	384	entry and positions the insert cursor at the end of the line.
372		.IP \(bu
	385	.IP \0\(bu 4
373	386	The ends of the selection can be adjusted by dragging with mouse
374	387	button 1 while the Shift key is down.
375	388	If the button is double-clicked before dragging then the selection
376	389	will be adjusted in units of whole words.
377		.IP \(bu
	390	.IP \0\(bu 4
378	391	Clicking mouse button 1 with the Control key down will position the
379	392	insert cursor in the entry without affecting the selection.
380		.IP \(bu
	393	.IP \0\(bu 4
381	394	If any normal printing characters are typed in an entry, they are
382	395	inserted at the point of the insert cursor.
383		.IP \(bu
	396	.IP \0\(bu 4
384	397	The view in the entry can be adjusted by dragging with mouse button 2.
385	398	If mouse button 2 is clicked without moving the mouse, the selection
386	399	is copied into the entry at the position of the mouse cursor.
387		.IP \(bu
	400	.IP \0\(bu 4
388	401	If the mouse is dragged out of the entry on the left or right sides
389	402	while button 1 is pressed, the entry will automatically scroll to
390	403	make more text visible (if there is more text off-screen on the side
391	404	where the mouse left the window).
392		.IP \(bu
	405	.IP \0\(bu 4
393	406	The Left and Right keys move the insert cursor one character to the
394	407	left or right; they also clear any selection in the entry.
395	408	If Left or Right is typed with the Shift key down, then the insertion

398	411	Control-Shift-Left and Control-Shift-Right move the insert cursor
399	412	by words and also extend the selection.
400	413	Control-b and Control-f behave the same as Left and Right, respectively.
401		.IP \(bu
	414	.IP \0\(bu 4
402	415	The Home key and Control-a move the insert cursor to the
403	416	beginning of the entry and clear any selection in the entry.
404	417	Shift-Home moves the insert cursor to the beginning of the entry
405	418	and extends the selection to that point.
406		.IP \(bu
	419	.IP \0\(bu 4
407	420	The End key and Control-e move the insert cursor to the
408	421	end of the entry and clear any selection in the entry.
409	422	Shift-End moves the cursor to the end and extends the selection
410	423	to that point.
411		.IP \(bu
	424	.IP \0\(bu 4
412	425	Control-/ selects all the text in the entry.
413		.IP \(bu
	426	.IP \0\(bu 4
414	427	Control-\e clears any selection in the entry.
415		.IP \(bu
	428	.IP \0\(bu 4
416	429	The standard Tk <<Cut>>, <<Copy>>, <<Paste>>, and <<Clear>>
417	430	virtual events operate on the selection in the expected manner.
418		.IP \(bu
	431	.IP \0\(bu 4
419	432	The Delete key deletes the selection, if there is one in the entry.
420	433	If there is no selection, it deletes the character to the right of
421	434	the insert cursor.
422		.IP \(bu
	435	.IP \0\(bu 4
423	436	The BackSpace key and Control-h delete the selection, if there is one
424	437	in the entry.
425	438	If there is no selection, it deletes the character to the left of
426	439	the insert cursor.
427		.IP \(bu
	440	.IP \0\(bu 4
428	441	Control-d deletes the character to the right of the insert cursor.
429		.IP \(bu
	442	.IP \0\(bu 4
430	443	Control-k deletes all the characters to the right of the insertion
431	444	cursor.
432	445	.SH "WIDGET STATES"

+5

-1

doc/ttk_menubutton.n less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: ttk_menubutton.n,v 1.12 2008/09/23 13:36:57 dkf Exp $
	6	'\" RCS: @(#) $Id: ttk_menubutton.n,v 1.13 2008/12/04 15:47:22 dkf Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH ttk::menubutton n 8.5 Tk "Tk Themed Widget"

42	42	Menubutton widgets support the standard
43	43	\fBcget\fR, \fBconfigure\fR, \fBidentify\fR, \fBinstate\fR, and \fBstate\fR
44	44	methods. No other widget methods are used.
	45	.SH "STANDARD STYLES"
	46	.PP
	47	\fBTtk::menubutton\fR widgets support the \fBToolbutton\fR style in all
	48	standard themes, which is useful for creating widgets for toolbars.
45	49	.SH "SEE ALSO"
46	50	ttk::widget(n), menu(n), menubutton(n)
47	51	.SH "KEYWORDS"

+1

-2

doc/ttk_panedwindow.n less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: ttk_panedwindow.n,v 1.18 2008/09/23 13:36:57 dkf Exp $
	6	'\" RCS: @(#) $Id: ttk_panedwindow.n,v 1.19 2008/11/19 20:17:34 jenglish Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH ttk::panedwindow n 8.5 Tk "Tk Themed Widget"

57	57	.TP
58	58	\fIpathname \fBadd\fR \fIsubwindow\fR \fIoptions...\fR
59	59	Adds a new pane to the window.
60		\fIsubwindow\fR must be a direct child of the paned window \fIpathname\fR.
61	60	See \fBPANE OPTIONS\fR for the list of available options.
62	61	.TP
63	62	\fIpathname \fBforget\fR \fIpane\fR

+5

-1

doc/ttk_radiobutton.n less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: ttk_radiobutton.n,v 1.14 2008/09/23 13:36:57 dkf Exp $
	6	'\" RCS: @(#) $Id: ttk_radiobutton.n,v 1.15 2008/12/04 15:47:22 dkf Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH ttk::radiobutton n 8.5 Tk "Tk Themed Widget"

62	62	or
63	63	.QW indeterminate
64	64	selection.)
	65	.SH "STANDARD STYLES"
	66	.PP
	67	\fBTtk::radiobutton\fR widgets support the \fBToolbutton\fR style in all
	68	standard themes, which is useful for creating widgets for toolbars.
65	69	.SH "SEE ALSO"
66	70	ttk::widget(n), ttk::checkbutton(n), radiobutton(n)
67	71	.SH "KEYWORDS"

+88

-0

doc/ttk_spinbox.n less more

	0	'\"
	1	'\" Copyright (c) 2008 Pat Thoyts
	2	'\"
	3	'\" See the file "license.terms" for information on usage and redistribution
	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
	5	'\"
	6	'\" RCS: @(#) $Id: ttk_spinbox.n,v 1.2 2008/11/24 09:56:44 dkf Exp $
	7	'\"
	8	.so man.macros
	9	.TH ttk::spinbox n 8.5 Tk "Tk Themed Widget"
	10	.BS
	11	.SH NAME
	12	ttk::spinbox \- Selecting text field widget
	13	.SH SYNOPSIS
	14	\fBttk::spinbox\fR \fIpathName \fR?\fIoptions\fR?
	15	.BE
	16	.SH DESCRIPTION
	17	.PP
	18	A \fBttk::spinbox\fR widget is a \fBttk::entry\fR widget with built-in
	19	up and down buttons that are used to either modify a numeric value or
	20	to select among a set of values. The widget implements all the features
	21	of the \fBttk::entry\fR widget including support of the
	22	\fB\-textvariable\fR option to link the value displayed by the widget
	23	to a Tcl variable.
	24	.SO ttk_widget
	25	\-class \-cursor \-style
	26	\-takefocus \-xscrollcommand
	27	.SE
	28	.SO ttk_entry
	29	\-validate \-validatecommand
	30	.SE
	31	.SH "WIDGET-SPECIFIC OPTIONS"
	32	.OP \-from from From
	33	A floating\-point value specifying the lowest value for the spinbox. This is
	34	used in conjunction with \fI\-to\fR and \fI\-increment\fR to set a numerical
	35	range.
	36	.OP \-to to To
	37	A floating\-point value specifying the highest permissible value for the
	38	widget. See also \fI\-from\fR and \fI\-increment\fR.
	39	range.
	40	.OP \-increment increment Increment
	41	A floating\-point value specifying the change in value to be applied each
	42	time one of the widget spin buttons is pressed. The up button applies a
	43	positive increment, the down button applies a negative increment.
	44	.OP \-values values Values
	45	This must be a Tcl list of values. If this option is set then this will
	46	override any range set using the \fI\-from\fR, \fI\-to\fR and
	47	\fI\-increment\fR options. The widget will instead use the values
	48	specified beginning with the first value.
	49	.OP \-wrap wrap Wrap
	50	Must be a proper boolean value. If on, the spinbox will wrap around the
	51	values of data in the widget.
	52	.OP \-format format Format
	53	Specifies an alternate format to use when setting the string value
	54	when using the \fB\-from\fR and \fB\-to\fR range.
	55	This must be a format specifier of the form \fB%<pad>.<pad>f\fR,
	56	as it will format a floating-point number.
	57	.OP \-command command Command
	58	Specifies a Tcl command to be invoked whenever a spinbutton is invoked.
	59	.SH "INDICES"
	60	.PP
	61	See the \fBttk::entry\fR manual for information about indexing characters.
	62	.SH "VALIDATION"
	63	.PP
	64	See the \fBttk::entry\fR manual for information about using the
	65	\fI\-validate\fR and \fI\-validatecommand\fR options.
	66	.SH "WIDGET COMMAND"
	67	.PP
	68	The following subcommands are possible for spinbox widgets in addition to
	69	the commands described for the \fBttk::entry\fR widget:
	70	.TP
	71	\fIpathName \fBcurrent \fIindex\fR
	72	.TP
	73	\fIpathName \fBget\fR
	74	Returns the spinbox's current value.
	75	.TP
	76	\fIpathName \fBset \fIvalue\fR
	77	Set the spinbox string to \fIvalue\fR. If a \fI\-format\fR option has
	78	been configured then this format will be applied. If formatting fails
	79	or is not set or the \fI\-values\fR option has been used then the value
	80	is set directly.
	81	.SH "SEE ALSO"
	82	ttk::widget(n), ttk::entry(n), spinbox(n)
	83	.SH KEYWORDS
	84	entry, spinbox, widget, text field
	85	'\" Local Variables:
	86	'\" mode: nroff
	87	'\" End:

+9

-1

doc/ttk_widget.n less more

3	3	'\" See the file "license.terms" for information on usage and redistribution
4	4	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
5	5	'\"
6		'\" RCS: @(#) $Id: ttk_widget.n,v 1.16 2008/09/23 13:36:58 dkf Exp $
	6	'\" RCS: @(#) $Id: ttk_widget.n,v 1.17 2008/12/03 18:44:49 jenglish Exp $
7	7	'\"
8	8	.so man.macros
9	9	.TH ttk::widget n 8.5 Tk "Tk Themed Widget"

233	233	The widget's value is invalid.
234	234	(Potential uses: scale widget value out of bounds,
235	235	entry widget value failed validation.)
	236	.TP
	237	\fBhover\fR
	238	The mouse cursor is within the widget.
	239	This is similar to the \fBactive\fP state;
	240	it is used in some themes for widgets that
	241	provide distinct visual feedback for
	242	the active widget in addition to the active element
	243	within the widget.
236	244	.PP
237	245	A \fIstate specification\fR or \fIstateSpec\fR is a list
238	246	of state names, optionally prefixed with an exclamation point (!)

+13

-2

doc/wm.n less more

4	4	'\" See the file "license.terms" for information on usage and redistribution
5	5	'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
6	6	'\"
7		'\" RCS: @(#) $Id: wm.n,v 1.40 2008/09/23 13:36:58 dkf Exp $
	7	'\" RCS: @(#) $Id: wm.n,v 1.42 2008/11/16 17:07:51 dkf Exp $
8	8	'\"
9	9	.so man.macros
10	10	.TH wm n 8.5 Tk "Tk Built-In Commands"

441	441	\fBwm manage \fIwidget\fR
442	442	.
443	443	The \fIwidget\fR specified will become a stand alone top-level window. The
444		window will be decorated with the window managers title bar, etc.
	444	window will be decorated with the window managers title bar, etc. Only
	445	\fIframe\fR, \fIlabelframe\fR and \fItoplevel\fR widgets can be used
	446	with this command. Attempting to pass any other widget type will raise
	447	an error. Attempting to manage a \fItoplevel\fR widget is benign and
	448	achieves nothing. See also \fBGEOMETRY MANAGEMENT\fR.
445	449	.TP
446	450	\fBwm maxsize \fIwindow\fR ?\fIwidth height\fR?
447	451	.

485	489	that the window will not be reparented from the root window into a
486	490	decorative frame and the user will not be able to manipulate the
487	491	window using the normal window manager mechanisms.
	492	.RS
	493	.PP
	494	Note that the override-redirect flag is only guaranteed to be taken notice of
	495	when the window is first mapped or when mapped after the state is changed from
	496	withdrawn to normal. Some, but not all, platforms will take notice at
	497	additional times.
	498	.RE
488	499	.TP
489	500	\fBwm positionfrom \fIwindow\fR ?\fIwho\fR?
490	501	.

+2

-2

generic/default.h less more

9	9	* See the file "license.terms" for information on usage and redistribution
10	10	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: default.h,v 1.5 2004/03/17 18:15:42 das Exp $
	12	* RCS: @(#) $Id: default.h,v 1.6 2008/11/06 22:19:00 nijtmans Exp $
13	13	*/
14	14
15	15	#ifndef _DEFAULT
16	16	#define _DEFAULT
17	17
18	18	#if defined(__WIN32__) \|\| defined(_WIN32) \|\| \
19		defined(__CYGWIN__) \|\| defined(__MINGW32__)
	19	defined(__MINGW32__)
20	20	# include "tkWinDefault.h"
21	21	#else
22	22	# if defined(MAC_OSX_TK)

+0

-284

~~generic/prolog.ps~~ less more

0		%%BeginProlog
1		50 dict begin
2
3		% This is a standard prolog for Postscript generated by Tk's canvas
4		% widget.
5		% RCS: @(#) $Id: prolog.ps,v 1.2 1999/04/16 01:51:09 stanton Exp $
6
7		% The definitions below just define all of the variables used in
8		% any of the procedures here. This is needed for obscure reasons
9		% explained on p. 716 of the Postscript manual (Section H.2.7,
10		% "Initializing Variables," in the section on Encapsulated Postscript).
11
12		/baseline 0 def
13		/stipimage 0 def
14		/height 0 def
15		/justify 0 def
16		/lineLength 0 def
17		/spacing 0 def
18		/stipple 0 def
19		/strings 0 def
20		/xoffset 0 def
21		/yoffset 0 def
22		/tmpstip null def
23
24		% Define the array ISOLatin1Encoding (which specifies how characters are
25		% encoded for ISO-8859-1 fonts), if it isn't already present (Postscript
26		% level 2 is supposed to define it, but level 1 doesn't).
27
28		systemdict /ISOLatin1Encoding known not {
29		/ISOLatin1Encoding [
30		/space /space /space /space /space /space /space /space
31		/space /space /space /space /space /space /space /space
32		/space /space /space /space /space /space /space /space
33		/space /space /space /space /space /space /space /space
34		/space /exclam /quotedbl /numbersign /dollar /percent /ampersand
35		/quoteright
36		/parenleft /parenright /asterisk /plus /comma /minus /period /slash
37		/zero /one /two /three /four /five /six /seven
38		/eight /nine /colon /semicolon /less /equal /greater /question
39		/at /A /B /C /D /E /F /G
40		/H /I /J /K /L /M /N /O
41		/P /Q /R /S /T /U /V /W
42		/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
43		/quoteleft /a /b /c /d /e /f /g
44		/h /i /j /k /l /m /n /o
45		/p /q /r /s /t /u /v /w
46		/x /y /z /braceleft /bar /braceright /asciitilde /space
47		/space /space /space /space /space /space /space /space
48		/space /space /space /space /space /space /space /space
49		/dotlessi /grave /acute /circumflex /tilde /macron /breve /dotaccent
50		/dieresis /space /ring /cedilla /space /hungarumlaut /ogonek /caron
51		/space /exclamdown /cent /sterling /currency /yen /brokenbar /section
52		/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen
53		/registered /macron
54		/degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph
55		/periodcentered
56		/cedillar /onesuperior /ordmasculine /guillemotright /onequarter
57		/onehalf /threequarters /questiondown
58		/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
59		/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex
60		/Idieresis
61		/Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
62		/Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn
63		/germandbls
64		/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
65		/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex
66		/idieresis
67		/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
68		/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn
69		/ydieresis
70		] def
71		} if
72
73		% font ISOEncode font
74		% This procedure changes the encoding of a font from the default
75		% Postscript encoding to ISOLatin1. It's typically invoked just
76		% before invoking "setfont". The body of this procedure comes from
77		% Section 5.6.1 of the Postscript book.
78
79		/ISOEncode {
80		dup length dict begin
81		{1 index /FID ne {def} {pop pop} ifelse} forall
82		/Encoding ISOLatin1Encoding def
83		currentdict
84		end
85
86		% I'm not sure why it's necessary to use "definefont" on this new
87		% font, but it seems to be important; just use the name "Temporary"
88		% for the font.
89
90		/Temporary exch definefont
91		} bind def
92
93		% StrokeClip
94		%
95		% This procedure converts the current path into a clip area under
96		% the assumption of stroking. It's a bit tricky because some Postscript
97		% interpreters get errors during strokepath for dashed lines. If
98		% this happens then turn off dashes and try again.
99
100		/StrokeClip {
101		{strokepath} stopped {
102		(This Postscript printer gets limitcheck overflows when) =
103		(stippling dashed lines; lines will be printed solid instead.) =
104		[] 0 setdash strokepath} if
105		clip
106		} bind def
107
108		% desiredSize EvenPixels closestSize
109		%
110		% The procedure below is used for stippling. Given the optimal size
111		% of a dot in a stipple pattern in the current user coordinate system,
112		% compute the closest size that is an exact multiple of the device's
113		% pixel size. This allows stipple patterns to be displayed without
114		% aliasing effects.
115
116		/EvenPixels {
117		% Compute exact number of device pixels per stipple dot.
118		dup 0 matrix currentmatrix dtransform
119		dup mul exch dup mul add sqrt
120
121		% Round to an integer, make sure the number is at least 1, and compute
122		% user coord distance corresponding to this.
123		dup round dup 1 lt {pop 1} if
124		exch div mul
125		} bind def
126
127		% width height string StippleFill --
128		%
129		% Given a path already set up and a clipping region generated from
130		% it, this procedure will fill the clipping region with a stipple
131		% pattern. "String" contains a proper image description of the
132		% stipple pattern and "width" and "height" give its dimensions. Each
133		% stipple dot is assumed to be about one unit across in the current
134		% user coordinate system. This procedure trashes the graphics state.
135
136		/StippleFill {
137		% The following code is needed to work around a NeWSprint bug.
138
139		/tmpstip 1 index def
140
141		% Change the scaling so that one user unit in user coordinates
142		% corresponds to the size of one stipple dot.
143		1 EvenPixels dup scale
144
145		% Compute the bounding box occupied by the path (which is now
146		% the clipping region), and round the lower coordinates down
147		% to the nearest starting point for the stipple pattern. Be
148		% careful about negative numbers, since the rounding works
149		% differently on them.
150
151		pathbbox
152		4 2 roll
153		5 index div dup 0 lt {1 sub} if cvi 5 index mul 4 1 roll
154		6 index div dup 0 lt {1 sub} if cvi 6 index mul 3 2 roll
155
156		% Stack now: width height string y1 y2 x1 x2
157		% Below is a doubly-nested for loop to iterate across this area
158		% in units of the stipple pattern size, going up columns then
159		% across rows, blasting out a stipple-pattern-sized rectangle at
160		% each position
161
162		6 index exch {
163		2 index 5 index 3 index {
164		% Stack now: width height string y1 y2 x y
165
166		gsave
167		1 index exch translate
168		5 index 5 index true matrix tmpstip imagemask
169		grestore
170		} for
171		pop
172		} for
173		pop pop pop pop pop
174		} bind def
175
176		% -- AdjustColor --
177		% Given a color value already set for output by the caller, adjusts
178		% that value to a grayscale or mono value if requested by the CL
179		% variable.
180
181		/AdjustColor {
182		CL 2 lt {
183		currentgray
184		CL 0 eq {
185		.5 lt {0} {1} ifelse
186		} if
187		setgray
188		} if
189		} bind def
190
191		% x y strings spacing xoffset yoffset justify stipple DrawText --
192		% This procedure does all of the real work of drawing text. The
193		% color and font must already have been set by the caller, and the
194		% following arguments must be on the stack:
195		%
196		% x, y - Coordinates at which to draw text.
197		% strings - An array of strings, one for each line of the text item,
198		% in order from top to bottom.
199		% spacing - Spacing between lines.
200		% xoffset - Horizontal offset for text bbox relative to x and y: 0 for
201		% nw/w/sw anchor, -0.5 for n/center/s, and -1.0 for ne/e/se.
202		% yoffset - Vertical offset for text bbox relative to x and y: 0 for
203		% nw/n/ne anchor, +0.5 for w/center/e, and +1.0 for sw/s/se.
204		% justify - 0 for left justification, 0.5 for center, 1 for right justify.
205		% stipple - Boolean value indicating whether or not text is to be
206		% drawn in stippled fashion. If text is stippled,
207		% procedure StippleText must have been defined to call
208		% StippleFill in the right way.
209		%
210		% Also, when this procedure is invoked, the color and font must already
211		% have been set for the text.
212
213		/DrawText {
214		/stipple exch def
215		/justify exch def
216		/yoffset exch def
217		/xoffset exch def
218		/spacing exch def
219		/strings exch def
220
221		% First scan through all of the text to find the widest line.
222
223		/lineLength 0 def
224		strings {
225		stringwidth pop
226		dup lineLength gt {/lineLength exch def} {pop} ifelse
227		newpath
228		} forall
229
230		% Compute the baseline offset and the actual font height.
231
232		0 0 moveto (TXygqPZ) false charpath
233		pathbbox dup /baseline exch def
234		exch pop exch sub /height exch def pop
235		newpath
236
237		% Translate coordinates first so that the origin is at the upper-left
238		% corner of the text's bounding box. Remember that x and y for
239		% positioning are still on the stack.
240
241		translate
242		lineLength xoffset mul
243		strings length 1 sub spacing mul height add yoffset mul translate
244
245		% Now use the baseline and justification information to translate so
246		% that the origin is at the baseline and positioning point for the
247		% first line of text.
248
249		justify lineLength mul baseline neg translate
250
251		% Iterate over each of the lines to output it. For each line,
252		% compute its width again so it can be properly justified, then
253		% display it.
254
255		strings {
256		dup stringwidth pop
257		justify neg mul 0 moveto
258		stipple {
259
260		% The text is stippled, so turn it into a path and print
261		% by calling StippledText, which in turn calls StippleFill.
262		% Unfortunately, many Postscript interpreters will get
263		% overflow errors if we try to do the whole string at
264		% once, so do it a character at a time.
265
266		gsave
267		/char (X) def
268		{
269		char 0 3 -1 roll put
270		currentpoint
271		gsave
272		char true charpath clip StippleText
273		grestore
274		char stringwidth translate
275		moveto
276		} forall
277		grestore
278		} {show} ifelse
279		0 spacing neg translate
280		} forall
281		} bind def
282
283		%%EndProlog

+65

-65

generic/tk.decls less more

9	9	#
10	10	# See the file "license.terms" for information on usage and redistribution
11	11	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
12		#
13		# RCS: @(#) $Id: tk.decls,v 1.39 2008/04/02 21:31:17 das Exp $
	12	#
	13	# RCS: @(#) $Id: tk.decls,v 1.45 2008/11/12 00:15:24 nijtmans Exp $
14	14
15	15	library tk
16	16

49	49	int relief)
50	50	}
51	51	declare 5 generic {
52		void Tk_AddOption(Tk_Window tkwin, CONST char *name,
53		CONST char *value, int priority)
	52	void Tk_AddOption(Tk_Window tkwin, const char *name,
	53	const char *value, int priority)
54	54	}
55	55	declare 6 generic {
56	56	void Tk_BindEvent(Tk_BindingTable bindingTable,

68	68	}
69	69	declare 9 generic {
70	70	int Tk_CanvasGetCoord(Tcl_Interp *interp,
71		Tk_Canvas canvas, CONST char str, double doublePtr)
	71	Tk_Canvas canvas, const char str, double doublePtr)
72	72	}
73	73	declare 10 generic {
74	74	Tk_CanvasTextInfo *Tk_CanvasGetTextInfo(Tk_Canvas canvas)

102	102	}
103	103	declare 18 generic {
104	104	int Tk_CanvasTagsParseProc(ClientData clientData, Tcl_Interp *interp,
105		Tk_Window tkwin, CONST char value, char widgRec, int offset)
	105	Tk_Window tkwin, const char value, char widgRec, int offset)
106	106	}
107	107	declare 19 generic {
108		char * Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin,
	108	CONST86 char * Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin,
109	109	char widgRec, int offset, Tcl_FreeProc *freeProcPtr)
110	110	}
111	111	declare 20 generic {

136	136	declare 27 generic {
137	137	int Tk_ConfigureInfo(Tcl_Interp *interp,
138	138	Tk_Window tkwin, Tk_ConfigSpec *specs,
139		char widgRec, CONST char argvName, int flags)
	139	char widgRec, const char argvName, int flags)
140	140	}
141	141	declare 28 generic {
142	142	int Tk_ConfigureValue(Tcl_Interp *interp,
143	143	Tk_Window tkwin, Tk_ConfigSpec *specs,
144		char widgRec, CONST char argvName, int flags)
	144	char widgRec, const char argvName, int flags)
145	145	}
146	146	declare 29 generic {
147	147	int Tk_ConfigureWidget(Tcl_Interp *interp,

155	155	}
156	156	declare 31 generic {
157	157	Tk_TextLayout Tk_ComputeTextLayout(Tk_Font font,
158		CONST char *str, int numChars, int wrapLength,
	158	const char *str, int numChars, int wrapLength,
159	159	Tk_Justify justify, int flags, int *widthPtr,
160	160	int *heightPtr)
161	161	}

165	165	declare 33 generic {
166	166	unsigned long Tk_CreateBinding(Tcl_Interp *interp,
167	167	Tk_BindingTable bindingTable, ClientData object,
168		CONST char eventStr, CONST char command, int append)
	168	const char eventStr, const char command, int append)
169	169	}
170	170	declare 34 generic {
171	171	Tk_BindingTable Tk_CreateBindingTable(Tcl_Interp *interp)

184	184	void Tk_CreateGenericHandler(Tk_GenericProc *proc, ClientData clientData)
185	185	}
186	186	declare 38 generic {
187		void Tk_CreateImageType(Tk_ImageType *typePtr)
	187	void Tk_CreateImageType(const Tk_ImageType *typePtr)
188	188	}
189	189	declare 39 generic {
190	190	void Tk_CreateItemType(Tk_ItemType *typePtr)
191	191	}
192	192	declare 40 generic {
193		void Tk_CreatePhotoImageFormat(Tk_PhotoImageFormat *formatPtr)
	193	void Tk_CreatePhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
194	194	}
195	195	declare 41 generic {
196	196	void Tk_CreateSelHandler(Tk_Window tkwin,

200	200	}
201	201	declare 42 generic {
202	202	Tk_Window Tk_CreateWindow(Tcl_Interp *interp,
203		Tk_Window parent, CONST char name, CONST char screenName)
	203	Tk_Window parent, const char name, const char screenName)
204	204	}
205	205	declare 43 generic {
206	206	Tk_Window Tk_CreateWindowFromPath(Tcl_Interp *interp, Tk_Window tkwin,
207		CONST char pathName, CONST char screenName)
	207	const char pathName, const char screenName)
208	208	}
209	209	declare 44 generic {
210		int Tk_DefineBitmap(Tcl_Interp interp, CONST char name,
211		CONST char *source, int width, int height)
	210	int Tk_DefineBitmap(Tcl_Interp interp, const char name,
	211	const char *source, int width, int height)
212	212	}
213	213	declare 45 generic {
214	214	void Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor)

219	219	declare 47 generic {
220	220	int Tk_DeleteBinding(Tcl_Interp *interp,
221	221	Tk_BindingTable bindingTable, ClientData object,
222		CONST char *eventStr)
	222	const char *eventStr)
223	223	}
224	224	declare 48 generic {
225	225	void Tk_DeleteBindingTable(Tk_BindingTable bindingTable)

236	236	void Tk_DeleteGenericHandler(Tk_GenericProc *proc, ClientData clientData)
237	237	}
238	238	declare 52 generic {
239		void Tk_DeleteImage(Tcl_Interp interp, CONST char name)
	239	void Tk_DeleteImage(Tcl_Interp interp, const char name)
240	240	}
241	241	declare 53 generic {
242	242	void Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection, Atom target)

263	263	}
264	264	declare 59 generic {
265	265	void Tk_DrawChars(Display *display, Drawable drawable, GC gc,
266		Tk_Font tkfont, CONST char *source, int numBytes, int x, int y)
	266	Tk_Font tkfont, const char *source, int numBytes, int x, int y)
267	267	}
268	268	declare 60 generic {
269	269	void Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc, int width,

287	287	int relief)
288	288	}
289	289	declare 64 generic {
290		Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp interp, CONST char imageName)
	290	Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp interp, const char imageName)
291	291	}
292	292	declare 65 generic {
293	293	Font Tk_FontId(Tk_Font font)

345	345	}
346	346	declare 82 generic {
347	347	int Tk_GetAnchor(Tcl_Interp *interp,
348		CONST char str, Tk_Anchor anchorPtr)
	348	const char str, Tk_Anchor anchorPtr)
349	349	}
350	350	declare 83 generic {
351	351	CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom)

353	353	declare 84 generic {
354	354	CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp,
355	355	Tk_BindingTable bindingTable, ClientData object,
356		CONST char *eventStr)
	356	const char *eventStr)
357	357	}
358	358	declare 85 generic {
359		Pixmap Tk_GetBitmap(Tcl_Interp interp, Tk_Window tkwin, CONST char str)
	359	Pixmap Tk_GetBitmap(Tcl_Interp interp, Tk_Window tkwin, const char str)
360	360	}
361	361	declare 86 generic {
362	362	Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp,
363		Tk_Window tkwin, CONST char *source, int width, int height)
	363	Tk_Window tkwin, const char *source, int width, int height)
364	364	}
365	365	declare 87 generic {
366		int Tk_GetCapStyle(Tcl_Interp interp, CONST char str, int *capPtr)
	366	int Tk_GetCapStyle(Tcl_Interp interp, const char str, int *capPtr)
367	367	}
368	368	declare 88 generic {
369	369	XColor * Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name)

373	373	}
374	374	declare 90 generic {
375	375	Colormap Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin,
376		CONST char *str)
	376	const char *str)
377	377	}
378	378	declare 91 generic {
379	379	Tk_Cursor Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin,

381	381	}
382	382	declare 92 generic {
383	383	Tk_Cursor Tk_GetCursorFromData(Tcl_Interp *interp,
384		Tk_Window tkwin, CONST char source, CONST char mask,
	384	Tk_Window tkwin, const char source, const char mask,
385	385	int width, int height, int xHot, int yHot,
386	386	Tk_Uid fg, Tk_Uid bg)
387	387	}
388	388	declare 93 generic {
389	389	Tk_Font Tk_GetFont(Tcl_Interp *interp,
390		Tk_Window tkwin, CONST char *str)
	390	Tk_Window tkwin, const char *str)
391	391	}
392	392	declare 94 generic {
393	393	Tk_Font Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr)

399	399	GC Tk_GetGC(Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr)
400	400	}
401	401	declare 97 generic {
402		Tk_Image Tk_GetImage(Tcl_Interp interp, Tk_Window tkwin, CONST char name,
	402	Tk_Image Tk_GetImage(Tcl_Interp interp, Tk_Window tkwin, const char name,
403	403	Tk_ImageChangedProc *changeProc, ClientData clientData)
404	404	}
405	405	declare 98 generic {
406	406	ClientData Tk_GetImageMasterData(Tcl_Interp *interp,
407		CONST char name, Tk_ImageType *typePtrPtr)
	407	const char name, CONST86 Tk_ImageType *typePtrPtr)
408	408	}
409	409	declare 99 generic {
410	410	Tk_ItemType * Tk_GetItemTypes(void)
411	411	}
412	412	declare 100 generic {
413		int Tk_GetJoinStyle(Tcl_Interp interp, CONST char str, int *joinPtr)
	413	int Tk_GetJoinStyle(Tcl_Interp interp, const char str, int *joinPtr)
414	414	}
415	415	declare 101 generic {
416	416	int Tk_GetJustify(Tcl_Interp *interp,
417		CONST char str, Tk_Justify justifyPtr)
	417	const char str, Tk_Justify justifyPtr)
418	418	}
419	419	declare 102 generic {
420	420	int Tk_GetNumMainWindows(void)
421	421	}
422	422	declare 103 generic {
423		Tk_Uid Tk_GetOption(Tk_Window tkwin, CONST char *name,
424		CONST char *className)
	423	Tk_Uid Tk_GetOption(Tk_Window tkwin, const char *name,
	424	const char *className)
425	425	}
426	426	declare 104 generic {
427	427	int Tk_GetPixels(Tcl_Interp *interp,
428		Tk_Window tkwin, CONST char str, int intPtr)
	428	Tk_Window tkwin, const char str, int intPtr)
429	429	}
430	430	declare 105 generic {
431	431	Pixmap Tk_GetPixmap(Display *display, Drawable d,
432	432	int width, int height, int depth)
433	433	}
434	434	declare 106 generic {
435		int Tk_GetRelief(Tcl_Interp interp, CONST char name, int *reliefPtr)
	435	int Tk_GetRelief(Tcl_Interp interp, const char name, int *reliefPtr)
436	436	}
437	437	declare 107 generic {
438	438	void Tk_GetRootCoords(Tk_Window tkwin, int xPtr, int yPtr)

443	443	}
444	444	declare 109 generic {
445	445	int Tk_GetScreenMM(Tcl_Interp *interp,
446		Tk_Window tkwin, CONST char str, double doublePtr)
	446	Tk_Window tkwin, const char str, double doublePtr)
447	447	}
448	448	declare 110 generic {
449	449	int Tk_GetSelection(Tcl_Interp *interp,

451	451	Tk_GetSelProc *proc, ClientData clientData)
452	452	}
453	453	declare 111 generic {
454		Tk_Uid Tk_GetUid(CONST char *str)
	454	Tk_Uid Tk_GetUid(const char *str)
455	455	}
456	456	declare 112 generic {
457	457	Visual * Tk_GetVisual(Tcl_Interp *interp,
458		Tk_Window tkwin, CONST char str, int depthPtr,
	458	Tk_Window tkwin, const char str, int depthPtr,
459	459	Colormap *colormapPtr)
460	460	}
461	461	declare 113 generic {

479	479	int Tk_Init(Tcl_Interp *interp)
480	480	}
481	481	declare 119 generic {
482		Atom Tk_InternAtom(Tk_Window tkwin, CONST char *name)
	482	Atom Tk_InternAtom(Tk_Window tkwin, const char *name)
483	483	}
484	484	declare 120 generic {
485	485	int Tk_IntersectTextLayout(Tk_TextLayout layout, int x, int y,

497	497	}
498	498	declare 124 generic {
499	499	void Tk_ManageGeometry(Tk_Window tkwin,
500		CONST Tk_GeomMgr *mgrPtr, ClientData clientData)
	500	const Tk_GeomMgr *mgrPtr, ClientData clientData)
501	501	}
502	502	declare 125 generic {
503	503	void Tk_MapWindow(Tk_Window tkwin)
504	504	}
505	505	declare 126 generic {
506	506	int Tk_MeasureChars(Tk_Font tkfont,
507		CONST char *source, int numBytes, int maxPixels,
	507	const char *source, int numBytes, int maxPixels,
508	508	int flags, int *lengthPtr)
509	509	}
510	510	declare 127 generic {

552	552	}
553	553	declare 141 generic {
554	554	Tk_Window Tk_NameToWindow(Tcl_Interp *interp,
555		CONST char *pathName, Tk_Window tkwin)
	555	const char *pathName, Tk_Window tkwin)
556	556	}
557	557	declare 142 generic {
558	558	void Tk_OwnSelection(Tk_Window tkwin,

562	562	declare 143 generic {
563	563	int Tk_ParseArgv(Tcl_Interp *interp,
564	564	Tk_Window tkwin, int argcPtr, CONST84 char *argv,
565		Tk_ArgvInfo *argTable, int flags)
	565	const Tk_ArgvInfo *argTable, int flags)
566	566	}
567	567	declare 144 generic {
568	568	void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,

621	621	int Tk_SafeInit(Tcl_Interp *interp)
622	622	}
623	623	declare 160 generic {
624		CONST char * Tk_SetAppName(Tk_Window tkwin, CONST char *name)
	624	const char * Tk_SetAppName(Tk_Window tkwin, const char *name)
625	625	}
626	626	declare 161 generic {
627	627	void Tk_SetBackgroundFromBorder(Tk_Window tkwin, Tk_3DBorder border)
628	628	}
629	629	declare 162 generic {
630		void Tk_SetClass(Tk_Window tkwin, CONST char *className)
	630	void Tk_SetClass(Tk_Window tkwin, const char *className)
631	631	}
632	632	declare 163 generic {
633	633	void Tk_SetGrid(Tk_Window tkwin, int reqWidth, int reqHeight,

672	672	void Tk_TextLayoutToPostscript(Tcl_Interp *interp, Tk_TextLayout layout)
673	673	}
674	674	declare 176 generic {
675		int Tk_TextWidth(Tk_Font font, CONST char *str, int numBytes)
	675	int Tk_TextWidth(Tk_Font font, const char *str, int numBytes)
676	676	}
677	677	declare 177 generic {
678	678	void Tk_UndefineCursor(Tk_Window window)

680	680	declare 178 generic {
681	681	void Tk_UnderlineChars(Display *display,
682	682	Drawable drawable, GC gc, Tk_Font tkfont,
683		CONST char *source, int x, int y, int firstByte,
	683	const char *source, int x, int y, int firstByte,
684	684	int lastByte)
685	685	}
686	686	declare 179 generic {

729	729	}
730	730	declare 190 generic {
731	731	Tk_OptionTable Tk_CreateOptionTable(Tcl_Interp *interp,
732		CONST Tk_OptionSpec *templatePtr)
	732	const Tk_OptionSpec *templatePtr)
733	733	}
734	734	declare 191 generic {
735	735	void Tk_DeleteOptionTable(Tk_OptionTable optionTable)

800	800	}
801	801	declare 210 generic {
802	802	int Tk_GetScrollInfoObj(Tcl_Interp *interp,
803		int objc, Tcl_Obj CONST objv[], double dblPtr, int *intPtr)
	803	int objc, Tcl_Obj const objv[], double dblPtr, int *intPtr)
804	804	}
805	805	declare 211 generic {
806	806	int Tk_InitOptions(Tcl_Interp interp, char recordPtr,

816	816	declare 214 generic {
817	817	int Tk_SetOptions(Tcl_Interp interp, char recordPtr,
818	818	Tk_OptionTable optionTable, int objc,
819		Tcl_Obj *CONST objv[], Tk_Window tkwin,
	819	Tcl_Obj *const objv[], Tk_Window tkwin,
820	820	Tk_SavedOptions savePtr, int maskPtr)
821	821	}
822	822	declare 215 generic {

826	826	int Tk_CreateConsoleWindow(Tcl_Interp *interp)
827	827	}
828	828	declare 217 generic {
829		void Tk_CreateSmoothMethod(Tcl_Interp interp, Tk_SmoothMethod method)
	829	void Tk_CreateSmoothMethod(Tcl_Interp interp, const Tk_SmoothMethod method)
830	830	}
831	831
832	832	#declare 218 generic {

834	834	#}
835	835
836	836	#declare 219 generic {
837		# VOID Tk_GetCanvasVisitor(Tcl_Interp interp, CONST char *name)
	837	# VOID Tk_GetCanvasVisitor(Tcl_Interp interp, const char *name)
838	838	#}
839	839
840	840	declare 220 generic {
841		int Tk_GetDash(Tcl_Interp interp, CONST char value, Tk_Dash *dash)
	841	int Tk_GetDash(Tcl_Interp interp, const char value, Tk_Dash *dash)
842	842	}
843	843	declare 221 generic {
844	844	void Tk_CreateOutline(Tk_Outline *outline)

924	924	#
925	925	declare 241 generic {
926	926	Tk_Window Tk_CreateAnonymousWindow(Tcl_Interp *interp,
927		Tk_Window parent, CONST char *screenName)
	927	Tk_Window parent, const char *screenName)
928	928	}
929	929	declare 242 generic {
930	930	void Tk_SetClassProcs(Tk_Window tkwin,

964	964
965	965	# Style engine
966	966	declare 249 generic {
967		Tk_StyleEngine Tk_RegisterStyleEngine(CONST char *name,
	967	Tk_StyleEngine Tk_RegisterStyleEngine(const char *name,
968	968	Tk_StyleEngine parent)
969	969	}
970	970	declare 250 generic {
971		Tk_StyleEngine Tk_GetStyleEngine(CONST char *name)
	971	Tk_StyleEngine Tk_GetStyleEngine(const char *name)
972	972	}
973	973	declare 251 generic {
974	974	int Tk_RegisterStyledElement(Tk_StyleEngine engine,
975	975	Tk_ElementSpec *templatePtr)
976	976	}
977	977	declare 252 generic {
978		int Tk_GetElementId(CONST char *name)
	978	int Tk_GetElementId(const char *name)
979	979	}
980	980	declare 253 generic {
981		Tk_Style Tk_CreateStyle(CONST char *name, Tk_StyleEngine engine,
	981	Tk_Style Tk_CreateStyle(const char *name, Tk_StyleEngine engine,
982	982	ClientData clientData)
983	983	}
984	984	declare 254 generic {
985		Tk_Style Tk_GetStyle(Tcl_Interp interp, CONST char name)
	985	Tk_Style Tk_GetStyle(Tcl_Interp interp, const char name)
986	986	}
987	987	declare 255 generic {
988	988	void Tk_FreeStyle(Tk_Style style)
989	989	}
990	990	declare 256 generic {
991		CONST char * Tk_NameOfStyle(Tk_Style style)
	991	const char * Tk_NameOfStyle(Tk_Style style)
992	992	}
993	993	declare 257 generic {
994	994	Tk_Style Tk_AllocStyleFromObj(Tcl_Interp interp, Tcl_Obj objPtr)

1067	1067	# Developers who need to produce a file [load]able into legacy interps must
1068	1068	# build against legacy sources.
1069	1069	declare 272 generic {
1070		void Tk_CreateOldImageType(Tk_ImageType *typePtr)
	1070	void Tk_CreateOldImageType(const Tk_ImageType *typePtr)
1071	1071	}
1072	1072	declare 273 generic {
1073		void Tk_CreateOldPhotoImageFormat(Tk_PhotoImageFormat *formatPtr)
	1073	void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
1074	1074	}
1075	1075
1076	1076	# Define the platform specific public Tk interface. These functions are

1153	1153	# Public functions that are not accessible via the stubs table.
1154	1154
1155	1155	export {
1156		CONST char Tk_PkgInitStubsCheck(Tcl_Interp interp, CONST char *version,
	1156	const char Tk_PkgInitStubsCheck(Tcl_Interp interp, const char *version,
1157	1157	int exact)
1158	1158	}

+97

-83

generic/tk.h less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tk.h,v 1.117 2008/09/03 06:01:51 dgp Exp $
	14	* RCS: @(#) $Id: tk.h,v 1.127 2008/12/19 14:32:25 dgp Exp $
15	15	*/
16	16
17	17	#ifndef _TK

51	51
52	52	#define TK_MAJOR_VERSION 8
53	53	#define TK_MINOR_VERSION 6
54		#define TK_RELEASE_LEVEL TCL_ALPHA_RELEASE
55		#define TK_RELEASE_SERIAL 3
	54	#define TK_RELEASE_LEVEL TCL_BETA_RELEASE
	55	#define TK_RELEASE_SERIAL 1
56	56
57	57	#define TK_VERSION "8.6"
58		#define TK_PATCH_LEVEL "8.6a3"
	58	#define TK_PATCH_LEVEL "8.6b1"
59	59
60	60	/*
61	61	* A special definition used to allow this header file to be included from

85	85	# undef TCL_STORAGE_CLASS
86	86	# define TCL_STORAGE_CLASS DLLEXPORT
87	87	#endif
88
89		/*
	88
	89	/*
	90	*----------------------------------------------------------------------
	91	*
90	92	* Decide whether or not to use input methods.
91	93	*/
92	94

121	123	typedef const char *Tk_Uid;
122	124
123	125	/*
	126	*----------------------------------------------------------------------
	127	*
124	128	* The enum below defines the valid types for Tk configuration options as
125	129	* implemented by Tk_InitOptions, Tk_SetOptions, etc.
126	130	*/

311	315
312	316	typedef int (Tk_OptionParseProc) (ClientData clientData, Tcl_Interp *interp,
313	317	Tk_Window tkwin, CONST84 char value, char widgRec, int offset);
314		typedef char *(Tk_OptionPrintProc) (ClientData clientData, Tk_Window tkwin,
	318	typedef CONST86 char *(Tk_OptionPrintProc) (ClientData clientData, Tk_Window tkwin,
315	319	char widgRec, int offset, Tcl_FreeProc *freeProcPtr);
316	320
317	321	typedef struct Tk_CustomOption {

337	341	int type; /* Type of option, such as TK_CONFIG_COLOR;
338	342	* see definitions below. Last option in table
339	343	* must have type TK_CONFIG_END. */
340		char argvName; / Switch used to specify option in argv. NULL
	344	const char argvName; / Switch used to specify option in argv. NULL
341	345	* means this spec is part of a group. */
342	346	Tk_Uid dbName; /* Name for option in option database. */
343	347	Tk_Uid dbClass; /* Class for option in database. */

349	353	int specFlags; /* Any combination of the values defined
350	354	* below; other bits are used internally by
351	355	* tkConfig.c. */
352		Tk_CustomOption customPtr; / If type is TK_CONFIG_CUSTOM then this is a
	356	CONST86 Tk_CustomOption customPtr; / If type is TK_CONFIG_CUSTOM then this is a
353	357	* pointer to info about how to parse and
354	358	* print the option. Otherwise it is
355	359	* irrelevant. */

397	401	*/
398	402
399	403	typedef struct {
400		char key; / The key string that flags the option in the
	404	const char key; / The key string that flags the option in the
401	405	* argv array. */
402	406	int type; /* Indicates option type; see below. */
403	407	char src; / Value to be used in setting dst; usage
404	408	* depends on type. */
405	409	char dst; / Address of value to be modified; usage
406	410	* depends on type. */
407		char help; / Documentation message describing this
	411	const char help; / Documentation message describing this
408	412	* option. */
409	413	} Tk_ArgvInfo;
410	414

614	618	#define TK_SCROLL_ERROR 4
615	619
616	620	/*
617		*---------------------------------------------------------------------------
	621	*----------------------------------------------------------------------
618	622	*
619	623	* Extensions to the X event set
620	624	*
621		*---------------------------------------------------------------------------
	625	*----------------------------------------------------------------------
622	626	*/
623	627
624	628	#define VirtualEvent (MappingNotify + 1)

675	679	} XActivateDeactivateEvent;
676	680	typedef XActivateDeactivateEvent XActivateEvent;
677	681	typedef XActivateDeactivateEvent XDeactivateEvent;
678
679		/*
680		*--------------------------------------------------------------
	682
	683	/*
	684	*----------------------------------------------------------------------
681	685	*
682	686	* Macros for querying Tk_Window structures. See the manual entries for
683	687	* documentation.
684	688	*
685		*--------------------------------------------------------------
	689	*----------------------------------------------------------------------
686	690	*/
687	691
688	692	#define Tk_Display(tkwin) (((Tk_FakeWin *) (tkwin))->display)

716	720	(((Tk_FakeWin *) (tkwin))->flags & TK_WIN_MANAGED)
717	721	#define Tk_TopWinHierarchy(tkwin) \
718	722	(((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY)
	723	#define Tk_IsManageable(tkwin) \
	724	(((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE)
719	725	#define Tk_ReqWidth(tkwin) (((Tk_FakeWin *) (tkwin))->reqWidth)
720	726	#define Tk_ReqHeight(tkwin) (((Tk_FakeWin *) (tkwin))->reqHeight)
721	727	/* Tk_InternalBorderWidth is deprecated */

851	857	* TK_PROP_PROPCHANGE 1 means that PropertyNotify events in the
852	858	* window's children should propagate up to this
853	859	* window.
	860	* TK_WM_MANAGEABLE 1 marks a window as capable of being converted
	861	* into a toplevel using [wm manage].
854	862	*/
855	863
856	864	#define TK_MAPPED 1

872	880	#define TK_WIN_MANAGED 0x10000
873	881	#define TK_TOP_HIERARCHY 0x20000
874	882	#define TK_PROP_PROPCHANGE 0x40000
875
876		/*
877		*--------------------------------------------------------------
	883	#define TK_WM_MANAGEABLE 0x80000
	884
	885	/*
	886	*----------------------------------------------------------------------
878	887	*
879	888	* Procedure prototypes and structures used for defining new canvas items:
880	889	*
881		*--------------------------------------------------------------
	890	*----------------------------------------------------------------------
882	891	*/
883	892
884	893	typedef enum {

887	896	} Tk_State;
888	897
889	898	typedef struct Tk_SmoothMethod {
890		char *name;
	899	const char *name;
891	900	int (coordProc) (Tk_Canvas canvas, double pointPtr, int numPoints,
892	901	int numSteps, XPoint xPoints[], double dblPoints[]);
893	902	void (postscriptProc) (Tcl_Interp interp, Tk_Canvas canvas,

960	969	*/
961	970
962	971	#ifdef USE_OLD_CANVAS
963		typedef int Tk_ItemCreateProc (Tcl_Interp *interp, Tk_Canvas canvas,
	972	typedef int (Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas,
964	973	Tk_Item itemPtr, int argc, char *argv);
965		typedef int Tk_ItemConfigureProc (Tcl_Interp *interp, Tk_Canvas canvas,
	974	typedef int (Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas,
966	975	Tk_Item itemPtr, int argc, char *argv, int flags);
967		typedef int Tk_ItemCoordProc (Tcl_Interp *interp, Tk_Canvas canvas,
	976	typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas,
968	977	Tk_Item itemPtr, int argc, char *argv);
969	978	#else
970		typedef int Tk_ItemCreateProc (Tcl_Interp *interp, Tk_Canvas canvas,
	979	typedef int (Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas,
971	980	Tk_Item itemPtr, int argc, Tcl_Obj const objv[]);
972		typedef int Tk_ItemConfigureProc (Tcl_Interp *interp, Tk_Canvas canvas,
	981	typedef int (Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas,
973	982	Tk_Item itemPtr, int argc, Tcl_Obj const objv[],
974	983	int flags);
975		typedef int Tk_ItemCoordProc (Tcl_Interp *interp, Tk_Canvas canvas,
	984	typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas,
976	985	Tk_Item itemPtr, int argc, Tcl_Obj const argv[]);
977	986	#endif
978		typedef void Tk_ItemDeleteProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	987	typedef void (Tk_ItemDeleteProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
979	988	Display *display);
980		typedef void Tk_ItemDisplayProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	989	typedef void (Tk_ItemDisplayProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
981	990	Display *display, Drawable dst, int x, int y, int width,
982	991	int height);
983		typedef double Tk_ItemPointProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	992	typedef double (Tk_ItemPointProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
984	993	double *pointPtr);
985		typedef int Tk_ItemAreaProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	994	typedef int (Tk_ItemAreaProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
986	995	double *rectPtr);
987		typedef int Tk_ItemPostscriptProc (Tcl_Interp *interp, Tk_Canvas canvas,
	996	typedef int (Tk_ItemPostscriptProc)(Tcl_Interp *interp, Tk_Canvas canvas,
988	997	Tk_Item *itemPtr, int prepass);
989		typedef void Tk_ItemScaleProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	998	typedef void (Tk_ItemScaleProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
990	999	double originX, double originY, double scaleX,
991	1000	double scaleY);
992		typedef void Tk_ItemTranslateProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	1001	typedef void (Tk_ItemTranslateProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
993	1002	double deltaX, double deltaY);
994		typedef int Tk_ItemIndexProc (Tcl_Interp *interp, Tk_Canvas canvas,
	1003	typedef int (Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
995	1004	Tk_Item itemPtr, char indexString, int *indexPtr);
996		typedef void Tk_ItemCursorProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	1005	typedef void (Tk_ItemCursorProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
997	1006	int index);
998		typedef int Tk_ItemSelectionProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	1007	typedef int (Tk_ItemSelectionProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
999	1008	int offset, char *buffer, int maxBytes);
1000		typedef void Tk_ItemInsertProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	1009	typedef void (Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
1001	1010	int beforeThis, char *string);
1002		typedef void Tk_ItemDCharsProc (Tk_Canvas canvas, Tk_Item *itemPtr,
	1011	typedef void (Tk_ItemDCharsProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
1003	1012	int first, int last);
1004	1013
1005	1014	#ifndef __NO_OLD_CONFIG
1006	1015
1007	1016	typedef struct Tk_ItemType {
1008		char name; / The name of this type of item, such as
	1017	const char name; / The name of this type of item, such as
1009	1018	* "line". */
1010	1019	int itemSize; /* Total amount of space needed for item's
1011	1020	* record. */

1061	1070	char *reserved4;
1062	1071	} Tk_ItemType;
1063	1072
	1073	/*
	1074	* Flag (used in the alwaysRedraw field) to say whether an item supports
	1075	* point-level manipulation like the line and polygon items.
	1076	*/
	1077
	1078	#define TK_MOVABLE_POINTS 2
	1079
1064	1080	#endif
1065	1081
1066	1082	/*

1106	1122	* should be displayed in focusItemPtr.
1107	1123	* Read-only to items.*/
1108	1124	} Tk_CanvasTextInfo;
1109
	1125
1110	1126	/*
1111	1127	* Structures used for Dashing and Outline.
1112	1128	*/

1147	1163	Tk_Dash dash; /* Dash pattern. */
1148	1164	Tk_Dash activeDash; /* Dash pattern if state is active. */
1149	1165	Tk_Dash disabledDash; /* Dash pattern if state is disabled. */
1150		VOID reserved1; / Reserved for future expansion. */
1151		VOID *reserved2;
1152		VOID *reserved3;
	1166	void reserved1; / Reserved for future expansion. */
	1167	void *reserved2;
	1168	void *reserved3;
1153	1169	Tk_TSOffset tsoffset; /* Stipple offset for outline. */
1154	1170	XColor color; / Outline color. */
1155	1171	XColor activeColor; / Outline color if state is active. */

1160	1176	Pixmap disabledStipple; /* Outline Stipple pattern if state is
1161	1177	* disabled. */
1162	1178	} Tk_Outline;
1163
1164		/*
1165		*--------------------------------------------------------------
	1179
	1180	/*
	1181	*----------------------------------------------------------------------
1166	1182	*
1167	1183	* Procedure prototypes and structures used for managing images:
1168	1184	*
1169		*--------------------------------------------------------------
	1185	*----------------------------------------------------------------------
1170	1186	*/
1171	1187
1172	1188	typedef struct Tk_ImageType Tk_ImageType;

1175	1191	char *argv, Tk_ImageType typePtr, Tk_ImageMaster master,
1176	1192	ClientData *masterDataPtr);
1177	1193	#else
1178		typedef int (Tk_ImageCreateProc) (Tcl_Interp interp, char name, int objc,
1179		Tcl_Obj const objv[], Tk_ImageType typePtr, Tk_ImageMaster master,
	1194	typedef int (Tk_ImageCreateProc) (Tcl_Interp interp, CONST86 char name, int objc,
	1195	Tcl_Obj const objv[], CONST86 Tk_ImageType typePtr, Tk_ImageMaster master,
1180	1196	ClientData *masterDataPtr);
1181	1197	#endif
1182	1198	typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData masterData);

1200	1216	*/
1201	1217
1202	1218	struct Tk_ImageType {
1203		char name; / Name of image type. */
	1219	const char name; / Name of image type. */
1204	1220	Tk_ImageCreateProc *createProc;
1205	1221	/* Procedure to call to create a new image of
1206	1222	* this type. */

1226	1242	* manager. */
1227	1243	char reserved; / reserved for future expansion */
1228	1244	};
1229
1230		/*
1231		*--------------------------------------------------------------
	1245
	1246	/*
	1247	*----------------------------------------------------------------------
1232	1248	*
1233	1249	* Additional definitions used to manage images of type "photo".
1234	1250	*
1235		*--------------------------------------------------------------
	1251	*----------------------------------------------------------------------
1236	1252	*/
1237	1253
1238	1254	/*

1312	1328	*/
1313	1329
1314	1330	struct Tk_PhotoImageFormat {
1315		char name; / Name of image file format */
	1331	const char name; / Name of image file format */
1316	1332	Tk_ImageFileMatchProc *fileMatchProc;
1317	1333	/* Procedure to call to determine whether an
1318	1334	* image file matches this format. */

1342	1358	#define Tk_CreateImageType Tk_CreateOldImageType
1343	1359	#define Tk_CreatePhotoImageFormat Tk_CreateOldPhotoImageFormat
1344	1360	#endif
1345
1346		/*
1347		*--------------------------------------------------------------
	1361
	1362	/*
	1363	*----------------------------------------------------------------------
1348	1364	*
1349	1365	* Procedure prototypes and structures used for managing styles:
1350	1366	*
1351		*--------------------------------------------------------------
	1367	*----------------------------------------------------------------------
1352	1368	*/
1353	1369
1354	1370	/*

1410	1426	#define TK_ELEMENT_STATE_DISABLED 1<<1
1411	1427	#define TK_ELEMENT_STATE_FOCUS 1<<2
1412	1428	#define TK_ELEMENT_STATE_PRESSED 1<<3
1413
1414		/*
1415		*--------------------------------------------------------------
	1429
	1430	/*
	1431	*----------------------------------------------------------------------
1416	1432	*
1417	1433	* The definitions below provide backward compatibility for functions and
1418	1434	* types related to event handling that used to be in Tk but have moved to
1419	1435	* Tcl.
1420	1436	*
1421		*--------------------------------------------------------------
	1437	*----------------------------------------------------------------------
1422	1438	*/
1423	1439
1424	1440	#define TK_READABLE TCL_READABLE

1473	1489
1474	1490	#define Tk_InitImageArgs(interp, argc, argv) /**/
1475	1491
1476
1477		/*
1478		*--------------------------------------------------------------
	1492
	1493	/*
	1494	*----------------------------------------------------------------------
1479	1495	*
1480	1496	* Additional procedure types defined by Tk.
1481	1497	*
1482		*--------------------------------------------------------------
	1498	*----------------------------------------------------------------------
1483	1499	*/
1484	1500
1485	1501	typedef int (Tk_ErrorProc) (ClientData clientData, XErrorEvent *errEventPtr);

1487	1503	typedef int (Tk_GenericProc) (ClientData clientData, XEvent *eventPtr);
1488	1504	typedef int (Tk_ClientMessageProc) (Tk_Window tkwin, XEvent *eventPtr);
1489	1505	typedef int (Tk_GetSelProc) (ClientData clientData, Tcl_Interp *interp,
1490		char *portion);
	1506	CONST86 char *portion);
1491	1507	typedef void (Tk_LostSelProc) (ClientData clientData);
1492	1508	typedef Tk_RestrictAction (Tk_RestrictProc) (ClientData clientData,
1493	1509	XEvent *eventPtr);
1494	1510	typedef int (Tk_SelectionProc) (ClientData clientData, int offset,
1495	1511	char *buffer, int maxBytes);
1496
1497		/*
1498		*--------------------------------------------------------------
1499		*
1500		* Platform independant exported procedures and variables.
1501		*
1502		*--------------------------------------------------------------
	1512
	1513	/*
	1514	*----------------------------------------------------------------------
	1515	*
	1516	* Platform independent exported procedures and variables.
	1517	*
	1518	*----------------------------------------------------------------------
1503	1519	*/
1504	1520
1505	1521	#include "tkDecls.h"
1506	1522
1507	1523	/*
	1524	*----------------------------------------------------------------------
	1525	*
1508	1526	* Allow users to say that they don't want to alter their source to add extra
1509	1527	* arguments to Tk_PhotoPutBlock() et al; DO NOT DEFINE THIS WHEN BUILDING TK.
1510	1528	*

1544	1562	# endif
1545	1563	# define Tk_PhotoSetSize Tk_PhotoSetSize_Panic
1546	1564	#endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */
1547
1548		/*
1549		* Tcl commands exported by Tk:
1550		*/
1551
	1565
1552	1566	#undef TCL_STORAGE_CLASS
1553	1567	#define TCL_STORAGE_CLASS DLLIMPORT
1554	1568

1563	1577	#endif
1564	1578
1565	1579	#endif /* _TK */
1566
	1580
1567	1581	/*
1568	1582	* Local Variables:
1569	1583	* mode: c

+27

-26

generic/tk3d.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tk3d.c,v 1.20 2008/04/27 22:38:55 dkf Exp $
	12	* RCS: @(#) $Id: tk3d.c,v 1.24 2008/12/12 00:09:37 nijtmans Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

20	20	* by Tk_GetReliefFromObj.
21	21	*/
22	22
23		static const char *reliefStrings[] = {
	23	static const char *const reliefStrings[] = {
24	24	"flat", "groove", "raised", "ridge", "solid", "sunken", NULL
25	25	};
26	26

46	46	* is set.
47	47	*/
48	48
49		Tcl_ObjType tkBorderObjType = {
	49	const Tcl_ObjType tkBorderObjType = {
50	50	"border", /* name */
51	51	FreeBorderObjProc, /* freeIntRepProc */
52	52	DupBorderObjProc, /* dupIntRepProc */

90	90	if (objPtr->typePtr != &tkBorderObjType) {
91	91	InitBorderObj(objPtr);
92	92	}
93		borderPtr = (TkBorder *) objPtr->internalRep.twoPtrValue.ptr1;
	93	borderPtr = objPtr->internalRep.twoPtrValue.ptr1;
94	94
95	95	/*
96	96	* If the object currently points to a TkBorder, see if it's the one we

129	129	*/
130	130
131	131	if (borderPtr != NULL) {
132		TkBorder *firstBorderPtr =
133		(TkBorder *) Tcl_GetHashValue(borderPtr->hashPtr);
	132	TkBorder *firstBorderPtr = Tcl_GetHashValue(borderPtr->hashPtr);
	133
134	134	FreeBorderObjProc(objPtr);
135	135	for (borderPtr = firstBorderPtr ; borderPtr != NULL;
136	136	borderPtr = borderPtr->nextPtr) {
137	137	if ((Tk_Screen(tkwin) == borderPtr->screen)
138		&& (Tk_Colormap(tkwin) == borderPtr->colormap)) {
	138	&& (Tk_Colormap(tkwin) == borderPtr->colormap)) {
139	139	borderPtr->resourceRefCount++;
140	140	borderPtr->objRefCount++;
141		objPtr->internalRep.twoPtrValue.ptr1 = (void *) borderPtr;
	141	objPtr->internalRep.twoPtrValue.ptr1 = borderPtr;
142	142	return (Tk_3DBorder) borderPtr;
143	143	}
144	144	}

150	150
151	151	borderPtr = (TkBorder *) Tk_Get3DBorder(interp, tkwin,
152	152	Tcl_GetString(objPtr));
153		objPtr->internalRep.twoPtrValue.ptr1 = (void *) borderPtr;
	153	objPtr->internalRep.twoPtrValue.ptr1 = borderPtr;
154	154	if (borderPtr != NULL) {
155	155	borderPtr->objRefCount++;
156	156	}

202	202
203	203	hashPtr = Tcl_CreateHashEntry(&dispPtr->borderTable, colorName, &isNew);
204	204	if (!isNew) {
205		existingBorderPtr = (TkBorder *) Tcl_GetHashValue(hashPtr);
	205	existingBorderPtr = Tcl_GetHashValue(hashPtr);
206	206	for (borderPtr = existingBorderPtr; borderPtr != NULL;
207	207	borderPtr = borderPtr->nextPtr) {
208	208	if ((Tk_Screen(tkwin) == borderPtr->screen)

427	427	return;
428	428	}
429	429
430		prevPtr = (TkBorder *) Tcl_GetHashValue(borderPtr->hashPtr);
	430	prevPtr = Tcl_GetHashValue(borderPtr->hashPtr);
431	431	TkpFreeBorder(borderPtr);
432	432	if (borderPtr->bgColorPtr != NULL) {
433	433	Tk_FreeColor(borderPtr->bgColorPtr);

521	521	FreeBorderObjProc(
522	522	Tcl_Obj objPtr) / The object we are releasing. */
523	523	{
524		TkBorder borderPtr = (TkBorder ) objPtr->internalRep.twoPtrValue.ptr1;
	524	TkBorder *borderPtr = objPtr->internalRep.twoPtrValue.ptr1;
525	525
526	526	if (borderPtr != NULL) {
527	527	borderPtr->objRefCount--;

556	556	Tcl_Obj srcObjPtr, / The object we are copying from. */
557	557	Tcl_Obj dupObjPtr) / The object we are copying to. */
558	558	{
559		TkBorder borderPtr = (TkBorder ) srcObjPtr->internalRep.twoPtrValue.ptr1;
	559	TkBorder *borderPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
560	560
561	561	dupObjPtr->typePtr = srcObjPtr->typePtr;
562		dupObjPtr->internalRep.twoPtrValue.ptr1 = (void *) borderPtr;
	562	dupObjPtr->internalRep.twoPtrValue.ptr1 = borderPtr;
563	563
564	564	if (borderPtr != NULL) {
565	565	borderPtr->objRefCount++;

669	669	} else {
670	670	char buf[200];
671	671
672		sprintf(buf, "bad relief type \"%.50s\": must be %s",
	672	sprintf(buf, "bad relief \"%.50s\": must be %s",
673	673	name, "flat, groove, raised, ridge, solid, or sunken");
674	674	Tcl_SetResult(interp, buf, TCL_VOLATILE);
675	675	return TCL_ERROR;

981	981	if ((width > doubleBorder) && (height > doubleBorder)) {
982	982	XFillRectangle(Tk_Display(tkwin), drawable, borderPtr->bgGC,
983	983	x + borderWidth, y + borderWidth,
984		(unsigned int) (width - doubleBorder),
985		(unsigned int) (height - doubleBorder));
	984	(unsigned) (width - doubleBorder),
	985	(unsigned) (height - doubleBorder));
986	986	}
987	987	if (borderWidth) {
988	988	Tk_Draw3DRectangle(tkwin, drawable, border, x, y, width,

1250	1250	* cached in the internal representation of the Tcl_Obj. Check it out...
1251	1251	*/
1252	1252
1253		borderPtr = (TkBorder *) objPtr->internalRep.twoPtrValue.ptr1;
	1253	borderPtr = objPtr->internalRep.twoPtrValue.ptr1;
1254	1254	if ((borderPtr != NULL)
1255	1255	&& (borderPtr->resourceRefCount > 0)
1256	1256	&& (Tk_Screen(tkwin) == borderPtr->screen)

1278	1278	if (hashPtr == NULL) {
1279	1279	goto error;
1280	1280	}
1281		for (borderPtr = (TkBorder *) Tcl_GetHashValue(hashPtr);
1282		(borderPtr != NULL); borderPtr = borderPtr->nextPtr) {
	1281	for (borderPtr = Tcl_GetHashValue(hashPtr); borderPtr != NULL;
	1282	borderPtr = borderPtr->nextPtr) {
1283	1283	if ((Tk_Screen(tkwin) == borderPtr->screen)
1284	1284	&& (Tk_Colormap(tkwin) == borderPtr->colormap)) {
1285	1285	FreeBorderObjProc(objPtr);
1286		objPtr->internalRep.twoPtrValue.ptr1 = (void *) borderPtr;
	1286	objPtr->internalRep.twoPtrValue.ptr1 = borderPtr;
1287	1287	borderPtr->objRefCount++;
1288	1288	return (Tk_3DBorder) borderPtr;
1289	1289	}

1330	1330	Tcl_GetString(objPtr);
1331	1331	typePtr = objPtr->typePtr;
1332	1332	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
1333		(*typePtr->freeIntRepProc)(objPtr);
	1333	typePtr->freeIntRepProc(objPtr);
1334	1334	}
1335	1335	objPtr->typePtr = &tkBorderObjType;
1336	1336	objPtr->internalRep.twoPtrValue.ptr1 = NULL;

1361	1361	* (not currently used). */
1362	1362	char name) / Name of the desired color. */
1363	1363	{
1364		TkBorder *borderPtr;
1365	1364	Tcl_HashEntry *hashPtr;
1366		Tcl_Obj resultPtr, objPtr;
	1365	Tcl_Obj *resultPtr;
1367	1366	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
1368	1367
1369	1368	resultPtr = Tcl_NewObj();
1370	1369	hashPtr = Tcl_FindHashEntry(&dispPtr->borderTable, name);
1371	1370	if (hashPtr != NULL) {
1372		borderPtr = (TkBorder *) Tcl_GetHashValue(hashPtr);
	1371	TkBorder *borderPtr = Tcl_GetHashValue(hashPtr);
	1372
1373	1373	if (borderPtr == NULL) {
1374	1374	Tcl_Panic("TkDebugBorder found empty hash table entry");
1375	1375	}
1376	1376	for ( ; (borderPtr != NULL); borderPtr = borderPtr->nextPtr) {
1377		objPtr = Tcl_NewObj();
	1377	Tcl_Obj *objPtr = Tcl_NewObj();
	1378
1378	1379	Tcl_ListObjAppendElement(NULL, objPtr,
1379	1380	Tcl_NewIntObj(borderPtr->resourceRefCount));
1380	1381	Tcl_ListObjAppendElement(NULL, objPtr,

+12

-12

generic/tkArgv.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkArgv.c,v 1.15 2008/10/03 13:13:31 dkf Exp $
	12	* RCS: @(#) $Id: tkArgv.c,v 1.17 2008/11/08 18:44:39 dkf Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

29	29	* Forward declarations for functions defined in this file:
30	30	*/
31	31
32		static void PrintUsage(Tcl_Interp interp, Tk_ArgvInfo argTable,
	32	static void PrintUsage(Tcl_Interp interp, const Tk_ArgvInfo argTable,
33	33	int flags);
34	34
35	35	/*

64	64	* hold # args left in argv at end. */
65	65	const char *argv, / Array of arguments. Modified to hold those
66	66	* that couldn't be processed here. */
67		Tk_ArgvInfo argTable, / Array of option descriptions */
	67	const Tk_ArgvInfo argTable, / Array of option descriptions */
68	68	int flags) /* Or'ed combination of various flag bits,
69	69	* such as TK_ARGV_NO_DEFAULTS. */
70	70	{
71		register Tk_ArgvInfo *infoPtr;
	71	register const Tk_ArgvInfo *infoPtr;
72	72	/* Pointer to the current entry in the table
73	73	* of argument descriptions. */
74		Tk_ArgvInfo matchPtr; / Descriptor that matches current argument. */
	74	const Tk_ArgvInfo matchPtr; / Descriptor that matches current argument. */
75	75	const char curArg; / Current argument */
76	76	register char c; /* Second character of current arg (used for
77	77	* quick check for matching; use 2nd char.

227	227	}
228	228	break;
229	229	case TK_ARGV_FUNC: {
230		typedef int (ArgvFunc)(char , char , const char *);
	230	typedef int (ArgvFunc)(char , const char , const char *);
231	231	ArgvFunc handlerProc = (ArgvFunc ) infoPtr->src;
232	232
233		if ((*handlerProc)(infoPtr->dst, infoPtr->key, argv[srcIndex])) {
	233	if (handlerProc(infoPtr->dst, infoPtr->key, argv[srcIndex])) {
234	234	srcIndex++;
235	235	argc--;
236	236	}
237	237	break;
238	238	}
239	239	case TK_ARGV_GENFUNC: {
240		typedef int (ArgvGenFunc)(char , Tcl_Interp , char *, int,
	240	typedef int (ArgvGenFunc)(char , Tcl_Interp , const char *, int,
241	241	const char **);
242	242	ArgvGenFunc handlerProc = (ArgvGenFunc ) infoPtr->src;
243	243
244		argc = (*handlerProc)(infoPtr->dst, interp, infoPtr->key,
245		argc, argv+srcIndex);
	244	argc = handlerProc(infoPtr->dst, interp, infoPtr->key, argc,
	245	argv+srcIndex);
246	246	if (argc < 0) {
247	247	return TCL_ERROR;
248	248	}

329	329	PrintUsage(
330	330	Tcl_Interp interp, / Place information in this interp's result
331	331	* area. */
332		Tk_ArgvInfo argTable, / Array of command-specific argument
	332	const Tk_ArgvInfo argTable, / Array of command-specific argument
333	333	* descriptions. */
334	334	int flags) /* If the TK_ARGV_NO_DEFAULTS bit is set in
335	335	* this word, then don't generate information
336	336	* for default options. */
337	337	{
338		register Tk_ArgvInfo *infoPtr;
	338	register const Tk_ArgvInfo *infoPtr;
339	339	size_t width, i, numSpaces;
340	340	char tmp[TCL_DOUBLE_SPACE];
341	341

+13

-14

generic/tkAtom.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkAtom.c,v 1.8 2008/04/27 22:38:55 dkf Exp $
	14	* RCS: @(#) $Id: tkAtom.c,v 1.11 2008/10/30 23:18:59 nijtmans Exp $
15	15	*/
16	16
17	17	#include "tkInt.h"

21	21	* those found in xatom.h
22	22	*/
23	23
24		static char * atomNameArray[] = {
	24	static const char *const atomNameArray[] = {
25	25	"PRIMARY", "SECONDARY", "ARC",
26	26	"ATOM", "BITMAP", "CARDINAL",
27	27	"COLORMAP", "CURSOR", "CUT_BUFFER0",

79	79	* window's display. */
80	80	const char name) / Name to turn into atom. */
81	81	{
82		register TkDisplay *dispPtr;
83		register Tcl_HashEntry *hPtr;
	82	TkDisplay *dispPtr;
	83	Tcl_HashEntry *hPtr;
84	84	int isNew;
85	85
86	86	dispPtr = ((TkWindow *) tkwin)->dispPtr;

128	128	* this window's display. */
129	129	Atom atom) /* Atom whose name is wanted. */
130	130	{
131		register TkDisplay *dispPtr;
132		register Tcl_HashEntry *hPtr;
	131	TkDisplay *dispPtr;
	132	Tcl_HashEntry *hPtr;
133	133
134	134	dispPtr = ((TkWindow *) tkwin)->dispPtr;
135	135	if (!dispPtr->atomInit) {

138	138
139	139	hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, (char *) atom);
140	140	if (hPtr == NULL) {
141		char *name;
	141	const char *name;
142	142	Tk_ErrorHandler handler;
143		int isNew, mustFree;
	143	int isNew;
	144	char *mustFree = NULL;
144	145
145	146	handler = Tk_CreateErrorHandler(dispPtr->display, BadAtom, -1, -1,
146	147	NULL, (ClientData) NULL);
147		name = XGetAtomName(dispPtr->display, atom);
148		mustFree = 1;
	148	name = mustFree = XGetAtomName(dispPtr->display, atom);
149	149	if (name == NULL) {
150	150	name = "?bad atom?";
151		mustFree = 0;
152	151	}
153	152	Tk_DeleteErrorHandler(handler);
154	153	hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew);
155	154	Tcl_SetHashValue(hPtr, atom);
156	155	if (mustFree) {
157		XFree(name);
	156	XFree(mustFree);
158	157	}
159	158	name = Tcl_GetHashKey(&dispPtr->nameTable, hPtr);
160	159	hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, (char *) atom, &isNew);

181	180
182	181	static void
183	182	AtomInit(
184		register TkDisplay dispPtr)/ Display to initialize. */
	183	TkDisplay dispPtr)/ Display to initialize. */
185	184	{
186	185	Tcl_HashEntry *hPtr;
187	186	Atom atom;

191	190	Tcl_InitHashTable(&dispPtr->atomTable, TCL_ONE_WORD_KEYS);
192	191
193	192	for (atom = 1; atom <= XA_LAST_PREDEFINED; atom++) {
194		char *name;
	193	const char *name;
195	194	int isNew;
196	195
197	196	hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, (char *) atom);

+207

-231

generic/tkBind.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkBind.c,v 1.46 2008/07/23 23:24:23 nijtmans Exp $
	13	* RCS: @(#) $Id: tkBind.c,v 1.51 2008/12/09 21:22:56 dgp Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

30	30	*
31	31	* Init/Free this package.
32	32	*
33		* Tcl "bind" command (actually located in tkCmds.c).
34		* "bind" command implementation.
35		* "bind" implementation helpers.
36		*
37		* Tcl "event" command.
38		* "event" command implementation.
39		* "event" implementation helpers.
	33	* Tcl "bind" command (actually located in tkCmds.c) core implementation, plus
	34	* helpers.
	35	*
	36	* Tcl "event" command implementation, plus helpers.
40	37	*
41	38	* Package-specific common helpers.
42	39	*

229	226	* enough space will be allocated for
230	227	* "numPats" patterns. To match, pats[0] must
231	228	* match event n, pats[1] must match event
232		* n-1, etc.
233		*/
	229	* n-1, etc. */
234	230	} PatSeq;
235	231
236	232	/*

354	350
355	351	#ifdef REDO_KEYSYM_LOOKUP
356	352	typedef struct {
357		char name; / Name of keysym. */
	353	const char name; / Name of keysym. */
358	354	KeySym value; /* Numeric identifier for keysym. */
359	355	} KeySymInfo;
360	356	static KeySymInfo keyArray[] = {

383	379	*/
384	380
385	381	typedef struct {
386		char name; / Name of modifier. */
	382	const char name; / Name of modifier. */
387	383	int mask; /* Button/modifier mask value, such as
388	384	* Button1Mask. */
389	385	int flags; /* Various flags; see below for

407	403	#define QUADRUPLE 4
408	404	#define MULT_CLICKS 7
409	405
410		static ModInfo modArray[] = {
	406	static const ModInfo modArray[] = {
411	407	{"Control", ControlMask, 0},
412	408	{"Shift", ShiftMask, 0},
413	409	{"Lock", LockMask, 0},

452	448	*/
453	449
454	450	typedef struct {
455		char name; / Name of event. */
	451	const char name; / Name of event. */
456	452	int type; /* Event type for X, such as ButtonPress. */
457	453	int eventMask; /* Mask bits (for XSelectInput) for this event
458	454	* type. */

535	531	#define CIRCREQ 0x400000
536	532
537	533	#define KEY_BUTTON_MOTION_VIRTUAL (KEY\|BUTTON\|MOTION\|VIRTUAL)
538		#define KEY_BUTTON_MOTION_CROSSING (KEY\|BUTTON\|MOTION\|CROSSING\|VIRTUAL)
	534	#define KEY_BUTTON_MOTION_CROSSING (KEY\|BUTTON\|MOTION\|VIRTUAL\|CROSSING)
539	535
540	536	static int flagArray[TK_LASTEVENT] = {
541	537	/* Not used */ 0,

673	669	static char * GetField(char p, char copy, int size);
674	670	static void GetPatternString(PatSeq psPtr, Tcl_DString dsPtr);
675	671	static int GetVirtualEvent(Tcl_Interp *interp,
676		VirtualEventTable vetPtr, char virtString);
	672	VirtualEventTable vetPtr, Tcl_Obj virtName);
677	673	static Tk_Uid GetVirtualEventUid(Tcl_Interp *interp,
678	674	char *virtString);
679	675	static int HandleEventGenerate(Tcl_Interp *interp, Tk_Window main,

698	694	*/
699	695
700	696	#define EvalTclBinding ((TkBindEvalProc *) 1)
701
702	697
703	698	/*
704	699	*---------------------------------------------------------------------------

737	732	Tcl_MutexLock(&bindMutex);
738	733	if (!initialized) {
739	734	Tcl_HashEntry *hPtr;
740		ModInfo *modPtr;
	735	const ModInfo *modPtr;
741	736	EventInfo *eiPtr;
742	737	int newEntry;
743
744	738	#ifdef REDO_KEYSYM_LOOKUP
745	739	KeySymInfo *kPtr;
746	740

816	810	bindInfoPtr = (BindInfo *) mainPtr->bindInfo;
817	811	DeleteVirtualEventTable(&bindInfoPtr->virtualEventTable);
818	812	bindInfoPtr->deleted = 1;
819		Tcl_EventuallyFree((ClientData) bindInfoPtr, TCL_DYNAMIC);
	813	Tcl_EventuallyFree(bindInfoPtr, TCL_DYNAMIC);
820	814	mainPtr->bindInfo = NULL;
821	815	}
822	816

895	889
896	890	for (hPtr = Tcl_FirstHashEntry(&bindPtr->patternTable, &search);
897	891	hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
898		for (psPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
899		psPtr != NULL; psPtr = nextPtr) {
	892	for (psPtr = Tcl_GetHashValue(hPtr); psPtr != NULL; psPtr = nextPtr) {
900	893	nextPtr = psPtr->nextSeqPtr;
901	894	psPtr->flags \|= MARKED_DELETED;
902	895	if (psPtr->refCount == 0) {
903	896	if (psPtr->freeProc != NULL) {
904		(*psPtr->freeProc)(psPtr->clientData);
	897	psPtr->freeProc(psPtr->clientData);
905	898	}
906	899	ckfree((char *) psPtr);
907	900	}

984	977	if (isNew) {
985	978	psPtr->nextObjPtr = NULL;
986	979	} else {
987		psPtr->nextObjPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
	980	psPtr->nextObjPtr = Tcl_GetHashValue(hPtr);
988	981	}
989	982	Tcl_SetHashValue(hPtr, psPtr);
990	983	} else if (psPtr->eventProc != EvalTclBinding) {

993	986	*/
994	987
995	988	if (psPtr->freeProc != NULL) {
996		(*psPtr->freeProc)(psPtr->clientData);
	989	psPtr->freeProc(psPtr->clientData);
997	990	}
998	991	psPtr->clientData = NULL;
999	992	append = 0;
1000	993	}
1001	994
1002		oldStr = (char *) psPtr->clientData;
	995	oldStr = psPtr->clientData;
1003	996	if ((append != 0) && (oldStr != NULL)) {
1004		size_t length;
1005
1006		length = strlen(oldStr) + strlen(command) + 2;
1007		newStr = (char *) ckalloc((unsigned) length);
1008		sprintf(newStr, "%s\n%s", oldStr, command);
	997	size_t length1 = strlen(oldStr), length2 = strlen(command);
	998
	999	newStr = ckalloc((unsigned) length1 + length2 + 2);
	1000	memcpy(newStr, oldStr, length1);
	1001	newStr[length1] = '\n';
	1002	memcpy(newStr+length1+1, command, length2+1);
1009	1003	} else {
1010		newStr = (char *) ckalloc((unsigned) strlen(command) + 1);
1011		strcpy(newStr, command);
	1004	size_t length = strlen(command);
	1005
	1006	newStr = ckalloc((unsigned) length+1);
	1007	memcpy(newStr, command, length+1);
1012	1008	}
1013	1009	if (oldStr != NULL) {
1014	1010	ckfree(oldStr);
1015	1011	}
1016	1012	psPtr->eventProc = EvalTclBinding;
1017	1013	psPtr->freeProc = FreeTclBinding;
1018		psPtr->clientData = (ClientData) newStr;
	1014	psPtr->clientData = newStr;
1019	1015	return eventMask;
1020	1016	}
1021	1017

1082	1078	if (isNew) {
1083	1079	psPtr->nextObjPtr = NULL;
1084	1080	} else {
1085		psPtr->nextObjPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
	1081	psPtr->nextObjPtr = Tcl_GetHashValue(hPtr);
1086	1082	}
1087	1083	Tcl_SetHashValue(hPtr, psPtr);
1088	1084	} else {
1089
1090	1085	/*
1091	1086	* Free existing callback.
1092	1087	*/
1093	1088
1094	1089	if (psPtr->freeProc != NULL) {
1095		(*psPtr->freeProc)(psPtr->clientData);
	1090	psPtr->freeProc(psPtr->clientData);
1096	1091	}
1097	1092	}
1098	1093

1151	1146	if (hPtr == NULL) {
1152	1147	Tcl_Panic("Tk_DeleteBinding couldn't find object table entry");
1153	1148	}
1154		prevPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
	1149	prevPtr = Tcl_GetHashValue(hPtr);
1155	1150	if (prevPtr == psPtr) {
1156	1151	Tcl_SetHashValue(hPtr, psPtr->nextObjPtr);
1157	1152	} else {

1165	1160	}
1166	1161	}
1167	1162	}
1168		prevPtr = (PatSeq *) Tcl_GetHashValue(psPtr->hPtr);
	1163	prevPtr = Tcl_GetHashValue(psPtr->hPtr);
1169	1164	if (prevPtr == psPtr) {
1170	1165	if (psPtr->nextSeqPtr == NULL) {
1171	1166	Tcl_DeleteHashEntry(psPtr->hPtr);

1187	1182	psPtr->flags \|= MARKED_DELETED;
1188	1183	if (psPtr->refCount == 0) {
1189	1184	if (psPtr->freeProc != NULL) {
1190		(*psPtr->freeProc)(psPtr->clientData);
	1185	psPtr->freeProc(psPtr->clientData);
1191	1186	}
1192	1187	ckfree((char *) psPtr);
1193	1188	}

1277	1272	return;
1278	1273	}
1279	1274	Tcl_DStringInit(&ds);
1280		for (psPtr = (PatSeq *) Tcl_GetHashValue(hPtr); psPtr != NULL;
	1275	for (psPtr = Tcl_GetHashValue(hPtr); psPtr != NULL;
1281	1276	psPtr = psPtr->nextObjPtr) {
1282	1277	/*
1283	1278	* For each binding, output information about each of the patterns in

1323	1318	if (hPtr == NULL) {
1324	1319	return;
1325	1320	}
1326		for (psPtr = (PatSeq *) Tcl_GetHashValue(hPtr); psPtr != NULL;
	1321	for (psPtr = Tcl_GetHashValue(hPtr); psPtr != NULL;
1327	1322	psPtr = nextPtr) {
1328		nextPtr = psPtr->nextObjPtr;
	1323	nextPtr = psPtr->nextObjPtr;
1329	1324
1330	1325	/*
1331	1326	* Be sure to remove each binding from its hash chain in the pattern

1333	1328	* hash entry too.
1334	1329	*/
1335	1330
1336		prevPtr = (PatSeq *) Tcl_GetHashValue(psPtr->hPtr);
	1331	prevPtr = Tcl_GetHashValue(psPtr->hPtr);
1337	1332	if (prevPtr == psPtr) {
1338	1333	if (psPtr->nextSeqPtr == NULL) {
1339	1334	Tcl_DeleteHashEntry(psPtr->hPtr);

1355	1350
1356	1351	if (psPtr->refCount == 0) {
1357	1352	if (psPtr->freeProc != NULL) {
1358		(*psPtr->freeProc)(psPtr->clientData);
	1353	psPtr->freeProc(psPtr->clientData);
1359	1354	}
1360	1355	ckfree((char *) psPtr);
1361	1356	}

1420	1415	Tcl_DString scripts, savedResult;
1421	1416	Detail detail;
1422	1417	char p, end;
1423		PendingBinding *pendingPtr;
1424		PendingBinding staticPending;
1425		TkWindow winPtr = (TkWindow )tkwin;
	1418	PendingBinding staticPending, *pendingPtr;
	1419	TkWindow winPtr = (TkWindow ) tkwin;
1426	1420	PatternTableKey key;
1427	1421	Tk_ClassModalProc *modalProc;
1428	1422

1444	1438	* mega-widget isn't supposed to be visible to people watching the parent.
1445	1439	*/
1446	1440
1447		if ((eventPtr->type == EnterNotify) \|\| (eventPtr->type == LeaveNotify)) {
	1441	if ((eventPtr->type == EnterNotify) \|\| (eventPtr->type == LeaveNotify)) {
1448	1442	if (eventPtr->xcrossing.detail == NotifyInferior) {
1449	1443	return;
1450	1444	}
1451	1445	}
1452		if ((eventPtr->type == FocusIn) \|\| (eventPtr->type == FocusOut)) {
	1446	if ((eventPtr->type == FocusIn) \|\| (eventPtr->type == FocusOut)) {
1453	1447	if (eventPtr->xfocus.detail == NotifyInferior) {
1454	1448	return;
1455	1449	}

1517	1511	}
1518	1512	}
1519	1513	ringPtr = &bindPtr->eventRing[bindPtr->curEvent];
1520		memcpy((void ) ringPtr, (void ) eventPtr, sizeof(XEvent));
	1514	memcpy(ringPtr, eventPtr, sizeof(XEvent));
1521	1515	detail.clientData = 0;
1522	1516	flags = flagArray[ringPtr->type];
1523	1517	if (flags & KEY) {

1542	1536	memset(&key, 0, sizeof(key));
1543	1537
1544	1538	if (ringPtr->type != VirtualEvent) {
1545		Tcl_HashTable *veptPtr;
	1539	Tcl_HashTable *veptPtr = &bindInfoPtr->virtualEventTable.patternTable;
1546	1540	Tcl_HashEntry *hPtr;
1547
1548		veptPtr = &bindInfoPtr->virtualEventTable.patternTable;
1549	1541
1550	1542	key.object = NULL;
1551	1543	key.type = ringPtr->type;

1553	1545
1554	1546	hPtr = Tcl_FindHashEntry(veptPtr, (char *) &key);
1555	1547	if (hPtr != NULL) {
1556		vMatchDetailList = (PatSeq *) Tcl_GetHashValue(hPtr);
	1548	vMatchDetailList = Tcl_GetHashValue(hPtr);
1557	1549	}
1558	1550
1559	1551	if (key.detail.clientData != 0) {
1560	1552	key.detail.clientData = 0;
1561	1553	hPtr = Tcl_FindHashEntry(veptPtr, (char *) &key);
1562	1554	if (hPtr != NULL) {
1563		vMatchNoDetailList = (PatSeq *) Tcl_GetHashValue(hPtr);
	1555	vMatchNoDetailList = Tcl_GetHashValue(hPtr);
1564	1556	}
1565	1557	}
1566	1558	}

1579	1571	Tcl_DStringInit(&scripts);
1580	1572
1581	1573	for ( ; numObjects > 0; numObjects--, objectPtr++) {
1582		PatSeq matchPtr, sourcePtr;
	1574	PatSeq matchPtr = NULL, sourcePtr = NULL;
1583	1575	Tcl_HashEntry *hPtr;
1584
1585		matchPtr = NULL;
1586		sourcePtr = NULL;
1587	1576
1588	1577	/*
1589	1578	* Match the new event against those recorded in the pattern table,

1598	1587	key.detail = detail;
1599	1588	hPtr = Tcl_FindHashEntry(&bindPtr->patternTable, (char *) &key);
1600	1589	if (hPtr != NULL) {
1601		matchPtr = MatchPatterns(dispPtr, bindPtr,
1602		(PatSeq *) Tcl_GetHashValue(hPtr), matchPtr, NULL,
1603		&sourcePtr);
	1590	matchPtr = MatchPatterns(dispPtr, bindPtr, Tcl_GetHashValue(hPtr),
	1591	matchPtr, NULL, &sourcePtr);
1604	1592	}
1605	1593
1606	1594	if (vMatchDetailList != NULL) {

1618	1606	hPtr = Tcl_FindHashEntry(&bindPtr->patternTable, (char *) &key);
1619	1607	if (hPtr != NULL) {
1620	1608	matchPtr = MatchPatterns(dispPtr, bindPtr,
1621		(PatSeq *) Tcl_GetHashValue(hPtr), matchPtr, NULL,
1622		&sourcePtr);
	1609	Tcl_GetHashValue(hPtr), matchPtr, NULL, &sourcePtr);
1623	1610	}
1624	1611
1625	1612	if (vMatchNoDetailList != NULL) {

1649	1636	- sizeof(staticPending.matchArray)
1650	1637	+ matchSpace * sizeof(PatSeq*);
1651	1638	newPtr = (PendingBinding *) ckalloc(newSize);
1652		memcpy((void ) newPtr, (void ) pendingPtr, oldSize);
	1639	memcpy(newPtr, pendingPtr, oldSize);
1653	1640	if (pendingPtr != &staticPending) {
1654	1641	ckfree((char *) pendingPtr);
1655	1642	}

1740	1727	* can tell that by first checking to see if winPtr->mainPtr == NULL.
1741	1728	*/
1742	1729
1743		Tcl_Preserve((ClientData) bindInfoPtr);
	1730	Tcl_Preserve(bindInfoPtr);
1744	1731	while (p < end) {
1745	1732	int code;
1746	1733

1757	1744	code = TCL_OK;
1758	1745	if ((pendingPtr->deleted == 0)
1759	1746	&& ((psPtr->flags & MARKED_DELETED) == 0)) {
1760		code = (*psPtr->eventProc)(psPtr->clientData, interp, eventPtr,
	1747	code = psPtr->eventProc(psPtr->clientData, interp, eventPtr,
1761	1748	tkwin, detail.keySym);
1762	1749	}
1763	1750	psPtr->refCount--;
1764	1751	if ((psPtr->refCount == 0) && (psPtr->flags & MARKED_DELETED)) {
1765	1752	if (psPtr->freeProc != NULL) {
1766		(*psPtr->freeProc)(psPtr->clientData);
	1753	psPtr->freeProc(psPtr->clientData);
1767	1754	}
1768	1755	ckfree((char *) psPtr);
1769	1756	}
1770	1757	} else {
1771	1758	int len = (int) strlen(p);
	1759
1772	1760	code = Tcl_EvalEx(interp, p, len, TCL_EVAL_GLOBAL);
1773	1761	p += len;
1774	1762	}

1786	1774	break;
1787	1775	} else {
1788	1776	Tcl_AddErrorInfo(interp, "\n (command bound to event)");
1789		Tcl_BackgroundError(interp);
	1777	Tcl_BackgroundException(interp, code);
1790	1778	break;
1791	1779	}
1792	1780	}

1804	1792	if (deferModal) {
1805	1793	modalProc = Tk_GetClassProc(winPtr->classProcsPtr, modalProc);
1806	1794	if (modalProc != NULL) {
1807		(*modalProc)(tkwin, eventPtr);
	1795	modalProc(tkwin, eventPtr);
1808	1796	}
1809	1797	}
1810	1798	}

1845	1833	ckfree((char *) pendingPtr);
1846	1834	}
1847	1835	}
1848		Tcl_Release((ClientData) bindInfoPtr);
	1836	Tcl_Release(bindInfoPtr);
1849	1837	}
1850	1838
1851	1839	/*

1927	1915	*
1928	1916	*----------------------------------------------------------------------
1929	1917	*/
	1918
1930	1919	static PatSeq *
1931	1920	MatchPatterns(
1932	1921	TkDisplay dispPtr, / Display from which the event came. */

1961	1950	*/
1962	1951
1963	1952	for ( ; psPtr != NULL; psPtr = psPtr->nextSeqPtr) {
1964		XEvent *eventPtr;
1965		Pattern *patPtr;
1966		Window window;
1967		Detail *detailPtr;
1968		int patCount, ringCount, flags, state;
1969		int modMask;
	1953	XEvent *eventPtr = &bindPtr->eventRing[bindPtr->curEvent];
	1954	Detail *detailPtr = &bindPtr->detailRing[bindPtr->curEvent];
	1955	Pattern *patPtr = psPtr->pats;
	1956	Window window = eventPtr->xany.window;
	1957	int patCount, ringCount, flags, state, modMask, i;
1970	1958
1971	1959	/*
1972	1960	* Iterate over all the patterns in a sequence to be sure that they
1973	1961	* all match.
1974	1962	*/
1975	1963
1976		eventPtr = &bindPtr->eventRing[bindPtr->curEvent];
1977		detailPtr = &bindPtr->detailRing[bindPtr->curEvent];
1978		window = eventPtr->xany.window;
1979		patPtr = psPtr->pats;
1980	1964	patCount = psPtr->numPats;
1981	1965	ringCount = EVENT_BUFFER_SIZE;
1982	1966	while (patCount > 0) {

2012	1996	\|\| (patPtr->eventType == ButtonRelease)) {
2013	1997	if ((eventPtr->xany.type == KeyPress)
2014	1998	\|\| (eventPtr->xany.type == KeyRelease)) {
2015		int i;
2016
2017	1999	/*
2018	2000	* Ignore key events if they are modifier keys.
2019	2001	*/

2024	2006	/*
2025	2007	* This key is a modifier key, so ignore it.
2026	2008	*/
	2009
2027	2010	goto nextEvent;
2028	2011	}
2029	2012	}

2055	2038	*/
2056	2039
2057	2040	if (eventPtr->xany.type == KeyPress) {
2058		int i;
2059
2060	2041	for (i = 0; i < dispPtr->numModKeyCodes; i++) {
2061	2042	if (dispPtr->modKeyCodes[i] == eventPtr->xkey.keycode) {
2062	2043	goto nextEvent;

2066	2047	goto nextSequence;
2067	2048	}
2068	2049	flags = flagArray[eventPtr->type];
2069		if (flags & (KEY_BUTTON_MOTION_VIRTUAL)) {
	2050	if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
2070	2051	state = eventPtr->xkey.state;
2071	2052	} else if (flags & CROSSING) {
2072	2053	state = eventPtr->xcrossing.state;

2094	2075	}
2095	2076	}
2096	2077	if (psPtr->flags & PAT_NEARBY) {
2097		XEvent *firstPtr;
	2078	XEvent *firstPtr = &bindPtr->eventRing[bindPtr->curEvent];
2098	2079	int timeDiff;
2099	2080
2100		firstPtr = &bindPtr->eventRing[bindPtr->curEvent];
2101	2081	timeDiff = (Time) firstPtr->xkey.time - eventPtr->xkey.time;
2102	2082	if ((firstPtr->xkey.x_root
2103	2083	< (eventPtr->xkey.x_root - NEARBY_PIXELS))

2153	2133	hPtr = Tcl_FindHashEntry(&bindPtr->patternTable,
2154	2134	(char *) &key);
2155	2135	if (hPtr != NULL) {
2156
2157	2136	/*
2158	2137	* This tag is interested in this virtual event and its
2159	2138	* corresponding physical event is a good match with the
2160	2139	* virtual event's definition.
2161	2140	*/
2162	2141
2163		PatSeq *virtMatchPtr;
2164
2165		virtMatchPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
	2142	PatSeq *virtMatchPtr = Tcl_GetHashValue(hPtr);
	2143
2166	2144	if ((virtMatchPtr->numPats != 1)
2167	2145	\|\| (virtMatchPtr->nextSeqPtr != NULL)) {
2168	2146	Tcl_Panic("MatchPattern: badly constructed virtual event");

2189	2167
2190	2168	if (bestPtr != NULL) {
2191	2169	Pattern *patPtr2;
2192		int i;
2193	2170
2194	2171	if (matchPtr->numPats != bestPtr->numPats) {
2195	2172	if (bestPtr->numPats > matchPtr->numPats) {

2217	2194	}
2218	2195	}
2219	2196	}
	2197
2220	2198	/*
2221	2199	* Tie goes to current best pattern.
2222	2200	*

2247	2225	*sourcePtrPtr = bestSourcePtr;
2248	2226	return bestPtr;
2249	2227	}
2250
2251	2228
2252	2229	/*
2253	2230	*--------------------------------------------------------------

2375	2352	case 'h':
2376	2353	if (flags & EXPOSE) {
2377	2354	number = eventPtr->xexpose.height;
2378		} else if (flags & (CONFIG)) {
	2355	} else if (flags & CONFIG) {
2379	2356	number = eventPtr->xconfigure.height;
2380	2357	} else if (flags & CREATE) {
2381	2358	number = eventPtr->xcreatewindow.height;
2382	2359	} else if (flags & CONFIGREQ) {
2383		number = eventPtr->xconfigurerequest.height;
	2360	number = eventPtr->xconfigurerequest.height;
2384	2361	} else if (flags & RESIZEREQ) {
2385		number = eventPtr->xresizerequest.height;
	2362	number = eventPtr->xresizerequest.height;
2386	2363	} else {
2387	2364	goto doString;
2388	2365	}

2438	2415	}
2439	2416	goto doString;
2440	2417	case 's':
2441		if (flags & (KEY_BUTTON_MOTION_VIRTUAL)) {
	2418	if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
2442	2419	number = eventPtr->xkey.state;
	2420	goto doNumber;
2443	2421	} else if (flags & CROSSING) {
2444	2422	number = eventPtr->xcrossing.state;
	2423	goto doNumber;
2445	2424	} else if (flags & PROP) {
2446	2425	string = TkFindStateString(propNotify,
2447	2426	eventPtr->xproperty.state);

2453	2432	} else {
2454	2433	goto doString;
2455	2434	}
2456		goto doNumber;
2457	2435	case 't':
2458		if (flags & (KEY_BUTTON_MOTION_VIRTUAL)) {
	2436	if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
2459	2437	number = (int) eventPtr->xkey.time;
2460	2438	} else if (flags & CROSSING) {
2461	2439	number = (int) eventPtr->xcrossing.time;

2476	2454	} else if (flags & CREATE) {
2477	2455	number = eventPtr->xcreatewindow.width;
2478	2456	} else if (flags & CONFIGREQ) {
2479		number = eventPtr->xconfigurerequest.width;
	2457	number = eventPtr->xconfigurerequest.width;
2480	2458	} else if (flags & RESIZEREQ) {
2481		number = eventPtr->xresizerequest.width;
	2459	number = eventPtr->xresizerequest.width;
2482	2460	} else {
2483	2461	goto doString;
2484	2462	}
2485	2463	goto doNumber;
2486	2464	case 'x':
2487		if (flags & (KEY_BUTTON_MOTION_VIRTUAL)) {
	2465	if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
2488	2466	number = eventPtr->xkey.x;
2489	2467	} else if (flags & CROSSING) {
2490	2468	number = eventPtr->xcrossing.x;

2497	2475	} else if (flags & CREATE) {
2498	2476	number = eventPtr->xcreatewindow.x;
2499	2477	} else if (flags & CONFIGREQ) {
2500		number = eventPtr->xconfigurerequest.x;
	2478	number = eventPtr->xconfigurerequest.x;
2501	2479	} else {
2502	2480	goto doString;
2503	2481	}
2504	2482	goto doNumber;
2505	2483	case 'y':
2506		if (flags & (KEY_BUTTON_MOTION_VIRTUAL)) {
	2484	if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
2507	2485	number = eventPtr->xkey.y;
2508	2486	} else if (flags & EXPOSE) {
2509	2487	number = eventPtr->xexpose.y;

2553	2531	goto doNumber;
2554	2532	case 'K':
2555	2533	if (flags & KEY) {
2556		char *name;
2557
2558		name = TkKeysymToString(keySym);
	2534	char *name = TkKeysymToString(keySym);
	2535
2559	2536	if (name != NULL) {
2560	2537	string = name;
2561	2538	}

2662	2639	* ChangeScreen --
2663	2640	*
2664	2641	* This function is invoked whenever the current screen changes in an
2665		* application. It invokes a Tcl function named "tk::ScreenChanged",
	2642	* application. It invokes a Tcl command named "tk::ScreenChanged",
2666	2643	* passing it the screen name as argument. tk::ScreenChanged does things
2667	2644	* like making the tk::Priv variable point to an array for the current
2668	2645	* display.

2671	2648	* None.
2672	2649	*
2673	2650	* Side effects:
2674		* Depends on what tk::ScreenChanged does. If an error occurs them
	2651	* Depends on what tk::ScreenChanged does. If an error occurs then
2675	2652	* bgerror will be invoked.
2676	2653	*
2677	2654	*----------------------------------------------------------------------

2683	2660	char dispName, / Name of new display. */
2684	2661	int screenIndex) /* Index of new screen. */
2685	2662	{
2686		Tcl_DString cmd;
	2663	Tcl_Obj *cmdObj = Tcl_ObjPrintf("::tk::ScreenChanged %s.%d",
	2664	dispName, screenIndex);
2687	2665	int code;
2688		char screen[TCL_INTEGER_SPACE];
2689
2690		Tcl_DStringInit(&cmd);
2691		Tcl_DStringAppend(&cmd, "tk::ScreenChanged ", 18);
2692		Tcl_DStringAppend(&cmd, dispName, -1);
2693		sprintf(screen, ".%d", screenIndex);
2694		Tcl_DStringAppend(&cmd, screen, -1);
2695		code = Tcl_EvalEx(interp, Tcl_DStringValue(&cmd), Tcl_DStringLength(&cmd),
2696		TCL_EVAL_GLOBAL);
2697		Tcl_DStringFree(&cmd);
	2666
	2667	Tcl_IncrRefCount(cmdObj);
	2668	code = Tcl_GlobalEvalObj(interp, cmdObj);
2698	2669	if (code != TCL_OK) {
2699	2670	Tcl_AddErrorInfo(interp,
2700	2671	"\n (changing screen in event binding)");
2701		Tcl_BackgroundError(interp);
2702		}
	2672	Tcl_BackgroundException(interp, code);
	2673	}
	2674	Tcl_DecrRefCount(cmdObj);
2703	2675	}
2704	2676
2705	2677	/*

2726	2698	int objc, /* Number of arguments. */
2727	2699	Tcl_Obj const objv[]) / Argument objects. */
2728	2700	{
2729		int index;
2730		Tk_Window tkwin;
	2701	int index, i;
	2702	char name, event;
	2703	Tk_Window tkwin = clientData;
2731	2704	VirtualEventTable *vetPtr;
2732	2705	TkBindInfo bindInfo;
2733		static const char *optionStrings[] = {
	2706	static const char *const optionStrings[] = {
2734	2707	"add", "delete", "generate", "info",
2735	2708	NULL
2736	2709	};

2738	2711	EVENT_ADD, EVENT_DELETE, EVENT_GENERATE, EVENT_INFO
2739	2712	};
2740	2713
2741		tkwin = (Tk_Window) clientData;
2742	2714	bindInfo = ((TkWindow *) tkwin)->mainPtr->bindInfo;
2743	2715	vetPtr = &((BindInfo *) bindInfo)->virtualEventTable;
2744	2716

2752	2724	}
2753	2725
2754	2726	switch ((enum options) index) {
2755		case EVENT_ADD: {
2756		int i;
2757		char name, event;
2758
	2727	case EVENT_ADD:
2759	2728	if (objc < 4) {
2760	2729	Tcl_WrongNumArgs(interp, 2, objv,
2761	2730	"virtual sequence ?sequence ...?");

2769	2738	}
2770	2739	}
2771	2740	break;
2772		}
2773		case EVENT_DELETE: {
2774		int i;
2775		char name, event;
2776
	2741	case EVENT_DELETE:
2777	2742	if (objc < 3) {
2778		Tcl_WrongNumArgs(interp, 2, objv,
2779		"virtual ?sequence ...?");
	2743	Tcl_WrongNumArgs(interp, 2, objv, "virtual ?sequence ...?");
2780	2744	return TCL_ERROR;
2781	2745	}
2782	2746	name = Tcl_GetString(objv[2]);

2790	2754	}
2791	2755	}
2792	2756	break;
2793		}
2794	2757	case EVENT_GENERATE:
2795	2758	if (objc < 4) {
2796		Tcl_WrongNumArgs(interp, 2, objv, "window event ?-option value ...?");
	2759	Tcl_WrongNumArgs(interp, 2, objv,
	2760	"window event ?-option value ...?");
2797	2761	return TCL_ERROR;
2798	2762	}
2799	2763	return HandleEventGenerate(interp, tkwin, objc - 2, objv + 2);

2802	2766	GetAllVirtualEvents(interp, vetPtr);
2803	2767	return TCL_OK;
2804	2768	} else if (objc == 3) {
2805		return GetVirtualEvent(interp, vetPtr, Tcl_GetString(objv[2]));
	2769	return GetVirtualEvent(interp, vetPtr, objv[2]);
2806	2770	} else {
2807	2771	Tcl_WrongNumArgs(interp, 2, objv, "?virtual?");
2808	2772	return TCL_ERROR;

2865	2829
2866	2830	hPtr = Tcl_FirstHashEntry(&vetPtr->patternTable, &search);
2867	2831	for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
2868		psPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
	2832	psPtr = Tcl_GetHashValue(hPtr);
2869	2833	for ( ; psPtr != NULL; psPtr = nextPtr) {
2870	2834	nextPtr = psPtr->nextSeqPtr;
2871	2835	ckfree((char *) psPtr->voPtr);

2876	2840
2877	2841	hPtr = Tcl_FirstHashEntry(&vetPtr->nameTable, &search);
2878	2842	for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
2879		ckfree((char *) Tcl_GetHashValue(hPtr));
	2843	ckfree(Tcl_GetHashValue(hPtr));
2880	2844	}
2881	2845	Tcl_DeleteHashTable(&vetPtr->nameTable);
2882	2846	}

2942	2906	* Make virtual event own the physical event.
2943	2907	*/
2944	2908
2945		poPtr = (PhysicalsOwned *) Tcl_GetHashValue(vhPtr);
	2909	poPtr = Tcl_GetHashValue(vhPtr);
2946	2910	if (poPtr == NULL) {
2947	2911	poPtr = (PhysicalsOwned *) ckalloc(sizeof(PhysicalsOwned));
2948	2912	poPtr->numOwned = 0;

2962	2926	poPtr = (PhysicalsOwned ) ckrealloc((char ) poPtr,
2963	2927	sizeof(PhysicalsOwned) + poPtr->numOwned * sizeof(PatSeq *));
2964	2928	}
2965		Tcl_SetHashValue(vhPtr, (ClientData) poPtr);
	2929	Tcl_SetHashValue(vhPtr, poPtr);
2966	2930	poPtr->patSeqs[poPtr->numOwned] = psPtr;
2967	2931	poPtr->numOwned++;
2968	2932

3034	2998	if (vhPtr == NULL) {
3035	2999	return TCL_OK;
3036	3000	}
3037		poPtr = (PhysicalsOwned *) Tcl_GetHashValue(vhPtr);
	3001	poPtr = Tcl_GetHashValue(vhPtr);
3038	3002
3039	3003	eventPSPtr = NULL;
3040	3004	if (eventString != NULL) {

3049	3013	eventPSPtr = FindSequence(interp, &vetPtr->patternTable, NULL,
3050	3014	eventString, 0, 0, &eventMask);
3051	3015	if (eventPSPtr == NULL) {
3052		const char *string;
3053
3054		string = Tcl_GetStringResult(interp);
	3016	const char *string = Tcl_GetStringResult(interp);
	3017
3055	3018	return (string[0] != '\0') ? TCL_ERROR : TCL_OK;
3056	3019	}
3057	3020	}
3058	3021
3059	3022	for (iPhys = poPtr->numOwned; --iPhys >= 0; ) {
3060	3023	PatSeq *psPtr = poPtr->patSeqs[iPhys];
	3024
3061	3025	if ((eventPSPtr == NULL) \|\| (psPtr == eventPSPtr)) {
3062	3026	int iVirt;
3063	3027	VirtualOwners *voPtr;

3083	3047	* from physical->virtual map.
3084	3048	*/
3085	3049
3086		PatSeq prevPtr = (PatSeq ) Tcl_GetHashValue(psPtr->hPtr);
	3050	PatSeq *prevPtr = Tcl_GetHashValue(psPtr->hPtr);
3087	3051
3088	3052	if (prevPtr == psPtr) {
3089	3053	if (psPtr->nextSeqPtr == NULL) {

3173	3137	GetVirtualEvent(
3174	3138	Tcl_Interp interp, / Interpreter for reporting. */
3175	3139	VirtualEventTable vetPtr, / Table in which to look for event. */
3176		char virtString) / String describing virtual event. */
	3140	Tcl_Obj virtName) / String describing virtual event. */
3177	3141	{
3178	3142	Tcl_HashEntry *vhPtr;
3179	3143	Tcl_DString ds;

3181	3145	PhysicalsOwned *poPtr;
3182	3146	Tk_Uid virtUid;
3183	3147
3184		virtUid = GetVirtualEventUid(interp, virtString);
	3148	virtUid = GetVirtualEventUid(interp, Tcl_GetString(virtName));
3185	3149	if (virtUid == NULL) {
3186	3150	return TCL_ERROR;
3187	3151	}

3193	3157
3194	3158	Tcl_DStringInit(&ds);
3195	3159
3196		poPtr = (PhysicalsOwned *) Tcl_GetHashValue(vhPtr);
	3160	poPtr = Tcl_GetHashValue(vhPtr);
3197	3161	for (iPhys = 0; iPhys < poPtr->numOwned; iPhys++) {
3198	3162	Tcl_DStringSetLength(&ds, 0);
3199	3163	GetPatternString(poPtr->patSeqs[iPhys], &ds);

3297	3261	TkWindow *mainPtr;
3298	3262	unsigned long eventMask;
3299	3263	Tcl_Obj *userDataObj;
3300		static const char *fieldStrings[] = {
	3264
	3265	static const char *const fieldStrings[] = {
3301	3266	"-when", "-above", "-borderwidth", "-button",
3302	3267	"-count", "-data", "-delta", "-detail",
3303	3268	"-focus", "-height",

3353	3318	return TCL_ERROR;
3354	3319	}
3355	3320
3356		memset((void *) &event, 0, sizeof(event));
	3321	memset(&event, 0, sizeof(event));
3357	3322	event.xany.type = pat.eventType;
3358	3323	event.xany.serial = NextRequest(Tk_Display(tkwin));
3359	3324	event.xany.send_event = False;

3374	3339	Tk_DestroyWindow(tkwin);
3375	3340	return TCL_OK;
3376	3341	}
3377		if (flags & (KEY_BUTTON_MOTION_VIRTUAL)) {
	3342	if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
3378	3343	event.xkey.state = pat.needMods;
3379	3344	if ((flags & KEY) && (event.xany.type != MouseWheelEvent)) {
3380	3345	TkpSetKeycodeAndState(tkwin, pat.detail.keySym, &event);

3388	3353	event.xcreatewindow.window = event.xany.window;
3389	3354	}
3390	3355
3391		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3356	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3392	3357	event.xkey.x_root = -1;
3393	3358	event.xkey.y_root = -1;
	3359	}
	3360
	3361	if (event.xany.type == FocusIn \|\| event.xany.type == FocusOut) {
	3362	event.xany.send_event = GENERATED_FOCUS_EVENT_MAGIC;
3394	3363	}
3395	3364
3396	3365	/*

3430	3399	if (Tcl_GetBooleanFromObj(interp, valuePtr, &warp) != TCL_OK) {
3431	3400	return TCL_ERROR;
3432	3401	}
3433		if (!(flags & (KEY_BUTTON_MOTION_VIRTUAL))) {
	3402	if (!(flags & KEY_BUTTON_MOTION_VIRTUAL)) {
3434	3403	goto badopt;
3435	3404	}
3436	3405	break;

3622	3591	if (NameToWindow(interp, tkwin, valuePtr, &tkwin2) != TCL_OK) {
3623	3592	return TCL_ERROR;
3624	3593	}
3625		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3594	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3626	3595	event.xkey.root = Tk_WindowId(tkwin2);
3627	3596	} else {
3628	3597	goto badopt;

3632	3601	if (Tk_GetPixelsFromObj(interp,tkwin,valuePtr,&number) != TCL_OK) {
3633	3602	return TCL_ERROR;
3634	3603	}
3635		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3604	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3636	3605	event.xkey.x_root = number;
3637	3606	} else {
3638	3607	goto badopt;

3642	3611	if (Tk_GetPixelsFromObj(interp,tkwin,valuePtr,&number) != TCL_OK) {
3643	3612	return TCL_ERROR;
3644	3613	}
3645		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3614	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3646	3615	event.xkey.y_root = number;
3647	3616	} else {
3648	3617	goto badopt;

3676	3645	event.xany.serial = number;
3677	3646	break;
3678	3647	case EVENT_STATE:
3679		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3648	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3680	3649	if (Tcl_GetIntFromObj(interp, valuePtr, &number) != TCL_OK) {
3681	3650	return TCL_ERROR;
3682	3651	}
3683		if (flags & (KEY_BUTTON_MOTION_VIRTUAL)) {
	3652	if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
3684	3653	event.xkey.state = number;
3685	3654	} else {
3686	3655	event.xcrossing.state = number;

3700	3669	if (NameToWindow(interp, tkwin, valuePtr, &tkwin2) != TCL_OK) {
3701	3670	return TCL_ERROR;
3702	3671	}
3703		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3672	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3704	3673	event.xkey.subwindow = Tk_WindowId(tkwin2);
3705	3674	} else {
3706	3675	goto badopt;

3710	3679	if (Tcl_GetIntFromObj(interp, valuePtr, &number) != TCL_OK) {
3711	3680	return TCL_ERROR;
3712	3681	}
3713		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3682	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3714	3683	event.xkey.time = (Time) number;
3715	3684	} else if (flags & PROP) {
3716	3685	event.xproperty.time = (Time) number;

3744	3713	if (Tk_GetPixelsFromObj(interp,tkwin,valuePtr,&number) != TCL_OK) {
3745	3714	return TCL_ERROR;
3746	3715	}
3747		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3716	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3748	3717	event.xkey.x = number;
3749	3718
3750	3719	/*

3771	3740	if (Tk_GetPixelsFromObj(interp,tkwin,valuePtr,&number) != TCL_OK) {
3772	3741	return TCL_ERROR;
3773	3742	}
3774		if (flags & (KEY_BUTTON_MOTION_VIRTUAL\|CROSSING)) {
	3743	if (flags & KEY_BUTTON_MOTION_CROSSING) {
3775	3744	event.xkey.y = number;
3776	3745
3777	3746	/*

3832	3801	*/
3833	3802
3834	3803	if ((warp != 0) && Tk_IsMapped(tkwin)) {
3835		TkDisplay *dispPtr;
3836		dispPtr = TkGetDisplay(event.xmotion.display);
	3804	TkDisplay *dispPtr = TkGetDisplay(event.xmotion.display);
	3805
3837	3806	if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
3838		Tcl_DoWhenIdle(DoWarp, (ClientData) dispPtr);
	3807	Tcl_DoWhenIdle(DoWarp, dispPtr);
3839	3808	dispPtr->flags \|= TK_DISPLAY_IN_WARP;
3840	3809	}
3841	3810	dispPtr->warpWindow = event.xany.window;

3853	3822	Tcl_Obj objPtr, / Contains name or id string of window. */
3854	3823	Tk_Window tkwinPtr) / Filled with token for window. */
3855	3824	{
3856		char *name;
	3825	char *name = Tcl_GetString(objPtr);
3857	3826	Tk_Window tkwin;
3858		Window id;
3859
3860		name = Tcl_GetString(objPtr);
	3827
3861	3828	if (name[0] == '.') {
3862	3829	tkwin = Tk_NameToWindow(interp, name, mainWin);
3863	3830	if (tkwin == NULL) {
3864	3831	return TCL_ERROR;
3865	3832	}
3866		*tkwinPtr = tkwin;
3867	3833	} else {
	3834	Window id;
	3835
3868	3836	/*
3869	3837	* Check for the winPtr being valid, even if it looks ok to
3870	3838	* TkpScanWindowId. [Bug #411307]
3871	3839	*/
3872	3840
3873		if ((TkpScanWindowId(NULL, name, &id) != TCL_OK) \|\|
3874		((*tkwinPtr = Tk_IdToWindow(Tk_Display(mainWin), id))
3875		== NULL)) {
3876		Tcl_AppendResult(interp, "bad window name/identifier \"",
3877		name, "\"", NULL);
3878		return TCL_ERROR;
3879		}
3880		}
	3841	if (TkpScanWindowId(NULL, name, &id) != TCL_OK) {
	3842	goto badWindow;
	3843	}
	3844	tkwin = Tk_IdToWindow(Tk_Display(mainWin), id);
	3845	if (tkwin == NULL) {
	3846	goto badWindow;
	3847	}
	3848	}
	3849	*tkwinPtr = tkwin;
3881	3850	return TCL_OK;
	3851
	3852	badWindow:
	3853	Tcl_AppendResult(interp, "bad window name/identifier \"",name,"\"", NULL);
	3854	return TCL_ERROR;
3882	3855	}
3883	3856
3884	3857	/*

3896	3869	*
3897	3870	*-------------------------------------------------------------------------
3898	3871	*/
	3872
3899	3873	static void
3900	3874	DoWarp(
3901	3875	ClientData clientData)
3902	3876	{
3903		TkDisplay dispPtr = (TkDisplay ) clientData;
3904
3905		XWarpPointer(dispPtr->display, (Window) None, (Window) dispPtr->warpWindow,
3906		0, 0, 0, 0, (int) dispPtr->warpX, (int) dispPtr->warpY);
	3877	TkDisplay *dispPtr = clientData;
	3878
	3879	XWarpPointer(dispPtr->display, (Window) None,
	3880	(Window) dispPtr->warpWindow, 0, 0, 0, 0,
	3881	(int) dispPtr->warpX, (int) dispPtr->warpY);
3907	3882	XForceScreenSaver(dispPtr->display, ScreenSaverReset);
3908	3883	dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
3909	3884	}

4078	4053	hPtr = Tcl_CreateHashEntry(patternTablePtr, (char *) &key, &isNew);
4079	4054	sequenceSize = numPats*sizeof(Pattern);
4080	4055	if (!isNew) {
4081		for (psPtr = (PatSeq *) Tcl_GetHashValue(hPtr); psPtr != NULL;
	4056	for (psPtr = Tcl_GetHashValue(hPtr); psPtr != NULL;
4082	4057	psPtr = psPtr->nextSeqPtr) {
4083	4058	if ((numPats == psPtr->numPats)
4084	4059	&& ((flags & PAT_NEARBY) == (psPtr->flags & PAT_NEARBY))
4085		&& (memcmp((char ) patPtr, (char ) psPtr->pats,
4086		sequenceSize) == 0)) {
	4060	&& (memcmp(patPtr, psPtr->pats, sequenceSize) == 0)) {
4087	4061	goto done;
4088	4062	}
4089	4063	}

4103	4077
4104	4078	return NULL;
4105	4079	}
4106		psPtr = (PatSeq *) ckalloc((unsigned) (sizeof(PatSeq)
4107		+ (numPats-1)*sizeof(Pattern)));
	4080	psPtr = (PatSeq *) ckalloc((unsigned)
	4081	(sizeof(PatSeq) + (numPats-1)*sizeof(Pattern)));
4108	4082	psPtr->numPats = numPats;
4109	4083	psPtr->eventProc = NULL;
4110	4084	psPtr->freeProc = NULL;
4111	4085	psPtr->clientData = NULL;
4112	4086	psPtr->flags = flags;
4113	4087	psPtr->refCount = 0;
4114		psPtr->nextSeqPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
	4088	psPtr->nextSeqPtr = Tcl_GetHashValue(hPtr);
4115	4089	psPtr->hPtr = hPtr;
4116	4090	psPtr->voPtr = NULL;
4117	4091	psPtr->nextObjPtr = NULL;
4118	4092	Tcl_SetHashValue(hPtr, psPtr);
4119	4093
4120		memcpy((void ) psPtr->pats, (void ) patPtr, sequenceSize);
	4094	memcpy(psPtr->pats, patPtr, sequenceSize);
4121	4095
4122	4096	done:
4123	4097	*maskPtr = eventMask;

4189	4163	if (isprint(UCHAR(*p))) {
4190	4164	patPtr->detail.keySym = *p;
4191	4165	} else {
4192		char buf[64];
4193
4194		sprintf(buf, "bad ASCII character 0x%x", (unsigned char) *p);
4195		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	4166	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
	4167	"bad ASCII character 0x%x", UCHAR(*p)));
4196	4168	count = 0;
4197	4169	goto done;
4198	4170	}

4230	4202	*/
4231	4203
4232	4204	char *field = p + 1;
	4205
4233	4206	p = strchr(field, '>');
4234	4207	if (p == field) {
4235	4208	Tcl_SetResult(interp, "virtual event \"<<>>\" is badly formed",

4255	4228
4256	4229	while (1) {
4257	4230	ModInfo *modPtr;
	4231
4258	4232	p = GetField(p, field, FIELD_SIZE);
4259	4233	if (*p == '>') {
4260	4234	/*

4269	4243	if (hPtr == NULL) {
4270	4244	break;
4271	4245	}
4272		modPtr = (ModInfo *) Tcl_GetHashValue(hPtr);
	4246	modPtr = Tcl_GetHashValue(hPtr);
4273	4247	patPtr->needMods \|= modPtr->mask;
4274		if (modPtr->flags & (MULT_CLICKS)) {
	4248	if (modPtr->flags & MULT_CLICKS) {
4275	4249	int i = modPtr->flags & MULT_CLICKS;
	4250
4276	4251	count = 2;
4277		while (i >>= 1) count++;
	4252	while (i >>= 1) {
	4253	count++;
	4254	}
4278	4255	}
4279	4256	while ((p == '-') \|\| isspace(UCHAR(p))) {
4280	4257	p++;

4284	4261	eventFlags = 0;
4285	4262	hPtr = Tcl_FindHashEntry(&eventTable, field);
4286	4263	if (hPtr != NULL) {
4287		EventInfo *eiPtr;
4288		eiPtr = (EventInfo *) Tcl_GetHashValue(hPtr);
	4264	EventInfo *eiPtr = Tcl_GetHashValue(hPtr);
4289	4265
4290	4266	patPtr->eventType = eiPtr->type;
4291	4267	eventFlags = flagArray[eiPtr->type];

4428	4404	Pattern *patPtr;
4429	4405	char c, buffer[TCL_INTEGER_SPACE];
4430	4406	int patsLeft, needMods;
4431		ModInfo *modPtr;
	4407	const ModInfo *modPtr;
4432	4408	EventInfo *eiPtr;
4433	4409
4434	4410	/*

4438	4414
4439	4415	for (patsLeft = psPtr->numPats, patPtr = &psPtr->pats[psPtr->numPats - 1];
4440	4416	patsLeft > 0; patsLeft--, patPtr--) {
4441
4442	4417	/*
4443	4418	* Check for simple case of an ASCII character.
4444	4419	*/

4450	4425	&& isprint(UCHAR(patPtr->detail.keySym))
4451	4426	&& (patPtr->detail.keySym != '<')
4452	4427	&& (patPtr->detail.keySym != ' ')) {
4453
4454	4428	c = (char) patPtr->detail.keySym;
4455	4429	Tcl_DStringAppend(dsPtr, &c, 1);
4456	4430	continue;

4474	4448	*/
4475	4449
4476	4450	Tcl_DStringAppend(dsPtr, "<", 1);
	4451
4477	4452	if ((psPtr->flags & PAT_NEARBY) && (patsLeft > 1)
4478		&& (memcmp((char ) patPtr, (char ) (patPtr-1),
4479		sizeof(Pattern)) == 0)) {
	4453	&& (memcmp(patPtr, patPtr-1, sizeof(Pattern)) == 0)) {
4480	4454	patsLeft--;
4481	4455	patPtr--;
4482		if ((patsLeft > 1) && (memcmp((char *) patPtr,
4483		(char *) (patPtr-1), sizeof(Pattern)) == 0)) {
	4456	if ((patsLeft > 1) &&
	4457	(memcmp(patPtr, patPtr-1, sizeof(Pattern)) == 0)) {
4484	4458	patsLeft--;
4485	4459	patPtr--;
4486		if ((patsLeft > 1) && (memcmp((char *) patPtr,
4487		(char *) (patPtr-1), sizeof(Pattern)) == 0)) {
4488		patsLeft--;
4489		patPtr--;
4490		Tcl_DStringAppend(dsPtr, "Quadruple-", 10);
4491		} else {
4492		Tcl_DStringAppend(dsPtr, "Triple-", 7);
4493		}
	4460	if ((patsLeft > 1) &&
	4461	(memcmp(patPtr, patPtr-1, sizeof(Pattern)) == 0)) {
	4462	patsLeft--;
	4463	patPtr--;
	4464	Tcl_DStringAppend(dsPtr, "Quadruple-", 10);
	4465	} else {
	4466	Tcl_DStringAppend(dsPtr, "Triple-", 7);
	4467	}
4494	4468	} else {
4495	4469	Tcl_DStringAppend(dsPtr, "Double-", 7);
4496	4470	}
4497	4471	}
	4472
4498	4473	for (needMods = patPtr->needMods, modPtr = modArray;
4499	4474	needMods != 0; modPtr++) {
4500	4475	if (modPtr->mask & needMods) {

4503	4478	Tcl_DStringAppend(dsPtr, "-", 1);
4504	4479	}
4505	4480	}
	4481
4506	4482	for (eiPtr = eventArray; eiPtr->name != NULL; eiPtr++) {
4507	4483	if (eiPtr->type == patPtr->eventType) {
4508	4484	Tcl_DStringAppend(dsPtr, eiPtr->name, -1);

4516	4492	if (patPtr->detail.clientData != 0) {
4517	4493	if ((patPtr->eventType == KeyPress)
4518	4494	\|\| (patPtr->eventType == KeyRelease)) {
4519		char *string;
4520
4521		string = TkKeysymToString(patPtr->detail.keySym);
	4495	char *string = TkKeysymToString(patPtr->detail.keySym);
	4496
4522	4497	if (string != NULL) {
4523	4498	Tcl_DStringAppend(dsPtr, string, -1);
4524	4499	}

4527	4502	Tcl_DStringAppend(dsPtr, buffer, -1);
4528	4503	}
4529	4504	}
	4505
4530	4506	Tcl_DStringAppend(dsPtr, ">", 1);
4531	4507	}
4532	4508	}

4578	4554	char name) / Name of a keysym. */
4579	4555	{
4580	4556	#ifdef REDO_KEYSYM_LOOKUP
4581		Tcl_HashEntry *hPtr;
4582		KeySym keysym;
4583
4584		hPtr = Tcl_FindHashEntry(&keySymTable, name);
	4557	Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&keySymTable, name);
	4558
4585	4559	if (hPtr != NULL) {
4586	4560	return (KeySym) Tcl_GetHashValue(hPtr);
4587	4561	}
4588	4562	if (strlen(name) == 1) {
4589		keysym = (KeySym) (unsigned char) name[0];
	4563	KeySym keysym = (KeySym) (unsigned char) name[0];
	4564
4590	4565	if (TkKeysymToString(keysym) != NULL) {
4591	4566	return keysym;
4592	4567	}

4617	4592	KeySym keysym)
4618	4593	{
4619	4594	#ifdef REDO_KEYSYM_LOOKUP
4620		Tcl_HashEntry *hPtr;
4621
4622		hPtr = Tcl_FindHashEntry(&nameTable, (char *)keysym);
	4595	Tcl_HashEntry hPtr = Tcl_FindHashEntry(&nameTable, (char )keysym);
	4596
4623	4597	if (hPtr != NULL) {
4624		return (char *) Tcl_GetHashValue(hPtr);
	4598	return Tcl_GetHashValue(hPtr);
4625	4599	}
4626	4600	#endif /* REDO_KEYSYM_LOOKUP */
	4601
4627	4602	return XKeysymToString(keysym);
4628	4603	}
4629	4604

4687	4662	{
4688	4663	TkWindow winPtr = (TkWindow ) Tk_MainWindow(interp);
4689	4664	BindingTable bindPtr = (BindingTable ) winPtr->mainPtr->bindingTable;
	4665
4690	4666	return &(bindPtr->eventRing[bindPtr->curEvent]);
4691	4667	}
4692	4668

+4

-4

generic/tkBitmap.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkBitmap.c,v 1.21 2007/12/13 15:24:13 dgp Exp $
	13	* RCS: @(#) $Id: tkBitmap.c,v 1.24 2008/11/08 18:44:39 dkf Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

121	121	* field of the Tcl_Obj points to a TkBitmap object.
122	122	*/
123	123
124		Tcl_ObjType tkBitmapObjType = {
	124	const Tcl_ObjType tkBitmapObjType = {
125	125	"bitmap", /* name */
126	126	FreeBitmapObjProc, /* freeIntRepProc */
127	127	DupBitmapObjProc, /* dupIntRepProc */

966	966	Tcl_GetString(objPtr);
967	967	typePtr = objPtr->typePtr;
968	968	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
969		(*typePtr->freeIntRepProc)(objPtr);
	969	typePtr->freeIntRepProc(objPtr);
970	970	}
971	971	objPtr->typePtr = &tkBitmapObjType;
972	972	objPtr->internalRep.twoPtrValue.ptr1 = NULL;

1090	1090	{
1091	1091	char *data;
1092	1092
1093		data = TkGetBitmapData(NULL, NULL, (char *) filename,
	1093	data = TkGetBitmapData(NULL, NULL, filename,
1094	1094	(int ) width_return, (int ) height_return, x_hot_return,
1095	1095	y_hot_return);
1096	1096	if (data == NULL) {

+928

-0

generic/tkBusy.c less more

	0	/*
	1	* tkBusy.c --
	2	*
	3	* This file provides functions that implement busy for Tk.
	4	*
	5	* Copyright 1993-1998 Lucent Technologies, Inc.
	6	*
	7	* The "busy" command was created by George Howlett. Adapted for
	8	* integration into Tk by Jos Decoster and Donal K. Fellows.
	9	*
	10	* See the file "license.terms" for information on usage and redistribution of
	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
	12	*
	13	* RCS: @(#) $Id: tkBusy.c,v 1.6 2008/12/10 00:34:51 das Exp $
	14	*/
	15
	16	#include "tkInt.h"
	17	#include "tkBusy.h"
	18	#include "default.h"
	19
	20	/*
	21	* Things about the busy system that may be configured. Note that currently on
	22	* OSX/Aqua, that's nothing at all.
	23	*/
	24
	25	static Tk_OptionSpec busyOptionSpecs[] = {
	26	#ifndef MAC_OSX_TK
	27	{TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",
	28	DEF_BUSY_CURSOR, -1, Tk_Offset(Busy, cursor),
	29	TK_OPTION_NULL_OK, 0, 0},
	30	#endif
	31	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0}
	32	};
	33
	34	/*
	35	* Forward declarations of functions defined in this file.
	36	*/
	37
	38	static void BusyEventProc(ClientData clientData,
	39	XEvent *eventPtr);
	40	static void BusyGeometryProc(ClientData clientData,
	41	Tk_Window tkwin);
	42	static void BusyCustodyProc(ClientData clientData,
	43	Tk_Window tkwin);
	44	static int ConfigureBusy(Tcl_Interp interp, Busy busyPtr,
	45	int objc, Tcl_Obj *const objv[]);
	46	static Busy * CreateBusy(Tcl_Interp *interp, Tk_Window tkRef);
	47	static void DestroyBusy(char *dataPtr);
	48	static void DoConfigureNotify(Tk_FakeWin *winPtr);
	49	static inline Tk_Window FirstChild(Tk_Window parent);
	50	static Busy * GetBusy(Tcl_Interp *interp,
	51	Tcl_HashTable *busyTablePtr,
	52	Tcl_Obj *const windowObj);
	53	static int HoldBusy(Tcl_HashTable *busyTablePtr,
	54	Tcl_Interp interp, Tcl_Obj const windowObj,
	55	int configObjc, Tcl_Obj *const configObjv[]);
	56	static void MakeTransparentWindowExist(Tk_Window tkwin,
	57	Window parent);
	58	static inline Tk_Window NextChild(Tk_Window tkwin);
	59	static void RefWinEventProc(ClientData clientData,
	60	register XEvent *eventPtr);
	61	static inline void SetWindowInstanceData(Tk_Window tkwin,
	62	ClientData instanceData);
	63
	64	/*
	65	* The "busy" geometry manager definition.
	66	*/
	67
	68	static Tk_GeomMgr busyMgrInfo = {
	69	"busy", /* Name of geometry manager used by winfo */
	70	BusyGeometryProc, /* Procedure to for new geometry requests */
	71	BusyCustodyProc, /* Procedure when window is taken away */
	72	};
	73
	74	/*
	75	* Helper functions, need to check if a Tcl/Tk alternative already exists.
	76	*/
	77
	78	static inline Tk_Window
	79	FirstChild(
	80	Tk_Window parent)
	81	{
	82	struct TkWindow parentPtr = (struct TkWindow ) parent;
	83
	84	return (Tk_Window) parentPtr->childList;
	85	}
	86
	87	static inline Tk_Window
	88	NextChild(
	89	Tk_Window tkwin)
	90	{
	91	struct TkWindow winPtr = (struct TkWindow ) tkwin;
	92
	93	if (winPtr == NULL) {
	94	return NULL;
	95	}
	96	return (Tk_Window) winPtr->nextPtr;
	97	}
	98
	99	static inline void
	100	SetWindowInstanceData(
	101	Tk_Window tkwin,
	102	ClientData instanceData)
	103	{
	104	struct TkWindow winPtr = (struct TkWindow ) tkwin;
	105
	106	winPtr->instanceData = instanceData;
	107	}
	108
	109	/*
	110	*----------------------------------------------------------------------
	111	*
	112	* BusyCustodyProc --
	113	*
	114	* This procedure is invoked when the busy window has been stolen by
	115	* another geometry manager. The information and memory associated with
	116	* the busy window is released. I don't know why anyone would try to pack
	117	* a busy window, but this should keep everything sane, if it is.
	118	*
	119	* Results:
	120	* None.
	121	*
	122	* Side effects:
	123	* The Busy structure is freed at the next idle point.
	124	*
	125	*----------------------------------------------------------------------
	126	*/
	127
	128	/* ARGSUSED */
	129	static void
	130	BusyCustodyProc(
	131	ClientData clientData, /* Information about the busy window. */
	132	Tk_Window tkwin) /* Not used. */
	133	{
	134	Busy *busyPtr = clientData;
	135
	136	Tk_DeleteEventHandler(busyPtr->tkBusy, StructureNotifyMask, BusyEventProc,
	137	busyPtr);
	138	TkpHideBusyWindow(busyPtr);
	139	busyPtr->tkBusy = NULL;
	140	Tcl_EventuallyFree(busyPtr, DestroyBusy);
	141	}
	142
	143	/*
	144	*----------------------------------------------------------------------
	145	*
	146	* BusyGeometryProc --
	147	*
	148	* This procedure is invoked by Tk_GeometryRequest for busy windows.
	149	* Busy windows never request geometry, so it's unlikely that this
	150	* function will ever be called;it exists simply as a place holder for
	151	* the GeomProc in the Geometry Manager structure.
	152	*
	153	* Results:
	154	* None.
	155	*
	156	* Side effects:
	157	* None.
	158	*
	159	*----------------------------------------------------------------------
	160	*/
	161
	162	/* ARGSUSED */
	163	static void
	164	BusyGeometryProc(
	165	ClientData clientData, /* Information about window that got new
	166	* preferred geometry. */
	167	Tk_Window tkwin) /* Other Tk-related information about the
	168	* window. */
	169	{
	170	/* Should never get here */
	171	}
	172
	173	/*
	174	*----------------------------------------------------------------------
	175	*
	176	* DoConfigureNotify --
	177	*
	178	* Generate a ConfigureNotify event describing the current configuration
	179	* of a window.
	180	*
	181	* Results:
	182	* None.
	183	*
	184	* Side effects:
	185	* An event is generated and processed by Tk_HandleEvent.
	186	*
	187	*----------------------------------------------------------------------
	188	*/
	189
	190	static void
	191	DoConfigureNotify(
	192	Tk_FakeWin winPtr) / Window whose configuration was just
	193	* changed. */
	194	{
	195	XEvent event;
	196
	197	event.type = ConfigureNotify;
	198	event.xconfigure.serial = LastKnownRequestProcessed(winPtr->display);
	199	event.xconfigure.send_event = False;
	200	event.xconfigure.display = winPtr->display;
	201	event.xconfigure.event = winPtr->window;
	202	event.xconfigure.window = winPtr->window;
	203	event.xconfigure.x = winPtr->changes.x;
	204	event.xconfigure.y = winPtr->changes.y;
	205	event.xconfigure.width = winPtr->changes.width;
	206	event.xconfigure.height = winPtr->changes.height;
	207	event.xconfigure.border_width = winPtr->changes.border_width;
	208	if (winPtr->changes.stack_mode == Above) {
	209	event.xconfigure.above = winPtr->changes.sibling;
	210	} else {
	211	event.xconfigure.above = None;
	212	}
	213	event.xconfigure.override_redirect = winPtr->atts.override_redirect;
	214	Tk_HandleEvent(&event);
	215	}
	216
	217	/*
	218	*----------------------------------------------------------------------
	219	*
	220	* RefWinEventProc --
	221	*
	222	* This procedure is invoked by the Tk dispatcher for the following
	223	* events on the reference window. If the reference and parent windows
	224	* are the same, only the first event is important.
	225	*
	226	* 1) ConfigureNotify The reference window has been resized or
	227	* moved. Move and resize the busy window to be
	228	* the same size and position of the reference
	229	* window.
	230	*
	231	* 2) DestroyNotify The reference window was destroyed. Destroy
	232	* the busy window and the free resources used.
	233	*
	234	* 3) MapNotify The reference window was (re)shown. Map the
	235	* busy window again.
	236	*
	237	* 4) UnmapNotify The reference window was hidden. Unmap the
	238	* busy window.
	239	*
	240	* Results:
	241	* None.
	242	*
	243	* Side effects:
	244	* When the reference window gets deleted, internal structures get
	245	* cleaned up. When it gets resized, the busy window is resized
	246	* accordingly. If it's displayed, the busy window is displayed. And when
	247	* it's hidden, the busy window is unmapped.
	248	*
	249	*----------------------------------------------------------------------
	250	*/
	251
	252	static void
	253	RefWinEventProc(
	254	ClientData clientData, /* Busy window record */
	255	register XEvent eventPtr) / Event which triggered call to routine */
	256	{
	257	register Busy *busyPtr = clientData;
	258
	259	switch (eventPtr->type) {
	260	case ReparentNotify:
	261	case DestroyNotify:
	262	/*
	263	* Arrange for the busy structure to be removed at a proper time.
	264	*/
	265
	266	Tcl_EventuallyFree(busyPtr, DestroyBusy);
	267	break;
	268
	269	case ConfigureNotify:
	270	if ((busyPtr->width != Tk_Width(busyPtr->tkRef)) \|\|
	271	(busyPtr->height != Tk_Height(busyPtr->tkRef)) \|\|
	272	(busyPtr->x != Tk_X(busyPtr->tkRef)) \|\|
	273	(busyPtr->y != Tk_Y(busyPtr->tkRef))) {
	274	int x, y;
	275
	276	busyPtr->width = Tk_Width(busyPtr->tkRef);
	277	busyPtr->height = Tk_Height(busyPtr->tkRef);
	278	busyPtr->x = Tk_X(busyPtr->tkRef);
	279	busyPtr->y = Tk_Y(busyPtr->tkRef);
	280
	281	x = y = 0;
	282
	283	if (busyPtr->tkParent != busyPtr->tkRef) {
	284	Tk_Window tkwin;
	285
	286	for (tkwin = busyPtr->tkRef; (tkwin != NULL) &&
	287	(!Tk_IsTopLevel(tkwin)); tkwin = Tk_Parent(tkwin)) {
	288	if (tkwin == busyPtr->tkParent) {
	289	break;
	290	}
	291	x += Tk_X(tkwin) + Tk_Changes(tkwin)->border_width;
	292	y += Tk_Y(tkwin) + Tk_Changes(tkwin)->border_width;
	293	}
	294	}
	295	if (busyPtr->tkBusy != NULL) {
	296	Tk_MoveResizeWindow(busyPtr->tkBusy, x, y, busyPtr->width,
	297	busyPtr->height);
	298	TkpShowBusyWindow(busyPtr);
	299	}
	300	}
	301	break;
	302
	303	case MapNotify:
	304	if (busyPtr->tkParent != busyPtr->tkRef) {
	305	TkpShowBusyWindow(busyPtr);
	306	}
	307	break;
	308
	309	case UnmapNotify:
	310	if (busyPtr->tkParent != busyPtr->tkRef) {
	311	TkpHideBusyWindow(busyPtr);
	312	}
	313	break;
	314	}
	315	}
	316
	317	/*
	318	*----------------------------------------------------------------------
	319	*
	320	* DestroyBusy --
	321	*
	322	* This procedure is called from the Tk event dispatcher. It releases X
	323	* resources and memory used by the busy window and updates the internal
	324	* hash table.
	325	*
	326	* Results:
	327	* None.
	328	*
	329	* Side effects:
	330	* Memory and resources are released and the Tk event handler is removed.
	331	*
	332	*----------------------------------------------------------------------
	333	*/
	334
	335	static void
	336	DestroyBusy(
	337	char data) / Busy window structure record */
	338	{
	339	register Busy busyPtr = (Busy ) data;
	340
	341	if (busyPtr->hashPtr != NULL) {
	342	Tcl_DeleteHashEntry(busyPtr->hashPtr);
	343	}
	344	Tk_DeleteEventHandler(busyPtr->tkRef, StructureNotifyMask,
	345	RefWinEventProc, busyPtr);
	346
	347	if (busyPtr->tkBusy != NULL) {
	348	Tk_FreeConfigOptions(data, busyPtr->optionTable, busyPtr->tkBusy);
	349	Tk_DeleteEventHandler(busyPtr->tkBusy, StructureNotifyMask,
	350	BusyEventProc, busyPtr);
	351	Tk_ManageGeometry(busyPtr->tkBusy, NULL, busyPtr);
	352	Tk_DestroyWindow(busyPtr->tkBusy);
	353	}
	354	ckfree(data);
	355	}
	356
	357	/*
	358	*----------------------------------------------------------------------
	359	*
	360	* BusyEventProc --
	361	*
	362	* This procedure is invoked by the Tk dispatcher for events on the busy
	363	* window itself. We're only concerned with destroy events.
	364	*
	365	* It might be necessary (someday) to watch resize events. Right now, I
	366	* don't think there's any point in it.
	367	*
	368	* Results:
	369	* None.
	370	*
	371	* Side effects:
	372	* When a busy window is destroyed, all internal structures associated
	373	* with it released at the next idle point.
	374	*
	375	*----------------------------------------------------------------------
	376	*/
	377
	378	static void
	379	BusyEventProc(
	380	ClientData clientData, /* Busy window record */
	381	XEvent eventPtr) / Event which triggered call to routine */
	382	{
	383	Busy *busyPtr = clientData;
	384
	385	if (eventPtr->type == DestroyNotify) {
	386	busyPtr->tkBusy = NULL;
	387	Tcl_EventuallyFree(busyPtr, DestroyBusy);
	388	}
	389	}
	390
	391	/*
	392	*----------------------------------------------------------------------
	393	*
	394	* MakeTransparentWindowExist --
	395	*
	396	* Similar to Tk_MakeWindowExist but instead creates a transparent window
	397	* to block for user events from sibling windows.
	398	*
	399	* Differences from Tk_MakeWindowExist.
	400	*
	401	* 1. This is always a "busy" window. There's never a platform-specific
	402	* class procedure to execute instead.
	403	* 2. The window is transparent and never will contain children, so
	404	* colormap information is irrelevant.
	405	*
	406	* Results:
	407	* None.
	408	*
	409	* Side effects:
	410	* When the procedure returns, the internal window associated with tkwin
	411	* is guaranteed to exist. This may require the window's ancestors to be
	412	* created too.
	413	*
	414	*----------------------------------------------------------------------
	415	*/
	416
	417	static void
	418	MakeTransparentWindowExist(
	419	Tk_Window tkwin, /* Token for window. */
	420	Window parent) /* Parent window. */
	421	{
	422	TkWindow winPtr = (TkWindow ) tkwin;
	423	Tcl_HashEntry *hPtr;
	424	int notUsed;
	425	TkDisplay *dispPtr;
	426
	427	if (winPtr->window != None) {
	428	return; /* Window already exists. */
	429	}
	430
	431	/*
	432	* Create a transparent window and put it on top.
	433	*/
	434
	435	TkpMakeTransparentWindowExist(tkwin, parent);
	436
	437	dispPtr = winPtr->dispPtr;
	438	hPtr = Tcl_CreateHashEntry(&dispPtr->winTable, (char *) winPtr->window,
	439	&notUsed);
	440	Tcl_SetHashValue(hPtr, winPtr);
	441	winPtr->dirtyAtts = 0;
	442	winPtr->dirtyChanges = 0;
	443
	444	if (!(winPtr->flags & TK_TOP_HIERARCHY)) {
	445	TkWindow *winPtr2;
	446
	447	/*
	448	* If any siblings higher up in the stacking order have already been
	449	* created then move this window to its rightful position in the
	450	* stacking order.
	451	*
	452	* NOTE: this code ignores any changes anyone might have made to the
	453	* sibling and stack_mode field of the window's attributes, so it
	454	* really isn't safe for these to be manipulated except by calling
	455	* Tk_RestackWindow.
	456	*/
	457
	458	for (winPtr2 = winPtr->nextPtr; winPtr2 != NULL;
	459	winPtr2 = winPtr2->nextPtr) {
	460	if ((winPtr2->window != None) &&
	461	!(winPtr2->flags & (TK_TOP_HIERARCHY\|TK_REPARENTED))) {
	462	XWindowChanges changes;
	463
	464	changes.sibling = winPtr2->window;
	465	changes.stack_mode = Below;
	466	XConfigureWindow(winPtr->display, winPtr->window,
	467	CWSibling \| CWStackMode, &changes);
	468	break;
	469	}
	470	}
	471	}
	472
	473	/*
	474	* Issue a ConfigureNotify event if there were deferred configuration
	475	* changes (but skip it if the window is being deleted; the
	476	* ConfigureNotify event could cause problems if we're being called from
	477	* Tk_DestroyWindow under some conditions).
	478	*/
	479
	480	if ((winPtr->flags & TK_NEED_CONFIG_NOTIFY)
	481	&& !(winPtr->flags & TK_ALREADY_DEAD)) {
	482	winPtr->flags &= ~TK_NEED_CONFIG_NOTIFY;
	483	DoConfigureNotify((Tk_FakeWin *) tkwin);
	484	}
	485	}
	486
	487	/*
	488	*----------------------------------------------------------------------
	489	*
	490	* CreateBusy --
	491	*
	492	* Creates a child transparent window that obscures its parent window
	493	* thereby effectively blocking device events. The size and position of
	494	* the busy window is exactly that of the reference window.
	495	*
	496	* We want to create sibling to the window to be blocked. If the busy
	497	* window is a child of the window to be blocked, Enter/Leave events can
	498	* sneak through. Futhermore under WIN32, messages of transparent windows
	499	* are sent directly to the parent. The only exception to this are
	500	* toplevels, since we can't make a sibling. Fortunately, toplevel
	501	* windows rarely receive events that need blocking.
	502	*
	503	* Results:
	504	* Returns a pointer to the new busy window structure.
	505	*
	506	* Side effects:
	507	* When the busy window is eventually displayed, it will screen device
	508	* events (in the area of the reference window) from reaching its parent
	509	* window and its children. User feed back can be achieved by changing
	510	* the cursor.
	511	*
	512	*----------------------------------------------------------------------
	513	*/
	514
	515	static Busy *
	516	CreateBusy(
	517	Tcl_Interp interp, / Interpreter to report error to */
	518	Tk_Window tkRef) /* Window hosting the busy window */
	519	{
	520	Busy *busyPtr;
	521	int length, x, y;
	522	const char *fmt;
	523	char *name;
	524	Tk_Window tkBusy, tkChild, tkParent;
	525	Window parent;
	526	Tk_FakeWin *winPtr;
	527
	528	busyPtr = (Busy *) ckalloc(sizeof(Busy));
	529	x = y = 0;
	530	length = strlen(Tk_Name(tkRef));
	531	name = ckalloc(length + 6);
	532	if (Tk_IsTopLevel(tkRef)) {
	533	fmt = "_Busy"; /* Child */
	534	tkParent = tkRef;
	535	} else {
	536	Tk_Window tkwin;
	537
	538	fmt = "%s_Busy"; /* Sibling */
	539	tkParent = Tk_Parent(tkRef);
	540	for (tkwin = tkRef; (tkwin != NULL) && !Tk_IsTopLevel(tkwin);
	541	tkwin = Tk_Parent(tkwin)) {
	542	if (tkwin == tkParent) {
	543	break;
	544	}
	545	x += Tk_X(tkwin) + Tk_Changes(tkwin)->border_width;
	546	y += Tk_Y(tkwin) + Tk_Changes(tkwin)->border_width;
	547	}
	548	}
	549	for (tkChild = FirstChild(tkParent); tkChild != NULL;
	550	tkChild = NextChild(tkChild)) {
	551	Tk_MakeWindowExist(tkChild);
	552	}
	553	sprintf(name, fmt, Tk_Name(tkRef));
	554	tkBusy = Tk_CreateWindow(interp, tkParent, name, NULL);
	555	ckfree(name);
	556
	557	if (tkBusy == NULL) {
	558	return NULL;
	559	}
	560	Tk_MakeWindowExist(tkRef);
	561	busyPtr->display = Tk_Display(tkRef);
	562	busyPtr->interp = interp;
	563	busyPtr->tkRef = tkRef;
	564	busyPtr->tkParent = tkParent;
	565	busyPtr->tkBusy = tkBusy;
	566	busyPtr->width = Tk_Width(tkRef);
	567	busyPtr->height = Tk_Height(tkRef);
	568	busyPtr->x = Tk_X(tkRef);
	569	busyPtr->y = Tk_Y(tkRef);
	570	busyPtr->cursor = None;
	571	Tk_SetClass(tkBusy, "Busy");
	572	busyPtr->optionTable = Tk_CreateOptionTable(interp, busyOptionSpecs);
	573	if (Tk_InitOptions(interp, (char *) busyPtr, busyPtr->optionTable,
	574	tkBusy) != TCL_OK) {
	575	Tk_DestroyWindow(tkBusy);
	576	return NULL;
	577	}
	578	SetWindowInstanceData(tkBusy, busyPtr);
	579	winPtr = (Tk_FakeWin *) tkRef;
	580
	581	TkpCreateBusy(winPtr, tkRef, &parent, tkParent, busyPtr);
	582
	583	MakeTransparentWindowExist(tkBusy, parent);
	584
	585	Tk_MoveResizeWindow(tkBusy, x, y, busyPtr->width, busyPtr->height);
	586
	587	/*
	588	* Only worry if the busy window is destroyed.
	589	*/
	590
	591	Tk_CreateEventHandler(tkBusy, StructureNotifyMask, BusyEventProc,
	592	busyPtr);
	593
	594	/*
	595	* Indicate that the busy window's geometry is being managed. This will
	596	* also notify us if the busy window is ever packed.
	597	*/
	598
	599	Tk_ManageGeometry(tkBusy, &busyMgrInfo, busyPtr);
	600	if (busyPtr->cursor != None) {
	601	Tk_DefineCursor(tkBusy, busyPtr->cursor);
	602	}
	603
	604	/*
	605	* Track the reference window to see if it is resized or destroyed.
	606	*/
	607
	608	Tk_CreateEventHandler(tkRef, StructureNotifyMask, RefWinEventProc,
	609	busyPtr);
	610	return busyPtr;
	611	}
	612
	613	/*
	614	*----------------------------------------------------------------------
	615	*
	616	* ConfigureBusy --
	617	*
	618	* This procedure is called from the Tk event dispatcher. It releases X
	619	* resources and memory used by the busy window and updates the internal
	620	* hash table.
	621	*
	622	* Results:
	623	* None.
	624	*
	625	* Side effects:
	626	* Memory and resources are released and the Tk event handler is removed.
	627	*
	628	*----------------------------------------------------------------------
	629	*/
	630
	631	static int
	632	ConfigureBusy(
	633	Tcl_Interp *interp,
	634	Busy *busyPtr,
	635	int objc,
	636	Tcl_Obj *const objv[])
	637	{
	638	Tk_Cursor oldCursor = busyPtr->cursor;
	639
	640	if (Tk_SetOptions(interp, (char *) busyPtr, busyPtr->optionTable, objc,
	641	objv, busyPtr->tkBusy, NULL, NULL) != TCL_OK) {
	642	return TCL_ERROR;
	643	}
	644	if (busyPtr->cursor != oldCursor) {
	645	if (busyPtr->cursor == None) {
	646	Tk_UndefineCursor(busyPtr->tkBusy);
	647	} else {
	648	Tk_DefineCursor(busyPtr->tkBusy, busyPtr->cursor);
	649	}
	650	}
	651
	652	return TCL_OK;
	653	}
	654
	655	/*
	656	*----------------------------------------------------------------------
	657	*
	658	* GetBusy --
	659	*
	660	* Returns the busy window structure associated with the reference
	661	* window, keyed by its path name. The clientData argument is the main
	662	* window of the interpreter, used to search for the reference window in
	663	* its own window hierarchy.
	664	*
	665	* Results:
	666	* If path name represents a reference window with a busy window, a
	667	* pointer to the busy window structure is returned. Otherwise, NULL is
	668	* returned and an error message is left in interp->result.
	669	*
	670	* Side effects:
	671	* None.
	672	*
	673	*----------------------------------------------------------------------
	674	*/
	675
	676	static Busy *
	677	GetBusy(
	678	Tcl_Interp interp, / Interpreter to look up main window of. */
	679	Tcl_HashTable busyTablePtr,/ Busy hash table */
	680	Tcl_Obj const windowObj) / Path name of parent window */
	681	{
	682	Tcl_HashEntry *hPtr;
	683	Tk_Window tkwin;
	684
	685	if (TkGetWindowFromObj(interp, Tk_MainWindow(interp), windowObj,
	686	&tkwin) != TCL_OK) {
	687	return NULL;
	688	}
	689	hPtr = Tcl_FindHashEntry(busyTablePtr, (char *) tkwin);
	690	if (hPtr == NULL) {
	691	Tcl_AppendResult(interp, "can't find busy window \"",
	692	Tcl_GetString(windowObj), "\"", NULL);
	693	return NULL;
	694	}
	695	return Tcl_GetHashValue(hPtr);
	696	}
	697
	698	/*
	699	*----------------------------------------------------------------------
	700	*
	701	* HoldBusy --
	702	*
	703	* Creates (if necessary) and maps a busy window, thereby preventing
	704	* device events from being be received by the parent window and its
	705	* children.
	706	*
	707	* Results:
	708	* Returns a standard TCL result. If path name represents a busy window,
	709	* it is unmapped and TCL_OK is returned. Otherwise, TCL_ERROR is
	710	* returned and an error message is left in interp->result.
	711	*
	712	* Side effects:
	713	* The busy window is created and displayed, blocking events from the
	714	* parent window and its children.
	715	*
	716	*----------------------------------------------------------------------
	717	*/
	718
	719	static int
	720	HoldBusy(
	721	Tcl_HashTable busyTablePtr,/ Busy hash table. */
	722	Tcl_Interp interp, / Interpreter to report errors to. */
	723	Tcl_Obj const windowObj, / Window name. */
	724	int configObjc, /* Option pairs. */
	725	Tcl_Obj *const configObjv[])
	726	{
	727	Tk_Window tkwin;
	728	Tcl_HashEntry *hPtr;
	729	Busy *busyPtr;
	730	int isNew, result;
	731
	732	if (TkGetWindowFromObj(interp, Tk_MainWindow(interp), windowObj,
	733	&tkwin) != TCL_OK) {
	734	return TCL_ERROR;
	735	}
	736	hPtr = Tcl_CreateHashEntry(busyTablePtr, (char *) tkwin, &isNew);
	737	if (isNew) {
	738	busyPtr = CreateBusy(interp, tkwin);
	739	if (busyPtr == NULL) {
	740	return TCL_ERROR;
	741	}
	742	Tcl_SetHashValue(hPtr, busyPtr);
	743	busyPtr->hashPtr = hPtr;
	744	} else {
	745	busyPtr = Tcl_GetHashValue(hPtr);
	746	}
	747
	748	busyPtr->tablePtr = busyTablePtr;
	749	result = ConfigureBusy(interp, busyPtr, configObjc, configObjv);
	750
	751	/*
	752	* Don't map the busy window unless the reference window is also currently
	753	* displayed.
	754	*/
	755
	756	if (Tk_IsMapped(busyPtr->tkRef)) {
	757	TkpShowBusyWindow(busyPtr);
	758	} else {
	759	TkpHideBusyWindow(busyPtr);
	760	}
	761	return result;
	762	}
	763
	764	/*
	765	*----------------------------------------------------------------------
	766	*
	767	* Tk_BusyObjCmd --
	768	*
	769	* This function is invoked to process the "tk busy" Tcl command. See the
	770	* user documentation for details on what it does.
	771	*
	772	* Results:
	773	* A standard Tcl result.
	774	*
	775	* Side effects:
	776	* See the user documentation.
	777	*
	778	*----------------------------------------------------------------------
	779	*/
	780
	781	int
	782	Tk_BusyObjCmd(
	783	ClientData clientData, /* Main window associated with interpreter. */
	784	Tcl_Interp interp, / Current interpreter. */
	785	int objc, /* Number of arguments. */
	786	Tcl_Obj const objv[]) / Argument objects. */
	787	{
	788	Tk_Window tkwin = clientData;
	789	Tcl_HashTable busyTablePtr = &((TkWindow ) tkwin)->mainPtr->busyTable;
	790	Busy *busyPtr;
	791	Tcl_Obj *objPtr;
	792	int index, result = TCL_OK;
	793	static const char *optionStrings[] = {
	794	"cget", "configure", "current", "forget", "hold", "status", NULL
	795	};
	796	enum options {
	797	BUSY_CGET, BUSY_CONFIGURE, BUSY_CURRENT, BUSY_FORGET, BUSY_HOLD,
	798	BUSY_STATUS
	799	};
	800
	801	if (objc < 2) {
	802	Tcl_WrongNumArgs(interp, 1, objv, "options ?arg arg ...?");
	803	return TCL_ERROR;
	804	}
	805
	806	/*
	807	* [tk busy <window>] command shortcut.
	808	*/
	809
	810	if (Tcl_GetString(objv[1])[0] == '.') {
	811	if (objc%2 == 1) {
	812	Tcl_WrongNumArgs(interp, 1, objv, "window ?option value ...?");
	813	return TCL_ERROR;
	814	}
	815	return HoldBusy(busyTablePtr, interp, objv[1], objc-2, objv+2);
	816	}
	817
	818	if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
	819	&index) != TCL_OK) {
	820	return TCL_ERROR;
	821	}
	822	switch ((enum options) index) {
	823	case BUSY_CGET:
	824	if (objc != 4) {
	825	Tcl_WrongNumArgs(interp, 2, objv, "window option");
	826	return TCL_ERROR;
	827	}
	828	busyPtr = GetBusy(interp, busyTablePtr, objv[2]);
	829	if (busyPtr == NULL) {
	830	return TCL_ERROR;
	831	}
	832	Tcl_Preserve(busyPtr);
	833	objPtr = Tk_GetOptionValue(interp, (char *) busyPtr,
	834	busyPtr->optionTable, objv[3], busyPtr->tkBusy);
	835	if (objPtr == NULL) {
	836	result = TCL_ERROR;
	837	} else {
	838	Tcl_SetObjResult(interp, objPtr);
	839	}
	840	Tcl_Release(busyPtr);
	841	return result;
	842
	843	case BUSY_CONFIGURE:
	844	if (objc < 3) {
	845	Tcl_WrongNumArgs(interp, 2, objv, "window ?option? ?value ...?");
	846	return TCL_ERROR;
	847	}
	848	busyPtr = GetBusy(interp, busyTablePtr, objv[2]);
	849	if (busyPtr == NULL) {
	850	return TCL_ERROR;
	851	}
	852	Tcl_Preserve(busyPtr);
	853	if (objc <= 4) {
	854	objPtr = Tk_GetOptionInfo(interp, (char *) busyPtr,
	855	busyPtr->optionTable, (objc == 4) ? objv[3] : NULL,
	856	busyPtr->tkBusy);
	857	if (objPtr == NULL) {
	858	result = TCL_ERROR;
	859	} else {
	860	Tcl_SetObjResult(interp, objPtr);
	861	}
	862	} else {
	863	result = ConfigureBusy(interp, busyPtr, objc-3, objv+3);
	864	}
	865	Tcl_Release(busyPtr);
	866	return result;
	867
	868	case BUSY_CURRENT: {
	869	Tcl_HashEntry *hPtr;
	870	Tcl_HashSearch cursor;
	871	const char *pattern = (objc == 3 ? Tcl_GetString(objv[2]) : NULL);
	872
	873	objPtr = Tcl_NewObj();
	874	for (hPtr = Tcl_FirstHashEntry(busyTablePtr, &cursor); hPtr != NULL;
	875	hPtr = Tcl_NextHashEntry(&cursor)) {
	876	busyPtr = Tcl_GetHashValue(hPtr);
	877	if (pattern == NULL \|\|
	878	Tcl_StringMatch(Tk_PathName(busyPtr->tkRef), pattern)) {
	879	Tcl_ListObjAppendElement(interp, objPtr,
	880	TkNewWindowObj(busyPtr->tkRef));
	881	}
	882	}
	883	Tcl_SetObjResult(interp, objPtr);
	884	return TCL_OK;
	885	}
	886
	887	case BUSY_FORGET:
	888	if (objc != 3) {
	889	Tcl_WrongNumArgs(interp, 2, objv, "window");
	890	return TCL_ERROR;
	891	}
	892	busyPtr = GetBusy(interp, busyTablePtr, objv[2]);
	893	if (busyPtr == NULL) {
	894	return TCL_ERROR;
	895	}
	896	TkpHideBusyWindow(busyPtr);
	897	Tcl_EventuallyFree(busyPtr, DestroyBusy);
	898	return TCL_OK;
	899
	900	case BUSY_HOLD:
	901	if (objc < 3 \|\| objc%2 != 1) {
	902	Tcl_WrongNumArgs(interp, 2, objv, "window ?option value ...?");
	903	return TCL_ERROR;
	904	}
	905	return HoldBusy(busyTablePtr, interp, objv[2], objc-3, objv+3);
	906
	907	case BUSY_STATUS:
	908	if (objc != 3) {
	909	Tcl_WrongNumArgs(interp, 2, objv, "window");
	910	return TCL_ERROR;
	911	}
	912	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
	913	GetBusy(interp, busyTablePtr, objv[2]) != NULL));
	914	return TCL_OK;
	915	}
	916
	917	Tcl_Panic("unhandled option: %d", index);
	918	return TCL_ERROR; /* Unreachable */
	919	}
	920
	921	/*
	922	* Local Variables:
	923	* mode: c
	924	* c-basic-offset: 4
	925	* fill-column: 78
	926	* End:
	927	*/

+43

-0

generic/tkBusy.h less more

	0	/*
	1	* tkBusy.h --
	2	*
	3	* This file defines the type of the structure describing a busy window.
	4	*
	5	* Copyright 1993-1998 Lucent Technologies, Inc.
	6	*
	7	* The "busy" command was created by George Howlett. Adapted for
	8	* integration into Tk by Jos Decoster and Donal K. Fellows.
	9	*
	10	* See the file "license.terms" for information on usage and redistribution of
	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
	12	*
	13	* RCS: @(#) $Id: tkBusy.h,v 1.1 2008/10/20 10:50:20 dkf Exp $
	14	*/
	15
	16	typedef struct Busy {
	17	Display display; / Display of busy window */
	18	Tcl_Interp interp; / Interpreter where "busy" command was
	19	* created. It's used to key the searches in
	20	* the window hierarchy. See the "windows"
	21	* command. */
	22	Tk_Window tkBusy; /* Busy window: Transparent window used to
	23	* block delivery of events to windows
	24	* underneath it. */
	25	Tk_Window tkParent; /* Parent window of the busy window. It may be
	26	* the reference window (if the reference is a
	27	* toplevel) or a mutual ancestor of the
	28	* reference window */
	29	Tk_Window tkRef; /* Reference window of the busy window. It is
	30	* used to manage the size and position of the
	31	* busy window. */
	32	int x, y; /* Position of the reference window */
	33	int width, height; /* Size of the reference window. Retained to
	34	* know if the reference window has been
	35	* reconfigured to a new size. */
	36	int menuBar; /* Menu bar flag. */
	37	Tk_Cursor cursor; /* Cursor for the busy window. */
	38	Tcl_HashEntry hashPtr; / Used the delete the busy window entry out
	39	* of the global hash table. */
	40	Tcl_HashTable *tablePtr;
	41	Tk_OptionTable optionTable;
	42	} Busy;

+58

-64

generic/tkButton.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkButton.c,v 1.30 2008/10/05 18:22:21 dkf Exp $
	13	* RCS: @(#) $Id: tkButton.c,v 1.33 2008/11/08 22:52:29 dkf Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

27	27	* tkButton.h.
28	28	*/
29	29
30		static const char *classNames[] = {"Label", "Button", "Checkbutton", "Radiobutton"};
	30	static const char *const classNames[] = {"Label", "Button", "Checkbutton", "Radiobutton"};
31	31
32	32	/*
33	33	* The following table defines the legal values for the -default option. It is
34	34	* used together with the "enum defaultValue" declaration in tkButton.h.
35	35	*/
36	36
37		static const char *defaultStrings[] = {
	37	static const char *const defaultStrings[] = {
38	38	"active", "disabled", "normal", NULL
39	39	};
40	40

43	43	* It is used together with the "enum state" declaration in tkButton.h.
44	44	*/
45	45
46		static const char *stateStrings[] = {
	46	static const char *const stateStrings[] = {
47	47	"active", "disabled", "normal", NULL
48	48	};
49	49

52	52	* It is used with the "enum compound" declaration in tkButton.h
53	53	*/
54	54
55		static const char *compoundStrings[] = {
	55	static const char *const compoundStrings[] = {
56	56	"bottom", "center", "left", "none", "right", "top", NULL
57	57	};
58	58

477	477	* such as TYPE_LABEL, to the option template for that class of widgets.
478	478	*/
479	479
480		static Tk_OptionSpec * const optionSpecs[] = {
	480	static Tk_OptionSpec *const optionSpecs[] = {
481	481	labelOptionSpecs,
482	482	buttonOptionSpecs,
483	483	checkbuttonOptionSpecs,

490	490	* enumerated type used to dispatch the widget command.
491	491	*/
492	492
493		static const char *commandNames[][8] = {
	493	static const char *const commandNames[][8] = {
494	494	{"cget", "configure", NULL},
495	495	{"cget", "configure", "flash", "invoke", NULL},
496	496	{"cget", "configure", "deselect", "flash", "invoke", "select",

665	665	Tk_SetClass(tkwin, classNames[type]);
666	666	butPtr = TkpCreateButton(tkwin);
667	667
668		Tk_SetClassProcs(tkwin, &tkpButtonProcs, (ClientData) butPtr);
	668	Tk_SetClassProcs(tkwin, &tkpButtonProcs, butPtr);
669	669
670	670	/*
671	671	* Initialize the data structure for the button.

675	675	butPtr->display = Tk_Display(tkwin);
676	676	butPtr->interp = interp;
677	677	butPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(tkwin),
678		ButtonWidgetObjCmd, (ClientData) butPtr, ButtonCmdDeletedProc);
	678	ButtonWidgetObjCmd, butPtr, ButtonCmdDeletedProc);
679	679	butPtr->type = type;
680	680	butPtr->optionTable = optionTable;
681	681	butPtr->textPtr = NULL;

740	740
741	741	Tk_CreateEventHandler(butPtr->tkwin,
742	742	ExposureMask\|StructureNotifyMask\|FocusChangeMask,
743		ButtonEventProc, (ClientData) butPtr);
	743	ButtonEventProc, butPtr);
744	744
745	745	if (Tk_InitOptions(interp, (char *) butPtr, optionTable, tkwin)
746	746	!= TCL_OK) {

752	752	return TCL_ERROR;
753	753	}
754	754
755		Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(butPtr->tkwin),-1));
	755	Tcl_SetObjResult(interp, TkNewWindowObj(butPtr->tkwin));
756	756	return TCL_OK;
757	757	}
758	758

781	781	int objc, /* Number of arguments. */
782	782	Tcl_Obj const objv[]) / Argument values. */
783	783	{
784		TkButton butPtr = (TkButton ) clientData;
	784	TkButton *butPtr = clientData;
785	785	int index;
786	786	int result;
787	787	Tcl_Obj *objPtr;

795	795	if (result != TCL_OK) {
796	796	return result;
797	797	}
798		Tcl_Preserve((ClientData) butPtr);
	798	Tcl_Preserve(butPtr);
799	799
800	800	switch (map[butPtr->type][index]) {
801	801	case COMMAND_CGET:

807	807	butPtr->optionTable, objv[2], butPtr->tkwin);
808	808	if (objPtr == NULL) {
809	809	goto error;
810		} else {
811		Tcl_SetObjResult(interp, objPtr);
812		}
	810	}
	811	Tcl_SetObjResult(interp, objPtr);
813	812	break;
814	813
815	814	case COMMAND_CONFIGURE:

819	818	butPtr->tkwin);
820	819	if (objPtr == NULL) {
821	820	goto error;
822		} else {
823		Tcl_SetObjResult(interp, objPtr);
824	821	}
	822	Tcl_SetObjResult(interp, objPtr);
825	823	} else {
826	824	result = ConfigureButton(interp, butPtr, objc-2, objv+2);
827	825	}

864	862	Tk_SetBackgroundFromBorder(butPtr->tkwin,
865	863	butPtr->normalBorder);
866	864	}
867		TkpDisplayButton((ClientData) butPtr);
	865	TkpDisplayButton(butPtr);
868	866
869	867	/*
870	868	* Special note: must cancel any existing idle handler for

872	870	* TkpDisplayButton cleared the REDRAW_PENDING flag.
873	871	*/
874	872
875		Tcl_CancelIdleCall(TkpDisplayButton, (ClientData) butPtr);
	873	Tcl_CancelIdleCall(TkpDisplayButton, butPtr);
876	874	XFlush(butPtr->display);
877	875	Tcl_Sleep(50);
878	876	}

914	912	}
915	913	break;
916	914	}
917		Tcl_Release((ClientData) butPtr);
	915	Tcl_Release(butPtr);
918	916	return result;
919	917
920	918	error:
921		Tcl_Release((ClientData) butPtr);
	919	Tcl_Release(butPtr);
922	920	return TCL_ERROR;
923	921	}
924	922

947	945	TkpDestroyButton(butPtr);
948	946
949	947	if (butPtr->flags & REDRAW_PENDING) {
950		Tcl_CancelIdleCall(TkpDisplayButton, (ClientData) butPtr);
	948	Tcl_CancelIdleCall(TkpDisplayButton, butPtr);
951	949	}
952	950
953	951	/*

959	957	if (butPtr->textVarNamePtr != NULL) {
960	958	Tcl_UntraceVar(butPtr->interp, Tcl_GetString(butPtr->textVarNamePtr),
961	959	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
962		ButtonTextVarProc, (ClientData) butPtr);
	960	ButtonTextVarProc, butPtr);
963	961	}
964	962	if (butPtr->image != NULL) {
965	963	Tk_FreeImage(butPtr->image);

994	992	if (butPtr->selVarNamePtr != NULL) {
995	993	Tcl_UntraceVar(butPtr->interp, Tcl_GetString(butPtr->selVarNamePtr),
996	994	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
997		ButtonVarProc, (ClientData) butPtr);
	995	ButtonVarProc, butPtr);
998	996	}
999	997	Tk_FreeConfigOptions((char *) butPtr, butPtr->optionTable,
1000	998	butPtr->tkwin);
1001	999	butPtr->tkwin = NULL;
1002		Tcl_EventuallyFree((ClientData) butPtr, TCL_DYNAMIC);
	1000	Tcl_EventuallyFree(butPtr, TCL_DYNAMIC);
1003	1001	}
1004	1002
1005	1003	/*

1042	1040	if (butPtr->textVarNamePtr != NULL) {
1043	1041	Tcl_UntraceVar(interp, Tcl_GetString(butPtr->textVarNamePtr),
1044	1042	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
1045		ButtonTextVarProc, (ClientData) butPtr);
	1043	ButtonTextVarProc, butPtr);
1046	1044	}
1047	1045	if (butPtr->selVarNamePtr != NULL) {
1048	1046	Tcl_UntraceVar(interp, Tcl_GetString(butPtr->selVarNamePtr),
1049	1047	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
1050		ButtonVarProc, (ClientData) butPtr);
	1048	ButtonVarProc, butPtr);
1051	1049	}
1052	1050
1053	1051	/*

1168	1166	if (butPtr->imagePtr != NULL) {
1169	1167	image = Tk_GetImage(butPtr->interp, butPtr->tkwin,
1170	1168	Tcl_GetString(butPtr->imagePtr), ButtonImageProc,
1171		(ClientData) butPtr);
	1169	butPtr);
1172	1170	if (image == NULL) {
1173	1171	continue;
1174	1172	}

1182	1180	if (butPtr->selectImagePtr != NULL) {
1183	1181	image = Tk_GetImage(butPtr->interp, butPtr->tkwin,
1184	1182	Tcl_GetString(butPtr->selectImagePtr),
1185		ButtonSelectImageProc, (ClientData) butPtr);
	1183	ButtonSelectImageProc, butPtr);
1186	1184	if (image == NULL) {
1187	1185	continue;
1188	1186	}

1196	1194	if (butPtr->tristateImagePtr != NULL) {
1197	1195	image = Tk_GetImage(butPtr->interp, butPtr->tkwin,
1198	1196	Tcl_GetString(butPtr->tristateImagePtr),
1199		ButtonTristateImageProc, (ClientData) butPtr);
	1197	ButtonTristateImageProc, butPtr);
1200	1198	if (image == NULL) {
1201	1199	continue;
1202	1200	}

1283	1281	if (butPtr->textVarNamePtr != NULL) {
1284	1282	Tcl_TraceVar(interp, Tcl_GetString(butPtr->textVarNamePtr),
1285	1283	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
1286		ButtonTextVarProc, (ClientData) butPtr);
	1284	ButtonTextVarProc, butPtr);
1287	1285	}
1288	1286	if (butPtr->selVarNamePtr != NULL) {
1289	1287	Tcl_TraceVar(interp, Tcl_GetString(butPtr->selVarNamePtr),
1290	1288	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
1291		ButtonVarProc, (ClientData) butPtr);
1292		}
1293
1294		TkButtonWorldChanged((ClientData) butPtr);
	1289	ButtonVarProc, butPtr);
	1290	}
	1291
	1292	TkButtonWorldChanged(butPtr);
1295	1293	if (error) {
1296	1294	Tcl_SetObjResult(interp, errorResult);
1297	1295	Tcl_DecrRefCount(errorResult);

1411	1409	*/
1412	1410
1413	1411	if (Tk_IsMapped(butPtr->tkwin) && !(butPtr->flags & REDRAW_PENDING)) {
1414		Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
	1412	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
1415	1413	butPtr->flags \|= REDRAW_PENDING;
1416	1414	}
1417	1415	}

1439	1437	ClientData clientData, /* Information about window. */
1440	1438	XEvent eventPtr) / Information about event. */
1441	1439	{
1442		TkButton butPtr = (TkButton ) clientData;
	1440	TkButton *butPtr = clientData;
1443	1441	if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) {
1444	1442	goto redraw;
1445	1443	} else if (eventPtr->type == ConfigureNotify) {

1470	1468
1471	1469	redraw:
1472	1470	if ((butPtr->tkwin != NULL) && !(butPtr->flags & REDRAW_PENDING)) {
1473		Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
	1471	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
1474	1472	butPtr->flags \|= REDRAW_PENDING;
1475	1473	}
1476	1474	}

1497	1495	ButtonCmdDeletedProc(
1498	1496	ClientData clientData) /* Pointer to widget record for widget. */
1499	1497	{
1500		TkButton butPtr = (TkButton ) clientData;
	1498	TkButton *butPtr = clientData;
1501	1499
1502	1500	/*
1503	1501	* This function could be invoked either because the window was destroyed

1592	1590	const char name2, / Second part of variable name. */
1593	1591	int flags) /* Information about what happened. */
1594	1592	{
1595		register TkButton butPtr = (TkButton ) clientData;
1596		char name, value;
	1593	register TkButton *butPtr = clientData;
	1594	const char *value;
1597	1595	Tcl_Obj *valuePtr;
1598
1599		name = Tcl_GetString(butPtr->selVarNamePtr);
1600	1596
1601	1597	/*
1602	1598	* If the variable is being unset, then just re-establish the trace unless

1604	1600	*/
1605	1601
1606	1602	if (flags & TCL_TRACE_UNSETS) {
1607		butPtr->flags &= ~SELECTED;
1608		butPtr->flags &= ~TRISTATED;
	1603	butPtr->flags &= ~(SELECTED \| TRISTATED);
1609	1604	if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
1610		Tcl_TraceVar(interp, name,
	1605	Tcl_TraceVar(interp, Tcl_GetString(butPtr->selVarNamePtr),
1611	1606	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
1612	1607	ButtonVarProc, clientData);
1613	1608	}

1619	1614	* button.
1620	1615	*/
1621	1616
1622		valuePtr = Tcl_GetVar2Ex(interp, name, NULL, TCL_GLOBAL_ONLY);
	1617	valuePtr = Tcl_ObjGetVar2(interp, butPtr->selVarNamePtr, NULL,
	1618	TCL_GLOBAL_ONLY);
1623	1619	if (valuePtr == NULL) {
1624	1620	value = "";
1625	1621	} else {

1646	1642	redisplay:
1647	1643	if ((butPtr->tkwin != NULL) && Tk_IsMapped(butPtr->tkwin)
1648	1644	&& !(butPtr->flags & REDRAW_PENDING)) {
1649		Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
	1645	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
1650	1646	butPtr->flags \|= REDRAW_PENDING;
1651	1647	}
1652	1648	return NULL;

1678	1674	const char name2, / Not used. */
1679	1675	int flags) /* Information about what happened. */
1680	1676	{
1681		TkButton butPtr = (TkButton ) clientData;
1682		char *name;
	1677	TkButton *butPtr = clientData;
1683	1678	Tcl_Obj *valuePtr;
1684	1679
1685	1680	if (butPtr->flags & BUTTON_DELETED) {
1686	1681	return NULL;
1687	1682	}
1688
1689		name = Tcl_GetString(butPtr->textVarNamePtr);
1690	1683
1691	1684	/*
1692	1685	* If the variable is unset, then immediately recreate it unless the whole

1695	1688
1696	1689	if (flags & TCL_TRACE_UNSETS) {
1697	1690	if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
1698		Tcl_SetVar2Ex(interp, name, NULL, butPtr->textPtr,
1699		TCL_GLOBAL_ONLY);
1700		Tcl_TraceVar(interp, name,
	1691	Tcl_ObjSetVar2(interp, butPtr->textVarNamePtr, NULL,
	1692	butPtr->textPtr, TCL_GLOBAL_ONLY);
	1693	Tcl_TraceVar(interp, Tcl_GetString(butPtr->textVarNamePtr),
1701	1694	TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
1702	1695	ButtonTextVarProc, clientData);
1703	1696	}
1704	1697	return NULL;
1705	1698	}
1706	1699
1707		valuePtr = Tcl_GetVar2Ex(interp, name, NULL, TCL_GLOBAL_ONLY);
	1700	valuePtr = Tcl_ObjGetVar2(interp, butPtr->textVarNamePtr, NULL,
	1701	TCL_GLOBAL_ONLY);
1708	1702	if (valuePtr == NULL) {
1709	1703	valuePtr = Tcl_NewObj();
1710	1704	}

1715	1709
1716	1710	if ((butPtr->tkwin != NULL) && Tk_IsMapped(butPtr->tkwin)
1717	1711	&& !(butPtr->flags & REDRAW_PENDING)) {
1718		Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
	1712	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
1719	1713	butPtr->flags \|= REDRAW_PENDING;
1720	1714	}
1721	1715	return NULL;

1748	1742	* <= 0). */
1749	1743	int imgWidth, int imgHeight)/* New dimensions of image. */
1750	1744	{
1751		register TkButton butPtr = (TkButton ) clientData;
	1745	register TkButton *butPtr = clientData;
1752	1746
1753	1747	if (butPtr->tkwin != NULL) {
1754	1748	TkpComputeButtonGeometry(butPtr);
1755	1749	if (Tk_IsMapped(butPtr->tkwin) && !(butPtr->flags & REDRAW_PENDING)) {
1756		Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
	1750	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
1757	1751	butPtr->flags \|= REDRAW_PENDING;
1758	1752	}
1759	1753	}

1786	1780	* <= 0). */
1787	1781	int imgWidth, int imgHeight)/* New dimensions of image. */
1788	1782	{
1789		register TkButton butPtr = (TkButton ) clientData;
	1783	register TkButton *butPtr = clientData;
1790	1784
1791	1785	/*
1792	1786	* Don't recompute geometry: it's controlled by the primary image.

1795	1789	if ((butPtr->flags & SELECTED) && (butPtr->tkwin != NULL)
1796	1790	&& Tk_IsMapped(butPtr->tkwin)
1797	1791	&& !(butPtr->flags & REDRAW_PENDING)) {
1798		Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
	1792	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
1799	1793	butPtr->flags \|= REDRAW_PENDING;
1800	1794	}
1801	1795	}

1827	1821	* <= 0). */
1828	1822	int imgWidth, int imgHeight)/* New dimensions of image. */
1829	1823	{
1830		register TkButton butPtr = (TkButton ) clientData;
	1824	register TkButton *butPtr = clientData;
1831	1825
1832	1826	/*
1833	1827	* Don't recompute geometry: it's controlled by the primary image.

1836	1830	if ((butPtr->flags & TRISTATED) && (butPtr->tkwin != NULL)
1837	1831	&& Tk_IsMapped(butPtr->tkwin)
1838	1832	&& !(butPtr->flags & REDRAW_PENDING)) {
1839		Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
	1833	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
1840	1834	butPtr->flags \|= REDRAW_PENDING;
1841	1835	}
1842	1836	}

+15

-25

generic/tkCanvArc.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkCanvArc.c,v 1.17 2008/04/27 22:38:55 dkf Exp $
	11	* RCS: @(#) $Id: tkCanvArc.c,v 1.19 2008/11/22 22:28:52 das Exp $
12	12	*/
13	13
14	14	#include <stdio.h>

82	82	static int StyleParseProc(ClientData clientData, Tcl_Interp *interp,
83	83	Tk_Window tkwin, const char *value,
84	84	char *widgRec, int offset);
85		static char * StylePrintProc(ClientData clientData, Tk_Window tkwin,
	85	static const char * StylePrintProc(ClientData clientData, Tk_Window tkwin,
86	86	char widgRec, int offset, Tcl_FreeProc *freeProcPtr);
87	87
88		static Tk_CustomOption stateOption = {
89		(Tk_OptionParseProc *) TkStateParseProc,
90		TkStatePrintProc, (ClientData) 2
	88	static const Tk_CustomOption stateOption = {
	89	TkStateParseProc, TkStatePrintProc, (ClientData) 2
91	90	};
92		static Tk_CustomOption styleOption = {
93		(Tk_OptionParseProc *) StyleParseProc,
94		StylePrintProc, (ClientData) NULL
	91	static const Tk_CustomOption styleOption = {
	92	StyleParseProc, StylePrintProc, (ClientData) NULL
95	93	};
96		static Tk_CustomOption tagsOption = {
97		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
98		Tk_CanvasTagsPrintProc, (ClientData) NULL
	94	static const Tk_CustomOption tagsOption = {
	95	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
99	96	};
100		static Tk_CustomOption dashOption = {
101		(Tk_OptionParseProc *) TkCanvasDashParseProc,
102		TkCanvasDashPrintProc, (ClientData) NULL
	97	static const Tk_CustomOption dashOption = {
	98	TkCanvasDashParseProc, TkCanvasDashPrintProc, (ClientData) NULL
103	99	};
104		static Tk_CustomOption offsetOption = {
105		(Tk_OptionParseProc *) TkOffsetParseProc,
106		TkOffsetPrintProc, (ClientData) (TK_OFFSET_RELATIVE)
	100	static const Tk_CustomOption offsetOption = {
	101	TkOffsetParseProc, TkOffsetPrintProc, (ClientData) (TK_OFFSET_RELATIVE)
107	102	};
108		static Tk_CustomOption pixelOption = {
109		(Tk_OptionParseProc *) TkPixelParseProc,
110		TkPixelPrintProc, (ClientData) NULL
	103	static const Tk_CustomOption pixelOption = {
	104	TkPixelParseProc, TkPixelPrintProc, (ClientData) NULL
111	105	};
112	106
113	107	static Tk_ConfigSpec configSpecs[] = {

241	235	NULL, /* dTextProc */
242	236	NULL, /* nextPtr */
243	237	};
244
245		#ifndef PI
246		#define PI 3.14159265358979323846
247		#endif
248	238
249	239	/*
250	240	*--------------------------------------------------------------

2060	2050	*--------------------------------------------------------------
2061	2051	*/
2062	2052
2063		static char *
	2053	static const char *
2064	2054	StylePrintProc(
2065	2055	ClientData clientData, /* Ignored. */
2066	2056	Tk_Window tkwin, /* Ignored. */

+5

-7

generic/tkCanvBmap.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkCanvBmap.c,v 1.15 2008/04/27 22:38:55 dkf Exp $
	11	* RCS: @(#) $Id: tkCanvBmap.c,v 1.16 2008/11/09 20:51:28 nijtmans Exp $
12	12	*/
13	13
14	14	#include <stdio.h>

42	42	* Information used for parsing configuration specs:
43	43	*/
44	44
45		static Tk_CustomOption stateOption = {
46		(Tk_OptionParseProc *) TkStateParseProc,
47		TkStatePrintProc, (ClientData) 2
	45	static const Tk_CustomOption stateOption = {
	46	TkStateParseProc, TkStatePrintProc, (ClientData) 2
48	47	};
49		static Tk_CustomOption tagsOption = {
50		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
51		Tk_CanvasTagsPrintProc, (ClientData) NULL
	48	static const Tk_CustomOption tagsOption = {
	49	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
52	50	};
53	51
54	52	static Tk_ConfigSpec configSpecs[] = {

+5

-7

generic/tkCanvImg.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkCanvImg.c,v 1.12 2008/04/27 22:38:55 dkf Exp $
	11	* RCS: @(#) $Id: tkCanvImg.c,v 1.13 2008/11/09 20:51:28 nijtmans Exp $
12	12	*/
13	13
14	14	#include <stdio.h>

45	45	* Information used for parsing configuration specs:
46	46	*/
47	47
48		static Tk_CustomOption stateOption = {
49		(Tk_OptionParseProc *) TkStateParseProc,
50		TkStatePrintProc, (ClientData) 2
	48	static const Tk_CustomOption stateOption = {
	49	TkStateParseProc, TkStatePrintProc, (ClientData) 2
51	50	};
52		static Tk_CustomOption tagsOption = {
53		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
54		Tk_CanvasTagsPrintProc, (ClientData) NULL
	51	static const Tk_CustomOption tagsOption = {
	52	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
55	53	};
56	54
57	55	static Tk_ConfigSpec configSpecs[] = {

+228

-213

generic/tkCanvLine.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkCanvLine.c,v 1.23 2008/04/27 22:38:55 dkf Exp $
	12	* RCS: @(#) $Id: tkCanvLine.c,v 1.27 2008/11/27 23:26:05 nijtmans Exp $
13	13	*/
14	14
15	15	#include <stdio.h>

60	60	* point in line (PTS_IN_ARROW points, first
61	61	* of which is tip). Malloc'ed. NULL means no
62	62	* arrowhead at last point. */
63		Tk_SmoothMethod smooth; / Non-zero means draw line smoothed (i.e.
	63	const Tk_SmoothMethod smooth; / Non-zero means draw line smoothed (i.e.
64	64	* with Bezier splines). */
65	65	int splineSteps; /* Number of steps in each spline segment. */
66	66	} LineItem;

110	110	static int ArrowParseProc(ClientData clientData,
111	111	Tcl_Interp *interp, Tk_Window tkwin,
112	112	const char value, char recordPtr, int offset);
113		static char * ArrowPrintProc(ClientData clientData,
	113	static const char * ArrowPrintProc(ClientData clientData,
114	114	Tk_Window tkwin, char *recordPtr, int offset,
115	115	Tcl_FreeProc **freeProcPtr);
116	116	static int ParseArrowShape(ClientData clientData,
117	117	Tcl_Interp *interp, Tk_Window tkwin,
118	118	const char value, char recordPtr, int offset);
119		static char * PrintArrowShape(ClientData clientData,
	119	static const char * PrintArrowShape(ClientData clientData,
120	120	Tk_Window tkwin, char *recordPtr, int offset,
121	121	Tcl_FreeProc **freeProcPtr);
122	122	static void ScaleLine(Tk_Canvas canvas,

131	131	* CreateLine.
132	132	*/
133	133
134		static Tk_CustomOption arrowShapeOption = {
135		(Tk_OptionParseProc *) ParseArrowShape,
136		PrintArrowShape, (ClientData) NULL
	134	static const Tk_CustomOption arrowShapeOption = {
	135	ParseArrowShape, PrintArrowShape, (ClientData) NULL
137	136	};
138		static Tk_CustomOption arrowOption = {
139		(Tk_OptionParseProc *) ArrowParseProc,
140		ArrowPrintProc, (ClientData) NULL
	137	static const Tk_CustomOption arrowOption = {
	138	ArrowParseProc, ArrowPrintProc, (ClientData) NULL
141	139	};
142		static Tk_CustomOption smoothOption = {
143		(Tk_OptionParseProc *) TkSmoothParseProc,
144		TkSmoothPrintProc, (ClientData) NULL
	140	static const Tk_CustomOption smoothOption = {
	141	TkSmoothParseProc, TkSmoothPrintProc, (ClientData) NULL
145	142	};
146		static Tk_CustomOption stateOption = {
147		(Tk_OptionParseProc *) TkStateParseProc,
148		TkStatePrintProc, (ClientData) 2
	143	static const Tk_CustomOption stateOption = {
	144	TkStateParseProc, TkStatePrintProc, (ClientData) 2
149	145	};
150		static Tk_CustomOption tagsOption = {
151		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
152		Tk_CanvasTagsPrintProc, (ClientData) NULL
	146	static const Tk_CustomOption tagsOption = {
	147	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
153	148	};
154		static Tk_CustomOption dashOption = {
155		(Tk_OptionParseProc *) TkCanvasDashParseProc,
156		TkCanvasDashPrintProc, (ClientData) NULL
	149	static const Tk_CustomOption dashOption = {
	150	TkCanvasDashParseProc, TkCanvasDashPrintProc, (ClientData) NULL
157	151	};
158		static Tk_CustomOption offsetOption = {
159		(Tk_OptionParseProc *) TkOffsetParseProc,
160		TkOffsetPrintProc,
	152	static const Tk_CustomOption offsetOption = {
	153	TkOffsetParseProc, TkOffsetPrintProc,
161	154	(ClientData) (TK_OFFSET_RELATIVE\|TK_OFFSET_INDEX)
162	155	};
163		static Tk_CustomOption pixelOption = {
164		(Tk_OptionParseProc *) TkPixelParseProc,
165		TkPixelPrintProc, (ClientData) NULL
	156	static const Tk_CustomOption pixelOption = {
	157	TkPixelParseProc, TkPixelPrintProc, (ClientData) NULL
166	158	};
167	159
168	160	static Tk_ConfigSpec configSpecs[] = {

177	169	"0.0", Tk_Offset(LineItem, outline.activeWidth),
178	170	TK_CONFIG_DONT_SET_DEFAULT, &pixelOption},
179	171	{TK_CONFIG_CUSTOM, "-arrow", NULL, NULL,
180		"none", Tk_Offset(LineItem, arrow), TK_CONFIG_DONT_SET_DEFAULT, &arrowOption},
	172	"none", Tk_Offset(LineItem, arrow),
	173	TK_CONFIG_DONT_SET_DEFAULT, &arrowOption},
181	174	{TK_CONFIG_CUSTOM, "-arrowshape", NULL, NULL,
182	175	"8 10 3", Tk_Offset(LineItem, arrowShapeA),
183	176	TK_CONFIG_DONT_SET_DEFAULT, &arrowShapeOption},

236	229	LineCoords, /* coordProc */
237	230	DeleteLine, /* deleteProc */
238	231	DisplayLine, /* displayProc */
239		TK_CONFIG_OBJS, /* flags */
	232	TK_CONFIG_OBJS \| TK_MOVABLE_POINTS, /* flags */
240	233	LineToPoint, /* pointProc */
241	234	LineToArea, /* areaProc */
242	235	LineToPostscript, /* postscriptProc */

257	250	*/
258	251
259	252	#define MAX_STATIC_POINTS 200
260
	253
261	254	/*
262	255	*--------------------------------------------------------------
263	256	*

298	291	* proper cleanup after errors during the the remainder of this function.
299	292	*/
300	293
301		Tk_CreateOutline(&(linePtr->outline));
	294	Tk_CreateOutline(&linePtr->outline);
302	295	linePtr->canvas = canvas;
303	296	linePtr->numPoints = 0;
304	297	linePtr->coordPtr = NULL;

338	331	DeleteLine(canvas, itemPtr, Tk_Display(Tk_CanvasTkwin(canvas)));
339	332	return TCL_ERROR;
340	333	}
341
	334
342	335	/*
343	336	*--------------------------------------------------------------
344	337	*

415	408	numPoints = objc/2;
416	409	if (linePtr->numPoints != numPoints) {
417	410	coordPtr = (double *)
418		ckalloc((unsigned) (sizeof(double) * objc));
	411	ckalloc(sizeof(double) * (unsigned) objc);
419	412	if (linePtr->coordPtr != NULL) {
420	413	ckfree((char *) linePtr->coordPtr);
421	414	}

423	416	linePtr->numPoints = numPoints;
424	417	}
425	418	coordPtr = linePtr->coordPtr;
426		for (i = 0; i <objc; i++) {
	419	for (i = 0; i < objc ; i++) {
427	420	if (Tk_CanvasGetCoordFromObj(interp, canvas, objv[i],
428	421	coordPtr++) != TCL_OK) {
429	422	return TCL_ERROR;

450	443	}
451	444	return TCL_OK;
452	445	}
453
	446
454	447	/*
455	448	*--------------------------------------------------------------
456	449	*

499	492
500	493	state = itemPtr->state;
501	494
502		if(state == TK_STATE_NULL) {
	495	if (state == TK_STATE_NULL) {
503	496	state = Canvas(canvas)->canvas_state;
504	497	}
505	498

511	504	} else {
512	505	itemPtr->redraw_flags &= ~TK_ITEM_STATE_DEPENDANT;
513	506	}
514		mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr,
515		&(linePtr->outline));
	507	mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr, &linePtr->outline);
516	508	if (mask) {
517	509	if (linePtr->arrow == ARROWS_NONE) {
518	510	gcValues.cap_style = linePtr->capStyle;

523	515	newGC = Tk_GetGC(tkwin, mask, &gcValues);
524	516	#ifdef MAC_OSX_TK
525	517	/*
526		* Mac OS X CG drawing needs access to linewidth even for
527		* arrow fills (as linewidth controls antialiasing).
	518	* Mac OS X CG drawing needs access to linewidth even for arrow fills
	519	* (as linewidth controls antialiasing).
528	520	*/
	521
529	522	mask \|= GCLineWidth;
530	523	#else
531	524	gcValues.line_width = 0;

553	546	linePtr->splineSteps = 100;
554	547	}
555	548
556		if ((!linePtr->numPoints) \|\| (state==TK_STATE_HIDDEN)) {
	549	if ((!linePtr->numPoints) \|\| (state == TK_STATE_HIDDEN)) {
557	550	ComputeLineBbox(canvas, linePtr);
558	551	return TCL_OK;
559	552	}

592	585
593	586	return TCL_OK;
594	587	}
595
	588
596	589	/*
597	590	*--------------------------------------------------------------
598	591	*

618	611	{
619	612	LineItem linePtr = (LineItem ) itemPtr;
620	613
621		Tk_DeleteOutline(display, &(linePtr->outline));
	614	Tk_DeleteOutline(display, &linePtr->outline);
622	615	if (linePtr->coordPtr != NULL) {
623	616	ckfree((char *) linePtr->coordPtr);
624	617	}

632	625	ckfree((char *) linePtr->lastArrowPtr);
633	626	}
634	627	}
635
	628
636	629	/*
637	630	*--------------------------------------------------------------
638	631	*

661	654	Tk_State state = linePtr->header.state;
662	655	Tk_TSOffset *tsoffset;
663	656
664		if(state == TK_STATE_NULL) {
	657	if (state == TK_STATE_NULL) {
665	658	state = Canvas(canvas)->canvas_state;
666	659	}
667	660
668		if (!(linePtr->numPoints) \|\| (state==TK_STATE_HIDDEN)) {
	661	if (!(linePtr->numPoints) \|\| (state == TK_STATE_HIDDEN)) {
669	662	linePtr->header.x1 = -1;
670	663	linePtr->header.x2 = -1;
671	664	linePtr->header.y1 = -1;

675	668
676	669	width = linePtr->outline.width;
677	670	if (Canvas(canvas)->currentItemPtr == (Tk_Item *)linePtr) {
678		if (linePtr->outline.activeWidth>width) {
	671	if (linePtr->outline.activeWidth > width) {
679	672	width = linePtr->outline.activeWidth;
680	673	}
681		} else if (state==TK_STATE_DISABLED) {
682		if (linePtr->outline.disabledWidth>0) {
	674	} else if (state == TK_STATE_DISABLED) {
	675	if (linePtr->outline.disabledWidth > 0) {
683	676	width = linePtr->outline.disabledWidth;
684	677	}
685	678	}
686	679
687	680	coordPtr = linePtr->coordPtr;
688		linePtr->header.x1 = linePtr->header.x2 = (int) *coordPtr;
	681	linePtr->header.x1 = linePtr->header.x2 = (int) coordPtr[0];
689	682	linePtr->header.y1 = linePtr->header.y2 = (int) coordPtr[1];
690	683
691	684	/*

693	686	* all directions by the line's width to take care of butting or rounded
694	687	* corners and projecting or rounded caps. This expansion is an
695	688	* overestimate (worst-case is square root of two over two) but it's
696		* simple. eDon't do anything special for curves. This causes an
697		* additional overestimate in the bounding box, but is faster.
	689	* simple. Don't do anything special for curves. This causes an additional
	690	* overestimate in the bounding box, but is faster.
698	691	*/
699	692
700	693	for (i = 1, coordPtr = linePtr->coordPtr+2; i < linePtr->numPoints;

716	709
717	710	tsoffset = &linePtr->outline.tsoffset;
718	711	if (tsoffset->flags & TK_OFFSET_INDEX) {
719		double *coordPtr = linePtr->coordPtr + (tsoffset->flags & ~TK_OFFSET_INDEX);
	712	double *coordPtr = linePtr->coordPtr
	713	+ (tsoffset->flags & ~TK_OFFSET_INDEX);
	714
720	715	if (tsoffset->flags <= 0) {
721	716	coordPtr = linePtr->coordPtr;
722		if ((linePtr->arrow == ARROWS_FIRST) \|\| (linePtr->arrow == ARROWS_BOTH)) {
	717	if ((linePtr->arrow == ARROWS_FIRST)
	718	\|\| (linePtr->arrow == ARROWS_BOTH)) {
723	719	coordPtr = linePtr->firstArrowPtr;
724	720	}
725	721	}
726	722	if (tsoffset->flags > (linePtr->numPoints * 2)) {
727	723	coordPtr = linePtr->coordPtr + (linePtr->numPoints * 2);
728		if ((linePtr->arrow == ARROWS_LAST) \|\| (linePtr->arrow == ARROWS_BOTH)) {
	724	if ((linePtr->arrow == ARROWS_LAST)
	725	\|\| (linePtr->arrow == ARROWS_BOTH)) {
729	726	coordPtr = linePtr->lastArrowPtr;
730	727	}
731	728	}

754	751	linePtr->header.y1 -= intWidth;
755	752	linePtr->header.y2 += intWidth;
756	753
757		if (linePtr->numPoints==1) {
	754	if (linePtr->numPoints == 1) {
758	755	linePtr->header.x1 -= 1;
759	756	linePtr->header.x2 += 1;
760	757	linePtr->header.y1 -= 1;

812	809	linePtr->header.y1 -= 1;
813	810	linePtr->header.y2 += 1;
814	811	}
815
	812
816	813	/*
817	814	*--------------------------------------------------------------
818	815	*

847	844	int numPoints;
848	845	Tk_State state = itemPtr->state;
849	846
850		if ((!linePtr->numPoints)\|\|(linePtr->outline.gc==None)) {
	847	if ((!linePtr->numPoints) \|\| (linePtr->outline.gc == None)) {
851	848	return;
852	849	}
853	850

859	856	if (linePtr->outline.activeWidth != linewidth) {
860	857	linewidth = linePtr->outline.activeWidth;
861	858	}
862		} else if (state==TK_STATE_DISABLED) {
	859	} else if (state == TK_STATE_DISABLED) {
863	860	if (linePtr->outline.disabledWidth != linewidth) {
864	861	linewidth = linePtr->outline.disabledWidth;
865	862	}

881	878	if (numPoints <= MAX_STATIC_POINTS) {
882	879	pointPtr = staticPoints;
883	880	} else {
884		pointPtr = (XPoint )ckalloc((unsigned)(numPoints 3*sizeof(XPoint)));
	881	pointPtr = (XPoint *)
	882	ckalloc((unsigned) numPoints * 3 * sizeof(XPoint));
885	883	}
886	884
887	885	if ((linePtr->smooth) && (linePtr->numPoints > 2)) {
888	886	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
889	887	linePtr->numPoints, linePtr->splineSteps, pointPtr, NULL);
890	888	} else {
891		numPoints = TkCanvTranslatePath((TkCanvas*)canvas, numPoints,
	889	numPoints = TkCanvTranslatePath((TkCanvas *) canvas, numPoints,
892	890	linePtr->coordPtr, 0, pointPtr);
893	891	}
894	892

899	897	* read-only.
900	898	*/
901	899
902		if (Tk_ChangeOutlineGC(canvas, itemPtr, &(linePtr->outline))) {
903		Tk_CanvasSetOffset(canvas, linePtr->arrowGC, &linePtr->outline.tsoffset);
904		}
905		if (numPoints>1) {
	900	if (Tk_ChangeOutlineGC(canvas, itemPtr, &linePtr->outline)) {
	901	Tk_CanvasSetOffset(canvas, linePtr->arrowGC,
	902	&linePtr->outline.tsoffset);
	903	}
	904	if (numPoints > 1) {
906	905	XDrawLines(display, drawable, linePtr->outline.gc, pointPtr, numPoints,
907		CoordModeOrigin);
	906	CoordModeOrigin);
908	907	} else {
909	908	int intwidth = (int) (linewidth + 0.5);
910		if (intwidth<1) {
911		intwidth=1;
	909
	910	if (intwidth < 1) {
	911	intwidth = 1;
912	912	}
913	913	XFillArc(display, drawable, linePtr->outline.gc,
914	914	pointPtr->x - intwidth/2, pointPtr->y - intwidth/2,
915		(unsigned int)intwidth+1, (unsigned int)intwidth+1, 0, 64*360);
	915	(unsigned) intwidth+1, (unsigned) intwidth+1, 0, 64*360);
916	916	}
917	917	if (pointPtr != staticPoints) {
918	918	ckfree((char *) pointPtr);

930	930	TkFillPolygon(canvas, linePtr->lastArrowPtr, PTS_IN_ARROW,
931	931	display, drawable, linePtr->arrowGC, NULL);
932	932	}
933		if (Tk_ResetOutlineGC(canvas, itemPtr, &(linePtr->outline))) {
	933	if (Tk_ResetOutlineGC(canvas, itemPtr, &linePtr->outline)) {
934	934	XSetTSOrigin(display, linePtr->arrowGC, 0, 0);
935	935	}
936	936	}
937
	937
938	938	/*
939	939	*--------------------------------------------------------------
940	940	*

1006	1006	newCoordPtr[i+objc] = linePtr->coordPtr[i];
1007	1007	}
1008	1008	if (linePtr->coordPtr) {
1009		ckfree((char *)linePtr->coordPtr);
	1009	ckfree((char *) linePtr->coordPtr);
1010	1010	}
1011	1011	linePtr->coordPtr = newCoordPtr;
1012	1012	linePtr->numPoints = (length + objc)/2;
1013	1013
1014		if ((length>3) && (state != TK_STATE_HIDDEN)) {
	1014	if ((length > 3) && (state != TK_STATE_HIDDEN)) {
1015	1015	/*
1016	1016	* This is some optimizing code that will result that only the part of
1017	1017	* the polygon that changed (and the objects that are overlapping with

1023	1023
1024	1024	itemPtr->redraw_flags \|= TK_ITEM_DONT_REDRAW;
1025	1025
1026		if (beforeThis>0) {beforeThis -= 2; objc+=2; }
1027		if ((beforeThis+objc)<length) objc+=2;
	1026	if (beforeThis > 0) {
	1027	beforeThis -= 2;
	1028	objc += 2;
	1029	}
	1030	if (beforeThis+objc < length) {
	1031	objc += 2;
	1032	}
1028	1033	if (linePtr->smooth) {
1029		if(beforeThis>0) {
1030		beforeThis-=2; objc+=2;
1031		}
1032		if((beforeThis+objc+2)<length) {
1033		objc+=2;
	1034	if (beforeThis > 0) {
	1035	beforeThis -= 2;
	1036	objc += 2;
	1037	}
	1038	if (beforeThis+objc+2 < length) {
	1039	objc += 2;
1034	1040	}
1035	1041	}
1036	1042	itemPtr->x1 = itemPtr->x2 = (int) linePtr->coordPtr[beforeThis];
1037	1043	itemPtr->y1 = itemPtr->y2 = (int) linePtr->coordPtr[beforeThis+1];
1038		if ((linePtr->firstArrowPtr != NULL) && (beforeThis<1)) {
	1044	if ((linePtr->firstArrowPtr != NULL) && (beforeThis < 1)) {
1039	1045	/*
1040	1046	* Include old first arrow.
1041	1047	*/

1045	1051	TkIncludePoint(itemPtr, coordPtr);
1046	1052	}
1047	1053	}
1048		if ((linePtr->lastArrowPtr != NULL) && ((beforeThis+objc)>=length)) {
	1054	if ((linePtr->lastArrowPtr != NULL) && (beforeThis+objc >= length)) {
1049	1055	/*
1050	1056	* Include old last arrow.
1051	1057	*/

1055	1061	TkIncludePoint(itemPtr, coordPtr);
1056	1062	}
1057	1063	}
1058		coordPtr = linePtr->coordPtr+beforeThis+2;
	1064	coordPtr = linePtr->coordPtr + beforeThis + 2;
1059	1065	for (i=2; i<objc; i+=2) {
1060	1066	TkIncludePoint(itemPtr, coordPtr);
1061		coordPtr+=2;
	1067	coordPtr += 2;
1062	1068	}
1063	1069	}
1064	1070	if (linePtr->firstArrowPtr != NULL) {

1077	1083	double width;
1078	1084	int intWidth;
1079	1085
1080		if ((linePtr->firstArrowPtr != NULL) && (beforeThis>2)) {
	1086	if ((linePtr->firstArrowPtr != NULL) && (beforeThis > 2)) {
1081	1087	/*
1082	1088	* Include new first arrow.
1083	1089	*/

1099	1105	}
1100	1106	width = linePtr->outline.width;
1101	1107	if (Canvas(canvas)->currentItemPtr == itemPtr) {
1102		if (linePtr->outline.activeWidth>width) {
	1108	if (linePtr->outline.activeWidth > width) {
1103	1109	width = linePtr->outline.activeWidth;
1104	1110	}
1105		} else if (state==TK_STATE_DISABLED) {
1106		if (linePtr->outline.disabledWidth>0) {
	1111	} else if (state == TK_STATE_DISABLED) {
	1112	if (linePtr->outline.disabledWidth > 0) {
1107	1113	width = linePtr->outline.disabledWidth;
1108	1114	}
1109	1115	}

1111	1117	if (intWidth < 1) {
1112	1118	intWidth = 1;
1113	1119	}
1114		itemPtr->x1 -= intWidth; itemPtr->y1 -= intWidth;
1115		itemPtr->x2 += intWidth; itemPtr->y2 += intWidth;
	1120	itemPtr->x1 -= intWidth;
	1121	itemPtr->y1 -= intWidth;
	1122	itemPtr->x2 += intWidth;
	1123	itemPtr->y2 += intWidth;
1116	1124	Tk_CanvasEventuallyRedraw(canvas, itemPtr->x1, itemPtr->y1,
1117	1125	itemPtr->x2, itemPtr->y2);
1118	1126	}
1119	1127
1120	1128	ComputeLineBbox(canvas, linePtr);
1121	1129	}
1122
	1130
1123	1131	/*
1124	1132	*--------------------------------------------------------------
1125	1133	*

1150	1158	double *coordPtr;
1151	1159	Tk_State state = itemPtr->state;
1152	1160
1153		if(state == TK_STATE_NULL) {
	1161	if (state == TK_STATE_NULL) {
1154	1162	state = Canvas(canvas)->canvas_state;
1155	1163	}
1156	1164

1174	1182	linePtr->coordPtr[length-2] = linePtr->lastArrowPtr[0];
1175	1183	linePtr->coordPtr[length-1] = linePtr->lastArrowPtr[1];
1176	1184	}
1177		first1 = first; last1 = last;
1178		if(first1>0) first1 -= 2;
1179		if(last1<length-2) last1 += 2;
	1185	first1 = first;
	1186	last1 = last;
	1187	if (first1 > 0) {
	1188	first1 -= 2;
	1189	}
	1190	if (last1 < length-2) {
	1191	last1 += 2;
	1192	}
1180	1193	if (linePtr->smooth) {
1181		if(first1>0) first1 -= 2;
1182		if(last1<length-2) last1 += 2;
1183		}
1184
1185		if((first1<2) && (last1 >= length-2)) {
	1194	if (first1 > 0) {
	1195	first1 -= 2;
	1196	}
	1197	if (last1 < length-2) {
	1198	last1 += 2;
	1199	}
	1200	}
	1201
	1202	if ((first1 < 2) && (last1 >= length-2)) {
1186	1203	/*
1187	1204	* This is some optimizing code that will result that only the part of
1188	1205	* the line that changed (and the objects that are overlapping with

1195	1212	itemPtr->redraw_flags \|= TK_ITEM_DONT_REDRAW;
1196	1213	itemPtr->x1 = itemPtr->x2 = (int) linePtr->coordPtr[first1];
1197	1214	itemPtr->y1 = itemPtr->y2 = (int) linePtr->coordPtr[first1+1];
1198		if ((linePtr->firstArrowPtr != NULL) && (first1<2)) {
	1215	if ((linePtr->firstArrowPtr != NULL) && (first1 < 2)) {
1199	1216	/*
1200	1217	* Include old first arrow.
1201	1218	*/

1205	1222	TkIncludePoint(itemPtr, coordPtr);
1206	1223	}
1207	1224	}
1208		if ((linePtr->lastArrowPtr != NULL) && (last1>=length-2)) {
	1225	if ((linePtr->lastArrowPtr != NULL) && (last1 >= length-2)) {
1209	1226	/*
1210	1227	* Include old last arrow.
1211	1228	*/

1218	1235	coordPtr = linePtr->coordPtr+first1+2;
1219	1236	for (i=first1+2; i<=last1; i+=2) {
1220	1237	TkIncludePoint(itemPtr, coordPtr);
1221		coordPtr+=2;
	1238	coordPtr += 2;
1222	1239	}
1223	1240	}
1224	1241

1236	1253	linePtr->lastArrowPtr = NULL;
1237	1254	}
1238	1255	if (linePtr->arrow != ARROWS_NONE) {
1239		ConfigureArrows(canvas, linePtr);
1240		}
1241		if(itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW) {
	1256	ConfigureArrows(canvas, linePtr);
	1257	}
	1258	if (itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW) {
1242	1259	double width;
1243	1260	int intWidth;
1244	1261
1245		if ((linePtr->firstArrowPtr != NULL) && (first1<4)) {
	1262	if ((linePtr->firstArrowPtr != NULL) && (first1 < 4)) {
1246	1263	/*
1247	1264	* Include new first arrow.
1248	1265	*/

1252	1269	TkIncludePoint(itemPtr, coordPtr);
1253	1270	}
1254	1271	}
1255		if ((linePtr->lastArrowPtr != NULL) && (last1>(length-4))) {
	1272	if ((linePtr->lastArrowPtr != NULL) && (last1 > length-4)) {
1256	1273	/*
1257	1274	* Include new right arrow.
1258	1275	*/

1264	1281	}
1265	1282	width = linePtr->outline.width;
1266	1283	if (Canvas(canvas)->currentItemPtr == itemPtr) {
1267		if (linePtr->outline.activeWidth>width) {
1268		width = linePtr->outline.activeWidth;
1269		}
1270		} else if (state==TK_STATE_DISABLED) {
1271		if (linePtr->outline.disabledWidth>0) {
1272		width = linePtr->outline.disabledWidth;
1273		}
	1284	if (linePtr->outline.activeWidth > width) {
	1285	width = linePtr->outline.activeWidth;
	1286	}
	1287	} else if (state == TK_STATE_DISABLED) {
	1288	if (linePtr->outline.disabledWidth > 0) {
	1289	width = linePtr->outline.disabledWidth;
	1290	}
1274	1291	}
1275	1292	intWidth = (int) (width + 0.5);
1276	1293	if (intWidth < 1) {
1277	1294	intWidth = 1;
1278	1295	}
1279		itemPtr->x1 -= intWidth; itemPtr->y1 -= intWidth;
1280		itemPtr->x2 += intWidth; itemPtr->y2 += intWidth;
	1296	itemPtr->x1 -= intWidth;
	1297	itemPtr->y1 -= intWidth;
	1298	itemPtr->x2 += intWidth;
	1299	itemPtr->y2 += intWidth;
1281	1300	Tk_CanvasEventuallyRedraw(canvas, itemPtr->x1, itemPtr->y1,
1282	1301	itemPtr->x2, itemPtr->y2);
1283	1302	}
1284	1303	ComputeLineBbox(canvas, linePtr);
1285	1304	}
1286
	1305
1287	1306	/*
1288	1307	*--------------------------------------------------------------
1289	1308	*

1329	1348	* which to do the check.
1330	1349	*/
1331	1350
1332		if(state == TK_STATE_NULL) {
	1351	if (state == TK_STATE_NULL) {
1333	1352	state = Canvas(canvas)->canvas_state;
1334	1353	}
1335	1354
1336	1355	width = linePtr->outline.width;
1337	1356	if (Canvas(canvas)->currentItemPtr == itemPtr) {
1338		if (linePtr->outline.activeWidth>width) {
	1357	if (linePtr->outline.activeWidth > width) {
1339	1358	width = linePtr->outline.activeWidth;
1340	1359	}
1341		} else if (state==TK_STATE_DISABLED) {
1342		if (linePtr->outline.disabledWidth>0) {
	1360	} else if (state == TK_STATE_DISABLED) {
	1361	if (linePtr->outline.disabledWidth > 0) {
1343	1362	width = linePtr->outline.disabledWidth;
1344	1363	}
1345	1364	}

1350	1369	if (numPoints <= MAX_STATIC_POINTS) {
1351	1370	linePoints = staticSpace;
1352	1371	} else {
1353		linePoints = (double *) ckalloc((unsigned)
1354		(2numPointssizeof(double)));
	1372	linePoints = (double *)
	1373	ckalloc((unsigned) (2numPointssizeof(double)));
1355	1374	}
1356	1375	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
1357	1376	linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);

1364	1383	width = 1.0;
1365	1384	}
1366	1385
1367		if (!numPoints \|\| itemPtr->state==TK_STATE_HIDDEN) {
	1386	if (!numPoints \|\| itemPtr->state == TK_STATE_HIDDEN) {
1368	1387	return bestDist;
1369	1388	} else if (numPoints == 1) {
1370	1389	bestDist = hypot(linePoints[0]-pointPtr[0], linePoints[1]-pointPtr[1])
1371	1390	- width/2.0;
1372		if (bestDist < 0) bestDist = 0;
	1391	if (bestDist < 0) {
	1392	bestDist = 0;
	1393	}
1373	1394	return bestDist;
1374	1395	}
1375	1396

1512	1533	}
1513	1534	return bestDist;
1514	1535	}
1515
	1536
1516	1537	/*
1517	1538	*--------------------------------------------------------------
1518	1539	*

1545	1566	double radius, width;
1546	1567	Tk_State state = itemPtr->state;
1547	1568
1548		if(state == TK_STATE_NULL) {
	1569	if (state == TK_STATE_NULL) {
1549	1570	state = Canvas(canvas)->canvas_state;
1550	1571	}
1551	1572	width = linePtr->outline.width;
1552	1573	if (Canvas(canvas)->currentItemPtr == itemPtr) {
1553		if (linePtr->outline.activeWidth>width) {
	1574	if (linePtr->outline.activeWidth > width) {
1554	1575	width = linePtr->outline.activeWidth;
1555	1576	}
1556		} else if (state==TK_STATE_DISABLED) {
1557		if (linePtr->outline.disabledWidth>0) {
	1577	} else if (state == TK_STATE_DISABLED) {
	1578	if (linePtr->outline.disabledWidth > 0) {
1558	1579	width = linePtr->outline.disabledWidth;
1559	1580	}
1560	1581	}
1561	1582
1562	1583	radius = (width+1.0)/2.0;
1563	1584
1564		if ((state==TK_STATE_HIDDEN) \|\| !linePtr->numPoints) {
	1585	if ((state == TK_STATE_HIDDEN) \|\| !linePtr->numPoints) {
1565	1586	return -1;
1566	1587	} else if (linePtr->numPoints == 1) {
1567	1588	double oval[4];

1584	1605	if (numPoints <= MAX_STATIC_POINTS) {
1585	1606	linePoints = staticSpace;
1586	1607	} else {
1587		linePoints = (double *) ckalloc((unsigned)
1588		(2numPointssizeof(double)));
	1608	linePoints = (double *)
	1609	ckalloc((unsigned) (2numPointssizeof(double)));
1589	1610	}
1590	1611	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
1591	1612	linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);

1598	1619	* Check the segments of the line.
1599	1620	*/
1600	1621
1601		if (width < 1.0) {
	1622	if (width < 1.0) {
1602	1623	width = 1.0;
1603	1624	}
1604	1625
1605		result = TkThickPolyLineToArea(linePoints, numPoints,
1606		width, linePtr->capStyle, linePtr->joinStyle,
1607		rectPtr);
	1626	result = TkThickPolyLineToArea(linePoints, numPoints, width,
	1627	linePtr->capStyle, linePtr->joinStyle, rectPtr);
1608	1628	if (result == 0) {
1609	1629	goto done;
1610	1630	}

1636	1656	}
1637	1657	return result;
1638	1658	}
1639
	1659
1640	1660	/*
1641	1661	*--------------------------------------------------------------
1642	1662	*

1699	1719	}
1700	1720	ComputeLineBbox(canvas, linePtr);
1701	1721	}
1702
	1722
1703	1723	/*
1704	1724	*--------------------------------------------------------------
1705	1725	*

1743	1763	*/
1744	1764
1745	1765	badIndex:
1746		Tcl_SetResult(interp, NULL, TCL_STATIC);
	1766	Tcl_ResetResult(interp);
1747	1767	Tcl_AppendResult(interp, "bad index \"", string, "\"", NULL);
1748	1768	return TCL_ERROR;
1749	1769	}
1750	1770	} else if (string[0] == '@') {
1751	1771	int i;
1752		double x ,y, bestDist, dist, *coordPtr;
	1772	double x, y, bestDist, dist, *coordPtr;
1753	1773	char end, p;
1754	1774
1755	1775	p = string+1;

1765	1785	bestDist = 1.0e36;
1766	1786	coordPtr = linePtr->coordPtr;
1767	1787	*indexPtr = 0;
1768		for(i=0; i<linePtr->numPoints; i++) {
	1788	for (i=0; i<linePtr->numPoints; i++) {
1769	1789	dist = hypot(coordPtr[0] - x, coordPtr[1] - y);
1770		if (dist<bestDist) {
	1790	if (dist < bestDist) {
1771	1791	bestDist = dist;
1772	1792	indexPtr = 2i;
1773	1793	}

1777	1797	if (Tcl_GetIntFromObj(interp, obj, indexPtr) != TCL_OK) {
1778	1798	goto badIndex;
1779	1799	}
1780		indexPtr &= -2; / if index is odd, make it even */
	1800	indexPtr &= -2; / If index is odd, make it even. */
1781	1801	if (*indexPtr < 0){
1782	1802	*indexPtr = 0;
1783	1803	} else if (indexPtr > (2linePtr->numPoints)) {

1786	1806	}
1787	1807	return TCL_OK;
1788	1808	}
1789
	1809
1790	1810	/*
1791	1811	*--------------------------------------------------------------
1792	1812	*

1836	1856	}
1837	1857	ComputeLineBbox(canvas, linePtr);
1838	1858	}
1839
	1859
1840	1860	/*
1841	1861	*--------------------------------------------------------------
1842	1862	*

1903	1923	ckfree((char *) argv);
1904	1924	return TCL_OK;
1905	1925	}
1906
	1926
1907	1927	/*
1908	1928	*--------------------------------------------------------------
1909	1929	*

1922	1942	*/
1923	1943
1924	1944	/* ARGSUSED */
1925		static char *
	1945	static const char *
1926	1946	PrintArrowShape(
1927	1947	ClientData clientData, /* Not used. */
1928	1948	Tk_Window tkwin, /* Window associated with linePtr's widget. */

1933	1953	* string here. */
1934	1954	{
1935	1955	LineItem linePtr = (LineItem ) recordPtr;
1936		char *buffer;
1937
1938		buffer = (char *) ckalloc(120);
	1956	char *buffer = ckalloc(120);
	1957
1939	1958	sprintf(buffer, "%.5g %.5g %.5g", linePtr->arrowShapeA,
1940	1959	linePtr->arrowShapeB, linePtr->arrowShapeC);
1941	1960	*freeProcPtr = TCL_DYNAMIC;
1942	1961	return buffer;
1943	1962	}
1944
1945
	1963
1946	1964	/*
1947	1965	*--------------------------------------------------------------
1948	1966	*

1975	1993
1976	1994	register Arrows arrowPtr = (Arrows ) (widgRec + offset);
1977	1995
1978		if(value == NULL \|\| *value == 0) {
	1996	if (value == NULL \|\| *value == 0) {
1979	1997	*arrowPtr = ARROWS_NONE;
1980	1998	return TCL_OK;
1981	1999	}

2005	2023	*arrowPtr = ARROWS_NONE;
2006	2024	return TCL_ERROR;
2007	2025	}
2008
	2026
2009	2027	/*
2010	2028	*--------------------------------------------------------------
2011	2029	*

2027	2045	*--------------------------------------------------------------
2028	2046	*/
2029	2047
2030		static char *
	2048	static const char *
2031	2049	ArrowPrintProc(
2032	2050	ClientData clientData, /* Ignored. */
2033	2051	Tk_Window tkwin, /* Window containing canvas widget. */

2050	2068	return "none";
2051	2069	}
2052	2070	}
2053
	2071
2054	2072	/*
2055	2073	*--------------------------------------------------------------
2056	2074	*

2091	2109	double width;
2092	2110	Tk_State state = linePtr->header.state;
2093	2111
2094		if (linePtr->numPoints <2) {
	2112	if (linePtr->numPoints < 2) {
2095	2113	return TCL_OK;
2096	2114	}
2097	2115
2098		if(state == TK_STATE_NULL) {
	2116	if (state == TK_STATE_NULL) {
2099	2117	state = Canvas(canvas)->canvas_state;
2100	2118	}
2101	2119
2102	2120	width = linePtr->outline.width;
2103	2121	if (Canvas(canvas)->currentItemPtr == (Tk_Item *)linePtr) {
2104		if (linePtr->outline.activeWidth>width) {
	2122	if (linePtr->outline.activeWidth > width) {
2105	2123	width = linePtr->outline.activeWidth;
2106	2124	}
2107		} else if (state==TK_STATE_DISABLED) {
2108		if (linePtr->outline.disabledWidth>0) {
	2125	} else if (state == TK_STATE_DISABLED) {
	2126	if (linePtr->outline.disabledWidth > 0) {
2109	2127	width = linePtr->outline.disabledWidth;
2110	2128	}
2111	2129	}

2132	2150	if (linePtr->arrow != ARROWS_LAST) {
2133	2151	poly = linePtr->firstArrowPtr;
2134	2152	if (poly == NULL) {
2135		poly = (double *) ckalloc((unsigned)
2136		(2PTS_IN_ARROWsizeof(double)));
	2153	poly = (double *)
	2154	ckalloc((unsigned) (2PTS_IN_ARROWsizeof(double)));
2137	2155	poly[0] = poly[10] = linePtr->coordPtr[0];
2138	2156	poly[1] = poly[11] = linePtr->coordPtr[1];
2139	2157	linePtr->firstArrowPtr = poly;

2210	2228
2211	2229	return TCL_OK;
2212	2230	}
2213
	2231
2214	2232	/*
2215	2233	*--------------------------------------------------------------
2216	2234	*

2241	2259	{
2242	2260	LineItem linePtr = (LineItem ) itemPtr;
2243	2261	char buffer[64 + TCL_INTEGER_SPACE];
2244		char *style;
	2262	const char *style;
2245	2263
2246	2264	double width;
2247	2265	XColor *color;
2248	2266	Pixmap stipple;
2249	2267	Tk_State state = itemPtr->state;
2250	2268
2251		if(state == TK_STATE_NULL) {
	2269	if (state == TK_STATE_NULL) {
2252	2270	state = Canvas(canvas)->canvas_state;
2253	2271	}
2254	2272

2256	2274	color = linePtr->outline.color;
2257	2275	stipple = linePtr->outline.stipple;
2258	2276	if (Canvas(canvas)->currentItemPtr == itemPtr) {
2259		if (linePtr->outline.activeWidth>width) {
	2277	if (linePtr->outline.activeWidth > width) {
2260	2278	width = linePtr->outline.activeWidth;
2261	2279	}
2262		if (linePtr->outline.activeColor!=NULL) {
	2280	if (linePtr->outline.activeColor != NULL) {
2263	2281	color = linePtr->outline.activeColor;
2264	2282	}
2265		if (linePtr->outline.activeStipple!=None) {
	2283	if (linePtr->outline.activeStipple != None) {
2266	2284	stipple = linePtr->outline.activeStipple;
2267	2285	}
2268		} else if (state==TK_STATE_DISABLED) {
2269		if (linePtr->outline.disabledWidth>0) {
	2286	} else if (state == TK_STATE_DISABLED) {
	2287	if (linePtr->outline.disabledWidth > 0) {
2270	2288	width = linePtr->outline.disabledWidth;
2271	2289	}
2272		if (linePtr->outline.disabledColor!=NULL) {
	2290	if (linePtr->outline.disabledColor != NULL) {
2273	2291	color = linePtr->outline.disabledColor;
2274	2292	}
2275		if (linePtr->outline.disabledStipple!=None) {
	2293	if (linePtr->outline.disabledStipple != None) {
2276	2294	stipple = linePtr->outline.disabledStipple;
2277	2295	}
2278	2296	}
2279	2297
2280		if (color == NULL \|\| linePtr->numPoints<1 \|\| linePtr->coordPtr==NULL) {
	2298	if (color == NULL \|\| linePtr->numPoints < 1 \|\| linePtr->coordPtr == NULL){
2281	2299	return TCL_OK;
2282	2300	}
2283	2301
2284		if (linePtr->numPoints==1) {
	2302	if (linePtr->numPoints == 1) {
2285	2303	sprintf(buffer, "%.15g %.15g translate %.15g %.15g",
2286	2304	linePtr->coordPtr[0], Tk_CanvasPsY(canvas, linePtr->coordPtr[1]),
2287	2305	width/2.0, width/2.0);
2288		Tcl_AppendResult(interp, "matrix currentmatrix\n",buffer,
	2306	Tcl_AppendResult(interp, "matrix currentmatrix\n", buffer,
2289	2307	" scale 1 0 moveto 0 0 1 0 360 arc\nsetmatrix\n", NULL);
2290	2308	if (Tk_CanvasPsColor(interp, canvas, color) != TCL_OK) {
2291	2309	return TCL_ERROR;

2307	2325
2308	2326	if ((!linePtr->smooth) \|\| (linePtr->numPoints < 3)) {
2309	2327	Tk_CanvasPsPath(interp, canvas, linePtr->coordPtr, linePtr->numPoints);
	2328	} else if ((stipple == None) && linePtr->smooth->postscriptProc) {
	2329	linePtr->smooth->postscriptProc(interp, canvas, linePtr->coordPtr,
	2330	linePtr->numPoints, linePtr->splineSteps);
2310	2331	} else {
2311		if ((stipple == None) && linePtr->smooth->postscriptProc) {
2312		linePtr->smooth->postscriptProc(interp, canvas,
2313		linePtr->coordPtr, linePtr->numPoints, linePtr->splineSteps);
2314		} else {
2315		/*
2316		* Special hack: Postscript printers don't appear to be able to
2317		* turn a path drawn with "curveto"s into a clipping path without
2318		* exceeding resource limits, so TkMakeBezierPostscript won't work
2319		* for stippled curves. Instead, generate all of the intermediate
2320		* points here and output them into the Postscript file with
2321		* "lineto"s instead.
2322		*/
2323
2324		double staticPoints[2*MAX_STATIC_POINTS];
2325		double *pointPtr;
2326		int numPoints;
2327
2328		numPoints = linePtr->smooth->coordProc(canvas, NULL,
2329		linePtr->numPoints, linePtr->splineSteps, NULL, NULL);
2330		pointPtr = staticPoints;
2331		if (numPoints > MAX_STATIC_POINTS) {
2332		pointPtr = (double *) ckalloc((unsigned)
2333		(numPoints * 2 * sizeof(double)));
2334		}
2335		numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
2336		linePtr->numPoints, linePtr->splineSteps, NULL, pointPtr);
2337		Tk_CanvasPsPath(interp, canvas, pointPtr, numPoints);
2338		if (pointPtr != staticPoints) {
2339		ckfree((char *) pointPtr);
2340		}
	2332	/*
	2333	* Special hack: Postscript printers don't appear to be able to turn a
	2334	* path drawn with "curveto"s into a clipping path without exceeding
	2335	* resource limits, so TkMakeBezierPostscript won't work for stippled
	2336	* curves. Instead, generate all of the intermediate points here and
	2337	* output them into the Postscript file with "lineto"s instead.
	2338	*/
	2339
	2340	double staticPoints[2*MAX_STATIC_POINTS];
	2341	double *pointPtr;
	2342	int numPoints;
	2343
	2344	numPoints = linePtr->smooth->coordProc(canvas, NULL,
	2345	linePtr->numPoints, linePtr->splineSteps, NULL, NULL);
	2346	pointPtr = staticPoints;
	2347	if (numPoints > MAX_STATIC_POINTS) {
	2348	pointPtr = (double *)
	2349	ckalloc((unsigned) (numPoints * 2 * sizeof(double)));
	2350	}
	2351	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
	2352	linePtr->numPoints, linePtr->splineSteps, NULL, pointPtr);
	2353	Tk_CanvasPsPath(interp, canvas, pointPtr, numPoints);
	2354	if (pointPtr != staticPoints) {
	2355	ckfree((char *) pointPtr);
2341	2356	}
2342	2357	}
2343	2358

2360	2375	}
2361	2376	Tcl_AppendResult(interp, style, NULL);
2362	2377
2363		if (Tk_CanvasPsOutline(canvas, itemPtr, &(linePtr->outline)) != TCL_OK) {
	2378	if (Tk_CanvasPsOutline(canvas, itemPtr, &linePtr->outline) != TCL_OK) {
2364	2379	return TCL_ERROR;
2365	2380	}
2366	2381

2388	2403	}
2389	2404	return TCL_OK;
2390	2405	}
2391
	2406
2392	2407	/*
2393	2408	*--------------------------------------------------------------
2394	2409	*

2430	2445	if (linePtr->outline.activeStipple!=None) {
2431	2446	stipple = linePtr->outline.activeStipple;
2432	2447	}
2433		} else if (state==TK_STATE_DISABLED) {
	2448	} else if (state == TK_STATE_DISABLED) {
2434	2449	if (linePtr->outline.activeStipple!=None) {
2435	2450	stipple = linePtr->outline.disabledStipple;
2436	2451	}

2447	2462	}
2448	2463	return TCL_OK;
2449	2464	}
2450
	2465
2451	2466	/*
2452	2467	* Local Variables:
2453	2468	* mode: c

+214

-204

generic/tkCanvPoly.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkCanvPoly.c,v 1.19 2008/04/27 22:38:55 dkf Exp $
	12	* RCS: @(#) $Id: tkCanvPoly.c,v 1.23 2008/11/09 21:53:39 nijtmans Exp $
13	13	*/
14	14
15	15	#include <stdio.h>

45	45	Pixmap disabledFillStipple; /* Stipple bitmap for filling polygon if state
46	46	* is disabled. */
47	47	GC fillGC; /* Graphics context for filling polygon. */
48		Tk_SmoothMethod smooth; / Non-zero means draw shape smoothed (i.e.
	48	const Tk_SmoothMethod smooth; / Non-zero means draw shape smoothed (i.e.
49	49	* with Bezier splines). */
50	50	int splineSteps; /* Number of steps in each spline segment. */
51	51	int autoClosed; /* Zero means the given polygon was closed,

56	56	* Information used for parsing configuration specs:
57	57	*/
58	58
59		static Tk_CustomOption smoothOption = {
60		(Tk_OptionParseProc *) TkSmoothParseProc,
61		TkSmoothPrintProc, (ClientData) NULL
	59	static const Tk_CustomOption smoothOption = {
	60	TkSmoothParseProc, TkSmoothPrintProc, (ClientData) NULL
62	61	};
63		static Tk_CustomOption stateOption = {
64		(Tk_OptionParseProc *) TkStateParseProc,
65		TkStatePrintProc, (ClientData) 2
	62	static const Tk_CustomOption stateOption = {
	63	TkStateParseProc, TkStatePrintProc, (ClientData) 2
66	64	};
67		static Tk_CustomOption tagsOption = {
68		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
69		Tk_CanvasTagsPrintProc, (ClientData) NULL
	65	static const Tk_CustomOption tagsOption = {
	66	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
70	67	};
71		static Tk_CustomOption dashOption = {
72		(Tk_OptionParseProc *) TkCanvasDashParseProc,
73		TkCanvasDashPrintProc, (ClientData) NULL
	68	static const Tk_CustomOption dashOption = {
	69	TkCanvasDashParseProc, TkCanvasDashPrintProc, (ClientData) NULL
74	70	};
75		static Tk_CustomOption offsetOption = {
76		(Tk_OptionParseProc *) TkOffsetParseProc,
77		TkOffsetPrintProc,
	71	static const Tk_CustomOption offsetOption = {
	72	TkOffsetParseProc, TkOffsetPrintProc,
78	73	(ClientData) (TK_OFFSET_RELATIVE\|TK_OFFSET_INDEX)
79	74	};
80		static Tk_CustomOption pixelOption = {
81		(Tk_OptionParseProc *) TkPixelParseProc,
82		TkPixelPrintProc, (ClientData) NULL
	75	static const Tk_CustomOption pixelOption = {
	76	TkPixelParseProc, TkPixelPrintProc, (ClientData) NULL
83	77	};
84	78
85	79	static Tk_ConfigSpec configSpecs[] = {

204	198	PolygonCoords, /* coordProc */
205	199	DeletePolygon, /* deleteProc */
206	200	DisplayPolygon, /* displayProc */
207		TK_CONFIG_OBJS, /* flags */
	201	TK_CONFIG_OBJS \| TK_MOVABLE_POINTS, /* flags */
208	202	PolygonToPoint, /* pointProc */
209	203	PolygonToArea, /* areaProc */
210	204	PolygonToPostscript, /* postscriptProc */

266	260	* errors during the the remainder of this function.
267	261	*/
268	262
269		Tk_CreateOutline(&(polyPtr->outline));
	263	Tk_CreateOutline(&polyPtr->outline);
270	264	polyPtr->numPoints = 0;
271	265	polyPtr->pointsAllocated = 0;
272	266	polyPtr->coordPtr = NULL;

293	287
294	288	for (i = 0; i < objc; i++) {
295	289	char *arg = Tcl_GetString(objv[i]);
	290
296	291	if ((arg[0] == '-') && (arg[1] >= 'a') && (arg[1] <= 'z')) {
297	292	break;
298	293	}

362	357	}
363	358	}
364	359	if (objc & 1) {
365		char buf[64 + TCL_INTEGER_SPACE];
366
367		sprintf(buf, "wrong # coordinates: expected an even number, got %d",
368		objc);
369		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	360	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
	361	"wrong # coordinates: expected an even number, got %d",
	362	objc));
370	363	return TCL_ERROR;
371		} else {
372		numPoints = objc/2;
373		if (polyPtr->pointsAllocated <= numPoints) {
374		if (polyPtr->coordPtr != NULL) {
375		ckfree((char *) polyPtr->coordPtr);
376		}
377
378		/*
379		* One extra point gets allocated here, because we always add
380		* another point to close the polygon.
381		*/
382
383		polyPtr->coordPtr = (double *) ckalloc((unsigned)
384		(sizeof(double) * (objc+2)));
385		polyPtr->pointsAllocated = numPoints+1;
386		}
387		for (i = objc-1; i >= 0; i--) {
388		if (Tk_CanvasGetCoordFromObj(interp, canvas, objv[i],
389		&polyPtr->coordPtr[i]) != TCL_OK) {
390		return TCL_ERROR;
391		}
392		}
393		polyPtr->numPoints = numPoints;
394		polyPtr->autoClosed = 0;
	364	}
	365
	366	numPoints = objc/2;
	367	if (polyPtr->pointsAllocated <= numPoints) {
	368	if (polyPtr->coordPtr != NULL) {
	369	ckfree((char *) polyPtr->coordPtr);
	370	}
395	371
396	372	/*
397		* Close the polygon if it isn't already closed.
	373	* One extra point gets allocated here, because we always add
	374	* another point to close the polygon.
398	375	*/
399	376
400		if (objc>2 && ((polyPtr->coordPtr[objc-2] != polyPtr->coordPtr[0])
401		\|\| (polyPtr->coordPtr[objc-1] != polyPtr->coordPtr[1]))) {
402		polyPtr->autoClosed = 1;
403		polyPtr->numPoints++;
404		polyPtr->coordPtr[objc] = polyPtr->coordPtr[0];
405		polyPtr->coordPtr[objc+1] = polyPtr->coordPtr[1];
406		}
407		ComputePolygonBbox(canvas, polyPtr);
408		}
	377	polyPtr->coordPtr = (double *)
	378	ckalloc(sizeof(double) * (unsigned)(objc+2));
	379	polyPtr->pointsAllocated = numPoints+1;
	380	}
	381	for (i = objc-1; i >= 0; i--) {
	382	if (Tk_CanvasGetCoordFromObj(interp, canvas, objv[i],
	383	&polyPtr->coordPtr[i]) != TCL_OK) {
	384	return TCL_ERROR;
	385	}
	386	}
	387	polyPtr->numPoints = numPoints;
	388	polyPtr->autoClosed = 0;
	389
	390	/*
	391	* Close the polygon if it isn't already closed.
	392	*/
	393
	394	if (objc>2 && ((polyPtr->coordPtr[objc-2] != polyPtr->coordPtr[0])
	395	\|\| (polyPtr->coordPtr[objc-1] != polyPtr->coordPtr[1]))) {
	396	polyPtr->autoClosed = 1;
	397	polyPtr->numPoints++;
	398	polyPtr->coordPtr[objc] = polyPtr->coordPtr[0];
	399	polyPtr->coordPtr[objc+1] = polyPtr->coordPtr[1];
	400	}
	401
	402	ComputePolygonBbox(canvas, polyPtr);
409	403	return TCL_OK;
410	404	}
411	405

470	464	itemPtr->redraw_flags &= ~TK_ITEM_STATE_DEPENDANT;
471	465	}
472	466
473		if(state == TK_STATE_NULL) {
	467	if (state == TK_STATE_NULL) {
474	468	state = Canvas(canvas)->canvas_state;
475	469	}
476		if (state==TK_STATE_HIDDEN) {
	470	if (state == TK_STATE_HIDDEN) {
477	471	ComputePolygonBbox(canvas, polyPtr);
478	472	return TCL_OK;
479	473	}
480	474
481		mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr, &(polyPtr->outline));
	475	mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr, &polyPtr->outline);
482	476	if (mask) {
483	477	gcValues.cap_style = CapRound;
484	478	gcValues.join_style = polyPtr->joinStyle;

495	489	color = polyPtr->fillColor;
496	490	stipple = polyPtr->fillStipple;
497	491	if (Canvas(canvas)->currentItemPtr == itemPtr) {
498		if (polyPtr->activeFillColor!=NULL) {
	492	if (polyPtr->activeFillColor != NULL) {
499	493	color = polyPtr->activeFillColor;
500	494	}
501		if (polyPtr->activeFillStipple!=None) {
	495	if (polyPtr->activeFillStipple != None) {
502	496	stipple = polyPtr->activeFillStipple;
503	497	}
504		} else if (state==TK_STATE_DISABLED) {
505		if (polyPtr->disabledFillColor!=NULL) {
	498	} else if (state == TK_STATE_DISABLED) {
	499	if (polyPtr->disabledFillColor != NULL) {
506	500	color = polyPtr->disabledFillColor;
507	501	}
508		if (polyPtr->disabledFillStipple!=None) {
	502	if (polyPtr->disabledFillStipple != None) {
509	503	stipple = polyPtr->disabledFillStipple;
510	504	}
511	505	}

525	519	* Mac OS X CG drawing needs access to the outline linewidth
526	520	* even for fills (as linewidth controls antialiasing).
527	521	*/
528		gcValues.line_width = polyPtr->outline.gc != None ?
	522	gcValues.line_width = polyPtr->outline.gc != None ?
529	523	polyPtr->outline.gc->line_width : 0;
530	524	mask \|= GCLineWidth;
531	525	#endif

575	569	{
576	570	PolygonItem polyPtr = (PolygonItem ) itemPtr;
577	571
578		Tk_DeleteOutline(display,&(polyPtr->outline));
	572	Tk_DeleteOutline(display, &polyPtr->outline);
579	573	if (polyPtr->coordPtr != NULL) {
580	574	ckfree((char *) polyPtr->coordPtr);
581	575	}

630	624	Tk_State state = polyPtr->header.state;
631	625	Tk_TSOffset *tsoffset;
632	626
633		if(state == TK_STATE_NULL) {
	627	if (state == TK_STATE_NULL) {
634	628	state = Canvas(canvas)->canvas_state;
635	629	}
636	630	width = polyPtr->outline.width;
637		if (polyPtr->coordPtr == NULL \|\| (polyPtr->numPoints < 1) \|\| (state==TK_STATE_HIDDEN)) {
	631	if (polyPtr->coordPtr == NULL \|\| (polyPtr->numPoints < 1)
	632	\|\| (state == TK_STATE_HIDDEN)) {
638	633	polyPtr->header.x1 = polyPtr->header.x2 =
639		polyPtr->header.y1 = polyPtr->header.y2 = -1;
	634	polyPtr->header.y1 = polyPtr->header.y2 = -1;
640	635	return;
641	636	}
642		if (Canvas(canvas)->currentItemPtr == (Tk_Item *)polyPtr) {
643		if (polyPtr->outline.activeWidth>width) {
	637	if (Canvas(canvas)->currentItemPtr == (Tk_Item *) polyPtr) {
	638	if (polyPtr->outline.activeWidth > width) {
644	639	width = polyPtr->outline.activeWidth;
645	640	}
646		} else if (state==TK_STATE_DISABLED) {
647		if (polyPtr->outline.disabledWidth>0.0) {
	641	} else if (state == TK_STATE_DISABLED) {
	642	if (polyPtr->outline.disabledWidth > 0.0) {
648	643	width = polyPtr->outline.disabledWidth;
649	644	}
650	645	}

670	665	tsoffset = &polyPtr->tsoffset;
671	666	if (tsoffset->flags & TK_OFFSET_INDEX) {
672	667	int index = tsoffset->flags & ~TK_OFFSET_INDEX;
	668
673	669	if (tsoffset->flags == INT_MAX) {
674	670	index = (polyPtr->numPoints - polyPtr->autoClosed) * 2;
675	671	if (index < 0) {

677	673	}
678	674	}
679	675	index %= (polyPtr->numPoints - polyPtr->autoClosed) * 2;
680		if (index <0) {
	676	if (index < 0) {
681	677	index += (polyPtr->numPoints - polyPtr->autoClosed) * 2;
682	678	}
683	679	tsoffset->xoffset = (int) (polyPtr->coordPtr[index] + 0.5);

709	705	index = (polyPtr->numPoints - 1) * 2;
710	706	}
711	707	index %= (polyPtr->numPoints - 1) * 2;
712		if (index <0) {
	708	if (index < 0) {
713	709	index += (polyPtr->numPoints - 1) * 2;
714	710	}
715	711	tsoffset->xoffset = (int) (polyPtr->coordPtr[index] + 0.5);

718	714	if (tsoffset->flags & TK_OFFSET_LEFT) {
719	715	tsoffset->xoffset = polyPtr->header.x1;
720	716	} else if (tsoffset->flags & TK_OFFSET_CENTER) {
721		tsoffset->xoffset = (polyPtr->header.x1 + polyPtr->header.x2)/2;
	717	tsoffset->xoffset =
	718	(polyPtr->header.x1 + polyPtr->header.x2) / 2;
722	719	} else if (tsoffset->flags & TK_OFFSET_RIGHT) {
723	720	tsoffset->xoffset = polyPtr->header.x2;
724	721	}
725	722	if (tsoffset->flags & TK_OFFSET_TOP) {
726	723	tsoffset->yoffset = polyPtr->header.y1;
727	724	} else if (tsoffset->flags & TK_OFFSET_MIDDLE) {
728		tsoffset->yoffset = (polyPtr->header.y1 + polyPtr->header.y2)/2;
	725	tsoffset->yoffset =
	726	(polyPtr->header.y1 + polyPtr->header.y2) / 2;
729	727	} else if (tsoffset->flags & TK_OFFSET_BOTTOM) {
730	728	tsoffset->yoffset = polyPtr->header.y2;
731	729	}
732	730	}
733	731	}
734	732
735		i = (int) ((width+1.5)/2.0);
	733	i = (int) ((width+1.5) / 2.0);
736	734	polyPtr->header.x1 -= i;
737	735	polyPtr->header.x2 += i;
738	736	polyPtr->header.y1 -= i;

749	747	int j;
750	748
751	749	coordPtr = polyPtr->coordPtr;
752		if (polyPtr->numPoints>3) {
	750	if (polyPtr->numPoints > 3) {
753	751	if (TkGetMiterPoints(coordPtr+2*(polyPtr->numPoints-2),
754		coordPtr, coordPtr+2, width,
755		miter, miter+2)) {
	752	coordPtr, coordPtr+2, width, miter, miter+2)) {
756	753	for (j = 0; j < 4; j += 2) {
757	754	TkIncludePoint((Tk_Item *) polyPtr, miter+j);
758	755	}
759	756	}
760		}
	757	}
761	758	for (i = polyPtr->numPoints ; i >= 3; i--, coordPtr += 2) {
762
763		if (TkGetMiterPoints(coordPtr, coordPtr+2, coordPtr+4,
764		width, miter, miter+2)) {
	759	if (TkGetMiterPoints(coordPtr, coordPtr+2, coordPtr+4, width,
	760	miter, miter+2)) {
765	761	for (j = 0; j < 4; j += 2) {
766	762	TkIncludePoint((Tk_Item *) polyPtr, miter+j);
767	763	}

828	824	if (numPoints <= MAX_STATIC_POINTS) {
829	825	pointPtr = staticPoints;
830	826	} else {
831		pointPtr = (XPoint ) ckalloc((unsigned) (numPoints sizeof(XPoint)));
	827	pointPtr = (XPoint ) ckalloc((unsigned) numPoints sizeof(XPoint));
832	828	}
833	829
834	830	for (i=0, pPtr=pointPtr ; i<numPoints; i+=1, coordPtr+=2, pPtr++) {

841	837	* allocated.
842	838	*/
843	839
844		if (gc != None && numPoints>3) {
	840	if (gc != None && numPoints > 3) {
845	841	XFillPolygon(display, drawable, gc, pointPtr, numPoints, Complex,
846	842	CoordModeOrigin);
847	843	}
848	844	if (outlineGC != None) {
849		XDrawLines(display, drawable, outlineGC, pointPtr,
850		numPoints, CoordModeOrigin);
	845	XDrawLines(display, drawable, outlineGC, pointPtr, numPoints,
	846	CoordModeOrigin);
851	847	}
852	848	if (pointPtr != staticPoints) {
853	849	ckfree((char *) pointPtr);

896	892	state = Canvas(canvas)->canvas_state;
897	893	}
898	894	if (Canvas(canvas)->currentItemPtr == itemPtr) {
899		if (polyPtr->outline.activeWidth>linewidth) {
	895	if (polyPtr->outline.activeWidth > linewidth) {
900	896	linewidth = polyPtr->outline.activeWidth;
901	897	}
902	898	if (polyPtr->activeFillStipple != None) {
903	899	stipple = polyPtr->activeFillStipple;
904	900	}
905		} else if (state==TK_STATE_DISABLED) {
906		if (polyPtr->outline.disabledWidth>0.0) {
	901	} else if (state == TK_STATE_DISABLED) {
	902	if (polyPtr->outline.disabledWidth > 0.0) {
907	903	linewidth = polyPtr->outline.disabledWidth;
908	904	}
909	905	if (polyPtr->disabledFillStipple != None) {

918	914
919	915	if ((stipple != None) && (polyPtr->fillGC != None)) {
920	916	Tk_TSOffset *tsoffset = &polyPtr->tsoffset;
921		int w=0; int h=0;
	917	int w = 0, h = 0;
922	918	int flags = tsoffset->flags;
923	919
924		if (!(flags & TK_OFFSET_INDEX) && (flags & (TK_OFFSET_CENTER\|TK_OFFSET_MIDDLE))) {
	920	if (!(flags & TK_OFFSET_INDEX)
	921	&& (flags & (TK_OFFSET_CENTER\|TK_OFFSET_MIDDLE))) {
925	922	Tk_SizeOfBitmap(display, stipple, &w, &h);
926	923	if (flags & TK_OFFSET_CENTER) {
927	924	w /= 2;

940	937	tsoffset->xoffset += w;
941	938	tsoffset->yoffset += h;
942	939	}
943		Tk_ChangeOutlineGC(canvas, itemPtr, &(polyPtr->outline));
944
945		if(polyPtr->numPoints < 3) {
946		short x,y;
	940	Tk_ChangeOutlineGC(canvas, itemPtr, &polyPtr->outline);
	941
	942	if (polyPtr->numPoints < 3) {
	943	short x, y;
947	944	int intLineWidth = (int) (linewidth + 0.5);
948	945
949	946	if (intLineWidth < 1) {
950	947	intLineWidth = 1;
951	948	}
952	949	Tk_CanvasDrawableCoords(canvas, polyPtr->coordPtr[0],
953		polyPtr->coordPtr[1], &x,&y);
	950	polyPtr->coordPtr[1], &x, &y);
954	951	XFillArc(display, drawable, polyPtr->outline.gc,
955	952	x - intLineWidth/2, y - intLineWidth/2,
956		(unsigned int)intLineWidth+1, (unsigned int)intLineWidth+1,
	953	(unsigned) intLineWidth+1, (unsigned) intLineWidth+1,
957	954	0, 64*360);
958	955	} else if (!polyPtr->smooth \|\| polyPtr->numPoints < 4) {
959	956	TkFillPolygon(canvas, polyPtr->coordPtr, polyPtr->numPoints,

973	970	if (numPoints <= MAX_STATIC_POINTS) {
974	971	pointPtr = staticPoints;
975	972	} else {
976		pointPtr = (XPoint *) ckalloc((unsigned)
977		(numPoints * sizeof(XPoint)));
	973	pointPtr = (XPoint *)
	974	ckalloc((unsigned) numPoints * sizeof(XPoint));
978	975	}
979	976	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
980	977	polyPtr->numPoints, polyPtr->splineSteps, pointPtr, NULL);

990	987	ckfree((char *) pointPtr);
991	988	}
992	989	}
993		Tk_ResetOutlineGC(canvas, itemPtr, &(polyPtr->outline));
	990	Tk_ResetOutlineGC(canvas, itemPtr, &polyPtr->outline);
994	991	if ((stipple != None) && (polyPtr->fillGC != None)) {
995	992	XSetTSOrigin(display, polyPtr->fillGC, 0, 0);
996	993	}

1035	1032	return;
1036	1033	}
1037	1034	length = 2*(polyPtr->numPoints - polyPtr->autoClosed);
1038		while (beforeThis>length) {
	1035	while (beforeThis > length) {
1039	1036	beforeThis -= length;
1040	1037	}
1041		while (beforeThis<0) {
	1038	while (beforeThis < 0) {
1042	1039	beforeThis += length;
1043	1040	}
1044	1041	newCoordPtr = (double *)

1085	1082
1086	1083	newCoordPtr[length] = newCoordPtr[0];
1087	1084	newCoordPtr[length+1] = newCoordPtr[1];
1088		if (((length-objc)>3) && (state != TK_STATE_HIDDEN)) {
	1085	if ((length-objc > 3) && (state != TK_STATE_HIDDEN)) {
1089	1086	/*
1090	1087	* This is some optimizing code that will result that only the part of
1091	1088	* the polygon that changed (and the objects that are overlapping with

1097	1094
1098	1095	double width;
1099	1096	int j;
	1097
1100	1098	itemPtr->redraw_flags \|= TK_ITEM_DONT_REDRAW;
1101	1099
1102	1100	/*

1108	1106
1109	1107	itemPtr->x1 = itemPtr->x2 = (int) polyPtr->coordPtr[beforeThis];
1110	1108	itemPtr->y1 = itemPtr->y2 = (int) polyPtr->coordPtr[beforeThis+1];
1111		beforeThis-=2; objc+=4;
	1109	beforeThis -= 2;
	1110	objc += 4;
1112	1111	if (polyPtr->smooth) {
1113		beforeThis-=2;
1114		objc+=4;
	1112	beforeThis -= 2;
	1113	objc += 4;
1115	1114	}
1116	1115
1117	1116	/*

1120	1119
1121	1120	for (i=beforeThis; i<beforeThis+objc; i+=2) {
1122	1121	j = i;
1123		if (j<0) {
	1122	if (j < 0) {
1124	1123	j += length;
1125		} else if (j>=length) {
	1124	} else if (j >= length) {
1126	1125	j -= length;
1127	1126	}
1128	1127	TkIncludePoint(itemPtr, polyPtr->coordPtr+j);

1132	1131	if (polyPtr->outline.activeWidth > width) {
1133	1132	width = polyPtr->outline.activeWidth;
1134	1133	}
1135		} else if (state==TK_STATE_DISABLED) {
	1134	} else if (state == TK_STATE_DISABLED) {
1136	1135	if (polyPtr->outline.disabledWidth > 0.0) {
1137	1136	width = polyPtr->outline.disabledWidth;
1138	1137	}
1139	1138	}
1140		itemPtr->x1 -= (int) width; itemPtr->y1 -= (int) width;
1141		itemPtr->x2 += (int) width; itemPtr->y2 += (int) width;
	1139	itemPtr->x1 -= (int) width;
	1140	itemPtr->y1 -= (int) width;
	1141	itemPtr->x2 += (int) width;
	1142	itemPtr->y2 += (int) width;
1142	1143	Tk_CanvasEventuallyRedraw(canvas,
1143	1144	itemPtr->x1, itemPtr->y1, itemPtr->x2, itemPtr->y2);
1144	1145	}

1174	1175	int count, i;
1175	1176	int length = 2*(polyPtr->numPoints - polyPtr->autoClosed);
1176	1177
1177		while (first>=length) {
	1178	while (first >= length) {
1178	1179	first -= length;
1179	1180	}
1180		while (first<0) {
	1181	while (first < 0) {
1181	1182	first += length;
1182	1183	}
1183		while (last>=length) {
	1184	while (last >= length) {
1184	1185	last -= length;
1185	1186	}
1186		while (last<0) {
	1187	while (last < 0) {
1187	1188	last += length;
1188	1189	}
1189	1190

1191	1192	last &= -2;
1192	1193
1193	1194	count = last + 2 - first;
1194		if (count<=0) {
	1195	if (count <= 0) {
1195	1196	count += length;
1196	1197	}
1197	1198

1204	1205	return;
1205	1206	}
1206	1207
1207		if (last>=first) {
1208		for(i=last+2; i<length; i++) {
	1208	if (last >= first) {
	1209	for (i=last+2; i<length; i++) {
1209	1210	polyPtr->coordPtr[i-count] = polyPtr->coordPtr[i];
1210	1211	}
1211	1212	} else {
1212		for(i=last; i<=first; i++) {
	1213	for (i=last; i<=first; i++) {
1213	1214	polyPtr->coordPtr[i-last] = polyPtr->coordPtr[i];
1214	1215	}
1215	1216	}

1266	1267	}
1267	1268	width = polyPtr->outline.width;
1268	1269	if (Canvas(canvas)->currentItemPtr == itemPtr) {
1269		if (polyPtr->outline.activeWidth>width) {
	1270	if (polyPtr->outline.activeWidth > width) {
1270	1271	width = polyPtr->outline.activeWidth;
1271	1272	}
1272		} else if (state==TK_STATE_DISABLED) {
1273		if (polyPtr->outline.disabledWidth>0.0) {
	1273	} else if (state == TK_STATE_DISABLED) {
	1274	if (polyPtr->outline.disabledWidth > 0.0) {
1274	1275	width = polyPtr->outline.disabledWidth;
1275	1276	}
1276	1277	}

1281	1282	* against which to do the check.
1282	1283	*/
1283	1284
1284		if ((polyPtr->smooth) && (polyPtr->numPoints>2)) {
	1285	if ((polyPtr->smooth) && (polyPtr->numPoints > 2)) {
1285	1286	numPoints = polyPtr->smooth->coordProc(canvas, NULL,
1286		polyPtr->numPoints, polyPtr->splineSteps, NULL,
1287		NULL);
	1287	polyPtr->numPoints, polyPtr->splineSteps, NULL, NULL);
1288	1288	if (numPoints <= MAX_STATIC_POINTS) {
1289	1289	polyPoints = staticSpace;
1290	1290	} else {
1291		polyPoints = (double *) ckalloc((unsigned)
1292		(2numPointssizeof(double)));
	1291	polyPoints = (double *)
	1292	ckalloc((unsigned) 2numPointssizeof(double));
1293	1293	}
1294	1294	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
1295		polyPtr->numPoints, polyPtr->splineSteps, NULL,
1296		polyPoints);
	1295	polyPtr->numPoints, polyPtr->splineSteps, NULL, polyPoints);
1297	1296	} else {
1298	1297	numPoints = polyPtr->numPoints;
1299	1298	polyPoints = polyPtr->coordPtr;
1300	1299	}
1301	1300
1302	1301	bestDist = TkPolygonToPoint(polyPoints, numPoints, pointPtr);
1303		if (bestDist<=0.0) {
	1302	if (bestDist <= 0.0) {
1304	1303	goto donepoint;
1305	1304	}
1306	1305	if ((polyPtr->outline.gc != None) && (polyPtr->joinStyle == JoinRound)) {

1350	1349	*/
1351	1350
1352	1351	if (count == numPoints) {
1353		TkGetButtPoints(coordPtr+2, coordPtr, (double) width,
1354		0, poly, poly+2);
	1352	TkGetButtPoints(coordPtr+2, coordPtr, (double) width, 0, poly,
	1353	poly+2);
1355	1354	} else if ((polyPtr->joinStyle == JoinMiter) && !changedMiterToBevel) {
1356	1355	poly[0] = poly[6];
1357	1356	poly[1] = poly[7];
1358	1357	poly[2] = poly[4];
1359	1358	poly[3] = poly[5];
1360	1359	} else {
1361		TkGetButtPoints(coordPtr+2, coordPtr, (double) width, 0,
1362		poly, poly+2);
	1360	TkGetButtPoints(coordPtr+2, coordPtr, (double) width, 0, poly,
	1361	poly+2);
1363	1362
1364	1363	/*
1365	1364	* If this line uses beveled joints, then check the distance to a

1382	1381	}
1383	1382	}
1384	1383	if (count == 2) {
1385		TkGetButtPoints(coordPtr, coordPtr+2, (double) width,
1386		0, poly+4, poly+6);
	1384	TkGetButtPoints(coordPtr, coordPtr+2, (double) width, 0, poly+4,
	1385	poly+6);
1387	1386	} else if (polyPtr->joinStyle == JoinMiter) {
1388	1387	if (TkGetMiterPoints(coordPtr, coordPtr+2, coordPtr+4,
1389	1388	(double) width, poly+4, poly+6) == 0) {

1392	1391	poly+4, poly+6);
1393	1392	}
1394	1393	} else {
1395		TkGetButtPoints(coordPtr, coordPtr+2, (double) width, 0,
1396		poly+4, poly+6);
	1394	TkGetButtPoints(coordPtr, coordPtr+2, (double) width, 0, poly+4,
	1395	poly+6);
1397	1396	}
1398	1397	poly[8] = poly[0];
1399	1398	poly[9] = poly[1];

1407	1406	}
1408	1407
1409	1408	donepoint:
1410		if ((polyPoints != staticSpace) && polyPoints != polyPtr->coordPtr) {
	1409	if (polyPoints != staticSpace && polyPoints != polyPtr->coordPtr) {
1411	1410	ckfree((char *) polyPoints);
1412	1411	}
1413	1412	return bestDist;

1464	1463
1465	1464	width = polyPtr->outline.width;
1466	1465	if (Canvas(canvas)->currentItemPtr == itemPtr) {
1467		if (polyPtr->outline.activeWidth>width) {
	1466	if (polyPtr->outline.activeWidth > width) {
1468	1467	width = polyPtr->outline.activeWidth;
1469	1468	}
1470		} else if (state==TK_STATE_DISABLED) {
1471		if (polyPtr->outline.disabledWidth>0.0) {
	1469	} else if (state == TK_STATE_DISABLED) {
	1470	if (polyPtr->outline.disabledWidth > 0.0) {
1472	1471	width = polyPtr->outline.disabledWidth;
1473	1472	}
1474	1473	}

1476	1475	radius = width/2.0;
1477	1476	inside = -1;
1478	1477
1479		if ((state==TK_STATE_HIDDEN) \|\| polyPtr->numPoints<2) {
	1478	if ((state == TK_STATE_HIDDEN) \|\| polyPtr->numPoints < 2) {
1480	1479	return -1;
1481		} else if (polyPtr->numPoints <3) {
	1480	} else if (polyPtr->numPoints < 3) {
1482	1481	double oval[4];
1483	1482
1484	1483	oval[0] = polyPtr->coordPtr[0]-radius;

1500	1499	polyPoints = staticSpace;
1501	1500	} else {
1502	1501	polyPoints = (double *)
1503		ckalloc((unsigned) (2numPointssizeof(double)));
	1502	ckalloc((unsigned) 2numPointssizeof(double));
1504	1503	}
1505	1504	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
1506	1505	polyPtr->numPoints, polyPtr->splineSteps, NULL, polyPoints);

1516	1515	*/
1517	1516
1518	1517	inside = TkPolygonToArea(polyPoints, numPoints, rectPtr);
1519		if (inside==0) {
	1518	if (inside == 0) {
1520	1519	goto donearea;
1521	1520	}
1522	1521

1585	1584	if (count == 2) {
1586	1585	TkGetButtPoints(coordPtr, coordPtr+2, width, 0, poly+4, poly+6);
1587	1586	} else if (polyPtr->joinStyle == JoinMiter) {
1588		if (TkGetMiterPoints(coordPtr, coordPtr+2, coordPtr+4,
1589		width, poly+4, poly+6) == 0) {
	1587	if (TkGetMiterPoints(coordPtr, coordPtr+2, coordPtr+4, width,
	1588	poly+4, poly+6) == 0) {
1590	1589	changedMiterToBevel = 1;
1591	1590	TkGetButtPoints(coordPtr, coordPtr+2, width,0, poly+4, poly+6);
1592	1591	}

1682	1681	char *string = Tcl_GetStringFromObj(obj, &length);
1683	1682
1684	1683	if (string[0] == 'e') {
1685		if (strncmp(string, "end", (unsigned)length) == 0) {
1686		indexPtr = 2(polyPtr->numPoints - polyPtr->autoClosed);
1687		} else {
1688		/*
1689		* Some of the paths here leave messages in interp->result, so we
1690		* have to clear it out before storing our own message.
1691		*/
1692
1693		badIndex:
1694		Tcl_SetResult(interp, NULL, TCL_STATIC);
1695		Tcl_AppendResult(interp, "bad index \"", string, "\"", NULL);
1696		return TCL_ERROR;
1697		}
	1684	if (strncmp(string, "end", (unsigned)length) != 0) {
	1685	goto badIndex;
	1686	}
	1687	indexPtr = 2(polyPtr->numPoints - polyPtr->autoClosed);
1698	1688	} else if (string[0] == '@') {
1699	1689	int i;
1700		double x ,y, bestDist, dist, *coordPtr;
	1690	double x, y, bestDist, dist, *coordPtr;
1701	1691	char end, p;
1702	1692
1703	1693	p = string+1;

1713	1703	bestDist = 1.0e36;
1714	1704	coordPtr = polyPtr->coordPtr;
1715	1705	*indexPtr = 0;
1716		for(i=0; i<(polyPtr->numPoints-1); i++) {
	1706	for (i=0; i<polyPtr->numPoints-1; i++) {
1717	1707	dist = hypot(coordPtr[0] - x, coordPtr[1] - y);
1718		if (dist<bestDist) {
	1708	if (dist < bestDist) {
1719	1709	bestDist = dist;
1720	1710	indexPtr = 2i;
1721	1711	}

1728	1718	goto badIndex;
1729	1719	}
1730	1720	indexPtr &= -2; / if odd, make it even */
1731		if (count) {
1732		if (*indexPtr > 0) {
1733		indexPtr = ((indexPtr - 2) % count) + 2;
1734		} else {
1735		indexPtr = -((-(indexPtr)) % count);
1736		}
	1721	if (!count) {
	1722	*indexPtr = 0;
	1723	} else if (*indexPtr > 0) {
	1724	indexPtr = ((indexPtr - 2) % count) + 2;
1737	1725	} else {
1738		*indexPtr = 0;
	1726	indexPtr = -((-(indexPtr)) % count);
1739	1727	}
1740	1728	}
1741	1729	return TCL_OK;
	1730
	1731	/*
	1732	* Some of the paths here leave messages in interp->result, so we have to
	1733	* clear it out before storing our own message.
	1734	*/
	1735
	1736	badIndex:
	1737	Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad index \"%s\"", string));
	1738	return TCL_ERROR;
1742	1739	}
1743	1740
1744	1741	/*

1806	1803	* being created. */
1807	1804	{
1808	1805	PolygonItem polyPtr = (PolygonItem ) itemPtr;
1809		char *style;
	1806	const char *style;
1810	1807	XColor *color;
1811	1808	XColor *fillColor;
1812	1809	Pixmap stipple;

1814	1811	Tk_State state = itemPtr->state;
1815	1812	double width;
1816	1813
1817		if (polyPtr->numPoints<2 \|\| polyPtr->coordPtr==NULL) {
	1814	if (polyPtr->numPoints < 2 \|\| polyPtr->coordPtr == NULL) {
1818	1815	return TCL_OK;
1819	1816	}
1820	1817
1821		if(state == TK_STATE_NULL) {
	1818	if (state == TK_STATE_NULL) {
1822	1819	state = Canvas(canvas)->canvas_state;
1823	1820	}
1824	1821	width = polyPtr->outline.width;

1827	1824	fillColor = polyPtr->fillColor;
1828	1825	fillStipple = polyPtr->fillStipple;
1829	1826	if (Canvas(canvas)->currentItemPtr == itemPtr) {
1830		if (polyPtr->outline.activeWidth>width) {
	1827	if (polyPtr->outline.activeWidth > width) {
1831	1828	width = polyPtr->outline.activeWidth;
1832	1829	}
1833		if (polyPtr->outline.activeColor!=NULL) {
	1830	if (polyPtr->outline.activeColor != NULL) {
1834	1831	color = polyPtr->outline.activeColor;
1835	1832	}
1836		if (polyPtr->outline.activeStipple!=None) {
	1833	if (polyPtr->outline.activeStipple != None) {
1837	1834	stipple = polyPtr->outline.activeStipple;
1838	1835	}
1839		if (polyPtr->activeFillColor!=NULL) {
	1836	if (polyPtr->activeFillColor != NULL) {
1840	1837	fillColor = polyPtr->activeFillColor;
1841	1838	}
1842		if (polyPtr->activeFillStipple!=None) {
	1839	if (polyPtr->activeFillStipple != None) {
1843	1840	fillStipple = polyPtr->activeFillStipple;
1844	1841	}
1845		} else if (state==TK_STATE_DISABLED) {
1846		if (polyPtr->outline.disabledWidth>0.0) {
	1842	} else if (state == TK_STATE_DISABLED) {
	1843	if (polyPtr->outline.disabledWidth > 0.0) {
1847	1844	width = polyPtr->outline.disabledWidth;
1848	1845	}
1849		if (polyPtr->outline.disabledColor!=NULL) {
	1846	if (polyPtr->outline.disabledColor != NULL) {
1850	1847	color = polyPtr->outline.disabledColor;
1851	1848	}
1852		if (polyPtr->outline.disabledStipple!=None) {
	1849	if (polyPtr->outline.disabledStipple != None) {
1853	1850	stipple = polyPtr->outline.disabledStipple;
1854	1851	}
1855		if (polyPtr->disabledFillColor!=NULL) {
	1852	if (polyPtr->disabledFillColor != NULL) {
1856	1853	fillColor = polyPtr->disabledFillColor;
1857	1854	}
1858		if (polyPtr->disabledFillStipple!=None) {
	1855	if (polyPtr->disabledFillStipple != None) {
1859	1856	fillStipple = polyPtr->disabledFillStipple;
1860	1857	}
1861	1858	}
1862		if (polyPtr->numPoints==2) {
1863		char string[128];
	1859	if (polyPtr->numPoints == 2) {
1864	1860	if (color == NULL) {
1865	1861	return TCL_OK;
1866	1862	}
1867	1863
1868		sprintf(string, "%.15g %.15g translate %.15g %.15g",
1869		polyPtr->coordPtr[0], Tk_CanvasPsY(canvas, polyPtr->coordPtr[1]),
1870		width/2.0, width/2.0);
1871		Tcl_AppendResult(interp, "matrix currentmatrix\n",string,
1872		" scale 1 0 moveto 0 0 1 0 360 arc\nsetmatrix\n", NULL);
	1864	/*
	1865	* Create a point by using a small circle. (Printer pixels are too
	1866	* tiny to be used directly...)
	1867	*/
	1868
	1869	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
	1870	"matrix currentmatrix\n" /* save state */
	1871	"%.15g %.15g translate " /* go to drawing location */
	1872	"%.15g %.15g scale " /* scale the drawing */
	1873	"1 0 moveto " /* correct for origin */
	1874	"0 0 1 0 360 arc\n" /* make the circle */
	1875	"setmatrix\n", /* restore state */
	1876	polyPtr->coordPtr[0],
	1877	Tk_CanvasPsY(canvas, polyPtr->coordPtr[1]),
	1878	width/2.0, width/2.0));
	1879
	1880	/*
	1881	* Color it in.
	1882	*/
	1883
1873	1884	if (Tk_CanvasPsColor(interp, canvas, color) != TCL_OK) {
1874	1885	return TCL_ERROR;
1875	1886	}

1888	1899	* Fill the area of the polygon.
1889	1900	*/
1890	1901
1891		if (fillColor != NULL && polyPtr->numPoints>3) {
	1902	if (fillColor != NULL && polyPtr->numPoints > 3) {
1892	1903	if (!polyPtr->smooth \|\| !polyPtr->smooth->postscriptProc) {
1893	1904	Tk_CanvasPsPath(interp, canvas, polyPtr->coordPtr,
1894	1905	polyPtr->numPoints);

1932	1943	} else {
1933	1944	style = "0";
1934	1945	}
1935		Tcl_AppendResult(interp, style," setlinejoin 1 setlinecap\n", NULL);
1936		if (Tk_CanvasPsOutline(canvas, itemPtr,
1937		&(polyPtr->outline)) != TCL_OK) {
	1946	Tcl_AppendResult(interp, style, " setlinejoin 1 setlinecap\n", NULL);
	1947	if (Tk_CanvasPsOutline(canvas, itemPtr, &polyPtr->outline) != TCL_OK){
1938	1948	return TCL_ERROR;
1939	1949	}
1940	1950	}

+23

-16

generic/tkCanvPs.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkCanvPs.c,v 1.20 2008/04/27 22:38:55 dkf Exp $
	13	* RCS: @(#) $Id: tkCanvPs.c,v 1.25 2008/12/07 16:34:12 das Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"
17	17	#include "tkCanvas.h"
	18	#include "tkFont.h"
18	19
19	20	/*
20	21	* See tkCanvas.h for key data structures used to implement canvases.

80	81	* pre-pass that collects font information, so
81	82	* the Postscript generated isn't relevant. */
82	83	int prolog; /* Non-zero means output should contain the
83		* file prolog.ps in the header. */
	84	* standard prolog in the header. Generated in
	85	* library/mkpsenc.tcl, stored in the variable
	86	* ::tk::ps_preamable [sic]. */
	87	Tk_Window tkwin; /* Window to get font pixel/point transform
	88	* from. */
84	89	} TkPostscriptInfo;
85	90
86	91	/*

172	177	Tcl_HashSearch search;
173	178	Tcl_HashEntry *hPtr;
174	179	Tcl_DString buffer;
175		char psenccmd[] = "::tk::ensure_psenc_is_loaded";
	180	static const char *psenccmd = "::tk::ensure_psenc_is_loaded";
176	181	int deltaX = 0, deltaY = 0; /* Offset of lower-left corner of area to be
177	182	* marked up, measured in canvas units from
178	183	* the positioning point on the page (reflects

184	189	* process all the arguments to fill the data structure in.
185	190	*/
186	191
187		result = Tcl_EvalEx(interp,psenccmd,-1,TCL_EVAL_GLOBAL);
	192	result = Tcl_EvalEx(interp, psenccmd, -1, TCL_EVAL_GLOBAL);
188	193	if (result != TCL_OK) {
189	194	return result;
190	195	}

212	217	psInfo.chan = NULL;
213	218	psInfo.prepass = 0;
214	219	psInfo.prolog = 1;
	220	psInfo.tkwin = tkwin;
215	221	Tcl_InitHashTable(&psInfo.fontTable, TCL_STRING_KEYS);
216	222	result = Tk_ConfigureWidget(interp, tkwin, configSpecs, argc-2, argv+2,
217	223	(char *) &psInfo, TK_CONFIG_ARGV_ONLY);

382	388	if (itemPtr->typePtr->postscriptProc == NULL) {
383	389	continue;
384	390	}
385		result = (*itemPtr->typePtr->postscriptProc)(interp,
	391	result = itemPtr->typePtr->postscriptProc(interp,
386	392	(Tk_Canvas) canvasPtr, itemPtr, 1);
387	393	Tcl_ResetResult(interp);
388	394	if (result != TCL_OK) {

392	398	* can happen later that don't happen now, so we still have to
393	399	* check for errors later anyway).
394	400	*/
	401
395	402	break;
396	403	}
397	404	}

452	459	* Insert the prolog
453	460	*/
454	461
455		Tcl_AppendResult(interp, Tcl_GetVar(interp,"::tk::ps_preamable",
	462	Tcl_AppendResult(interp, Tcl_GetVar(interp, "::tk::ps_preamable",
456	463	TCL_GLOBAL_ONLY), NULL);
457	464
458	465	if (psInfo.chan != NULL) {

526	533	continue;
527	534	}
528	535	Tcl_AppendResult(interp, "gsave\n", NULL);
529		result = (*itemPtr->typePtr->postscriptProc)(interp,
	536	result = itemPtr->typePtr->postscriptProc(interp,
530	537	(Tk_Canvas) canvasPtr, itemPtr, 0);
531	538	if (result != TCL_OK) {
532	539	char msg[64 + TCL_INTEGER_SPACE];

725	732
726	733	if (Tcl_ListObjGetElements(interp, list, &objc, &objv) != TCL_OK
727	734	\|\| objc != 2
728		\|\| Tcl_GetString(objv[0])[0]=='\0'
	735	\|\| Tcl_GetString(objv[0])[0] == '\0'
729	736	\|\| Tcl_GetDoubleFromObj(interp, objv[1], &size) != TCL_OK
730	737	\|\| size <= 0) {
731	738	Tcl_ResetResult(interp);

735	742	}
736	743
737	744	fontname = Tcl_GetString(objv[0]);
738		sprintf(pointString, "%d", (int)size);
	745	sprintf(pointString, "%d", (int) size);
739	746
740	747	Tcl_AppendResult(interp, "/", fontname, " findfont ",
741	748	pointString, " scalefont ", NULL);

754	761
755	762	Tcl_DStringInit(&ds);
756	763	points = Tk_PostscriptFontName(tkfont, &ds);
757		sprintf(pointString, "%d", points);
	764	sprintf(pointString, "%d", TkFontGetPoints(psInfoPtr->tkwin, points));
758	765	Tcl_AppendResult(interp, "/", Tcl_DStringValue(&ds), " findfont ",
759	766	pointString, " scalefont ", NULL);
760	767	if (strncasecmp(Tcl_DStringValue(&ds), "Symbol", 7) != 0) {

1247	1254	* monochrome screen, use gray or monochrome mode instead.
1248	1255	*/
1249	1256
1250		if (!cdata.color && level == 2) {
	1257	if (!cdata.color && level >= 2) {
1251	1258	level = 1;
1252	1259	}
1253	1260

1264	1271	switch (level) {
1265	1272	case 0: bytesPerLine = (width + 7) / 8; maxWidth = 240000; break;
1266	1273	case 1: bytesPerLine = width; maxWidth = 60000; break;
1267		case 2: bytesPerLine = 3 * width; maxWidth = 20000; break;
	1274	default: bytesPerLine = 3 * width; maxWidth = 20000; break;
1268	1275	}
1269	1276
1270	1277	if (bytesPerLine > 60000) {

1292	1299	sprintf(buffer, "%d %d 8 matrix {\n<", width, rows);
1293	1300	Tcl_AppendResult(interp, buffer, NULL);
1294	1301	break;
1295		case 2:
	1302	default:
1296	1303	sprintf(buffer, "%d %d 8 matrix {\n<", width, rows);
1297	1304	Tcl_AppendResult(interp, buffer, NULL);
1298	1305	break;

1354	1361	}
1355	1362	}
1356	1363	break;
1357		case 2:
	1364	default:
1358	1365	/*
1359	1366	* Finally, color mode. Here, just output the red, green, and
1360	1367	* blue values directly.

1380	1387	switch (level) {
1381	1388	case 0: case 1:
1382	1389	sprintf(buffer, ">\n} image\n"); break;
1383		case 2:
	1390	default:
1384	1391	sprintf(buffer, ">\n} false 3 colorimage\n"); break;
1385	1392	}
1386	1393	Tcl_AppendResult(interp, buffer, NULL);

1579	1586	switch (colorLevel) {
1580	1587	case 0: bytesPerLine = (width + 7) / 8; maxWidth = 240000; break;
1581	1588	case 1: bytesPerLine = width; maxWidth = 60000; break;
1582		case 2: bytesPerLine = 3 * width; maxWidth = 20000; break;
	1589	default: bytesPerLine = 3 * width; maxWidth = 20000; break;
1583	1590	}
1584	1591	if (bytesPerLine > 60000) {
1585	1592	Tcl_ResetResult(interp);

+220

-126

generic/tkCanvText.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkCanvText.c,v 1.29 2008/10/03 15:37:13 dkf Exp $
	11	* RCS: @(#) $Id: tkCanvText.c,v 1.35 2008/11/23 15:08:58 dkf Exp $
12	12	*/
13	13
14	14	#include <stdio.h>

56	56	* means no word-wrap. */
57	57	int underline; /* Index of character to put underline beneath
58	58	* or -1 for no underlining. */
	59	double angle; /* What angle, in degrees, to draw the text
	60	* at. */
59	61
60	62	/*
61	63	* Fields whose values are derived from the current values of the

65	67	int numChars; /* Length of text in characters. */
66	68	int numBytes; /* Length of text in bytes. */
67	69	Tk_TextLayout textLayout; /* Cached text layout information. */
68		int leftEdge; /* Pixel location of the left edge of the text
69		* item; where the left border of the text
70		* layout is drawn. */
71		int rightEdge; /* Pixel just to right of right edge of area
72		* of text item. Used for selecting up to end
73		* of line. */
	70	int actualWidth; /* Width of text as computed. Used to make
	71	* selections of wrapped text display
	72	* right. */
	73	double drawOrigin[2]; /* Where we start drawing from. */
74	74	GC gc; /* Graphics context for drawing text. */
75	75	GC selTextGC; /* Graphics context for selected text. */
76	76	GC cursorOffGC; /* If not None, this gives a graphics context
77	77	* to use to draw the insertion cursor when
78	78	* it's off. Used if the selection and
79	79	* insertion cursor colors are the same. */
	80	double sine; /* Sine of angle field. */
	81	double cosine; /* Cosine of angle field. */
80	82	} TextItem;
81	83
82	84	/*
83	85	* Information used for parsing configuration specs:
84	86	*/
85	87
86		static Tk_CustomOption stateOption = {
87		(Tk_OptionParseProc *) TkStateParseProc,
88		TkStatePrintProc, (ClientData) 2
	88	static const Tk_CustomOption stateOption = {
	89	TkStateParseProc, TkStatePrintProc, (ClientData) 2
89	90	};
90		static Tk_CustomOption tagsOption = {
91		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
92		Tk_CanvasTagsPrintProc, (ClientData) NULL
	91	static const Tk_CustomOption tagsOption = {
	92	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
93	93	};
94		static Tk_CustomOption offsetOption = {
95		(Tk_OptionParseProc *) TkOffsetParseProc,
96		TkOffsetPrintProc, (ClientData) (TK_OFFSET_RELATIVE)
	94	static const Tk_CustomOption offsetOption = {
	95	TkOffsetParseProc, TkOffsetPrintProc, (ClientData) (TK_OFFSET_RELATIVE)
97	96	};
98	97
99	98	static Tk_ConfigSpec configSpecs[] = {

103	102	NULL, Tk_Offset(TextItem, activeStipple), TK_CONFIG_NULL_OK},
104	103	{TK_CONFIG_ANCHOR, "-anchor", NULL, NULL,
105	104	"center", Tk_Offset(TextItem, anchor), TK_CONFIG_DONT_SET_DEFAULT},
	105	{TK_CONFIG_DOUBLE, "-angle", NULL, NULL,
	106	"0.0", Tk_Offset(TextItem, angle), TK_CONFIG_DONT_SET_DEFAULT},
106	107	{TK_CONFIG_COLOR, "-disabledfill", NULL, NULL,
107	108	NULL, Tk_Offset(TextItem, disabledColor), TK_CONFIG_NULL_OK},
108	109	{TK_CONFIG_BITMAP, "-disabledstipple", NULL, NULL,

201	202	TextDeleteChars, /* dTextProc */
202	203	NULL, /* nextPtr */
203	204	};
	205
	206	#define ROUND(d) ((int) floor((d) + 0.5))
204	207
205	208	/*
206	209	*--------------------------------------------------------------

260	263	textPtr->text = NULL;
261	264	textPtr->width = 0;
262	265	textPtr->underline = -1;
	266	textPtr->angle = 0.0;
263	267
264	268	textPtr->numChars = 0;
265	269	textPtr->numBytes = 0;
266	270	textPtr->textLayout = NULL;
267		textPtr->leftEdge = 0;
268		textPtr->rightEdge = 0;
	271	textPtr->actualWidth = 0;
	272	textPtr->drawOrigin[0] = textPtr->drawOrigin[1] = 0.0;
269	273	textPtr->gc = None;
270	274	textPtr->selTextGC = None;
271	275	textPtr->cursorOffGC = None;
	276	textPtr->sine = 0.0;
	277	textPtr->cosine = 1.0;
272	278
273	279	/*
274	280	* Process the arguments to fill in the item record. Only 1 (list) or 2 (x

327	333
328	334	if (objc == 0) {
329	335	Tcl_Obj *obj = Tcl_NewObj();
330
331	336	Tcl_Obj *subobj = Tcl_NewDoubleObj(textPtr->x);
	337
332	338	Tcl_ListObjAppendElement(interp, obj, subobj);
333	339	subobj = Tcl_NewDoubleObj(textPtr->y);
334	340	Tcl_ListObjAppendElement(interp, obj, subobj);
335	341	Tcl_SetObjResult(interp, obj);
336	342	} else if (objc < 3) {
337		if (objc==1) {
	343	if (objc == 1) {
338	344	if (Tcl_ListObjGetElements(interp, objv[0], &objc,
339	345	(Tcl_Obj ***) &objv) != TCL_OK) {
340	346	return TCL_ERROR;
341	347	} else if (objc != 2) {
342		char buf[64 + TCL_INTEGER_SPACE];
343
344		sprintf(buf, "wrong # coordinates: expected 2, got %d", objc);
345		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	348	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
	349	"wrong # coordinates: expected 2, got %d", objc));
346	350	return TCL_ERROR;
347	351	}
348	352	}

354	358	}
355	359	ComputeTextBbox(canvas, textPtr);
356	360	} else {
357		char buf[64 + TCL_INTEGER_SPACE];
358
359		sprintf(buf, "wrong # coordinates: expected 0 or 2, got %d", objc);
360		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	361	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
	362	"wrong # coordinates: expected 0 or 2, got %d", objc));
361	363	return TCL_ERROR;
362	364	}
363	365	return TCL_OK;

421	423	itemPtr->redraw_flags &= ~TK_ITEM_STATE_DEPENDANT;
422	424	}
423	425
424		if(state == TK_STATE_NULL) {
	426	if (state == TK_STATE_NULL) {
425	427	state = Canvas(canvas)->canvas_state;
426	428	}
427	429
428	430	color = textPtr->color;
429	431	stipple = textPtr->stipple;
430	432	if (Canvas(canvas)->currentItemPtr == itemPtr) {
431		if (textPtr->activeColor!=NULL) {
	433	if (textPtr->activeColor != NULL) {
432	434	color = textPtr->activeColor;
433	435	}
434		if (textPtr->activeStipple!=None) {
	436	if (textPtr->activeStipple != None) {
435	437	stipple = textPtr->activeStipple;
436	438	}
437		} else if (state==TK_STATE_DISABLED) {
438		if (textPtr->disabledColor!=NULL) {
	439	} else if (state == TK_STATE_DISABLED) {
	440	if (textPtr->disabledColor != NULL) {
439	441	color = textPtr->disabledColor;
440	442	}
441		if (textPtr->disabledStipple!=None) {
	443	if (textPtr->disabledStipple != None) {
442	444	stipple = textPtr->disabledStipple;
443	445	}
444	446	}

494	496	}
495	497	textPtr->cursorOffGC = newGC;
496	498
497
498	499	/*
499	500	* If the text was changed, move the selection and insertion indices to
500	501	* keep them inside the item.

520	521	textPtr->insertPos = textPtr->numChars;
521	522	}
522	523
	524	/*
	525	* Restrict so that 0.0 <= angle < 360.0, and then recompute the cached
	526	* sine and cosine of the angle. Note that fmod() can produce negative
	527	* results, and we try to avoid negative zero as well.
	528	*/
	529
	530	textPtr->angle = fmod(textPtr->angle, 360.0);
	531	if (textPtr->angle < 0.0) {
	532	textPtr->angle += 360.0;
	533	}
	534	if (textPtr->angle == 0.0) {
	535	textPtr->angle = 0.0;
	536	}
	537	textPtr->sine = sin(textPtr->angle * PI/180.0);
	538	textPtr->cosine = cos(textPtr->angle * PI/180.0);
	539
523	540	ComputeTextBbox(canvas, textPtr);
524	541	return TCL_OK;
525	542	}

610	627	TextItem textPtr) / Item whose bbox is to be recomputed. */
611	628	{
612	629	Tk_CanvasTextInfo *textInfoPtr;
613		int leftX, topY, width, height, fudge;
	630	int leftX, topY, width, height, fudge, i;
614	631	Tk_State state = textPtr->header.state;
615
616		if(state == TK_STATE_NULL) {
	632	double x[4], y[4], dx[4], dy[4], sinA, cosA, tmp;
	633
	634	if (state == TK_STATE_NULL) {
617	635	state = Canvas(canvas)->canvas_state;
618	636	}
619	637

631	649	* bounding box for the text item.
632	650	*/
633	651
634		leftX = (int) floor(textPtr->x + 0.5);
635		topY = (int) floor(textPtr->y + 0.5);
	652	leftX = ROUND(textPtr->x);
	653	topY = ROUND(textPtr->y);
	654	for (i=0 ; i<4 ; i++) {
	655	dx[i] = dy[i] = 0.0;
	656	}
636	657	switch (textPtr->anchor) {
637	658	case TK_ANCHOR_NW:
638	659	case TK_ANCHOR_N:

643	664	case TK_ANCHOR_CENTER:
644	665	case TK_ANCHOR_E:
645	666	topY -= height / 2;
	667	for (i=0 ; i<4 ; i++) {
	668	dy[i] = -height / 2;
	669	}
646	670	break;
647	671
648	672	case TK_ANCHOR_SW:
649	673	case TK_ANCHOR_S:
650	674	case TK_ANCHOR_SE:
651	675	topY -= height;
	676	for (i=0 ; i<4 ; i++) {
	677	dy[i] = -height;
	678	}
652	679	break;
653	680	}
654	681	switch (textPtr->anchor) {

661	688	case TK_ANCHOR_CENTER:
662	689	case TK_ANCHOR_S:
663	690	leftX -= width / 2;
	691	for (i=0 ; i<4 ; i++) {
	692	dx[i] = -width / 2;
	693	}
664	694	break;
665	695
666	696	case TK_ANCHOR_NE:
667	697	case TK_ANCHOR_E:
668	698	case TK_ANCHOR_SE:
669	699	leftX -= width;
	700	for (i=0 ; i<4 ; i++) {
	701	dx[i] = -width;
	702	}
670	703	break;
671	704	}
672	705
673		textPtr->leftEdge = leftX;
674		textPtr->rightEdge = leftX + width;
	706	textPtr->actualWidth = width;
	707
	708	sinA = textPtr->sine;
	709	cosA = textPtr->cosine;
	710	textPtr->drawOrigin[0] = textPtr->x + dx[0]cosA + dy[0]sinA;
	711	textPtr->drawOrigin[1] = textPtr->y + dy[0]cosA - dx[0]sinA;
675	712
676	713	/*
677	714	* Last of all, update the bounding box for the item. The item's bounding

684	721	if (textInfoPtr->selBorderWidth > fudge) {
685	722	fudge = textInfoPtr->selBorderWidth;
686	723	}
687		textPtr->header.x1 = leftX - fudge;
688		textPtr->header.y1 = topY;
689		textPtr->header.x2 = leftX + width + fudge;
690		textPtr->header.y2 = topY + height;
	724
	725	/*
	726	* Apply the rotation before computing the bounding box.
	727	*/
	728
	729	dx[0] -= fudge;
	730	dx[1] += width + fudge;
	731	dx[2] += width + fudge;
	732	dy[2] += height;
	733	dx[3] -= fudge;
	734	dy[3] += height;
	735	for (i=0 ; i<4 ; i++) {
	736	x[i] = textPtr->x + dx[i] * cosA + dy[i] * sinA;
	737	y[i] = textPtr->y + dy[i] * cosA - dx[i] * sinA;
	738	}
	739
	740	/*
	741	* Convert to a rectilinear bounding box.
	742	*/
	743
	744	for (i=1,tmp=x[0] ; i<4 ; i++) {
	745	if (x[i] < tmp) {
	746	tmp = x[i];
	747	}
	748	}
	749	textPtr->header.x1 = ROUND(tmp);
	750	for (i=1,tmp=y[0] ; i<4 ; i++) {
	751	if (y[i] < tmp) {
	752	tmp = y[i];
	753	}
	754	}
	755	textPtr->header.y1 = ROUND(tmp);
	756	for (i=1,tmp=x[0] ; i<4 ; i++) {
	757	if (x[i] > tmp) {
	758	tmp = x[i];
	759	}
	760	}
	761	textPtr->header.x2 = ROUND(tmp);
	762	for (i=1,tmp=y[0] ; i<4 ; i++) {
	763	if (y[i] > tmp) {
	764	tmp = y[i];
	765	}
	766	}
	767	textPtr->header.y2 = ROUND(tmp);
691	768	}
692	769
693	770	/*

727	804	textPtr = (TextItem *) itemPtr;
728	805	textInfoPtr = textPtr->textInfoPtr;
729	806
730		if(state == TK_STATE_NULL) {
	807	if (state == TK_STATE_NULL) {
731	808	state = Canvas(canvas)->canvas_state;
732	809	}
733	810	stipple = textPtr->stipple;
734	811	if (Canvas(canvas)->currentItemPtr == itemPtr) {
735		if (textPtr->activeStipple!=None) {
	812	if (textPtr->activeStipple != None) {
736	813	stipple = textPtr->activeStipple;
737	814	}
738		} else if (state==TK_STATE_DISABLED) {
739		if (textPtr->disabledStipple!=None) {
	815	} else if (state == TK_STATE_DISABLED) {
	816	if (textPtr->disabledStipple != None) {
740	817	stipple = textPtr->disabledStipple;
741	818	}
742	819	}

757	834
758	835	selFirstChar = -1;
759	836	selLastChar = 0; /* lint. */
	837	Tk_CanvasDrawableCoords(canvas, textPtr->drawOrigin[0],
	838	textPtr->drawOrigin[1], &drawableX, &drawableY);
760	839
761	840	if (textInfoPtr->selItemPtr == itemPtr) {
762	841	selFirstChar = textInfoPtr->selectFirst;

787	866	x = xFirst;
788	867	height = hFirst;
789	868	for (y = yFirst ; y <= yLast; y += height) {
	869	int dx1, dy1, dx2, dy2;
	870	double s = textPtr->sine, c = textPtr->cosine;
	871	XPoint points[4];
	872
790	873	if (y == yLast) {
791	874	width = xLast + wLast - x;
792	875	} else {
793		width = textPtr->rightEdge - textPtr->leftEdge - x;
	876	width = textPtr->actualWidth - x;
794	877	}
795		Tk_CanvasDrawableCoords(canvas,
796		(double) (textPtr->leftEdge + x
797		- textInfoPtr->selBorderWidth),
798		(double) (textPtr->header.y1 + y),
799		&drawableX, &drawableY);
800		Tk_Fill3DRectangle(Tk_CanvasTkwin(canvas), drawable,
801		textInfoPtr->selBorder, drawableX, drawableY,
802		width + 2 * textInfoPtr->selBorderWidth,
803		height, textInfoPtr->selBorderWidth, TK_RELIEF_RAISED);
	878	dx1 = x - textInfoPtr->selBorderWidth;
	879	dy1 = y;
	880	dx2 = width + 2 * textInfoPtr->selBorderWidth;
	881	dy2 = height;
	882	points[0].x = (short)(drawableX + dx1c + dy1s);
	883	points[0].y = (short)(drawableY + dy1c - dx1s);
	884	points[1].x = (short)(drawableX + (dx1+dx2)c + dy1s);
	885	points[1].y = (short)(drawableY + dy1c - (dx1+dx2)s);
	886	points[2].x = (short)(drawableX + (dx1+dx2)c + (dy1+dy2)s);
	887	points[2].y = (short)(drawableY + (dy1+dy2)c - (dx1+dx2)s);
	888	points[3].x = (short)(drawableX + dx1c + (dy1+dy2)s);
	889	points[3].y = (short)(drawableY + (dy1+dy2)c - dx1s);
	890	Tk_Fill3DPolygon(Tk_CanvasTkwin(canvas), drawable,
	891	textInfoPtr->selBorder, points, 4,
	892	textInfoPtr->selBorderWidth, TK_RELIEF_RAISED);
804	893	x = 0;
805	894	}
806	895	}

818	907	if ((textInfoPtr->focusItemPtr == itemPtr) && (textInfoPtr->gotFocus)) {
819	908	if (Tk_CharBbox(textPtr->textLayout, textPtr->insertPos,
820	909	&x, &y, NULL, &height)) {
821		Tk_CanvasDrawableCoords(canvas,
822		(double) (textPtr->leftEdge + x
823		- (textInfoPtr->insertWidth / 2)),
824		(double) (textPtr->header.y1 + y),
825		&drawableX, &drawableY);
826		Tk_SetCaretPos(Tk_CanvasTkwin(canvas), drawableX, drawableY,
	910	int dx1, dy1, dx2, dy2;
	911	double s = textPtr->sine, c = textPtr->cosine;
	912	XPoint points[4];
	913
	914	dx1 = x - (textInfoPtr->insertWidth / 2);
	915	dy1 = y;
	916	dx2 = textInfoPtr->insertWidth;
	917	dy2 = height;
	918	points[0].x = (short)(drawableX + dx1c + dy1s);
	919	points[0].y = (short)(drawableY + dy1c - dx1s);
	920	points[1].x = (short)(drawableX + (dx1+dx2)c + dy1s);
	921	points[1].y = (short)(drawableY + dy1c - (dx1+dx2)s);
	922	points[2].x = (short)(drawableX + (dx1+dx2)c + (dy1+dy2)s);
	923	points[2].y = (short)(drawableY + (dy1+dy2)c - (dx1+dx2)s);
	924	points[3].x = (short)(drawableX + dx1c + (dy1+dy2)s);
	925	points[3].y = (short)(drawableY + (dy1+dy2)c - dx1s);
	926
	927	Tk_SetCaretPos(Tk_CanvasTkwin(canvas), points[0].x, points[0].y,
827	928	height);
828	929	if (textInfoPtr->cursorOn) {
829		Tk_Fill3DRectangle(Tk_CanvasTkwin(canvas), drawable,
830		textInfoPtr->insertBorder,
831		drawableX, drawableY,
832		textInfoPtr->insertWidth, height,
	930	Tk_Fill3DPolygon(Tk_CanvasTkwin(canvas), drawable,
	931	textInfoPtr->insertBorder, points, 4,
833	932	textInfoPtr->insertBorderWidth, TK_RELIEF_RAISED);
834	933	} else if (textPtr->cursorOffGC != None) {
835	934	/*

839	938	* where both may be drawn in the same color.
840	939	*/
841	940
842		XFillRectangle(display, drawable, textPtr->cursorOffGC,
843		drawableX, drawableY,
844		(unsigned) textInfoPtr->insertWidth,
845		(unsigned) height);
	941	XFillPolygon(display, drawable, textPtr->cursorOffGC,
	942	points, 4, Convex, CoordModeOrigin);
846	943	}
847	944	}
848	945	}

857	954	* anti-aliasing colors would blend together.
858	955	*/
859	956
860		Tk_CanvasDrawableCoords(canvas, (double) textPtr->leftEdge,
861		(double) textPtr->header.y1, &drawableX, &drawableY);
862
863	957	if ((selFirstChar >= 0) && (textPtr->selTextGC != textPtr->gc)) {
864		Tk_DrawTextLayout(display, drawable, textPtr->gc, textPtr->textLayout,
865		drawableX, drawableY, 0, selFirstChar);
866		Tk_DrawTextLayout(display, drawable, textPtr->selTextGC,
867		textPtr->textLayout, drawableX, drawableY, selFirstChar,
868		selLastChar + 1);
869		Tk_DrawTextLayout(display, drawable, textPtr->gc, textPtr->textLayout,
870		drawableX, drawableY, selLastChar + 1, -1);
	958	TkDrawAngledTextLayout(display, drawable, textPtr->gc,
	959	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
	960	0, selFirstChar);
	961	TkDrawAngledTextLayout(display, drawable, textPtr->selTextGC,
	962	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
	963	selFirstChar, selLastChar + 1);
	964	TkDrawAngledTextLayout(display, drawable, textPtr->gc,
	965	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
	966	selLastChar + 1, -1);
871	967	} else {
872		Tk_DrawTextLayout(display, drawable, textPtr->gc, textPtr->textLayout,
873		drawableX, drawableY, 0, -1);
874		}
875		Tk_UnderlineTextLayout(display, drawable, textPtr->gc, textPtr->textLayout,
876		drawableX, drawableY, textPtr->underline);
	968	TkDrawAngledTextLayout(display, drawable, textPtr->gc,
	969	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
	970	0, -1);
	971	}
	972	TkUnderlineAngledTextLayout(display, drawable, textPtr->gc,
	973	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
	974	textPtr->underline);
877	975
878	976	if (stipple != None) {
879	977	XSetTSOrigin(display, textPtr->gc, 0, 0);

881	979	}
882	980
883	981	/*
884		*--------------------------------------------------------------
	982	*----------------------------------------------------------------------
885	983	*
886	984	* TextInsert --
887	985	*

894	992	* The text in the given item is modified. The cursor and selection
895	993	* positions are also modified to reflect the insertion.
896	994	*
897		*--------------------------------------------------------------
	995	*----------------------------------------------------------------------
898	996	*/
899	997
900	998	static void

926	1024	return;
927	1025	}
928	1026
929		newStr = (char *) ckalloc((unsigned) textPtr->numBytes + byteCount + 1);
	1027	newStr = ckalloc((unsigned) textPtr->numBytes + byteCount + 1);
930	1028	memcpy(newStr, text, (size_t) byteIndex);
931	1029	strcpy(newStr + byteIndex, string);
932	1030	strcpy(newStr + byteIndex + byteCount, text + byteIndex);

1007	1105	byteCount = Tcl_UtfAtIndex(text + byteIndex, charsRemoved)
1008	1106	- (text + byteIndex);
1009	1107
1010		newStr = (char *) ckalloc((unsigned) (textPtr->numBytes + 1 - byteCount));
	1108	newStr = ckalloc((unsigned) (textPtr->numBytes + 1 - byteCount));
1011	1109	memcpy(newStr, text, (size_t) byteIndex);
1012	1110	strcpy(newStr + byteIndex, text + byteIndex + byteCount);
1013	1111

1083	1181	{
1084	1182	TextItem *textPtr;
1085	1183	Tk_State state = itemPtr->state;
1086		double value;
	1184	double value, px, py;
1087	1185
1088	1186	if (state == TK_STATE_NULL) {
1089	1187	state = Canvas(canvas)->canvas_state;
1090	1188	}
1091	1189	textPtr = (TextItem *) itemPtr;
	1190	px = pointPtr[0] - textPtr->drawOrigin[0];
	1191	py = pointPtr[1] - textPtr->drawOrigin[1];
1092	1192	value = (double) Tk_DistanceToTextLayout(textPtr->textLayout,
1093		(int) pointPtr[0] - textPtr->leftEdge,
1094		(int) pointPtr[1] - textPtr->header.y1);
	1193	(int) (pxtextPtr->cosine - pytextPtr->sine),
	1194	(int) (pytextPtr->cosine + pxtextPtr->sine));
1095	1195
1096	1196	if ((state == TK_STATE_HIDDEN) \|\| (textPtr->color == NULL) \|\|
1097	1197	(textPtr->text == NULL) \|\| (*textPtr->text == 0)) {

1135	1235	}
1136	1236
1137	1237	textPtr = (TextItem *) itemPtr;
1138		return Tk_IntersectTextLayout(textPtr->textLayout,
1139		(int) (rectPtr[0] + 0.5) - textPtr->leftEdge,
1140		(int) (rectPtr[1] + 0.5) - textPtr->header.y1,
	1238	return TkIntersectAngledTextLayout(textPtr->textLayout,
	1239	(int) ((rectPtr[0] + 0.5) - textPtr->drawOrigin[0]),
	1240	(int) ((rectPtr[1] + 0.5) - textPtr->drawOrigin[1]),
1141	1241	(int) (rectPtr[2] - rectPtr[0] + 0.5),
1142		(int) (rectPtr[3] - rectPtr[1] + 0.5));
	1242	(int) (rectPtr[3] - rectPtr[1] + 0.5),
	1243	textPtr->angle);
1143	1244	}
1144	1245
1145	1246	/*

1268	1369	*indexPtr = textInfoPtr->selectLast;
1269	1370	} else if (c == '@') {
1270	1371	int x, y;
1271		double tmp;
	1372	double tmp, c = textPtr->cosine, s = textPtr->sine;
1272	1373	char end, p;
1273	1374
1274	1375	p = string+1;

1283	1384	goto badIndex;
1284	1385	}
1285	1386	y = (int) ((tmp < 0) ? tmp - 0.5 : tmp + 0.5);
1286		*indexPtr = Tk_PointToChar(textPtr->textLayout,
1287		x + canvasPtr->scrollX1 - textPtr->leftEdge,
1288		y + canvasPtr->scrollY1 - textPtr->header.y1);
	1387	x += canvasPtr->scrollX1 - (int) textPtr->drawOrigin[0];
	1388	y += canvasPtr->scrollY1 - (int) textPtr->drawOrigin[1];
	1389	*indexPtr = Tk_PointToChar(textPtr->textLayout,
	1390	(int) (xc - ys), (int) (yc + xs));
1289	1391	} else if (Tcl_GetIntFromObj(NULL, obj, indexPtr) == TCL_OK) {
1290		if (*indexPtr < 0){
	1392	if (*indexPtr < 0) {
1291	1393	*indexPtr = 0;
1292	1394	} else if (*indexPtr > textPtr->numChars) {
1293	1395	*indexPtr = textPtr->numChars;

1299	1401	*/
1300	1402
1301	1403	badIndex:
1302		Tcl_SetResult(interp, NULL, TCL_STATIC);
1303		Tcl_AppendResult(interp, "bad index \"", string, "\"", NULL);
	1404	Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad index \"%s\"", string));
1304	1405	return TCL_ERROR;
1305	1406	}
1306	1407	return TCL_OK;

1428	1529	* being created. */
1429	1530	{
1430	1531	TextItem textPtr = (TextItem ) itemPtr;
1431		int x, y;
	1532	double x, y;
1432	1533	Tk_FontMetrics fm;
1433		char *justify;
1434		char buffer[500];
	1534	const char *justify;
1435	1535	XColor *color;
1436	1536	Pixmap stipple;
1437	1537	Tk_State state = itemPtr->state;

1445	1545	textPtr->text == NULL \|\| *textPtr->text == 0) {
1446	1546	return TCL_OK;
1447	1547	} else if (Canvas(canvas)->currentItemPtr == itemPtr) {
1448		if (textPtr->activeColor!=NULL) {
	1548	if (textPtr->activeColor != NULL) {
1449	1549	color = textPtr->activeColor;
1450	1550	}
1451		if (textPtr->activeStipple!=None) {
	1551	if (textPtr->activeStipple != None) {
1452	1552	stipple = textPtr->activeStipple;
1453	1553	}
1454		} else if (state==TK_STATE_DISABLED) {
1455		if (textPtr->disabledColor!=NULL) {
	1554	} else if (state == TK_STATE_DISABLED) {
	1555	if (textPtr->disabledColor != NULL) {
1456	1556	color = textPtr->disabledColor;
1457	1557	}
1458		if (textPtr->disabledStipple!=None) {
	1558	if (textPtr->disabledStipple != None) {
1459	1559	stipple = textPtr->disabledStipple;
1460	1560	}
1461	1561	}

1475	1575	Tcl_AppendResult(interp, "} bind def\n", NULL);
1476	1576	}
1477	1577
1478		sprintf(buffer, "%.15g %.15g [\n", textPtr->x,
1479		Tk_CanvasPsY(canvas, textPtr->y));
1480		Tcl_AppendResult(interp, buffer, NULL);
	1578	Tcl_AppendPrintfToObj(Tcl_GetObjResult(interp), "%.15g %.15g %.15g [\n",
	1579	textPtr->angle, textPtr->x, Tk_CanvasPsY(canvas, textPtr->y));
1481	1580
1482	1581	Tk_TextLayoutToPostscript(interp, textPtr->textLayout);
1483	1582

1500	1599	}
1501	1600
1502	1601	Tk_GetFontMetrics(textPtr->tkfont, &fm);
1503		sprintf(buffer, "] %d ", fm.linespace);
1504		Tcl_AppendResult(interp, buffer, NULL);
1505		Tcl_PrintDouble(NULL, x / -2.0, buffer);
1506		Tcl_AppendResult(interp, buffer, " ", NULL);
1507		Tcl_PrintDouble(NULL, y / 2.0, buffer);
1508		Tcl_AppendResult(interp, buffer, NULL);
1509		sprintf(buffer, " %s %s DrawText\n", justify,
	1602	Tcl_AppendPrintfToObj(Tcl_GetObjResult(interp),
	1603	"] %d %g %g %s %s DrawText\n",
	1604	fm.linespace, x / -2.0, y / 2.0, justify,
1510	1605	((stipple == None) ? "false" : "true"));
1511		Tcl_AppendResult(interp, buffer, NULL);
1512	1606
1513	1607	return TCL_OK;
1514	1608	}

+17

-21

generic/tkCanvUtil.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkCanvUtil.c,v 1.20 2008/04/27 22:38:55 dkf Exp $
	11	* RCS: @(#) $Id: tkCanvUtil.c,v 1.24 2008/11/27 23:47:09 ferrieux Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

26	26	* option. */
27	27	} SmoothAssocData;
28	28
29		Tk_SmoothMethod tkBezierSmoothMethod = {
	29	const Tk_SmoothMethod tkBezierSmoothMethod = {
30	30	"true",
31	31	TkMakeBezierCurve,
32	32	(void () (Tcl_Interp interp, Tk_Canvas canvas, double *coordPtr,
33	33	int numPoints, int numSteps)) TkMakeBezierPostscript,
34	34	};
35		static Tk_SmoothMethod tkRawSmoothMethod = {
	35	static const Tk_SmoothMethod tkRawSmoothMethod = {
36	36	"raw",
37	37	TkMakeRawCurve,
38	38	(void () (Tcl_Interp interp, Tk_Canvas canvas, double *coordPtr,

260	260	* form may be used here). */
261	261	double doublePtr) / Place to store converted coordinate. */
262	262	{
263		if (Tk_GetMMFromObj(Canvas(canvas)->interp, Canvas(canvas)->tkwin, obj,
264		doublePtr) != TCL_OK) {
265		return TCL_ERROR;
266		}
267		doublePtr = Canvas(canvas)->pixelsPerMM;
268		return TCL_OK;
	263	return Tk_GetDoublePixelsFromObj(Canvas(canvas)->interp, Canvas(canvas)->tkwin, obj, doublePtr);
269	264	}
270	265
271	266	/*

456	451	*--------------------------------------------------------------
457	452	*/
458	453
459		char *
	454	const char *
460	455	Tk_CanvasTagsPrintProc(
461	456	ClientData clientData, /* Ignored. */
462	457	Tk_Window tkwin, /* Window containing canvas widget. */

474	469	}
475	470	if (itemPtr->numTags == 1) {
476	471	*freeProcPtr = NULL;
477		return (char *) itemPtr->tagPtr[0];
	472	return (const char *) itemPtr->tagPtr[0];
478	473	}
479	474	*freeProcPtr = TCL_DYNAMIC;
480	475	return Tcl_Merge(itemPtr->numTags, (const char **) itemPtr->tagPtr);

532	527	*--------------------------------------------------------------
533	528	*/
534	529
535		char *
	530	const char *
536	531	TkCanvasDashPrintProc(
537	532	ClientData clientData, /* Ignored. */
538	533	Tk_Window tkwin, /* Window containing canvas widget. */

632	627	void
633	628	Tk_CreateSmoothMethod(
634	629	Tcl_Interp *interp,
635		Tk_SmoothMethod *smooth)
	630	const Tk_SmoothMethod *smooth)
636	631	{
637	632	SmoothAssocData methods, typePtr2, prevPtr, ptr;
638	633	methods = Tcl_GetAssocData(interp, "smoothMethod", NULL);

727	722	char widgRec, / Pointer to record for item. */
728	723	int offset) /* Offset into item. */
729	724	{
730		register Tk_SmoothMethod **smoothPtr =
731		(Tk_SmoothMethod **) (widgRec + offset);
732		Tk_SmoothMethod *smooth = NULL;
	725	register const Tk_SmoothMethod **smoothPtr =
	726	(const Tk_SmoothMethod **) (widgRec + offset);
	727	const Tk_SmoothMethod *smooth = NULL;
733	728	int b;
734	729	size_t length;
735	730	SmoothAssocData *methods;

808	803	*--------------------------------------------------------------
809	804	*/
810	805
811		char *
	806	const char *
812	807	TkSmoothPrintProc(
813	808	ClientData clientData, /* Ignored. */
814	809	Tk_Window tkwin, /* Window containing canvas widget. */

818	813	* information about how to reclaim storage
819	814	* for return string. */
820	815	{
821		register Tk_SmoothMethod **smoothPtr =
822		(Tk_SmoothMethod **) (widgRec + offset);
823
824		return (smoothPtr) ? (smoothPtr)->name : "0";
	816	register const Tk_SmoothMethod *smoothPtr =
	817	* (Tk_SmoothMethod **) (widgRec + offset);
	818
	819	return smoothPtr ? smoothPtr->name : "0";
825	820	}
826	821	/*
827	822	*--------------------------------------------------------------

1802	1797	/*
1803	1798	* The current vertex is to the left of xClip
1804	1799	*/
	1800
1805	1801	if (!inside) {
1806	1802	/*
1807	1803	* If the current vertex is on the left of xClip and one

+5

-7

generic/tkCanvWind.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkCanvWind.c,v 1.17 2008/04/27 22:38:55 dkf Exp $
	11	* RCS: @(#) $Id: tkCanvWind.c,v 1.18 2008/11/09 20:51:28 nijtmans Exp $
12	12	*/
13	13
14	14	#include <stdio.h>

39	39	* Information used for parsing configuration specs:
40	40	*/
41	41
42		static Tk_CustomOption stateOption = {
43		(Tk_OptionParseProc *) TkStateParseProc,
44		TkStatePrintProc, (ClientData) 2
	42	static const Tk_CustomOption stateOption = {
	43	TkStateParseProc, TkStatePrintProc, (ClientData) 2
45	44	};
46		static Tk_CustomOption tagsOption = {
47		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
48		Tk_CanvasTagsPrintProc, (ClientData) NULL
	45	static const Tk_CustomOption tagsOption = {
	46	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
49	47	};
50	48
51	49	static Tk_ConfigSpec configSpecs[] = {

+581

-375

generic/tkCanvas.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkCanvas.c,v 1.51 2008/09/30 23:54:46 dkf Exp $
	14	* RCS: @(#) $Id: tkCanvas.c,v 1.58 2008/12/09 21:22:56 dgp Exp $
15	15	*/
16	16
17	17	/* #define USE_OLD_TAG_SEARCH 1 */

101	101	* Custom option for handling "-state" and "-offset"
102	102	*/
103	103
104		static Tk_CustomOption stateOption = {
105		(Tk_OptionParseProc *) TkStateParseProc,
106		TkStatePrintProc,
	104	static const Tk_CustomOption stateOption = {
	105	TkStateParseProc, TkStatePrintProc,
107	106	(ClientData) NULL /* Only "normal" and "disabled". */
108	107	};
109	108
110		static Tk_CustomOption offsetOption = {
111		(Tk_OptionParseProc *) TkOffsetParseProc,
112		TkOffsetPrintProc,
	109	static const Tk_CustomOption offsetOption = {
	110	TkOffsetParseProc, TkOffsetPrintProc,
113	111	(ClientData) TK_OFFSET_RELATIVE
114	112	};
115	113

267	265	static int CanvasWidgetCmd(ClientData clientData,
268	266	Tcl_Interp *interp, int argc,
269	267	Tcl_Obj const argv);
270		static void CanvasWorldChanged(
271		ClientData instanceData);
	268	static void CanvasWorldChanged(ClientData instanceData);
272	269	static int ConfigureCanvas(Tcl_Interp *interp,
273	270	TkCanvas *canvasPtr, int argc,
274	271	Tcl_Obj const argv, int flags);

276	273	static void DisplayCanvas(ClientData clientData);
277	274	static void DoItem(Tcl_Interp *interp,
278	275	Tk_Item *itemPtr, Tk_Uid tag);
279		static void EventuallyRedrawItem(Tk_Canvas canvas,
	276	static void EventuallyRedrawItem(TkCanvas *canvasPtr,
280	277	Tk_Item *itemPtr);
281	278	#ifdef USE_OLD_TAG_SEARCH
282	279	static int FindItems(Tcl_Interp interp, TkCanvas canvasPtr,

340	337	#define FOR_EVERY_CANVAS_ITEM_MATCHING(objPtr,searchPtrPtr,errorExitClause) \
341	338	for ((itemPtr) = StartTagSearch(canvasPtr, (objPtr), &search); \
342	339	(itemPtr) != NULL; (itemPtr) = NextItem(&search))
	340	#define FIND_ITEMS(objPtr, n) \
	341	FindItems(interp, canvasPtr, objc, objv, (objPtr), (n))
	342	#define RELINK_ITEMS(objPtr, itemPtr) \
	343	RelinkItems(canvasPtr, (objPtr), (itemPtr))
343	344	#else /* USE_OLD_TAG_SEARCH */
344	345	#define FIRST_CANVAS_ITEM_MATCHING(objPtr,searchPtrPtr,errorExitClause) \
345	346	if ((result=TagSearchScan(canvasPtr,(objPtr),(searchPtrPtr))) != TCL_OK){ \

352	353	} \
353	354	for (itemPtr = TagSearchFirst(*(searchPtrPtr)); \
354	355	itemPtr != NULL; itemPtr = TagSearchNext(*(searchPtrPtr)))
	356	#define FIND_ITEMS(objPtr, n) \
	357	FindItems(interp, canvasPtr, objc, objv, (objPtr), (n), &searchPtr)
	358	#define RELINK_ITEMS(objPtr, itemPtr) \
	359	result = RelinkItems(canvasPtr, (objPtr), (itemPtr), &searchPtr)
355	360	#endif /* USE_OLD_TAG_SEARCH */
356
	361
	362	/*
	363	* ----------------------------------------------------------------------
	364	*
	365	* AlwaysRedraw, ItemConfigure, ItemCoords, etc. --
	366	*
	367	* Helper functions that make access to canvas item functions simpler.
	368	* Note that these are all inline functions.
	369	*
	370	* ----------------------------------------------------------------------
	371	*/
	372
	373	static inline int
	374	AlwaysRedraw(
	375	Tk_Item *itemPtr)
	376	{
	377	return itemPtr->typePtr->alwaysRedraw & 1;
	378	}
	379
	380	static inline int
	381	ItemConfigure(
	382	TkCanvas *canvasPtr,
	383	Tk_Item *itemPtr,
	384	int objc,
	385	Tcl_Obj *const objv[])
	386	{
	387	Tcl_Interp *interp = canvasPtr->interp;
	388	int result;
	389
	390	if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
	391	result = itemPtr->typePtr->configProc(interp, (Tk_Canvas) canvasPtr,
	392	itemPtr, objc, objv, TK_CONFIG_ARGV_ONLY);
	393	} else {
	394	const char **args = TkGetStringsFromObjs(objc, objv);
	395
	396	result = itemPtr->typePtr->configProc(interp, (Tk_Canvas) canvasPtr,
	397	itemPtr, objc, (Tcl_Obj **) args, TK_CONFIG_ARGV_ONLY);
	398	if (args != NULL) {
	399	ckfree((char *) args);
	400	}
	401	}
	402	return result;
	403	}
	404
	405	static inline int
	406	ItemConfigInfo(
	407	TkCanvas *canvasPtr,
	408	Tk_Item *itemPtr,
	409	Tcl_Obj *fieldName)
	410	{
	411	return Tk_ConfigureInfo(canvasPtr->interp, canvasPtr->tkwin,
	412	itemPtr->typePtr->configSpecs, (char *) itemPtr,
	413	(fieldName ? Tcl_GetString(fieldName) : NULL), 0);
	414	}
	415
	416	static inline int
	417	ItemConfigValue(
	418	TkCanvas *canvasPtr,
	419	Tk_Item *itemPtr,
	420	Tcl_Obj *fieldName)
	421	{
	422	return Tk_ConfigureValue(canvasPtr->interp, canvasPtr->tkwin,
	423	itemPtr->typePtr->configSpecs, (char *) itemPtr,
	424	Tcl_GetString(fieldName), 0);
	425	}
	426
	427	static inline int
	428	ItemCoords(
	429	TkCanvas *canvasPtr,
	430	Tk_Item *itemPtr,
	431	int objc,
	432	Tcl_Obj *const objv[])
	433	{
	434	Tcl_Interp *interp = canvasPtr->interp;
	435	int result;
	436
	437	if (itemPtr->typePtr->coordProc == NULL) {
	438	result = TCL_OK;
	439	} else if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
	440	result = itemPtr->typePtr->coordProc(interp, (Tk_Canvas) canvasPtr,
	441	itemPtr, objc, objv);
	442	} else {
	443	const char **args = TkGetStringsFromObjs(objc, objv);
	444
	445	result = itemPtr->typePtr->coordProc(interp, (Tk_Canvas) canvasPtr,
	446	itemPtr, objc, (Tcl_Obj **) args);
	447	if (args != NULL) {
	448	ckfree((char *) args);
	449	}
	450	}
	451	return result;
	452	}
	453
	454	static inline int
	455	ItemCreate(
	456	TkCanvas *canvasPtr,
	457	Tk_Item itemPtr, / Warning: incomplete! typePtr field must be
	458	* set by this point. */
	459	int objc,
	460	Tcl_Obj *const objv[])
	461	{
	462	Tcl_Interp *interp = canvasPtr->interp;
	463	int result;
	464
	465	if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
	466	result = itemPtr->typePtr->createProc(interp, (Tk_Canvas) canvasPtr,
	467	itemPtr, objc-3, objv+3);
	468	} else {
	469	const char **args = TkGetStringsFromObjs(objc-3, objv+3);
	470
	471	result = itemPtr->typePtr->createProc(interp, (Tk_Canvas) canvasPtr,
	472	itemPtr, objc-3, (Tcl_Obj **) args);
	473	if (args != NULL) {
	474	ckfree((char *) args);
	475	}
	476	}
	477	return result;
	478	}
	479
	480	static inline void
	481	ItemCursor(
	482	TkCanvas *canvasPtr,
	483	Tk_Item *itemPtr,
	484	int index)
	485	{
	486	itemPtr->typePtr->icursorProc((Tk_Canvas) canvasPtr, itemPtr, index);
	487	}
	488
	489	static inline void
	490	ItemDelChars(
	491	TkCanvas *canvasPtr,
	492	Tk_Item *itemPtr,
	493	int first,
	494	int last)
	495	{
	496	itemPtr->typePtr->dCharsProc((Tk_Canvas) canvasPtr, itemPtr, first, last);
	497	}
	498
	499	static inline void
	500	ItemDelete(
	501	TkCanvas *canvasPtr,
	502	Tk_Item *itemPtr)
	503	{
	504	itemPtr->typePtr->deleteProc((Tk_Canvas) canvasPtr, itemPtr,
	505	canvasPtr->display);
	506	}
	507
	508	static inline void
	509	ItemDisplay(
	510	TkCanvas *canvasPtr,
	511	Tk_Item *itemPtr,
	512	Pixmap pixmap,
	513	int screenX1, int screenY1,
	514	int width, int height)
	515	{
	516	itemPtr->typePtr->displayProc((Tk_Canvas) canvasPtr, itemPtr,
	517	canvasPtr->display, pixmap, screenX1, screenY1, width, height);
	518	}
	519
	520	static inline int
	521	ItemIndex(
	522	TkCanvas *canvasPtr,
	523	Tk_Item *itemPtr,
	524	Tcl_Obj *objPtr,
	525	int *indexPtr)
	526	{
	527	Tcl_Interp *interp = canvasPtr->interp;
	528
	529	if (itemPtr->typePtr->indexProc == NULL) {
	530	return TCL_OK;
	531	} else if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
	532	return itemPtr->typePtr->indexProc(interp, (Tk_Canvas) canvasPtr,
	533	itemPtr, (char *) objPtr, indexPtr);
	534	} else {
	535	return itemPtr->typePtr->indexProc(interp, (Tk_Canvas) canvasPtr,
	536	itemPtr, Tcl_GetString(objPtr), indexPtr);
	537	}
	538	}
	539
	540	static inline void
	541	ItemInsert(
	542	TkCanvas *canvasPtr,
	543	Tk_Item *itemPtr,
	544	int beforeThis,
	545	Tcl_Obj *toInsert)
	546	{
	547	if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
	548	itemPtr->typePtr->insertProc((Tk_Canvas) canvasPtr, itemPtr,
	549	beforeThis, (char *) toInsert);
	550	} else {
	551	itemPtr->typePtr->insertProc((Tk_Canvas) canvasPtr, itemPtr,
	552	beforeThis, Tcl_GetString(toInsert));
	553	}
	554	}
	555
	556	static inline int
	557	ItemOverlap(
	558	TkCanvas *canvasPtr,
	559	Tk_Item *itemPtr,
	560	double rect[])
	561	{
	562	return itemPtr->typePtr->areaProc((Tk_Canvas) canvasPtr, itemPtr, rect);
	563	}
	564
	565	static inline double
	566	ItemPoint(
	567	TkCanvas *canvasPtr,
	568	Tk_Item *itemPtr,
	569	double coords[],
	570	double halo)
	571	{
	572	double dist;
	573
	574	dist = itemPtr->typePtr->pointProc((Tk_Canvas) canvasPtr, itemPtr,
	575	coords) - halo;
	576	return (dist < 0.0) ? 0.0 : dist;
	577	}
	578
	579	static inline void
	580	ItemScale(
	581	TkCanvas *canvasPtr,
	582	Tk_Item *itemPtr,
	583	double xOrigin, double yOrigin,
	584	double xScale, double yScale)
	585	{
	586	itemPtr->typePtr->scaleProc((Tk_Canvas) canvasPtr, itemPtr,
	587	xOrigin, yOrigin, xScale, yScale);
	588	}
	589
	590	static inline int
	591	ItemSelection(
	592	TkCanvas *canvasPtr,
	593	Tk_Item *itemPtr,
	594	int offset,
	595	char *buffer,
	596	int maxBytes)
	597	{
	598	if (itemPtr == NULL \|\| itemPtr->typePtr->selectionProc == NULL) {
	599	return -1;
	600	}
	601
	602	return itemPtr->typePtr->selectionProc((Tk_Canvas) canvasPtr, itemPtr,
	603	offset, buffer, maxBytes);
	604	}
	605
	606	static inline void
	607	ItemTranslate(
	608	TkCanvas *canvasPtr,
	609	Tk_Item *itemPtr,
	610	double xDelta,
	611	double yDelta)
	612	{
	613	itemPtr->typePtr->translateProc((Tk_Canvas) canvasPtr, itemPtr,
	614	xDelta, yDelta);
	615	}
357	616
358	617	/*
359	618	*--------------------------------------------------------------

379	638	int argc, /* Number of arguments. */
380	639	Tcl_Obj const argv[]) / Argument objects. */
381	640	{
382		Tk_Window tkwin = (Tk_Window) clientData;
	641	Tk_Window tkwin = clientData;
383	642	TkCanvas *canvasPtr;
384	643	Tk_Window newWin;
385	644

408	667	canvasPtr->display = Tk_Display(newWin);
409	668	canvasPtr->interp = interp;
410	669	canvasPtr->widgetCmd = Tcl_CreateObjCommand(interp,
411		Tk_PathName(canvasPtr->tkwin), CanvasWidgetCmd,
412		(ClientData) canvasPtr, CanvasCmdDeletedProc);
	670	Tk_PathName(canvasPtr->tkwin), CanvasWidgetCmd, canvasPtr,
	671	CanvasCmdDeletedProc);
413	672	canvasPtr->firstItemPtr = NULL;
414	673	canvasPtr->lastItemPtr = NULL;
415	674	canvasPtr->borderWidth = 0;

482	741	Tcl_InitHashTable(&canvasPtr->idTable, TCL_ONE_WORD_KEYS);
483	742
484	743	Tk_SetClass(canvasPtr->tkwin, "Canvas");
485		Tk_SetClassProcs(canvasPtr->tkwin, &canvasClass, (ClientData) canvasPtr);
	744	Tk_SetClassProcs(canvasPtr->tkwin, &canvasClass, canvasPtr);
486	745	Tk_CreateEventHandler(canvasPtr->tkwin,
487	746	ExposureMask\|StructureNotifyMask\|FocusChangeMask,
488		CanvasEventProc, (ClientData) canvasPtr);
	747	CanvasEventProc, canvasPtr);
489	748	Tk_CreateEventHandler(canvasPtr->tkwin, KeyPressMask\|KeyReleaseMask
490	749	\|ButtonPressMask\|ButtonReleaseMask\|EnterWindowMask
491	750	\|LeaveWindowMask\|PointerMotionMask\|VirtualEventMask,
492		CanvasBindProc, (ClientData) canvasPtr);
	751	CanvasBindProc, canvasPtr);
493	752	Tk_CreateSelHandler(canvasPtr->tkwin, XA_PRIMARY, XA_STRING,
494		CanvasFetchSelection, (ClientData) canvasPtr, XA_STRING);
	753	CanvasFetchSelection, canvasPtr, XA_STRING);
495	754	if (ConfigureCanvas(interp, canvasPtr, argc-2, argv+2, 0) != TCL_OK) {
496	755	goto error;
497	756	}
498	757
499		Tcl_SetResult(interp, Tk_PathName(canvasPtr->tkwin), TCL_STATIC);
	758	Tcl_SetObjResult(interp, TkNewWindowObj(canvasPtr->tkwin));
500	759	return TCL_OK;
501	760
502	761	error:

541	800	#endif /* USE_OLD_TAG_SEARCH */
542	801
543	802	int index;
544		static const char *optionStrings[] = {
	803	static const char *const optionStrings[] = {
545	804	"addtag", "bbox", "bind", "canvasx",
546	805	"canvasy", "cget", "configure", "coords",
547	806	"create", "dchars", "delete", "dtag",
548	807	"find", "focus", "gettags", "icursor",
549		"index", "insert", "itemcget", "itemconfigure",
	808	"imove", "index", "insert", "itemcget",
	809	"itemconfigure",
550	810	"lower", "move", "moveto", "postscript",
551		"raise", "scale", "scan", "select",
552		"type", "xview", "yview",
	811	"raise", "rchars", "scale", "scan",
	812	"select", "type", "xview", "yview",
553	813	NULL
554	814	};
555	815	enum options {

557	817	CANV_CANVASY, CANV_CGET, CANV_CONFIGURE, CANV_COORDS,
558	818	CANV_CREATE, CANV_DCHARS, CANV_DELETE, CANV_DTAG,
559	819	CANV_FIND, CANV_FOCUS, CANV_GETTAGS, CANV_ICURSOR,
560		CANV_INDEX, CANV_INSERT, CANV_ITEMCGET, CANV_ITEMCONFIGURE,
	820	CANV_IMOVE, CANV_INDEX, CANV_INSERT, CANV_ITEMCGET,
	821	CANV_ITEMCONFIGURE,
561	822	CANV_LOWER, CANV_MOVE, CANV_MOVETO, CANV_POSTSCRIPT,
562		CANV_RAISE, CANV_SCALE, CANV_SCAN, CANV_SELECT,
563		CANV_TYPE, CANV_XVIEW, CANV_YVIEW
	823	CANV_RAISE, CANV_RCHARS, CANV_SCALE, CANV_SCAN,
	824	CANV_SELECT, CANV_TYPE, CANV_XVIEW, CANV_YVIEW
564	825	};
565	826
566	827	if (objc < 2) {

571	832	&index) != TCL_OK) {
572	833	return TCL_ERROR;
573	834	}
574		Tcl_Preserve((ClientData) canvasPtr);
	835	Tcl_Preserve(canvasPtr);
575	836
576	837	result = TCL_OK;
577	838	switch ((enum options) index) {

581	842	result = TCL_ERROR;
582	843	goto done;
583	844	}
584		#ifdef USE_OLD_TAG_SEARCH
585		result = FindItems(interp, canvasPtr, objc, objv, objv[2], 3);
586		#else /* USE_OLD_TAG_SEARCH */
587		result = FindItems(interp, canvasPtr, objc, objv, objv[2], 3,
588		&searchPtr);
589		#endif /* USE_OLD_TAG_SEARCH */
	845	result = FIND_ITEMS(objv[2], 3);
590	846	break;
591	847
592	848	case CANV_BBOX: {

630	886	}
631	887	}
632	888	if (gotAny) {
633		char buf[TCL_INTEGER_SPACE * 4];
634
635		sprintf(buf, "%d %d %d %d", x1, y1, x2, y2);
636		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	889	Tcl_Obj *resultObjs[4];
	890
	891	resultObjs[0] = Tcl_NewIntObj(x1);
	892	resultObjs[1] = Tcl_NewIntObj(y1);
	893	resultObjs[2] = Tcl_NewIntObj(x2);
	894	resultObjs[3] = Tcl_NewIntObj(y2);
	895	Tcl_SetObjResult(interp, Tcl_NewListObj(4, resultObjs));
637	896	}
638	897	break;
639	898	}

664	923	}
665	924	entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable, (char *) id);
666	925	if (entryPtr != NULL) {
667		itemPtr = (Tk_Item *) Tcl_GetHashValue(entryPtr);
668		object = (ClientData) itemPtr;
	926	itemPtr = Tcl_GetHashValue(entryPtr);
	927	object = itemPtr;
669	928	}
670	929
671	930	if (object == 0) {

675	934	goto done;
676	935	}
677	936	} else {
678		bindByTag:
679		object = (ClientData) Tk_GetUid(Tcl_GetString(objv[2]));
	937	bindByTag:
	938	object = Tk_GetUid(Tcl_GetString(objv[2]));
680	939	}
681	940	#else /* USE_OLD_TAG_SEARCH */
682	941	result = TagSearchScan(canvasPtr, objv[2], &searchPtr);

689	948	entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable,
690	949	(char *) INT2PTR(searchPtr->id));
691	950	if (entryPtr != NULL) {
692		itemPtr = (Tk_Item *) Tcl_GetHashValue(entryPtr);
693		object = (ClientData) itemPtr;
	951	itemPtr = Tcl_GetHashValue(entryPtr);
	952	object = itemPtr;
694	953	}
695	954
696	955	if (object == 0) {

715	974	if (objc == 5) {
716	975	int append = 0;
717	976	unsigned long mask;
718		char* argv4 = Tcl_GetString(objv[4]);
	977	char *argv4 = Tcl_GetString(objv[4]);
719	978
720	979	if (argv4[0] == 0) {
721	980	result = Tk_DeleteBinding(interp, canvasPtr->bindingTable,

784	1043	command = Tk_GetBinding(interp, canvasPtr->bindingTable,
785	1044	object, Tcl_GetString(objv[3]));
786	1045	if (command == NULL) {
787		const char *string;
788
789		string = Tcl_GetStringResult(interp);
	1046	const char *string = Tcl_GetStringResult(interp);
790	1047
791	1048	/*
792	1049	* Ignore missing binding errors. This is a special hack that

797	1054	if (string[0] != '\0') {
798	1055	result = TCL_ERROR;
799	1056	goto done;
800		} else {
801		Tcl_ResetResult(interp);
802	1057	}
	1058	Tcl_ResetResult(interp);
803	1059	} else {
804		Tcl_SetResult(interp, (char *) command, TCL_STATIC);
	1060	Tcl_SetObjResult(interp, Tcl_NewStringObj(command, -1));
805	1061	}
806	1062	} else {
807	1063	Tk_GetAllBindings(interp, canvasPtr->bindingTable, object);

811	1067	case CANV_CANVASX: {
812	1068	int x;
813	1069	double grid;
814		char buf[TCL_DOUBLE_SPACE];
815	1070
816	1071	if ((objc < 3) \|\| (objc > 4)) {
817	1072	Tcl_WrongNumArgs(interp, 2, objv, "screenx ?gridspacing?");

833	1088	grid = 0.0;
834	1089	}
835	1090	x += canvasPtr->xOrigin;
836		Tcl_PrintDouble(interp, GridAlign((double) x, grid), buf);
837		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	1091	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(GridAlign((double)x,grid)));
838	1092	break;
839	1093	}
840	1094	case CANV_CANVASY: {
841	1095	int y;
842	1096	double grid;
843		char buf[TCL_DOUBLE_SPACE];
844	1097
845	1098	if ((objc < 3) \|\| (objc > 4)) {
846	1099	Tcl_WrongNumArgs(interp, 2, objv, "screeny ?gridspacing?");

862	1115	grid = 0.0;
863	1116	}
864	1117	y += canvasPtr->yOrigin;
865		Tcl_PrintDouble(interp, GridAlign((double) y, grid), buf);
866		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	1118	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(GridAlign((double)y,grid)));
867	1119	break;
868	1120	}
869	1121	case CANV_CGET:

896	1148	FIRST_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done);
897	1149	if (itemPtr != NULL) {
898	1150	if (objc != 3) {
899		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
900		}
901		if (itemPtr->typePtr->coordProc != NULL) {
902		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
903		result = itemPtr->typePtr->coordProc(interp,
904		(Tk_Canvas) canvasPtr, itemPtr, objc-3, objv+3);
905		} else {
906		const char **args = TkGetStringsFromObjs(objc-3, objv+3);
907
908		result = itemPtr->typePtr->coordProc(interp,
909		(Tk_Canvas) canvasPtr, itemPtr, objc-3,
910		(Tcl_Obj **) args);
911		if (args != NULL) {
912		ckfree((char *) args);
913		}
914		}
915		}
	1151	EventuallyRedrawItem(canvasPtr, itemPtr);
	1152	}
	1153	result = ItemCoords(canvasPtr, itemPtr, objc-3, objv+3);
916	1154	if (objc != 3) {
917		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1155	EventuallyRedrawItem(canvasPtr, itemPtr);
918	1156	}
919	1157	}
920	1158	break;
	1159	case CANV_IMOVE: {
	1160	double ignored;
	1161	Tcl_Obj *tmpObj;
	1162
	1163	if (objc != 6) {
	1164	Tcl_WrongNumArgs(interp, 2, objv, "tagOrId index x y");
	1165	result = TCL_ERROR;
	1166	goto done;
	1167	}
	1168	if (Tk_CanvasGetCoordFromObj(interp, (Tk_Canvas) canvasPtr,
	1169	objv[4], &ignored) != TCL_OK
	1170	\|\| Tk_CanvasGetCoordFromObj(interp, (Tk_Canvas) canvasPtr,
	1171	objv[5], &ignored) != TCL_OK) {
	1172	result = TCL_ERROR;
	1173	goto done;
	1174	}
	1175
	1176	/*
	1177	* Make a temporary object here that we can reuse for all the
	1178	* modifications in the loop.
	1179	*/
	1180
	1181	tmpObj = Tcl_NewListObj(2, objv+4);
	1182
	1183	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto doneImove) {
	1184	int index;
	1185	int x1,x2,y1,y2;
	1186
	1187	/*
	1188	* The TK_MOVABLE_POINTS flag should only be set for types that
	1189	* support the same semantics of index, dChars and insert methods
	1190	* as lines and canvases.
	1191	*/
	1192
	1193	if (itemPtr == NULL \|\|
	1194	!(itemPtr->typePtr->alwaysRedraw & TK_MOVABLE_POINTS)) {
	1195	continue;
	1196	}
	1197
	1198	result = ItemIndex(canvasPtr, itemPtr, objv[3], &index);
	1199	if (result != TCL_OK) {
	1200	break;
	1201	}
	1202
	1203	/*
	1204	* Redraw both item's old and new areas: it's possible that a
	1205	* replace could result in a new area larger than the old area.
	1206	* Except if the dCharsProc or insertProc sets the
	1207	* TK_ITEM_DONT_REDRAW flag, nothing more needs to be done.
	1208	*/
	1209
	1210	x1 = itemPtr->x1; y1 = itemPtr->y1;
	1211	x2 = itemPtr->x2; y2 = itemPtr->y2;
	1212	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
	1213
	1214	ItemDelChars(canvasPtr, itemPtr, index, index);
	1215	ItemInsert(canvasPtr, itemPtr, index, tmpObj);
	1216
	1217	if (!(itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW)) {
	1218	Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr,
	1219	x1, y1, x2, y2);
	1220	EventuallyRedrawItem(canvasPtr, itemPtr);
	1221	}
	1222	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
	1223	}
	1224
	1225	doneImove:
	1226	Tcl_DecrRefCount(tmpObj);
	1227	break;
	1228	}
921	1229	case CANV_CREATE: {
922	1230	Tk_ItemType *typePtr;
923	1231	Tk_ItemType *matchPtr = NULL;
924	1232	Tk_Item *itemPtr;
925		char buf[TCL_INTEGER_SPACE];
926	1233	int isNew = 0;
927	1234	Tcl_HashEntry *entryPtr;
928	1235	char *arg;

948	1255	&& (!strncmp(arg, typePtr->name, (unsigned)length))) {
949	1256	if (matchPtr != NULL) {
950	1257	Tcl_MutexUnlock(&typeListMutex);
951		badType:
952		Tcl_AppendResult(interp,
953		"unknown or ambiguous item type \"", arg, "\"",
954		NULL);
955		result = TCL_ERROR;
956		goto done;
	1258	goto badType;
957	1259	}
958	1260	matchPtr = typePtr;
959	1261	}

966	1268
967	1269	Tcl_MutexUnlock(&typeListMutex);
968	1270	if (matchPtr == NULL) {
969		goto badType;
	1271	badType:
	1272	Tcl_AppendResult(interp,
	1273	"unknown or ambiguous item type \"", arg, "\"", NULL);
	1274	result = TCL_ERROR;
	1275	goto done;
970	1276	}
971	1277	if (objc < 4) {
972	1278	/*

977	1283	result = TCL_ERROR;
978	1284	goto done;
979	1285	}
	1286
980	1287	typePtr = matchPtr;
981	1288	itemPtr = (Tk_Item *) ckalloc((unsigned) typePtr->itemSize);
982	1289	itemPtr->id = canvasPtr->nextId;

987	1294	itemPtr->typePtr = typePtr;
988	1295	itemPtr->state = TK_STATE_NULL;
989	1296	itemPtr->redraw_flags = 0;
990		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
991		result = typePtr->createProc(interp, (Tk_Canvas) canvasPtr,
992		itemPtr, objc-3, objv+3);
993		} else {
994		const char **args = TkGetStringsFromObjs(objc-3, objv+3);
995
996		result = typePtr->createProc(interp, (Tk_Canvas) canvasPtr,
997		itemPtr, objc-3, (Tcl_Obj **) args);
998		if (args != NULL) {
999		ckfree((char *) args);
1000		}
1001		}
1002		if (result != TCL_OK) {
	1297
	1298	if (ItemCreate(canvasPtr, itemPtr, objc, objv) != TCL_OK) {
1003	1299	ckfree((char *) itemPtr);
1004	1300	result = TCL_ERROR;
1005	1301	goto done;
1006	1302	}
	1303
1007	1304	itemPtr->nextPtr = NULL;
1008	1305	entryPtr = Tcl_CreateHashEntry(&canvasPtr->idTable,
1009	1306	(char *) INT2PTR(itemPtr->id), &isNew);

1018	1315	}
1019	1316	canvasPtr->lastItemPtr = itemPtr;
1020	1317	itemPtr->redraw_flags \|= FORCE_REDRAW;
1021		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1318	EventuallyRedrawItem(canvasPtr, itemPtr);
1022	1319	canvasPtr->flags \|= REPICK_NEEDED;
1023		sprintf(buf, "%d", itemPtr->id);
1024		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	1320	Tcl_SetObjResult(interp, Tcl_NewIntObj(itemPtr->id));
1025	1321	break;
1026	1322	}
1027	1323	case CANV_DCHARS: {

1038	1334	\|\| (itemPtr->typePtr->dCharsProc == NULL)) {
1039	1335	continue;
1040	1336	}
1041		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1042		result = itemPtr->typePtr->indexProc(interp,
1043		(Tk_Canvas) canvasPtr, itemPtr, (char *) objv[3],
1044		&first);
1045		} else {
1046		result = itemPtr->typePtr->indexProc(interp,
1047		(Tk_Canvas) canvasPtr, itemPtr,
1048		Tcl_GetString(objv[3]), &first);
1049		}
	1337	result = ItemIndex(canvasPtr, itemPtr, objv[3], &first);
1050	1338	if (result != TCL_OK) {
1051	1339	goto done;
1052	1340	}
1053	1341	if (objc == 5) {
1054		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1055		result = itemPtr->typePtr->indexProc(interp,
1056		(Tk_Canvas) canvasPtr, itemPtr, (char *) objv[4],
1057		&last);
1058		} else {
1059		result = itemPtr->typePtr->indexProc(interp,
1060		(Tk_Canvas) canvasPtr, itemPtr,
1061		Tcl_GetString(objv[4]), &last);
1062		}
	1342	result = ItemIndex(canvasPtr, itemPtr, objv[4], &last);
1063	1343	if (result != TCL_OK) {
1064	1344	goto done;
1065	1345	}

1077	1357	x1 = itemPtr->x1; y1 = itemPtr->y1;
1078	1358	x2 = itemPtr->x2; y2 = itemPtr->y2;
1079	1359	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
1080		itemPtr->typePtr->dCharsProc((Tk_Canvas) canvasPtr, itemPtr,
1081		first, last);
	1360	ItemDelChars(canvasPtr, itemPtr, first, last);
1082	1361	if (!(itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW)) {
1083	1362	Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr,
1084	1363	x1, y1, x2, y2);
1085		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1364	EventuallyRedrawItem(canvasPtr, itemPtr);
1086	1365	}
1087	1366	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
1088	1367	}

1094	1373
1095	1374	for (i = 2; i < objc; i++) {
1096	1375	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[i], &searchPtr, goto done) {
1097		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1376	EventuallyRedrawItem(canvasPtr, itemPtr);
1098	1377	if (canvasPtr->bindingTable != NULL) {
1099		Tk_DeleteAllBindings(canvasPtr->bindingTable,
1100		(ClientData) itemPtr);
	1378	Tk_DeleteAllBindings(canvasPtr->bindingTable, itemPtr);
1101	1379	}
1102		itemPtr->typePtr->deleteProc((Tk_Canvas) canvasPtr, itemPtr,
1103		canvasPtr->display);
	1380	ItemDelete(canvasPtr, itemPtr);
1104	1381	if (itemPtr->tagPtr != itemPtr->staticTagSpace) {
1105	1382	ckfree((char *) itemPtr->tagPtr);
1106	1383	}

1175	1452	result = TCL_ERROR;
1176	1453	goto done;
1177	1454	}
1178		#ifdef USE_OLD_TAG_SEARCH
1179		result = FindItems(interp, canvasPtr, objc, objv, NULL, 2);
1180		#else /* USE_OLD_TAG_SEARCH */
1181		result = FindItems(interp, canvasPtr, objc, objv, NULL, 2,
1182		&searchPtr);
1183		#endif /* USE_OLD_TAG_SEARCH */
	1455	result = FIND_ITEMS(NULL, 2);
1184	1456	break;
1185	1457	case CANV_FOCUS:
1186	1458	if (objc > 3) {

1191	1463	itemPtr = canvasPtr->textInfo.focusItemPtr;
1192	1464	if (objc == 2) {
1193	1465	if (itemPtr != NULL) {
1194		char buf[TCL_INTEGER_SPACE];
1195
1196		sprintf(buf, "%d", itemPtr->id);
1197		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	1466	Tcl_SetObjResult(interp, Tcl_NewIntObj(itemPtr->id));
1198	1467	}
1199	1468	goto done;
1200	1469	}
1201		if ((itemPtr != NULL) && (canvasPtr->textInfo.gotFocus)) {
1202		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1470	if (canvasPtr->textInfo.gotFocus) {
	1471	EventuallyRedrawItem(canvasPtr, itemPtr);
1203	1472	}
1204	1473	if (Tcl_GetString(objv[2])[0] == 0) {
1205	1474	canvasPtr->textInfo.focusItemPtr = NULL;

1215	1484	}
1216	1485	canvasPtr->textInfo.focusItemPtr = itemPtr;
1217	1486	if (canvasPtr->textInfo.gotFocus) {
1218		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1487	EventuallyRedrawItem(canvasPtr, itemPtr);
1219	1488	}
1220	1489	break;
1221	1490	case CANV_GETTAGS:

1245	1514	\|\| (itemPtr->typePtr->icursorProc == NULL)) {
1246	1515	goto done;
1247	1516	}
1248		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1249		result = itemPtr->typePtr->indexProc(interp,
1250		(Tk_Canvas) canvasPtr, itemPtr, (char *) objv[3],
1251		&index);
1252		} else {
1253		result = itemPtr->typePtr->indexProc(interp,
1254		(Tk_Canvas) canvasPtr, itemPtr,
1255		Tcl_GetString(objv[3]), &index);
1256		}
	1517	result = ItemIndex(canvasPtr, itemPtr, objv[3], &index);
1257	1518	if (result != TCL_OK) {
1258	1519	goto done;
1259	1520	}
1260		itemPtr->typePtr->icursorProc((Tk_Canvas) canvasPtr, itemPtr,
1261		index);
	1521	ItemCursor(canvasPtr, itemPtr, index);
1262	1522	if ((itemPtr == canvasPtr->textInfo.focusItemPtr)
1263	1523	&& (canvasPtr->textInfo.cursorOn)) {
1264		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1524	EventuallyRedrawItem(canvasPtr, itemPtr);
1265	1525	}
1266	1526	}
1267	1527	break;
1268	1528	}
1269	1529	case CANV_INDEX: {
1270	1530	int index;
1271		char buf[TCL_INTEGER_SPACE];
1272	1531
1273	1532	if (objc != 4) {
1274	1533	Tcl_WrongNumArgs(interp, 2, objv, "tagOrId string");

1286	1545	result = TCL_ERROR;
1287	1546	goto done;
1288	1547	}
1289		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1290		result = itemPtr->typePtr->indexProc(interp, (Tk_Canvas)canvasPtr,
1291		itemPtr, (char *) objv[3], &index);
1292		} else {
1293		result = itemPtr->typePtr->indexProc(interp, (Tk_Canvas)canvasPtr,
1294		itemPtr, Tcl_GetString(objv[3]), &index);
1295		}
	1548	result = ItemIndex(canvasPtr, itemPtr, objv[3], &index);
1296	1549	if (result != TCL_OK) {
1297	1550	goto done;
1298	1551	}
1299		sprintf(buf, "%d", index);
1300		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	1552	Tcl_SetObjResult(interp, Tcl_NewIntObj(index));
1301	1553	break;
1302	1554	}
1303	1555	case CANV_INSERT: {

1314	1566	\|\| (itemPtr->typePtr->insertProc == NULL)) {
1315	1567	continue;
1316	1568	}
1317		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1318		result = itemPtr->typePtr->indexProc(interp,
1319		(Tk_Canvas) canvasPtr, itemPtr, (char *) objv[3],
1320		&beforeThis);
1321		} else {
1322		result = itemPtr->typePtr->indexProc(interp,
1323		(Tk_Canvas) canvasPtr, itemPtr,
1324		Tcl_GetString(objv[3]), &beforeThis);
1325		}
	1569	result = ItemIndex(canvasPtr, itemPtr, objv[3], &beforeThis);
1326	1570	if (result != TCL_OK) {
1327	1571	goto done;
1328	1572	}

1337	1581	x1 = itemPtr->x1; y1 = itemPtr->y1;
1338	1582	x2 = itemPtr->x2; y2 = itemPtr->y2;
1339	1583	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
1340		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1341		itemPtr->typePtr->insertProc((Tk_Canvas) canvasPtr, itemPtr,
1342		beforeThis, (char *) objv[4]);
1343		} else {
1344		itemPtr->typePtr->insertProc((Tk_Canvas) canvasPtr, itemPtr,
1345		beforeThis, Tcl_GetString(objv[4]));
1346		}
	1584	ItemInsert(canvasPtr, itemPtr, beforeThis, objv[4]);
1347	1585	if (!(itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW)) {
1348	1586	Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr,
1349	1587	x1, y1, x2, y2);
1350		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1588	EventuallyRedrawItem(canvasPtr, itemPtr);
1351	1589	}
1352	1590	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
1353	1591	}

1361	1599	}
1362	1600	FIRST_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done);
1363	1601	if (itemPtr != NULL) {
1364		result = Tk_ConfigureValue(canvasPtr->interp, canvasPtr->tkwin,
1365		itemPtr->typePtr->configSpecs, (char *) itemPtr,
1366		Tcl_GetString(objv[3]), 0);
	1602	result = ItemConfigValue(canvasPtr, itemPtr, objv[3]);
1367	1603	}
1368	1604	break;
1369	1605	case CANV_ITEMCONFIGURE:

1374	1610	}
1375	1611	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done) {
1376	1612	if (objc == 3) {
1377		result = Tk_ConfigureInfo(canvasPtr->interp, canvasPtr->tkwin,
1378		itemPtr->typePtr->configSpecs, (char *) itemPtr,
1379		NULL, 0);
	1613	result = ItemConfigInfo(canvasPtr, itemPtr, NULL);
1380	1614	} else if (objc == 4) {
1381		result = Tk_ConfigureInfo(canvasPtr->interp, canvasPtr->tkwin,
1382		itemPtr->typePtr->configSpecs, (char *) itemPtr,
1383		Tcl_GetString(objv[3]), 0);
	1615	result = ItemConfigInfo(canvasPtr, itemPtr, objv[3]);
1384	1616	} else {
1385		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
1386		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1387		result = itemPtr->typePtr->configProc(interp,
1388		(Tk_Canvas) canvasPtr, itemPtr, objc-3, objv+3,
1389		TK_CONFIG_ARGV_ONLY);
1390		} else {
1391		const char **args = TkGetStringsFromObjs(objc-3, objv+3);
1392
1393		result = itemPtr->typePtr->configProc(interp,
1394		(Tk_Canvas) canvasPtr, itemPtr, objc-3,
1395		(Tcl_Obj **) args, TK_CONFIG_ARGV_ONLY);
1396		if (args != NULL) {
1397		ckfree((char *) args);
1398		}
1399		}
1400		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1617	EventuallyRedrawItem(canvasPtr, itemPtr);
	1618	result = ItemConfigure(canvasPtr, itemPtr, objc-3, objv+3);
	1619	EventuallyRedrawItem(canvasPtr, itemPtr);
1401	1620	canvasPtr->flags \|= REPICK_NEEDED;
1402	1621	}
1403	1622	if ((result != TCL_OK) \|\| (objc < 5)) {

1429	1648	}
1430	1649	itemPtr = itemPtr->prevPtr;
1431	1650	}
1432		#ifdef USE_OLD_TAG_SEARCH
1433		RelinkItems(canvasPtr, objv[2], itemPtr);
1434		#else /* USE_OLD_TAG_SEARCH */
1435		result = RelinkItems(canvasPtr, objv[2], itemPtr, &searchPtr);
1436		#endif /* USE_OLD_TAG_SEARCH */
	1651	RELINK_ITEMS(objv[2], itemPtr);
1437	1652	break;
1438	1653	}
1439	1654	case CANV_MOVE: {

1451	1666	goto done;
1452	1667	}
1453	1668	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done) {
1454		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
1455		itemPtr->typePtr->translateProc((Tk_Canvas) canvasPtr, itemPtr,
1456		xAmount, yAmount);
1457		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1669	EventuallyRedrawItem(canvasPtr, itemPtr);
	1670	ItemTranslate(canvasPtr, itemPtr, xAmount, yAmount);
	1671	EventuallyRedrawItem(canvasPtr, itemPtr);
1458	1672	canvasPtr->flags \|= REPICK_NEEDED;
1459	1673	}
1460	1674	break;

1514	1728	*/
1515	1729
1516	1730	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done) {
1517		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
1518		itemPtr->typePtr->translateProc((Tk_Canvas) canvasPtr,
1519		itemPtr, xAmount, yAmount);
1520		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1731	EventuallyRedrawItem(canvasPtr, itemPtr);
	1732	ItemTranslate(canvasPtr, itemPtr, xAmount, yAmount);
	1733	EventuallyRedrawItem(canvasPtr, itemPtr);
1521	1734	canvasPtr->flags \|= REPICK_NEEDED;
1522	1735	}
1523	1736	}

1559	1772	goto done;
1560	1773	}
1561	1774	}
1562		#ifdef USE_OLD_TAG_SEARCH
1563		RelinkItems(canvasPtr, objv[2], prevPtr);
1564		#else /* USE_OLD_TAG_SEARCH */
1565		result = RelinkItems(canvasPtr, objv[2], prevPtr, &searchPtr);
1566		#endif /* USE_OLD_TAG_SEARCH */
	1775	RELINK_ITEMS(objv[2], prevPtr);
	1776	break;
	1777	}
	1778	case CANV_RCHARS: {
	1779	int first, last;
	1780	int x1,x2,y1,y2;
	1781
	1782	if (objc != 6) {
	1783	Tcl_WrongNumArgs(interp, 2, objv, "tagOrId first last string");
	1784	result = TCL_ERROR;
	1785	goto done;
	1786	}
	1787	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done) {
	1788	if ((itemPtr->typePtr->indexProc == NULL)
	1789	\|\| (itemPtr->typePtr->dCharsProc == NULL)
	1790	\|\| (itemPtr->typePtr->insertProc == NULL)) {
	1791	continue;
	1792	}
	1793	result = ItemIndex(canvasPtr, itemPtr, objv[3], &first);
	1794	if (result != TCL_OK) {
	1795	goto done;
	1796	}
	1797	result = ItemIndex(canvasPtr, itemPtr, objv[4], &last);
	1798	if (result != TCL_OK) {
	1799	goto done;
	1800	}
	1801
	1802	/*
	1803	* Redraw both item's old and new areas: it's possible that a
	1804	* replace could result in a new area larger than the old area.
	1805	* Except if the dCharsProc or insertProc sets the
	1806	* TK_ITEM_DONT_REDRAW flag, nothing more needs to be done.
	1807	*/
	1808
	1809	x1 = itemPtr->x1; y1 = itemPtr->y1;
	1810	x2 = itemPtr->x2; y2 = itemPtr->y2;
	1811	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
	1812
	1813	ItemDelChars(canvasPtr, itemPtr, first, last);
	1814	ItemInsert(canvasPtr, itemPtr, first, objv[5]);
	1815
	1816	if (!(itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW)) {
	1817	Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr,
	1818	x1, y1, x2, y2);
	1819	EventuallyRedrawItem(canvasPtr, itemPtr);
	1820	}
	1821	itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
	1822	}
1567	1823	break;
1568	1824	}
1569	1825	case CANV_SCALE: {

1590	1846	goto done;
1591	1847	}
1592	1848	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done) {
1593		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
1594		itemPtr->typePtr->scaleProc((Tk_Canvas) canvasPtr, itemPtr,
1595		xOrigin, yOrigin, xScale, yScale);
1596		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	1849	EventuallyRedrawItem(canvasPtr, itemPtr);
	1850	ItemScale(canvasPtr, itemPtr, xOrigin, yOrigin, xScale, yScale);
	1851	EventuallyRedrawItem(canvasPtr, itemPtr);
1597	1852	canvasPtr->flags \|= REPICK_NEEDED;
1598	1853	}
1599	1854	break;
1600	1855	}
1601	1856	case CANV_SCAN: {
1602	1857	int x, y, gain = 10;
1603		static const char *optionStrings[] = {
	1858	static const char *const optionStrings[] = {
1604	1859	"mark", "dragto", NULL
1605	1860	};
1606	1861

1644	1899	}
1645	1900	case CANV_SELECT: {
1646	1901	int index, optionindex;
1647		static const char *optionStrings[] = {
	1902	static const char *const optionStrings[] = {
1648	1903	"adjust", "clear", "from", "item", "to", NULL
1649	1904	};
1650	1905	enum options {

1672	1927	}
1673	1928	}
1674	1929	if (objc == 5) {
1675		if (itemPtr->typePtr->alwaysRedraw & TK_CONFIG_OBJS) {
1676		result = itemPtr->typePtr->indexProc(interp,
1677		(Tk_Canvas) canvasPtr, itemPtr, (char *) objv[4],
1678		&index);
1679		} else {
1680		result = itemPtr->typePtr->indexProc(interp,
1681		(Tk_Canvas) canvasPtr, itemPtr,
1682		Tcl_GetString(objv[4]), &index);
1683		}
	1930	result = ItemIndex(canvasPtr, itemPtr, objv[4], &index);
1684	1931	if (result != TCL_OK) {
1685	1932	goto done;
1686	1933	}

1711	1958	break;
1712	1959	case CANV_CLEAR:
1713	1960	if (objc != 3) {
1714		Tcl_AppendResult(interp, 3, objv, NULL);
	1961	Tcl_WrongNumArgs(interp, 3, objv, NULL);
1715	1962	result = TCL_ERROR;
1716	1963	goto done;
1717	1964	}
1718		if (canvasPtr->textInfo.selItemPtr != NULL) {
1719		EventuallyRedrawItem((Tk_Canvas) canvasPtr,
1720		canvasPtr->textInfo.selItemPtr);
1721		canvasPtr->textInfo.selItemPtr = NULL;
1722		}
1723		goto done;
	1965	EventuallyRedrawItem(canvasPtr, canvasPtr->textInfo.selItemPtr);
	1966	canvasPtr->textInfo.selItemPtr = NULL;
1724	1967	break;
1725	1968	case CANV_FROM:
1726	1969	if (objc != 5) {

1761	2004	}
1762	2005	FIRST_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done);
1763	2006	if (itemPtr != NULL) {
1764		Tcl_SetResult(interp, itemPtr->typePtr->name, TCL_STATIC);
	2007	Tcl_SetObjResult(interp,
	2008	Tcl_NewStringObj(itemPtr->typePtr->name, -1));
1765	2009	}
1766	2010	break;
1767	2011	case CANV_XVIEW: {

1865	2109	#ifndef USE_OLD_TAG_SEARCH
1866	2110	TagSearchDestroy(searchPtr);
1867	2111	#endif /* not USE_OLD_TAG_SEARCH */
1868		Tcl_Release((ClientData) canvasPtr);
	2112	Tcl_Release(canvasPtr);
1869	2113	return result;
1870	2114	}
1871	2115

1904	2148	for (itemPtr = canvasPtr->firstItemPtr; itemPtr != NULL;
1905	2149	itemPtr = canvasPtr->firstItemPtr) {
1906	2150	canvasPtr->firstItemPtr = itemPtr->nextPtr;
1907		itemPtr->typePtr->deleteProc((Tk_Canvas) canvasPtr, itemPtr,
1908		canvasPtr->display);
	2151	ItemDelete(canvasPtr, itemPtr);
1909	2152	if (itemPtr->tagPtr != itemPtr->staticTagSpace) {
1910	2153	ckfree((char *) itemPtr->tagPtr);
1911	2154	}

2033	2276	if (argc2 != 4) {
2034	2277	Tcl_AppendResult(interp, "bad scrollRegion \"",
2035	2278	canvasPtr->regionString, "\"", NULL);
2036		badRegion:
	2279	badRegion:
2037	2280	ckfree(canvasPtr->regionString);
2038	2281	ckfree((char *) argv2);
2039	2282	canvasPtr->regionString = NULL;

2083	2326	}
2084	2327
2085	2328	/*
2086		*---------------------------------------------------------------------------
	2329	*----------------------------------------------------------------------
2087	2330	*
2088	2331	* CanvasWorldChanged --
2089	2332	*

2099	2342	* side effect of causing all the items to recompute their geometry and
2100	2343	* to be redisplayed.
2101	2344	*
2102		*---------------------------------------------------------------------------
	2345	*----------------------------------------------------------------------
2103	2346	*/
2104	2347
2105	2348	static void
2106	2349	CanvasWorldChanged(
2107	2350	ClientData instanceData) /* Information about widget. */
2108	2351	{
2109		TkCanvas canvasPtr = (TkCanvas ) instanceData;
	2352	TkCanvas *canvasPtr = instanceData;
2110	2353	Tk_Item *itemPtr;
2111		int result;
2112	2354
2113	2355	itemPtr = canvasPtr->firstItemPtr;
2114	2356	for ( ; itemPtr != NULL; itemPtr = itemPtr->nextPtr) {
2115		result = itemPtr->typePtr->configProc(canvasPtr->interp,
2116		(Tk_Canvas) canvasPtr, itemPtr, 0, NULL,
2117		TK_CONFIG_ARGV_ONLY);
2118		if (result != TCL_OK) {
	2357	if (ItemConfigure(canvasPtr, itemPtr, 0, NULL) != TCL_OK) {
2119	2358	Tcl_ResetResult(canvasPtr->interp);
2120	2359	}
2121	2360	}

2127	2366	}
2128	2367
2129	2368	/*
2130		*--------------------------------------------------------------
	2369	*----------------------------------------------------------------------
2131	2370	*
2132	2371	* DisplayCanvas --
2133	2372	*

2141	2380	* Side effects:
2142	2381	* Information appears on the screen.
2143	2382	*
2144		*--------------------------------------------------------------
	2383	*----------------------------------------------------------------------
2145	2384	*/
2146	2385
2147	2386	static void

2168	2407	*/
2169	2408
2170	2409	while (canvasPtr->flags & REPICK_NEEDED) {
2171		Tcl_Preserve((ClientData) canvasPtr);
	2410	Tcl_Preserve(canvasPtr);
2172	2411	canvasPtr->flags &= ~REPICK_NEEDED;
2173	2412	PickCurrentItem(canvasPtr, &canvasPtr->pickEvent);
2174	2413	tkwin = canvasPtr->tkwin;
2175		Tcl_Release((ClientData) canvasPtr);
	2414	Tcl_Release(canvasPtr);
2176	2415	if (tkwin == NULL) {
2177	2416	return;
2178	2417	}

2185	2424	*/
2186	2425
2187	2426	for (itemPtr = canvasPtr->firstItemPtr; itemPtr != NULL;
2188		itemPtr = itemPtr->nextPtr) {
	2427	itemPtr = itemPtr->nextPtr) {
2189	2428	if (itemPtr->redraw_flags & FORCE_REDRAW) {
2190	2429	itemPtr->redraw_flags &= ~FORCE_REDRAW;
2191		EventuallyRedrawItem((Tk_Canvas)canvasPtr, itemPtr);
	2430	EventuallyRedrawItem(canvasPtr, itemPtr);
2192	2431	itemPtr->redraw_flags &= ~FORCE_REDRAW;
2193	2432	}
2194	2433	}
	2434
2195	2435	/*
2196	2436	* Compute the intersection between the area that needs redrawing and the
2197	2437	* area that's visible on the screen.

2289	2529	\|\| (itemPtr->y1 >= screenY2)
2290	2530	\|\| (itemPtr->x2 < screenX1)
2291	2531	\|\| (itemPtr->y2 < screenY1)) {
2292		if (!(itemPtr->typePtr->alwaysRedraw & 1)
	2532	if (!AlwaysRedraw(itemPtr)
2293	2533	\|\| (itemPtr->x1 >= canvasPtr->redrawX2)
2294	2534	\|\| (itemPtr->y1 >= canvasPtr->redrawY2)
2295	2535	\|\| (itemPtr->x2 < canvasPtr->redrawX1)

2298	2538	}
2299	2539	}
2300	2540	if (itemPtr->state == TK_STATE_HIDDEN \|\|
2301		(itemPtr->state == TK_STATE_NULL &&
2302		canvasPtr->canvas_state == TK_STATE_HIDDEN)) {
	2541	(itemPtr->state == TK_STATE_NULL &&
	2542	canvasPtr->canvas_state == TK_STATE_HIDDEN)) {
2303	2543	continue;
2304	2544	}
2305		itemPtr->typePtr->displayProc((Tk_Canvas) canvasPtr, itemPtr,
2306		canvasPtr->display, pixmap, screenX1, screenY1, width,
	2545	ItemDisplay(canvasPtr, itemPtr, pixmap, screenX1, screenY1, width,
2307	2546	height);
2308	2547	}
2309	2548

2367	2606	}
2368	2607
2369	2608	/*
2370		*--------------------------------------------------------------
	2609	*----------------------------------------------------------------------
2371	2610	*
2372	2611	* CanvasEventProc --
2373	2612	*

2378	2617	* None.
2379	2618	*
2380	2619	* Side effects:
2381		* When the window gets deleted, internal structures get cleaned up.
2382		* When it gets exposed, it is redisplayed.
2383		*
2384		*--------------------------------------------------------------
	2620	* When the window gets deleted, internal structures get cleaned up. When
	2621	* it gets exposed, it is redisplayed.
	2622	*
	2623	*----------------------------------------------------------------------
2385	2624	*/
2386	2625
2387	2626	static void

2414	2653	canvasPtr->widgetCmd);
2415	2654	}
2416	2655	if (canvasPtr->flags & REDRAW_PENDING) {
2417		Tcl_CancelIdleCall(DisplayCanvas, (ClientData) canvasPtr);
2418		}
2419		Tcl_EventuallyFree((ClientData) canvasPtr,
2420		(Tcl_FreeProc *) DestroyCanvas);
	2656	Tcl_CancelIdleCall(DisplayCanvas, canvasPtr);
	2657	}
	2658	Tcl_EventuallyFree(canvasPtr, (Tcl_FreeProc *) DestroyCanvas);
2421	2659	} else if (eventPtr->type == ConfigureNotify) {
2422	2660	canvasPtr->flags \|= UPDATE_SCROLLBARS;
2423	2661

2451	2689
2452	2690	for (itemPtr = canvasPtr->firstItemPtr; itemPtr != NULL;
2453	2691	itemPtr = itemPtr->nextPtr) {
2454		if (itemPtr->typePtr->alwaysRedraw & 1) {
2455		itemPtr->typePtr->displayProc((Tk_Canvas) canvasPtr, itemPtr,
2456		canvasPtr->display, None, 0, 0, 0, 0);
	2692	if (AlwaysRedraw(itemPtr)) {
	2693	ItemDisplay(canvasPtr, itemPtr, None, 0, 0, 0, 0);
2457	2694	}
2458	2695	}
2459	2696	}

2498	2735	}
2499	2736
2500	2737	/*
2501		*--------------------------------------------------------------
	2738	*----------------------------------------------------------------------
2502	2739	*
2503	2740	* Tk_CanvasEventuallyRedraw --
2504	2741	*

2511	2748	* Side effects:
2512	2749	* The screen will eventually be refreshed.
2513	2750	*
2514		*--------------------------------------------------------------
	2751	*----------------------------------------------------------------------
2515	2752	*/
2516	2753
2517	2754	void

2560	2797	canvasPtr->flags \|= BBOX_NOT_EMPTY;
2561	2798	}
2562	2799	if (!(canvasPtr->flags & REDRAW_PENDING)) {
2563		Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr);
	2800	Tcl_DoWhenIdle(DisplayCanvas, canvasPtr);
2564	2801	canvasPtr->flags \|= REDRAW_PENDING;
2565	2802	}
2566	2803	}
2567	2804
2568	2805	/*
2569		*--------------------------------------------------------------
	2806	*----------------------------------------------------------------------
2570	2807	*
2571	2808	* EventuallyRedrawItem --
2572	2809	*

2579	2816	* Side effects:
2580	2817	* The screen will eventually be refreshed.
2581	2818	*
2582		*--------------------------------------------------------------
	2819	*----------------------------------------------------------------------
2583	2820	*/
2584	2821
2585	2822	static void
2586	2823	EventuallyRedrawItem(
2587		Tk_Canvas canvas, /* Information about widget. */
2588		Tk_Item itemPtr) / Item to be redrawn. */
2589		{
2590		TkCanvas *canvasPtr = Canvas(canvas);
2591
	2824	TkCanvas canvasPtr, / Information about widget. */
	2825	Tk_Item itemPtr) / Item to be redrawn. May be NULL, in which
	2826	* case nothing happens. */
	2827	{
	2828	if (itemPtr == NULL) {
	2829	return;
	2830	}
2592	2831	if ((itemPtr->x1 >= itemPtr->x2) \|\| (itemPtr->y1 >= itemPtr->y2) \|\|
2593	2832	(itemPtr->x2 < canvasPtr->xOrigin) \|\|
2594	2833	(itemPtr->y2 < canvasPtr->yOrigin) \|\|
2595	2834	(itemPtr->x1 >= canvasPtr->xOrigin+Tk_Width(canvasPtr->tkwin)) \|\|
2596	2835	(itemPtr->y1 >= canvasPtr->yOrigin+Tk_Height(canvasPtr->tkwin))) {
2597		if (!(itemPtr->typePtr->alwaysRedraw & 1)) {
	2836	if (!AlwaysRedraw(itemPtr)) {
2598	2837	return;
2599	2838	}
2600	2839	}

2622	2861	itemPtr->redraw_flags \|= FORCE_REDRAW;
2623	2862	}
2624	2863	if (!(canvasPtr->flags & REDRAW_PENDING)) {
2625		Tcl_DoWhenIdle(DisplayCanvas, (ClientData) canvasPtr);
	2864	Tcl_DoWhenIdle(DisplayCanvas, canvasPtr);
2626	2865	canvasPtr->flags \|= REDRAW_PENDING;
2627	2866	}
2628	2867	}
2629	2868
2630	2869	/*
2631		*--------------------------------------------------------------
	2870	*----------------------------------------------------------------------
2632	2871	*
2633	2872	* Tk_CreateItemType --
2634	2873	*

2644	2883	* commands). If there was already a type with the same name as in
2645	2884	* typePtr, it is replaced with the new type.
2646	2885	*
2647		*--------------------------------------------------------------
	2886	*----------------------------------------------------------------------
2648	2887	*/
2649	2888
2650	2889	void

2784	3023	Tk_Uid uid;
2785	3024	char *tag = Tcl_GetString(tagObj);
2786	3025	int count;
2787		TkWindow *tkwin;
2788		TkDisplay *dispPtr;
2789
2790		tkwin = (TkWindow *) canvasPtr->tkwin;
2791		dispPtr = tkwin->dispPtr;
	3026	TkWindow tkwin = (TkWindow ) canvasPtr->tkwin;
	3027	TkDisplay *dispPtr = tkwin->dispPtr;
2792	3028
2793	3029	/*
2794	3030	* Initialize the search.

2818	3054	dispPtr->numSlowSearches++;
2819	3055	entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable, (char*) id);
2820	3056	if (entryPtr != NULL) {
2821		itemPtr = (Tk_Item *)Tcl_GetHashValue(entryPtr);
	3057	itemPtr = Tcl_GetHashValue(entryPtr);
2822	3058	lastPtr = itemPtr->prevPtr;
2823	3059	} else {
2824	3060	lastPtr = itemPtr = NULL;

3010	3246	TagSearchExprInit(
3011	3247	TagSearchExpr **exprPtrPtr)
3012	3248	{
3013		TagSearchExpr* expr = *exprPtrPtr;
3014
3015		if (! expr) {
	3249	TagSearchExpr expr = exprPtrPtr;
	3250
	3251	if (expr == NULL) {
3016	3252	expr = (TagSearchExpr *) ckalloc(sizeof(TagSearchExpr));
3017	3253	expr->allocated = 0;
3018	3254	expr->uids = NULL;

3042	3278	TagSearchExprDestroy(
3043	3279	TagSearchExpr *expr)
3044	3280	{
3045		if (expr) {
	3281	if (expr != NULL) {
3046	3282	if (expr->uids) {
3047		ckfree((char *)expr->uids);
3048		}
3049		ckfree((char *)expr);
	3283	ckfree((char *) expr->uids);
	3284	}
	3285	ckfree((char *) expr);
3050	3286	}
3051	3287	}
3052	3288

3087	3323	* Initialize the search.
3088	3324	*/
3089	3325
3090		if (*searchPtrPtr) {
	3326	if (*searchPtrPtr != NULL) {
3091	3327	searchPtr = *searchPtrPtr;
3092	3328	} else {
3093	3329	/*

3104	3340	searchPtr->rewritebufferAllocated = 100;
3105	3341	searchPtr->rewritebuffer = ckalloc(searchPtr->rewritebufferAllocated);
3106	3342	}
3107		TagSearchExprInit(&(searchPtr->expr));
	3343	TagSearchExprInit(&searchPtr->expr);
3108	3344
3109	3345	/*
3110	3346	* How long is the tagOrId?

3116	3352	* Make sure there is enough buffer to hold rewritten tags.
3117	3353	*/
3118	3354
3119		if ((unsigned int)searchPtr->stringLength >=
	3355	if ((unsigned) searchPtr->stringLength >=
3120	3356	searchPtr->rewritebufferAllocated) {
3121	3357	searchPtr->rewritebufferAllocated = searchPtr->stringLength + 100;
3122	3358	searchPtr->rewritebuffer =

3248	3484	{
3249	3485	if (searchPtr) {
3250	3486	TagSearchExprDestroy(searchPtr->expr);
3251		ckfree((char *)searchPtr->rewritebuffer);
3252		ckfree((char *)searchPtr);
	3487	ckfree((char *) searchPtr->rewritebuffer);
	3488	ckfree((char *) searchPtr);
3253	3489	}
3254	3490	}
3255	3491

3594	3830	negate_result = 0;
3595	3831	}
3596	3832	looking_for_tag = 0;
3597		} else { /* ! looking_for_tag */
	3833	} else { /* ! looking_for_tag */
3598	3834	if (((uid == searchUids->andUid) && (!result)) \|\|
3599	3835	((uid == searchUids->orUid) && result)) {
3600	3836	/*

3700	3936	entryPtr = Tcl_FindHashEntry(&searchPtr->canvasPtr->idTable,
3701	3937	(char *) INT2PTR(searchPtr->id));
3702	3938	if (entryPtr != NULL) {
3703		itemPtr = (Tk_Item *)Tcl_GetHashValue(entryPtr);
	3939	itemPtr = Tcl_GetHashValue(entryPtr);
3704	3940	lastPtr = itemPtr->prevPtr;
3705	3941	} else {
3706	3942	lastPtr = itemPtr = NULL;

3923	4159
3924	4160	itemPtr->tagSpace += 5;
3925	4161	newTagPtr = (Tk_Uid *)
3926		ckalloc((unsigned) (itemPtr->tagSpace * sizeof(Tk_Uid)));
	4162	ckalloc((unsigned) itemPtr->tagSpace * sizeof(Tk_Uid));
3927	4163	memcpy((void *) newTagPtr, itemPtr->tagPtr,
3928	4164	itemPtr->numTags * sizeof(Tk_Uid));
3929	4165	if (itemPtr->tagPtr != itemPtr->staticTagSpace) {

3991	4227	Tk_Item *itemPtr;
3992	4228	Tk_Uid uid;
3993	4229	int index, result;
3994		static const char *optionStrings[] = {
	4230	static const char *const optionStrings[] = {
3995	4231	"above", "all", "below", "closest",
3996	4232	"enclosed", "overlapping", "withtag", NULL
3997	4233	};

4111	4347	if (itemPtr == NULL) {
4112	4348	return TCL_OK;
4113	4349	}
4114		closestDist = itemPtr->typePtr->pointProc((Tk_Canvas) canvasPtr,
4115		itemPtr, coords) - halo;
4116		if (closestDist < 0.0) {
4117		closestDist = 0.0;
4118		}
	4350	closestDist = ItemPoint(canvasPtr, itemPtr, coords, halo);
4119	4351	while (1) {
4120	4352	double newDist;
4121	4353

4154	4386	\|\| (itemPtr->y1 >= y2) \|\| (itemPtr->y2 <= y1)) {
4155	4387	continue;
4156	4388	}
4157		newDist = itemPtr->typePtr->pointProc((Tk_Canvas) canvasPtr,
4158		itemPtr, coords) - halo;
4159		if (newDist < 0.0) {
4160		newDist = 0.0;
4161		}
	4389	newDist = ItemPoint(canvasPtr, itemPtr, coords, halo);
4162	4390	if (newDist <= closestDist) {
4163	4391	closestDist = newDist;
4164	4392	break;

4270	4498	\|\| (itemPtr->y1 >= y2) \|\| (itemPtr->y2 <= y1)) {
4271	4499	continue;
4272	4500	}
4273		if (itemPtr->typePtr->areaProc((Tk_Canvas) canvasPtr, itemPtr, rect)
4274		>= enclosed) {
	4501	if (ItemOverlap(canvasPtr, itemPtr, rect) >= enclosed) {
4275	4502	DoItem(interp, itemPtr, uid);
4276	4503	}
4277	4504	}

4363	4590	lastMovePtr->nextPtr = itemPtr;
4364	4591	}
4365	4592	lastMovePtr = itemPtr;
4366		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	4593	EventuallyRedrawItem(canvasPtr, itemPtr);
4367	4594	canvasPtr->flags \|= REPICK_NEEDED;
4368	4595	}
4369	4596

4427	4654	XEvent eventPtr) / Pointer to X event that just happened. */
4428	4655	{
4429	4656	TkCanvas *canvasPtr = clientData;
	4657	int mask;
4430	4658
4431	4659	Tcl_Preserve(canvasPtr);
4432	4660

4436	4664	* current item while buttons are down.
4437	4665	*/
4438	4666
4439		if (eventPtr->type == ButtonPress \|\| eventPtr->type == ButtonRelease) {
4440		int mask;
4441
	4667	switch (eventPtr->type) {
	4668	case ButtonPress:
	4669	case ButtonRelease:
4442	4670	switch (eventPtr->xbutton.button) {
4443	4671	case Button1:
4444	4672	mask = Button1Mask;

4492	4720	PickCurrentItem(canvasPtr, eventPtr);
4493	4721	eventPtr->xbutton.state ^= mask;
4494	4722	}
4495		goto done;
4496		} else if ((eventPtr->type == EnterNotify)
4497		\|\| (eventPtr->type == LeaveNotify)) {
	4723	break;
	4724	case EnterNotify:
	4725	case LeaveNotify:
4498	4726	canvasPtr->state = eventPtr->xcrossing.state;
4499	4727	PickCurrentItem(canvasPtr, eventPtr);
4500		goto done;
4501		} else if (eventPtr->type == MotionNotify) {
	4728	break;
	4729	case MotionNotify:
4502	4730	canvasPtr->state = eventPtr->xmotion.state;
4503	4731	PickCurrentItem(canvasPtr, eventPtr);
4504		}
4505		CanvasDoEvent(canvasPtr, eventPtr);
4506
4507		done:
	4732	/* fallthrough */
	4733	default:
	4734	CanvasDoEvent(canvasPtr, eventPtr);
	4735	}
	4736
4508	4737	Tcl_Release(canvasPtr);
4509	4738	}
4510	4739

4702	4931	canvasPtr->currentItemPtr = canvasPtr->newCurrentPtr;
4703	4932	if (prevItemPtr != NULL && prevItemPtr != canvasPtr->currentItemPtr &&
4704	4933	(prevItemPtr->redraw_flags & TK_ITEM_STATE_DEPENDANT)) {
4705		EventuallyRedrawItem((Tk_Canvas) canvasPtr, prevItemPtr);
4706		prevItemPtr->typePtr->configProc(canvasPtr->interp,
4707		(Tk_Canvas) canvasPtr, prevItemPtr, 0, NULL,
4708		TK_CONFIG_ARGV_ONLY);
	4934	EventuallyRedrawItem(canvasPtr, prevItemPtr);
	4935	ItemConfigure(canvasPtr, prevItemPtr, 0, NULL);
4709	4936	}
4710	4937	if (canvasPtr->currentItemPtr != NULL) {
4711	4938	XEvent event;

4714	4941	DoItem(NULL, canvasPtr->currentItemPtr, Tk_GetUid("current"));
4715	4942	#else /* USE_OLD_TAG_SEARCH */
4716	4943	DoItem(NULL, canvasPtr->currentItemPtr, searchUids->currentUid);
4717		#endif /* USE_OLD_TAG_SEA */
	4944	#endif /* USE_OLD_TAG_SEARCH */
4718	4945	if ((canvasPtr->currentItemPtr->redraw_flags & TK_ITEM_STATE_DEPENDANT
4719	4946	&& prevItemPtr != canvasPtr->currentItemPtr)) {
4720		canvasPtr->currentItemPtr->typePtr->configProc(canvasPtr->interp,
4721		(Tk_Canvas) canvasPtr, canvasPtr->currentItemPtr, 0, NULL,
4722		TK_CONFIG_ARGV_ONLY);
4723		EventuallyRedrawItem((Tk_Canvas) canvasPtr,
4724		canvasPtr->currentItemPtr);
	4947	ItemConfigure(canvasPtr, canvasPtr->currentItemPtr, 0, NULL);
	4948	EventuallyRedrawItem(canvasPtr, canvasPtr->currentItemPtr);
4725	4949	}
4726	4950	event = canvasPtr->pickEvent;
4727	4951	event.type = EnterNotify;

4778	5002	\|\| (itemPtr->y1 > y2) \|\| (itemPtr->y2 < y1)) {
4779	5003	continue;
4780	5004	}
4781		if (itemPtr->typePtr->pointProc((Tk_Canvas) canvasPtr, itemPtr,
4782		coords) <= canvasPtr->closeEnough) {
	5005	if (ItemPoint(canvasPtr,itemPtr,coords,0) <= canvasPtr->closeEnough) {
4783	5006	bestPtr = itemPtr;
4784	5007	}
4785	5008	}

4954	5177	canvasPtr->insertBlinkHandler = Tcl_CreateTimerHandler(
4955	5178	canvasPtr->insertOnTime, CanvasBlinkProc, canvasPtr);
4956	5179	}
4957		if (canvasPtr->textInfo.focusItemPtr != NULL) {
4958		EventuallyRedrawItem((Tk_Canvas) canvasPtr,
4959		canvasPtr->textInfo.focusItemPtr);
4960		}
	5180	EventuallyRedrawItem(canvasPtr, canvasPtr->textInfo.focusItemPtr);
4961	5181	}
4962	5182
4963	5183	/*

4997	5217	canvasPtr->textInfo.cursorOn = 0;
4998	5218	canvasPtr->insertBlinkHandler = (Tcl_TimerToken) NULL;
4999	5219	}
5000		if (canvasPtr->textInfo.focusItemPtr != NULL) {
5001		EventuallyRedrawItem((Tk_Canvas) canvasPtr,
5002		canvasPtr->textInfo.focusItemPtr);
5003		}
	5220	EventuallyRedrawItem(canvasPtr, canvasPtr->textInfo.focusItemPtr);
5004	5221	if (canvasPtr->highlightWidth > 0) {
5005	5222	canvasPtr->flags \|= REDRAW_BORDERS;
5006	5223	if (!(canvasPtr->flags & REDRAW_PENDING)) {

5049	5266	Tk_OwnSelection(canvasPtr->tkwin, XA_PRIMARY, CanvasLostSelection,
5050	5267	canvasPtr);
5051	5268	} else if (canvasPtr->textInfo.selItemPtr != itemPtr) {
5052		EventuallyRedrawItem((Tk_Canvas) canvasPtr,
5053		canvasPtr->textInfo.selItemPtr);
	5269	EventuallyRedrawItem(canvasPtr, canvasPtr->textInfo.selItemPtr);
5054	5270	}
5055	5271	canvasPtr->textInfo.selItemPtr = itemPtr;
5056	5272

5068	5284	if ((canvasPtr->textInfo.selectFirst != oldFirst)
5069	5285	\|\| (canvasPtr->textInfo.selectLast != oldLast)
5070	5286	\|\| (itemPtr != oldSelPtr)) {
5071		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
	5287	EventuallyRedrawItem(canvasPtr, itemPtr);
5072	5288	}
5073	5289	}
5074	5290

5105	5321	{
5106	5322	TkCanvas *canvasPtr = clientData;
5107	5323
5108		if (canvasPtr->textInfo.selItemPtr == NULL) {
5109		return -1;
5110		}
5111		if (canvasPtr->textInfo.selItemPtr->typePtr->selectionProc == NULL) {
5112		return -1;
5113		}
5114		return canvasPtr->textInfo.selItemPtr->typePtr->selectionProc(
5115		(Tk_Canvas) canvasPtr, canvasPtr->textInfo.selItemPtr, offset,
	5324	return ItemSelection(canvasPtr, canvasPtr->textInfo.selItemPtr, offset,
5116	5325	buffer, maxBytes);
5117	5326	}
5118	5327

5140	5349	{
5141	5350	TkCanvas *canvasPtr = clientData;
5142	5351
5143		if (canvasPtr->textInfo.selItemPtr != NULL) {
5144		EventuallyRedrawItem((Tk_Canvas) canvasPtr,
5145		canvasPtr->textInfo.selItemPtr);
5146		}
	5352	EventuallyRedrawItem(canvasPtr, canvasPtr->textInfo.selItemPtr);
5147	5353	canvasPtr->textInfo.selItemPtr = NULL;
5148	5354	}
5149	5355

5294	5500	NULL);
5295	5501	Tcl_DecrRefCount(fractions);
5296	5502	if (result != TCL_OK) {
5297		Tcl_BackgroundError(interp);
	5503	Tcl_BackgroundException(interp, result);
5298	5504	}
5299	5505	Tcl_ResetResult(interp);
5300	5506	Tcl_Release(xScrollCmd);

5308	5514	NULL);
5309	5515	Tcl_DecrRefCount(fractions);
5310	5516	if (result != TCL_OK) {
5311		Tcl_BackgroundError(interp);
	5517	Tcl_BackgroundException(interp, result);
5312	5518	}
5313	5519	Tcl_ResetResult(interp);
5314	5520	Tcl_Release(yScrollCmd);

+7

-7

generic/tkClipboard.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkClipboard.c,v 1.20 2008/07/23 23:24:23 nijtmans Exp $
	13	* RCS: @(#) $Id: tkClipboard.c,v 1.22 2008/10/28 22:33:06 nijtmans Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

28	28	int offset, char *buffer, int maxBytes);
29	29	static void ClipboardLostSel(ClientData clientData);
30	30	static int ClipboardGetProc(ClientData clientData,
31		Tcl_Interp interp, char portion);
	31	Tcl_Interp interp, const char portion);
32	32
33	33	/*
34	34	*----------------------------------------------------------------------

424	424	Tk_Window tkwin = (Tk_Window) clientData;
425	425	char *path = NULL;
426	426	Atom selection;
427		static const char *optionStrings[] = { "append", "clear", "get", NULL };
	427	static const char *const optionStrings[] = { "append", "clear", "get", NULL };
428	428	enum options { CLIPBOARD_APPEND, CLIPBOARD_CLEAR, CLIPBOARD_GET };
429	429	int index, i;
430	430

444	444	char *targetName = NULL;
445	445	char *formatName = NULL;
446	446	char *string;
447		static const char *appendOptionStrings[] = {
	447	static const char *const appendOptionStrings[] = {
448	448	"-displayof", "-format", "-type", NULL
449	449	};
450	450	enum appendOptions { APPEND_DISPLAYOF, APPEND_FORMAT, APPEND_TYPE };

515	515	Tcl_GetString(objv[i]));
516	516	}
517	517	case CLIPBOARD_CLEAR: {
518		static const char *clearOptionStrings[] = { "-displayof", NULL };
	518	static const char *const clearOptionStrings[] = { "-displayof", NULL };
519	519	enum clearOptions { CLEAR_DISPLAYOF };
520	520	int subIndex;
521	521

547	547	Tcl_DString selBytes;
548	548	int result;
549	549	char *string;
550		static const char *getOptionStrings[] = {
	550	static const char *const getOptionStrings[] = {
551	551	"-displayof", "-type", NULL
552	552	};
553	553	enum getOptions { APPEND_DISPLAYOF, APPEND_TYPE };

703	703	* selection. */
704	704	Tcl_Interp interp, / Interpreter used for error reporting (not
705	705	* used). */
706		char portion) / New information to be appended. */
	706	const char portion) / New information to be appended. */
707	707	{
708	708	Tcl_DStringAppend((Tcl_DString *) clientData, portion, -1);
709	709	return TCL_OK;

+352

-275

generic/tkCmds.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkCmds.c,v 1.44 2008/10/05 21:25:07 dkf Exp $
	13	* RCS: @(#) $Id: tkCmds.c,v 1.49 2008/12/10 05:02:40 das Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

35	35	XEvent *eventPtr);
36	36	static void WaitWindowProc(ClientData clientData,
37	37	XEvent *eventPtr);
	38	static int AppnameCmd(ClientData dummy, Tcl_Interp *interp,
	39	int objc, Tcl_Obj const objv);
	40	static int CaretCmd(ClientData dummy, Tcl_Interp *interp,
	41	int objc, Tcl_Obj const objv);
	42	static int InactiveCmd(ClientData dummy, Tcl_Interp *interp,
	43	int objc, Tcl_Obj const objv);
	44	static int ScalingCmd(ClientData dummy, Tcl_Interp *interp,
	45	int objc, Tcl_Obj const objv);
	46	static int UseinputmethodsCmd(ClientData dummy,
	47	Tcl_Interp *interp, int objc,
	48	Tcl_Obj const objv);
	49	static int WindowingsystemCmd(ClientData dummy,
	50	Tcl_Interp *interp, int objc,
	51	Tcl_Obj const objv);
	52
	53	#if defined(__WIN32__) \|\| defined(MAC_OSX_TK)
	54	MODULE_SCOPE const TkEnsemble tkFontchooserEnsemble[];
	55	#else
	56	#define tkFontchooserEnsemble NULL
	57	#endif
	58
	59	/*
	60	* Table of tk subcommand names and implementations.
	61	*/
	62
	63	static const TkEnsemble tkCmdMap[] = {
	64	{"appname", AppnameCmd },
	65	{"busy", Tk_BusyObjCmd },
	66	{"caret", CaretCmd },
	67	{"inactive", InactiveCmd },
	68	{"scaling", ScalingCmd },
	69	{"useinputmethods", UseinputmethodsCmd },
	70	{"windowingsystem", WindowingsystemCmd },
	71	{"fontchooser", NULL, tkFontchooserEnsemble},
	72	{NULL}
	73	};
38	74
39	75	/*
40	76	*----------------------------------------------------------------------

60	96	int objc, /* Number of arguments. */
61	97	Tcl_Obj const objv[]) / Argument objects. */
62	98	{
63		static const char *bellOptions[] = {
	99	static const char *const bellOptions[] = {
64	100	"-displayof", "-nice", NULL
65	101	};
66	102	enum options { TK_BELL_DISPLAYOF, TK_BELL_NICE };

586	622	}
587	623
588	624	/*
589		*----------------------------------------------------------------------
590		*
591		* Tk_TkObjCmd --
592		*
593		* This function is invoked to process the "tk" Tcl command. See the user
594		* documentation for details on what it does.
	625	* ----------------------------------------------------------------------
	626	*
	627	* TkInitTkCmd --
	628	*
	629	* Set up the tk ensemble.
595	630	*
596	631	* Results:
597	632	* A standard Tcl result.
598	633	*
599	634	* Side effects:
	635	* None.
	636	*
	637	* ----------------------------------------------------------------------
	638	*/
	639
	640	int
	641	TkInitTkCmd(Tcl_Interp *interp, ClientData clientData)
	642	{
	643	TkMakeEnsemble(interp, "::", "tk", clientData, tkCmdMap);
	644	#if defined(__WIN32__) \|\| defined(MAC_OSX_TK)
	645	TkInitFontchooser(interp, clientData);
	646	#endif
	647	return TCL_OK;
	648	}
	649
	650	/*
	651	*----------------------------------------------------------------------
	652	*
	653	* AppnameCmd, CaretCmd, ScalingCmd, UseinputmethodsCmd,
	654	* WindowingsystemCmd, InactiveCmd --
	655	*
	656	* These functions are invoked to process the "tk" ensemble subcommands.
	657	* See the user documentation for details on what they do.
	658	*
	659	* Results:
	660	* A standard Tcl result.
	661	*
	662	* Side effects:
600	663	* See the user documentation.
601	664	*
602	665	*----------------------------------------------------------------------
603	666	*/
604	667
605	668	int
606		Tk_TkObjCmd(
	669	AppnameCmd(
607	670	ClientData clientData, /* Main window associated with interpreter. */
608	671	Tcl_Interp interp, / Current interpreter. */
609	672	int objc, /* Number of arguments. */
610	673	Tcl_Obj const objv[]) / Argument objects. */
611	674	{
	675	Tk_Window tkwin = clientData;
	676	TkWindow *winPtr;
	677	char *string;
	678
	679	if (Tcl_IsSafe(interp)) {
	680	Tcl_SetResult(interp,
	681	"appname not accessible in a safe interpreter",
	682	TCL_STATIC);
	683	return TCL_ERROR;
	684	}
	685
	686	winPtr = (TkWindow *) tkwin;
	687
	688	if (objc > 2) {
	689	Tcl_WrongNumArgs(interp, 1, objv, "?newName?");
	690	return TCL_ERROR;
	691	}
	692	if (objc == 2) {
	693	string = Tcl_GetString(objv[1]);
	694	winPtr->nameUid = Tk_GetUid(Tk_SetAppName(tkwin, string));
	695	}
	696	Tcl_AppendResult(interp, winPtr->nameUid, NULL);
	697	return TCL_OK;
	698	}
	699
	700	int
	701	CaretCmd(
	702	ClientData clientData, /* Main window associated with interpreter. */
	703	Tcl_Interp interp, / Current interpreter. */
	704	int objc, /* Number of arguments. */
	705	Tcl_Obj const objv[]) / Argument objects. */
	706	{
	707	Tk_Window tkwin = clientData;
612	708	int index;
613		Tk_Window tkwin;
614		static const char *optionStrings[] = {
615		"appname", "caret", "scaling", "useinputmethods",
616		"windowingsystem", "inactive", NULL
	709	Tcl_Obj *objPtr;
	710	TkCaret *caretPtr;
	711	Tk_Window window;
	712	static const char *const caretStrings[] = {
	713	"-x", "-y", "-height", NULL
617	714	};
618		enum options {
619		TK_APPNAME, TK_CARET, TK_SCALING, TK_USE_IM,
620		TK_WINDOWINGSYSTEM, TK_INACTIVE
	715	enum caretOptions {
	716	TK_CARET_X, TK_CARET_Y, TK_CARET_HEIGHT
621	717	};
622	718
623		tkwin = (Tk_Window) clientData;
624
625		if (objc < 2) {
626		Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?");
627		return TCL_ERROR;
628		}
629		if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
630		&index) != TCL_OK) {
631		return TCL_ERROR;
632		}
633
634		switch ((enum options) index) {
635		case TK_APPNAME: {
636		TkWindow *winPtr;
637		char *string;
638
639		if (Tcl_IsSafe(interp)) {
640		Tcl_SetResult(interp,
641		"appname not accessible in a safe interpreter",
642		TCL_STATIC);
643		return TCL_ERROR;
644		}
645
646		winPtr = (TkWindow *) tkwin;
647
648		if (objc > 3) {
649		Tcl_WrongNumArgs(interp, 2, objv, "?newName?");
650		return TCL_ERROR;
651		}
652		if (objc == 3) {
653		string = Tcl_GetString(objv[2]);
654		winPtr->nameUid = Tk_GetUid(Tk_SetAppName(tkwin, string));
655		}
656		Tcl_AppendResult(interp, winPtr->nameUid, NULL);
657		break;
658		}
659		case TK_CARET: {
660		Tcl_Obj *objPtr;
661		TkCaret *caretPtr;
662		Tk_Window window;
663		static const char *caretStrings[] = {
664		"-x", "-y", "-height", NULL
665		};
666		enum caretOptions {
667		TK_CARET_X, TK_CARET_Y, TK_CARET_HEIGHT
668		};
669
670		if ((objc < 3) \|\| ((objc > 4) && !(objc & 1))) {
671		Tcl_WrongNumArgs(interp, 2, objv,
672		"window ?-x x? ?-y y? ?-height height?");
673		return TCL_ERROR;
674		}
675		window = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), tkwin);
676		if (window == NULL) {
677		return TCL_ERROR;
678		}
679		caretPtr = &(((TkWindow *) window)->dispPtr->caret);
680		if (objc == 3) {
681		/*
682		* Return all the current values
683		*/
684
685		objPtr = Tcl_NewObj();
686		Tcl_ListObjAppendElement(interp, objPtr,
687		Tcl_NewStringObj("-height", 7));
688		Tcl_ListObjAppendElement(interp, objPtr,
689		Tcl_NewIntObj(caretPtr->height));
690		Tcl_ListObjAppendElement(interp, objPtr,
691		Tcl_NewStringObj("-x", 2));
692		Tcl_ListObjAppendElement(interp, objPtr,
693		Tcl_NewIntObj(caretPtr->x));
694		Tcl_ListObjAppendElement(interp, objPtr,
695		Tcl_NewStringObj("-y", 2));
696		Tcl_ListObjAppendElement(interp, objPtr,
697		Tcl_NewIntObj(caretPtr->y));
698		Tcl_SetObjResult(interp, objPtr);
699		} else if (objc == 4) {
700		int value;
701
702		/*
703		* Return the current value of the selected option
704		*/
705
706		if (Tcl_GetIndexFromObj(interp, objv[3], caretStrings,
707		"caret option", 0, &index) != TCL_OK) {
	719	if ((objc < 2) \|\| ((objc > 3) && !!(objc & 1))) {
	720	Tcl_WrongNumArgs(interp, 1, objv,
	721	"window ?-x x? ?-y y? ?-height height?");
	722	return TCL_ERROR;
	723	}
	724	window = Tk_NameToWindow(interp, Tcl_GetString(objv[1]), tkwin);
	725	if (window == NULL) {
	726	return TCL_ERROR;
	727	}
	728	caretPtr = &(((TkWindow *) window)->dispPtr->caret);
	729	if (objc == 2) {
	730	/*
	731	* Return all the current values
	732	*/
	733
	734	objPtr = Tcl_NewObj();
	735	Tcl_ListObjAppendElement(interp, objPtr,
	736	Tcl_NewStringObj("-height", 7));
	737	Tcl_ListObjAppendElement(interp, objPtr,
	738	Tcl_NewIntObj(caretPtr->height));
	739	Tcl_ListObjAppendElement(interp, objPtr,
	740	Tcl_NewStringObj("-x", 2));
	741	Tcl_ListObjAppendElement(interp, objPtr,
	742	Tcl_NewIntObj(caretPtr->x));
	743	Tcl_ListObjAppendElement(interp, objPtr,
	744	Tcl_NewStringObj("-y", 2));
	745	Tcl_ListObjAppendElement(interp, objPtr,
	746	Tcl_NewIntObj(caretPtr->y));
	747	Tcl_SetObjResult(interp, objPtr);
	748	} else if (objc == 3) {
	749	int value;
	750
	751	/*
	752	* Return the current value of the selected option
	753	*/
	754
	755	if (Tcl_GetIndexFromObj(interp, objv[2], caretStrings,
	756	"caret option", 0, &index) != TCL_OK) {
	757	return TCL_ERROR;
	758	}
	759	if (index == TK_CARET_X) {
	760	value = caretPtr->x;
	761	} else if (index == TK_CARET_Y) {
	762	value = caretPtr->y;
	763	} else /* if (index == TK_CARET_HEIGHT) -- last case */ {
	764	value = caretPtr->height;
	765	}
	766	Tcl_SetObjResult(interp, Tcl_NewIntObj(value));
	767	} else {
	768	int i, value, x = 0, y = 0, height = -1;
	769
	770	for (i = 2; i < objc; i += 2) {
	771	if ((Tcl_GetIndexFromObj(interp, objv[i], caretStrings,
	772	"caret option", 0, &index) != TCL_OK) \|\|
	773	Tcl_GetIntFromObj(interp,objv[i+1],&value) != TCL_OK) {
708	774	return TCL_ERROR;
709	775	}
710	776	if (index == TK_CARET_X) {
711		value = caretPtr->x;
	777	x = value;
712	778	} else if (index == TK_CARET_Y) {
713		value = caretPtr->y;
	779	y = value;
714	780	} else /* if (index == TK_CARET_HEIGHT) -- last case */ {
715		value = caretPtr->height;
	781	height = value;
716	782	}
717		Tcl_SetObjResult(interp, Tcl_NewIntObj(value));
	783	}
	784	if (height < 0) {
	785	height = Tk_Height(window);
	786	}
	787	Tk_SetCaretPos(window, x, y, height);
	788	}
	789	return TCL_OK;
	790	}
	791
	792	int
	793	ScalingCmd(
	794	ClientData clientData, /* Main window associated with interpreter. */
	795	Tcl_Interp interp, / Current interpreter. */
	796	int objc, /* Number of arguments. */
	797	Tcl_Obj const objv[]) / Argument objects. */
	798	{
	799	Tk_Window tkwin = clientData;
	800	Screen *screenPtr;
	801	int skip, width, height;
	802	double d;
	803
	804	if (Tcl_IsSafe(interp)) {
	805	Tcl_SetResult(interp,
	806	"scaling not accessible in a safe interpreter",
	807	TCL_STATIC);
	808	return TCL_ERROR;
	809	}
	810
	811	skip = TkGetDisplayOf(interp, objc - 1, objv + 1, &tkwin);
	812	if (skip < 0) {
	813	return TCL_ERROR;
	814	}
	815	screenPtr = Tk_Screen(tkwin);
	816	if (objc - skip == 1) {
	817	d = 25.4 / 72;
	818	d *= WidthOfScreen(screenPtr);
	819	d /= WidthMMOfScreen(screenPtr);
	820	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(d));
	821	} else if (objc - skip == 2) {
	822	if (Tcl_GetDoubleFromObj(interp, objv[1+skip], &d) != TCL_OK) {
	823	return TCL_ERROR;
	824	}
	825	d = (25.4 / 72) / d;
	826	width = (int) (d * WidthOfScreen(screenPtr) + 0.5);
	827	if (width <= 0) {
	828	width = 1;
	829	}
	830	height = (int) (d * HeightOfScreen(screenPtr) + 0.5);
	831	if (height <= 0) {
	832	height = 1;
	833	}
	834	WidthMMOfScreen(screenPtr) = width;
	835	HeightMMOfScreen(screenPtr) = height;
	836	} else {
	837	Tcl_WrongNumArgs(interp, 1, objv,
	838	"?-displayof window? ?factor?");
	839	return TCL_ERROR;
	840	}
	841	return TCL_OK;
	842	}
	843
	844	int
	845	UseinputmethodsCmd(
	846	ClientData clientData, /* Main window associated with interpreter. */
	847	Tcl_Interp interp, / Current interpreter. */
	848	int objc, /* Number of arguments. */
	849	Tcl_Obj const objv[]) / Argument objects. */
	850	{
	851	Tk_Window tkwin = clientData;
	852	TkDisplay *dispPtr;
	853	int skip;
	854
	855	if (Tcl_IsSafe(interp)) {
	856	Tcl_SetResult(interp,
	857	"useinputmethods not accessible in a safe interpreter",
	858	TCL_STATIC);
	859	return TCL_ERROR;
	860	}
	861
	862	skip = TkGetDisplayOf(interp, objc-1, objv+1, &tkwin);
	863	if (skip < 0) {
	864	return TCL_ERROR;
	865	}
	866	dispPtr = ((TkWindow *) tkwin)->dispPtr;
	867	if ((objc - skip) == 2) {
	868	/*
	869	* In the case where TK_USE_INPUT_METHODS is not defined, this
	870	* will be ignored and we will always return 0. That will indicate
	871	* to the user that input methods are just not available.
	872	*/
	873
	874	int boolVal;
	875
	876	if (Tcl_GetBooleanFromObj(interp, objv[1+skip],
	877	&boolVal) != TCL_OK) {
	878	return TCL_ERROR;
	879	}
	880	#ifdef TK_USE_INPUT_METHODS
	881	if (boolVal) {
	882	dispPtr->flags \|= TK_DISPLAY_USE_IM;
718	883	} else {
719		int i, value, x = 0, y = 0, height = -1;
720
721		for (i = 3; i < objc; i += 2) {
722		if ((Tcl_GetIndexFromObj(interp, objv[i], caretStrings,
723		"caret option", 0, &index) != TCL_OK) \|\|
724		Tcl_GetIntFromObj(interp,objv[i+1],&value) != TCL_OK) {
725		return TCL_ERROR;
726		}
727		if (index == TK_CARET_X) {
728		x = value;
729		} else if (index == TK_CARET_Y) {
730		y = value;
731		} else /* if (index == TK_CARET_HEIGHT) -- last case */ {
732		height = value;
733		}
734		}
735		if (height < 0) {
736		height = Tk_Height(window);
737		}
738		Tk_SetCaretPos(window, x, y, height);
739		}
740		break;
741		}
742		case TK_SCALING: {
743		Screen *screenPtr;
744		int skip, width, height;
745		double d;
746
	884	dispPtr->flags &= ~TK_DISPLAY_USE_IM;
	885	}
	886	#endif /* TK_USE_INPUT_METHODS */
	887	} else if ((objc - skip) != 1) {
	888	Tcl_WrongNumArgs(interp, 1, objv,
	889	"?-displayof window? ?boolean?");
	890	return TCL_ERROR;
	891	}
	892	Tcl_SetObjResult(interp,
	893	Tcl_NewBooleanObj(dispPtr->flags & TK_DISPLAY_USE_IM));
	894	return TCL_OK;
	895	}
	896
	897	int
	898	WindowingsystemCmd(
	899	ClientData clientData, /* Main window associated with interpreter. */
	900	Tcl_Interp interp, / Current interpreter. */
	901	int objc, /* Number of arguments. */
	902	Tcl_Obj const objv[]) / Argument objects. */
	903	{
	904	const char *windowingsystem;
	905
	906	if (objc != 1) {
	907	Tcl_WrongNumArgs(interp, 1, objv, NULL);
	908	return TCL_ERROR;
	909	}
	910	#if defined(WIN32)
	911	windowingsystem = "win32";
	912	#elif defined(MAC_OSX_TK)
	913	windowingsystem = "aqua";
	914	#else
	915	windowingsystem = "x11";
	916	#endif
	917	Tcl_SetObjResult(interp, Tcl_NewStringObj(windowingsystem, -1));
	918	return TCL_OK;
	919	}
	920
	921	int
	922	InactiveCmd(
	923	ClientData clientData, /* Main window associated with interpreter. */
	924	Tcl_Interp interp, / Current interpreter. */
	925	int objc, /* Number of arguments. */
	926	Tcl_Obj const objv[]) / Argument objects. */
	927	{
	928	Tk_Window tkwin = clientData;
	929	int skip = TkGetDisplayOf(interp, objc - 1, objv + 1, &tkwin);
	930
	931	if (skip < 0) {
	932	return TCL_ERROR;
	933	}
	934	if (objc - skip == 1) {
	935	long inactive;
	936
	937	inactive = (Tcl_IsSafe(interp) ? -1 :
	938	Tk_GetUserInactiveTime(Tk_Display(tkwin)));
	939	Tcl_SetObjResult(interp, Tcl_NewLongObj(inactive));
	940
	941	} else if (objc - skip == 2) {
	942	char *string;
	943
	944	string = Tcl_GetString(objv[objc-1]);
	945	if (strcmp(string, "reset") != 0) {
	946	Tcl_Obj *msg = Tcl_NewStringObj("bad option \"", -1);
	947
	948	Tcl_AppendStringsToObj(msg, string, "\": must be reset", NULL);
	949	Tcl_SetObjResult(interp, msg);
	950	return TCL_ERROR;
	951	}
747	952	if (Tcl_IsSafe(interp)) {
748	953	Tcl_SetResult(interp,
749		"scaling not accessible in a safe interpreter",
750		TCL_STATIC);
751		return TCL_ERROR;
752		}
753
754		skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
755		if (skip < 0) {
756		return TCL_ERROR;
757		}
758		screenPtr = Tk_Screen(tkwin);
759		if (objc - skip == 2) {
760		d = 25.4 / 72;
761		d *= WidthOfScreen(screenPtr);
762		d /= WidthMMOfScreen(screenPtr);
763		Tcl_SetObjResult(interp, Tcl_NewDoubleObj(d));
764		} else if (objc - skip == 3) {
765		if (Tcl_GetDoubleFromObj(interp, objv[2+skip], &d) != TCL_OK) {
766		return TCL_ERROR;
767		}
768		d = (25.4 / 72) / d;
769		width = (int) (d * WidthOfScreen(screenPtr) + 0.5);
770		if (width <= 0) {
771		width = 1;
772		}
773		height = (int) (d * HeightOfScreen(screenPtr) + 0.5);
774		if (height <= 0) {
775		height = 1;
776		}
777		WidthMMOfScreen(screenPtr) = width;
778		HeightMMOfScreen(screenPtr) = height;
779		} else {
780		Tcl_WrongNumArgs(interp, 2, objv,
781		"?-displayof window? ?factor?");
782		return TCL_ERROR;
783		}
784		break;
785		}
786		case TK_USE_IM: {
787		TkDisplay *dispPtr;
788		int skip;
789
790		if (Tcl_IsSafe(interp)) {
791		Tcl_SetResult(interp,
792		"useinputmethods not accessible in a safe interpreter",
793		TCL_STATIC);
794		return TCL_ERROR;
795		}
796
797		skip = TkGetDisplayOf(interp, objc-2, objv+2, &tkwin);
798		if (skip < 0) {
799		return TCL_ERROR;
800		}
801		dispPtr = ((TkWindow *) tkwin)->dispPtr;
802		if ((objc - skip) == 3) {
803		/*
804		* In the case where TK_USE_INPUT_METHODS is not defined, this
805		* will be ignored and we will always return 0. That will indicate
806		* to the user that input methods are just not available.
807		*/
808
809		int boolVal;
810
811		if (Tcl_GetBooleanFromObj(interp, objv[2+skip],
812		&boolVal) != TCL_OK) {
813		return TCL_ERROR;
814		}
815		#ifdef TK_USE_INPUT_METHODS
816		if (boolVal) {
817		dispPtr->flags \|= TK_DISPLAY_USE_IM;
818		} else {
819		dispPtr->flags &= ~TK_DISPLAY_USE_IM;
820		}
821		#endif /* TK_USE_INPUT_METHODS */
822		} else if ((objc - skip) != 2) {
823		Tcl_WrongNumArgs(interp, 2, objv,
824		"?-displayof window? ?boolean?");
825		return TCL_ERROR;
826		}
827		Tcl_SetObjResult(interp,
828		Tcl_NewBooleanObj(dispPtr->flags & TK_DISPLAY_USE_IM));
829		break;
830		}
831		case TK_WINDOWINGSYSTEM: {
832		const char *windowingsystem;
833
834		if (objc != 2) {
835		Tcl_WrongNumArgs(interp, 2, objv, NULL);
836		return TCL_ERROR;
837		}
838		#if defined(WIN32)
839		windowingsystem = "win32";
840		#elif defined(MAC_OSX_TK)
841		windowingsystem = "aqua";
842		#else
843		windowingsystem = "x11";
844		#endif
845		Tcl_SetObjResult(interp, Tcl_NewStringObj(windowingsystem, -1));
846		break;
847		}
848		case TK_INACTIVE: {
849		int skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
850
851		if (skip < 0) {
852		return TCL_ERROR;
853		}
854		if (objc - skip == 2) {
855		long inactive;
856
857		inactive = (Tcl_IsSafe(interp) ? -1 :
858		Tk_GetUserInactiveTime(Tk_Display(tkwin)));
859		Tcl_SetObjResult(interp, Tcl_NewLongObj(inactive));
860
861		} else if (objc - skip == 3) {
862		char *string;
863
864		string = Tcl_GetString(objv[objc-1]);
865		if (strcmp(string, "reset") != 0) {
866		Tcl_Obj *msg = Tcl_NewStringObj("bad option \"", -1);
867
868		Tcl_AppendStringsToObj(msg, string, "\": must be reset", NULL);
869		Tcl_SetObjResult(interp, msg);
870		return TCL_ERROR;
871		}
872		if (Tcl_IsSafe(interp)) {
873		Tcl_SetResult(interp,
874		"resetting the user inactivity timer "
875		"is not allowed in a safe interpreter", TCL_STATIC);
876		return TCL_ERROR;
877		}
878		Tk_ResetUserInactiveTime(Tk_Display(tkwin));
879		Tcl_ResetResult(interp);
880		} else {
881		Tcl_WrongNumArgs(interp, 2, objv, "?-displayof window? ?reset?");
882		return TCL_ERROR;
883		}
884		break;
885		}
	954	"resetting the user inactivity timer "
	955	"is not allowed in a safe interpreter", TCL_STATIC);
	956	return TCL_ERROR;
	957	}
	958	Tk_ResetUserInactiveTime(Tk_Display(tkwin));
	959	Tcl_ResetResult(interp);
	960	} else {
	961	Tcl_WrongNumArgs(interp, 1, objv, "?-displayof window? ?reset?");
	962	return TCL_ERROR;
886	963	}
887	964	return TCL_OK;
888	965	}

915	992	Tk_Window tkwin = (Tk_Window) clientData;
916	993	int done, index;
917	994	int code = TCL_OK;
918		static const char *optionStrings[] = {
	995	static const char *const optionStrings[] = {
919	996	"variable", "visibility", "window", NULL
920	997	};
921	998	enum options {

1100	1177	int objc, /* Number of arguments. */
1101	1178	Tcl_Obj const objv[]) / Argument objects. */
1102	1179	{
1103		static const char *updateOptions[] = {"idletasks", NULL};
	1180	static const char *const updateOptions[] = {"idletasks", NULL};
1104	1181	int flags, index;
1105	1182	TkDisplay *dispPtr;
1106	1183	int code = TCL_OK;

1199	1276	Tcl_Obj const objv[]) / Argument objects. */
1200	1277	{
1201	1278	int index, x, y, width, height, useX, useY, class, skip;
1202		char *string;
	1279	const char *string;
1203	1280	TkWindow *winPtr;
1204	1281	Tk_Window tkwin;
1205	1282

1212	1289	{StaticGray, "staticgray"},
1213	1290	{-1, NULL}
1214	1291	};
1215		static const char *optionStrings[] = {
	1292	static const char *const optionStrings[] = {
1216	1293	"cells", "children", "class", "colormapfull",
1217	1294	"depth", "geometry", "height", "id",
1218	1295	"ismapped", "manager", "name", "parent",

1751	1828	Tk_Window tkwin;
1752	1829	TkWindow *winPtr;
1753	1830
1754		static const char *optionStrings[] = {
	1831	static const char *const optionStrings[] = {
1755	1832	"aspect", "client", "command", "deiconify",
1756	1833	"focusmodel", "frame", "geometry", "grid",
1757	1834	"group", "iconbitmap", "iconify", "iconmask",

+3

-3

generic/tkColor.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkColor.c,v 1.17 2008/04/27 22:38:55 dkf Exp $
	13	* RCS: @(#) $Id: tkColor.c,v 1.19 2008/11/08 18:44:39 dkf Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

52	52	* of the Tcl_Obj points to a TkColor object.
53	53	*/
54	54
55		Tcl_ObjType tkColorObjType = {
	55	const Tcl_ObjType tkColorObjType = {
56	56	"color", /* name */
57	57	FreeColorObjProc, /* freeIntRepProc */
58	58	DupColorObjProc, /* dupIntRepProc */

713	713	Tcl_GetString(objPtr);
714	714	typePtr = objPtr->typePtr;
715	715	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
716		(*typePtr->freeIntRepProc)(objPtr);
	716	typePtr->freeIntRepProc(objPtr);
717	717	}
718	718	objPtr->typePtr = &tkColorObjType;
719	719	objPtr->internalRep.twoPtrValue.ptr1 = NULL;

+2

-2

generic/tkConfig.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkConfig.c,v 1.28 2008/10/05 18:22:21 dkf Exp $
	11	* RCS: @(#) $Id: tkConfig.c,v 1.29 2008/10/15 06:41:06 nijtmans Exp $
12	12	*/
13	13
14	14	/*

135	135	* the internalPtr2 field points to the entry that matched.
136	136	*/
137	137
138		Tcl_ObjType tkOptionObjType = {
	138	const Tcl_ObjType tkOptionObjType = {
139	139	"option", /* name */
140	140	NULL, /* freeIntRepProc */
141	141	NULL, /* dupIntRepProc */

+4

-4

generic/tkConsole.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkConsole.c,v 1.37 2008/04/27 22:38:56 dkf Exp $
	12	* RCS: @(#) $Id: tkConsole.c,v 1.38 2008/10/17 23:18:37 nijtmans Exp $
13	13	*/
14	14
15	15	#include "tk.h"

113	113	DWORD consoleParams;
114	114	DWORD fileType;
115	115	int mode;
116		char *bufMode;
	116	const char *bufMode;
117	117	HANDLE handle;
118	118
119	119	switch (type) {

672	672	Tcl_Obj const objv[]) / Argument objects */
673	673	{
674	674	int index, result;
675		static const char *options[] = {"eval", "hide", "show", "title", NULL};
	675	static const char *const options[] = {"eval", "hide", "show", "title", NULL};
676	676	enum option {CON_EVAL, CON_HIDE, CON_SHOW, CON_TITLE};
677	677	Tcl_Obj *cmd = NULL;
678	678	ConsoleInfo info = (ConsoleInfo ) clientData;

759	759	Tcl_Obj const objv[]) / Argument objects */
760	760	{
761	761	int index, result = TCL_OK;
762		static const char *options[] = {"eval", "record", NULL};
	762	static const char *const options[] = {"eval", "record", NULL};
763	763	enum option {OTHER_EVAL, OTHER_RECORD};
764	764	ConsoleInfo *info = clientData;
765	765	Tcl_Interp *otherInterp = info->interp;

+3

-3

generic/tkCursor.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkCursor.c,v 1.19 2008/04/27 22:38:56 dkf Exp $
	13	* RCS: @(#) $Id: tkCursor.c,v 1.21 2008/11/08 18:44:39 dkf Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

55	55	* option is set.
56	56	*/
57	57
58		Tcl_ObjType tkCursorObjType = {
	58	Tcl_ObjType const tkCursorObjType = {
59	59	"cursor", /* name */
60	60	FreeCursorObjProc, /* freeIntRepProc */
61	61	DupCursorObjProc, /* dupIntRepProc */

759	759	Tcl_GetString(objPtr);
760	760	typePtr = objPtr->typePtr;
761	761	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
762		(*typePtr->freeIntRepProc)(objPtr);
	762	typePtr->freeIntRepProc(objPtr);
763	763	}
764	764	objPtr->typePtr = &tkCursorObjType;
765	765	objPtr->internalRep.twoPtrValue.ptr1 = NULL;

+395

-395

generic/tkDecls.h less more

7	7	* See the file "license.terms" for information on usage and redistribution
8	8	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkDecls.h,v 1.34 2008/04/08 15:00:37 das Exp $
	10	* RCS: @(#) $Id: tkDecls.h,v 1.40 2008/11/12 00:15:26 nijtmans Exp $
11	11	*/
12	12
13	13	#ifndef _TKDECLS

43	43	#ifndef Tk_3DBorderGC_TCL_DECLARED
44	44	#define Tk_3DBorderGC_TCL_DECLARED
45	45	/* 2 */
46		EXTERN GC Tk_3DBorderGC (Tk_Window tkwin, Tk_3DBorder border,
	46	EXTERN GC Tk_3DBorderGC (Tk_Window tkwin, Tk_3DBorder border,
47	47	int which);
48	48	#endif
49	49	#ifndef Tk_3DHorizontalBevel_TCL_DECLARED
50	50	#define Tk_3DHorizontalBevel_TCL_DECLARED
51	51	/* 3 */
52		EXTERN void Tk_3DHorizontalBevel (Tk_Window tkwin,
53		Drawable drawable, Tk_3DBorder border, int x,
54		int y, int width, int height, int leftIn,
	52	EXTERN void Tk_3DHorizontalBevel (Tk_Window tkwin,
	53	Drawable drawable, Tk_3DBorder border, int x,
	54	int y, int width, int height, int leftIn,
55	55	int rightIn, int topBevel, int relief);
56	56	#endif
57	57	#ifndef Tk_3DVerticalBevel_TCL_DECLARED
58	58	#define Tk_3DVerticalBevel_TCL_DECLARED
59	59	/* 4 */
60		EXTERN void Tk_3DVerticalBevel (Tk_Window tkwin,
61		Drawable drawable, Tk_3DBorder border, int x,
62		int y, int width, int height, int leftBevel,
	60	EXTERN void Tk_3DVerticalBevel (Tk_Window tkwin,
	61	Drawable drawable, Tk_3DBorder border, int x,
	62	int y, int width, int height, int leftBevel,
63	63	int relief);
64	64	#endif
65	65	#ifndef Tk_AddOption_TCL_DECLARED
66	66	#define Tk_AddOption_TCL_DECLARED
67	67	/* 5 */
68		EXTERN void Tk_AddOption (Tk_Window tkwin, CONST char * name,
69		CONST char * value, int priority);
	68	EXTERN void Tk_AddOption (Tk_Window tkwin, const char * name,
	69	const char * value, int priority);
70	70	#endif
71	71	#ifndef Tk_BindEvent_TCL_DECLARED
72	72	#define Tk_BindEvent_TCL_DECLARED
73	73	/* 6 */
74		EXTERN void Tk_BindEvent (Tk_BindingTable bindingTable,
75		XEvent * eventPtr, Tk_Window tkwin,
	74	EXTERN void Tk_BindEvent (Tk_BindingTable bindingTable,
	75	XEvent * eventPtr, Tk_Window tkwin,
76	76	int numObjects, ClientData * objectPtr);
77	77	#endif
78	78	#ifndef Tk_CanvasDrawableCoords_TCL_DECLARED
79	79	#define Tk_CanvasDrawableCoords_TCL_DECLARED
80	80	/* 7 */
81		EXTERN void Tk_CanvasDrawableCoords (Tk_Canvas canvas, double x,
82		double y, short * drawableXPtr,
	81	EXTERN void Tk_CanvasDrawableCoords (Tk_Canvas canvas, double x,
	82	double y, short * drawableXPtr,
83	83	short * drawableYPtr);
84	84	#endif
85	85	#ifndef Tk_CanvasEventuallyRedraw_TCL_DECLARED
86	86	#define Tk_CanvasEventuallyRedraw_TCL_DECLARED
87	87	/* 8 */
88		EXTERN void Tk_CanvasEventuallyRedraw (Tk_Canvas canvas, int x1,
	88	EXTERN void Tk_CanvasEventuallyRedraw (Tk_Canvas canvas, int x1,
89	89	int y1, int x2, int y2);
90	90	#endif
91	91	#ifndef Tk_CanvasGetCoord_TCL_DECLARED
92	92	#define Tk_CanvasGetCoord_TCL_DECLARED
93	93	/* 9 */
94		EXTERN int Tk_CanvasGetCoord (Tcl_Interp * interp,
95		Tk_Canvas canvas, CONST char * str,
	94	EXTERN int Tk_CanvasGetCoord (Tcl_Interp * interp,
	95	Tk_Canvas canvas, const char * str,
96	96	double * doublePtr);
97	97	#endif
98	98	#ifndef Tk_CanvasGetTextInfo_TCL_DECLARED

103	103	#ifndef Tk_CanvasPsBitmap_TCL_DECLARED
104	104	#define Tk_CanvasPsBitmap_TCL_DECLARED
105	105	/* 11 */
106		EXTERN int Tk_CanvasPsBitmap (Tcl_Interp * interp,
107		Tk_Canvas canvas, Pixmap bitmap, int x,
	106	EXTERN int Tk_CanvasPsBitmap (Tcl_Interp * interp,
	107	Tk_Canvas canvas, Pixmap bitmap, int x,
108	108	int y, int width, int height);
109	109	#endif
110	110	#ifndef Tk_CanvasPsColor_TCL_DECLARED
111	111	#define Tk_CanvasPsColor_TCL_DECLARED
112	112	/* 12 */
113		EXTERN int Tk_CanvasPsColor (Tcl_Interp * interp,
	113	EXTERN int Tk_CanvasPsColor (Tcl_Interp * interp,
114	114	Tk_Canvas canvas, XColor * colorPtr);
115	115	#endif
116	116	#ifndef Tk_CanvasPsFont_TCL_DECLARED
117	117	#define Tk_CanvasPsFont_TCL_DECLARED
118	118	/* 13 */
119		EXTERN int Tk_CanvasPsFont (Tcl_Interp * interp,
	119	EXTERN int Tk_CanvasPsFont (Tcl_Interp * interp,
120	120	Tk_Canvas canvas, Tk_Font font);
121	121	#endif
122	122	#ifndef Tk_CanvasPsPath_TCL_DECLARED
123	123	#define Tk_CanvasPsPath_TCL_DECLARED
124	124	/* 14 */
125		EXTERN void Tk_CanvasPsPath (Tcl_Interp * interp,
126		Tk_Canvas canvas, double * coordPtr,
	125	EXTERN void Tk_CanvasPsPath (Tcl_Interp * interp,
	126	Tk_Canvas canvas, double * coordPtr,
127	127	int numPoints);
128	128	#endif
129	129	#ifndef Tk_CanvasPsStipple_TCL_DECLARED
130	130	#define Tk_CanvasPsStipple_TCL_DECLARED
131	131	/* 15 */
132		EXTERN int Tk_CanvasPsStipple (Tcl_Interp * interp,
	132	EXTERN int Tk_CanvasPsStipple (Tcl_Interp * interp,
133	133	Tk_Canvas canvas, Pixmap bitmap);
134	134	#endif
135	135	#ifndef Tk_CanvasPsY_TCL_DECLARED

145	145	#ifndef Tk_CanvasTagsParseProc_TCL_DECLARED
146	146	#define Tk_CanvasTagsParseProc_TCL_DECLARED
147	147	/* 18 */
148		EXTERN int Tk_CanvasTagsParseProc (ClientData clientData,
149		Tcl_Interp * interp, Tk_Window tkwin,
150		CONST char * value, char * widgRec,
	148	EXTERN int Tk_CanvasTagsParseProc (ClientData clientData,
	149	Tcl_Interp * interp, Tk_Window tkwin,
	150	const char * value, char * widgRec,
151	151	int offset);
152	152	#endif
153	153	#ifndef Tk_CanvasTagsPrintProc_TCL_DECLARED
154	154	#define Tk_CanvasTagsPrintProc_TCL_DECLARED
155	155	/* 19 */
156		EXTERN char * Tk_CanvasTagsPrintProc (ClientData clientData,
157		Tk_Window tkwin, char * widgRec, int offset,
	156	EXTERN CONST86 char * Tk_CanvasTagsPrintProc (ClientData clientData,
	157	Tk_Window tkwin, char * widgRec, int offset,
158	158	Tcl_FreeProc ** freeProcPtr);
159	159	#endif
160	160	#ifndef Tk_CanvasTkwin_TCL_DECLARED

165	165	#ifndef Tk_CanvasWindowCoords_TCL_DECLARED
166	166	#define Tk_CanvasWindowCoords_TCL_DECLARED
167	167	/* 21 */
168		EXTERN void Tk_CanvasWindowCoords (Tk_Canvas canvas, double x,
169		double y, short * screenXPtr,
	168	EXTERN void Tk_CanvasWindowCoords (Tk_Canvas canvas, double x,
	169	double y, short * screenXPtr,
170	170	short * screenYPtr);
171	171	#endif
172	172	#ifndef Tk_ChangeWindowAttributes_TCL_DECLARED
173	173	#define Tk_ChangeWindowAttributes_TCL_DECLARED
174	174	/* 22 */
175		EXTERN void Tk_ChangeWindowAttributes (Tk_Window tkwin,
176		unsigned long valueMask,
	175	EXTERN void Tk_ChangeWindowAttributes (Tk_Window tkwin,
	176	unsigned long valueMask,
177	177	XSetWindowAttributes * attsPtr);
178	178	#endif
179	179	#ifndef Tk_CharBbox_TCL_DECLARED
180	180	#define Tk_CharBbox_TCL_DECLARED
181	181	/* 23 */
182		EXTERN int Tk_CharBbox (Tk_TextLayout layout, int index,
183		int * xPtr, int * yPtr, int * widthPtr,
	182	EXTERN int Tk_CharBbox (Tk_TextLayout layout, int index,
	183	int * xPtr, int * yPtr, int * widthPtr,
184	184	int * heightPtr);
185	185	#endif
186	186	#ifndef Tk_ClearSelection_TCL_DECLARED

191	191	#ifndef Tk_ClipboardAppend_TCL_DECLARED
192	192	#define Tk_ClipboardAppend_TCL_DECLARED
193	193	/* 25 */
194		EXTERN int Tk_ClipboardAppend (Tcl_Interp * interp,
195		Tk_Window tkwin, Atom target, Atom format,
	194	EXTERN int Tk_ClipboardAppend (Tcl_Interp * interp,
	195	Tk_Window tkwin, Atom target, Atom format,
196	196	char* buffer);
197	197	#endif
198	198	#ifndef Tk_ClipboardClear_TCL_DECLARED
199	199	#define Tk_ClipboardClear_TCL_DECLARED
200	200	/* 26 */
201		EXTERN int Tk_ClipboardClear (Tcl_Interp * interp,
	201	EXTERN int Tk_ClipboardClear (Tcl_Interp * interp,
202	202	Tk_Window tkwin);
203	203	#endif
204	204	#ifndef Tk_ConfigureInfo_TCL_DECLARED
205	205	#define Tk_ConfigureInfo_TCL_DECLARED
206	206	/* 27 */
207		EXTERN int Tk_ConfigureInfo (Tcl_Interp * interp,
208		Tk_Window tkwin, Tk_ConfigSpec * specs,
209		char * widgRec, CONST char * argvName,
	207	EXTERN int Tk_ConfigureInfo (Tcl_Interp * interp,
	208	Tk_Window tkwin, Tk_ConfigSpec * specs,
	209	char * widgRec, const char * argvName,
210	210	int flags);
211	211	#endif
212	212	#ifndef Tk_ConfigureValue_TCL_DECLARED
213	213	#define Tk_ConfigureValue_TCL_DECLARED
214	214	/* 28 */
215		EXTERN int Tk_ConfigureValue (Tcl_Interp * interp,
216		Tk_Window tkwin, Tk_ConfigSpec * specs,
217		char * widgRec, CONST char * argvName,
	215	EXTERN int Tk_ConfigureValue (Tcl_Interp * interp,
	216	Tk_Window tkwin, Tk_ConfigSpec * specs,
	217	char * widgRec, const char * argvName,
218	218	int flags);
219	219	#endif
220	220	#ifndef Tk_ConfigureWidget_TCL_DECLARED
221	221	#define Tk_ConfigureWidget_TCL_DECLARED
222	222	/* 29 */
223		EXTERN int Tk_ConfigureWidget (Tcl_Interp * interp,
224		Tk_Window tkwin, Tk_ConfigSpec * specs,
225		int argc, CONST84 char ** argv,
	223	EXTERN int Tk_ConfigureWidget (Tcl_Interp * interp,
	224	Tk_Window tkwin, Tk_ConfigSpec * specs,
	225	int argc, CONST84 char ** argv,
226	226	char * widgRec, int flags);
227	227	#endif
228	228	#ifndef Tk_ConfigureWindow_TCL_DECLARED
229	229	#define Tk_ConfigureWindow_TCL_DECLARED
230	230	/* 30 */
231		EXTERN void Tk_ConfigureWindow (Tk_Window tkwin,
232		unsigned int valueMask,
	231	EXTERN void Tk_ConfigureWindow (Tk_Window tkwin,
	232	unsigned int valueMask,
233	233	XWindowChanges * valuePtr);
234	234	#endif
235	235	#ifndef Tk_ComputeTextLayout_TCL_DECLARED
236	236	#define Tk_ComputeTextLayout_TCL_DECLARED
237	237	/* 31 */
238		EXTERN Tk_TextLayout Tk_ComputeTextLayout (Tk_Font font, CONST char * str,
239		int numChars, int wrapLength,
240		Tk_Justify justify, int flags,
	238	EXTERN Tk_TextLayout Tk_ComputeTextLayout (Tk_Font font, const char * str,
	239	int numChars, int wrapLength,
	240	Tk_Justify justify, int flags,
241	241	int * widthPtr, int * heightPtr);
242	242	#endif
243	243	#ifndef Tk_CoordsToWindow_TCL_DECLARED
244	244	#define Tk_CoordsToWindow_TCL_DECLARED
245	245	/* 32 */
246		EXTERN Tk_Window Tk_CoordsToWindow (int rootX, int rootY,
	246	EXTERN Tk_Window Tk_CoordsToWindow (int rootX, int rootY,
247	247	Tk_Window tkwin);
248	248	#endif
249	249	#ifndef Tk_CreateBinding_TCL_DECLARED
250	250	#define Tk_CreateBinding_TCL_DECLARED
251	251	/* 33 */
252		EXTERN unsigned long Tk_CreateBinding (Tcl_Interp * interp,
253		Tk_BindingTable bindingTable,
254		ClientData object, CONST char * eventStr,
255		CONST char * command, int append);
	252	EXTERN unsigned long Tk_CreateBinding (Tcl_Interp * interp,
	253	Tk_BindingTable bindingTable,
	254	ClientData object, const char * eventStr,
	255	const char * command, int append);
256	256	#endif
257	257	#ifndef Tk_CreateBindingTable_TCL_DECLARED
258	258	#define Tk_CreateBindingTable_TCL_DECLARED

262	262	#ifndef Tk_CreateErrorHandler_TCL_DECLARED
263	263	#define Tk_CreateErrorHandler_TCL_DECLARED
264	264	/* 35 */
265		EXTERN Tk_ErrorHandler Tk_CreateErrorHandler (Display * display, int errNum,
266		int request, int minorCode,
267		Tk_ErrorProc * errorProc,
	265	EXTERN Tk_ErrorHandler Tk_CreateErrorHandler (Display * display, int errNum,
	266	int request, int minorCode,
	267	Tk_ErrorProc * errorProc,
268	268	ClientData clientData);
269	269	#endif
270	270	#ifndef Tk_CreateEventHandler_TCL_DECLARED
271	271	#define Tk_CreateEventHandler_TCL_DECLARED
272	272	/* 36 */
273		EXTERN void Tk_CreateEventHandler (Tk_Window token,
274		unsigned long mask, Tk_EventProc * proc,
	273	EXTERN void Tk_CreateEventHandler (Tk_Window token,
	274	unsigned long mask, Tk_EventProc * proc,
275	275	ClientData clientData);
276	276	#endif
277	277	#ifndef Tk_CreateGenericHandler_TCL_DECLARED
278	278	#define Tk_CreateGenericHandler_TCL_DECLARED
279	279	/* 37 */
280		EXTERN void Tk_CreateGenericHandler (Tk_GenericProc * proc,
	280	EXTERN void Tk_CreateGenericHandler (Tk_GenericProc * proc,
281	281	ClientData clientData);
282	282	#endif
283	283	#ifndef Tk_CreateImageType_TCL_DECLARED
284	284	#define Tk_CreateImageType_TCL_DECLARED
285	285	/* 38 */
286		EXTERN void Tk_CreateImageType (Tk_ImageType * typePtr);
	286	EXTERN void Tk_CreateImageType (const Tk_ImageType * typePtr);
287	287	#endif
288	288	#ifndef Tk_CreateItemType_TCL_DECLARED
289	289	#define Tk_CreateItemType_TCL_DECLARED

294	294	#define Tk_CreatePhotoImageFormat_TCL_DECLARED
295	295	/* 40 */
296	296	EXTERN void Tk_CreatePhotoImageFormat (
297		Tk_PhotoImageFormat * formatPtr);
	297	const Tk_PhotoImageFormat * formatPtr);
298	298	#endif
299	299	#ifndef Tk_CreateSelHandler_TCL_DECLARED
300	300	#define Tk_CreateSelHandler_TCL_DECLARED
301	301	/* 41 */
302		EXTERN void Tk_CreateSelHandler (Tk_Window tkwin, Atom selection,
303		Atom target, Tk_SelectionProc * proc,
	302	EXTERN void Tk_CreateSelHandler (Tk_Window tkwin, Atom selection,
	303	Atom target, Tk_SelectionProc * proc,
304	304	ClientData clientData, Atom format);
305	305	#endif
306	306	#ifndef Tk_CreateWindow_TCL_DECLARED
307	307	#define Tk_CreateWindow_TCL_DECLARED
308	308	/* 42 */
309		EXTERN Tk_Window Tk_CreateWindow (Tcl_Interp * interp,
310		Tk_Window parent, CONST char * name,
311		CONST char * screenName);
	309	EXTERN Tk_Window Tk_CreateWindow (Tcl_Interp * interp,
	310	Tk_Window parent, const char * name,
	311	const char * screenName);
312	312	#endif
313	313	#ifndef Tk_CreateWindowFromPath_TCL_DECLARED
314	314	#define Tk_CreateWindowFromPath_TCL_DECLARED
315	315	/* 43 */
316		EXTERN Tk_Window Tk_CreateWindowFromPath (Tcl_Interp * interp,
317		Tk_Window tkwin, CONST char * pathName,
318		CONST char * screenName);
	316	EXTERN Tk_Window Tk_CreateWindowFromPath (Tcl_Interp * interp,
	317	Tk_Window tkwin, const char * pathName,
	318	const char * screenName);
319	319	#endif
320	320	#ifndef Tk_DefineBitmap_TCL_DECLARED
321	321	#define Tk_DefineBitmap_TCL_DECLARED
322	322	/* 44 */
323		EXTERN int Tk_DefineBitmap (Tcl_Interp * interp,
324		CONST char * name, CONST char * source,
	323	EXTERN int Tk_DefineBitmap (Tcl_Interp * interp,
	324	const char * name, const char * source,
325	325	int width, int height);
326	326	#endif
327	327	#ifndef Tk_DefineCursor_TCL_DECLARED

332	332	#ifndef Tk_DeleteAllBindings_TCL_DECLARED
333	333	#define Tk_DeleteAllBindings_TCL_DECLARED
334	334	/* 46 */
335		EXTERN void Tk_DeleteAllBindings (Tk_BindingTable bindingTable,
	335	EXTERN void Tk_DeleteAllBindings (Tk_BindingTable bindingTable,
336	336	ClientData object);
337	337	#endif
338	338	#ifndef Tk_DeleteBinding_TCL_DECLARED
339	339	#define Tk_DeleteBinding_TCL_DECLARED
340	340	/* 47 */
341		EXTERN int Tk_DeleteBinding (Tcl_Interp * interp,
342		Tk_BindingTable bindingTable,
343		ClientData object, CONST char * eventStr);
	341	EXTERN int Tk_DeleteBinding (Tcl_Interp * interp,
	342	Tk_BindingTable bindingTable,
	343	ClientData object, const char * eventStr);
344	344	#endif
345	345	#ifndef Tk_DeleteBindingTable_TCL_DECLARED
346	346	#define Tk_DeleteBindingTable_TCL_DECLARED

355	355	#ifndef Tk_DeleteEventHandler_TCL_DECLARED
356	356	#define Tk_DeleteEventHandler_TCL_DECLARED
357	357	/* 50 */
358		EXTERN void Tk_DeleteEventHandler (Tk_Window token,
359		unsigned long mask, Tk_EventProc * proc,
	358	EXTERN void Tk_DeleteEventHandler (Tk_Window token,
	359	unsigned long mask, Tk_EventProc * proc,
360	360	ClientData clientData);
361	361	#endif
362	362	#ifndef Tk_DeleteGenericHandler_TCL_DECLARED
363	363	#define Tk_DeleteGenericHandler_TCL_DECLARED
364	364	/* 51 */
365		EXTERN void Tk_DeleteGenericHandler (Tk_GenericProc * proc,
	365	EXTERN void Tk_DeleteGenericHandler (Tk_GenericProc * proc,
366	366	ClientData clientData);
367	367	#endif
368	368	#ifndef Tk_DeleteImage_TCL_DECLARED
369	369	#define Tk_DeleteImage_TCL_DECLARED
370	370	/* 52 */
371		EXTERN void Tk_DeleteImage (Tcl_Interp * interp,
372		CONST char * name);
	371	EXTERN void Tk_DeleteImage (Tcl_Interp * interp,
	372	const char * name);
373	373	#endif
374	374	#ifndef Tk_DeleteSelHandler_TCL_DECLARED
375	375	#define Tk_DeleteSelHandler_TCL_DECLARED
376	376	/* 53 */
377		EXTERN void Tk_DeleteSelHandler (Tk_Window tkwin, Atom selection,
	377	EXTERN void Tk_DeleteSelHandler (Tk_Window tkwin, Atom selection,
378	378	Atom target);
379	379	#endif
380	380	#ifndef Tk_DestroyWindow_TCL_DECLARED

390	390	#ifndef Tk_DistanceToTextLayout_TCL_DECLARED
391	391	#define Tk_DistanceToTextLayout_TCL_DECLARED
392	392	/* 56 */
393		EXTERN int Tk_DistanceToTextLayout (Tk_TextLayout layout, int x,
	393	EXTERN int Tk_DistanceToTextLayout (Tk_TextLayout layout, int x,
394	394	int y);
395	395	#endif
396	396	#ifndef Tk_Draw3DPolygon_TCL_DECLARED
397	397	#define Tk_Draw3DPolygon_TCL_DECLARED
398	398	/* 57 */
399		EXTERN void Tk_Draw3DPolygon (Tk_Window tkwin, Drawable drawable,
400		Tk_3DBorder border, XPoint * pointPtr,
401		int numPoints, int borderWidth,
	399	EXTERN void Tk_Draw3DPolygon (Tk_Window tkwin, Drawable drawable,
	400	Tk_3DBorder border, XPoint * pointPtr,
	401	int numPoints, int borderWidth,
402	402	int leftRelief);
403	403	#endif
404	404	#ifndef Tk_Draw3DRectangle_TCL_DECLARED
405	405	#define Tk_Draw3DRectangle_TCL_DECLARED
406	406	/* 58 */
407		EXTERN void Tk_Draw3DRectangle (Tk_Window tkwin,
408		Drawable drawable, Tk_3DBorder border, int x,
409		int y, int width, int height,
	407	EXTERN void Tk_Draw3DRectangle (Tk_Window tkwin,
	408	Drawable drawable, Tk_3DBorder border, int x,
	409	int y, int width, int height,
410	410	int borderWidth, int relief);
411	411	#endif
412	412	#ifndef Tk_DrawChars_TCL_DECLARED
413	413	#define Tk_DrawChars_TCL_DECLARED
414	414	/* 59 */
415		EXTERN void Tk_DrawChars (Display * display, Drawable drawable,
416		GC gc, Tk_Font tkfont, CONST char * source,
	415	EXTERN void Tk_DrawChars (Display * display, Drawable drawable,
	416	GC gc, Tk_Font tkfont, const char * source,
417	417	int numBytes, int x, int y);
418	418	#endif
419	419	#ifndef Tk_DrawFocusHighlight_TCL_DECLARED
420	420	#define Tk_DrawFocusHighlight_TCL_DECLARED
421	421	/* 60 */
422		EXTERN void Tk_DrawFocusHighlight (Tk_Window tkwin, GC gc,
	422	EXTERN void Tk_DrawFocusHighlight (Tk_Window tkwin, GC gc,
423	423	int width, Drawable drawable);
424	424	#endif
425	425	#ifndef Tk_DrawTextLayout_TCL_DECLARED
426	426	#define Tk_DrawTextLayout_TCL_DECLARED
427	427	/* 61 */
428		EXTERN void Tk_DrawTextLayout (Display * display,
429		Drawable drawable, GC gc,
430		Tk_TextLayout layout, int x, int y,
	428	EXTERN void Tk_DrawTextLayout (Display * display,
	429	Drawable drawable, GC gc,
	430	Tk_TextLayout layout, int x, int y,
431	431	int firstChar, int lastChar);
432	432	#endif
433	433	#ifndef Tk_Fill3DPolygon_TCL_DECLARED
434	434	#define Tk_Fill3DPolygon_TCL_DECLARED
435	435	/* 62 */
436		EXTERN void Tk_Fill3DPolygon (Tk_Window tkwin, Drawable drawable,
437		Tk_3DBorder border, XPoint * pointPtr,
438		int numPoints, int borderWidth,
	436	EXTERN void Tk_Fill3DPolygon (Tk_Window tkwin, Drawable drawable,
	437	Tk_3DBorder border, XPoint * pointPtr,
	438	int numPoints, int borderWidth,
439	439	int leftRelief);
440	440	#endif
441	441	#ifndef Tk_Fill3DRectangle_TCL_DECLARED
442	442	#define Tk_Fill3DRectangle_TCL_DECLARED
443	443	/* 63 */
444		EXTERN void Tk_Fill3DRectangle (Tk_Window tkwin,
445		Drawable drawable, Tk_3DBorder border, int x,
446		int y, int width, int height,
	444	EXTERN void Tk_Fill3DRectangle (Tk_Window tkwin,
	445	Drawable drawable, Tk_3DBorder border, int x,
	446	int y, int width, int height,
447	447	int borderWidth, int relief);
448	448	#endif
449	449	#ifndef Tk_FindPhoto_TCL_DECLARED
450	450	#define Tk_FindPhoto_TCL_DECLARED
451	451	/* 64 */
452		EXTERN Tk_PhotoHandle Tk_FindPhoto (Tcl_Interp * interp,
453		CONST char * imageName);
	452	EXTERN Tk_PhotoHandle Tk_FindPhoto (Tcl_Interp * interp,
	453	const char * imageName);
454	454	#endif
455	455	#ifndef Tk_FontId_TCL_DECLARED
456	456	#define Tk_FontId_TCL_DECLARED

475	475	#ifndef Tk_FreeColormap_TCL_DECLARED
476	476	#define Tk_FreeColormap_TCL_DECLARED
477	477	/* 69 */
478		EXTERN void Tk_FreeColormap (Display * display,
	478	EXTERN void Tk_FreeColormap (Display * display,
479	479	Colormap colormap);
480	480	#endif
481	481	#ifndef Tk_FreeCursor_TCL_DECLARED

501	501	#ifndef Tk_FreeOptions_TCL_DECLARED
502	502	#define Tk_FreeOptions_TCL_DECLARED
503	503	/* 74 */
504		EXTERN void Tk_FreeOptions (Tk_ConfigSpec * specs,
505		char * widgRec, Display * display,
	504	EXTERN void Tk_FreeOptions (Tk_ConfigSpec * specs,
	505	char * widgRec, Display * display,
506	506	int needFlags);
507	507	#endif
508	508	#ifndef Tk_FreePixmap_TCL_DECLARED

528	528	#ifndef Tk_GeometryRequest_TCL_DECLARED
529	529	#define Tk_GeometryRequest_TCL_DECLARED
530	530	/* 79 */
531		EXTERN void Tk_GeometryRequest (Tk_Window tkwin, int reqWidth,
	531	EXTERN void Tk_GeometryRequest (Tk_Window tkwin, int reqWidth,
532	532	int reqHeight);
533	533	#endif
534	534	#ifndef Tk_Get3DBorder_TCL_DECLARED
535	535	#define Tk_Get3DBorder_TCL_DECLARED
536	536	/* 80 */
537		EXTERN Tk_3DBorder Tk_Get3DBorder (Tcl_Interp * interp, Tk_Window tkwin,
	537	EXTERN Tk_3DBorder Tk_Get3DBorder (Tcl_Interp * interp, Tk_Window tkwin,
538	538	Tk_Uid colorName);
539	539	#endif
540	540	#ifndef Tk_GetAllBindings_TCL_DECLARED
541	541	#define Tk_GetAllBindings_TCL_DECLARED
542	542	/* 81 */
543		EXTERN void Tk_GetAllBindings (Tcl_Interp * interp,
544		Tk_BindingTable bindingTable,
	543	EXTERN void Tk_GetAllBindings (Tcl_Interp * interp,
	544	Tk_BindingTable bindingTable,
545	545	ClientData object);
546	546	#endif
547	547	#ifndef Tk_GetAnchor_TCL_DECLARED
548	548	#define Tk_GetAnchor_TCL_DECLARED
549	549	/* 82 */
550		EXTERN int Tk_GetAnchor (Tcl_Interp * interp, CONST char * str,
	550	EXTERN int Tk_GetAnchor (Tcl_Interp * interp, const char * str,
551	551	Tk_Anchor * anchorPtr);
552	552	#endif
553	553	#ifndef Tk_GetAtomName_TCL_DECLARED

558	558	#ifndef Tk_GetBinding_TCL_DECLARED
559	559	#define Tk_GetBinding_TCL_DECLARED
560	560	/* 84 */
561		EXTERN CONST84_RETURN char * Tk_GetBinding (Tcl_Interp * interp,
562		Tk_BindingTable bindingTable,
563		ClientData object, CONST char * eventStr);
	561	EXTERN CONST84_RETURN char * Tk_GetBinding (Tcl_Interp * interp,
	562	Tk_BindingTable bindingTable,
	563	ClientData object, const char * eventStr);
564	564	#endif
565	565	#ifndef Tk_GetBitmap_TCL_DECLARED
566	566	#define Tk_GetBitmap_TCL_DECLARED
567	567	/* 85 */
568		EXTERN Pixmap Tk_GetBitmap (Tcl_Interp * interp, Tk_Window tkwin,
569		CONST char * str);
	568	EXTERN Pixmap Tk_GetBitmap (Tcl_Interp * interp, Tk_Window tkwin,
	569	const char * str);
570	570	#endif
571	571	#ifndef Tk_GetBitmapFromData_TCL_DECLARED
572	572	#define Tk_GetBitmapFromData_TCL_DECLARED
573	573	/* 86 */
574		EXTERN Pixmap Tk_GetBitmapFromData (Tcl_Interp * interp,
575		Tk_Window tkwin, CONST char * source,
	574	EXTERN Pixmap Tk_GetBitmapFromData (Tcl_Interp * interp,
	575	Tk_Window tkwin, const char * source,
576	576	int width, int height);
577	577	#endif
578	578	#ifndef Tk_GetCapStyle_TCL_DECLARED
579	579	#define Tk_GetCapStyle_TCL_DECLARED
580	580	/* 87 */
581		EXTERN int Tk_GetCapStyle (Tcl_Interp * interp,
582		CONST char * str, int * capPtr);
	581	EXTERN int Tk_GetCapStyle (Tcl_Interp * interp,
	582	const char * str, int * capPtr);
583	583	#endif
584	584	#ifndef Tk_GetColor_TCL_DECLARED
585	585	#define Tk_GetColor_TCL_DECLARED
586	586	/* 88 */
587		EXTERN XColor * Tk_GetColor (Tcl_Interp * interp, Tk_Window tkwin,
	587	EXTERN XColor * Tk_GetColor (Tcl_Interp * interp, Tk_Window tkwin,
588	588	Tk_Uid name);
589	589	#endif
590	590	#ifndef Tk_GetColorByValue_TCL_DECLARED
591	591	#define Tk_GetColorByValue_TCL_DECLARED
592	592	/* 89 */
593		EXTERN XColor * Tk_GetColorByValue (Tk_Window tkwin,
	593	EXTERN XColor * Tk_GetColorByValue (Tk_Window tkwin,
594	594	XColor * colorPtr);
595	595	#endif
596	596	#ifndef Tk_GetColormap_TCL_DECLARED
597	597	#define Tk_GetColormap_TCL_DECLARED
598	598	/* 90 */
599		EXTERN Colormap Tk_GetColormap (Tcl_Interp * interp, Tk_Window tkwin,
600		CONST char * str);
	599	EXTERN Colormap Tk_GetColormap (Tcl_Interp * interp, Tk_Window tkwin,
	600	const char * str);
601	601	#endif
602	602	#ifndef Tk_GetCursor_TCL_DECLARED
603	603	#define Tk_GetCursor_TCL_DECLARED
604	604	/* 91 */
605		EXTERN Tk_Cursor Tk_GetCursor (Tcl_Interp * interp, Tk_Window tkwin,
	605	EXTERN Tk_Cursor Tk_GetCursor (Tcl_Interp * interp, Tk_Window tkwin,
606	606	Tk_Uid str);
607	607	#endif
608	608	#ifndef Tk_GetCursorFromData_TCL_DECLARED
609	609	#define Tk_GetCursorFromData_TCL_DECLARED
610	610	/* 92 */
611		EXTERN Tk_Cursor Tk_GetCursorFromData (Tcl_Interp * interp,
612		Tk_Window tkwin, CONST char * source,
613		CONST char * mask, int width, int height,
	611	EXTERN Tk_Cursor Tk_GetCursorFromData (Tcl_Interp * interp,
	612	Tk_Window tkwin, const char * source,
	613	const char * mask, int width, int height,
614	614	int xHot, int yHot, Tk_Uid fg, Tk_Uid bg);
615	615	#endif
616	616	#ifndef Tk_GetFont_TCL_DECLARED
617	617	#define Tk_GetFont_TCL_DECLARED
618	618	/* 93 */
619		EXTERN Tk_Font Tk_GetFont (Tcl_Interp * interp, Tk_Window tkwin,
620		CONST char * str);
	619	EXTERN Tk_Font Tk_GetFont (Tcl_Interp * interp, Tk_Window tkwin,
	620	const char * str);
621	621	#endif
622	622	#ifndef Tk_GetFontFromObj_TCL_DECLARED
623	623	#define Tk_GetFontFromObj_TCL_DECLARED

627	627	#ifndef Tk_GetFontMetrics_TCL_DECLARED
628	628	#define Tk_GetFontMetrics_TCL_DECLARED
629	629	/* 95 */
630		EXTERN void Tk_GetFontMetrics (Tk_Font font,
	630	EXTERN void Tk_GetFontMetrics (Tk_Font font,
631	631	Tk_FontMetrics * fmPtr);
632	632	#endif
633	633	#ifndef Tk_GetGC_TCL_DECLARED
634	634	#define Tk_GetGC_TCL_DECLARED
635	635	/* 96 */
636		EXTERN GC Tk_GetGC (Tk_Window tkwin, unsigned long valueMask,
	636	EXTERN GC Tk_GetGC (Tk_Window tkwin, unsigned long valueMask,
637	637	XGCValues * valuePtr);
638	638	#endif
639	639	#ifndef Tk_GetImage_TCL_DECLARED
640	640	#define Tk_GetImage_TCL_DECLARED
641	641	/* 97 */
642		EXTERN Tk_Image Tk_GetImage (Tcl_Interp * interp, Tk_Window tkwin,
643		CONST char * name,
644		Tk_ImageChangedProc * changeProc,
	642	EXTERN Tk_Image Tk_GetImage (Tcl_Interp * interp, Tk_Window tkwin,
	643	const char * name,
	644	Tk_ImageChangedProc * changeProc,
645	645	ClientData clientData);
646	646	#endif
647	647	#ifndef Tk_GetImageMasterData_TCL_DECLARED
648	648	#define Tk_GetImageMasterData_TCL_DECLARED
649	649	/* 98 */
650		EXTERN ClientData Tk_GetImageMasterData (Tcl_Interp * interp,
651		CONST char * name,
652		Tk_ImageType ** typePtrPtr);
	650	EXTERN ClientData Tk_GetImageMasterData (Tcl_Interp * interp,
	651	const char * name,
	652	CONST86 Tk_ImageType ** typePtrPtr);
653	653	#endif
654	654	#ifndef Tk_GetItemTypes_TCL_DECLARED
655	655	#define Tk_GetItemTypes_TCL_DECLARED

659	659	#ifndef Tk_GetJoinStyle_TCL_DECLARED
660	660	#define Tk_GetJoinStyle_TCL_DECLARED
661	661	/* 100 */
662		EXTERN int Tk_GetJoinStyle (Tcl_Interp * interp,
663		CONST char * str, int * joinPtr);
	662	EXTERN int Tk_GetJoinStyle (Tcl_Interp * interp,
	663	const char * str, int * joinPtr);
664	664	#endif
665	665	#ifndef Tk_GetJustify_TCL_DECLARED
666	666	#define Tk_GetJustify_TCL_DECLARED
667	667	/* 101 */
668		EXTERN int Tk_GetJustify (Tcl_Interp * interp, CONST char * str,
	668	EXTERN int Tk_GetJustify (Tcl_Interp * interp, const char * str,
669	669	Tk_Justify * justifyPtr);
670	670	#endif
671	671	#ifndef Tk_GetNumMainWindows_TCL_DECLARED

676	676	#ifndef Tk_GetOption_TCL_DECLARED
677	677	#define Tk_GetOption_TCL_DECLARED
678	678	/* 103 */
679		EXTERN Tk_Uid Tk_GetOption (Tk_Window tkwin, CONST char * name,
680		CONST char * className);
	679	EXTERN Tk_Uid Tk_GetOption (Tk_Window tkwin, const char * name,
	680	const char * className);
681	681	#endif
682	682	#ifndef Tk_GetPixels_TCL_DECLARED
683	683	#define Tk_GetPixels_TCL_DECLARED
684	684	/* 104 */
685		EXTERN int Tk_GetPixels (Tcl_Interp * interp, Tk_Window tkwin,
686		CONST char * str, int * intPtr);
	685	EXTERN int Tk_GetPixels (Tcl_Interp * interp, Tk_Window tkwin,
	686	const char * str, int * intPtr);
687	687	#endif
688	688	#ifndef Tk_GetPixmap_TCL_DECLARED
689	689	#define Tk_GetPixmap_TCL_DECLARED
690	690	/* 105 */
691		EXTERN Pixmap Tk_GetPixmap (Display * display, Drawable d,
	691	EXTERN Pixmap Tk_GetPixmap (Display * display, Drawable d,
692	692	int width, int height, int depth);
693	693	#endif
694	694	#ifndef Tk_GetRelief_TCL_DECLARED
695	695	#define Tk_GetRelief_TCL_DECLARED
696	696	/* 106 */
697		EXTERN int Tk_GetRelief (Tcl_Interp * interp, CONST char * name,
	697	EXTERN int Tk_GetRelief (Tcl_Interp * interp, const char * name,
698	698	int * reliefPtr);
699	699	#endif
700	700	#ifndef Tk_GetRootCoords_TCL_DECLARED
701	701	#define Tk_GetRootCoords_TCL_DECLARED
702	702	/* 107 */
703		EXTERN void Tk_GetRootCoords (Tk_Window tkwin, int * xPtr,
	703	EXTERN void Tk_GetRootCoords (Tk_Window tkwin, int * xPtr,
704	704	int * yPtr);
705	705	#endif
706	706	#ifndef Tk_GetScrollInfo_TCL_DECLARED
707	707	#define Tk_GetScrollInfo_TCL_DECLARED
708	708	/* 108 */
709		EXTERN int Tk_GetScrollInfo (Tcl_Interp * interp, int argc,
710		CONST84 char ** argv, double * dblPtr,
	709	EXTERN int Tk_GetScrollInfo (Tcl_Interp * interp, int argc,
	710	CONST84 char ** argv, double * dblPtr,
711	711	int * intPtr);
712	712	#endif
713	713	#ifndef Tk_GetScreenMM_TCL_DECLARED
714	714	#define Tk_GetScreenMM_TCL_DECLARED
715	715	/* 109 */
716		EXTERN int Tk_GetScreenMM (Tcl_Interp * interp, Tk_Window tkwin,
717		CONST char * str, double * doublePtr);
	716	EXTERN int Tk_GetScreenMM (Tcl_Interp * interp, Tk_Window tkwin,
	717	const char * str, double * doublePtr);
718	718	#endif
719	719	#ifndef Tk_GetSelection_TCL_DECLARED
720	720	#define Tk_GetSelection_TCL_DECLARED
721	721	/* 110 */
722		EXTERN int Tk_GetSelection (Tcl_Interp * interp,
723		Tk_Window tkwin, Atom selection, Atom target,
	722	EXTERN int Tk_GetSelection (Tcl_Interp * interp,
	723	Tk_Window tkwin, Atom selection, Atom target,
724	724	Tk_GetSelProc * proc, ClientData clientData);
725	725	#endif
726	726	#ifndef Tk_GetUid_TCL_DECLARED
727	727	#define Tk_GetUid_TCL_DECLARED
728	728	/* 111 */
729		EXTERN Tk_Uid Tk_GetUid (CONST char * str);
	729	EXTERN Tk_Uid Tk_GetUid (const char * str);
730	730	#endif
731	731	#ifndef Tk_GetVisual_TCL_DECLARED
732	732	#define Tk_GetVisual_TCL_DECLARED
733	733	/* 112 */
734		EXTERN Visual * Tk_GetVisual (Tcl_Interp * interp, Tk_Window tkwin,
735		CONST char * str, int * depthPtr,
	734	EXTERN Visual * Tk_GetVisual (Tcl_Interp * interp, Tk_Window tkwin,
	735	const char * str, int * depthPtr,
736	736	Colormap * colormapPtr);
737	737	#endif
738	738	#ifndef Tk_GetVRootGeometry_TCL_DECLARED
739	739	#define Tk_GetVRootGeometry_TCL_DECLARED
740	740	/* 113 */
741		EXTERN void Tk_GetVRootGeometry (Tk_Window tkwin, int * xPtr,
	741	EXTERN void Tk_GetVRootGeometry (Tk_Window tkwin, int * xPtr,
742	742	int * yPtr, int * widthPtr, int * heightPtr);
743	743	#endif
744	744	#ifndef Tk_Grab_TCL_DECLARED
745	745	#define Tk_Grab_TCL_DECLARED
746	746	/* 114 */
747		EXTERN int Tk_Grab (Tcl_Interp * interp, Tk_Window tkwin,
	747	EXTERN int Tk_Grab (Tcl_Interp * interp, Tk_Window tkwin,
748	748	int grabGlobal);
749	749	#endif
750	750	#ifndef Tk_HandleEvent_TCL_DECLARED

760	760	#ifndef Tk_ImageChanged_TCL_DECLARED
761	761	#define Tk_ImageChanged_TCL_DECLARED
762	762	/* 117 */
763		EXTERN void Tk_ImageChanged (Tk_ImageMaster master, int x, int y,
764		int width, int height, int imageWidth,
	763	EXTERN void Tk_ImageChanged (Tk_ImageMaster master, int x, int y,
	764	int width, int height, int imageWidth,
765	765	int imageHeight);
766	766	#endif
767	767	#ifndef Tk_Init_TCL_DECLARED

772	772	#ifndef Tk_InternAtom_TCL_DECLARED
773	773	#define Tk_InternAtom_TCL_DECLARED
774	774	/* 119 */
775		EXTERN Atom Tk_InternAtom (Tk_Window tkwin, CONST char * name);
	775	EXTERN Atom Tk_InternAtom (Tk_Window tkwin, const char * name);
776	776	#endif
777	777	#ifndef Tk_IntersectTextLayout_TCL_DECLARED
778	778	#define Tk_IntersectTextLayout_TCL_DECLARED
779	779	/* 120 */
780		EXTERN int Tk_IntersectTextLayout (Tk_TextLayout layout, int x,
	780	EXTERN int Tk_IntersectTextLayout (Tk_TextLayout layout, int x,
781	781	int y, int width, int height);
782	782	#endif
783	783	#ifndef Tk_MaintainGeometry_TCL_DECLARED
784	784	#define Tk_MaintainGeometry_TCL_DECLARED
785	785	/* 121 */
786		EXTERN void Tk_MaintainGeometry (Tk_Window slave,
787		Tk_Window master, int x, int y, int width,
	786	EXTERN void Tk_MaintainGeometry (Tk_Window slave,
	787	Tk_Window master, int x, int y, int width,
788	788	int height);
789	789	#endif
790	790	#ifndef Tk_MainWindow_TCL_DECLARED

800	800	#ifndef Tk_ManageGeometry_TCL_DECLARED
801	801	#define Tk_ManageGeometry_TCL_DECLARED
802	802	/* 124 */
803		EXTERN void Tk_ManageGeometry (Tk_Window tkwin,
804		CONST Tk_GeomMgr * mgrPtr,
	803	EXTERN void Tk_ManageGeometry (Tk_Window tkwin,
	804	const Tk_GeomMgr * mgrPtr,
805	805	ClientData clientData);
806	806	#endif
807	807	#ifndef Tk_MapWindow_TCL_DECLARED

812	812	#ifndef Tk_MeasureChars_TCL_DECLARED
813	813	#define Tk_MeasureChars_TCL_DECLARED
814	814	/* 126 */
815		EXTERN int Tk_MeasureChars (Tk_Font tkfont, CONST char * source,
816		int numBytes, int maxPixels, int flags,
	815	EXTERN int Tk_MeasureChars (Tk_Font tkfont, const char * source,
	816	int numBytes, int maxPixels, int flags,
817	817	int * lengthPtr);
818	818	#endif
819	819	#ifndef Tk_MoveResizeWindow_TCL_DECLARED
820	820	#define Tk_MoveResizeWindow_TCL_DECLARED
821	821	/* 127 */
822		EXTERN void Tk_MoveResizeWindow (Tk_Window tkwin, int x, int y,
	822	EXTERN void Tk_MoveResizeWindow (Tk_Window tkwin, int x, int y,
823	823	int width, int height);
824	824	#endif
825	825	#ifndef Tk_MoveWindow_TCL_DECLARED

845	845	#ifndef Tk_NameOfBitmap_TCL_DECLARED
846	846	#define Tk_NameOfBitmap_TCL_DECLARED
847	847	/* 132 */
848		EXTERN CONST84_RETURN char * Tk_NameOfBitmap (Display * display,
	848	EXTERN CONST84_RETURN char * Tk_NameOfBitmap (Display * display,
849	849	Pixmap bitmap);
850	850	#endif
851	851	#ifndef Tk_NameOfCapStyle_TCL_DECLARED

861	861	#ifndef Tk_NameOfCursor_TCL_DECLARED
862	862	#define Tk_NameOfCursor_TCL_DECLARED
863	863	/* 135 */
864		EXTERN CONST84_RETURN char * Tk_NameOfCursor (Display * display,
	864	EXTERN CONST84_RETURN char * Tk_NameOfCursor (Display * display,
865	865	Tk_Cursor cursor);
866	866	#endif
867	867	#ifndef Tk_NameOfFont_TCL_DECLARED

892	892	#ifndef Tk_NameToWindow_TCL_DECLARED
893	893	#define Tk_NameToWindow_TCL_DECLARED
894	894	/* 141 */
895		EXTERN Tk_Window Tk_NameToWindow (Tcl_Interp * interp,
896		CONST char * pathName, Tk_Window tkwin);
	895	EXTERN Tk_Window Tk_NameToWindow (Tcl_Interp * interp,
	896	const char * pathName, Tk_Window tkwin);
897	897	#endif
898	898	#ifndef Tk_OwnSelection_TCL_DECLARED
899	899	#define Tk_OwnSelection_TCL_DECLARED
900	900	/* 142 */
901		EXTERN void Tk_OwnSelection (Tk_Window tkwin, Atom selection,
	901	EXTERN void Tk_OwnSelection (Tk_Window tkwin, Atom selection,
902	902	Tk_LostSelProc * proc, ClientData clientData);
903	903	#endif
904	904	#ifndef Tk_ParseArgv_TCL_DECLARED
905	905	#define Tk_ParseArgv_TCL_DECLARED
906	906	/* 143 */
907		EXTERN int Tk_ParseArgv (Tcl_Interp * interp, Tk_Window tkwin,
908		int * argcPtr, CONST84 char ** argv,
909		Tk_ArgvInfo * argTable, int flags);
	907	EXTERN int Tk_ParseArgv (Tcl_Interp * interp, Tk_Window tkwin,
	908	int * argcPtr, CONST84 char ** argv,
	909	const Tk_ArgvInfo * argTable, int flags);
910	910	#endif
911	911	#ifndef Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
912	912	#define Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
913	913	/* 144 */
914		EXTERN void Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle,
915		Tk_PhotoImageBlock * blockPtr, int x, int y,
	914	EXTERN void Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle,
	915	Tk_PhotoImageBlock * blockPtr, int x, int y,
916	916	int width, int height);
917	917	#endif
918	918	#ifndef Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
919	919	#define Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
920	920	/* 145 */
921	921	EXTERN void Tk_PhotoPutZoomedBlock_NoComposite (
922		Tk_PhotoHandle handle,
923		Tk_PhotoImageBlock * blockPtr, int x, int y,
924		int width, int height, int zoomX, int zoomY,
	922	Tk_PhotoHandle handle,
	923	Tk_PhotoImageBlock * blockPtr, int x, int y,
	924	int width, int height, int zoomX, int zoomY,
925	925	int subsampleX, int subsampleY);
926	926	#endif
927	927	#ifndef Tk_PhotoGetImage_TCL_DECLARED
928	928	#define Tk_PhotoGetImage_TCL_DECLARED
929	929	/* 146 */
930		EXTERN int Tk_PhotoGetImage (Tk_PhotoHandle handle,
	930	EXTERN int Tk_PhotoGetImage (Tk_PhotoHandle handle,
931	931	Tk_PhotoImageBlock * blockPtr);
932	932	#endif
933	933	#ifndef Tk_PhotoBlank_TCL_DECLARED

938	938	#ifndef Tk_PhotoExpand_Panic_TCL_DECLARED
939	939	#define Tk_PhotoExpand_Panic_TCL_DECLARED
940	940	/* 148 */
941		EXTERN void Tk_PhotoExpand_Panic (Tk_PhotoHandle handle,
	941	EXTERN void Tk_PhotoExpand_Panic (Tk_PhotoHandle handle,
942	942	int width, int height);
943	943	#endif
944	944	#ifndef Tk_PhotoGetSize_TCL_DECLARED
945	945	#define Tk_PhotoGetSize_TCL_DECLARED
946	946	/* 149 */
947		EXTERN void Tk_PhotoGetSize (Tk_PhotoHandle handle,
	947	EXTERN void Tk_PhotoGetSize (Tk_PhotoHandle handle,
948	948	int * widthPtr, int * heightPtr);
949	949	#endif
950	950	#ifndef Tk_PhotoSetSize_Panic_TCL_DECLARED
951	951	#define Tk_PhotoSetSize_Panic_TCL_DECLARED
952	952	/* 150 */
953		EXTERN void Tk_PhotoSetSize_Panic (Tk_PhotoHandle handle,
	953	EXTERN void Tk_PhotoSetSize_Panic (Tk_PhotoHandle handle,
954	954	int width, int height);
955	955	#endif
956	956	#ifndef Tk_PointToChar_TCL_DECLARED

961	961	#ifndef Tk_PostscriptFontName_TCL_DECLARED
962	962	#define Tk_PostscriptFontName_TCL_DECLARED
963	963	/* 152 */
964		EXTERN int Tk_PostscriptFontName (Tk_Font tkfont,
	964	EXTERN int Tk_PostscriptFontName (Tk_Font tkfont,
965	965	Tcl_DString * dsPtr);
966	966	#endif
967	967	#ifndef Tk_PreserveColormap_TCL_DECLARED
968	968	#define Tk_PreserveColormap_TCL_DECLARED
969	969	/* 153 */
970		EXTERN void Tk_PreserveColormap (Display * display,
	970	EXTERN void Tk_PreserveColormap (Display * display,
971	971	Colormap colormap);
972	972	#endif
973	973	#ifndef Tk_QueueWindowEvent_TCL_DECLARED
974	974	#define Tk_QueueWindowEvent_TCL_DECLARED
975	975	/* 154 */
976		EXTERN void Tk_QueueWindowEvent (XEvent * eventPtr,
	976	EXTERN void Tk_QueueWindowEvent (XEvent * eventPtr,
977	977	Tcl_QueuePosition position);
978	978	#endif
979	979	#ifndef Tk_RedrawImage_TCL_DECLARED
980	980	#define Tk_RedrawImage_TCL_DECLARED
981	981	/* 155 */
982		EXTERN void Tk_RedrawImage (Tk_Image image, int imageX,
983		int imageY, int width, int height,
984		Drawable drawable, int drawableX,
	982	EXTERN void Tk_RedrawImage (Tk_Image image, int imageX,
	983	int imageY, int width, int height,
	984	Drawable drawable, int drawableX,
985	985	int drawableY);
986	986	#endif
987	987	#ifndef Tk_ResizeWindow_TCL_DECLARED
988	988	#define Tk_ResizeWindow_TCL_DECLARED
989	989	/* 156 */
990		EXTERN void Tk_ResizeWindow (Tk_Window tkwin, int width,
	990	EXTERN void Tk_ResizeWindow (Tk_Window tkwin, int width,
991	991	int height);
992	992	#endif
993	993	#ifndef Tk_RestackWindow_TCL_DECLARED
994	994	#define Tk_RestackWindow_TCL_DECLARED
995	995	/* 157 */
996		EXTERN int Tk_RestackWindow (Tk_Window tkwin, int aboveBelow,
	996	EXTERN int Tk_RestackWindow (Tk_Window tkwin, int aboveBelow,
997	997	Tk_Window other);
998	998	#endif
999	999	#ifndef Tk_RestrictEvents_TCL_DECLARED
1000	1000	#define Tk_RestrictEvents_TCL_DECLARED
1001	1001	/* 158 */
1002		EXTERN Tk_RestrictProc * Tk_RestrictEvents (Tk_RestrictProc * proc,
	1002	EXTERN Tk_RestrictProc * Tk_RestrictEvents (Tk_RestrictProc * proc,
1003	1003	ClientData arg, ClientData * prevArgPtr);
1004	1004	#endif
1005	1005	#ifndef Tk_SafeInit_TCL_DECLARED

1010	1010	#ifndef Tk_SetAppName_TCL_DECLARED
1011	1011	#define Tk_SetAppName_TCL_DECLARED
1012	1012	/* 160 */
1013		EXTERN CONST char * Tk_SetAppName (Tk_Window tkwin, CONST char * name);
	1013	EXTERN const char * Tk_SetAppName (Tk_Window tkwin, const char * name);
1014	1014	#endif
1015	1015	#ifndef Tk_SetBackgroundFromBorder_TCL_DECLARED
1016	1016	#define Tk_SetBackgroundFromBorder_TCL_DECLARED
1017	1017	/* 161 */
1018		EXTERN void Tk_SetBackgroundFromBorder (Tk_Window tkwin,
	1018	EXTERN void Tk_SetBackgroundFromBorder (Tk_Window tkwin,
1019	1019	Tk_3DBorder border);
1020	1020	#endif
1021	1021	#ifndef Tk_SetClass_TCL_DECLARED
1022	1022	#define Tk_SetClass_TCL_DECLARED
1023	1023	/* 162 */
1024		EXTERN void Tk_SetClass (Tk_Window tkwin, CONST char * className);
	1024	EXTERN void Tk_SetClass (Tk_Window tkwin, const char * className);
1025	1025	#endif
1026	1026	#ifndef Tk_SetGrid_TCL_DECLARED
1027	1027	#define Tk_SetGrid_TCL_DECLARED
1028	1028	/* 163 */
1029		EXTERN void Tk_SetGrid (Tk_Window tkwin, int reqWidth,
	1029	EXTERN void Tk_SetGrid (Tk_Window tkwin, int reqWidth,
1030	1030	int reqHeight, int gridWidth, int gridHeight);
1031	1031	#endif
1032	1032	#ifndef Tk_SetInternalBorder_TCL_DECLARED

1037	1037	#ifndef Tk_SetWindowBackground_TCL_DECLARED
1038	1038	#define Tk_SetWindowBackground_TCL_DECLARED
1039	1039	/* 165 */
1040		EXTERN void Tk_SetWindowBackground (Tk_Window tkwin,
	1040	EXTERN void Tk_SetWindowBackground (Tk_Window tkwin,
1041	1041	unsigned long pixel);
1042	1042	#endif
1043	1043	#ifndef Tk_SetWindowBackgroundPixmap_TCL_DECLARED
1044	1044	#define Tk_SetWindowBackgroundPixmap_TCL_DECLARED
1045	1045	/* 166 */
1046		EXTERN void Tk_SetWindowBackgroundPixmap (Tk_Window tkwin,
	1046	EXTERN void Tk_SetWindowBackgroundPixmap (Tk_Window tkwin,
1047	1047	Pixmap pixmap);
1048	1048	#endif
1049	1049	#ifndef Tk_SetWindowBorder_TCL_DECLARED
1050	1050	#define Tk_SetWindowBorder_TCL_DECLARED
1051	1051	/* 167 */
1052		EXTERN void Tk_SetWindowBorder (Tk_Window tkwin,
	1052	EXTERN void Tk_SetWindowBorder (Tk_Window tkwin,
1053	1053	unsigned long pixel);
1054	1054	#endif
1055	1055	#ifndef Tk_SetWindowBorderWidth_TCL_DECLARED

1060	1060	#ifndef Tk_SetWindowBorderPixmap_TCL_DECLARED
1061	1061	#define Tk_SetWindowBorderPixmap_TCL_DECLARED
1062	1062	/* 169 */
1063		EXTERN void Tk_SetWindowBorderPixmap (Tk_Window tkwin,
	1063	EXTERN void Tk_SetWindowBorderPixmap (Tk_Window tkwin,
1064	1064	Pixmap pixmap);
1065	1065	#endif
1066	1066	#ifndef Tk_SetWindowColormap_TCL_DECLARED
1067	1067	#define Tk_SetWindowColormap_TCL_DECLARED
1068	1068	/* 170 */
1069		EXTERN void Tk_SetWindowColormap (Tk_Window tkwin,
	1069	EXTERN void Tk_SetWindowColormap (Tk_Window tkwin,
1070	1070	Colormap colormap);
1071	1071	#endif
1072	1072	#ifndef Tk_SetWindowVisual_TCL_DECLARED
1073	1073	#define Tk_SetWindowVisual_TCL_DECLARED
1074	1074	/* 171 */
1075		EXTERN int Tk_SetWindowVisual (Tk_Window tkwin, Visual * visual,
	1075	EXTERN int Tk_SetWindowVisual (Tk_Window tkwin, Visual * visual,
1076	1076	int depth, Colormap colormap);
1077	1077	#endif
1078	1078	#ifndef Tk_SizeOfBitmap_TCL_DECLARED
1079	1079	#define Tk_SizeOfBitmap_TCL_DECLARED
1080	1080	/* 172 */
1081		EXTERN void Tk_SizeOfBitmap (Display * display, Pixmap bitmap,
	1081	EXTERN void Tk_SizeOfBitmap (Display * display, Pixmap bitmap,
1082	1082	int * widthPtr, int * heightPtr);
1083	1083	#endif
1084	1084	#ifndef Tk_SizeOfImage_TCL_DECLARED
1085	1085	#define Tk_SizeOfImage_TCL_DECLARED
1086	1086	/* 173 */
1087		EXTERN void Tk_SizeOfImage (Tk_Image image, int * widthPtr,
	1087	EXTERN void Tk_SizeOfImage (Tk_Image image, int * widthPtr,
1088	1088	int * heightPtr);
1089	1089	#endif
1090	1090	#ifndef Tk_StrictMotif_TCL_DECLARED

1095	1095	#ifndef Tk_TextLayoutToPostscript_TCL_DECLARED
1096	1096	#define Tk_TextLayoutToPostscript_TCL_DECLARED
1097	1097	/* 175 */
1098		EXTERN void Tk_TextLayoutToPostscript (Tcl_Interp * interp,
	1098	EXTERN void Tk_TextLayoutToPostscript (Tcl_Interp * interp,
1099	1099	Tk_TextLayout layout);
1100	1100	#endif
1101	1101	#ifndef Tk_TextWidth_TCL_DECLARED
1102	1102	#define Tk_TextWidth_TCL_DECLARED
1103	1103	/* 176 */
1104		EXTERN int Tk_TextWidth (Tk_Font font, CONST char * str,
	1104	EXTERN int Tk_TextWidth (Tk_Font font, const char * str,
1105	1105	int numBytes);
1106	1106	#endif
1107	1107	#ifndef Tk_UndefineCursor_TCL_DECLARED

1112	1112	#ifndef Tk_UnderlineChars_TCL_DECLARED
1113	1113	#define Tk_UnderlineChars_TCL_DECLARED
1114	1114	/* 178 */
1115		EXTERN void Tk_UnderlineChars (Display * display,
1116		Drawable drawable, GC gc, Tk_Font tkfont,
1117		CONST char * source, int x, int y,
	1115	EXTERN void Tk_UnderlineChars (Display * display,
	1116	Drawable drawable, GC gc, Tk_Font tkfont,
	1117	const char * source, int x, int y,
1118	1118	int firstByte, int lastByte);
1119	1119	#endif
1120	1120	#ifndef Tk_UnderlineTextLayout_TCL_DECLARED
1121	1121	#define Tk_UnderlineTextLayout_TCL_DECLARED
1122	1122	/* 179 */
1123		EXTERN void Tk_UnderlineTextLayout (Display * display,
1124		Drawable drawable, GC gc,
1125		Tk_TextLayout layout, int x, int y,
	1123	EXTERN void Tk_UnderlineTextLayout (Display * display,
	1124	Drawable drawable, GC gc,
	1125	Tk_TextLayout layout, int x, int y,
1126	1126	int underline);
1127	1127	#endif
1128	1128	#ifndef Tk_Ungrab_TCL_DECLARED

1133	1133	#ifndef Tk_UnmaintainGeometry_TCL_DECLARED
1134	1134	#define Tk_UnmaintainGeometry_TCL_DECLARED
1135	1135	/* 181 */
1136		EXTERN void Tk_UnmaintainGeometry (Tk_Window slave,
	1136	EXTERN void Tk_UnmaintainGeometry (Tk_Window slave,
1137	1137	Tk_Window master);
1138	1138	#endif
1139	1139	#ifndef Tk_UnmapWindow_TCL_DECLARED

1149	1149	#ifndef Tk_UpdatePointer_TCL_DECLARED
1150	1150	#define Tk_UpdatePointer_TCL_DECLARED
1151	1151	/* 184 */
1152		EXTERN void Tk_UpdatePointer (Tk_Window tkwin, int x, int y,
	1152	EXTERN void Tk_UpdatePointer (Tk_Window tkwin, int x, int y,
1153	1153	int state);
1154	1154	#endif
1155	1155	#ifndef Tk_AllocBitmapFromObj_TCL_DECLARED
1156	1156	#define Tk_AllocBitmapFromObj_TCL_DECLARED
1157	1157	/* 185 */
1158		EXTERN Pixmap Tk_AllocBitmapFromObj (Tcl_Interp * interp,
	1158	EXTERN Pixmap Tk_AllocBitmapFromObj (Tcl_Interp * interp,
1159	1159	Tk_Window tkwin, Tcl_Obj * objPtr);
1160	1160	#endif
1161	1161	#ifndef Tk_Alloc3DBorderFromObj_TCL_DECLARED
1162	1162	#define Tk_Alloc3DBorderFromObj_TCL_DECLARED
1163	1163	/* 186 */
1164		EXTERN Tk_3DBorder Tk_Alloc3DBorderFromObj (Tcl_Interp * interp,
	1164	EXTERN Tk_3DBorder Tk_Alloc3DBorderFromObj (Tcl_Interp * interp,
1165	1165	Tk_Window tkwin, Tcl_Obj * objPtr);
1166	1166	#endif
1167	1167	#ifndef Tk_AllocColorFromObj_TCL_DECLARED
1168	1168	#define Tk_AllocColorFromObj_TCL_DECLARED
1169	1169	/* 187 */
1170		EXTERN XColor * Tk_AllocColorFromObj (Tcl_Interp * interp,
	1170	EXTERN XColor * Tk_AllocColorFromObj (Tcl_Interp * interp,
1171	1171	Tk_Window tkwin, Tcl_Obj * objPtr);
1172	1172	#endif
1173	1173	#ifndef Tk_AllocCursorFromObj_TCL_DECLARED
1174	1174	#define Tk_AllocCursorFromObj_TCL_DECLARED
1175	1175	/* 188 */
1176		EXTERN Tk_Cursor Tk_AllocCursorFromObj (Tcl_Interp * interp,
	1176	EXTERN Tk_Cursor Tk_AllocCursorFromObj (Tcl_Interp * interp,
1177	1177	Tk_Window tkwin, Tcl_Obj * objPtr);
1178	1178	#endif
1179	1179	#ifndef Tk_AllocFontFromObj_TCL_DECLARED
1180	1180	#define Tk_AllocFontFromObj_TCL_DECLARED
1181	1181	/* 189 */
1182		EXTERN Tk_Font Tk_AllocFontFromObj (Tcl_Interp * interp,
	1182	EXTERN Tk_Font Tk_AllocFontFromObj (Tcl_Interp * interp,
1183	1183	Tk_Window tkwin, Tcl_Obj * objPtr);
1184	1184	#endif
1185	1185	#ifndef Tk_CreateOptionTable_TCL_DECLARED
1186	1186	#define Tk_CreateOptionTable_TCL_DECLARED
1187	1187	/* 190 */
1188		EXTERN Tk_OptionTable Tk_CreateOptionTable (Tcl_Interp * interp,
1189		CONST Tk_OptionSpec * templatePtr);
	1188	EXTERN Tk_OptionTable Tk_CreateOptionTable (Tcl_Interp * interp,
	1189	const Tk_OptionSpec * templatePtr);
1190	1190	#endif
1191	1191	#ifndef Tk_DeleteOptionTable_TCL_DECLARED
1192	1192	#define Tk_DeleteOptionTable_TCL_DECLARED

1196	1196	#ifndef Tk_Free3DBorderFromObj_TCL_DECLARED
1197	1197	#define Tk_Free3DBorderFromObj_TCL_DECLARED
1198	1198	/* 192 */
1199		EXTERN void Tk_Free3DBorderFromObj (Tk_Window tkwin,
	1199	EXTERN void Tk_Free3DBorderFromObj (Tk_Window tkwin,
1200	1200	Tcl_Obj * objPtr);
1201	1201	#endif
1202	1202	#ifndef Tk_FreeBitmapFromObj_TCL_DECLARED
1203	1203	#define Tk_FreeBitmapFromObj_TCL_DECLARED
1204	1204	/* 193 */
1205		EXTERN void Tk_FreeBitmapFromObj (Tk_Window tkwin,
	1205	EXTERN void Tk_FreeBitmapFromObj (Tk_Window tkwin,
1206	1206	Tcl_Obj * objPtr);
1207	1207	#endif
1208	1208	#ifndef Tk_FreeColorFromObj_TCL_DECLARED
1209	1209	#define Tk_FreeColorFromObj_TCL_DECLARED
1210	1210	/* 194 */
1211		EXTERN void Tk_FreeColorFromObj (Tk_Window tkwin,
	1211	EXTERN void Tk_FreeColorFromObj (Tk_Window tkwin,
1212	1212	Tcl_Obj * objPtr);
1213	1213	#endif
1214	1214	#ifndef Tk_FreeConfigOptions_TCL_DECLARED
1215	1215	#define Tk_FreeConfigOptions_TCL_DECLARED
1216	1216	/* 195 */
1217		EXTERN void Tk_FreeConfigOptions (char * recordPtr,
	1217	EXTERN void Tk_FreeConfigOptions (char * recordPtr,
1218	1218	Tk_OptionTable optionToken, Tk_Window tkwin);
1219	1219	#endif
1220	1220	#ifndef Tk_FreeSavedOptions_TCL_DECLARED

1225	1225	#ifndef Tk_FreeCursorFromObj_TCL_DECLARED
1226	1226	#define Tk_FreeCursorFromObj_TCL_DECLARED
1227	1227	/* 197 */
1228		EXTERN void Tk_FreeCursorFromObj (Tk_Window tkwin,
	1228	EXTERN void Tk_FreeCursorFromObj (Tk_Window tkwin,
1229	1229	Tcl_Obj * objPtr);
1230	1230	#endif
1231	1231	#ifndef Tk_FreeFontFromObj_TCL_DECLARED
1232	1232	#define Tk_FreeFontFromObj_TCL_DECLARED
1233	1233	/* 198 */
1234		EXTERN void Tk_FreeFontFromObj (Tk_Window tkwin,
	1234	EXTERN void Tk_FreeFontFromObj (Tk_Window tkwin,
1235	1235	Tcl_Obj * objPtr);
1236	1236	#endif
1237	1237	#ifndef Tk_Get3DBorderFromObj_TCL_DECLARED
1238	1238	#define Tk_Get3DBorderFromObj_TCL_DECLARED
1239	1239	/* 199 */
1240		EXTERN Tk_3DBorder Tk_Get3DBorderFromObj (Tk_Window tkwin,
	1240	EXTERN Tk_3DBorder Tk_Get3DBorderFromObj (Tk_Window tkwin,
1241	1241	Tcl_Obj * objPtr);
1242	1242	#endif
1243	1243	#ifndef Tk_GetAnchorFromObj_TCL_DECLARED
1244	1244	#define Tk_GetAnchorFromObj_TCL_DECLARED
1245	1245	/* 200 */
1246		EXTERN int Tk_GetAnchorFromObj (Tcl_Interp * interp,
	1246	EXTERN int Tk_GetAnchorFromObj (Tcl_Interp * interp,
1247	1247	Tcl_Obj * objPtr, Tk_Anchor * anchorPtr);
1248	1248	#endif
1249	1249	#ifndef Tk_GetBitmapFromObj_TCL_DECLARED
1250	1250	#define Tk_GetBitmapFromObj_TCL_DECLARED
1251	1251	/* 201 */
1252		EXTERN Pixmap Tk_GetBitmapFromObj (Tk_Window tkwin,
	1252	EXTERN Pixmap Tk_GetBitmapFromObj (Tk_Window tkwin,
1253	1253	Tcl_Obj * objPtr);
1254	1254	#endif
1255	1255	#ifndef Tk_GetColorFromObj_TCL_DECLARED
1256	1256	#define Tk_GetColorFromObj_TCL_DECLARED
1257	1257	/* 202 */
1258		EXTERN XColor * Tk_GetColorFromObj (Tk_Window tkwin,
	1258	EXTERN XColor * Tk_GetColorFromObj (Tk_Window tkwin,
1259	1259	Tcl_Obj * objPtr);
1260	1260	#endif
1261	1261	#ifndef Tk_GetCursorFromObj_TCL_DECLARED
1262	1262	#define Tk_GetCursorFromObj_TCL_DECLARED
1263	1263	/* 203 */
1264		EXTERN Tk_Cursor Tk_GetCursorFromObj (Tk_Window tkwin,
	1264	EXTERN Tk_Cursor Tk_GetCursorFromObj (Tk_Window tkwin,
1265	1265	Tcl_Obj * objPtr);
1266	1266	#endif
1267	1267	#ifndef Tk_GetOptionInfo_TCL_DECLARED
1268	1268	#define Tk_GetOptionInfo_TCL_DECLARED
1269	1269	/* 204 */
1270		EXTERN Tcl_Obj * Tk_GetOptionInfo (Tcl_Interp * interp,
1271		char * recordPtr, Tk_OptionTable optionTable,
	1270	EXTERN Tcl_Obj * Tk_GetOptionInfo (Tcl_Interp * interp,
	1271	char * recordPtr, Tk_OptionTable optionTable,
1272	1272	Tcl_Obj * namePtr, Tk_Window tkwin);
1273	1273	#endif
1274	1274	#ifndef Tk_GetOptionValue_TCL_DECLARED
1275	1275	#define Tk_GetOptionValue_TCL_DECLARED
1276	1276	/* 205 */
1277		EXTERN Tcl_Obj * Tk_GetOptionValue (Tcl_Interp * interp,
1278		char * recordPtr, Tk_OptionTable optionTable,
	1277	EXTERN Tcl_Obj * Tk_GetOptionValue (Tcl_Interp * interp,
	1278	char * recordPtr, Tk_OptionTable optionTable,
1279	1279	Tcl_Obj * namePtr, Tk_Window tkwin);
1280	1280	#endif
1281	1281	#ifndef Tk_GetJustifyFromObj_TCL_DECLARED
1282	1282	#define Tk_GetJustifyFromObj_TCL_DECLARED
1283	1283	/* 206 */
1284		EXTERN int Tk_GetJustifyFromObj (Tcl_Interp * interp,
	1284	EXTERN int Tk_GetJustifyFromObj (Tcl_Interp * interp,
1285	1285	Tcl_Obj * objPtr, Tk_Justify * justifyPtr);
1286	1286	#endif
1287	1287	#ifndef Tk_GetMMFromObj_TCL_DECLARED
1288	1288	#define Tk_GetMMFromObj_TCL_DECLARED
1289	1289	/* 207 */
1290		EXTERN int Tk_GetMMFromObj (Tcl_Interp * interp,
1291		Tk_Window tkwin, Tcl_Obj * objPtr,
	1290	EXTERN int Tk_GetMMFromObj (Tcl_Interp * interp,
	1291	Tk_Window tkwin, Tcl_Obj * objPtr,
1292	1292	double * doublePtr);
1293	1293	#endif
1294	1294	#ifndef Tk_GetPixelsFromObj_TCL_DECLARED
1295	1295	#define Tk_GetPixelsFromObj_TCL_DECLARED
1296	1296	/* 208 */
1297		EXTERN int Tk_GetPixelsFromObj (Tcl_Interp * interp,
1298		Tk_Window tkwin, Tcl_Obj * objPtr,
	1297	EXTERN int Tk_GetPixelsFromObj (Tcl_Interp * interp,
	1298	Tk_Window tkwin, Tcl_Obj * objPtr,
1299	1299	int * intPtr);
1300	1300	#endif
1301	1301	#ifndef Tk_GetReliefFromObj_TCL_DECLARED
1302	1302	#define Tk_GetReliefFromObj_TCL_DECLARED
1303	1303	/* 209 */
1304		EXTERN int Tk_GetReliefFromObj (Tcl_Interp * interp,
	1304	EXTERN int Tk_GetReliefFromObj (Tcl_Interp * interp,
1305	1305	Tcl_Obj * objPtr, int * resultPtr);
1306	1306	#endif
1307	1307	#ifndef Tk_GetScrollInfoObj_TCL_DECLARED
1308	1308	#define Tk_GetScrollInfoObj_TCL_DECLARED
1309	1309	/* 210 */
1310		EXTERN int Tk_GetScrollInfoObj (Tcl_Interp * interp, int objc,
1311		Tcl_Obj CONST objv[], double dblPtr,
	1310	EXTERN int Tk_GetScrollInfoObj (Tcl_Interp * interp, int objc,
	1311	Tcl_Obj const objv[], double dblPtr,
1312	1312	int * intPtr);
1313	1313	#endif
1314	1314	#ifndef Tk_InitOptions_TCL_DECLARED
1315	1315	#define Tk_InitOptions_TCL_DECLARED
1316	1316	/* 211 */
1317		EXTERN int Tk_InitOptions (Tcl_Interp * interp,
1318		char * recordPtr, Tk_OptionTable optionToken,
	1317	EXTERN int Tk_InitOptions (Tcl_Interp * interp,
	1318	char * recordPtr, Tk_OptionTable optionToken,
1319	1319	Tk_Window tkwin);
1320	1320	#endif
1321	1321	#ifndef Tk_MainEx_TCL_DECLARED
1322	1322	#define Tk_MainEx_TCL_DECLARED
1323	1323	/* 212 */
1324		EXTERN void Tk_MainEx (int argc, char ** argv,
1325		Tcl_AppInitProc * appInitProc,
	1324	EXTERN void Tk_MainEx (int argc, char ** argv,
	1325	Tcl_AppInitProc * appInitProc,
1326	1326	Tcl_Interp * interp);
1327	1327	#endif
1328	1328	#ifndef Tk_RestoreSavedOptions_TCL_DECLARED

1333	1333	#ifndef Tk_SetOptions_TCL_DECLARED
1334	1334	#define Tk_SetOptions_TCL_DECLARED
1335	1335	/* 214 */
1336		EXTERN int Tk_SetOptions (Tcl_Interp * interp, char * recordPtr,
1337		Tk_OptionTable optionTable, int objc,
1338		Tcl_Obj *CONST objv[], Tk_Window tkwin,
	1336	EXTERN int Tk_SetOptions (Tcl_Interp * interp, char * recordPtr,
	1337	Tk_OptionTable optionTable, int objc,
	1338	Tcl_Obj *const objv[], Tk_Window tkwin,
1339	1339	Tk_SavedOptions * savePtr, int * maskPtr);
1340	1340	#endif
1341	1341	#ifndef Tk_InitConsoleChannels_TCL_DECLARED

1351	1351	#ifndef Tk_CreateSmoothMethod_TCL_DECLARED
1352	1352	#define Tk_CreateSmoothMethod_TCL_DECLARED
1353	1353	/* 217 */
1354		EXTERN void Tk_CreateSmoothMethod (Tcl_Interp * interp,
1355		Tk_SmoothMethod * method);
	1354	EXTERN void Tk_CreateSmoothMethod (Tcl_Interp * interp,
	1355	const Tk_SmoothMethod * method);
1356	1356	#endif
1357	1357	/* Slot 218 is reserved */
1358	1358	/* Slot 219 is reserved */
1359	1359	#ifndef Tk_GetDash_TCL_DECLARED
1360	1360	#define Tk_GetDash_TCL_DECLARED
1361	1361	/* 220 */
1362		EXTERN int Tk_GetDash (Tcl_Interp * interp, CONST char * value,
	1362	EXTERN int Tk_GetDash (Tcl_Interp * interp, const char * value,
1363	1363	Tk_Dash * dash);
1364	1364	#endif
1365	1365	#ifndef Tk_CreateOutline_TCL_DECLARED

1370	1370	#ifndef Tk_DeleteOutline_TCL_DECLARED
1371	1371	#define Tk_DeleteOutline_TCL_DECLARED
1372	1372	/* 222 */
1373		EXTERN void Tk_DeleteOutline (Display * display,
	1373	EXTERN void Tk_DeleteOutline (Display * display,
1374	1374	Tk_Outline * outline);
1375	1375	#endif
1376	1376	#ifndef Tk_ConfigOutlineGC_TCL_DECLARED
1377	1377	#define Tk_ConfigOutlineGC_TCL_DECLARED
1378	1378	/* 223 */
1379		EXTERN int Tk_ConfigOutlineGC (XGCValues * gcValues,
1380		Tk_Canvas canvas, Tk_Item * item,
	1379	EXTERN int Tk_ConfigOutlineGC (XGCValues * gcValues,
	1380	Tk_Canvas canvas, Tk_Item * item,
1381	1381	Tk_Outline * outline);
1382	1382	#endif
1383	1383	#ifndef Tk_ChangeOutlineGC_TCL_DECLARED
1384	1384	#define Tk_ChangeOutlineGC_TCL_DECLARED
1385	1385	/* 224 */
1386		EXTERN int Tk_ChangeOutlineGC (Tk_Canvas canvas, Tk_Item * item,
	1386	EXTERN int Tk_ChangeOutlineGC (Tk_Canvas canvas, Tk_Item * item,
1387	1387	Tk_Outline * outline);
1388	1388	#endif
1389	1389	#ifndef Tk_ResetOutlineGC_TCL_DECLARED
1390	1390	#define Tk_ResetOutlineGC_TCL_DECLARED
1391	1391	/* 225 */
1392		EXTERN int Tk_ResetOutlineGC (Tk_Canvas canvas, Tk_Item * item,
	1392	EXTERN int Tk_ResetOutlineGC (Tk_Canvas canvas, Tk_Item * item,
1393	1393	Tk_Outline * outline);
1394	1394	#endif
1395	1395	#ifndef Tk_CanvasPsOutline_TCL_DECLARED
1396	1396	#define Tk_CanvasPsOutline_TCL_DECLARED
1397	1397	/* 226 */
1398		EXTERN int Tk_CanvasPsOutline (Tk_Canvas canvas, Tk_Item * item,
	1398	EXTERN int Tk_CanvasPsOutline (Tk_Canvas canvas, Tk_Item * item,
1399	1399	Tk_Outline * outline);
1400	1400	#endif
1401	1401	#ifndef Tk_SetTSOrigin_TCL_DECLARED

1406	1406	#ifndef Tk_CanvasGetCoordFromObj_TCL_DECLARED
1407	1407	#define Tk_CanvasGetCoordFromObj_TCL_DECLARED
1408	1408	/* 228 */
1409		EXTERN int Tk_CanvasGetCoordFromObj (Tcl_Interp * interp,
1410		Tk_Canvas canvas, Tcl_Obj * obj,
	1409	EXTERN int Tk_CanvasGetCoordFromObj (Tcl_Interp * interp,
	1410	Tk_Canvas canvas, Tcl_Obj * obj,
1411	1411	double * doublePtr);
1412	1412	#endif
1413	1413	#ifndef Tk_CanvasSetOffset_TCL_DECLARED
1414	1414	#define Tk_CanvasSetOffset_TCL_DECLARED
1415	1415	/* 229 */
1416		EXTERN void Tk_CanvasSetOffset (Tk_Canvas canvas, GC gc,
	1416	EXTERN void Tk_CanvasSetOffset (Tk_Canvas canvas, GC gc,
1417	1417	Tk_TSOffset * offset);
1418	1418	#endif
1419	1419	#ifndef Tk_DitherPhoto_TCL_DECLARED
1420	1420	#define Tk_DitherPhoto_TCL_DECLARED
1421	1421	/* 230 */
1422		EXTERN void Tk_DitherPhoto (Tk_PhotoHandle handle, int x, int y,
	1422	EXTERN void Tk_DitherPhoto (Tk_PhotoHandle handle, int x, int y,
1423	1423	int width, int height);
1424	1424	#endif
1425	1425	#ifndef Tk_PostscriptBitmap_TCL_DECLARED
1426	1426	#define Tk_PostscriptBitmap_TCL_DECLARED
1427	1427	/* 231 */
1428		EXTERN int Tk_PostscriptBitmap (Tcl_Interp * interp,
1429		Tk_Window tkwin, Tk_PostscriptInfo psInfo,
1430		Pixmap bitmap, int startX, int startY,
	1428	EXTERN int Tk_PostscriptBitmap (Tcl_Interp * interp,
	1429	Tk_Window tkwin, Tk_PostscriptInfo psInfo,
	1430	Pixmap bitmap, int startX, int startY,
1431	1431	int width, int height);
1432	1432	#endif
1433	1433	#ifndef Tk_PostscriptColor_TCL_DECLARED
1434	1434	#define Tk_PostscriptColor_TCL_DECLARED
1435	1435	/* 232 */
1436		EXTERN int Tk_PostscriptColor (Tcl_Interp * interp,
	1436	EXTERN int Tk_PostscriptColor (Tcl_Interp * interp,
1437	1437	Tk_PostscriptInfo psInfo, XColor * colorPtr);
1438	1438	#endif
1439	1439	#ifndef Tk_PostscriptFont_TCL_DECLARED
1440	1440	#define Tk_PostscriptFont_TCL_DECLARED
1441	1441	/* 233 */
1442		EXTERN int Tk_PostscriptFont (Tcl_Interp * interp,
	1442	EXTERN int Tk_PostscriptFont (Tcl_Interp * interp,
1443	1443	Tk_PostscriptInfo psInfo, Tk_Font font);
1444	1444	#endif
1445	1445	#ifndef Tk_PostscriptImage_TCL_DECLARED
1446	1446	#define Tk_PostscriptImage_TCL_DECLARED
1447	1447	/* 234 */
1448		EXTERN int Tk_PostscriptImage (Tk_Image image,
1449		Tcl_Interp * interp, Tk_Window tkwin,
1450		Tk_PostscriptInfo psinfo, int x, int y,
	1448	EXTERN int Tk_PostscriptImage (Tk_Image image,
	1449	Tcl_Interp * interp, Tk_Window tkwin,
	1450	Tk_PostscriptInfo psinfo, int x, int y,
1451	1451	int width, int height, int prepass);
1452	1452	#endif
1453	1453	#ifndef Tk_PostscriptPath_TCL_DECLARED
1454	1454	#define Tk_PostscriptPath_TCL_DECLARED
1455	1455	/* 235 */
1456		EXTERN void Tk_PostscriptPath (Tcl_Interp * interp,
1457		Tk_PostscriptInfo psInfo, double * coordPtr,
	1456	EXTERN void Tk_PostscriptPath (Tcl_Interp * interp,
	1457	Tk_PostscriptInfo psInfo, double * coordPtr,
1458	1458	int numPoints);
1459	1459	#endif
1460	1460	#ifndef Tk_PostscriptStipple_TCL_DECLARED
1461	1461	#define Tk_PostscriptStipple_TCL_DECLARED
1462	1462	/* 236 */
1463		EXTERN int Tk_PostscriptStipple (Tcl_Interp * interp,
1464		Tk_Window tkwin, Tk_PostscriptInfo psInfo,
	1463	EXTERN int Tk_PostscriptStipple (Tcl_Interp * interp,
	1464	Tk_Window tkwin, Tk_PostscriptInfo psInfo,
1465	1465	Pixmap bitmap);
1466	1466	#endif
1467	1467	#ifndef Tk_PostscriptY_TCL_DECLARED

1472	1472	#ifndef Tk_PostscriptPhoto_TCL_DECLARED
1473	1473	#define Tk_PostscriptPhoto_TCL_DECLARED
1474	1474	/* 238 */
1475		EXTERN int Tk_PostscriptPhoto (Tcl_Interp * interp,
1476		Tk_PhotoImageBlock * blockPtr,
1477		Tk_PostscriptInfo psInfo, int width,
	1475	EXTERN int Tk_PostscriptPhoto (Tcl_Interp * interp,
	1476	Tk_PhotoImageBlock * blockPtr,
	1477	Tk_PostscriptInfo psInfo, int width,
1478	1478	int height);
1479	1479	#endif
1480	1480	#ifndef Tk_CreateClientMessageHandler_TCL_DECLARED

1492	1492	#ifndef Tk_CreateAnonymousWindow_TCL_DECLARED
1493	1493	#define Tk_CreateAnonymousWindow_TCL_DECLARED
1494	1494	/* 241 */
1495		EXTERN Tk_Window Tk_CreateAnonymousWindow (Tcl_Interp * interp,
1496		Tk_Window parent, CONST char * screenName);
	1495	EXTERN Tk_Window Tk_CreateAnonymousWindow (Tcl_Interp * interp,
	1496	Tk_Window parent, const char * screenName);
1497	1497	#endif
1498	1498	#ifndef Tk_SetClassProcs_TCL_DECLARED
1499	1499	#define Tk_SetClassProcs_TCL_DECLARED
1500	1500	/* 242 */
1501		EXTERN void Tk_SetClassProcs (Tk_Window tkwin,
1502		Tk_ClassProcs * procs,
	1501	EXTERN void Tk_SetClassProcs (Tk_Window tkwin,
	1502	Tk_ClassProcs * procs,
1503	1503	ClientData instanceData);
1504	1504	#endif
1505	1505	#ifndef Tk_SetInternalBorderEx_TCL_DECLARED
1506	1506	#define Tk_SetInternalBorderEx_TCL_DECLARED
1507	1507	/* 243 */
1508		EXTERN void Tk_SetInternalBorderEx (Tk_Window tkwin, int left,
	1508	EXTERN void Tk_SetInternalBorderEx (Tk_Window tkwin, int left,
1509	1509	int right, int top, int bottom);
1510	1510	#endif
1511	1511	#ifndef Tk_SetMinimumRequestSize_TCL_DECLARED
1512	1512	#define Tk_SetMinimumRequestSize_TCL_DECLARED
1513	1513	/* 244 */
1514		EXTERN void Tk_SetMinimumRequestSize (Tk_Window tkwin,
	1514	EXTERN void Tk_SetMinimumRequestSize (Tk_Window tkwin,
1515	1515	int minWidth, int minHeight);
1516	1516	#endif
1517	1517	#ifndef Tk_SetCaretPos_TCL_DECLARED
1518	1518	#define Tk_SetCaretPos_TCL_DECLARED
1519	1519	/* 245 */
1520		EXTERN void Tk_SetCaretPos (Tk_Window tkwin, int x, int y,
	1520	EXTERN void Tk_SetCaretPos (Tk_Window tkwin, int x, int y,
1521	1521	int height);
1522	1522	#endif
1523	1523	#ifndef Tk_PhotoPutBlock_Panic_TCL_DECLARED
1524	1524	#define Tk_PhotoPutBlock_Panic_TCL_DECLARED
1525	1525	/* 246 */
1526		EXTERN void Tk_PhotoPutBlock_Panic (Tk_PhotoHandle handle,
1527		Tk_PhotoImageBlock * blockPtr, int x, int y,
	1526	EXTERN void Tk_PhotoPutBlock_Panic (Tk_PhotoHandle handle,
	1527	Tk_PhotoImageBlock * blockPtr, int x, int y,
1528	1528	int width, int height, int compRule);
1529	1529	#endif
1530	1530	#ifndef Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
1531	1531	#define Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
1532	1532	/* 247 */
1533		EXTERN void Tk_PhotoPutZoomedBlock_Panic (Tk_PhotoHandle handle,
1534		Tk_PhotoImageBlock * blockPtr, int x, int y,
1535		int width, int height, int zoomX, int zoomY,
	1533	EXTERN void Tk_PhotoPutZoomedBlock_Panic (Tk_PhotoHandle handle,
	1534	Tk_PhotoImageBlock * blockPtr, int x, int y,
	1535	int width, int height, int zoomX, int zoomY,
1536	1536	int subsampleX, int subsampleY, int compRule);
1537	1537	#endif
1538	1538	#ifndef Tk_CollapseMotionEvents_TCL_DECLARED
1539	1539	#define Tk_CollapseMotionEvents_TCL_DECLARED
1540	1540	/* 248 */
1541		EXTERN int Tk_CollapseMotionEvents (Display * display,
	1541	EXTERN int Tk_CollapseMotionEvents (Display * display,
1542	1542	int collapse);
1543	1543	#endif
1544	1544	#ifndef Tk_RegisterStyleEngine_TCL_DECLARED
1545	1545	#define Tk_RegisterStyleEngine_TCL_DECLARED
1546	1546	/* 249 */
1547		EXTERN Tk_StyleEngine Tk_RegisterStyleEngine (CONST char * name,
	1547	EXTERN Tk_StyleEngine Tk_RegisterStyleEngine (const char * name,
1548	1548	Tk_StyleEngine parent);
1549	1549	#endif
1550	1550	#ifndef Tk_GetStyleEngine_TCL_DECLARED
1551	1551	#define Tk_GetStyleEngine_TCL_DECLARED
1552	1552	/* 250 */
1553		EXTERN Tk_StyleEngine Tk_GetStyleEngine (CONST char * name);
	1553	EXTERN Tk_StyleEngine Tk_GetStyleEngine (const char * name);
1554	1554	#endif
1555	1555	#ifndef Tk_RegisterStyledElement_TCL_DECLARED
1556	1556	#define Tk_RegisterStyledElement_TCL_DECLARED
1557	1557	/* 251 */
1558		EXTERN int Tk_RegisterStyledElement (Tk_StyleEngine engine,
	1558	EXTERN int Tk_RegisterStyledElement (Tk_StyleEngine engine,
1559	1559	Tk_ElementSpec * templatePtr);
1560	1560	#endif
1561	1561	#ifndef Tk_GetElementId_TCL_DECLARED
1562	1562	#define Tk_GetElementId_TCL_DECLARED
1563	1563	/* 252 */
1564		EXTERN int Tk_GetElementId (CONST char * name);
	1564	EXTERN int Tk_GetElementId (const char * name);
1565	1565	#endif
1566	1566	#ifndef Tk_CreateStyle_TCL_DECLARED
1567	1567	#define Tk_CreateStyle_TCL_DECLARED
1568	1568	/* 253 */
1569		EXTERN Tk_Style Tk_CreateStyle (CONST char * name,
	1569	EXTERN Tk_Style Tk_CreateStyle (const char * name,
1570	1570	Tk_StyleEngine engine, ClientData clientData);
1571	1571	#endif
1572	1572	#ifndef Tk_GetStyle_TCL_DECLARED
1573	1573	#define Tk_GetStyle_TCL_DECLARED
1574	1574	/* 254 */
1575		EXTERN Tk_Style Tk_GetStyle (Tcl_Interp * interp, CONST char * name);
	1575	EXTERN Tk_Style Tk_GetStyle (Tcl_Interp * interp, const char * name);
1576	1576	#endif
1577	1577	#ifndef Tk_FreeStyle_TCL_DECLARED
1578	1578	#define Tk_FreeStyle_TCL_DECLARED

1582	1582	#ifndef Tk_NameOfStyle_TCL_DECLARED
1583	1583	#define Tk_NameOfStyle_TCL_DECLARED
1584	1584	/* 256 */
1585		EXTERN CONST char * Tk_NameOfStyle (Tk_Style style);
	1585	EXTERN const char * Tk_NameOfStyle (Tk_Style style);
1586	1586	#endif
1587	1587	#ifndef Tk_AllocStyleFromObj_TCL_DECLARED
1588	1588	#define Tk_AllocStyleFromObj_TCL_DECLARED
1589	1589	/* 257 */
1590		EXTERN Tk_Style Tk_AllocStyleFromObj (Tcl_Interp * interp,
	1590	EXTERN Tk_Style Tk_AllocStyleFromObj (Tcl_Interp * interp,
1591	1591	Tcl_Obj * objPtr);
1592	1592	#endif
1593	1593	#ifndef Tk_GetStyleFromObj_TCL_DECLARED

1603	1603	#ifndef Tk_GetStyledElement_TCL_DECLARED
1604	1604	#define Tk_GetStyledElement_TCL_DECLARED
1605	1605	/* 260 */
1606		EXTERN Tk_StyledElement Tk_GetStyledElement (Tk_Style style, int elementId,
	1606	EXTERN Tk_StyledElement Tk_GetStyledElement (Tk_Style style, int elementId,
1607	1607	Tk_OptionTable optionTable);
1608	1608	#endif
1609	1609	#ifndef Tk_GetElementSize_TCL_DECLARED
1610	1610	#define Tk_GetElementSize_TCL_DECLARED
1611	1611	/* 261 */
1612		EXTERN void Tk_GetElementSize (Tk_Style style,
1613		Tk_StyledElement element, char * recordPtr,
1614		Tk_Window tkwin, int width, int height,
	1612	EXTERN void Tk_GetElementSize (Tk_Style style,
	1613	Tk_StyledElement element, char * recordPtr,
	1614	Tk_Window tkwin, int width, int height,
1615	1615	int inner, int * widthPtr, int * heightPtr);
1616	1616	#endif
1617	1617	#ifndef Tk_GetElementBox_TCL_DECLARED
1618	1618	#define Tk_GetElementBox_TCL_DECLARED
1619	1619	/* 262 */
1620		EXTERN void Tk_GetElementBox (Tk_Style style,
1621		Tk_StyledElement element, char * recordPtr,
1622		Tk_Window tkwin, int x, int y, int width,
1623		int height, int inner, int * xPtr,
	1620	EXTERN void Tk_GetElementBox (Tk_Style style,
	1621	Tk_StyledElement element, char * recordPtr,
	1622	Tk_Window tkwin, int x, int y, int width,
	1623	int height, int inner, int * xPtr,
1624	1624	int * yPtr, int * widthPtr, int * heightPtr);
1625	1625	#endif
1626	1626	#ifndef Tk_GetElementBorderWidth_TCL_DECLARED
1627	1627	#define Tk_GetElementBorderWidth_TCL_DECLARED
1628	1628	/* 263 */
1629		EXTERN int Tk_GetElementBorderWidth (Tk_Style style,
1630		Tk_StyledElement element, char * recordPtr,
	1629	EXTERN int Tk_GetElementBorderWidth (Tk_Style style,
	1630	Tk_StyledElement element, char * recordPtr,
1631	1631	Tk_Window tkwin);
1632	1632	#endif
1633	1633	#ifndef Tk_DrawElement_TCL_DECLARED
1634	1634	#define Tk_DrawElement_TCL_DECLARED
1635	1635	/* 264 */
1636		EXTERN void Tk_DrawElement (Tk_Style style,
1637		Tk_StyledElement element, char * recordPtr,
1638		Tk_Window tkwin, Drawable d, int x, int y,
	1636	EXTERN void Tk_DrawElement (Tk_Style style,
	1637	Tk_StyledElement element, char * recordPtr,
	1638	Tk_Window tkwin, Drawable d, int x, int y,
1639	1639	int width, int height, int state);
1640	1640	#endif
1641	1641	#ifndef Tk_PhotoExpand_TCL_DECLARED
1642	1642	#define Tk_PhotoExpand_TCL_DECLARED
1643	1643	/* 265 */
1644		EXTERN int Tk_PhotoExpand (Tcl_Interp * interp,
	1644	EXTERN int Tk_PhotoExpand (Tcl_Interp * interp,
1645	1645	Tk_PhotoHandle handle, int width, int height);
1646	1646	#endif
1647	1647	#ifndef Tk_PhotoPutBlock_TCL_DECLARED
1648	1648	#define Tk_PhotoPutBlock_TCL_DECLARED
1649	1649	/* 266 */
1650		EXTERN int Tk_PhotoPutBlock (Tcl_Interp * interp,
1651		Tk_PhotoHandle handle,
1652		Tk_PhotoImageBlock * blockPtr, int x, int y,
	1650	EXTERN int Tk_PhotoPutBlock (Tcl_Interp * interp,
	1651	Tk_PhotoHandle handle,
	1652	Tk_PhotoImageBlock * blockPtr, int x, int y,
1653	1653	int width, int height, int compRule);
1654	1654	#endif
1655	1655	#ifndef Tk_PhotoPutZoomedBlock_TCL_DECLARED
1656	1656	#define Tk_PhotoPutZoomedBlock_TCL_DECLARED
1657	1657	/* 267 */
1658		EXTERN int Tk_PhotoPutZoomedBlock (Tcl_Interp * interp,
1659		Tk_PhotoHandle handle,
1660		Tk_PhotoImageBlock * blockPtr, int x, int y,
1661		int width, int height, int zoomX, int zoomY,
	1658	EXTERN int Tk_PhotoPutZoomedBlock (Tcl_Interp * interp,
	1659	Tk_PhotoHandle handle,
	1660	Tk_PhotoImageBlock * blockPtr, int x, int y,
	1661	int width, int height, int zoomX, int zoomY,
1662	1662	int subsampleX, int subsampleY, int compRule);
1663	1663	#endif
1664	1664	#ifndef Tk_PhotoSetSize_TCL_DECLARED
1665	1665	#define Tk_PhotoSetSize_TCL_DECLARED
1666	1666	/* 268 */
1667		EXTERN int Tk_PhotoSetSize (Tcl_Interp * interp,
	1667	EXTERN int Tk_PhotoSetSize (Tcl_Interp * interp,
1668	1668	Tk_PhotoHandle handle, int width, int height);
1669	1669	#endif
1670	1670	#ifndef Tk_GetUserInactiveTime_TCL_DECLARED

1685	1685	#ifndef Tk_CreateOldImageType_TCL_DECLARED
1686	1686	#define Tk_CreateOldImageType_TCL_DECLARED
1687	1687	/* 272 */
1688		EXTERN void Tk_CreateOldImageType (Tk_ImageType * typePtr);
	1688	EXTERN void Tk_CreateOldImageType (const Tk_ImageType * typePtr);
1689	1689	#endif
1690	1690	#ifndef Tk_CreateOldPhotoImageFormat_TCL_DECLARED
1691	1691	#define Tk_CreateOldPhotoImageFormat_TCL_DECLARED
1692	1692	/* 273 */
1693	1693	EXTERN void Tk_CreateOldPhotoImageFormat (
1694		Tk_PhotoImageFormat * formatPtr);
	1694	const Tk_PhotoImageFormat * formatPtr);
1695	1695	#endif
1696	1696
1697	1697	typedef struct TkStubHooks {
1698		CONST struct TkPlatStubs *tkPlatStubs;
1699		CONST struct TkIntStubs *tkIntStubs;
1700		CONST struct TkIntPlatStubs *tkIntPlatStubs;
1701		CONST struct TkIntXlibStubs *tkIntXlibStubs;
	1698	const struct TkPlatStubs *tkPlatStubs;
	1699	const struct TkIntStubs *tkIntStubs;
	1700	const struct TkIntPlatStubs *tkIntPlatStubs;
	1701	const struct TkIntXlibStubs *tkIntXlibStubs;
1702	1702	} TkStubHooks;
1703	1703
1704	1704	typedef struct TkStubs {
1705	1705	int magic;
1706		CONST struct TkStubHooks *hooks;
	1706	const struct TkStubHooks *hooks;
1707	1707
1708	1708	void (tk_MainLoop) (void); / 0 */
1709	1709	XColor * (tk_3DBorderColor) (Tk_3DBorder border); / 1 */
1710	1710	GC (tk_3DBorderGC) (Tk_Window tkwin, Tk_3DBorder border, int which); / 2 */
1711	1711	void (tk_3DHorizontalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief); / 3 */
1712	1712	void (tk_3DVerticalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief); / 4 */
1713		void (tk_AddOption) (Tk_Window tkwin, CONST char name, CONST char * value, int priority); /* 5 */
	1713	void (tk_AddOption) (Tk_Window tkwin, const char name, const char * value, int priority); /* 5 */
1714	1714	void (tk_BindEvent) (Tk_BindingTable bindingTable, XEvent eventPtr, Tk_Window tkwin, int numObjects, ClientData * objectPtr); /* 6 */
1715	1715	void (tk_CanvasDrawableCoords) (Tk_Canvas canvas, double x, double y, short drawableXPtr, short * drawableYPtr); /* 7 */
1716	1716	void (tk_CanvasEventuallyRedraw) (Tk_Canvas canvas, int x1, int y1, int x2, int y2); / 8 */
1717		int (tk_CanvasGetCoord) (Tcl_Interp interp, Tk_Canvas canvas, CONST char * str, double * doublePtr); /* 9 */
	1717	int (tk_CanvasGetCoord) (Tcl_Interp interp, Tk_Canvas canvas, const char * str, double * doublePtr); /* 9 */
1718	1718	Tk_CanvasTextInfo * (tk_CanvasGetTextInfo) (Tk_Canvas canvas); / 10 */
1719	1719	int (tk_CanvasPsBitmap) (Tcl_Interp interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); /* 11 */
1720	1720	int (tk_CanvasPsColor) (Tcl_Interp interp, Tk_Canvas canvas, XColor * colorPtr); /* 12 */

1723	1723	int (tk_CanvasPsStipple) (Tcl_Interp interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */
1724	1724	double (tk_CanvasPsY) (Tk_Canvas canvas, double y); / 16 */
1725	1725	void (tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); / 17 */
1726		int (tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp interp, Tk_Window tkwin, CONST char * value, char * widgRec, int offset); /* 18 */
1727		char * (tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 19 */
	1726	int (tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp interp, Tk_Window tkwin, const char * value, char * widgRec, int offset); /* 18 */
	1727	CONST86 char * (tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 19 */
1728	1728	Tk_Window (tk_CanvasTkwin) (Tk_Canvas canvas); / 20 */
1729	1729	void (tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short screenXPtr, short * screenYPtr); /* 21 */
1730	1730	void (tk_ChangeWindowAttributes) (Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes attsPtr); /* 22 */

1732	1732	void (tk_ClearSelection) (Tk_Window tkwin, Atom selection); / 24 */
1733	1733	int (tk_ClipboardAppend) (Tcl_Interp interp, Tk_Window tkwin, Atom target, Atom format, char* buffer); /* 25 */
1734	1734	int (tk_ClipboardClear) (Tcl_Interp interp, Tk_Window tkwin); /* 26 */
1735		int (tk_ConfigureInfo) (Tcl_Interp interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags); /* 27 */
1736		int (tk_ConfigureValue) (Tcl_Interp interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags); /* 28 */
	1735	int (tk_ConfigureInfo) (Tcl_Interp interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, const char * argvName, int flags); /* 27 */
	1736	int (tk_ConfigureValue) (Tcl_Interp interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, const char * argvName, int flags); /* 28 */
1737	1737	int (tk_ConfigureWidget) (Tcl_Interp interp, Tk_Window tkwin, Tk_ConfigSpec * specs, int argc, CONST84 char ** argv, char * widgRec, int flags); /* 29 */
1738	1738	void (tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges valuePtr); /* 30 */
1739		Tk_TextLayout (tk_ComputeTextLayout) (Tk_Font font, CONST char str, int numChars, int wrapLength, Tk_Justify justify, int flags, int * widthPtr, int * heightPtr); /* 31 */
	1739	Tk_TextLayout (tk_ComputeTextLayout) (Tk_Font font, const char str, int numChars, int wrapLength, Tk_Justify justify, int flags, int * widthPtr, int * heightPtr); /* 31 */
1740	1740	Tk_Window (tk_CoordsToWindow) (int rootX, int rootY, Tk_Window tkwin); / 32 */
1741		unsigned long (tk_CreateBinding) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr, CONST char * command, int append); /* 33 */
	1741	unsigned long (tk_CreateBinding) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, const char * eventStr, const char * command, int append); /* 33 */
1742	1742	Tk_BindingTable (tk_CreateBindingTable) (Tcl_Interp interp); /* 34 */
1743	1743	Tk_ErrorHandler (tk_CreateErrorHandler) (Display display, int errNum, int request, int minorCode, Tk_ErrorProc * errorProc, ClientData clientData); /* 35 */
1744	1744	void (tk_CreateEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc proc, ClientData clientData); /* 36 */
1745	1745	void (tk_CreateGenericHandler) (Tk_GenericProc proc, ClientData clientData); /* 37 */
1746		void (tk_CreateImageType) (Tk_ImageType typePtr); /* 38 */
	1746	void (tk_CreateImageType) (const Tk_ImageType typePtr); /* 38 */
1747	1747	void (tk_CreateItemType) (Tk_ItemType typePtr); /* 39 */
1748		void (tk_CreatePhotoImageFormat) (Tk_PhotoImageFormat formatPtr); /* 40 */
	1748	void (tk_CreatePhotoImageFormat) (const Tk_PhotoImageFormat formatPtr); /* 40 */
1749	1749	void (tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc proc, ClientData clientData, Atom format); /* 41 */
1750		Tk_Window (tk_CreateWindow) (Tcl_Interp interp, Tk_Window parent, CONST char * name, CONST char * screenName); /* 42 */
1751		Tk_Window (tk_CreateWindowFromPath) (Tcl_Interp interp, Tk_Window tkwin, CONST char * pathName, CONST char * screenName); /* 43 */
1752		int (tk_DefineBitmap) (Tcl_Interp interp, CONST char * name, CONST char * source, int width, int height); /* 44 */
	1750	Tk_Window (tk_CreateWindow) (Tcl_Interp interp, Tk_Window parent, const char * name, const char * screenName); /* 42 */
	1751	Tk_Window (tk_CreateWindowFromPath) (Tcl_Interp interp, Tk_Window tkwin, const char * pathName, const char * screenName); /* 43 */
	1752	int (tk_DefineBitmap) (Tcl_Interp interp, const char * name, const char * source, int width, int height); /* 44 */
1753	1753	void (tk_DefineCursor) (Tk_Window window, Tk_Cursor cursor); / 45 */
1754	1754	void (tk_DeleteAllBindings) (Tk_BindingTable bindingTable, ClientData object); / 46 */
1755		int (tk_DeleteBinding) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr); /* 47 */
	1755	int (tk_DeleteBinding) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, const char * eventStr); /* 47 */
1756	1756	void (tk_DeleteBindingTable) (Tk_BindingTable bindingTable); / 48 */
1757	1757	void (tk_DeleteErrorHandler) (Tk_ErrorHandler handler); / 49 */
1758	1758	void (tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc proc, ClientData clientData); /* 50 */
1759	1759	void (tk_DeleteGenericHandler) (Tk_GenericProc proc, ClientData clientData); /* 51 */
1760		void (tk_DeleteImage) (Tcl_Interp interp, CONST char * name); /* 52 */
	1760	void (tk_DeleteImage) (Tcl_Interp interp, const char * name); /* 52 */
1761	1761	void (tk_DeleteSelHandler) (Tk_Window tkwin, Atom selection, Atom target); / 53 */
1762	1762	void (tk_DestroyWindow) (Tk_Window tkwin); / 54 */
1763	1763	CONST84_RETURN char * (tk_DisplayName) (Tk_Window tkwin); / 55 */
1764	1764	int (tk_DistanceToTextLayout) (Tk_TextLayout layout, int x, int y); / 56 */
1765	1765	void (tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */
1766	1766	void (tk_Draw3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); / 58 */
1767		void (tk_DrawChars) (Display display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int numBytes, int x, int y); /* 59 */
	1767	void (tk_DrawChars) (Display display, Drawable drawable, GC gc, Tk_Font tkfont, const char * source, int numBytes, int x, int y); /* 59 */
1768	1768	void (tk_DrawFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable); / 60 */
1769	1769	void (tk_DrawTextLayout) (Display display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); /* 61 */
1770	1770	void (tk_Fill3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint pointPtr, int numPoints, int borderWidth, int leftRelief); /* 62 */
1771	1771	void (tk_Fill3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); / 63 */
1772		Tk_PhotoHandle (tk_FindPhoto) (Tcl_Interp interp, CONST char * imageName); /* 64 */
	1772	Tk_PhotoHandle (tk_FindPhoto) (Tcl_Interp interp, const char * imageName); /* 64 */
1773	1773	Font (tk_FontId) (Tk_Font font); / 65 */
1774	1774	void (tk_Free3DBorder) (Tk_3DBorder border); / 66 */
1775	1775	void (tk_FreeBitmap) (Display display, Pixmap bitmap); /* 67 */

1787	1787	void (tk_GeometryRequest) (Tk_Window tkwin, int reqWidth, int reqHeight); / 79 */
1788	1788	Tk_3DBorder (tk_Get3DBorder) (Tcl_Interp interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */
1789	1789	void (tk_GetAllBindings) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */
1790		int (tk_GetAnchor) (Tcl_Interp interp, CONST char * str, Tk_Anchor * anchorPtr); /* 82 */
	1790	int (tk_GetAnchor) (Tcl_Interp interp, const char * str, Tk_Anchor * anchorPtr); /* 82 */
1791	1791	CONST84_RETURN char * (tk_GetAtomName) (Tk_Window tkwin, Atom atom); / 83 */
1792		CONST84_RETURN char * (tk_GetBinding) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr); /* 84 */
1793		Pixmap (tk_GetBitmap) (Tcl_Interp interp, Tk_Window tkwin, CONST char * str); /* 85 */
1794		Pixmap (tk_GetBitmapFromData) (Tcl_Interp interp, Tk_Window tkwin, CONST char * source, int width, int height); /* 86 */
1795		int (tk_GetCapStyle) (Tcl_Interp interp, CONST char * str, int * capPtr); /* 87 */
	1792	CONST84_RETURN char * (tk_GetBinding) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, const char * eventStr); /* 84 */
	1793	Pixmap (tk_GetBitmap) (Tcl_Interp interp, Tk_Window tkwin, const char * str); /* 85 */
	1794	Pixmap (tk_GetBitmapFromData) (Tcl_Interp interp, Tk_Window tkwin, const char * source, int width, int height); /* 86 */
	1795	int (tk_GetCapStyle) (Tcl_Interp interp, const char * str, int * capPtr); /* 87 */
1796	1796	XColor * (tk_GetColor) (Tcl_Interp interp, Tk_Window tkwin, Tk_Uid name); /* 88 */
1797	1797	XColor * (tk_GetColorByValue) (Tk_Window tkwin, XColor colorPtr); /* 89 */
1798		Colormap (tk_GetColormap) (Tcl_Interp interp, Tk_Window tkwin, CONST char * str); /* 90 */
	1798	Colormap (tk_GetColormap) (Tcl_Interp interp, Tk_Window tkwin, const char * str); /* 90 */
1799	1799	Tk_Cursor (tk_GetCursor) (Tcl_Interp interp, Tk_Window tkwin, Tk_Uid str); /* 91 */
1800		Tk_Cursor (tk_GetCursorFromData) (Tcl_Interp interp, Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
1801		Tk_Font (tk_GetFont) (Tcl_Interp interp, Tk_Window tkwin, CONST char * str); /* 93 */
	1800	Tk_Cursor (tk_GetCursorFromData) (Tcl_Interp interp, Tk_Window tkwin, const char * source, const char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
	1801	Tk_Font (tk_GetFont) (Tcl_Interp interp, Tk_Window tkwin, const char * str); /* 93 */
1802	1802	Tk_Font (tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj objPtr); /* 94 */
1803	1803	void (tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics fmPtr); /* 95 */
1804	1804	GC (tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues valuePtr); /* 96 */
1805		Tk_Image (tk_GetImage) (Tcl_Interp interp, Tk_Window tkwin, CONST char * name, Tk_ImageChangedProc * changeProc, ClientData clientData); /* 97 */
1806		ClientData (tk_GetImageMasterData) (Tcl_Interp interp, CONST char * name, Tk_ImageType ** typePtrPtr); /* 98 */
	1805	Tk_Image (tk_GetImage) (Tcl_Interp interp, Tk_Window tkwin, const char * name, Tk_ImageChangedProc * changeProc, ClientData clientData); /* 97 */
	1806	ClientData (tk_GetImageMasterData) (Tcl_Interp interp, const char * name, CONST86 Tk_ImageType ** typePtrPtr); /* 98 */
1807	1807	Tk_ItemType * (tk_GetItemTypes) (void); / 99 */
1808		int (tk_GetJoinStyle) (Tcl_Interp interp, CONST char * str, int * joinPtr); /* 100 */
1809		int (tk_GetJustify) (Tcl_Interp interp, CONST char * str, Tk_Justify * justifyPtr); /* 101 */
	1808	int (tk_GetJoinStyle) (Tcl_Interp interp, const char * str, int * joinPtr); /* 100 */
	1809	int (tk_GetJustify) (Tcl_Interp interp, const char * str, Tk_Justify * justifyPtr); /* 101 */
1810	1810	int (tk_GetNumMainWindows) (void); / 102 */
1811		Tk_Uid (tk_GetOption) (Tk_Window tkwin, CONST char name, CONST char * className); /* 103 */
1812		int (tk_GetPixels) (Tcl_Interp interp, Tk_Window tkwin, CONST char * str, int * intPtr); /* 104 */
	1811	Tk_Uid (tk_GetOption) (Tk_Window tkwin, const char name, const char * className); /* 103 */
	1812	int (tk_GetPixels) (Tcl_Interp interp, Tk_Window tkwin, const char * str, int * intPtr); /* 104 */
1813	1813	Pixmap (tk_GetPixmap) (Display display, Drawable d, int width, int height, int depth); /* 105 */
1814		int (tk_GetRelief) (Tcl_Interp interp, CONST char * name, int * reliefPtr); /* 106 */
	1814	int (tk_GetRelief) (Tcl_Interp interp, const char * name, int * reliefPtr); /* 106 */
1815	1815	void (tk_GetRootCoords) (Tk_Window tkwin, int xPtr, int * yPtr); /* 107 */
1816	1816	int (tk_GetScrollInfo) (Tcl_Interp interp, int argc, CONST84 char ** argv, double * dblPtr, int * intPtr); /* 108 */
1817		int (tk_GetScreenMM) (Tcl_Interp interp, Tk_Window tkwin, CONST char * str, double * doublePtr); /* 109 */
	1817	int (tk_GetScreenMM) (Tcl_Interp interp, Tk_Window tkwin, const char * str, double * doublePtr); /* 109 */
1818	1818	int (tk_GetSelection) (Tcl_Interp interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc * proc, ClientData clientData); /* 110 */
1819		Tk_Uid (tk_GetUid) (CONST char str); /* 111 */
1820		Visual * (tk_GetVisual) (Tcl_Interp interp, Tk_Window tkwin, CONST char * str, int * depthPtr, Colormap * colormapPtr); /* 112 */
	1819	Tk_Uid (tk_GetUid) (const char str); /* 111 */
	1820	Visual * (tk_GetVisual) (Tcl_Interp interp, Tk_Window tkwin, const char * str, int * depthPtr, Colormap * colormapPtr); /* 112 */
1821	1821	void (tk_GetVRootGeometry) (Tk_Window tkwin, int xPtr, int * yPtr, int * widthPtr, int * heightPtr); /* 113 */
1822	1822	int (tk_Grab) (Tcl_Interp interp, Tk_Window tkwin, int grabGlobal); /* 114 */
1823	1823	void (tk_HandleEvent) (XEvent eventPtr); /* 115 */
1824	1824	Tk_Window (tk_IdToWindow) (Display display, Window window); /* 116 */
1825	1825	void (tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); / 117 */
1826	1826	int (tk_Init) (Tcl_Interp interp); /* 118 */
1827		Atom (tk_InternAtom) (Tk_Window tkwin, CONST char name); /* 119 */
	1827	Atom (tk_InternAtom) (Tk_Window tkwin, const char name); /* 119 */
1828	1828	int (tk_IntersectTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height); / 120 */
1829	1829	void (tk_MaintainGeometry) (Tk_Window slave, Tk_Window master, int x, int y, int width, int height); / 121 */
1830	1830	Tk_Window (tk_MainWindow) (Tcl_Interp interp); /* 122 */
1831	1831	void (tk_MakeWindowExist) (Tk_Window tkwin); / 123 */
1832		void (tk_ManageGeometry) (Tk_Window tkwin, CONST Tk_GeomMgr mgrPtr, ClientData clientData); /* 124 */
	1832	void (tk_ManageGeometry) (Tk_Window tkwin, const Tk_GeomMgr mgrPtr, ClientData clientData); /* 124 */
1833	1833	void (tk_MapWindow) (Tk_Window tkwin); / 125 */
1834		int (tk_MeasureChars) (Tk_Font tkfont, CONST char source, int numBytes, int maxPixels, int flags, int * lengthPtr); /* 126 */
	1834	int (tk_MeasureChars) (Tk_Font tkfont, const char source, int numBytes, int maxPixels, int flags, int * lengthPtr); /* 126 */
1835	1835	void (tk_MoveResizeWindow) (Tk_Window tkwin, int x, int y, int width, int height); / 127 */
1836	1836	void (tk_MoveWindow) (Tk_Window tkwin, int x, int y); / 128 */
1837	1837	void (tk_MoveToplevelWindow) (Tk_Window tkwin, int x, int y); / 129 */

1846	1846	CONST84_RETURN char * (tk_NameOfJoinStyle) (int join); / 138 */
1847	1847	CONST84_RETURN char * (tk_NameOfJustify) (Tk_Justify justify); / 139 */
1848	1848	CONST84_RETURN char * (tk_NameOfRelief) (int relief); / 140 */
1849		Tk_Window (tk_NameToWindow) (Tcl_Interp interp, CONST char * pathName, Tk_Window tkwin); /* 141 */
	1849	Tk_Window (tk_NameToWindow) (Tcl_Interp interp, const char * pathName, Tk_Window tkwin); /* 141 */
1850	1850	void (tk_OwnSelection) (Tk_Window tkwin, Atom selection, Tk_LostSelProc proc, ClientData clientData); /* 142 */
1851		int (tk_ParseArgv) (Tcl_Interp interp, Tk_Window tkwin, int * argcPtr, CONST84 char ** argv, Tk_ArgvInfo * argTable, int flags); /* 143 */
	1851	int (tk_ParseArgv) (Tcl_Interp interp, Tk_Window tkwin, int * argcPtr, CONST84 char ** argv, const Tk_ArgvInfo * argTable, int flags); /* 143 */
1852	1852	void (tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock blockPtr, int x, int y, int width, int height); /* 144 */
1853	1853	void (tk_PhotoPutZoomedBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); /* 145 */
1854	1854	int (tk_PhotoGetImage) (Tk_PhotoHandle handle, Tk_PhotoImageBlock blockPtr); /* 146 */

1865	1865	int (tk_RestackWindow) (Tk_Window tkwin, int aboveBelow, Tk_Window other); / 157 */
1866	1866	Tk_RestrictProc * (tk_RestrictEvents) (Tk_RestrictProc proc, ClientData arg, ClientData * prevArgPtr); /* 158 */
1867	1867	int (tk_SafeInit) (Tcl_Interp interp); /* 159 */
1868		CONST char * (tk_SetAppName) (Tk_Window tkwin, CONST char name); /* 160 */
	1868	const char * (tk_SetAppName) (Tk_Window tkwin, const char name); /* 160 */
1869	1869	void (tk_SetBackgroundFromBorder) (Tk_Window tkwin, Tk_3DBorder border); / 161 */
1870		void (tk_SetClass) (Tk_Window tkwin, CONST char className); /* 162 */
	1870	void (tk_SetClass) (Tk_Window tkwin, const char className); /* 162 */
1871	1871	void (tk_SetGrid) (Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight); / 163 */
1872	1872	void (tk_SetInternalBorder) (Tk_Window tkwin, int width); / 164 */
1873	1873	void (tk_SetWindowBackground) (Tk_Window tkwin, unsigned long pixel); / 165 */

1881	1881	void (tk_SizeOfImage) (Tk_Image image, int widthPtr, int * heightPtr); /* 173 */
1882	1882	int (tk_StrictMotif) (Tk_Window tkwin); / 174 */
1883	1883	void (tk_TextLayoutToPostscript) (Tcl_Interp interp, Tk_TextLayout layout); /* 175 */
1884		int (tk_TextWidth) (Tk_Font font, CONST char str, int numBytes); /* 176 */
	1884	int (tk_TextWidth) (Tk_Font font, const char str, int numBytes); /* 176 */
1885	1885	void (tk_UndefineCursor) (Tk_Window window); / 177 */
1886		void (tk_UnderlineChars) (Display display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int x, int y, int firstByte, int lastByte); /* 178 */
	1886	void (tk_UnderlineChars) (Display display, Drawable drawable, GC gc, Tk_Font tkfont, const char * source, int x, int y, int firstByte, int lastByte); /* 178 */
1887	1887	void (tk_UnderlineTextLayout) (Display display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */
1888	1888	void (tk_Ungrab) (Tk_Window tkwin); / 180 */
1889	1889	void (tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); / 181 */

1895	1895	XColor * (tk_AllocColorFromObj) (Tcl_Interp interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 187 */
1896	1896	Tk_Cursor (tk_AllocCursorFromObj) (Tcl_Interp interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 188 */
1897	1897	Tk_Font (tk_AllocFontFromObj) (Tcl_Interp interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 189 */
1898		Tk_OptionTable (tk_CreateOptionTable) (Tcl_Interp interp, CONST Tk_OptionSpec * templatePtr); /* 190 */
	1898	Tk_OptionTable (tk_CreateOptionTable) (Tcl_Interp interp, const Tk_OptionSpec * templatePtr); /* 190 */
1899	1899	void (tk_DeleteOptionTable) (Tk_OptionTable optionTable); / 191 */
1900	1900	void (tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj objPtr); /* 192 */
1901	1901	void (tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj objPtr); /* 193 */

1915	1915	int (tk_GetMMFromObj) (Tcl_Interp interp, Tk_Window tkwin, Tcl_Obj * objPtr, double * doublePtr); /* 207 */
1916	1916	int (tk_GetPixelsFromObj) (Tcl_Interp interp, Tk_Window tkwin, Tcl_Obj * objPtr, int * intPtr); /* 208 */
1917	1917	int (tk_GetReliefFromObj) (Tcl_Interp interp, Tcl_Obj * objPtr, int * resultPtr); /* 209 */
1918		int (tk_GetScrollInfoObj) (Tcl_Interp interp, int objc, Tcl_Obj CONST objv[], double dblPtr, int * intPtr); /* 210 */
	1918	int (tk_GetScrollInfoObj) (Tcl_Interp interp, int objc, Tcl_Obj const objv[], double dblPtr, int * intPtr); /* 210 */
1919	1919	int (tk_InitOptions) (Tcl_Interp interp, char * recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
1920	1920	void (tk_MainEx) (int argc, char * argv, Tcl_AppInitProc * appInitProc, Tcl_Interp * interp); /* 212 */
1921	1921	void (tk_RestoreSavedOptions) (Tk_SavedOptions savePtr); /* 213 */
1922		int (tk_SetOptions) (Tcl_Interp interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj CONST objv[], Tk_Window tkwin, Tk_SavedOptions savePtr, int * maskPtr); /* 214 */
	1922	int (tk_SetOptions) (Tcl_Interp interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj const objv[], Tk_Window tkwin, Tk_SavedOptions savePtr, int * maskPtr); /* 214 */
1923	1923	void (tk_InitConsoleChannels) (Tcl_Interp interp); /* 215 */
1924	1924	int (tk_CreateConsoleWindow) (Tcl_Interp interp); /* 216 */
1925		void (tk_CreateSmoothMethod) (Tcl_Interp interp, Tk_SmoothMethod * method); /* 217 */
	1925	void (tk_CreateSmoothMethod) (Tcl_Interp interp, const Tk_SmoothMethod * method); /* 217 */
1926	1926	void *reserved218;
1927	1927	void *reserved219;
1928		int (tk_GetDash) (Tcl_Interp interp, CONST char * value, Tk_Dash * dash); /* 220 */
	1928	int (tk_GetDash) (Tcl_Interp interp, const char * value, Tk_Dash * dash); /* 220 */
1929	1929	void (tk_CreateOutline) (Tk_Outline outline); /* 221 */
1930	1930	void (tk_DeleteOutline) (Display display, Tk_Outline * outline); /* 222 */
1931	1931	int (tk_ConfigOutlineGC) (XGCValues gcValues, Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline); /* 223 */

1946	1946	int (tk_PostscriptPhoto) (Tcl_Interp interp, Tk_PhotoImageBlock * blockPtr, Tk_PostscriptInfo psInfo, int width, int height); /* 238 */
1947	1947	void (tk_CreateClientMessageHandler) (Tk_ClientMessageProc proc); /* 239 */
1948	1948	void (tk_DeleteClientMessageHandler) (Tk_ClientMessageProc proc); /* 240 */
1949		Tk_Window (tk_CreateAnonymousWindow) (Tcl_Interp interp, Tk_Window parent, CONST char * screenName); /* 241 */
	1949	Tk_Window (tk_CreateAnonymousWindow) (Tcl_Interp interp, Tk_Window parent, const char * screenName); /* 241 */
1950	1950	void (tk_SetClassProcs) (Tk_Window tkwin, Tk_ClassProcs procs, ClientData instanceData); /* 242 */
1951	1951	void (tk_SetInternalBorderEx) (Tk_Window tkwin, int left, int right, int top, int bottom); / 243 */
1952	1952	void (tk_SetMinimumRequestSize) (Tk_Window tkwin, int minWidth, int minHeight); / 244 */

1954	1954	void (tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
1955	1955	void (tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */
1956	1956	int (tk_CollapseMotionEvents) (Display display, int collapse); /* 248 */
1957		Tk_StyleEngine (tk_RegisterStyleEngine) (CONST char name, Tk_StyleEngine parent); /* 249 */
1958		Tk_StyleEngine (tk_GetStyleEngine) (CONST char name); /* 250 */
	1957	Tk_StyleEngine (tk_RegisterStyleEngine) (const char name, Tk_StyleEngine parent); /* 249 */
	1958	Tk_StyleEngine (tk_GetStyleEngine) (const char name); /* 250 */
1959	1959	int (tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec templatePtr); /* 251 */
1960		int (tk_GetElementId) (CONST char name); /* 252 */
1961		Tk_Style (tk_CreateStyle) (CONST char name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
1962		Tk_Style (tk_GetStyle) (Tcl_Interp interp, CONST char * name); /* 254 */
	1960	int (tk_GetElementId) (const char name); /* 252 */
	1961	Tk_Style (tk_CreateStyle) (const char name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
	1962	Tk_Style (tk_GetStyle) (Tcl_Interp interp, const char * name); /* 254 */
1963	1963	void (tk_FreeStyle) (Tk_Style style); / 255 */
1964		CONST char * (tk_NameOfStyle) (Tk_Style style); / 256 */
	1964	const char * (tk_NameOfStyle) (Tk_Style style); / 256 */
1965	1965	Tk_Style (tk_AllocStyleFromObj) (Tcl_Interp interp, Tcl_Obj * objPtr); /* 257 */
1966	1966	Tk_Style (tk_GetStyleFromObj) (Tcl_Obj objPtr); /* 258 */
1967	1967	void (tk_FreeStyleFromObj) (Tcl_Obj objPtr); /* 259 */

1977	1977	long (tk_GetUserInactiveTime) (Display dpy); /* 269 */
1978	1978	void (tk_ResetUserInactiveTime) (Display dpy); /* 270 */
1979	1979	Tcl_Interp * (tk_Interp) (Tk_Window tkwin); / 271 */
1980		void (tk_CreateOldImageType) (Tk_ImageType typePtr); /* 272 */
1981		void (tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat formatPtr); /* 273 */
	1980	void (tk_CreateOldImageType) (const Tk_ImageType typePtr); /* 272 */
	1981	void (tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat formatPtr); /* 273 */
1982	1982	} TkStubs;
1983	1983
1984	1984	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
1985		extern CONST TkStubs *tkStubsPtr;
	1985	extern const TkStubs *tkStubsPtr;
1986	1986	#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
1987	1987
1988	1988	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)

+72

-85

generic/tkEntry.c less more

13	13	* See the file "license.terms" for information on usage and redistribution of
14	14	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
15	15	*
16		* RCS: @(#) $Id: tkEntry.c,v 1.52 2008/10/09 21:49:44 dkf Exp $
	16	* RCS: @(#) $Id: tkEntry.c,v 1.57 2008/12/09 21:22:56 dgp Exp $
17	17	*/
18	18
19	19	#include "tkInt.h"

36	36	#define DOUBLES_EQ(d1, d2) (fabs((d1) - (d2)) < MIN_DBL_VAL)
37	37
38	38
39		static char *stateStrings[] = {
	39	static const char *const stateStrings[] = {
40	40	"disabled", "normal", "readonly", NULL
41	41	};
42	42

44	44	* Definitions for -validate option values:
45	45	*/
46	46
47		static char *validateStrings[] = {
	47	static const char *const validateStrings[] = {
48	48	"all", "key", "focus", "focusin", "focusout", "none", NULL
49	49	};
50	50	enum validateType {

318	318	* dispatch the entry widget command.
319	319	*/
320	320
321		static const char *entryCmdNames[] = {
	321	static const char *const entryCmdNames[] = {
322	322	"bbox", "cget", "configure", "delete", "get", "icursor", "index",
323	323	"insert", "scan", "selection", "validate", "xview", NULL
324	324	};

329	329	COMMAND_SCAN, COMMAND_SELECTION, COMMAND_VALIDATE, COMMAND_XVIEW
330	330	};
331	331
332		static const char *selCmdNames[] = {
	332	static const char *const selCmdNames[] = {
333	333	"adjust", "clear", "from", "present", "range", "to", NULL
334	334	};
335	335

344	344	* dispatch the spinbox widget command.
345	345	*/
346	346
347		static const char *sbCmdNames[] = {
	347	static const char *const sbCmdNames[] = {
348	348	"bbox", "cget", "configure", "delete", "get", "icursor", "identify",
349	349	"index", "insert", "invoke", "scan", "selection", "set",
350	350	"validate", "xview", NULL

357	357	SB_CMD_SET, SB_CMD_VALIDATE, SB_CMD_XVIEW
358	358	};
359	359
360		static const char *sbSelCmdNames[] = {
	360	static const char *const sbSelCmdNames[] = {
361	361	"adjust", "clear", "element", "from", "present", "range", "to", NULL
362	362	};
363	363

375	375	* modify them, you must modify the strings here.
376	376	*/
377	377
378		static const char *selElementNames[] = {
	378	static const char *const selElementNames[] = {
379	379	"none", "buttondown", "buttonup", NULL, "entry"
380	380	};
381	381

558	558	return TCL_ERROR;
559	559	}
560	560
561		Tcl_SetResult(interp, Tk_PathName(entryPtr->tkwin), TCL_STATIC);
	561	Tcl_SetObjResult(interp, TkNewWindowObj(entryPtr->tkwin));
562	562	return TCL_OK;
563	563	}
564	564

611	611	switch ((enum entryCmd) cmdIndex) {
612	612	case COMMAND_BBOX: {
613	613	int index, x, y, width, height;
614		char buf[TCL_INTEGER_SPACE * 4];
615	614
616	615	if (objc != 3) {
617	616	Tcl_WrongNumArgs(interp, 2, objv, "index");

625	624	index--;
626	625	}
627	626	Tk_CharBbox(entryPtr->textLayout, index, &x, &y, &width, &height);
628		sprintf(buf, "%d %d %d %d", x + entryPtr->layoutX,
629		y + entryPtr->layoutY, width, height);
630		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	627	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d %d %d",
	628	x + entryPtr->layoutX, y + entryPtr->layoutY, width, height));
631	629	break;
632	630	}
633	631

641	639	entryPtr->optionTable, objv[2], entryPtr->tkwin);
642	640	if (objPtr == NULL) {
643	641	goto error;
644		} else {
645		Tcl_SetObjResult(interp, objPtr);
646		}
	642	}
	643	Tcl_SetObjResult(interp, objPtr);
647	644	break;
648	645
649	646	case COMMAND_CONFIGURE:

654	651	entryPtr->tkwin);
655	652	if (objPtr == NULL) {
656	653	goto error;
657		} else {
658		Tcl_SetObjResult(interp, objPtr);
659		}
	654	}
	655	Tcl_SetObjResult(interp, objPtr);
660	656	} else {
661	657	result = ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0);
662	658	}

1334	1330	code = Tcl_GetDouble(NULL, entryPtr->string, &dvalue);
1335	1331	if (code != TCL_OK) {
1336	1332	dvalue = sbPtr->fromValue;
1337		} else {
1338		if (dvalue > sbPtr->toValue) {
1339		dvalue = sbPtr->toValue;
1340		} else if (dvalue < sbPtr->fromValue) {
1341		dvalue = sbPtr->fromValue;
1342		}
	1333	} else if (dvalue > sbPtr->toValue) {
	1334	dvalue = sbPtr->toValue;
	1335	} else if (dvalue < sbPtr->fromValue) {
	1336	dvalue = sbPtr->fromValue;
1343	1337	}
1344	1338	sprintf(sbPtr->formatBuf, sbPtr->valueFormat, dvalue);
1345	1339	EntryValueChanged(entryPtr, sbPtr->formatBuf);

1967	1961	height = fm.linespace + 2entryPtr->inset + 2(YPAD-XPAD);
1968	1962	if (entryPtr->prefWidth > 0) {
1969	1963	width = entryPtr->prefWidthentryPtr->avgWidth + 2entryPtr->inset;
	1964	} else if (totalLength == 0) {
	1965	width = entryPtr->avgWidth + 2*entryPtr->inset;
1970	1966	} else {
1971		if (totalLength == 0) {
1972		width = entryPtr->avgWidth + 2*entryPtr->inset;
1973		} else {
1974		width = totalLength + 2*entryPtr->inset;
1975		}
	1967	width = totalLength + 2*entryPtr->inset;
1976	1968	}
1977	1969
1978	1970	/*

2514	2506
2515	2507	length = strlen(string);
2516	2508
2517		if (string[0] == 'a') {
2518		if (strncmp(string, "anchor", length) == 0) {
2519		*indexPtr = entryPtr->selectAnchor;
2520		} else {
2521		badIndex:
2522
2523		/*
2524		* Some of the paths here leave messages in the interp's result,
2525		* so we have to clear it out before storing our own message.
2526		*/
2527
2528		Tcl_SetResult(interp, NULL, TCL_STATIC);
2529		Tcl_AppendResult(interp, "bad ",
2530		(entryPtr->type == TK_ENTRY) ? "entry" : "spinbox",
2531		" index \"", string, "\"", NULL);
2532		return TCL_ERROR;
2533		}
2534		} else if (string[0] == 'e') {
2535		if (strncmp(string, "end", length) == 0) {
2536		*indexPtr = entryPtr->numChars;
2537		} else {
	2509	switch (string[0]) {
	2510	case 'a':
	2511	if (strncmp(string, "anchor", length) != 0) {
2538	2512	goto badIndex;
2539	2513	}
2540		} else if (string[0] == 'i') {
2541		if (strncmp(string, "insert", length) == 0) {
2542		*indexPtr = entryPtr->insertPos;
2543		} else {
	2514	*indexPtr = entryPtr->selectAnchor;
	2515	break;
	2516	case 'e':
	2517	if (strncmp(string, "end", length) != 0) {
2544	2518	goto badIndex;
2545	2519	}
2546		} else if (string[0] == 's') {
	2520	*indexPtr = entryPtr->numChars;
	2521	break;
	2522	case 'i':
	2523	if (strncmp(string, "insert", length) != 0) {
	2524	goto badIndex;
	2525	}
	2526	*indexPtr = entryPtr->insertPos;
	2527	break;
	2528	case 's':
2547	2529	if (entryPtr->selectFirst < 0) {
2548		Tcl_SetResult(interp, NULL, TCL_STATIC);
	2530	Tcl_ResetResult(interp);
2549	2531	Tcl_AppendResult(interp, "selection isn't in widget ",
2550	2532	Tk_PathName(entryPtr->tkwin), NULL);
2551	2533	return TCL_ERROR;

2560	2542	} else {
2561	2543	goto badIndex;
2562	2544	}
2563		} else if (string[0] == '@') {
	2545	break;
	2546	case '@': {
2564	2547	int x, roundUp, maxWidth;
2565	2548
2566	2549	if (Tcl_GetInt(interp, string + 1, &x) != TCL_OK) {

2571	2554	}
2572	2555	roundUp = 0;
2573	2556	maxWidth = Tk_Width(entryPtr->tkwin) - entryPtr->inset
2574		- entryPtr->xWidth - 1;
	2557	- entryPtr->xWidth - 1;
2575	2558	if (x > maxWidth) {
2576	2559	x = maxWidth;
2577	2560	roundUp = 1;

2589	2572	if (roundUp && (*indexPtr < entryPtr->numChars)) {
2590	2573	*indexPtr += 1;
2591	2574	}
2592		} else {
	2575	break;
	2576	}
	2577	default:
2593	2578	if (Tcl_GetInt(interp, string, indexPtr) != TCL_OK) {
2594	2579	goto badIndex;
2595	2580	}

2600	2585	}
2601	2586	}
2602	2587	return TCL_OK;
	2588
	2589	badIndex:
	2590	Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad %s index \"%s\"",
	2591	(entryPtr->type == TK_ENTRY) ? "entry" : "spinbox", string));
	2592	return TCL_ERROR;
2603	2593	}
2604	2594
2605	2595	/*

2949	2939	"\n (horizontal scrolling command executed by ");
2950	2940	Tcl_AddErrorInfo(interp, Tk_PathName(entryPtr->tkwin));
2951	2941	Tcl_AddErrorInfo(interp, ")");
2952		Tcl_BackgroundError(interp);
2953		}
2954		Tcl_SetResult(interp, NULL, TCL_STATIC);
	2942	Tcl_BackgroundException(interp, code);
	2943	}
	2944	Tcl_ResetResult(interp);
2955	2945	Tcl_Release(interp);
2956	2946	}
2957	2947

3150	3140	*/
3151	3141
3152	3142	if (code != TCL_OK && code != TCL_RETURN) {
3153		Tcl_AddErrorInfo(interp, "\n\t(in validation command executed by ");
3154		Tcl_AddErrorInfo(interp, Tk_PathName(entryPtr->tkwin));
3155		Tcl_AddErrorInfo(interp, ")");
3156		Tcl_BackgroundError(interp);
	3143	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
	3144	"\n\t(in validation command executed by %s)",
	3145	Tk_PathName(entryPtr->tkwin)));
	3146	Tcl_BackgroundException(interp, code);
3157	3147	return TCL_ERROR;
3158	3148	}
3159	3149

3166	3156	Tcl_AddErrorInfo(interp,
3167	3157	"\nvalid boolean not returned by validation command");
3168	3158	Tcl_BackgroundError(interp);
3169		Tcl_SetResult(interp, NULL, 0);
	3159	Tcl_ResetResult(interp);
3170	3160	return TCL_ERROR;
3171	3161	}
3172	3162
3173		Tcl_SetResult(interp, NULL, 0);
	3163	Tcl_ResetResult(interp);
3174	3164	return (bool ? TCL_OK : TCL_BREAK);
3175	3165	}
3176	3166

3284	3274	change, newValue, index, type, &script);
3285	3275	Tcl_DStringAppend(&script, "", 1);
3286	3276	p = Tcl_DStringValue(&script);
3287		if (Tcl_EvalEx(entryPtr->interp, p, -1,
3288		TCL_EVAL_GLOBAL \| TCL_EVAL_DIRECT) != TCL_OK) {
	3277	code = Tcl_EvalEx(entryPtr->interp, p, -1,
	3278	TCL_EVAL_GLOBAL \| TCL_EVAL_DIRECT);
	3279	if (code != TCL_OK) {
3289	3280	Tcl_AddErrorInfo(entryPtr->interp,
3290	3281	"\n\t(in invalidcommand executed by entry)");
3291		Tcl_BackgroundError(entryPtr->interp);
	3282	Tcl_BackgroundException(entryPtr->interp, code);
3292	3283	code = TCL_ERROR;
3293	3284	entryPtr->validate = VALIDATE_NONE;
3294	3285	}

3657	3648	switch ((enum sbCmd) cmdIndex) {
3658	3649	case SB_CMD_BBOX: {
3659	3650	int index, x, y, width, height;
3660		char buf[TCL_INTEGER_SPACE * 4];
3661	3651
3662	3652	if (objc != 3) {
3663	3653	Tcl_WrongNumArgs(interp, 2, objv, "index");

3671	3661	index--;
3672	3662	}
3673	3663	Tk_CharBbox(entryPtr->textLayout, index, &x, &y, &width, &height);
3674		sprintf(buf, "%d %d %d %d", x + entryPtr->layoutX,
3675		y + entryPtr->layoutY, width, height);
3676		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	3664	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d %d %d",
	3665	x + entryPtr->layoutX, y + entryPtr->layoutY, width, height));
3677	3666	break;
3678	3667	}
3679	3668

3687	3676	entryPtr->optionTable, objv[2], entryPtr->tkwin);
3688	3677	if (objPtr == NULL) {
3689	3678	goto error;
3690		} else {
3691		Tcl_SetObjResult(interp, objPtr);
3692		}
	3679	}
	3680	Tcl_SetObjResult(interp, objPtr);
3693	3681	break;
3694	3682
3695	3683	case SB_CMD_CONFIGURE:

3699	3687	entryPtr->tkwin);
3700	3688	if (objPtr == NULL) {
3701	3689	goto error;
3702		} else {
3703		Tcl_SetObjResult(interp, objPtr);
3704		}
	3690	}
	3691	Tcl_SetObjResult(interp, objPtr);
3705	3692	} else {
3706	3693	result = ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0);
3707	3694	}

4171	4158	* "down" button. */
4172	4159	{
4173	4160	Entry entryPtr = (Entry ) sbPtr;
4174		char *type;
	4161	const char *type;
4175	4162	int code, up;
4176	4163	Tcl_DString script;
4177	4164

4296	4283
4297	4284	if (code != TCL_OK) {
4298	4285	Tcl_AddErrorInfo(interp, "\n\t(in command executed by spinbox)");
4299		Tcl_BackgroundError(interp);
	4286	Tcl_BackgroundException(interp, code);
4300	4287
4301	4288	/*
4302	4289	* Yes, it's an error, but a bg one, so we return OK

4305	4292	return TCL_OK;
4306	4293	}
4307	4294
4308		Tcl_SetResult(interp, NULL, 0);
	4295	Tcl_ResetResult(interp);
4309	4296	}
4310	4297
4311	4298	return TCL_OK;

+4

-4

generic/tkError.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkError.c,v 1.7 2008/08/19 15:52:11 georgeps Exp $
	14	* RCS: @(#) $Id: tkError.c,v 1.8 2008/11/08 18:44:39 dkf Exp $
15	15	*/
16	16
17	17	#include "tkInt.h"

247	247	&& (errorPtr->lastRequest < errEventPtr->serial))) {
248	248	continue;
249	249	}
250		if (errorPtr->errorProc == NULL \|\| (*errorPtr->errorProc)(
251		errorPtr->clientData, errEventPtr) == 0) {
	250	if (errorPtr->errorProc == NULL \|\|
	251	errorPtr->errorProc(errorPtr->clientData, errEventPtr) == 0) {
252	252	return 0;
253	253	}
254	254	}

280	280	*/
281	281
282	282	couldntHandle:
283		return (*defaultHandler)(display, errEventPtr);
	283	return defaultHandler(display, errEventPtr);
284	284	}
285	285
286	286	/*

+6

-6

generic/tkEvent.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkEvent.c,v 1.36 2008/08/05 20:31:08 jenglish Exp $
	14	* RCS: @(#) $Id: tkEvent.c,v 1.37 2008/11/08 18:44:39 dkf Exp $
15	15	*/
16	16
17	17	#include "tkInt.h"

789	789	int done;
790	790
791	791	tsdPtr->handlersActive++;
792		done = (*curPtr->proc)(curPtr->clientData, eventPtr);
	792	done = curPtr->proc(curPtr->clientData, eventPtr);
793	793	tsdPtr->handlersActive--;
794	794	if (done) {
795	795	return done;

1382	1382	for (handlerPtr = winPtr->handlerList; handlerPtr != NULL; ) {
1383	1383	if ((handlerPtr->mask & mask) != 0) {
1384	1384	ip.nextHandler = handlerPtr->nextPtr;
1385		(*(handlerPtr->proc))(handlerPtr->clientData, eventPtr);
	1385	handlerPtr->proc(handlerPtr->clientData, eventPtr);
1386	1386	handlerPtr = ip.nextHandler;
1387	1387	} else {
1388	1388	handlerPtr = handlerPtr->nextPtr;

1786	1786	return 0;
1787	1787	}
1788	1788	if (tsdPtr->restrictProc != NULL) {
1789		result = (*tsdPtr->restrictProc)(tsdPtr->restrictArg, &wevPtr->event);
	1789	result = tsdPtr->restrictProc(tsdPtr->restrictArg, &wevPtr->event);
1790	1790	if (result != TK_PROCESS_EVENT) {
1791	1791	if (result == TK_DEFER_EVENT) {
1792	1792	return 0;

2052	2052
2053	2053	firstExitPtr = exitPtr->nextPtr;
2054	2054	Tcl_MutexUnlock(&exitMutex);
2055		(*exitPtr->proc)(exitPtr->clientData);
	2055	exitPtr->proc(exitPtr->clientData);
2056	2056	ckfree((char *) exitPtr);
2057	2057	Tcl_MutexLock(&exitMutex);
2058	2058	}

2102	2102	*/
2103	2103
2104	2104	tsdPtr->firstExitPtr = exitPtr->nextPtr;
2105		(*exitPtr->proc)(exitPtr->clientData);
	2105	exitPtr->proc(exitPtr->clientData);
2106	2106	ckfree((char *) exitPtr);
2107	2107	}
2108	2108	}

+2

-2

generic/tkFileFilter.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkFileFilter.c,v 1.11 2008/04/27 22:38:56 dkf Exp $
	11	* RCS: @(#) $Id: tkFileFilter.c,v 1.12 2008/12/07 16:34:12 das Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

337	337	globPtr->next = NULL;
338	338	}
339	339	}
340		if (ostypeCount > 0 && ostypeList != NULL) {
	340	if (ostypeList != NULL && ostypeCount > 0) {
341	341	if (macRoman == NULL) {
342	342	macRoman = Tcl_GetEncoding(NULL, "macRoman");
343	343	}

+7

-15

generic/tkFocus.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkFocus.c,v 1.17 2008/04/27 22:38:56 dkf Exp $
	11	* RCS: @(#) $Id: tkFocus.c,v 1.20 2008/11/23 21:58:24 patthoyts Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

69	69	} DisplayFocusInfo;
70	70
71	71	/*
72		* The following magic value is stored in the "send_event" field of FocusIn
73		* and FocusOut events that are generated in this file. This allows us to
74		* separate "real" events coming from the server from those that we generated.
75		*/
76
77		#define GENERATED_EVENT_MAGIC ((Bool) 0x547321ac)
78
79		/*
80	72	* Debugging support...
81	73	*/
82	74

119	111	int objc, /* Number of arguments. */
120	112	Tcl_Obj const objv[]) / Argument objects. */
121	113	{
122		static const char *focusOptions[] = {
	114	static const char *const focusOptions[] = {
123	115	"-displayof", "-force", "-lastfor", NULL
124	116	};
125	117	Tk_Window tkwin = clientData;

289	281	* pass the event through to Tk bindings.
290	282	*/
291	283
292		if (eventPtr->xfocus.send_event == GENERATED_EVENT_MAGIC) {
	284	if (eventPtr->xfocus.send_event == GENERATED_FOCUS_EVENT_MAGIC) {
293	285	eventPtr->xfocus.send_event = 0;
294	286	return 1;
295	287	}

907	899	}
908	900
909	901	event.xfocus.serial = LastKnownRequestProcessed(winPtr->display);
910		event.xfocus.send_event = GENERATED_EVENT_MAGIC;
	902	event.xfocus.send_event = GENERATED_FOCUS_EVENT_MAGIC;
911	903	event.xfocus.display = winPtr->display;
912	904	event.xfocus.mode = NotifyNormal;
913	905	TkInOutEvents(&event, sourcePtr, destPtr, FocusOut, FocusIn,

1058	1050	*/
1059	1051
1060	1052	void
1061		TkFocusSplit(winPtr)
1062		TkWindow winPtr; / Window is the new toplevel. Any focus point
	1053	TkFocusSplit(
	1054	TkWindow winPtr) / Window is the new toplevel. Any focus point
1063	1055	* at or below window must be moved to this
1064	1056	* new toplevel. */
1065	1057	{

1112	1104	* See if current focusWin is child of the new toplevel.
1113	1105	*/
1114	1106
1115		for (subWinPtr = tlFocusPtr->focusWinPtr;
	1107	for (subWinPtr = tlFocusPtr->focusWinPtr;
1116	1108	subWinPtr && subWinPtr != winPtr && subWinPtr != topLevelPtr;
1117	1109	subWinPtr = subWinPtr->parentPtr) {
1118	1110	/* EMPTY */

+410

-26

generic/tkFont.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkFont.c,v 1.46 2008/10/05 21:23:25 dkf Exp $
	12	* RCS: @(#) $Id: tkFont.c,v 1.51 2008/12/07 16:34:12 das Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"
16	16	#include "tkFont.h"
	17
	18	#define ROUND16(x) ((short)((x) + 0.5))
17	19
18	20	/*
19	21	* The following structure is used to keep track of all the fonts that exist

164	166	* configuring a set of font attributes.
165	167	*/
166	168
167		static const char *fontOpt[] = {
	169	static const char *const fontOpt[] = {
168	170	"-family",
169	171	"-size",
170	172	"-weight",

189	191	* the alias list are also automatically tried.
190	192	*/
191	193
192		static char *timesAliases[] = {
	194	static const char *const timesAliases[] = {
193	195	"Times", /* Unix. */
194	196	"Times New Roman", /* Windows. */
195	197	"New York", /* Mac. */
196	198	NULL
197	199	};
198	200
199		static char *helveticaAliases[] = {
	201	static const char *const helveticaAliases[] = {
200	202	"Helvetica", /* Unix. */
201	203	"Arial", /* Windows. */
202	204	"Geneva", /* Mac. */
203	205	NULL
204	206	};
205	207
206		static char *courierAliases[] = {
	208	static const char *const courierAliases[] = {
207	209	"Courier", /* Unix and Mac. */
208	210	"Courier New", /* Windows. */
209	211	NULL
210	212	};
211	213
212		static char *minchoAliases[] = {
	214	static const char *const minchoAliases[] = {
213	215	"mincho", /* Unix. */
214	216	"\357\274\255\357\274\263 \346\230\216\346\234\235",
215	217	/* Windows (MS mincho). */

218	220	NULL
219	221	};
220	222
221		static char *gothicAliases[] = {
	223	static const char *const gothicAliases[] = {
222	224	"gothic", /* Unix. */
223	225	"\357\274\255\357\274\263 \343\202\264\343\202\267\343\203\203\343\202\257",
224	226	/* Windows (MS goshikku). */

227	229	NULL
228	230	};
229	231
230		static char *dingbatsAliases[] = {
	232	static const char *const dingbatsAliases[] = {
231	233	"dingbats", "zapfdingbats", "itc zapfdingbats",
232	234	/* Unix. */
233	235	/* Windows. */

235	237	NULL
236	238	};
237	239
238		static char **fontAliases[] = {
	240	static const char const const fontAliases[] = {
239	241	timesAliases,
240	242	helveticaAliases,
241	243	courierAliases,

251	253	* be examined also.
252	254	*/
253	255
254		static char *systemClass[] = {
	256	static const char *const systemClass[] = {
255	257	"fixed", /* Unix. */
256	258	/* Windows. */
257	259	"chicago", "osaka", "sistemny",

259	261	NULL
260	262	};
261	263
262		static char *serifClass[] = {
	264	static const char *const serifClass[] = {
263	265	"times", "palatino", "mincho",
264	266	/* All platforms. */
265	267	"song ti", /* Unix. */

269	271	NULL
270	272	};
271	273
272		static char *sansClass[] = {
	274	static const char *const sansClass[] = {
273	275	"helvetica", "gothic", /* All platforms. */
274	276	/* Unix. */
275	277	"ms sans serif", "traditional arabic",

278	280	NULL
279	281	};
280	282
281		static char *monoClass[] = {
	283	static const char *const monoClass[] = {
282	284	"courier", "gothic", /* All platforms. */
283	285	"fangsong ti", /* Unix. */
284	286	"simplified arabic fixed", /* Windows. */

286	288	NULL
287	289	};
288	290
289		static char *symbolClass[] = {
	291	static const char *const symbolClass[] = {
290	292	"symbol", "dingbats", "wingdings", NULL
291	293	};
292	294
293		static char **fontFallbacks[] = {
	295	static const char const const fontFallbacks[] = {
294	296	systemClass,
295	297	serifClass,
296	298	sansClass,

305	307	* found, all font families in the system are examined.
306	308	*/
307	309
308		static char *globalFontClass[] = {
	310	static const char *const globalFontClass[] = {
309	311	"symbol", /* All platforms. */
310	312	/* Unix. */
311	313	"lucida sans unicode", /* Windows. */

346	348	* font object points to the TkFont structure for the font, or NULL.
347	349	*/
348	350
349		Tcl_ObjType tkFontObjType = {
	351	const Tcl_ObjType tkFontObjType = {
350	352	"font", /* name */
351	353	FreeFontObjProc, /* freeIntRepProc */
352	354	DupFontObjProc, /* dupIntRepProc */

473	475	int index;
474	476	Tk_Window tkwin;
475	477	TkFontInfo *fiPtr;
476		static const char *optionStrings[] = {
	478	static const char *const optionStrings[] = {
477	479	"actual", "configure", "create", "delete",
478	480	"families", "measure", "metrics", "names",
479	481	NULL

740	742	Tk_Font tkfont;
741	743	int skip, index, i;
742	744	const TkFontMetrics *fmPtr;
743		static const char *switches[] = {
	745	static const char *const switches[] = {
744	746	"-ascent", "-descent", "-linespace", "-fixed", NULL
745	747	};
746	748

887	889	Tk_GetClassProc(winPtr->classProcsPtr, worldChangedProc);
888	890
889	891	if (proc != NULL) {
890		(*proc)(winPtr->instanceData);
	892	proc(winPtr->instanceData);
891	893	}
892	894
893	895	/*

1346	1348	Tcl_GetString(objPtr);
1347	1349	typePtr = objPtr->typePtr;
1348	1350	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
1349		(*typePtr->freeIntRepProc)(objPtr);
	1351	typePtr->freeIntRepProc(objPtr);
1350	1352	}
1351	1353	objPtr->typePtr = &tkFontObjType;
1352	1354	objPtr->internalRep.twoPtrValue.ptr1 = NULL;

2309	2311	}
2310	2312	}
2311	2313
	2314	void
	2315	TkDrawAngledTextLayout(
	2316	Display display, / Display on which to draw. */
	2317	Drawable drawable, /* Window or pixmap in which to draw. */
	2318	GC gc, /* Graphics context to use for drawing text. */
	2319	Tk_TextLayout layout, /* Layout information, from a previous call to
	2320	* Tk_ComputeTextLayout(). */
	2321	int x, int y, /* Upper-left hand corner of rectangle in
	2322	* which to draw (pixels). */
	2323	double angle,
	2324	int firstChar, /* The index of the first character to draw
	2325	* from the given text item. 0 specfies the
	2326	* beginning. */
	2327	int lastChar) /* The index just after the last character to
	2328	* draw from the given text item. A number < 0
	2329	* means to draw all characters. */
	2330	{
	2331	TextLayout layoutPtr = (TextLayout ) layout;
	2332	int i, numDisplayChars, drawX;
	2333	const char firstByte, lastByte;
	2334	LayoutChunk *chunkPtr;
	2335	double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
	2336
	2337	if (layoutPtr == NULL) {
	2338	return;
	2339	}
	2340
	2341	if (lastChar < 0) {
	2342	lastChar = 100000000;
	2343	}
	2344	chunkPtr = layoutPtr->chunks;
	2345	for (i = 0; i < layoutPtr->numChunks; i++) {
	2346	numDisplayChars = chunkPtr->numDisplayChars;
	2347	if ((numDisplayChars > 0) && (firstChar < numDisplayChars)) {
	2348	double dx, dy;
	2349
	2350	if (firstChar <= 0) {
	2351	drawX = 0;
	2352	firstChar = 0;
	2353	firstByte = chunkPtr->start;
	2354	} else {
	2355	firstByte = Tcl_UtfAtIndex(chunkPtr->start, firstChar);
	2356	Tk_MeasureChars(layoutPtr->tkfont, chunkPtr->start,
	2357	firstByte - chunkPtr->start, -1, 0, &drawX);
	2358	}
	2359	if (lastChar < numDisplayChars) {
	2360	numDisplayChars = lastChar;
	2361	}
	2362	lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
	2363	dx = cosA * (chunkPtr->x + drawX) + sinA * (chunkPtr->y);
	2364	dy = -sinA * (chunkPtr->x + drawX) + cosA * (chunkPtr->y);
	2365	TkpDrawAngledChars(display, drawable, gc, layoutPtr->tkfont,
	2366	firstByte, lastByte - firstByte, x+dx, y+dy, angle);
	2367	}
	2368	firstChar -= chunkPtr->numChars;
	2369	lastChar -= chunkPtr->numChars;
	2370	if (lastChar <= 0) {
	2371	break;
	2372	}
	2373	chunkPtr++;
	2374	}
	2375	}
	2376
2312	2377	/*
2313	2378	*---------------------------------------------------------------------------
2314	2379	*

2354	2419	XFillRectangle(display, drawable, gc, x + xx,
2355	2420	y + yy + fontPtr->fm.ascent + fontPtr->underlinePos,
2356	2421	(unsigned) width, (unsigned) fontPtr->underlineHeight);
	2422	}
	2423	}
	2424
	2425	void
	2426	TkUnderlineAngledTextLayout(
	2427	Display display, / Display on which to draw. */
	2428	Drawable drawable, /* Window or pixmap in which to draw. */
	2429	GC gc, /* Graphics context to use for drawing text. */
	2430	Tk_TextLayout layout, /* Layout information, from a previous call to
	2431	* Tk_ComputeTextLayout(). */
	2432	int x, int y, /* Upper-left hand corner of rectangle in
	2433	* which to draw (pixels). */
	2434	double angle,
	2435	int underline) /* Index of the single character to underline,
	2436	* or -1 for no underline. */
	2437	{
	2438	int xx, yy, width, height;
	2439
	2440	if (angle == 0.0) {
	2441	Tk_UnderlineTextLayout(display, drawable, gc, layout, x,y, underline);
	2442	return;
	2443	}
	2444
	2445	if ((Tk_CharBbox(layout, underline, &xx, &yy, &width, &height) != 0)
	2446	&& (width != 0)) {
	2447	TextLayout layoutPtr = (TextLayout ) layout;
	2448	TkFont fontPtr = (TkFont ) layoutPtr->tkfont;
	2449	double sinA = sin(anglePI/180), cosA = cos(anglePI/180);
	2450	double dy = yy + fontPtr->fm.ascent + fontPtr->underlinePos;
	2451	XPoint points[5];
	2452
	2453	/*
	2454	* Note that we're careful to only round a double value once, which
	2455	* minimizes roundoff errors.
	2456	*/
	2457
	2458	points[0].x = x + ROUND16(xxcosA + dysinA);
	2459	points[0].y = y + ROUND16(dycosA - xxsinA);
	2460	points[1].x = x + ROUND16(xxcosA + dysinA + width*cosA);
	2461	points[1].y = y + ROUND16(dycosA - xxsinA - width*sinA);
	2462	if (fontPtr->underlineHeight == 1) {
	2463	/*
	2464	* Thin underlines look better when rotated when drawn as a line
	2465	* rather than a rectangle; the rasterizer copes better.
	2466	*/
	2467
	2468	XDrawLines(display, drawable, gc, points, 2, CoordModeOrigin);
	2469	} else {
	2470	points[2].x = x + ROUND16(xxcosA + dysinA + width*cosA
	2471	- fontPtr->underlineHeight*sinA);
	2472	points[2].y = y + ROUND16(dycosA - xxsinA - width*sinA
	2473	+ fontPtr->underlineHeight*cosA);
	2474	points[3].x = x + ROUND16(xxcosA + dysinA
	2475	- fontPtr->underlineHeight*sinA);
	2476	points[3].y = y + ROUND16(dycosA - xxsinA
	2477	+ fontPtr->underlineHeight*cosA);
	2478	points[4].x = points[0].x;
	2479	points[4].y = points[0].y;
	2480	XFillPolygon(display, drawable, gc, points, 5, Complex,
	2481	CoordModeOrigin);
	2482	XDrawLines(display, drawable, gc, points, 5, CoordModeOrigin);
	2483	}
2357	2484	}
2358	2485	}
2359	2486

2547	2674	{
2548	2675	TextLayout *layoutPtr;
2549	2676	LayoutChunk *chunkPtr;
2550		int i, x, w;
	2677	int i, x = 0, w;
2551	2678	Tk_Font tkfont;
2552	2679	TkFont *fontPtr;
2553	2680	const char *end;

2800	2927	chunkPtr++;
2801	2928	}
2802	2929	return result;
	2930	}
	2931
	2932	/*
	2933	*---------------------------------------------------------------------------
	2934	*
	2935	* TkIntersectAngledTextLayout --
	2936	*
	2937	* Determines whether a text layout that has been turned by an angle
	2938	* about its top-left coordinae lies entirely inside, entirely outside,
	2939	* or overlaps a given rectangle. Non-displaying space characters that
	2940	* occur at the end of individual lines in the text layout are ignored
	2941	* for intersection calculations.
	2942	*
	2943	* Results:
	2944	* The return value is -1 if the text layout is entirely outside of the
	2945	* rectangle, 0 if it overlaps, and 1 if it is entirely inside of the
	2946	* rectangle.
	2947	*
	2948	* Side effects:
	2949	* None.
	2950	*
	2951	*---------------------------------------------------------------------------
	2952	*/
	2953
	2954	static inline int
	2955	PointInQuadrilateral(
	2956	double qx[],
	2957	double qy[],
	2958	double x,
	2959	double y)
	2960	{
	2961	int i;
	2962
	2963	for (i=0 ; i<4 ; i++) {
	2964	double sideDX = qx[(i+1)%4] - qx[i];
	2965	double sideDY = qy[(i+1)%4] - qy[i];
	2966	double dx = x - qx[i];
	2967	double dy = y - qy[i];
	2968
	2969	if (sideDXdy < sideDYdx) {
	2970	return 0;
	2971	}
	2972	}
	2973	return 1;
	2974	}
	2975
	2976	static inline int
	2977	sign(
	2978	double value)
	2979	{
	2980	if (value < 0.0) return -1;
	2981	if (value > 0.0) return 1;
	2982	return 0;
	2983	}
	2984
	2985	static inline int
	2986	SidesIntersect(
	2987	double ax1, double ay1, double ax2, double ay2,
	2988	double bx1, double by1, double bx2, double by2)
	2989	{
	2990	#if 0
	2991	/* http://www.freelunchdesign.com/cgi-bin/codwiki.pl?DiscussionTopics/CollideMeUpBaby */
	2992
	2993	double a1, b1, c1, a2, b2, c2, r1, r2, r3, r4, denom;
	2994
	2995	a1 = ay2 - ay1;
	2996	b1 = ax1 - ax2;
	2997	c1 = (ax2 * ay1) - (ax1 * ay2);
	2998	r3 = (a1 * bx1) + (b1 * by1) + c1;
	2999	r4 = (a1 * bx2) + (b1 * by2) + c1;
	3000	if ((r3 != 0.0) && (r4 != 0.0) && (r3*r4 > 0.0)) {
	3001	return 0;
	3002	}
	3003
	3004	a2 = by2 - by1;
	3005	b2 = bx1 - bx2;
	3006	c2 = (bx2 * by1) - (bx1 * by2);
	3007	r1 = (a2 * ax1) + (b2 * ay1) + c2;
	3008	r2 = (a2 * ax2) + (b2 * ay2) + c2;
	3009	if ((r1 != 0.0) && (r2 != 0.0) && (r1*r2 > 0.0)) {
	3010	return 0;
	3011	}
	3012
	3013	denom = (a1 * b2) - (a2 * b1);
	3014	return (denom != 0.0);
	3015	#else
	3016	/*
	3017	* A more efficient version. Two line segments intersect if, when seen
	3018	* from the perspective of one line, the two endpoints of the other
	3019	* segment lie on opposite sides of the line, and vice versa. "Lie on
	3020	* opposite sides" is computed by taking the cross products and seeing if
	3021	* they are of opposite signs.
	3022	*/
	3023
	3024	double dx, dy, dx1, dy1;
	3025
	3026	dx = ax2 - ax1;
	3027	dy = ay2 - ay1;
	3028	dx1 = bx1 - ax1;
	3029	dy1 = by1 - ay1;
	3030	if ((dxdy1-dydx1 > 0.0) == (dx(by2-ay1)-dy(bx2-ax1) > 0.0)) {
	3031	return 0;
	3032	}
	3033	dx = bx2 - bx1;
	3034	dy = by2 - by1;
	3035	if ((dydx1-dxdy1 > 0.0) == (dx(ay2-by1)-dy(ax2-bx1) > 0.0)) {
	3036	return 0;
	3037	}
	3038	return 1;
	3039	#endif
	3040	}
	3041
	3042	int
	3043	TkIntersectAngledTextLayout(
	3044	Tk_TextLayout layout, /* Layout information, from a previous call to
	3045	* Tk_ComputeTextLayout(). */
	3046	int x, int y, /* Upper-left hand corner, in pixels, of
	3047	* rectangular area to compare with text
	3048	* layout. Coordinates are with respect to the
	3049	* upper-left hand corner of the text layout
	3050	* itself. */
	3051	int width, int height, /* The width and height of the above
	3052	* rectangular area, in pixels. */
	3053	double angle)
	3054	{
	3055	int i, x1, y1, x2, y2;
	3056	TextLayout *layoutPtr;
	3057	LayoutChunk *chunkPtr;
	3058	TkFont *fontPtr;
	3059	double c = cos(angle * PI/180.0), s = sin(angle * PI/180.0);
	3060	double rx[4], ry[4];
	3061
	3062	if (angle == 0.0) {
	3063	return Tk_IntersectTextLayout(layout, x, y, width, height);
	3064	}
	3065
	3066	/*
	3067	* Compute the coordinates of the rectangle, rotated into text layout
	3068	* space.
	3069	*/
	3070
	3071	rx[0] = xc - ys;
	3072	ry[0] = yc + xs;
	3073	rx[1] = (x+width)c - ys;
	3074	ry[1] = yc + (x+width)s;
	3075	rx[2] = (x+width)c - (y+height)s;
	3076	ry[2] = (y+height)c + (x+width)s;
	3077	rx[3] = xc - (y+height)s;
	3078	ry[3] = (y+height)c + xs;
	3079
	3080	/*
	3081	* Want to know if all chunks are inside the rectangle, or if there is any
	3082	* overlap. First, we check to see if all chunks are inside; if and only
	3083	* if they are, we're in the "inside" case.
	3084	*/
	3085
	3086	layoutPtr = (TextLayout *) layout;
	3087	chunkPtr = layoutPtr->chunks;
	3088	fontPtr = (TkFont *) layoutPtr->tkfont;
	3089
	3090	for (i=0 ; i<layoutPtr->numChunks ; i++,chunkPtr++) {
	3091	if (chunkPtr->start[0] == '\n') {
	3092	/*
	3093	* Newline characters are not counted when computing area
	3094	* intersection (but tab characters would still be considered).
	3095	*/
	3096
	3097	continue;
	3098	}
	3099
	3100	x1 = chunkPtr->x;
	3101	y1 = chunkPtr->y - fontPtr->fm.ascent;
	3102	x2 = chunkPtr->x + chunkPtr->displayWidth;
	3103	y2 = chunkPtr->y + fontPtr->fm.descent;
	3104	if ( !PointInQuadrilateral(rx, ry, x1, y1) \|\|
	3105	!PointInQuadrilateral(rx, ry, x2, y1) \|\|
	3106	!PointInQuadrilateral(rx, ry, x2, y2) \|\|
	3107	!PointInQuadrilateral(rx, ry, x1, y2)) {
	3108	goto notInside;
	3109	}
	3110	}
	3111	return 1;
	3112
	3113	/*
	3114	* Next, check to see if all the points of the rectangle are inside a
	3115	* single chunk; if they are, we're in an "overlap" case.
	3116	*/
	3117
	3118	notInside:
	3119	chunkPtr = layoutPtr->chunks;
	3120
	3121	for (i=0 ; i<layoutPtr->numChunks ; i++,chunkPtr++) {
	3122	double cx[4], cy[4];
	3123	if (chunkPtr->start[0] == '\n') {
	3124	/*
	3125	* Newline characters are not counted when computing area
	3126	* intersection (but tab characters would still be considered).
	3127	*/
	3128
	3129	continue;
	3130	}
	3131
	3132	cx[0] = cx[3] = chunkPtr->x;
	3133	cy[0] = cy[1] = chunkPtr->y - fontPtr->fm.ascent;
	3134	cx[1] = cx[2] = chunkPtr->x + chunkPtr->displayWidth;
	3135	cy[2] = cy[3] = chunkPtr->y + fontPtr->fm.descent;
	3136	if ( !PointInQuadrilateral(cx, cy, rx[0], ry[0]) \|\|
	3137	!PointInQuadrilateral(cx, cy, rx[1], ry[1]) \|\|
	3138	!PointInQuadrilateral(cx, cy, rx[2], ry[2]) \|\|
	3139	!PointInQuadrilateral(cx, cy, rx[3], ry[3])) {
	3140	goto notReverseInside;
	3141	}
	3142	}
	3143	return 0;
	3144
	3145	/*
	3146	* If we're overlapping now, we must be partially in and out of at least
	3147	* one chunk. If that is the case, there must be one line segment of the
	3148	* rectangle that is touching or crossing a line segment of a chunk.
	3149	*/
	3150
	3151	notReverseInside:
	3152	chunkPtr = layoutPtr->chunks;
	3153
	3154	for (i=0 ; i<layoutPtr->numChunks ; i++,chunkPtr++) {
	3155	int j;
	3156
	3157	if (chunkPtr->start[0] == '\n') {
	3158	/*
	3159	* Newline characters are not counted when computing area
	3160	* intersection (but tab characters would still be considered).
	3161	*/
	3162
	3163	continue;
	3164	}
	3165
	3166	x1 = chunkPtr->x;
	3167	y1 = chunkPtr->y - fontPtr->fm.ascent;
	3168	x2 = chunkPtr->x + chunkPtr->displayWidth;
	3169	y2 = chunkPtr->y + fontPtr->fm.descent;
	3170
	3171	for (j=0 ; j<4 ; j++) {
	3172	int k = (j+1) % 4;
	3173	if ( SidesIntersect(rx[j],ry[j], rx[k],ry[k], x1,y1, x2,y1) \|\|
	3174	SidesIntersect(rx[j],ry[j], rx[k],ry[k], x2,y1, x2,y2) \|\|
	3175	SidesIntersect(rx[j],ry[j], rx[k],ry[k], x2,y2, x1,y2) \|\|
	3176	SidesIntersect(rx[j],ry[j], rx[k],ry[k], x1,y2, x1,y1)) {
	3177	return 0;
	3178	}
	3179	}
	3180	}
	3181
	3182	/*
	3183	* They must be wholly non-overlapping.
	3184	*/
	3185
	3186	return -1;
2803	3187	}
2804	3188
2805	3189	/*

3673	4057	*-------------------------------------------------------------------------
3674	4058	*/
3675	4059
3676		char **
	4060	const char const
3677	4061	TkFontGetAliasList(
3678	4062	const char faceName) / Font name to test for aliases. */
3679	4063	{

3706	4090	*-------------------------------------------------------------------------
3707	4091	*/
3708	4092
3709		char ***
	4093	const char const const *
3710	4094	TkFontGetFallbacks(void)
3711	4095	{
3712	4096	return fontFallbacks;

3731	4115	*-------------------------------------------------------------------------
3732	4116	*/
3733	4117
3734		char **
	4118	const char const
3735	4119	TkFontGetGlobalClass(void)
3736	4120	{
3737	4121	return globalFontClass;

3754	4138	*-------------------------------------------------------------------------
3755	4139	*/
3756	4140
3757		char **
	4141	const char const
3758	4142	TkFontGetSymbolClass(void)
3759	4143	{
3760	4144	return symbolClass;

+5

-5

generic/tkFont.h less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkFont.h,v 1.11 2008/05/02 10:28:18 dkf Exp $
	12	* RCS: @(#) $Id: tkFont.h,v 1.13 2008/11/05 23:29:58 nijtmans Exp $
13	13	*/
14	14
15	15	#ifndef _TKFONT

196	196
197	197	MODULE_SCOPE int TkFontParseXLFD(const char *string,
198	198	TkFontAttributes faPtr, TkXLFDAttributes xaPtr);
199		MODULE_SCOPE char ** TkFontGetAliasList(const char *faceName);
200		MODULE_SCOPE char *** TkFontGetFallbacks(void);
	199	MODULE_SCOPE const char const TkFontGetAliasList(const char *faceName);
	200	MODULE_SCOPE const char const const * TkFontGetFallbacks(void);
201	201	MODULE_SCOPE int TkFontGetPixels(Tk_Window tkwin, int size);
202	202	MODULE_SCOPE int TkFontGetPoints(Tk_Window tkwin, int size);
203		MODULE_SCOPE char ** TkFontGetGlobalClass(void);
204		MODULE_SCOPE char ** TkFontGetSymbolClass(void);
	203	MODULE_SCOPE const char const TkFontGetGlobalClass(void);
	204	MODULE_SCOPE const char const TkFontGetSymbolClass(void);
205	205	MODULE_SCOPE int TkCreateNamedFont(Tcl_Interp *interp, Tk_Window tkwin,
206	206	const char name, TkFontAttributes faPtr);
207	207	MODULE_SCOPE int TkDeleteNamedFont(Tcl_Interp *interp,

+25

-16

generic/tkFrame.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkFrame.c,v 1.33 2008/07/23 23:24:21 nijtmans Exp $
	13	* RCS: @(#) $Id: tkFrame.c,v 1.37 2008/11/15 00:00:27 patthoyts Exp $
14	14	*/
15	15
16	16	#include "default.h"

163	163	LABELANCHOR_W, LABELANCHOR_WN, LABELANCHOR_WS
164	164	};
165	165
166		static char *labelAnchorStrings[] = {
	166	static const char *labelAnchorStrings[] = {
167	167	"e", "en", "es", "n", "ne", "nw", "s", "se", "sw", "w", "wn", "ws",
168	168	NULL
169	169	};

282	282	* Class names for widgets, indexed by FrameType.
283	283	*/
284	284
285		static char *classNames[] = {"Frame", "Toplevel", "Labelframe"};
	285	static const char *const classNames[] = {"Frame", "Toplevel", "Labelframe"};
286	286
287	287	/*
288	288	* The following table maps from FrameType to the option template for that

304	304	int objc, Tcl_Obj *const objv[]);
305	305	static int CreateFrame(ClientData clientData, Tcl_Interp *interp,
306	306	int objc, Tcl_Obj *const argv[],
307		enum FrameType type, char *appName);
	307	enum FrameType type, const char *appName);
308	308	static void DestroyFrame(char *memPtr);
309	309	static void DestroyFramePartly(Frame *framePtr);
310	310	static void DisplayFrame(ClientData clientData);

417	417	ClientData clientData, /* Either NULL or pointer to option table. */
418	418	Tcl_Interp interp, / Current interpreter. */
419	419	int argc, /* Number of arguments. */
420		char *argv, / Argument strings. */
	420	const char const argv, /* Argument strings. */
421	421	int toplevel, /* Non-zero means create a toplevel window,
422	422	* zero means create a frame. */
423		char appName) / Should only be non-NULL if there is no main
	423	const char appName) / Should only be non-NULL if there is no main
424	424	* window associated with the interpreter.
425	425	* Gives the base name to use for the new
426	426	* application. */

449	449	int objc, /* Number of arguments. */
450	450	Tcl_Obj const objv[], / Argument objects. */
451	451	enum FrameType type, /* What widget type to create. */
452		char appName) / Should only be non-NULL if there are no
	452	const char appName) / Should only be non-NULL if there are no
453	453	* Main window associated with the
454	454	* interpreter. Gives the base name to use for
455	455	* the new application. */

555	555	}
556	556	if (newWin == NULL) {
557	557	goto error;
	558	} else {
	559	/*
	560	* Mark Tk frames as suitable candidates for [wm manage]
	561	*/
	562	TkWindow winPtr = (TkWindow )newWin;
	563	winPtr->flags \|= TK_WM_MANAGEABLE;
558	564	}
559	565	if (className == NULL) {
560	566	className = Tk_GetOption(newWin, "class", "Class");

666	672	if (type == TYPE_TOPLEVEL) {
667	673	Tcl_DoWhenIdle(MapFrame, framePtr);
668	674	}
669		Tcl_SetResult(interp, Tk_PathName(newWin), TCL_STATIC);
	675	Tcl_SetObjResult(interp, TkNewWindowObj(newWin));
670	676	return TCL_OK;
671	677
672	678	error:

701	707	int objc, /* Number of arguments. */
702	708	Tcl_Obj const objv[]) / Argument objects. */
703	709	{
704		static const char *frameOptions[] = {
	710	static const char *const frameOptions[] = {
705	711	"cget", "configure", NULL
706	712	};
707	713	enum options {

933	939	ckfree(oldMenuName);
934	940	}
935	941	return TCL_ERROR;
936		} else {
937		Tk_FreeSavedOptions(&savedOptions);
938		}
	942	}
	943	Tk_FreeSavedOptions(&savedOptions);
939	944
940	945	/*
941	946	* A few of the options require additional processing.

1266	1271	if ((labelframePtr->labelAnchor >= LABELANCHOR_N) &&
1267	1272	(labelframePtr->labelAnchor <= LABELANCHOR_SW)) {
1268	1273	maxWidth -= padding;
1269		if (maxWidth < 1) maxWidth = 1;
	1274	if (maxWidth < 1) {
	1275	maxWidth = 1;
	1276	}
1270	1277	} else {
1271	1278	maxHeight -= padding;
1272		if (maxHeight < 1) maxHeight = 1;
	1279	if (maxHeight < 1) {
	1280	maxHeight = 1;
	1281	}
1273	1282	}
1274	1283	if (labelframePtr->labelBox.width > maxWidth) {
1275	1284	labelframePtr->labelBox.width = maxWidth;

1915	1924	}
1916	1925
1917	1926	void
1918		TkMapTopFrame (tkwin)
1919		Tk_Window tkwin;
	1927	TkMapTopFrame(
	1928	Tk_Window tkwin)
1920	1929	{
1921	1930	Frame framePtr = ((TkWindow)tkwin)->instanceData;
1922	1931	Tk_OptionTable optionTable;

+3

-3

generic/tkGeometry.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkGeometry.c,v 1.13 2008/04/27 22:38:56 dkf Exp $
	12	* RCS: @(#) $Id: tkGeometry.c,v 1.14 2008/11/08 18:44:40 dkf Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

97	97	&& ((winPtr->geomMgrPtr != mgrPtr)
98	98	\|\| (winPtr->geomData != clientData))
99	99	&& (winPtr->geomMgrPtr->lostSlaveProc != NULL)) {
100		(*winPtr->geomMgrPtr->lostSlaveProc)(winPtr->geomData, tkwin);
	100	winPtr->geomMgrPtr->lostSlaveProc(winPtr->geomData, tkwin);
101	101	}
102	102
103	103	winPtr->geomMgrPtr = mgrPtr;

153	153	winPtr->reqHeight = reqHeight;
154	154	if ((winPtr->geomMgrPtr != NULL)
155	155	&& (winPtr->geomMgrPtr->requestProc != NULL)) {
156		(*winPtr->geomMgrPtr->requestProc)(winPtr->geomData, tkwin);
	156	winPtr->geomMgrPtr->requestProc(winPtr->geomData, tkwin);
157	157	}
158	158	}
159	159

+3

-3

generic/tkGet.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkGet.c,v 1.14 2008/04/27 22:38:56 dkf Exp $
	14	* RCS: @(#) $Id: tkGet.c,v 1.15 2008/10/17 23:18:37 nijtmans Exp $
15	15	*/
16	16
17	17	#include "tkInt.h"

36	36	* used by Tk_GetAnchorFromObj and Tk_GetJustifyFromObj.
37	37	*/
38	38
39		static const char *anchorStrings[] = {
	39	static const char *const anchorStrings[] = {
40	40	"n", "ne", "e", "se", "s", "sw", "w", "nw", "center", NULL
41	41	};
42		static const char *justifyStrings[] = {
	42	static const char *const justifyStrings[] = {
43	43	"left", "right", "center", NULL
44	44	};
45	45

+6

-6

generic/tkGrab.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkGrab.c,v 1.15 2008/07/23 23:24:23 nijtmans Exp $
	11	* RCS: @(#) $Id: tkGrab.c,v 1.17 2008/11/23 21:58:24 patthoyts Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

131	131	* we generated.
132	132	*/
133	133
134		#define GENERATED_EVENT_MAGIC ((Bool) 0x147321ac)
	134	#define GENERATED_GRAB_EVENT_MAGIC ((Bool) 0x147321ac)
135	135
136	136	/*
137	137	* Mask that selects any of the state bits corresponding to buttons, plus

190	190	char *arg;
191	191	int index;
192	192	int len;
193		static const char *optionStrings[] = {
	193	static const char *const optionStrings[] = {
194	194	"current", "release", "set", "status", NULL
195	195	};
196		static const char *flagStrings[] = {
	196	static const char *const flagStrings[] = {
197	197	"-global", NULL
198	198	};
199	199	enum options {

721	721	* serverWinPtr.
722	722	*/
723	723
724		if (eventPtr->xcrossing.send_event != GENERATED_EVENT_MAGIC) {
	724	if (eventPtr->xcrossing.send_event != GENERATED_GRAB_EVENT_MAGIC) {
725	725	if ((eventPtr->type == LeaveNotify) &&
726	726	(winPtr->flags & TK_TOP_HIERARCHY)) {
727	727	dispPtr->serverWinPtr = NULL;

1150	1150	}
1151	1151
1152	1152	event.xcrossing.serial = LastKnownRequestProcessed(winPtr->display);
1153		event.xcrossing.send_event = GENERATED_EVENT_MAGIC;
	1153	event.xcrossing.send_event = GENERATED_GRAB_EVENT_MAGIC;
1154	1154	event.xcrossing.display = winPtr->display;
1155	1155	event.xcrossing.root = RootWindow(winPtr->display, winPtr->screenNum);
1156	1156	event.xcrossing.time = TkCurrentTime(winPtr->dispPtr);

+6

-7

generic/tkGrid.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkGrid.c,v 1.49 2008/07/23 23:24:23 nijtmans Exp $
	10	* RCS: @(#) $Id: tkGrid.c,v 1.51 2008/11/08 22:52:29 dkf Exp $
11	11	*/
12	12
13	13	#include "tkInt.h"

333	333	Tcl_Obj const objv[]) / Argument objects. */
334	334	{
335	335	Tk_Window tkwin = clientData;
336		static const char *optionStrings[] = {
	336	static const char *const optionStrings[] = {
337	337	"anchor", "bbox", "columnconfigure", "configure",
338	338	"forget", "info", "location", "propagate", "remove",
339	339	"rowconfigure", "size", "slaves", NULL

930	930	int ok; /* temporary TCL result code */
931	931	int i, j, first, last;
932	932	char *string;
933		static const char *optionStrings[] = {
	933	static const char *const optionStrings[] = {
934	934	"-minsize", "-pad", "-uniform", "-weight", NULL
935	935	};
936	936	enum options {

1305	1305	Gridder *slavePtr;
1306	1306	int i, value, index;
1307	1307	int row = -1, column = -1;
1308		static const char *optionStrings[] = {
	1308	static const char *const optionStrings[] = {
1309	1309	"-column", "-row", NULL
1310	1310	};
1311	1311	enum options { SLAVES_COLUMN, SLAVES_ROW };

1352	1352	slavePtr->row+slavePtr->numRows-1 < row)) {
1353	1353	continue;
1354	1354	}
1355		Tcl_ListObjAppendElement(interp, res,
1356		Tcl_NewStringObj(Tk_PathName(slavePtr->tkwin), -1));
	1355	Tcl_ListObjAppendElement(interp,res, TkNewWindowObj(slavePtr->tkwin));
1357	1356	}
1358	1357	Tcl_SetObjResult(interp, res);
1359	1358	return TCL_OK;

2884	2883	char lastWindow; / Use this window to base current row/col
2885	2884	* on */
2886	2885	int numSkip; /* Number of 'x' found */
2887		static const char *optionStrings[] = {
	2886	static const char *const optionStrings[] = {
2888	2887	"-column", "-columnspan", "-in", "-ipadx", "-ipady",
2889	2888	"-padx", "-pady", "-row", "-rowspan", "-sticky", NULL
2890	2889	};

+106

-51

generic/tkImage.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkImage.c,v 1.38 2008/10/05 18:22:21 dkf Exp $
	12	* RCS: @(#) $Id: tkImage.c,v 1.42 2008/11/12 09:56:51 dkf Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"
16	16
17	17	/*
18	18	* Each call to Tk_GetImage returns a pointer to one of the following
19		* structures, which is used as a token by clients (widgets) that
20		* display images.
	19	* structures, which is used as a token by clients (widgets) that display
	20	* images.
21	21	*/
22	22
23	23	typedef struct Image {

73	73	Tk_ImageType *oldImageTypeList;
74	74	/* First in a list of all known old-style
75	75	* image types. */
	76	int initialized; /* Set to 1 if we've initialized the
	77	* structure. */
76	78	} ThreadSpecificData;
77	79	static Tcl_ThreadDataKey dataKey;
78	80

80	82	* Prototypes for local functions:
81	83	*/
82	84
	85	static void ImageTypeThreadExitProc(ClientData clientData);
83	86	static void DeleteImage(ImageMaster *masterPtr);
84	87	static void EventuallyDeleteImage(ImageMaster *masterPtr,
85	88	int forgetImageHashNow);

87	90	/*
88	91	*----------------------------------------------------------------------
89	92	*
	93	* ImageTypeThreadExitProc --
	94	*
	95	* Clean up the registered list of image types.
	96	*
	97	* Results:
	98	* None.
	99	*
	100	* Side effects:
	101	* The thread's linked lists of photo image formats is deleted.
	102	*
	103	*----------------------------------------------------------------------
	104	*/
	105
	106	static void
	107	ImageTypeThreadExitProc(
	108	ClientData clientData) /* not used */
	109	{
	110	Tk_ImageType *freePtr;
	111	ThreadSpecificData *tsdPtr =
	112	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	113
	114	while (tsdPtr->oldImageTypeList != NULL) {
	115	freePtr = tsdPtr->oldImageTypeList;
	116	tsdPtr->oldImageTypeList = tsdPtr->oldImageTypeList->nextPtr;
	117	ckfree((char *) freePtr);
	118	}
	119	while (tsdPtr->imageTypeList != NULL) {
	120	freePtr = tsdPtr->imageTypeList;
	121	tsdPtr->imageTypeList = tsdPtr->imageTypeList->nextPtr;
	122	ckfree((char *) freePtr);
	123	}
	124	}
	125
	126	/*
	127	*----------------------------------------------------------------------
	128	*
90	129	* Tk_CreateOldImageType, Tk_CreateImageType --
91	130	*
92	131	* This function is invoked by an image manager to tell Tk about a new

105	144
106	145	void
107	146	Tk_CreateOldImageType(
108		Tk_ImageType typePtr) / Structure describing the type. All of the
	147	const Tk_ImageType *typePtr)
	148	/* Structure describing the type. All of the
109	149	* fields except "nextPtr" must be filled in
110		* by caller. Must not have been passed to
111		* Tk_CreateImageType previously. */
112		{
113		ThreadSpecificData tsdPtr = (ThreadSpecificData )
114		Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
115
116		typePtr->nextPtr = tsdPtr->oldImageTypeList;
117		tsdPtr->oldImageTypeList = typePtr;
	150	* by caller. */
	151	{
	152	Tk_ImageType *copyPtr;
	153	ThreadSpecificData *tsdPtr =
	154	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	155
	156	if (!tsdPtr->initialized) {
	157	tsdPtr->initialized = 1;
	158	Tcl_CreateThreadExitHandler(ImageTypeThreadExitProc, NULL);
	159	}
	160	copyPtr = (Tk_ImageType *) ckalloc(sizeof(Tk_ImageType));
	161	copyPtr = typePtr;
	162	copyPtr->nextPtr = tsdPtr->oldImageTypeList;
	163	tsdPtr->oldImageTypeList = copyPtr;
118	164	}
119	165
120	166	void
121	167	Tk_CreateImageType(
122		Tk_ImageType typePtr) / Structure describing the type. All of the
	168	const Tk_ImageType *typePtr)
	169	/* Structure describing the type. All of the
123	170	* fields except "nextPtr" must be filled in
124		* by caller. Must not have been passed to
125		* Tk_CreateImageType previously. */
126		{
127		ThreadSpecificData tsdPtr = (ThreadSpecificData )
128		Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
129
130		typePtr->nextPtr = tsdPtr->imageTypeList;
131		tsdPtr->imageTypeList = typePtr;
	171	* by caller. */
	172	{
	173	Tk_ImageType *copyPtr;
	174	ThreadSpecificData *tsdPtr =
	175	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	176
	177	if (!tsdPtr->initialized) {
	178	tsdPtr->initialized = 1;
	179	Tcl_CreateThreadExitHandler(ImageTypeThreadExitProc, NULL);
	180	}
	181	copyPtr = (Tk_ImageType *) ckalloc(sizeof(Tk_ImageType));
	182	copyPtr = typePtr;
	183	copyPtr->nextPtr = tsdPtr->imageTypeList;
	184	tsdPtr->imageTypeList = copyPtr;
132	185	}
133	186
134	187	/*

155	208	int objc, /* Number of arguments. */
156	209	Tcl_Obj const objv[]) / Argument strings. */
157	210	{
158		static const char *imageOptions[] = {
	211	static const char *const imageOptions[] = {
159	212	"create", "delete", "height", "inuse", "names", "type", "types",
160	213	"width", NULL
161	214	};

173	226	char idString[16 + TCL_INTEGER_SPACE];
174	227	TkDisplay *dispPtr = winPtr->dispPtr;
175	228	char arg, name;
176		ThreadSpecificData tsdPtr = (ThreadSpecificData )
	229	ThreadSpecificData *tsdPtr =
177	230	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
178	231
179	232	if (objc < 2) {

189	242	case IMAGE_CREATE: {
190	243	Tcl_Obj **args;
191	244	int oldimage = 0;
	245
192	246	if (objc < 3) {
193		Tcl_WrongNumArgs(interp, 2, objv, "type ?name? ?-option value ...?");
	247	Tcl_WrongNumArgs(interp, 2, objv,
	248	"type ?name? ?-option value ...?");
194	249	return TCL_ERROR;
195	250	}
196	251

228	283
229	284	if ((objc == 3) \|\| (*(arg = Tcl_GetString(objv[3])) == '-')) {
230	285	Tcl_CmdInfo dummy;
	286
231	287	do {
232	288	dispPtr->imageId++;
233	289	sprintf(idString, "image%d", dispPtr->imageId);

282	338	if (masterPtr->typePtr != NULL) {
283	339	for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
284	340	imagePtr = imagePtr->nextPtr) {
285		(*masterPtr->typePtr->freeProc)(imagePtr->instanceData,
	341	masterPtr->typePtr->freeProc(imagePtr->instanceData,
286	342	imagePtr->display);
287		(*imagePtr->changeProc)(imagePtr->widgetClientData,
288		0, 0, masterPtr->width, masterPtr->height,
	343	imagePtr->changeProc(imagePtr->widgetClientData, 0, 0,
	344	masterPtr->width, masterPtr->height,
289	345	masterPtr->width, masterPtr->height);
290	346	}
291		(*masterPtr->typePtr->deleteProc)(masterPtr->masterData);
	347	masterPtr->typePtr->deleteProc(masterPtr->masterData);
292	348	masterPtr->typePtr = NULL;
293	349	}
294	350	masterPtr->deleted = 0;

313	369	args[objc] = NULL;
314	370	}
315	371	Tcl_Preserve(masterPtr);
316		if ((*typePtr->createProc)(interp, name, objc, args, typePtr,
317		(Tk_ImageMaster)masterPtr, &masterPtr->masterData) != TCL_OK) {
	372	if (typePtr->createProc(interp, name, objc, args, typePtr,
	373	(Tk_ImageMaster)masterPtr, &masterPtr->masterData) != TCL_OK){
318	374	EventuallyDeleteImage(masterPtr, 0);
319	375	Tcl_Release(masterPtr);
320	376	if (oldimage) {

329	385	masterPtr->typePtr = typePtr;
330	386	for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
331	387	imagePtr = imagePtr->nextPtr) {
332		imagePtr->instanceData = (*typePtr->getProc)(imagePtr->tkwin,
	388	imagePtr->instanceData = typePtr->getProc(imagePtr->tkwin,
333	389	masterPtr->masterData);
334	390	}
335	391	Tcl_SetResult(interp,

478	534	masterPtr->height = imageHeight;
479	535	for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
480	536	imagePtr = imagePtr->nextPtr) {
481		(*imagePtr->changeProc)(imagePtr->widgetClientData, x, y,
482		width, height, imageWidth, imageHeight);
	537	imagePtr->changeProc(imagePtr->widgetClientData, x, y, width, height,
	538	imageWidth, imageHeight);
483	539	}
484	540	}
485	541

566	622	imagePtr->display = Tk_Display(tkwin);
567	623	imagePtr->masterPtr = masterPtr;
568	624	imagePtr->instanceData =
569		(*masterPtr->typePtr->getProc)(tkwin, masterPtr->masterData);
	625	masterPtr->typePtr->getProc(tkwin, masterPtr->masterData);
570	626	imagePtr->changeProc = changeProc;
571	627	imagePtr->widgetClientData = clientData;
572	628	imagePtr->nextPtr = masterPtr->instancePtr;

612	668	*/
613	669
614	670	if (masterPtr->typePtr != NULL) {
615		(*masterPtr->typePtr->freeProc)(imagePtr->instanceData,
	671	masterPtr->typePtr->freeProc(imagePtr->instanceData,
616	672	imagePtr->display);
617	673	}
618	674	prevPtr = masterPtr->instancePtr;

690	746	*/
691	747
692	748	if (imagePtr->masterPtr->typePtr->postscriptProc != NULL) {
693		return (*imagePtr->masterPtr->typePtr->postscriptProc)(
694		imagePtr->masterPtr->masterData, interp, tkwin, psinfo,
695		x, y, width, height, prepass);
	749	return imagePtr->masterPtr->typePtr->postscriptProc(
	750	imagePtr->masterPtr->masterData, interp, tkwin, psinfo,
	751	x, y, width, height, prepass);
696	752	}
697	753
698	754	if (prepass) {

711	767	gcValues.foreground = WhitePixelOfScreen(Tk_Screen(tkwin));
712	768	newGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
713	769	if (newGC != None) {
714		XFillRectangle(Tk_Display(tkwin), pmap, newGC,
715		0, 0, (unsigned int)width, (unsigned int)height);
	770	XFillRectangle(Tk_Display(tkwin), pmap, newGC, 0, 0,
	771	(unsigned) width, (unsigned) height);
716	772	Tk_FreeGC(Tk_Display(tkwin), newGC);
717	773	}
718	774
719	775	Tk_RedrawImage(image, x, y, width, height, pmap, 0, 0);
720	776
721	777	ximage = XGetImage(Tk_Display(tkwin), pmap, 0, 0,
722		(unsigned int)width, (unsigned int)height, AllPlanes, ZPixmap);
	778	(unsigned) width, (unsigned) height, AllPlanes, ZPixmap);
723	779
724	780	Tk_FreePixmap(Tk_Display(tkwin), pmap);
725	781

800	856	if ((imageY + height) > imagePtr->masterPtr->height) {
801	857	height = imagePtr->masterPtr->height - imageY;
802	858	}
803		(*imagePtr->masterPtr->typePtr->displayProc)(
804		imagePtr->instanceData, imagePtr->display, drawable,
805		imageX, imageY, width, height, drawableX, drawableY);
	859	imagePtr->masterPtr->typePtr->displayProc(imagePtr->instanceData,
	860	imagePtr->display, drawable, imageX, imageY, width, height,
	861	drawableX, drawableY);
806	862	}
807	863
808	864	/*

901	957	if (typePtr != NULL) {
902	958	for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
903	959	imagePtr = imagePtr->nextPtr) {
904		(*typePtr->freeProc)(imagePtr->instanceData,
905		imagePtr->display);
906		(*imagePtr->changeProc)(imagePtr->widgetClientData, 0, 0,
	960	typePtr->freeProc(imagePtr->instanceData, imagePtr->display);
	961	imagePtr->changeProc(imagePtr->widgetClientData, 0, 0,
907	962	masterPtr->width, masterPtr->height, masterPtr->width,
908	963	masterPtr->height);
909	964	}
910		(*typePtr->deleteProc)(masterPtr->masterData);
	965	typePtr->deleteProc(masterPtr->masterData);
911	966	}
912	967	if (masterPtr->instancePtr == NULL) {
913	968	if (masterPtr->hPtr != NULL) {

1011	1066	Tcl_Interp interp, / Interpreter in which the image was
1012	1067	* created. */
1013	1068	const char name, / Name of image. */
1014		Tk_ImageType *typePtrPtr) / Points to location to fill in with pointer
	1069	const Tk_ImageType **typePtrPtr)
	1070	/* Points to location to fill in with pointer
1015	1071	* to type information for image. */
1016	1072	{
	1073	TkWindow winPtr = (TkWindow ) Tk_MainWindow(interp);
1017	1074	Tcl_HashEntry *hPtr;
1018		TkWindow *winPtr;
1019	1075	ImageMaster *masterPtr;
1020	1076
1021		winPtr = (TkWindow *) Tk_MainWindow(interp);
1022	1077	hPtr = Tcl_FindHashEntry(&winPtr->mainPtr->imageTable, name);
1023	1078	if (hPtr == NULL) {
1024	1079	*typePtrPtr = NULL;

+29

-28

generic/tkImgBmap.c less more

9	9	* See the file "license.terms" for information on usage and redistribution
10	10	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkImgBmap.c,v 1.24 2008/07/23 23:24:21 nijtmans Exp $
	12	* RCS: @(#) $Id: tkImgBmap.c,v 1.28 2008/12/09 21:22:56 dgp Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

76	76
77	77	static int GetByte(Tcl_Channel chan);
78	78	static int ImgBmapCreate(Tcl_Interp *interp,
79		char name, int argc, Tcl_Obj const objv[],
80		Tk_ImageType *typePtr, Tk_ImageMaster master,
	79	const char name, int argc, Tcl_Obj const objv[],
	80	const Tk_ImageType *typePtr, Tk_ImageMaster master,
81	81	ClientData *clientDataPtr);
82	82	static ClientData ImgBmapGet(Tk_Window tkwin, ClientData clientData);
83	83	static void ImgBmapDisplay(ClientData clientData,

130	130
131	131	#define MAX_WORD_LENGTH 100
132	132	typedef struct ParseInfo {
133		char string; / Next character of string data for bitmap,
	133	const char string; / Next character of string data for bitmap,
134	134	* or NULL if bitmap is being read from
135	135	* file. */
136	136	Tcl_Channel chan; /* File containing bitmap data, or NULL if no

152	152	static int ImgBmapConfigureMaster(BitmapMaster *masterPtr,
153	153	int argc, Tcl_Obj *const objv[], int flags);
154	154	static int NextBitmapWord(ParseInfo *parseInfoPtr);
155
	155
156	156	/*
157	157	*----------------------------------------------------------------------
158	158	*

174	174	ImgBmapCreate(
175	175	Tcl_Interp interp, / Interpreter for application containing
176	176	* image. */
177		char name, / Name to use for image. */
	177	const char name, / Name to use for image. */
178	178	int argc, /* Number of arguments. */
179	179	Tcl_Obj const argv[], / Argument objects for options (doesn't
180	180	* include image name or type). */
181		Tk_ImageType typePtr, / Pointer to our type record (not used). */
	181	const Tk_ImageType typePtr, / Pointer to our type record (not used). */
182	182	Tk_ImageMaster master, /* Token for image, to be used by us in later
183	183	* callbacks. */
184	184	ClientData clientDataPtr) / Store manager's token for image here; it

208	208	*clientDataPtr = masterPtr;
209	209	return TCL_OK;
210	210	}
211
	211
212	212	/*
213	213	*----------------------------------------------------------------------
214	214	*

312	312	masterPtr->height, masterPtr->width, masterPtr->height);
313	313	return TCL_OK;
314	314	}
315
	315
316	316	/*
317	317	*----------------------------------------------------------------------
318	318	*

442	442	Tk_FreeGC(Tk_Display(instancePtr->tkwin), instancePtr->gc);
443	443	}
444	444	instancePtr->gc = None;
445		Tcl_AddErrorInfo(masterPtr->interp, "\n (while configuring image \"");
446		Tcl_AddErrorInfo(masterPtr->interp, Tk_NameOfImage(masterPtr->tkMaster));
447		Tcl_AddErrorInfo(masterPtr->interp, "\")");
	445	Tcl_AppendObjToErrorInfo(masterPtr->interp, Tcl_ObjPrintf(
	446	"\n (while configuring image \"%s\")", Tk_NameOfImage(
	447	masterPtr->tkMaster)));
448	448	Tcl_BackgroundError(masterPtr->interp);
449	449	}
450
	450
451	451	/*
452	452	*----------------------------------------------------------------------
453	453	*

473	473	char *
474	474	TkGetBitmapData(
475	475	Tcl_Interp interp, / For reporting errors, or NULL. */
476		char string, / String describing bitmap. May be NULL. */
477		char fileName, / Name of file containing bitmap description.
	476	const char string, / String describing bitmap. May be NULL. */
	477	const char fileName, / Name of file containing bitmap description.
478	478	* Used only if string is NULL. Must not be
479	479	* NULL if string is NULL. */
480	480	int widthPtr, int heightPtr,

649	649	}
650	650	return NULL;
651	651	}
652
	652
653	653	/*
654	654	*----------------------------------------------------------------------
655	655	*

674	674	ParseInfo parseInfoPtr) / Describes what we're reading and where we
675	675	* are in it. */
676	676	{
677		char src, dst;
	677	const char *src;
	678	char *dst;
678	679	int c;
679	680
680	681	parseInfoPtr->wordLength = 0;

718	719	parseInfoPtr->word[parseInfoPtr->wordLength] = 0;
719	720	return TCL_OK;
720	721	}
721
	722
722	723	/*
723	724	*--------------------------------------------------------------
724	725	*

744	745	int objc, /* Number of arguments. */
745	746	Tcl_Obj const objv[]) / Argument objects. */
746	747	{
747		static const char *bmapOptions[] = {"cget", "configure", NULL};
	748	static const char *const bmapOptions[] = {"cget", "configure", NULL};
748	749	BitmapMaster *masterPtr = clientData;
749	750	int index;
750	751

781	782	return TCL_OK;
782	783	}
783	784	}
784
	785
785	786	/*
786	787	*----------------------------------------------------------------------
787	788	*

852	853
853	854	return instancePtr;
854	855	}
855
	856
856	857	/*
857	858	*----------------------------------------------------------------------
858	859	*

912	913	XSetClipOrigin(display, instancePtr->gc, 0, 0);
913	914	}
914	915	}
915
	916
916	917	/*
917	918	*----------------------------------------------------------------------
918	919	*

975	976	}
976	977	ckfree((char *) instancePtr);
977	978	}
978
	979
979	980	/*
980	981	*----------------------------------------------------------------------
981	982	*

1016	1017	Tk_FreeOptions(configSpecs, (char *) masterPtr, NULL, 0);
1017	1018	ckfree((char *) masterPtr);
1018	1019	}
1019
	1020
1020	1021	/*
1021	1022	*----------------------------------------------------------------------
1022	1023	*

1046	1047	Tk_DeleteImage(masterPtr->interp, Tk_NameOfImage(masterPtr->tkMaster));
1047	1048	}
1048	1049	}
1049
	1050
1050	1051	/*
1051	1052	*----------------------------------------------------------------------
1052	1053	*

1078	1079	}
1079	1080	}
1080	1081
1081
	1082
1082	1083	/*
1083	1084	*----------------------------------------------------------------------
1084	1085	*

1174	1175	Tcl_AppendResult(interp, ">} imagemask \n", NULL);
1175	1176	return TCL_OK;
1176	1177	}
1177
	1178
1178	1179	/*
1179	1180	*----------------------------------------------------------------------
1180	1181	*

1281	1282	}
1282	1283	return TCL_OK;
1283	1284	}
1284
	1285
1285	1286	/*
1286	1287	* Local Variables:
1287	1288	* mode: c

+2

-2

generic/tkImgGIF.c less more

31	31	* This file also contains code from miGIF. See lower down in file for the
32	32	* applicable copyright notice for that portion.
33	33	*
34		* RCS: @(#) $Id: tkImgGIF.c,v 1.44 2008/04/27 22:38:56 dkf Exp $
	34	* RCS: @(#) $Id: tkImgGIF.c,v 1.45 2008/10/17 23:18:37 nijtmans Exp $
35	35	*/
36	36
37	37	#include "tkInt.h"

263	263	int bitPixel;
264	264	unsigned char colorMap[MAXCOLORMAPSIZE][4];
265	265	int transparent = -1;
266		static const char *optionStrings[] = {
	266	static const char *const optionStrings[] = {
267	267	"-index", NULL
268	268	};
269	269	GIFImageConfig gifConf, *gifConfPtr = &gifConf;

+18

-25

generic/tkImgPhoto.c less more

16	16	* Department of Computer Science,
17	17	* Australian National University.
18	18	*
19		* RCS: @(#) $Id: tkImgPhoto.c,v 1.82 2008/10/05 18:22:21 dkf Exp $
	19	* RCS: @(#) $Id: tkImgPhoto.c,v 1.88 2008/11/18 23:49:43 nijtmans Exp $
20	20	*/
21	21
22	22	#include "tkImgPhoto.h"

76	76	* of the OPT_* constants above.
77	77	*/
78	78
79		static char *optionNames[] = {
	79	static const char *const optionNames[] = {
80	80	"-background",
81	81	"-compositingrule",
82	82	"-format",

101	101	* Functions used in the type record for photo images.
102	102	*/
103	103
104		static int ImgPhotoCreate(Tcl_Interp interp, char name,
	104	static int ImgPhotoCreate(Tcl_Interp interp, const char name,
105	105	int objc, Tcl_Obj *const objv[],
106		Tk_ImageType *typePtr, Tk_ImageMaster master,
	106	const Tk_ImageType *typePtr, Tk_ImageMaster master,
107	107	ClientData *clientDataPtr);
108	108	static void ImgPhotoDelete(ClientData clientData);
109	109	static int ImgPhotoPostscript(ClientData clientData,

134	134	/* Pointer to the first in the list of known
135	135	* photo image formats.*/
136	136	int initialized; /* Set to 1 if we've initialized the
137		* strucuture. */
	137	* structure. */
138	138	} ThreadSpecificData;
139	139	static Tcl_ThreadDataKey dataKey;
140	140

228	228	while (tsdPtr->oldFormatList != NULL) {
229	229	freePtr = tsdPtr->oldFormatList;
230	230	tsdPtr->oldFormatList = tsdPtr->oldFormatList->nextPtr;
231		ckfree(freePtr->name);
232	231	ckfree((char *) freePtr);
233	232	}
234	233	while (tsdPtr->formatList != NULL) {
235	234	freePtr = tsdPtr->formatList;
236	235	tsdPtr->formatList = tsdPtr->formatList->nextPtr;
237		ckfree(freePtr->name);
238	236	ckfree((char *) freePtr);
239	237	}
240	238	}

260	258
261	259	void
262	260	Tk_CreateOldPhotoImageFormat(
263		Tk_PhotoImageFormat *formatPtr)
	261	const Tk_PhotoImageFormat *formatPtr)
264	262	/* Structure describing the format. All of the
265	263	* fields except "nextPtr" must be filled in
266		* by caller. Must not have been passed to
267		* Tk_CreatePhotoImageFormat previously. */
	264	* by caller. */
268	265	{
269	266	Tk_PhotoImageFormat *copyPtr;
270	267	ThreadSpecificData *tsdPtr =

276	273	}
277	274	copyPtr = (Tk_PhotoImageFormat *) ckalloc(sizeof(Tk_PhotoImageFormat));
278	275	copyPtr = formatPtr;
279		copyPtr->name = ckalloc((unsigned) (strlen(formatPtr->name) + 1));
280		strcpy(copyPtr->name, formatPtr->name);
281	276	copyPtr->nextPtr = tsdPtr->oldFormatList;
282	277	tsdPtr->oldFormatList = copyPtr;
283	278	}
284	279
285	280	void
286	281	Tk_CreatePhotoImageFormat(
287		Tk_PhotoImageFormat *formatPtr)
	282	const Tk_PhotoImageFormat *formatPtr)
288	283	/* Structure describing the format. All of the
289	284	* fields except "nextPtr" must be filled in
290		* by caller. Must not have been passed to
291		* Tk_CreatePhotoImageFormat previously. */
	285	* by caller. */
292	286	{
293	287	Tk_PhotoImageFormat *copyPtr;
294	288	ThreadSpecificData *tsdPtr =

300	294	}
301	295	copyPtr = (Tk_PhotoImageFormat *) ckalloc(sizeof(Tk_PhotoImageFormat));
302	296	copyPtr = formatPtr;
303		copyPtr->name = ckalloc((unsigned) (strlen(formatPtr->name) + 1));
304		strcpy(copyPtr->name, formatPtr->name);
305	297	if (isupper((unsigned char) *formatPtr->name)) {
306	298	copyPtr->nextPtr = tsdPtr->oldFormatList;
307	299	tsdPtr->oldFormatList = copyPtr;

332	324	ImgPhotoCreate(
333	325	Tcl_Interp interp, / Interpreter for application containing
334	326	* image. */
335		char name, / Name to use for image. */
	327	const char name, / Name to use for image. */
336	328	int objc, /* Number of arguments. */
337	329	Tcl_Obj const objv[], / Argument objects for options (doesn't
338	330	* include image name or type). */
339		Tk_ImageType typePtr, / Pointer to our type record (not used). */
	331	const Tk_ImageType typePtr, / Pointer to our type record (not used). */
340	332	Tk_ImageMaster master, /* Token for image, to be used by us in later
341	333	* callbacks. */
342	334	ClientData clientDataPtr) / Store manager's token for image here; it

397	389	int objc, /* Number of arguments. */
398	390	Tcl_Obj const objv[]) / Argument objects. */
399	391	{
400		static const char *photoOptions[] = {
	392	static const char *const photoOptions[] = {
401	393	"blank", "cget", "configure", "copy", "data", "get", "put",
402	394	"read", "redither", "transparency", "write", NULL
403	395	};

1124	1116	return TCL_OK;
1125	1117
1126	1118	case PHOTO_TRANS: {
1127		static const char *photoTransOptions[] = {
	1119	static const char *const photoTransOptions[] = {
1128	1120	"get", "set", NULL
1129	1121	};
1130	1122	enum transOptions {

1400	1392	{
1401	1393	int index, c, bit, currentBit, length;
1402	1394	int values[4], numValues, maxValues, argIndex;
1403		char option, *listPtr;
	1395	const char *option;
	1396	const char const listPtr;
1404	1397
1405	1398	for (index = optIndexPtr; index < objc; optIndexPtr = ++index) {
1406	1399	/*

1509	1502	* constants.
1510	1503	*/
1511	1504
1512		static const char *compositingRules[] = {
	1505	static const char *const compositingRules[] = {
1513	1506	"overlay", "set", NULL
1514	1507	};
1515	1508

2516	2509	* exists. */
2517	2510	const char imageName) / Name of the desired photo image. */
2518	2511	{
2519		Tk_ImageType *typePtr;
	2512	const Tk_ImageType *typePtr;
2520	2513	ClientData clientData =
2521	2514	Tk_GetImageMasterData(interp, imageName, &typePtr);
2522	2515
2523		if (typePtr != &tkPhotoImageType) {
	2516	if ((typePtr == NULL) \|\| (typePtr->name != tkPhotoImageType.name)) {
2524	2517	return NULL;
2525	2518	}
2526	2519	return clientData;

+83

-31

generic/tkInt.decls less more

9	9	# See the file "license.terms" for information on usage and redistribution
10	10	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	#
12		# RCS: @(#) $Id: tkInt.decls,v 1.45 2008/08/19 15:52:11 georgeps Exp $
	12	# RCS: @(#) $Id: tkInt.decls,v 1.51 2008/12/05 15:51:31 nijtmans Exp $
13	13
14	14	library tk
15	15

61	61	declare 11 generic {
62	62	unsigned long TkCreateBindingProcedure(Tcl_Interp *interp,
63	63	Tk_BindingTable bindingTable, ClientData object,
64		CONST char eventString, TkBindEvalProc evalProc,
	64	const char eventString, TkBindEvalProc evalProc,
65	65	TkBindFreeProc *freeProc, ClientData clientData)
66	66	}
67	67	declare 12 generic {
68	68	TkCursor *TkCreateCursorFromData(Tk_Window tkwin,
69		CONST char source, CONST char mask, int width, int height,
	69	const char source, const char mask, int width, int height,
70	70	int xHot, int yHot, XColor fg, XColor bg)
71	71	}
72	72	declare 13 generic {
73	73	int TkCreateFrame(ClientData clientData, Tcl_Interp *interp,
74		int argc, char *argv, int toplevel, char appName)
	74	int argc, const char const argv, int toplevel, const char *appName)
75	75	}
76	76	declare 14 generic {
77	77	Tk_Window TkCreateMainWindow(Tcl_Interp *interp,
78		CONST char screenName, char baseName)
	78	const char screenName, const char baseName)
79	79	}
80	80	declare 15 generic {
81	81	Time TkCurrentTime(TkDisplay *dispPtr)

98	98	Display *display, Drawable drawable, GC gc, GC outlineGC)
99	99	}
100	100	declare 21 generic {
101		int TkFindStateNum(Tcl_Interp interp, CONST char option,
102		CONST TkStateMap mapPtr, CONST char strKey)
	101	int TkFindStateNum(Tcl_Interp interp, const char option,
	102	const TkStateMap mapPtr, const char strKey)
103	103	}
104	104	declare 22 generic {
105		char TkFindStateString(CONST TkStateMap mapPtr, int numKey)
	105	char TkFindStateString(const TkStateMap mapPtr, int numKey)
106	106	}
107	107	declare 23 generic {
108	108	void TkFocusDeadWindow(TkWindow *winPtr)

128	128	void TkpFreeCursor(TkCursor *cursorPtr)
129	129	}
130	130	declare 30 generic {
131		char TkGetBitmapData(Tcl_Interp interp, char string, char fileName,
132		int widthPtr, int heightPtr, int hotXPtr, int hotYPtr)
	131	char TkGetBitmapData(Tcl_Interp interp, const char *string,
	132	const char fileName, int widthPtr, int *heightPtr,
	133	int hotXPtr, int hotYPtr)
133	134	}
134	135	declare 31 generic {
135	136	void TkGetButtPoints(double p1[], double p2[],

140	141	Tk_Window tkwin, Tk_Uid string)
141	142	}
142	143	declare 33 generic {
143		CONST84_RETURN char TkGetDefaultScreenName(Tcl_Interp interp,
144		CONST char *screenName)
	144	const char TkGetDefaultScreenName(Tcl_Interp interp,
	145	const char *screenName)
145	146	}
146	147	declare 34 generic {
147	148	TkDisplay TkGetDisplay(Display display)
148	149	}
149	150	declare 35 generic {
150		int TkGetDisplayOf(Tcl_Interp interp, int objc, Tcl_Obj CONST objv[],
	151	int TkGetDisplayOf(Tcl_Interp interp, int objc, Tcl_Obj const objv[],
151	152	Tk_Window *tkwinPtr)
152	153	}
153	154	declare 36 generic {

223	224	void TkpClaimFocus(TkWindow *topLevelPtr, int force)
224	225	}
225	226	declare 58 generic {
226		void TkpDisplayWarning(CONST char msg, CONST char title)
	227	void TkpDisplayWarning(const char msg, const char title)
227	228	}
228	229	declare 59 generic {
229	230	void TkpGetAppName(Tcl_Interp interp, Tcl_DString name)

254	255	void TkpMenuNotifyToplevelCreate(Tcl_Interp interp1, char menuName)
255	256	}
256	257	declare 68 generic {
257		TkDisplay TkpOpenDisplay(CONST char display_name)
	258	TkDisplay TkpOpenDisplay(const char display_name)
258	259	}
259	260	declare 69 generic {
260	261	int TkPointerEvent(XEvent eventPtr, TkWindow winPtr)

275	276	void TkpSetMainMenubar(Tcl_Interp interp, Tk_Window tkwin, char menuName)
276	277	}
277	278	declare 75 generic {
278		int TkpUseWindow(Tcl_Interp interp, Tk_Window tkwin, CONST char string)
	279	int TkpUseWindow(Tcl_Interp interp, Tk_Window tkwin, const char string)
279	280	}
280	281	declare 77 generic {
281	282	void TkQueueEventForAllChildren(TkWindow winPtr, XEvent eventPtr)
282	283	}
283	284	declare 78 generic {
284		int TkReadBitmapFile(Display display, Drawable d, CONST char filename,
	285	int TkReadBitmapFile(Display display, Drawable d, const char filename,
285	286	unsigned int width_return, unsigned int height_return,
286	287	Pixmap bitmap_return, int x_hot_return, int *y_hot_return)
287	288	}

373	374	}
374	375	declare 104 generic {
375	376	int TkFindStateNumObj(Tcl_Interp interp, Tcl_Obj optionPtr,
376		CONST TkStateMap mapPtr, Tcl_Obj keyPtr)
	377	const TkStateMap mapPtr, Tcl_Obj keyPtr)
377	378	}
378	379	declare 105 generic {
379	380	Tcl_HashTable *TkGetBitmapPredefTable(void)

396	397	}
397	398	declare 111 generic {
398	399	Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin,
399		CONST char dbName, CONST char className)
	400	const char dbName, const char className)
400	401	}
401	402	declare 112 generic {
402	403	void TkpMenuThreadInit(void)

425	426	TkRegion src, TkRegion dr_return)
426	427	}
427	428	declare 121 aqua {
428		Pixmap TkpCreateNativeBitmap(Display display, CONST char source)
	429	Pixmap TkpCreateNativeBitmap(Display display, const char source)
429	430	}
430	431	declare 122 aqua {
431	432	void TkpDefineNativeBitmaps(void)
432	433	}
433	434	declare 124 aqua {
434	435	Pixmap TkpGetNativeAppBitmap(Display *display,
435		CONST char name, int width, int *height)
	436	const char name, int width, int *height)
436	437	}
437	438	declare 135 generic {
438	439	void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC,

477	478	}
478	479	declare 148 generic {
479	480	Tk_Window TkToplevelWindowForCommand(Tcl_Interp *interp,
480		CONST char *cmdName)
	481	const char *cmdName)
481	482	}
482	483	declare 149 generic {
483		CONST Tk_OptionSpec TkGetOptionSpec(CONST char name,
	484	const Tk_OptionSpec TkGetOptionSpec(const char name,
484	485	Tk_OptionTable optionTable)
485	486	}
486	487

507	508	# entries needed only by tktest:
508	509	declare 156 generic {
509	510	int TkpTestembedCmd(ClientData clientData, Tcl_Interp *interp, int argc,
510		CONST char **argv)
	511	const char **argv)
511	512	}
512	513	declare 157 generic {
513	514	int TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp, int argc,
514		CONST char **argv)
	515	const char **argv)
	516	}
	517	declare 158 generic {
	518	int TkSelGetSelection(Tcl_Interp *interp, Tk_Window tkwin,
	519	Atom selection, Atom target, Tk_GetSelProc *proc,
	520	ClientData clientData)
	521	}
	522	declare 159 generic {
	523	int TkTextGetIndex(Tcl_Interp interp, struct TkText textPtr,
	524	const char string, struct TkTextIndex indexPtr)
	525	}
	526	declare 160 generic {
	527	int TkTextIndexBackBytes(const struct TkText *textPtr,
	528	const struct TkTextIndex *srcPtr, int count,
	529	struct TkTextIndex *dstPtr)
	530	}
	531	declare 161 generic {
	532	int TkTextIndexForwBytes(const struct TkText *textPtr,
	533	const struct TkTextIndex *srcPtr, int count,
	534	struct TkTextIndex *dstPtr)
	535	}
	536	declare 162 generic {
	537	struct TkTextIndex *TkTextMakeByteIndex(TkTextBTree tree,
	538	const struct TkText *textPtr, int lineIndex,
	539	int byteIndex, struct TkTextIndex *indexPtr)
	540	}
	541	declare 163 generic {
	542	int TkTextPrintIndex(const struct TkText *textPtr,
	543	const struct TkTextIndex indexPtr, char string)
	544	}
	545	declare 164 generic {
	546	struct TkTextSegment TkTextSetMark(struct TkText textPtr,
	547	const char name, struct TkTextIndex indexPtr)
	548	}
	549	declare 165 generic {
	550	int TkTextXviewCmd(struct TkText textPtr, Tcl_Interp interp,
	551	int objc, Tcl_Obj *const objv[])
	552	}
	553	declare 166 generic {
	554	void TkTextChanged(struct TkSharedText *sharedTextPtr,
	555	struct TkText textPtr, const struct TkTextIndex index1Ptr,
	556	const struct TkTextIndex *index2Ptr)
	557	}
	558	declare 167 generic {
	559	int TkBTreeNumLines(TkTextBTree tree,
	560	const struct TkText *textPtr)
	561	}
	562	declare 168 generic {
	563	void TkTextInsertDisplayProc(struct TkText *textPtr,
	564	struct TkTextDispChunk *chunkPtr, int x, int y,
	565	int height, int baseline, Display *display,
	566	Drawable dst, int screenY)
515	567	}
516	568
517	569	##############################################################################

543	595	void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar)
544	596	}
545	597	declare 8 x11 {
546		int TkpScanWindowId(Tcl_Interp interp, CONST char string, Window *idPtr)
	598	int TkpScanWindowId(Tcl_Interp interp, const char string, Window *idPtr)
547	599	}
548	600	declare 9 x11 {
549	601	void TkWmCleanup(TkDisplay *dispPtr)

557	609	# only needed by tktest:
558	610	declare 13 x11 {
559	611	int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int argc,
560		CONST char **argv)
	612	const char **argv)
561	613	}
562	614
563	615	################################

579	631	void TkpPrintWindowId(char *buf, Window window)
580	632	}
581	633	declare 6 win {
582		int TkpScanWindowId(Tcl_Interp interp, CONST char string, Window *idPtr)
	634	int TkpScanWindowId(Tcl_Interp interp, const char string, Window *idPtr)
583	635	}
584	636	declare 7 win {
585	637	void TkpSetCapture(TkWindow *winPtr)

664	716	}
665	717	declare 32 win {
666	718	Tcl_Obj *TkWinGetMenuSystemDefault(Tk_Window tkwin,
667		CONST char dbName, CONST char className)
	719	const char dbName, const char className)
668	720	}
669	721	declare 33 win {
670	722	int TkWinGetPlatformId(void)

688	740
689	741	# removed duplicates from tkInt table
690	742	#declare 1 aqua {
691		# Pixmap TkpCreateNativeBitmap(Display display, CONST char source)
	743	# Pixmap TkpCreateNativeBitmap(Display display, const char source)
692	744	#}
693	745	#
694	746	#declare 2 aqua {

1089	1141	Status XSendEvent(Display d, Window w, Bool b, long l, XEvent x)
1090	1142	}
1091	1143	declare 62 win {
1092		void XSetCommand(Display d, Window w, CONST char *c, int i)
	1144	void XSetCommand(Display d, Window w, const char *c, int i)
1093	1145	}
1094	1146	declare 63 win {
1095	1147	void XSetIconName(Display d, Window w, _Xconst char c)

+94

-24

generic/tkInt.h less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: $Id: tkInt.h,v 1.83 2008/04/02 21:32:32 das Exp $
	13	* RCS: $Id: tkInt.h,v 1.98 2008/12/10 05:02:51 das Exp $
14	14	*/
15	15
16	16	#ifndef _TKINT

101	101	typedef struct TkRegion_ *TkRegion;
102	102	typedef struct TkStressedCmap TkStressedCmap;
103	103	typedef struct TkBindInfo_ *TkBindInfo;
	104	typedef struct Busy *TkBusy;
104	105
105	106	/*
106	107	* Function types.

669	670	* ::tk::AlwaysShowSelection variable. */
670	671	struct TkMainInfo nextPtr; / Next in list of all main windows managed by
671	672	* this process. */
	673	Tcl_HashTable busyTable; /* Information used by [tk busy] command. */
672	674	} TkMainInfo;
673	675
674	676	/*

851	853	} TkWindow;
852	854
853	855	/*
	856	* The following structure is used with TkMakeEnsemble to create
	857	* ensemble commands and optionally to create sub-ensembles.
	858	*/
	859
	860	typedef struct TkEnsemble {
	861	const char *name;
	862	Tcl_ObjCmdProc *proc;
	863	const struct TkEnsemble *subensemble;
	864	} TkEnsemble;
	865
	866	/*
854	867	* The following structure is used as a two way map between integers and
855	868	* strings, usually to map between an internal C representation and the
856	869	* strings used in Tcl.

930	943	* be properly registered with Tcl:
931	944	*/
932	945
933		MODULE_SCOPE Tcl_ObjType tkBorderObjType;
934		MODULE_SCOPE Tcl_ObjType tkBitmapObjType;
935		MODULE_SCOPE Tcl_ObjType tkColorObjType;
936		MODULE_SCOPE Tcl_ObjType tkCursorObjType;
937		MODULE_SCOPE Tcl_ObjType tkFontObjType;
938		MODULE_SCOPE Tcl_ObjType tkOptionObjType;
939		MODULE_SCOPE Tcl_ObjType tkStateKeyObjType;
940		MODULE_SCOPE Tcl_ObjType tkTextIndexType;
	946	MODULE_SCOPE const Tcl_ObjType tkBorderObjType;
	947	MODULE_SCOPE const Tcl_ObjType tkBitmapObjType;
	948	MODULE_SCOPE const Tcl_ObjType tkColorObjType;
	949	MODULE_SCOPE const Tcl_ObjType tkCursorObjType;
	950	MODULE_SCOPE const Tcl_ObjType tkFontObjType;
	951	MODULE_SCOPE const Tcl_ObjType tkOptionObjType;
	952	MODULE_SCOPE const Tcl_ObjType tkStateKeyObjType;
	953	MODULE_SCOPE const Tcl_ObjType tkTextIndexType;
941	954
942	955	/*
943	956	* Miscellaneous variables shared among Tk modules but not exported to the
944	957	* outside world:
945	958	*/
946	959
947		MODULE_SCOPE Tk_SmoothMethod tkBezierSmoothMethod;
	960	MODULE_SCOPE const Tk_SmoothMethod tkBezierSmoothMethod;
948	961	MODULE_SCOPE Tk_ImageType tkBitmapImageType;
949	962	MODULE_SCOPE Tk_PhotoImageFormat tkImgFmtGIF;
950	963	MODULE_SCOPE void (tkHandleEventProc) (XEvent eventPtr);

953	966	MODULE_SCOPE Tk_ImageType tkPhotoImageType;
954	967	MODULE_SCOPE Tcl_HashTable tkPredefBitmapTable;
955	968
	969	/*
	970	* The definition of pi, at least from the perspective of double-precision
	971	* floats.
	972	*/
	973
	974	#ifndef PI
	975	#ifdef M_PI
	976	#define PI M_PI
	977	#else
	978	#define PI 3.14159265358979323846
	979	#endif
	980	#endif
	981
	982	/*
	983	* The following magic value is stored in the "send_event" field of FocusIn
	984	* and FocusOut events. This allows us to separate "real" events coming from
	985	* the server from those that we generated.
	986	*/
	987
	988	#define GENERATED_FOCUS_EVENT_MAGIC ((Bool) 0x547321ac)
	989
	990	/*
	991	* Exported internals.
	992	*/
	993
956	994	#include "tkIntDecls.h"
957	995
958	996	#ifdef BUILD_tk

980	1018	MODULE_SCOPE int Tk_BindtagsObjCmd(ClientData clientData,
981	1019	Tcl_Interp *interp, int objc,
982	1020	Tcl_Obj *const objv[]);
	1021	MODULE_SCOPE int Tk_BusyObjCmd(ClientData clientData,
	1022	Tcl_Interp *interp, int objc,
	1023	Tcl_Obj *const objv[]);
983	1024	MODULE_SCOPE int Tk_ButtonObjCmd(ClientData clientData,
984	1025	Tcl_Interp *interp, int objc,
985	1026	Tcl_Obj *const objv[]);

996	1037	Tcl_Interp *interp, int objc,
997	1038	Tcl_Obj *const objv[]);
998	1039	MODULE_SCOPE int Tk_ChooseDirectoryObjCmd(ClientData clientData,
999		Tcl_Interp *interp, int objc,
1000		Tcl_Obj *const objv[]);
1001		MODULE_SCOPE int Tk_ChooseFontObjCmd(ClientData clientData,
1002	1040	Tcl_Interp *interp, int objc,
1003	1041	Tcl_Obj *const objv[]);
1004	1042	MODULE_SCOPE int Tk_DestroyObjCmd(ClientData clientData,

1092	1130	MODULE_SCOPE int Tk_TextObjCmd(ClientData clientData,
1093	1131	Tcl_Interp *interp, int objc,
1094	1132	Tcl_Obj *const objv[]);
1095		MODULE_SCOPE int Tk_TkObjCmd(ClientData clientData,
1096		Tcl_Interp *interp, int objc,
1097		Tcl_Obj *const objv[]);
1098	1133	MODULE_SCOPE int Tk_TkwaitObjCmd(ClientData clientData,
1099	1134	Tcl_Interp *interp, int objc,
1100	1135	Tcl_Obj *const objv[]);

1109	1144	Tcl_Obj *const objv[]);
1110	1145	MODULE_SCOPE int Tk_WmObjCmd(ClientData clientData, Tcl_Interp *interp,
1111	1146	int objc, Tcl_Obj *const objv[]);
	1147
	1148	MODULE_SCOPE int Tk_GetDoublePixelsFromObj(Tcl_Interp *interp,
	1149	Tk_Window tkwin,
	1150	Tcl_Obj *objPtr,
	1151	double *doublePtr);
1112	1152
1113	1153	MODULE_SCOPE void TkEventInit(void);
1114	1154	MODULE_SCOPE void TkRegisterObjTypes(void);

1121	1161	MODULE_SCOPE int TkCanvasDashParseProc(ClientData clientData,
1122	1162	Tcl_Interp *interp, Tk_Window tkwin,
1123	1163	const char value, char widgRec, int offset);
1124		MODULE_SCOPE char * TkCanvasDashPrintProc(ClientData clientData,
	1164	MODULE_SCOPE const char * TkCanvasDashPrintProc(ClientData clientData,
1125	1165	Tk_Window tkwin, char *widgRec, int offset,
1126	1166	Tcl_FreeProc **freeProcPtr);
1127	1167	MODULE_SCOPE int TkGetDoublePixels(Tcl_Interp *interp, Tk_Window tkwin,

1129	1169	MODULE_SCOPE int TkOffsetParseProc(ClientData clientData,
1130	1170	Tcl_Interp *interp, Tk_Window tkwin,
1131	1171	const char value, char widgRec, int offset);
1132		MODULE_SCOPE char * TkOffsetPrintProc(ClientData clientData,
	1172	MODULE_SCOPE const char * TkOffsetPrintProc(ClientData clientData,
1133	1173	Tk_Window tkwin, char *widgRec, int offset,
1134	1174	Tcl_FreeProc **freeProcPtr);
1135	1175	MODULE_SCOPE int TkOrientParseProc(ClientData clientData,
1136	1176	Tcl_Interp *interp, Tk_Window tkwin,
1137	1177	const char value, char widgRec, int offset);
1138		MODULE_SCOPE char * TkOrientPrintProc(ClientData clientData,
	1178	MODULE_SCOPE const char * TkOrientPrintProc(ClientData clientData,
1139	1179	Tk_Window tkwin, char *widgRec, int offset,
1140	1180	Tcl_FreeProc **freeProcPtr);
1141	1181	MODULE_SCOPE int TkPixelParseProc(ClientData clientData,
1142	1182	Tcl_Interp *interp, Tk_Window tkwin,
1143	1183	const char value, char widgRec, int offset);
1144		MODULE_SCOPE char * TkPixelPrintProc(ClientData clientData,
	1184	MODULE_SCOPE const char * TkPixelPrintProc(ClientData clientData,
1145	1185	Tk_Window tkwin, char *widgRec, int offset,
1146	1186	Tcl_FreeProc **freeProcPtr);
1147	1187	MODULE_SCOPE int TkPostscriptImage(Tcl_Interp *interp, Tk_Window tkwin,

1150	1190	MODULE_SCOPE int TkSmoothParseProc(ClientData clientData,
1151	1191	Tcl_Interp *interp, Tk_Window tkwin,
1152	1192	const char value, char recordPtr, int offset);
1153		MODULE_SCOPE char * TkSmoothPrintProc(ClientData clientData,
	1193	MODULE_SCOPE const char * TkSmoothPrintProc(ClientData clientData,
1154	1194	Tk_Window tkwin, char *recordPtr, int offset,
1155	1195	Tcl_FreeProc **freeProcPtr);
1156	1196	MODULE_SCOPE int TkStateParseProc(ClientData clientData,
1157	1197	Tcl_Interp *interp, Tk_Window tkwin,
1158	1198	const char value, char widgRec, int offset);
1159		MODULE_SCOPE char * TkStatePrintProc(ClientData clientData,
	1199	MODULE_SCOPE const char * TkStatePrintProc(ClientData clientData,
1160	1200	Tk_Window tkwin, char *widgRec, int offset,
1161	1201	Tcl_FreeProc **freeProcPtr);
1162	1202	MODULE_SCOPE int TkTileParseProc(ClientData clientData,
1163	1203	Tcl_Interp *interp, Tk_Window tkwin,
1164	1204	const char value, char widgRec, int offset);
1165		MODULE_SCOPE char * TkTilePrintProc(ClientData clientData, Tk_Window tkwin,
	1205	MODULE_SCOPE const char * TkTilePrintProc(ClientData clientData, Tk_Window tkwin,
1166	1206	char *widgRec, int offset,
1167	1207	Tcl_FreeProc **freeProcPtr);
1168	1208	MODULE_SCOPE void TkMapTopFrame(Tk_Window tkwin);

1178	1218	unsigned height, unsigned char *dataPtr,
1179	1219	unsigned pixelStride, unsigned lineStride);
1180	1220	MODULE_SCOPE void TkPrintPadAmount(Tcl_Interp *interp,
1181		char *buffer, int pad1, int pad2);
	1221	const char *buffer, int pad1, int pad2);
1182	1222	MODULE_SCOPE int TkParsePadAmount(Tcl_Interp *interp,
1183	1223	Tk_Window tkwin, Tcl_Obj *objPtr,
1184	1224	int pad1Ptr, int pad2Ptr);

1199	1239	int firstByte, int lastByte);
1200	1240	MODULE_SCOPE void TkpGetFontAttrsForChar(Tk_Window tkwin, Tk_Font tkfont,
1201	1241	Tcl_UniChar c, struct TkFontAttributes *faPtr);
	1242	MODULE_SCOPE Tcl_Obj * TkNewWindowObj(Tk_Window tkwin);
	1243	MODULE_SCOPE void TkpShowBusyWindow(TkBusy busy);
	1244	MODULE_SCOPE void TkpHideBusyWindow(TkBusy busy);
	1245	MODULE_SCOPE void TkpMakeTransparentWindowExist(Tk_Window tkwin,
	1246	Window parent);
	1247	MODULE_SCOPE void TkpCreateBusy(Tk_FakeWin *winPtr, Tk_Window tkRef,
	1248	Window *parentPtr, Tk_Window tkParent,
	1249	TkBusy busy);
	1250	MODULE_SCOPE void TkDrawAngledTextLayout(Display *display,
	1251	Drawable drawable, GC gc, Tk_TextLayout layout,
	1252	int x, int y, double angle, int firstChar,
	1253	int lastChar);
	1254	MODULE_SCOPE void TkpDrawAngledChars(Display *display,Drawable drawable,
	1255	GC gc, Tk_Font tkfont, const char *source,
	1256	int numBytes, double x, double y, double angle);
	1257	MODULE_SCOPE void TkUnderlineAngledTextLayout(Display *display,
	1258	Drawable drawable, GC gc, Tk_TextLayout layout,
	1259	int x, int y, double angle, int underline);
	1260	MODULE_SCOPE int TkIntersectAngledTextLayout(Tk_TextLayout layout,
	1261	int x,int y, int width, int height, double angle);
	1262	MODULE_SCOPE int TkBackgroundEvalObjv(Tcl_Interp *interp,
	1263	int objc, Tcl_Obj const objv, int flags);
	1264	MODULE_SCOPE void TkSendVirtualEvent(Tk_Window tgtWin, const char *eventName);
	1265	MODULE_SCOPE Tcl_Command TkMakeEnsemble(Tcl_Interp *interp,
	1266	const char namespace, const char name,
	1267	ClientData clientData, const TkEnsemble *map);
	1268	MODULE_SCOPE int TkInitTkCmd(Tcl_Interp *interp,
	1269	ClientData clientData);
	1270	MODULE_SCOPE int TkInitFontchooser(Tcl_Interp *interp,
	1271	ClientData clientData);
1202	1272
1203	1273	/*
1204	1274	* Unsupported commands.

+293

-151

generic/tkIntDecls.h less more

10	10	* See the file "license.terms" for information on usage and redistribution
11	11	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkIntDecls.h,v 1.35 2008/08/19 15:52:11 georgeps Exp $
	13	* RCS: @(#) $Id: tkIntDecls.h,v 1.41 2008/12/05 15:51:31 nijtmans Exp $
14	14	*/
15	15
16	16	#ifndef _TKINTDECLS

20	20	#undef TCL_STORAGE_CLASS
21	21	#define TCL_STORAGE_CLASS DLLEXPORT
22	22	#endif
	23
	24	struct TkText;
	25	typedef struct TkTextBTree_ *TkTextBTree;
	26	struct TkTextDispChunk;
	27	struct TkTextIndex;
	28	struct TkTextSegment;
	29	struct TkSharedText;
23	30
24	31	/*
25	32	* WARNING: This file is automatically generated by the tools/genStubs.tcl

36	43	#ifndef TkAllocWindow_TCL_DECLARED
37	44	#define TkAllocWindow_TCL_DECLARED
38	45	/* 0 */
39		EXTERN TkWindow * TkAllocWindow (TkDisplay * dispPtr, int screenNum,
	46	EXTERN TkWindow * TkAllocWindow (TkDisplay * dispPtr, int screenNum,
40	47	TkWindow * parentPtr);
41	48	#endif
42	49	#ifndef TkBezierPoints_TCL_DECLARED
43	50	#define TkBezierPoints_TCL_DECLARED
44	51	/* 1 */
45		EXTERN void TkBezierPoints (double control[], int numSteps,
	52	EXTERN void TkBezierPoints (double control[], int numSteps,
46	53	double * coordPtr);
47	54	#endif
48	55	#ifndef TkBezierScreenPoints_TCL_DECLARED
49	56	#define TkBezierScreenPoints_TCL_DECLARED
50	57	/* 2 */
51		EXTERN void TkBezierScreenPoints (Tk_Canvas canvas,
52		double control[], int numSteps,
	58	EXTERN void TkBezierScreenPoints (Tk_Canvas canvas,
	59	double control[], int numSteps,
53	60	XPoint * xPointPtr);
54	61	#endif
55	62	#ifndef TkBindDeadWindow_TCL_DECLARED

60	67	#ifndef TkBindEventProc_TCL_DECLARED
61	68	#define TkBindEventProc_TCL_DECLARED
62	69	/* 4 */
63		EXTERN void TkBindEventProc (TkWindow * winPtr,
	70	EXTERN void TkBindEventProc (TkWindow * winPtr,
64	71	XEvent * eventPtr);
65	72	#endif
66	73	#ifndef TkBindFree_TCL_DECLARED

76	83	#ifndef TkChangeEventWindow_TCL_DECLARED
77	84	#define TkChangeEventWindow_TCL_DECLARED
78	85	/* 7 */
79		EXTERN void TkChangeEventWindow (XEvent * eventPtr,
	86	EXTERN void TkChangeEventWindow (XEvent * eventPtr,
80	87	TkWindow * winPtr);
81	88	#endif
82	89	#ifndef TkClipInit_TCL_DECLARED

87	94	#ifndef TkComputeAnchor_TCL_DECLARED
88	95	#define TkComputeAnchor_TCL_DECLARED
89	96	/* 9 */
90		EXTERN void TkComputeAnchor (Tk_Anchor anchor, Tk_Window tkwin,
91		int padX, int padY, int innerWidth,
	97	EXTERN void TkComputeAnchor (Tk_Anchor anchor, Tk_Window tkwin,
	98	int padX, int padY, int innerWidth,
92	99	int innerHeight, int * xPtr, int * yPtr);
93	100	#endif
94	101	#ifndef TkCopyAndGlobalEval_TCL_DECLARED
95	102	#define TkCopyAndGlobalEval_TCL_DECLARED
96	103	/* 10 */
97		EXTERN int TkCopyAndGlobalEval (Tcl_Interp * interp,
	104	EXTERN int TkCopyAndGlobalEval (Tcl_Interp * interp,
98	105	char * script);
99	106	#endif
100	107	#ifndef TkCreateBindingProcedure_TCL_DECLARED
101	108	#define TkCreateBindingProcedure_TCL_DECLARED
102	109	/* 11 */
103		EXTERN unsigned long TkCreateBindingProcedure (Tcl_Interp * interp,
104		Tk_BindingTable bindingTable,
105		ClientData object, CONST char * eventString,
106		TkBindEvalProc * evalProc,
107		TkBindFreeProc * freeProc,
	110	EXTERN unsigned long TkCreateBindingProcedure (Tcl_Interp * interp,
	111	Tk_BindingTable bindingTable,
	112	ClientData object, const char * eventString,
	113	TkBindEvalProc * evalProc,
	114	TkBindFreeProc * freeProc,
108	115	ClientData clientData);
109	116	#endif
110	117	#ifndef TkCreateCursorFromData_TCL_DECLARED
111	118	#define TkCreateCursorFromData_TCL_DECLARED
112	119	/* 12 */
113		EXTERN TkCursor * TkCreateCursorFromData (Tk_Window tkwin,
114		CONST char * source, CONST char * mask,
115		int width, int height, int xHot, int yHot,
	120	EXTERN TkCursor * TkCreateCursorFromData (Tk_Window tkwin,
	121	const char * source, const char * mask,
	122	int width, int height, int xHot, int yHot,
116	123	XColor fg, XColor bg);
117	124	#endif
118	125	#ifndef TkCreateFrame_TCL_DECLARED
119	126	#define TkCreateFrame_TCL_DECLARED
120	127	/* 13 */
121		EXTERN int TkCreateFrame (ClientData clientData,
122		Tcl_Interp * interp, int argc, char ** argv,
123		int toplevel, char * appName);
	128	EXTERN int TkCreateFrame (ClientData clientData,
	129	Tcl_Interp * interp, int argc,
	130	const char const argv, int toplevel,
	131	const char * appName);
124	132	#endif
125	133	#ifndef TkCreateMainWindow_TCL_DECLARED
126	134	#define TkCreateMainWindow_TCL_DECLARED
127	135	/* 14 */
128		EXTERN Tk_Window TkCreateMainWindow (Tcl_Interp * interp,
129		CONST char * screenName, char * baseName);
	136	EXTERN Tk_Window TkCreateMainWindow (Tcl_Interp * interp,
	137	const char * screenName,
	138	const char * baseName);
130	139	#endif
131	140	#ifndef TkCurrentTime_TCL_DECLARED
132	141	#define TkCurrentTime_TCL_DECLARED

146	155	#ifndef TkDrawInsetFocusHighlight_TCL_DECLARED
147	156	#define TkDrawInsetFocusHighlight_TCL_DECLARED
148	157	/* 18 */
149		EXTERN void TkDrawInsetFocusHighlight (Tk_Window tkwin, GC gc,
	158	EXTERN void TkDrawInsetFocusHighlight (Tk_Window tkwin, GC gc,
150	159	int width, Drawable drawable, int padding);
151	160	#endif
152	161	#ifndef TkEventDeadWindow_TCL_DECLARED

157	166	#ifndef TkFillPolygon_TCL_DECLARED
158	167	#define TkFillPolygon_TCL_DECLARED
159	168	/* 20 */
160		EXTERN void TkFillPolygon (Tk_Canvas canvas, double * coordPtr,
161		int numPoints, Display * display,
	169	EXTERN void TkFillPolygon (Tk_Canvas canvas, double * coordPtr,
	170	int numPoints, Display * display,
162	171	Drawable drawable, GC gc, GC outlineGC);
163	172	#endif
164	173	#ifndef TkFindStateNum_TCL_DECLARED
165	174	#define TkFindStateNum_TCL_DECLARED
166	175	/* 21 */
167		EXTERN int TkFindStateNum (Tcl_Interp * interp,
168		CONST char * option,
169		CONST TkStateMap * mapPtr,
170		CONST char * strKey);
	176	EXTERN int TkFindStateNum (Tcl_Interp * interp,
	177	const char * option,
	178	const TkStateMap * mapPtr,
	179	const char * strKey);
171	180	#endif
172	181	#ifndef TkFindStateString_TCL_DECLARED
173	182	#define TkFindStateString_TCL_DECLARED
174	183	/* 22 */
175		EXTERN char * TkFindStateString (CONST TkStateMap * mapPtr,
	184	EXTERN char * TkFindStateString (const TkStateMap * mapPtr,
176	185	int numKey);
177	186	#endif
178	187	#ifndef TkFocusDeadWindow_TCL_DECLARED

183	192	#ifndef TkFocusFilterEvent_TCL_DECLARED
184	193	#define TkFocusFilterEvent_TCL_DECLARED
185	194	/* 24 */
186		EXTERN int TkFocusFilterEvent (TkWindow * winPtr,
	195	EXTERN int TkFocusFilterEvent (TkWindow * winPtr,
187	196	XEvent * eventPtr);
188	197	#endif
189	198	#ifndef TkFocusKeyEvent_TCL_DECLARED
190	199	#define TkFocusKeyEvent_TCL_DECLARED
191	200	/* 25 */
192		EXTERN TkWindow * TkFocusKeyEvent (TkWindow * winPtr,
	201	EXTERN TkWindow * TkFocusKeyEvent (TkWindow * winPtr,
193	202	XEvent * eventPtr);
194	203	#endif
195	204	#ifndef TkFontPkgInit_TCL_DECLARED

215	224	#ifndef TkGetBitmapData_TCL_DECLARED
216	225	#define TkGetBitmapData_TCL_DECLARED
217	226	/* 30 */
218		EXTERN char * TkGetBitmapData (Tcl_Interp * interp, char * string,
219		char * fileName, int * widthPtr,
220		int * heightPtr, int * hotXPtr,
221		int * hotYPtr);
	227	EXTERN char * TkGetBitmapData (Tcl_Interp * interp,
	228	const char * string, const char * fileName,
	229	int * widthPtr, int * heightPtr,
	230	int * hotXPtr, int * hotYPtr);
222	231	#endif
223	232	#ifndef TkGetButtPoints_TCL_DECLARED
224	233	#define TkGetButtPoints_TCL_DECLARED
225	234	/* 31 */
226		EXTERN void TkGetButtPoints (double p1[], double p2[],
227		double width, int project, double m1[],
	235	EXTERN void TkGetButtPoints (double p1[], double p2[],
	236	double width, int project, double m1[],
228	237	double m2[]);
229	238	#endif
230	239	#ifndef TkGetCursorByName_TCL_DECLARED
231	240	#define TkGetCursorByName_TCL_DECLARED
232	241	/* 32 */
233		EXTERN TkCursor * TkGetCursorByName (Tcl_Interp * interp,
	242	EXTERN TkCursor * TkGetCursorByName (Tcl_Interp * interp,
234	243	Tk_Window tkwin, Tk_Uid string);
235	244	#endif
236	245	#ifndef TkGetDefaultScreenName_TCL_DECLARED
237	246	#define TkGetDefaultScreenName_TCL_DECLARED
238	247	/* 33 */
239		EXTERN CONST84_RETURN char * TkGetDefaultScreenName (Tcl_Interp * interp,
240		CONST char * screenName);
	248	EXTERN const char * TkGetDefaultScreenName (Tcl_Interp * interp,
	249	const char * screenName);
241	250	#endif
242	251	#ifndef TkGetDisplay_TCL_DECLARED
243	252	#define TkGetDisplay_TCL_DECLARED

247	256	#ifndef TkGetDisplayOf_TCL_DECLARED
248	257	#define TkGetDisplayOf_TCL_DECLARED
249	258	/* 35 */
250		EXTERN int TkGetDisplayOf (Tcl_Interp * interp, int objc,
251		Tcl_Obj CONST objv[], Tk_Window tkwinPtr);
	259	EXTERN int TkGetDisplayOf (Tcl_Interp * interp, int objc,
	260	Tcl_Obj const objv[], Tk_Window tkwinPtr);
252	261	#endif
253	262	#ifndef TkGetFocusWin_TCL_DECLARED
254	263	#define TkGetFocusWin_TCL_DECLARED

258	267	#ifndef TkGetInterpNames_TCL_DECLARED
259	268	#define TkGetInterpNames_TCL_DECLARED
260	269	/* 37 */
261		EXTERN int TkGetInterpNames (Tcl_Interp * interp,
	270	EXTERN int TkGetInterpNames (Tcl_Interp * interp,
262	271	Tk_Window tkwin);
263	272	#endif
264	273	#ifndef TkGetMiterPoints_TCL_DECLARED
265	274	#define TkGetMiterPoints_TCL_DECLARED
266	275	/* 38 */
267		EXTERN int TkGetMiterPoints (double p1[], double p2[],
268		double p3[], double width, double m1[],
	276	EXTERN int TkGetMiterPoints (double p1[], double p2[],
	277	double p3[], double width, double m1[],
269	278	double m2[]);
270	279	#endif
271	280	#ifndef TkGetPointerCoords_TCL_DECLARED
272	281	#define TkGetPointerCoords_TCL_DECLARED
273	282	/* 39 */
274		EXTERN void TkGetPointerCoords (Tk_Window tkwin, int * xPtr,
	283	EXTERN void TkGetPointerCoords (Tk_Window tkwin, int * xPtr,
275	284	int * yPtr);
276	285	#endif
277	286	#ifndef TkGetServerInfo_TCL_DECLARED
278	287	#define TkGetServerInfo_TCL_DECLARED
279	288	/* 40 */
280		EXTERN void TkGetServerInfo (Tcl_Interp * interp,
	289	EXTERN void TkGetServerInfo (Tcl_Interp * interp,
281	290	Tk_Window tkwin);
282	291	#endif
283	292	#ifndef TkGrabDeadWindow_TCL_DECLARED

298	307	#ifndef TkInOutEvents_TCL_DECLARED
299	308	#define TkInOutEvents_TCL_DECLARED
300	309	/* 44 */
301		EXTERN void TkInOutEvents (XEvent * eventPtr,
302		TkWindow * sourcePtr, TkWindow * destPtr,
303		int leaveType, int enterType,
	310	EXTERN void TkInOutEvents (XEvent * eventPtr,
	311	TkWindow * sourcePtr, TkWindow * destPtr,
	312	int leaveType, int enterType,
304	313	Tcl_QueuePosition position);
305	314	#endif
306	315	#ifndef TkInstallFrameMenu_TCL_DECLARED

316	325	#ifndef TkLineToArea_TCL_DECLARED
317	326	#define TkLineToArea_TCL_DECLARED
318	327	/* 47 */
319		EXTERN int TkLineToArea (double end1Ptr[], double end2Ptr[],
	328	EXTERN int TkLineToArea (double end1Ptr[], double end2Ptr[],
320	329	double rectPtr[]);
321	330	#endif
322	331	#ifndef TkLineToPoint_TCL_DECLARED
323	332	#define TkLineToPoint_TCL_DECLARED
324	333	/* 48 */
325		EXTERN double TkLineToPoint (double end1Ptr[], double end2Ptr[],
	334	EXTERN double TkLineToPoint (double end1Ptr[], double end2Ptr[],
326	335	double pointPtr[]);
327	336	#endif
328	337	#ifndef TkMakeBezierCurve_TCL_DECLARED
329	338	#define TkMakeBezierCurve_TCL_DECLARED
330	339	/* 49 */
331		EXTERN int TkMakeBezierCurve (Tk_Canvas canvas,
332		double * pointPtr, int numPoints,
333		int numSteps, XPoint xPoints[],
	340	EXTERN int TkMakeBezierCurve (Tk_Canvas canvas,
	341	double * pointPtr, int numPoints,
	342	int numSteps, XPoint xPoints[],
334	343	double dblPoints[]);
335	344	#endif
336	345	#ifndef TkMakeBezierPostscript_TCL_DECLARED
337	346	#define TkMakeBezierPostscript_TCL_DECLARED
338	347	/* 50 */
339		EXTERN void TkMakeBezierPostscript (Tcl_Interp * interp,
340		Tk_Canvas canvas, double * pointPtr,
	348	EXTERN void TkMakeBezierPostscript (Tcl_Interp * interp,
	349	Tk_Canvas canvas, double * pointPtr,
341	350	int numPoints);
342	351	#endif
343	352	#ifndef TkOptionClassChanged_TCL_DECLARED

358	367	#ifndef TkOvalToPoint_TCL_DECLARED
359	368	#define TkOvalToPoint_TCL_DECLARED
360	369	/* 54 */
361		EXTERN double TkOvalToPoint (double ovalPtr[], double width,
	370	EXTERN double TkOvalToPoint (double ovalPtr[], double width,
362	371	int filled, double pointPtr[]);
363	372	#endif
364	373	#ifndef TkpChangeFocus_TCL_DECLARED

379	388	#ifndef TkpDisplayWarning_TCL_DECLARED
380	389	#define TkpDisplayWarning_TCL_DECLARED
381	390	/* 58 */
382		EXTERN void TkpDisplayWarning (CONST char * msg,
383		CONST char * title);
	391	EXTERN void TkpDisplayWarning (const char * msg,
	392	const char * title);
384	393	#endif
385	394	#ifndef TkpGetAppName_TCL_DECLARED
386	395	#define TkpGetAppName_TCL_DECLARED
387	396	/* 59 */
388		EXTERN void TkpGetAppName (Tcl_Interp * interp,
	397	EXTERN void TkpGetAppName (Tcl_Interp * interp,
389	398	Tcl_DString * name);
390	399	#endif
391	400	#ifndef TkpGetOtherWindow_TCL_DECLARED

406	415	#ifndef TkpInitializeMenuBindings_TCL_DECLARED
407	416	#define TkpInitializeMenuBindings_TCL_DECLARED
408	417	/* 63 */
409		EXTERN void TkpInitializeMenuBindings (Tcl_Interp * interp,
	418	EXTERN void TkpInitializeMenuBindings (Tcl_Interp * interp,
410	419	Tk_BindingTable bindingTable);
411	420	#endif
412	421	#ifndef TkpMakeContainer_TCL_DECLARED

427	436	#ifndef TkpMenuNotifyToplevelCreate_TCL_DECLARED
428	437	#define TkpMenuNotifyToplevelCreate_TCL_DECLARED
429	438	/* 67 */
430		EXTERN void TkpMenuNotifyToplevelCreate (Tcl_Interp * interp1,
	439	EXTERN void TkpMenuNotifyToplevelCreate (Tcl_Interp * interp1,
431	440	char * menuName);
432	441	#endif
433	442	#ifndef TkpOpenDisplay_TCL_DECLARED
434	443	#define TkpOpenDisplay_TCL_DECLARED
435	444	/* 68 */
436		EXTERN TkDisplay * TkpOpenDisplay (CONST char * display_name);
	445	EXTERN TkDisplay * TkpOpenDisplay (const char * display_name);
437	446	#endif
438	447	#ifndef TkPointerEvent_TCL_DECLARED
439	448	#define TkPointerEvent_TCL_DECLARED

443	452	#ifndef TkPolygonToArea_TCL_DECLARED
444	453	#define TkPolygonToArea_TCL_DECLARED
445	454	/* 70 */
446		EXTERN int TkPolygonToArea (double * polyPtr, int numPoints,
	455	EXTERN int TkPolygonToArea (double * polyPtr, int numPoints,
447	456	double * rectPtr);
448	457	#endif
449	458	#ifndef TkPolygonToPoint_TCL_DECLARED
450	459	#define TkPolygonToPoint_TCL_DECLARED
451	460	/* 71 */
452		EXTERN double TkPolygonToPoint (double * polyPtr, int numPoints,
	461	EXTERN double TkPolygonToPoint (double * polyPtr, int numPoints,
453	462	double * pointPtr);
454	463	#endif
455	464	#ifndef TkPositionInTree_TCL_DECLARED
456	465	#define TkPositionInTree_TCL_DECLARED
457	466	/* 72 */
458		EXTERN int TkPositionInTree (TkWindow * winPtr,
	467	EXTERN int TkPositionInTree (TkWindow * winPtr,
459	468	TkWindow * treePtr);
460	469	#endif
461	470	#ifndef TkpRedirectKeyEvent_TCL_DECLARED
462	471	#define TkpRedirectKeyEvent_TCL_DECLARED
463	472	/* 73 */
464		EXTERN void TkpRedirectKeyEvent (TkWindow * winPtr,
	473	EXTERN void TkpRedirectKeyEvent (TkWindow * winPtr,
465	474	XEvent * eventPtr);
466	475	#endif
467	476	#ifndef TkpSetMainMenubar_TCL_DECLARED
468	477	#define TkpSetMainMenubar_TCL_DECLARED
469	478	/* 74 */
470		EXTERN void TkpSetMainMenubar (Tcl_Interp * interp,
	479	EXTERN void TkpSetMainMenubar (Tcl_Interp * interp,
471	480	Tk_Window tkwin, char * menuName);
472	481	#endif
473	482	#ifndef TkpUseWindow_TCL_DECLARED
474	483	#define TkpUseWindow_TCL_DECLARED
475	484	/* 75 */
476		EXTERN int TkpUseWindow (Tcl_Interp * interp, Tk_Window tkwin,
477		CONST char * string);
	485	EXTERN int TkpUseWindow (Tcl_Interp * interp, Tk_Window tkwin,
	486	const char * string);
478	487	#endif
479	488	/* Slot 76 is reserved */
480	489	#ifndef TkQueueEventForAllChildren_TCL_DECLARED
481	490	#define TkQueueEventForAllChildren_TCL_DECLARED
482	491	/* 77 */
483		EXTERN void TkQueueEventForAllChildren (TkWindow * winPtr,
	492	EXTERN void TkQueueEventForAllChildren (TkWindow * winPtr,
484	493	XEvent * eventPtr);
485	494	#endif
486	495	#ifndef TkReadBitmapFile_TCL_DECLARED
487	496	#define TkReadBitmapFile_TCL_DECLARED
488	497	/* 78 */
489		EXTERN int TkReadBitmapFile (Display * display, Drawable d,
490		CONST char * filename,
491		unsigned int * width_return,
492		unsigned int * height_return,
493		Pixmap * bitmap_return, int * x_hot_return,
	498	EXTERN int TkReadBitmapFile (Display * display, Drawable d,
	499	const char * filename,
	500	unsigned int * width_return,
	501	unsigned int * height_return,
	502	Pixmap * bitmap_return, int * x_hot_return,
494	503	int * y_hot_return);
495	504	#endif
496	505	#ifndef TkScrollWindow_TCL_DECLARED
497	506	#define TkScrollWindow_TCL_DECLARED
498	507	/* 79 */
499		EXTERN int TkScrollWindow (Tk_Window tkwin, GC gc, int x, int y,
500		int width, int height, int dx, int dy,
	508	EXTERN int TkScrollWindow (Tk_Window tkwin, GC gc, int x, int y,
	509	int width, int height, int dx, int dy,
501	510	TkRegion damageRgn);
502	511	#endif
503	512	#ifndef TkSelDeadWindow_TCL_DECLARED

524	533	#ifndef TkSetWindowMenuBar_TCL_DECLARED
525	534	#define TkSetWindowMenuBar_TCL_DECLARED
526	535	/* 85 */
527		EXTERN void TkSetWindowMenuBar (Tcl_Interp * interp,
528		Tk_Window tkwin, char * oldMenuName,
	536	EXTERN void TkSetWindowMenuBar (Tcl_Interp * interp,
	537	Tk_Window tkwin, char * oldMenuName,
529	538	char * menuName);
530	539	#endif
531	540	#ifndef TkStringToKeysym_TCL_DECLARED

536	545	#ifndef TkThickPolyLineToArea_TCL_DECLARED
537	546	#define TkThickPolyLineToArea_TCL_DECLARED
538	547	/* 87 */
539		EXTERN int TkThickPolyLineToArea (double * coordPtr,
540		int numPoints, double width, int capStyle,
	548	EXTERN int TkThickPolyLineToArea (double * coordPtr,
	549	int numPoints, double width, int capStyle,
541	550	int joinStyle, double * rectPtr);
542	551	#endif
543	552	#ifndef TkWmAddToColormapWindows_TCL_DECLARED

568	577	#ifndef TkWmProtocolEventProc_TCL_DECLARED
569	578	#define TkWmProtocolEventProc_TCL_DECLARED
570	579	/* 93 */
571		EXTERN void TkWmProtocolEventProc (TkWindow * winPtr,
	580	EXTERN void TkWmProtocolEventProc (TkWindow * winPtr,
572	581	XEvent * evenvPtr);
573	582	#endif
574	583	#ifndef TkWmRemoveFromColormapWindows_TCL_DECLARED

579	588	#ifndef TkWmRestackToplevel_TCL_DECLARED
580	589	#define TkWmRestackToplevel_TCL_DECLARED
581	590	/* 95 */
582		EXTERN void TkWmRestackToplevel (TkWindow * winPtr,
	591	EXTERN void TkWmRestackToplevel (TkWindow * winPtr,
583	592	int aboveBelow, TkWindow * otherPtr);
584	593	#endif
585	594	#ifndef TkWmSetClass_TCL_DECLARED

615	624	#ifndef TkDebugConfig_TCL_DECLARED
616	625	#define TkDebugConfig_TCL_DECLARED
617	626	/* 102 */
618		EXTERN Tcl_Obj * TkDebugConfig (Tcl_Interp * interp,
	627	EXTERN Tcl_Obj * TkDebugConfig (Tcl_Interp * interp,
619	628	Tk_OptionTable table);
620	629	#endif
621	630	#ifndef TkDebugFont_TCL_DECLARED

626	635	#ifndef TkFindStateNumObj_TCL_DECLARED
627	636	#define TkFindStateNumObj_TCL_DECLARED
628	637	/* 104 */
629		EXTERN int TkFindStateNumObj (Tcl_Interp * interp,
630		Tcl_Obj * optionPtr,
631		CONST TkStateMap * mapPtr, Tcl_Obj * keyPtr);
	638	EXTERN int TkFindStateNumObj (Tcl_Interp * interp,
	639	Tcl_Obj * optionPtr,
	640	const TkStateMap * mapPtr, Tcl_Obj * keyPtr);
632	641	#endif
633	642	#ifndef TkGetBitmapPredefTable_TCL_DECLARED
634	643	#define TkGetBitmapPredefTable_TCL_DECLARED

648	657	#ifndef TkGetWindowFromObj_TCL_DECLARED
649	658	#define TkGetWindowFromObj_TCL_DECLARED
650	659	/* 108 */
651		EXTERN int TkGetWindowFromObj (Tcl_Interp * interp,
652		Tk_Window tkwin, Tcl_Obj * objPtr,
	660	EXTERN int TkGetWindowFromObj (Tcl_Interp * interp,
	661	Tk_Window tkwin, Tcl_Obj * objPtr,
653	662	Tk_Window * windowPtr);
654	663	#endif
655	664	#ifndef TkpGetString_TCL_DECLARED
656	665	#define TkpGetString_TCL_DECLARED
657	666	/* 109 */
658		EXTERN char * TkpGetString (TkWindow * winPtr, XEvent * eventPtr,
	667	EXTERN char * TkpGetString (TkWindow * winPtr, XEvent * eventPtr,
659	668	Tcl_DString * dsPtr);
660	669	#endif
661	670	#ifndef TkpGetSubFonts_TCL_DECLARED

666	675	#ifndef TkpGetSystemDefault_TCL_DECLARED
667	676	#define TkpGetSystemDefault_TCL_DECLARED
668	677	/* 111 */
669		EXTERN Tcl_Obj * TkpGetSystemDefault (Tk_Window tkwin,
670		CONST char * dbName, CONST char * className);
	678	EXTERN Tcl_Obj * TkpGetSystemDefault (Tk_Window tkwin,
	679	const char * dbName, const char * className);
671	680	#endif
672	681	#ifndef TkpMenuThreadInit_TCL_DECLARED
673	682	#define TkpMenuThreadInit_TCL_DECLARED

720	729	#ifndef TkIntersectRegion_TCL_DECLARED
721	730	#define TkIntersectRegion_TCL_DECLARED
722	731	/* 116 */
723		EXTERN void TkIntersectRegion (TkRegion sra, TkRegion srcb,
	732	EXTERN void TkIntersectRegion (TkRegion sra, TkRegion srcb,
724	733	TkRegion dr_return);
725	734	#endif
726	735	#endif /* WIN */

728	737	#ifndef TkIntersectRegion_TCL_DECLARED
729	738	#define TkIntersectRegion_TCL_DECLARED
730	739	/* 116 */
731		EXTERN void TkIntersectRegion (TkRegion sra, TkRegion srcb,
	740	EXTERN void TkIntersectRegion (TkRegion sra, TkRegion srcb,
732	741	TkRegion dr_return);
733	742	#endif
734	743	#endif /* AQUA */

736	745	#ifndef TkRectInRegion_TCL_DECLARED
737	746	#define TkRectInRegion_TCL_DECLARED
738	747	/* 117 */
739		EXTERN int TkRectInRegion (TkRegion rgn, int x, int y,
	748	EXTERN int TkRectInRegion (TkRegion rgn, int x, int y,
740	749	unsigned int width, unsigned int height);
741	750	#endif
742	751	#endif /* WIN */

744	753	#ifndef TkRectInRegion_TCL_DECLARED
745	754	#define TkRectInRegion_TCL_DECLARED
746	755	/* 117 */
747		EXTERN int TkRectInRegion (TkRegion rgn, int x, int y,
	756	EXTERN int TkRectInRegion (TkRegion rgn, int x, int y,
748	757	unsigned int width, unsigned int height);
749	758	#endif
750	759	#endif /* AQUA */

766	775	#ifndef TkUnionRectWithRegion_TCL_DECLARED
767	776	#define TkUnionRectWithRegion_TCL_DECLARED
768	777	/* 119 */
769		EXTERN void TkUnionRectWithRegion (XRectangle * rect,
	778	EXTERN void TkUnionRectWithRegion (XRectangle * rect,
770	779	TkRegion src, TkRegion dr_return);
771	780	#endif
772	781	#endif /* WIN */

774	783	#ifndef TkUnionRectWithRegion_TCL_DECLARED
775	784	#define TkUnionRectWithRegion_TCL_DECLARED
776	785	/* 119 */
777		EXTERN void TkUnionRectWithRegion (XRectangle * rect,
	786	EXTERN void TkUnionRectWithRegion (XRectangle * rect,
778	787	TkRegion src, TkRegion dr_return);
779	788	#endif
780	789	#endif /* AQUA */

783	792	#ifndef TkpCreateNativeBitmap_TCL_DECLARED
784	793	#define TkpCreateNativeBitmap_TCL_DECLARED
785	794	/* 121 */
786		EXTERN Pixmap TkpCreateNativeBitmap (Display * display,
787		CONST char * source);
	795	EXTERN Pixmap TkpCreateNativeBitmap (Display * display,
	796	const char * source);
788	797	#endif
789	798	#endif /* AQUA */
790	799	#ifdef MAC_OSX_TK /* AQUA */

799	808	#ifndef TkpGetNativeAppBitmap_TCL_DECLARED
800	809	#define TkpGetNativeAppBitmap_TCL_DECLARED
801	810	/* 124 */
802		EXTERN Pixmap TkpGetNativeAppBitmap (Display * display,
803		CONST char * name, int * width, int * height);
	811	EXTERN Pixmap TkpGetNativeAppBitmap (Display * display,
	812	const char * name, int * width, int * height);
804	813	#endif
805	814	#endif /* AQUA */
806	815	/* Slot 125 is reserved */

816	825	#ifndef TkpDrawHighlightBorder_TCL_DECLARED
817	826	#define TkpDrawHighlightBorder_TCL_DECLARED
818	827	/* 135 */
819		EXTERN void TkpDrawHighlightBorder (Tk_Window tkwin, GC fgGC,
820		GC bgGC, int highlightWidth,
	828	EXTERN void TkpDrawHighlightBorder (Tk_Window tkwin, GC fgGC,
	829	GC bgGC, int highlightWidth,
821	830	Drawable drawable);
822	831	#endif
823	832	#ifndef TkSetFocusWin_TCL_DECLARED

828	837	#ifndef TkpSetKeycodeAndState_TCL_DECLARED
829	838	#define TkpSetKeycodeAndState_TCL_DECLARED
830	839	/* 137 */
831		EXTERN void TkpSetKeycodeAndState (Tk_Window tkwin,
	840	EXTERN void TkpSetKeycodeAndState (Tk_Window tkwin,
832	841	KeySym keySym, XEvent * eventPtr);
833	842	#endif
834	843	#ifndef TkpGetKeySym_TCL_DECLARED

870	879	#ifndef TkSubtractRegion_TCL_DECLARED
871	880	#define TkSubtractRegion_TCL_DECLARED
872	881	/* 145 */
873		EXTERN void TkSubtractRegion (TkRegion sra, TkRegion srcb,
	882	EXTERN void TkSubtractRegion (TkRegion sra, TkRegion srcb,
874	883	TkRegion dr_return);
875	884	#endif
876	885	#endif /* WIN */

878	887	#ifndef TkSubtractRegion_TCL_DECLARED
879	888	#define TkSubtractRegion_TCL_DECLARED
880	889	/* 145 */
881		EXTERN void TkSubtractRegion (TkRegion sra, TkRegion srcb,
	890	EXTERN void TkSubtractRegion (TkRegion sra, TkRegion srcb,
882	891	TkRegion dr_return);
883	892	#endif
884	893	#endif /* AQUA */

895	904	#ifndef TkToplevelWindowForCommand_TCL_DECLARED
896	905	#define TkToplevelWindowForCommand_TCL_DECLARED
897	906	/* 148 */
898		EXTERN Tk_Window TkToplevelWindowForCommand (Tcl_Interp * interp,
899		CONST char * cmdName);
	907	EXTERN Tk_Window TkToplevelWindowForCommand (Tcl_Interp * interp,
	908	const char * cmdName);
900	909	#endif
901	910	#ifndef TkGetOptionSpec_TCL_DECLARED
902	911	#define TkGetOptionSpec_TCL_DECLARED
903	912	/* 149 */
904		EXTERN CONST Tk_OptionSpec * TkGetOptionSpec (CONST char * name,
	913	EXTERN const Tk_OptionSpec * TkGetOptionSpec (const char * name,
905	914	Tk_OptionTable optionTable);
906	915	#endif
907	916	#ifndef TkMakeRawCurve_TCL_DECLARED
908	917	#define TkMakeRawCurve_TCL_DECLARED
909	918	/* 150 */
910		EXTERN int TkMakeRawCurve (Tk_Canvas canvas, double * pointPtr,
911		int numPoints, int numSteps,
	919	EXTERN int TkMakeRawCurve (Tk_Canvas canvas, double * pointPtr,
	920	int numPoints, int numSteps,
912	921	XPoint xPoints[], double dblPoints[]);
913	922	#endif
914	923	#ifndef TkMakeRawCurvePostscript_TCL_DECLARED
915	924	#define TkMakeRawCurvePostscript_TCL_DECLARED
916	925	/* 151 */
917		EXTERN void TkMakeRawCurvePostscript (Tcl_Interp * interp,
918		Tk_Canvas canvas, double * pointPtr,
	926	EXTERN void TkMakeRawCurvePostscript (Tcl_Interp * interp,
	927	Tk_Canvas canvas, double * pointPtr,
919	928	int numPoints);
920	929	#endif
921	930	#ifndef TkpDrawFrame_TCL_DECLARED
922	931	#define TkpDrawFrame_TCL_DECLARED
923	932	/* 152 */
924		EXTERN void TkpDrawFrame (Tk_Window tkwin, Tk_3DBorder border,
925		int highlightWidth, int borderWidth,
	933	EXTERN void TkpDrawFrame (Tk_Window tkwin, Tk_3DBorder border,
	934	int highlightWidth, int borderWidth,
926	935	int relief);
927	936	#endif
928	937	#ifndef TkCreateThreadExitHandler_TCL_DECLARED
929	938	#define TkCreateThreadExitHandler_TCL_DECLARED
930	939	/* 153 */
931		EXTERN void TkCreateThreadExitHandler (Tcl_ExitProc * proc,
	940	EXTERN void TkCreateThreadExitHandler (Tcl_ExitProc * proc,
932	941	ClientData clientData);
933	942	#endif
934	943	#ifndef TkDeleteThreadExitHandler_TCL_DECLARED
935	944	#define TkDeleteThreadExitHandler_TCL_DECLARED
936	945	/* 154 */
937		EXTERN void TkDeleteThreadExitHandler (Tcl_ExitProc * proc,
	946	EXTERN void TkDeleteThreadExitHandler (Tcl_ExitProc * proc,
938	947	ClientData clientData);
939	948	#endif
940	949	/* Slot 155 is reserved */
941	950	#ifndef TkpTestembedCmd_TCL_DECLARED
942	951	#define TkpTestembedCmd_TCL_DECLARED
943	952	/* 156 */
944		EXTERN int TkpTestembedCmd (ClientData clientData,
945		Tcl_Interp * interp, int argc,
946		CONST char ** argv);
	953	EXTERN int TkpTestembedCmd (ClientData clientData,
	954	Tcl_Interp * interp, int argc,
	955	const char ** argv);
947	956	#endif
948	957	#ifndef TkpTesttextCmd_TCL_DECLARED
949	958	#define TkpTesttextCmd_TCL_DECLARED
950	959	/* 157 */
951		EXTERN int TkpTesttextCmd (ClientData dummy,
952		Tcl_Interp * interp, int argc,
953		CONST char ** argv);
	960	EXTERN int TkpTesttextCmd (ClientData dummy,
	961	Tcl_Interp * interp, int argc,
	962	const char ** argv);
	963	#endif
	964	#ifndef TkSelGetSelection_TCL_DECLARED
	965	#define TkSelGetSelection_TCL_DECLARED
	966	/* 158 */
	967	EXTERN int TkSelGetSelection (Tcl_Interp * interp,
	968	Tk_Window tkwin, Atom selection, Atom target,
	969	Tk_GetSelProc * proc, ClientData clientData);
	970	#endif
	971	#ifndef TkTextGetIndex_TCL_DECLARED
	972	#define TkTextGetIndex_TCL_DECLARED
	973	/* 159 */
	974	EXTERN int TkTextGetIndex (Tcl_Interp * interp,
	975	struct TkText * textPtr, const char * string,
	976	struct TkTextIndex * indexPtr);
	977	#endif
	978	#ifndef TkTextIndexBackBytes_TCL_DECLARED
	979	#define TkTextIndexBackBytes_TCL_DECLARED
	980	/* 160 */
	981	EXTERN int TkTextIndexBackBytes (const struct TkText * textPtr,
	982	const struct TkTextIndex * srcPtr, int count,
	983	struct TkTextIndex * dstPtr);
	984	#endif
	985	#ifndef TkTextIndexForwBytes_TCL_DECLARED
	986	#define TkTextIndexForwBytes_TCL_DECLARED
	987	/* 161 */
	988	EXTERN int TkTextIndexForwBytes (const struct TkText * textPtr,
	989	const struct TkTextIndex * srcPtr, int count,
	990	struct TkTextIndex * dstPtr);
	991	#endif
	992	#ifndef TkTextMakeByteIndex_TCL_DECLARED
	993	#define TkTextMakeByteIndex_TCL_DECLARED
	994	/* 162 */
	995	EXTERN struct TkTextIndex * TkTextMakeByteIndex (TkTextBTree tree,
	996	const struct TkText * textPtr, int lineIndex,
	997	int byteIndex, struct TkTextIndex * indexPtr);
	998	#endif
	999	#ifndef TkTextPrintIndex_TCL_DECLARED
	1000	#define TkTextPrintIndex_TCL_DECLARED
	1001	/* 163 */
	1002	EXTERN int TkTextPrintIndex (const struct TkText * textPtr,
	1003	const struct TkTextIndex * indexPtr,
	1004	char * string);
	1005	#endif
	1006	#ifndef TkTextSetMark_TCL_DECLARED
	1007	#define TkTextSetMark_TCL_DECLARED
	1008	/* 164 */
	1009	EXTERN struct TkTextSegment * TkTextSetMark (struct TkText * textPtr,
	1010	const char * name,
	1011	struct TkTextIndex * indexPtr);
	1012	#endif
	1013	#ifndef TkTextXviewCmd_TCL_DECLARED
	1014	#define TkTextXviewCmd_TCL_DECLARED
	1015	/* 165 */
	1016	EXTERN int TkTextXviewCmd (struct TkText * textPtr,
	1017	Tcl_Interp * interp, int objc,
	1018	Tcl_Obj *const objv[]);
	1019	#endif
	1020	#ifndef TkTextChanged_TCL_DECLARED
	1021	#define TkTextChanged_TCL_DECLARED
	1022	/* 166 */
	1023	EXTERN void TkTextChanged (struct TkSharedText * sharedTextPtr,
	1024	struct TkText * textPtr,
	1025	const struct TkTextIndex * index1Ptr,
	1026	const struct TkTextIndex * index2Ptr);
	1027	#endif
	1028	#ifndef TkBTreeNumLines_TCL_DECLARED
	1029	#define TkBTreeNumLines_TCL_DECLARED
	1030	/* 167 */
	1031	EXTERN int TkBTreeNumLines (TkTextBTree tree,
	1032	const struct TkText * textPtr);
	1033	#endif
	1034	#ifndef TkTextInsertDisplayProc_TCL_DECLARED
	1035	#define TkTextInsertDisplayProc_TCL_DECLARED
	1036	/* 168 */
	1037	EXTERN void TkTextInsertDisplayProc (struct TkText * textPtr,
	1038	struct TkTextDispChunk * chunkPtr, int x,
	1039	int y, int height, int baseline,
	1040	Display * display, Drawable dst, int screenY);
954	1041	#endif
955	1042
956	1043	typedef struct TkIntStubs {
957	1044	int magic;
958		CONST struct TkIntStubHooks *hooks;
	1045	const struct TkIntStubHooks *hooks;
959	1046
960	1047	TkWindow * (tkAllocWindow) (TkDisplay dispPtr, int screenNum, TkWindow * parentPtr); /* 0 */
961	1048	void (tkBezierPoints) (double control[], int numSteps, double coordPtr); /* 1 */

968	1055	int (tkClipInit) (Tcl_Interp interp, TkDisplay * dispPtr); /* 8 */
969	1056	void (tkComputeAnchor) (Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int xPtr, int * yPtr); /* 9 */
970	1057	int (tkCopyAndGlobalEval) (Tcl_Interp interp, char * script); /* 10 */
971		unsigned long (tkCreateBindingProcedure) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventString, TkBindEvalProc * evalProc, TkBindFreeProc * freeProc, ClientData clientData); /* 11 */
972		TkCursor * (tkCreateCursorFromData) (Tk_Window tkwin, CONST char source, CONST char * mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
973		int (tkCreateFrame) (ClientData clientData, Tcl_Interp interp, int argc, char ** argv, int toplevel, char * appName); /* 13 */
974		Tk_Window (tkCreateMainWindow) (Tcl_Interp interp, CONST char * screenName, char * baseName); /* 14 */
	1058	unsigned long (tkCreateBindingProcedure) (Tcl_Interp interp, Tk_BindingTable bindingTable, ClientData object, const char * eventString, TkBindEvalProc * evalProc, TkBindFreeProc * freeProc, ClientData clientData); /* 11 */
	1059	TkCursor * (tkCreateCursorFromData) (Tk_Window tkwin, const char source, const char * mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
	1060	int (tkCreateFrame) (ClientData clientData, Tcl_Interp interp, int argc, const char const argv, int toplevel, const char * appName); /* 13 */
	1061	Tk_Window (tkCreateMainWindow) (Tcl_Interp interp, const char * screenName, const char * baseName); /* 14 */
975	1062	Time (tkCurrentTime) (TkDisplay dispPtr); /* 15 */
976	1063	void (tkDeleteAllImages) (TkMainInfo mainPtr); /* 16 */
977	1064	void (tkDoConfigureNotify) (TkWindow winPtr); /* 17 */
978	1065	void (tkDrawInsetFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding); / 18 */
979	1066	void (tkEventDeadWindow) (TkWindow winPtr); /* 19 */
980	1067	void (tkFillPolygon) (Tk_Canvas canvas, double coordPtr, int numPoints, Display * display, Drawable drawable, GC gc, GC outlineGC); /* 20 */
981		int (tkFindStateNum) (Tcl_Interp interp, CONST char * option, CONST TkStateMap * mapPtr, CONST char * strKey); /* 21 */
982		char * (tkFindStateString) (CONST TkStateMap mapPtr, int numKey); /* 22 */
	1068	int (tkFindStateNum) (Tcl_Interp interp, const char * option, const TkStateMap * mapPtr, const char * strKey); /* 21 */
	1069	char * (tkFindStateString) (const TkStateMap mapPtr, int numKey); /* 22 */
983	1070	void (tkFocusDeadWindow) (TkWindow winPtr); /* 23 */
984	1071	int (tkFocusFilterEvent) (TkWindow winPtr, XEvent * eventPtr); /* 24 */
985	1072	TkWindow * (tkFocusKeyEvent) (TkWindow winPtr, XEvent * eventPtr); /* 25 */

987	1074	void (tkFontPkgFree) (TkMainInfo mainPtr); /* 27 */
988	1075	void (tkFreeBindingTags) (TkWindow winPtr); /* 28 */
989	1076	void (tkpFreeCursor) (TkCursor cursorPtr); /* 29 */
990		char * (tkGetBitmapData) (Tcl_Interp interp, char * string, char * fileName, int * widthPtr, int * heightPtr, int * hotXPtr, int * hotYPtr); /* 30 */
	1077	char * (tkGetBitmapData) (Tcl_Interp interp, const char * string, const char * fileName, int * widthPtr, int * heightPtr, int * hotXPtr, int * hotYPtr); /* 30 */
991	1078	void (tkGetButtPoints) (double p1[], double p2[], double width, int project, double m1[], double m2[]); / 31 */
992	1079	TkCursor * (tkGetCursorByName) (Tcl_Interp interp, Tk_Window tkwin, Tk_Uid string); /* 32 */
993		CONST84_RETURN char * (tkGetDefaultScreenName) (Tcl_Interp interp, CONST char * screenName); /* 33 */
	1080	const char * (tkGetDefaultScreenName) (Tcl_Interp interp, const char * screenName); /* 33 */
994	1081	TkDisplay * (tkGetDisplay) (Display display); /* 34 */
995		int (tkGetDisplayOf) (Tcl_Interp interp, int objc, Tcl_Obj CONST objv[], Tk_Window tkwinPtr); /* 35 */
	1082	int (tkGetDisplayOf) (Tcl_Interp interp, int objc, Tcl_Obj const objv[], Tk_Window tkwinPtr); /* 35 */
996	1083	TkWindow * (tkGetFocusWin) (TkWindow winPtr); /* 36 */
997	1084	int (tkGetInterpNames) (Tcl_Interp interp, Tk_Window tkwin); /* 37 */
998	1085	int (tkGetMiterPoints) (double p1[], double p2[], double p3[], double width, double m1[], double m2[]); / 38 */

1015	1102	int (tkpChangeFocus) (TkWindow winPtr, int force); /* 55 */
1016	1103	void (tkpCloseDisplay) (TkDisplay dispPtr); /* 56 */
1017	1104	void (tkpClaimFocus) (TkWindow topLevelPtr, int force); /* 57 */
1018		void (tkpDisplayWarning) (CONST char msg, CONST char * title); /* 58 */
	1105	void (tkpDisplayWarning) (const char msg, const char * title); /* 58 */
1019	1106	void (tkpGetAppName) (Tcl_Interp interp, Tcl_DString * name); /* 59 */
1020	1107	TkWindow * (tkpGetOtherWindow) (TkWindow winPtr); /* 60 */
1021	1108	TkWindow * (tkpGetWrapperWindow) (TkWindow winPtr); /* 61 */

1025	1112	void (tkpMakeMenuWindow) (Tk_Window tkwin, int transient); / 65 */
1026	1113	Window (tkpMakeWindow) (TkWindow winPtr, Window parent); /* 66 */
1027	1114	void (tkpMenuNotifyToplevelCreate) (Tcl_Interp interp1, char * menuName); /* 67 */
1028		TkDisplay * (tkpOpenDisplay) (CONST char display_name); /* 68 */
	1115	TkDisplay * (tkpOpenDisplay) (const char display_name); /* 68 */
1029	1116	int (tkPointerEvent) (XEvent eventPtr, TkWindow * winPtr); /* 69 */
1030	1117	int (tkPolygonToArea) (double polyPtr, int numPoints, double * rectPtr); /* 70 */
1031	1118	double (tkPolygonToPoint) (double polyPtr, int numPoints, double * pointPtr); /* 71 */
1032	1119	int (tkPositionInTree) (TkWindow winPtr, TkWindow * treePtr); /* 72 */
1033	1120	void (tkpRedirectKeyEvent) (TkWindow winPtr, XEvent * eventPtr); /* 73 */
1034	1121	void (tkpSetMainMenubar) (Tcl_Interp interp, Tk_Window tkwin, char * menuName); /* 74 */
1035		int (tkpUseWindow) (Tcl_Interp interp, Tk_Window tkwin, CONST char * string); /* 75 */
	1122	int (tkpUseWindow) (Tcl_Interp interp, Tk_Window tkwin, const char * string); /* 75 */
1036	1123	void *reserved76;
1037	1124	void (tkQueueEventForAllChildren) (TkWindow winPtr, XEvent * eventPtr); /* 77 */
1038		int (tkReadBitmapFile) (Display display, Drawable d, CONST char * filename, unsigned int * width_return, unsigned int * height_return, Pixmap * bitmap_return, int * x_hot_return, int * y_hot_return); /* 78 */
	1125	int (tkReadBitmapFile) (Display display, Drawable d, const char * filename, unsigned int * width_return, unsigned int * height_return, Pixmap * bitmap_return, int * x_hot_return, int * y_hot_return); /* 78 */
1039	1126	int (tkScrollWindow) (Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn); / 79 */
1040	1127	void (tkSelDeadWindow) (TkWindow winPtr); /* 80 */
1041	1128	void (tkSelEventProc) (Tk_Window tkwin, XEvent eventPtr); /* 81 */

1061	1148	Tcl_Obj * (tkDebugColor) (Tk_Window tkwin, char name); /* 101 */
1062	1149	Tcl_Obj * (tkDebugConfig) (Tcl_Interp interp, Tk_OptionTable table); /* 102 */
1063	1150	Tcl_Obj * (tkDebugFont) (Tk_Window tkwin, char name); /* 103 */
1064		int (tkFindStateNumObj) (Tcl_Interp interp, Tcl_Obj * optionPtr, CONST TkStateMap * mapPtr, Tcl_Obj * keyPtr); /* 104 */
	1151	int (tkFindStateNumObj) (Tcl_Interp interp, Tcl_Obj * optionPtr, const TkStateMap * mapPtr, Tcl_Obj * keyPtr); /* 104 */
1065	1152	Tcl_HashTable * (tkGetBitmapPredefTable) (void); / 105 */
1066	1153	TkDisplay * (tkGetDisplayList) (void); / 106 */
1067	1154	TkMainInfo * (tkGetMainInfoList) (void); / 107 */
1068	1155	int (tkGetWindowFromObj) (Tcl_Interp interp, Tk_Window tkwin, Tcl_Obj * objPtr, Tk_Window * windowPtr); /* 108 */
1069	1156	char * (tkpGetString) (TkWindow winPtr, XEvent * eventPtr, Tcl_DString * dsPtr); /* 109 */
1070	1157	void (tkpGetSubFonts) (Tcl_Interp interp, Tk_Font tkfont); /* 110 */
1071		Tcl_Obj * (tkpGetSystemDefault) (Tk_Window tkwin, CONST char dbName, CONST char * className); /* 111 */
	1158	Tcl_Obj * (tkpGetSystemDefault) (Tk_Window tkwin, const char dbName, const char * className); /* 111 */
1072	1159	void (tkpMenuThreadInit) (void); / 112 */
1073	1160	#if !(defined(__WIN32__) \|\| defined(MAC_OSX_TK)) /* X11 */
1074	1161	void *reserved113;

1149	1236	#endif /* WIN */
1150	1237	#ifdef MAC_OSX_TK /* AQUA */
1151	1238	void reserved121; / Dummy entry for stubs table backwards compatibility */
1152		Pixmap (tkpCreateNativeBitmap) (Display display, CONST char * source); /* 121 */
	1239	Pixmap (tkpCreateNativeBitmap) (Display display, const char * source); /* 121 */
1153	1240	#endif /* AQUA */
1154	1241	#if !(defined(__WIN32__) \|\| defined(MAC_OSX_TK)) /* X11 */
1155	1242	void *reserved122;

1170	1257	#endif /* WIN */
1171	1258	#ifdef MAC_OSX_TK /* AQUA */
1172	1259	void reserved124; / Dummy entry for stubs table backwards compatibility */
1173		Pixmap (tkpGetNativeAppBitmap) (Display display, CONST char * name, int * width, int * height); /* 124 */
	1260	Pixmap (tkpGetNativeAppBitmap) (Display display, const char * name, int * width, int * height); /* 124 */
1174	1261	#endif /* AQUA */
1175	1262	void *reserved125;
1176	1263	void *reserved126;

1204	1291	#endif /* AQUA */
1205	1292	void (tkStylePkgInit) (TkMainInfo mainPtr); /* 146 */
1206	1293	void (tkStylePkgFree) (TkMainInfo mainPtr); /* 147 */
1207		Tk_Window (tkToplevelWindowForCommand) (Tcl_Interp interp, CONST char * cmdName); /* 148 */
1208		CONST Tk_OptionSpec * (tkGetOptionSpec) (CONST char name, Tk_OptionTable optionTable); /* 149 */
	1294	Tk_Window (tkToplevelWindowForCommand) (Tcl_Interp interp, const char * cmdName); /* 148 */
	1295	const Tk_OptionSpec * (tkGetOptionSpec) (const char name, Tk_OptionTable optionTable); /* 149 */
1209	1296	int (tkMakeRawCurve) (Tk_Canvas canvas, double pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[]); /* 150 */
1210	1297	void (tkMakeRawCurvePostscript) (Tcl_Interp interp, Tk_Canvas canvas, double * pointPtr, int numPoints); /* 151 */
1211	1298	void (tkpDrawFrame) (Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief); / 152 */
1212	1299	void (tkCreateThreadExitHandler) (Tcl_ExitProc proc, ClientData clientData); /* 153 */
1213	1300	void (tkDeleteThreadExitHandler) (Tcl_ExitProc proc, ClientData clientData); /* 154 */
1214	1301	void *reserved155;
1215		int (tkpTestembedCmd) (ClientData clientData, Tcl_Interp interp, int argc, CONST char ** argv); /* 156 */
1216		int (tkpTesttextCmd) (ClientData dummy, Tcl_Interp interp, int argc, CONST char ** argv); /* 157 */
	1302	int (tkpTestembedCmd) (ClientData clientData, Tcl_Interp interp, int argc, const char ** argv); /* 156 */
	1303	int (tkpTesttextCmd) (ClientData dummy, Tcl_Interp interp, int argc, const char ** argv); /* 157 */
	1304	int (tkSelGetSelection) (Tcl_Interp interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc * proc, ClientData clientData); /* 158 */
	1305	int (tkTextGetIndex) (Tcl_Interp interp, struct TkText * textPtr, const char * string, struct TkTextIndex * indexPtr); /* 159 */
	1306	int (tkTextIndexBackBytes) (const struct TkText textPtr, const struct TkTextIndex * srcPtr, int count, struct TkTextIndex * dstPtr); /* 160 */
	1307	int (tkTextIndexForwBytes) (const struct TkText textPtr, const struct TkTextIndex * srcPtr, int count, struct TkTextIndex * dstPtr); /* 161 */
	1308	struct TkTextIndex * (tkTextMakeByteIndex) (TkTextBTree tree, const struct TkText textPtr, int lineIndex, int byteIndex, struct TkTextIndex * indexPtr); /* 162 */
	1309	int (tkTextPrintIndex) (const struct TkText textPtr, const struct TkTextIndex * indexPtr, char * string); /* 163 */
	1310	struct TkTextSegment * (tkTextSetMark) (struct TkText textPtr, const char * name, struct TkTextIndex * indexPtr); /* 164 */
	1311	int (tkTextXviewCmd) (struct TkText textPtr, Tcl_Interp * interp, int objc, Tcl_Obj const objv[]); / 165 */
	1312	void (tkTextChanged) (struct TkSharedText sharedTextPtr, struct TkText * textPtr, const struct TkTextIndex * index1Ptr, const struct TkTextIndex * index2Ptr); /* 166 */
	1313	int (tkBTreeNumLines) (TkTextBTree tree, const struct TkText textPtr); /* 167 */
	1314	void (tkTextInsertDisplayProc) (struct TkText textPtr, struct TkTextDispChunk * chunkPtr, int x, int y, int height, int baseline, Display * display, Drawable dst, int screenY); /* 168 */
1217	1315	} TkIntStubs;
1218	1316
1219	1317	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
1220		extern CONST TkIntStubs *tkIntStubsPtr;
	1318	extern const TkIntStubs *tkIntStubsPtr;
1221	1319	#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
1222	1320
1223	1321	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)

1883	1981	#define TkpTesttextCmd \
1884	1982	(tkIntStubsPtr->tkpTesttextCmd) /* 157 */
1885	1983	#endif
	1984	#ifndef TkSelGetSelection
	1985	#define TkSelGetSelection \
	1986	(tkIntStubsPtr->tkSelGetSelection) /* 158 */
	1987	#endif
	1988	#ifndef TkTextGetIndex
	1989	#define TkTextGetIndex \
	1990	(tkIntStubsPtr->tkTextGetIndex) /* 159 */
	1991	#endif
	1992	#ifndef TkTextIndexBackBytes
	1993	#define TkTextIndexBackBytes \
	1994	(tkIntStubsPtr->tkTextIndexBackBytes) /* 160 */
	1995	#endif
	1996	#ifndef TkTextIndexForwBytes
	1997	#define TkTextIndexForwBytes \
	1998	(tkIntStubsPtr->tkTextIndexForwBytes) /* 161 */
	1999	#endif
	2000	#ifndef TkTextMakeByteIndex
	2001	#define TkTextMakeByteIndex \
	2002	(tkIntStubsPtr->tkTextMakeByteIndex) /* 162 */
	2003	#endif
	2004	#ifndef TkTextPrintIndex
	2005	#define TkTextPrintIndex \
	2006	(tkIntStubsPtr->tkTextPrintIndex) /* 163 */
	2007	#endif
	2008	#ifndef TkTextSetMark
	2009	#define TkTextSetMark \
	2010	(tkIntStubsPtr->tkTextSetMark) /* 164 */
	2011	#endif
	2012	#ifndef TkTextXviewCmd
	2013	#define TkTextXviewCmd \
	2014	(tkIntStubsPtr->tkTextXviewCmd) /* 165 */
	2015	#endif
	2016	#ifndef TkTextChanged
	2017	#define TkTextChanged \
	2018	(tkIntStubsPtr->tkTextChanged) /* 166 */
	2019	#endif
	2020	#ifndef TkBTreeNumLines
	2021	#define TkBTreeNumLines \
	2022	(tkIntStubsPtr->tkBTreeNumLines) /* 167 */
	2023	#endif
	2024	#ifndef TkTextInsertDisplayProc
	2025	#define TkTextInsertDisplayProc \
	2026	(tkIntStubsPtr->tkTextInsertDisplayProc) /* 168 */
	2027	#endif
1886	2028
1887	2029	#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
1888	2030

+42

-42

generic/tkIntPlatDecls.h less more

8	8	* Copyright (c) 1998-1999 by Scriptics Corporation.
9	9	* All rights reserved.
10	10	*
11		* RCS: @(#) $Id: tkIntPlatDecls.h,v 1.33 2008/08/19 15:52:12 georgeps Exp $
	11	* RCS: @(#) $Id: tkIntPlatDecls.h,v 1.34 2008/10/22 20:56:43 nijtmans Exp $
12	12	*/
13	13
14	14	#ifndef _TKINTPLATDECLS

35	35	#ifndef TkAlignImageData_TCL_DECLARED
36	36	#define TkAlignImageData_TCL_DECLARED
37	37	/* 0 */
38		EXTERN char * TkAlignImageData (XImage * image, int alignment,
	38	EXTERN char * TkAlignImageData (XImage * image, int alignment,
39	39	int bitOrder);
40	40	#endif
41	41	/* Slot 1 is reserved */
42	42	#ifndef TkGenerateActivateEvents_TCL_DECLARED
43	43	#define TkGenerateActivateEvents_TCL_DECLARED
44	44	/* 2 */
45		EXTERN void TkGenerateActivateEvents (TkWindow * winPtr,
	45	EXTERN void TkGenerateActivateEvents (TkWindow * winPtr,
46	46	int active);
47	47	#endif
48	48	#ifndef TkpGetMS_TCL_DECLARED

63	63	#ifndef TkpScanWindowId_TCL_DECLARED
64	64	#define TkpScanWindowId_TCL_DECLARED
65	65	/* 6 */
66		EXTERN int TkpScanWindowId (Tcl_Interp * interp,
67		CONST char * string, Window * idPtr);
	66	EXTERN int TkpScanWindowId (Tcl_Interp * interp,
	67	const char * string, Window * idPtr);
68	68	#endif
69	69	#ifndef TkpSetCapture_TCL_DECLARED
70	70	#define TkpSetCapture_TCL_DECLARED

84	84	#ifndef TkSetPixmapColormap_TCL_DECLARED
85	85	#define TkSetPixmapColormap_TCL_DECLARED
86	86	/* 10 */
87		EXTERN void TkSetPixmapColormap (Pixmap pixmap,
	87	EXTERN void TkSetPixmapColormap (Pixmap pixmap,
88	88	Colormap colormap);
89	89	#endif
90	90	#ifndef TkWinCancelMouseTimer_TCL_DECLARED

95	95	#ifndef TkWinClipboardRender_TCL_DECLARED
96	96	#define TkWinClipboardRender_TCL_DECLARED
97	97	/* 12 */
98		EXTERN void TkWinClipboardRender (TkDisplay * dispPtr,
	98	EXTERN void TkWinClipboardRender (TkDisplay * dispPtr,
99	99	UINT format);
100	100	#endif
101	101	#ifndef TkWinEmbeddedEventProc_TCL_DECLARED
102	102	#define TkWinEmbeddedEventProc_TCL_DECLARED
103	103	/* 13 */
104		EXTERN LRESULT TkWinEmbeddedEventProc (HWND hwnd, UINT message,
	104	EXTERN LRESULT TkWinEmbeddedEventProc (HWND hwnd, UINT message,
105	105	WPARAM wParam, LPARAM lParam);
106	106	#endif
107	107	#ifndef TkWinFillRect_TCL_DECLARED
108	108	#define TkWinFillRect_TCL_DECLARED
109	109	/* 14 */
110		EXTERN void TkWinFillRect (HDC dc, int x, int y, int width,
	110	EXTERN void TkWinFillRect (HDC dc, int x, int y, int width,
111	111	int height, int pixel);
112	112	#endif
113	113	#ifndef TkWinGetBorderPixels_TCL_DECLARED
114	114	#define TkWinGetBorderPixels_TCL_DECLARED
115	115	/* 15 */
116		EXTERN COLORREF TkWinGetBorderPixels (Tk_Window tkwin,
	116	EXTERN COLORREF TkWinGetBorderPixels (Tk_Window tkwin,
117	117	Tk_3DBorder border, int which);
118	118	#endif
119	119	#ifndef TkWinGetDrawableDC_TCL_DECLARED
120	120	#define TkWinGetDrawableDC_TCL_DECLARED
121	121	/* 16 */
122		EXTERN HDC TkWinGetDrawableDC (Display * display, Drawable d,
	122	EXTERN HDC TkWinGetDrawableDC (Display * display, Drawable d,
123	123	TkWinDCState * state);
124	124	#endif
125	125	#ifndef TkWinGetModifierState_TCL_DECLARED

140	140	#ifndef TkWinHandleMenuEvent_TCL_DECLARED
141	141	#define TkWinHandleMenuEvent_TCL_DECLARED
142	142	/* 20 */
143		EXTERN int TkWinHandleMenuEvent (HWND * phwnd, UINT * pMessage,
144		WPARAM * pwParam, LPARAM * plParam,
	143	EXTERN int TkWinHandleMenuEvent (HWND * phwnd, UINT * pMessage,
	144	WPARAM * pwParam, LPARAM * plParam,
145	145	LRESULT * plResult);
146	146	#endif
147	147	#ifndef TkWinIndexOfColor_TCL_DECLARED

152	152	#ifndef TkWinReleaseDrawableDC_TCL_DECLARED
153	153	#define TkWinReleaseDrawableDC_TCL_DECLARED
154	154	/* 22 */
155		EXTERN void TkWinReleaseDrawableDC (Drawable d, HDC hdc,
	155	EXTERN void TkWinReleaseDrawableDC (Drawable d, HDC hdc,
156	156	TkWinDCState * state);
157	157	#endif
158	158	#ifndef TkWinResendEvent_TCL_DECLARED
159	159	#define TkWinResendEvent_TCL_DECLARED
160	160	/* 23 */
161		EXTERN LRESULT TkWinResendEvent (WNDPROC wndproc, HWND hwnd,
	161	EXTERN LRESULT TkWinResendEvent (WNDPROC wndproc, HWND hwnd,
162	162	XEvent * eventPtr);
163	163	#endif
164	164	#ifndef TkWinSelectPalette_TCL_DECLARED

174	174	#ifndef TkWinSetWindowPos_TCL_DECLARED
175	175	#define TkWinSetWindowPos_TCL_DECLARED
176	176	/* 26 */
177		EXTERN void TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd,
	177	EXTERN void TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd,
178	178	int pos);
179	179	#endif
180	180	#ifndef TkWinWmCleanup_TCL_DECLARED

205	205	#ifndef TkWinGetMenuSystemDefault_TCL_DECLARED
206	206	#define TkWinGetMenuSystemDefault_TCL_DECLARED
207	207	/* 32 */
208		EXTERN Tcl_Obj * TkWinGetMenuSystemDefault (Tk_Window tkwin,
209		CONST char * dbName, CONST char * className);
	208	EXTERN Tcl_Obj * TkWinGetMenuSystemDefault (Tk_Window tkwin,
	209	const char * dbName, const char * className);
210	210	#endif
211	211	#ifndef TkWinGetPlatformId_TCL_DECLARED
212	212	#define TkWinGetPlatformId_TCL_DECLARED

228	228	#ifndef TkGenerateActivateEvents_TCL_DECLARED
229	229	#define TkGenerateActivateEvents_TCL_DECLARED
230	230	/* 0 */
231		EXTERN void TkGenerateActivateEvents (TkWindow * winPtr,
	231	EXTERN void TkGenerateActivateEvents (TkWindow * winPtr,
232	232	int active);
233	233	#endif
234	234	/* Slot 1 is reserved */

298	298	#ifndef TkMacOSXGrowToplevel_TCL_DECLARED
299	299	#define TkMacOSXGrowToplevel_TCL_DECLARED
300	300	/* 17 */
301		EXTERN int TkMacOSXGrowToplevel (WindowRef whichWindow,
	301	EXTERN int TkMacOSXGrowToplevel (WindowRef whichWindow,
302	302	Point start);
303	303	#endif
304	304	#ifndef TkMacOSXHandleMenuSelect_TCL_DECLARED
305	305	#define TkMacOSXHandleMenuSelect_TCL_DECLARED
306	306	/* 18 */
307		EXTERN void TkMacOSXHandleMenuSelect (MenuID theMenu,
	307	EXTERN void TkMacOSXHandleMenuSelect (MenuID theMenu,
308	308	MenuItemIndex theItem, int optionKeyPressed);
309	309	#endif
310	310	/* Slot 19 is reserved */

312	312	#ifndef TkMacOSXInvalidateWindow_TCL_DECLARED
313	313	#define TkMacOSXInvalidateWindow_TCL_DECLARED
314	314	/* 21 */
315		EXTERN void TkMacOSXInvalidateWindow (MacDrawable * macWin,
	315	EXTERN void TkMacOSXInvalidateWindow (MacDrawable * macWin,
316	316	int flag);
317	317	#endif
318	318	#ifndef TkMacOSXIsCharacterMissing_TCL_DECLARED
319	319	#define TkMacOSXIsCharacterMissing_TCL_DECLARED
320	320	/* 22 */
321		EXTERN int TkMacOSXIsCharacterMissing (Tk_Font tkfont,
	321	EXTERN int TkMacOSXIsCharacterMissing (Tk_Font tkfont,
322	322	unsigned int searchChar);
323	323	#endif
324	324	#ifndef TkMacOSXMakeRealWindowExist_TCL_DECLARED

339	339	#ifndef TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
340	340	#define TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
341	341	/* 26 */
342		EXTERN void TkMacOSXRegisterOffScreenWindow (Window window,
	342	EXTERN void TkMacOSXRegisterOffScreenWindow (Window window,
343	343	GWorldPtr portPtr);
344	344	#endif
345	345	#ifndef TkMacOSXResizable_TCL_DECLARED

355	355	#ifndef TkMacOSXSetScrollbarGrow_TCL_DECLARED
356	356	#define TkMacOSXSetScrollbarGrow_TCL_DECLARED
357	357	/* 29 */
358		EXTERN void TkMacOSXSetScrollbarGrow (TkWindow * winPtr,
	358	EXTERN void TkMacOSXSetScrollbarGrow (TkWindow * winPtr,
359	359	int flag);
360	360	#endif
361	361	#ifndef TkMacOSXSetUpClippingRgn_TCL_DECLARED

391	391	#ifndef TkMacOSXWinBounds_TCL_DECLARED
392	392	#define TkMacOSXWinBounds_TCL_DECLARED
393	393	/* 36 */
394		EXTERN void TkMacOSXWinBounds (TkWindow * winPtr,
	394	EXTERN void TkMacOSXWinBounds (TkWindow * winPtr,
395	395	Rect * geometry);
396	396	#endif
397	397	#ifndef TkMacOSXWindowOffset_TCL_DECLARED
398	398	#define TkMacOSXWindowOffset_TCL_DECLARED
399	399	/* 37 */
400		EXTERN void TkMacOSXWindowOffset (WindowRef wRef, int * xOffset,
	400	EXTERN void TkMacOSXWindowOffset (WindowRef wRef, int * xOffset,
401	401	int * yOffset);
402	402	#endif
403	403	#ifndef TkSetMacColor_TCL_DECLARED
404	404	#define TkSetMacColor_TCL_DECLARED
405	405	/* 38 */
406		EXTERN int TkSetMacColor (unsigned long pixel,
	406	EXTERN int TkSetMacColor (unsigned long pixel,
407	407	RGBColor * macColor);
408	408	#endif
409	409	#ifndef TkSetWMName_TCL_DECLARED

419	419	#ifndef TkMacOSXZoomToplevel_TCL_DECLARED
420	420	#define TkMacOSXZoomToplevel_TCL_DECLARED
421	421	/* 41 */
422		EXTERN int TkMacOSXZoomToplevel (WindowPtr whichWindow,
	422	EXTERN int TkMacOSXZoomToplevel (WindowPtr whichWindow,
423	423	short zoomPart);
424	424	#endif
425	425	#ifndef Tk_TopCoordsToWindow_TCL_DECLARED
426	426	#define Tk_TopCoordsToWindow_TCL_DECLARED
427	427	/* 42 */
428		EXTERN Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, int rootX,
	428	EXTERN Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, int rootX,
429	429	int rootY, int * newX, int * newY);
430	430	#endif
431	431	#ifndef TkMacOSXContainerId_TCL_DECLARED

462	462	#ifndef TkGenerateButtonEvent_TCL_DECLARED
463	463	#define TkGenerateButtonEvent_TCL_DECLARED
464	464	/* 50 */
465		EXTERN int TkGenerateButtonEvent (int x, int y, Window window,
	465	EXTERN int TkGenerateButtonEvent (int x, int y, Window window,
466	466	unsigned int state);
467	467	#endif
468	468	#ifndef TkGenWMDestroyEvent_TCL_DECLARED

513	513	#ifndef TkpScanWindowId_TCL_DECLARED
514	514	#define TkpScanWindowId_TCL_DECLARED
515	515	/* 8 */
516		EXTERN int TkpScanWindowId (Tcl_Interp * interp,
517		CONST char * string, Window * idPtr);
	516	EXTERN int TkpScanWindowId (Tcl_Interp * interp,
	517	const char * string, Window * idPtr);
518	518	#endif
519	519	#ifndef TkWmCleanup_TCL_DECLARED
520	520	#define TkWmCleanup_TCL_DECLARED

535	535	#ifndef TkpTestsendCmd_TCL_DECLARED
536	536	#define TkpTestsendCmd_TCL_DECLARED
537	537	/* 13 */
538		EXTERN int TkpTestsendCmd (ClientData clientData,
539		Tcl_Interp * interp, int argc,
540		CONST char ** argv);
	538	EXTERN int TkpTestsendCmd (ClientData clientData,
	539	Tcl_Interp * interp, int argc,
	540	const char ** argv);
541	541	#endif
542	542	#endif /* X11 */
543	543
544	544	typedef struct TkIntPlatStubs {
545	545	int magic;
546		CONST struct TkIntPlatStubHooks *hooks;
	546	const struct TkIntPlatStubHooks *hooks;
547	547
548	548	#ifdef __WIN32__ /* WIN */
549	549	char * (tkAlignImageData) (XImage image, int alignment, int bitOrder); /* 0 */

552	552	unsigned long (tkpGetMS) (void); / 3 */
553	553	void (tkPointerDeadWindow) (TkWindow winPtr); /* 4 */
554	554	void (tkpPrintWindowId) (char buf, Window window); /* 5 */
555		int (tkpScanWindowId) (Tcl_Interp interp, CONST char * string, Window * idPtr); /* 6 */
	555	int (tkpScanWindowId) (Tcl_Interp interp, const char * string, Window * idPtr); /* 6 */
556	556	void (tkpSetCapture) (TkWindow winPtr); /* 7 */
557	557	void (tkpSetCursor) (TkpCursor cursor); / 8 */
558	558	void (tkpWmSetState) (TkWindow winPtr, int state); /* 9 */

578	578	void (tkWinXInit) (HINSTANCE hInstance); / 29 */
579	579	void (tkWinSetForegroundWindow) (TkWindow winPtr); /* 30 */
580	580	void (tkWinDialogDebug) (int debug); / 31 */
581		Tcl_Obj * (tkWinGetMenuSystemDefault) (Tk_Window tkwin, CONST char dbName, CONST char * className); /* 32 */
	581	Tcl_Obj * (tkWinGetMenuSystemDefault) (Tk_Window tkwin, const char dbName, const char * className); /* 32 */
582	582	int (tkWinGetPlatformId) (void); / 33 */
583	583	void (tkWinSetHINSTANCE) (HINSTANCE hInstance); / 34 */
584	584	int (tkWinGetPlatformTheme) (void); / 35 */

648	648	Window (tkUnixContainerId) (TkWindow winPtr); /* 5 */
649	649	int (tkUnixDoOneXEvent) (Tcl_Time timePtr); /* 6 */
650	650	void (tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); / 7 */
651		int (tkpScanWindowId) (Tcl_Interp interp, CONST char * string, Window * idPtr); /* 8 */
	651	int (tkpScanWindowId) (Tcl_Interp interp, const char * string, Window * idPtr); /* 8 */
652	652	void (tkWmCleanup) (TkDisplay dispPtr); /* 9 */
653	653	void (tkSendCleanup) (TkDisplay dispPtr); /* 10 */
654	654	void *reserved11;
655	655	int (tkpWmSetState) (TkWindow winPtr, int state); /* 12 */
656		int (tkpTestsendCmd) (ClientData clientData, Tcl_Interp interp, int argc, CONST char ** argv); /* 13 */
	656	int (tkpTestsendCmd) (ClientData clientData, Tcl_Interp interp, int argc, const char ** argv); /* 13 */
657	657	#endif /* X11 */
658	658	} TkIntPlatStubs;
659	659
660	660	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
661		extern CONST TkIntPlatStubs *tkIntPlatStubsPtr;
	661	extern const TkIntPlatStubs *tkIntPlatStubsPtr;
662	662	#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
663	663
664	664	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)

+184

-184

generic/tkIntXlibDecls.h less more

8	8	* Copyright (c) 1998-1999 by Scriptics Corporation.
9	9	* All rights reserved.
10	10	*
11		* RCS: @(#) $Id: tkIntXlibDecls.h,v 1.26 2008/04/08 15:00:47 das Exp $
	11	* RCS: @(#) $Id: tkIntXlibDecls.h,v 1.27 2008/10/22 20:56:43 nijtmans Exp $
12	12	*/
13	13
14	14	#ifndef _TKINTXLIBDECLS

37	37	#ifndef XSetDashes_TCL_DECLARED
38	38	#define XSetDashes_TCL_DECLARED
39	39	/* 0 */
40		EXTERN void XSetDashes (Display * display, GC gc,
41		int dash_offset, _Xconst char * dash_list,
	40	EXTERN void XSetDashes (Display * display, GC gc,
	41	int dash_offset, _Xconst char * dash_list,
42	42	int n);
43	43	#endif
44	44	#ifndef XGetModifierMapping_TCL_DECLARED

49	49	#ifndef XCreateImage_TCL_DECLARED
50	50	#define XCreateImage_TCL_DECLARED
51	51	/* 2 */
52		EXTERN XImage * XCreateImage (Display * d, Visual * v,
53		unsigned int ui1, int i1, int i2, char * cp,
54		unsigned int ui2, unsigned int ui3, int i3,
	52	EXTERN XImage * XCreateImage (Display * d, Visual * v,
	53	unsigned int ui1, int i1, int i2, char * cp,
	54	unsigned int ui2, unsigned int ui3, int i3,
55	55	int i4);
56	56	#endif
57	57	#ifndef XGetImage_TCL_DECLARED
58	58	#define XGetImage_TCL_DECLARED
59	59	/* 3 */
60		EXTERN XImage * XGetImage (Display * d, Drawable dr, int i1, int i2,
61		unsigned int ui1, unsigned int ui2,
	60	EXTERN XImage * XGetImage (Display * d, Drawable dr, int i1, int i2,
	61	unsigned int ui1, unsigned int ui2,
62	62	unsigned long ul, int i3);
63	63	#endif
64	64	#ifndef XGetAtomName_TCL_DECLARED

74	74	#ifndef XCreateColormap_TCL_DECLARED
75	75	#define XCreateColormap_TCL_DECLARED
76	76	/* 6 */
77		EXTERN Colormap XCreateColormap (Display * d, Window w, Visual * v,
	77	EXTERN Colormap XCreateColormap (Display * d, Window w, Visual * v,
78	78	int i);
79	79	#endif
80	80	#ifndef XCreatePixmapCursor_TCL_DECLARED
81	81	#define XCreatePixmapCursor_TCL_DECLARED
82	82	/* 7 */
83		EXTERN Cursor XCreatePixmapCursor (Display * d, Pixmap p1,
84		Pixmap p2, XColor * x1, XColor * x2,
	83	EXTERN Cursor XCreatePixmapCursor (Display * d, Pixmap p1,
	84	Pixmap p2, XColor * x1, XColor * x2,
85	85	unsigned int ui1, unsigned int ui2);
86	86	#endif
87	87	#ifndef XCreateGlyphCursor_TCL_DECLARED
88	88	#define XCreateGlyphCursor_TCL_DECLARED
89	89	/* 8 */
90		EXTERN Cursor XCreateGlyphCursor (Display * d, Font f1, Font f2,
91		unsigned int ui1, unsigned int ui2,
	90	EXTERN Cursor XCreateGlyphCursor (Display * d, Font f1, Font f2,
	91	unsigned int ui1, unsigned int ui2,
92	92	XColor * x1, XColor * x2);
93	93	#endif
94	94	#ifndef XGContextFromGC_TCL_DECLARED

134	134	#ifndef XGetWMColormapWindows_TCL_DECLARED
135	135	#define XGetWMColormapWindows_TCL_DECLARED
136	136	/* 17 */
137		EXTERN Status XGetWMColormapWindows (Display * d, Window w,
	137	EXTERN Status XGetWMColormapWindows (Display * d, Window w,
138	138	Window ** wpp, int * ip);
139	139	#endif
140	140	#ifndef XAllocColor_TCL_DECLARED

150	150	#ifndef XChangeProperty_TCL_DECLARED
151	151	#define XChangeProperty_TCL_DECLARED
152	152	/* 20 */
153		EXTERN void XChangeProperty (Display * d, Window w, Atom a1,
154		Atom a2, int i1, int i2,
	153	EXTERN void XChangeProperty (Display * d, Window w, Atom a1,
	154	Atom a2, int i1, int i2,
155	155	_Xconst unsigned char * c, int i3);
156	156	#endif
157	157	#ifndef XChangeWindowAttributes_TCL_DECLARED
158	158	#define XChangeWindowAttributes_TCL_DECLARED
159	159	/* 21 */
160		EXTERN void XChangeWindowAttributes (Display * d, Window w,
	160	EXTERN void XChangeWindowAttributes (Display * d, Window w,
161	161	unsigned long ul, XSetWindowAttributes * x);
162	162	#endif
163	163	#ifndef XClearWindow_TCL_DECLARED

168	168	#ifndef XConfigureWindow_TCL_DECLARED
169	169	#define XConfigureWindow_TCL_DECLARED
170	170	/* 23 */
171		EXTERN void XConfigureWindow (Display * d, Window w,
	171	EXTERN void XConfigureWindow (Display * d, Window w,
172	172	unsigned int i, XWindowChanges * x);
173	173	#endif
174	174	#ifndef XCopyArea_TCL_DECLARED
175	175	#define XCopyArea_TCL_DECLARED
176	176	/* 24 */
177		EXTERN void XCopyArea (Display * d, Drawable dr1, Drawable dr2,
178		GC g, int i1, int i2, unsigned int ui1,
	177	EXTERN void XCopyArea (Display * d, Drawable dr1, Drawable dr2,
	178	GC g, int i1, int i2, unsigned int ui1,
179	179	unsigned int ui2, int i3, int i4);
180	180	#endif
181	181	#ifndef XCopyPlane_TCL_DECLARED
182	182	#define XCopyPlane_TCL_DECLARED
183	183	/* 25 */
184		EXTERN void XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
185		GC g, int i1, int i2, unsigned int ui1,
186		unsigned int ui2, int i3, int i4,
	184	EXTERN void XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
	185	GC g, int i1, int i2, unsigned int ui1,
	186	unsigned int ui2, int i3, int i4,
187	187	unsigned long ul);
188	188	#endif
189	189	#ifndef XCreateBitmapFromData_TCL_DECLARED
190	190	#define XCreateBitmapFromData_TCL_DECLARED
191	191	/* 26 */
192		EXTERN Pixmap XCreateBitmapFromData (Display * display, Drawable d,
193		_Xconst char * data, unsigned int width,
	192	EXTERN Pixmap XCreateBitmapFromData (Display * display, Drawable d,
	193	_Xconst char * data, unsigned int width,
194	194	unsigned int height);
195	195	#endif
196	196	#ifndef XDefineCursor_TCL_DECLARED

211	211	#ifndef XDrawArc_TCL_DECLARED
212	212	#define XDrawArc_TCL_DECLARED
213	213	/* 30 */
214		EXTERN void XDrawArc (Display * d, Drawable dr, GC g, int i1,
215		int i2, unsigned int ui1, unsigned int ui2,
	214	EXTERN void XDrawArc (Display * d, Drawable dr, GC g, int i1,
	215	int i2, unsigned int ui1, unsigned int ui2,
216	216	int i3, int i4);
217	217	#endif
218	218	#ifndef XDrawLines_TCL_DECLARED
219	219	#define XDrawLines_TCL_DECLARED
220	220	/* 31 */
221		EXTERN void XDrawLines (Display * d, Drawable dr, GC g,
	221	EXTERN void XDrawLines (Display * d, Drawable dr, GC g,
222	222	XPoint * x, int i1, int i2);
223	223	#endif
224	224	#ifndef XDrawRectangle_TCL_DECLARED
225	225	#define XDrawRectangle_TCL_DECLARED
226	226	/* 32 */
227		EXTERN void XDrawRectangle (Display * d, Drawable dr, GC g,
228		int i1, int i2, unsigned int ui1,
	227	EXTERN void XDrawRectangle (Display * d, Drawable dr, GC g,
	228	int i1, int i2, unsigned int ui1,
229	229	unsigned int ui2);
230	230	#endif
231	231	#ifndef XFillArc_TCL_DECLARED
232	232	#define XFillArc_TCL_DECLARED
233	233	/* 33 */
234		EXTERN void XFillArc (Display * d, Drawable dr, GC g, int i1,
235		int i2, unsigned int ui1, unsigned int ui2,
	234	EXTERN void XFillArc (Display * d, Drawable dr, GC g, int i1,
	235	int i2, unsigned int ui1, unsigned int ui2,
236	236	int i3, int i4);
237	237	#endif
238	238	#ifndef XFillPolygon_TCL_DECLARED
239	239	#define XFillPolygon_TCL_DECLARED
240	240	/* 34 */
241		EXTERN void XFillPolygon (Display * d, Drawable dr, GC g,
	241	EXTERN void XFillPolygon (Display * d, Drawable dr, GC g,
242	242	XPoint * x, int i1, int i2, int i3);
243	243	#endif
244	244	#ifndef XFillRectangles_TCL_DECLARED
245	245	#define XFillRectangles_TCL_DECLARED
246	246	/* 35 */
247		EXTERN void XFillRectangles (Display * d, Drawable dr, GC g,
	247	EXTERN void XFillRectangles (Display * d, Drawable dr, GC g,
248	248	XRectangle * x, int i);
249	249	#endif
250	250	#ifndef XForceScreenSaver_TCL_DECLARED

260	260	#ifndef XFreeColors_TCL_DECLARED
261	261	#define XFreeColors_TCL_DECLARED
262	262	/* 38 */
263		EXTERN void XFreeColors (Display * d, Colormap c,
	263	EXTERN void XFreeColors (Display * d, Colormap c,
264	264	unsigned long * ulp, int i, unsigned long ul);
265	265	#endif
266	266	#ifndef XFreeCursor_TCL_DECLARED

276	276	#ifndef XGetGeometry_TCL_DECLARED
277	277	#define XGetGeometry_TCL_DECLARED
278	278	/* 41 */
279		EXTERN Status XGetGeometry (Display * d, Drawable dr, Window * w,
280		int * i1, int * i2, unsigned int * ui1,
281		unsigned int * ui2, unsigned int * ui3,
	279	EXTERN Status XGetGeometry (Display * d, Drawable dr, Window * w,
	280	int * i1, int * i2, unsigned int * ui1,
	281	unsigned int * ui2, unsigned int * ui3,
282	282	unsigned int * ui4);
283	283	#endif
284	284	#ifndef XGetInputFocus_TCL_DECLARED

289	289	#ifndef XGetWindowProperty_TCL_DECLARED
290	290	#define XGetWindowProperty_TCL_DECLARED
291	291	/* 43 */
292		EXTERN int XGetWindowProperty (Display * d, Window w, Atom a1,
293		long l1, long l2, Bool b, Atom a2, Atom * ap,
294		int * ip, unsigned long * ulp1,
	292	EXTERN int XGetWindowProperty (Display * d, Window w, Atom a1,
	293	long l1, long l2, Bool b, Atom a2, Atom * ap,
	294	int * ip, unsigned long * ulp1,
295	295	unsigned long * ulp2, unsigned char ** cpp);
296	296	#endif
297	297	#ifndef XGetWindowAttributes_TCL_DECLARED
298	298	#define XGetWindowAttributes_TCL_DECLARED
299	299	/* 44 */
300		EXTERN Status XGetWindowAttributes (Display * d, Window w,
	300	EXTERN Status XGetWindowAttributes (Display * d, Window w,
301	301	XWindowAttributes * x);
302	302	#endif
303	303	#ifndef XGrabKeyboard_TCL_DECLARED
304	304	#define XGrabKeyboard_TCL_DECLARED
305	305	/* 45 */
306		EXTERN int XGrabKeyboard (Display * d, Window w, Bool b, int i1,
	306	EXTERN int XGrabKeyboard (Display * d, Window w, Bool b, int i1,
307	307	int i2, Time t);
308	308	#endif
309	309	#ifndef XGrabPointer_TCL_DECLARED
310	310	#define XGrabPointer_TCL_DECLARED
311	311	/* 46 */
312		EXTERN int XGrabPointer (Display * d, Window w1, Bool b,
313		unsigned int ui, int i1, int i2, Window w2,
	312	EXTERN int XGrabPointer (Display * d, Window w1, Bool b,
	313	unsigned int ui, int i1, int i2, Window w2,
314	314	Cursor c, Time t);
315	315	#endif
316	316	#ifndef XKeysymToKeycode_TCL_DECLARED

321	321	#ifndef XLookupColor_TCL_DECLARED
322	322	#define XLookupColor_TCL_DECLARED
323	323	/* 48 */
324		EXTERN Status XLookupColor (Display * d, Colormap c1,
	324	EXTERN Status XLookupColor (Display * d, Colormap c1,
325	325	_Xconst char * c2, XColor * x1, XColor * x2);
326	326	#endif
327	327	#ifndef XMapWindow_TCL_DECLARED

332	332	#ifndef XMoveResizeWindow_TCL_DECLARED
333	333	#define XMoveResizeWindow_TCL_DECLARED
334	334	/* 50 */
335		EXTERN void XMoveResizeWindow (Display * d, Window w, int i1,
	335	EXTERN void XMoveResizeWindow (Display * d, Window w, int i1,
336	336	int i2, unsigned int ui1, unsigned int ui2);
337	337	#endif
338	338	#ifndef XMoveWindow_TCL_DECLARED

353	353	#ifndef XQueryColors_TCL_DECLARED
354	354	#define XQueryColors_TCL_DECLARED
355	355	/* 54 */
356		EXTERN void XQueryColors (Display * d, Colormap c, XColor * x,
	356	EXTERN void XQueryColors (Display * d, Colormap c, XColor * x,
357	357	int i);
358	358	#endif
359	359	#ifndef XQueryPointer_TCL_DECLARED
360	360	#define XQueryPointer_TCL_DECLARED
361	361	/* 55 */
362		EXTERN Bool XQueryPointer (Display * d, Window w1, Window * w2,
363		Window * w3, int * i1, int * i2, int * i3,
	362	EXTERN Bool XQueryPointer (Display * d, Window w1, Window * w2,
	363	Window * w3, int * i1, int * i2, int * i3,
364	364	int * i4, unsigned int * ui);
365	365	#endif
366	366	#ifndef XQueryTree_TCL_DECLARED
367	367	#define XQueryTree_TCL_DECLARED
368	368	/* 56 */
369		EXTERN Status XQueryTree (Display * d, Window w1, Window * w2,
	369	EXTERN Status XQueryTree (Display * d, Window w1, Window * w2,
370	370	Window * w3, Window ** w4, unsigned int * ui);
371	371	#endif
372	372	#ifndef XRaiseWindow_TCL_DECLARED

382	382	#ifndef XResizeWindow_TCL_DECLARED
383	383	#define XResizeWindow_TCL_DECLARED
384	384	/* 59 */
385		EXTERN void XResizeWindow (Display * d, Window w,
	385	EXTERN void XResizeWindow (Display * d, Window w,
386	386	unsigned int ui1, unsigned int ui2);
387	387	#endif
388	388	#ifndef XSelectInput_TCL_DECLARED

393	393	#ifndef XSendEvent_TCL_DECLARED
394	394	#define XSendEvent_TCL_DECLARED
395	395	/* 61 */
396		EXTERN Status XSendEvent (Display * d, Window w, Bool b, long l,
	396	EXTERN Status XSendEvent (Display * d, Window w, Bool b, long l,
397	397	XEvent * x);
398	398	#endif
399	399	#ifndef XSetCommand_TCL_DECLARED
400	400	#define XSetCommand_TCL_DECLARED
401	401	/* 62 */
402		EXTERN void XSetCommand (Display * d, Window w, CONST char ** c,
	402	EXTERN void XSetCommand (Display * d, Window w, const char ** c,
403	403	int i);
404	404	#endif
405	405	#ifndef XSetIconName_TCL_DECLARED
406	406	#define XSetIconName_TCL_DECLARED
407	407	/* 63 */
408		EXTERN void XSetIconName (Display * d, Window w,
	408	EXTERN void XSetIconName (Display * d, Window w,
409	409	_Xconst char * c);
410	410	#endif
411	411	#ifndef XSetInputFocus_TCL_DECLARED

416	416	#ifndef XSetSelectionOwner_TCL_DECLARED
417	417	#define XSetSelectionOwner_TCL_DECLARED
418	418	/* 65 */
419		EXTERN void XSetSelectionOwner (Display * d, Atom a, Window w,
	419	EXTERN void XSetSelectionOwner (Display * d, Atom a, Window w,
420	420	Time t);
421	421	#endif
422	422	#ifndef XSetWindowBackground_TCL_DECLARED
423	423	#define XSetWindowBackground_TCL_DECLARED
424	424	/* 66 */
425		EXTERN void XSetWindowBackground (Display * d, Window w,
	425	EXTERN void XSetWindowBackground (Display * d, Window w,
426	426	unsigned long ul);
427	427	#endif
428	428	#ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
429	429	#define XSetWindowBackgroundPixmap_TCL_DECLARED
430	430	/* 67 */
431		EXTERN void XSetWindowBackgroundPixmap (Display * d, Window w,
	431	EXTERN void XSetWindowBackgroundPixmap (Display * d, Window w,
432	432	Pixmap p);
433	433	#endif
434	434	#ifndef XSetWindowBorder_TCL_DECLARED
435	435	#define XSetWindowBorder_TCL_DECLARED
436	436	/* 68 */
437		EXTERN void XSetWindowBorder (Display * d, Window w,
	437	EXTERN void XSetWindowBorder (Display * d, Window w,
438	438	unsigned long ul);
439	439	#endif
440	440	#ifndef XSetWindowBorderPixmap_TCL_DECLARED
441	441	#define XSetWindowBorderPixmap_TCL_DECLARED
442	442	/* 69 */
443		EXTERN void XSetWindowBorderPixmap (Display * d, Window w,
	443	EXTERN void XSetWindowBorderPixmap (Display * d, Window w,
444	444	Pixmap p);
445	445	#endif
446	446	#ifndef XSetWindowBorderWidth_TCL_DECLARED
447	447	#define XSetWindowBorderWidth_TCL_DECLARED
448	448	/* 70 */
449		EXTERN void XSetWindowBorderWidth (Display * d, Window w,
	449	EXTERN void XSetWindowBorderWidth (Display * d, Window w,
450	450	unsigned int ui);
451	451	#endif
452	452	#ifndef XSetWindowColormap_TCL_DECLARED
453	453	#define XSetWindowColormap_TCL_DECLARED
454	454	/* 71 */
455		EXTERN void XSetWindowColormap (Display * d, Window w,
	455	EXTERN void XSetWindowColormap (Display * d, Window w,
456	456	Colormap c);
457	457	#endif
458	458	#ifndef XTranslateCoordinates_TCL_DECLARED
459	459	#define XTranslateCoordinates_TCL_DECLARED
460	460	/* 72 */
461		EXTERN Bool XTranslateCoordinates (Display * d, Window w1,
462		Window w2, int i1, int i2, int * i3,
	461	EXTERN Bool XTranslateCoordinates (Display * d, Window w1,
	462	Window w2, int i1, int i2, int * i3,
463	463	int * i4, Window * w3);
464	464	#endif
465	465	#ifndef XUngrabKeyboard_TCL_DECLARED

480	480	#ifndef XWindowEvent_TCL_DECLARED
481	481	#define XWindowEvent_TCL_DECLARED
482	482	/* 76 */
483		EXTERN void XWindowEvent (Display * d, Window w, long l,
	483	EXTERN void XWindowEvent (Display * d, Window w, long l,
484	484	XEvent * x);
485	485	#endif
486	486	#ifndef XDestroyIC_TCL_DECLARED

496	496	#ifndef XmbLookupString_TCL_DECLARED
497	497	#define XmbLookupString_TCL_DECLARED
498	498	/* 79 */
499		EXTERN int XmbLookupString (XIC xi, XKeyPressedEvent * xk,
	499	EXTERN int XmbLookupString (XIC xi, XKeyPressedEvent * xk,
500	500	char * c, int i, KeySym * k, Status * s);
501	501	#endif
502	502	#ifndef TkPutImage_TCL_DECLARED
503	503	#define TkPutImage_TCL_DECLARED
504	504	/* 80 */
505		EXTERN void TkPutImage (unsigned long * colors, int ncolors,
506		Display * display, Drawable d, GC gc,
507		XImage * image, int src_x, int src_y,
508		int dest_x, int dest_y, unsigned int width,
	505	EXTERN void TkPutImage (unsigned long * colors, int ncolors,
	506	Display * display, Drawable d, GC gc,
	507	XImage * image, int src_x, int src_y,
	508	int dest_x, int dest_y, unsigned int width,
509	509	unsigned int height);
510	510	#endif
511	511	/* Slot 81 is reserved */
512	512	#ifndef XParseColor_TCL_DECLARED
513	513	#define XParseColor_TCL_DECLARED
514	514	/* 82 */
515		EXTERN Status XParseColor (Display * display, Colormap map,
	515	EXTERN Status XParseColor (Display * display, Colormap map,
516	516	_Xconst char * spec, XColor * colorPtr);
517	517	#endif
518	518	#ifndef XCreateGC_TCL_DECLARED
519	519	#define XCreateGC_TCL_DECLARED
520	520	/* 83 */
521		EXTERN GC XCreateGC (Display * display, Drawable d,
	521	EXTERN GC XCreateGC (Display * display, Drawable d,
522	522	unsigned long valuemask, XGCValues * values);
523	523	#endif
524	524	#ifndef XFreeGC_TCL_DECLARED

529	529	#ifndef XInternAtom_TCL_DECLARED
530	530	#define XInternAtom_TCL_DECLARED
531	531	/* 85 */
532		EXTERN Atom XInternAtom (Display * display,
533		_Xconst char * atom_name,
	532	EXTERN Atom XInternAtom (Display * display,
	533	_Xconst char * atom_name,
534	534	Bool only_if_exists);
535	535	#endif
536	536	#ifndef XSetBackground_TCL_DECLARED
537	537	#define XSetBackground_TCL_DECLARED
538	538	/* 86 */
539		EXTERN void XSetBackground (Display * display, GC gc,
	539	EXTERN void XSetBackground (Display * display, GC gc,
540	540	unsigned long foreground);
541	541	#endif
542	542	#ifndef XSetForeground_TCL_DECLARED
543	543	#define XSetForeground_TCL_DECLARED
544	544	/* 87 */
545		EXTERN void XSetForeground (Display * display, GC gc,
	545	EXTERN void XSetForeground (Display * display, GC gc,
546	546	unsigned long foreground);
547	547	#endif
548	548	#ifndef XSetClipMask_TCL_DECLARED
549	549	#define XSetClipMask_TCL_DECLARED
550	550	/* 88 */
551		EXTERN void XSetClipMask (Display * display, GC gc,
	551	EXTERN void XSetClipMask (Display * display, GC gc,
552	552	Pixmap pixmap);
553	553	#endif
554	554	#ifndef XSetClipOrigin_TCL_DECLARED
555	555	#define XSetClipOrigin_TCL_DECLARED
556	556	/* 89 */
557		EXTERN void XSetClipOrigin (Display * display, GC gc,
	557	EXTERN void XSetClipOrigin (Display * display, GC gc,
558	558	int clip_x_origin, int clip_y_origin);
559	559	#endif
560	560	#ifndef XSetTSOrigin_TCL_DECLARED
561	561	#define XSetTSOrigin_TCL_DECLARED
562	562	/* 90 */
563		EXTERN void XSetTSOrigin (Display * display, GC gc,
	563	EXTERN void XSetTSOrigin (Display * display, GC gc,
564	564	int ts_x_origin, int ts_y_origin);
565	565	#endif
566	566	#ifndef XChangeGC_TCL_DECLARED
567	567	#define XChangeGC_TCL_DECLARED
568	568	/* 91 */
569		EXTERN void XChangeGC (Display * d, GC gc, unsigned long mask,
	569	EXTERN void XChangeGC (Display * d, GC gc, unsigned long mask,
570	570	XGCValues * values);
571	571	#endif
572	572	#ifndef XSetFont_TCL_DECLARED

582	582	#ifndef XSetStipple_TCL_DECLARED
583	583	#define XSetStipple_TCL_DECLARED
584	584	/* 94 */
585		EXTERN void XSetStipple (Display * display, GC gc,
	585	EXTERN void XSetStipple (Display * display, GC gc,
586	586	Pixmap stipple);
587	587	#endif
588	588	#ifndef XSetFillRule_TCL_DECLARED
589	589	#define XSetFillRule_TCL_DECLARED
590	590	/* 95 */
591		EXTERN void XSetFillRule (Display * display, GC gc,
	591	EXTERN void XSetFillRule (Display * display, GC gc,
592	592	int fill_rule);
593	593	#endif
594	594	#ifndef XSetFillStyle_TCL_DECLARED
595	595	#define XSetFillStyle_TCL_DECLARED
596	596	/* 96 */
597		EXTERN void XSetFillStyle (Display * display, GC gc,
	597	EXTERN void XSetFillStyle (Display * display, GC gc,
598	598	int fill_style);
599	599	#endif
600	600	#ifndef XSetFunction_TCL_DECLARED

605	605	#ifndef XSetLineAttributes_TCL_DECLARED
606	606	#define XSetLineAttributes_TCL_DECLARED
607	607	/* 98 */
608		EXTERN void XSetLineAttributes (Display * display, GC gc,
609		unsigned int line_width, int line_style,
	608	EXTERN void XSetLineAttributes (Display * display, GC gc,
	609	unsigned int line_width, int line_style,
610	610	int cap_style, int join_style);
611	611	#endif
612	612	#ifndef _XInitImageFuncPtrs_TCL_DECLARED

622	622	#ifndef XGetVisualInfo_TCL_DECLARED
623	623	#define XGetVisualInfo_TCL_DECLARED
624	624	/* 101 */
625		EXTERN XVisualInfo * XGetVisualInfo (Display * display, long vinfo_mask,
626		XVisualInfo * vinfo_template,
	625	EXTERN XVisualInfo * XGetVisualInfo (Display * display, long vinfo_mask,
	626	XVisualInfo * vinfo_template,
627	627	int * nitems_return);
628	628	#endif
629	629	#ifndef XSetWMClientMachine_TCL_DECLARED
630	630	#define XSetWMClientMachine_TCL_DECLARED
631	631	/* 102 */
632		EXTERN void XSetWMClientMachine (Display * display, Window w,
	632	EXTERN void XSetWMClientMachine (Display * display, Window w,
633	633	XTextProperty * text_prop);
634	634	#endif
635	635	#ifndef XStringListToTextProperty_TCL_DECLARED
636	636	#define XStringListToTextProperty_TCL_DECLARED
637	637	/* 103 */
638		EXTERN Status XStringListToTextProperty (char ** list, int count,
	638	EXTERN Status XStringListToTextProperty (char ** list, int count,
639	639	XTextProperty * text_prop_return);
640	640	#endif
641	641	#ifndef XDrawLine_TCL_DECLARED
642	642	#define XDrawLine_TCL_DECLARED
643	643	/* 104 */
644		EXTERN void XDrawLine (Display * d, Drawable dr, GC g, int x1,
	644	EXTERN void XDrawLine (Display * d, Drawable dr, GC g, int x1,
645	645	int y1, int x2, int y2);
646	646	#endif
647	647	#ifndef XWarpPointer_TCL_DECLARED
648	648	#define XWarpPointer_TCL_DECLARED
649	649	/* 105 */
650		EXTERN void XWarpPointer (Display * d, Window s, Window dw,
651		int sx, int sy, unsigned int sw,
	650	EXTERN void XWarpPointer (Display * d, Window s, Window dw,
	651	int sx, int sy, unsigned int sw,
652	652	unsigned int sh, int dx, int dy);
653	653	#endif
654	654	#ifndef XFillRectangle_TCL_DECLARED
655	655	#define XFillRectangle_TCL_DECLARED
656	656	/* 106 */
657		EXTERN void XFillRectangle (Display * display, Drawable d, GC gc,
658		int x, int y, unsigned int width,
	657	EXTERN void XFillRectangle (Display * display, Drawable d, GC gc,
	658	int x, int y, unsigned int width,
659	659	unsigned int height);
660	660	#endif
661	661	#endif /* WIN */

663	663	#ifndef XSetDashes_TCL_DECLARED
664	664	#define XSetDashes_TCL_DECLARED
665	665	/* 0 */
666		EXTERN void XSetDashes (Display * display, GC gc,
667		int dash_offset, _Xconst char * dash_list,
	666	EXTERN void XSetDashes (Display * display, GC gc,
	667	int dash_offset, _Xconst char * dash_list,
668	668	int n);
669	669	#endif
670	670	#ifndef XGetModifierMapping_TCL_DECLARED

675	675	#ifndef XCreateImage_TCL_DECLARED
676	676	#define XCreateImage_TCL_DECLARED
677	677	/* 2 */
678		EXTERN XImage * XCreateImage (Display * d, Visual * v,
679		unsigned int ui1, int i1, int i2, char * cp,
680		unsigned int ui2, unsigned int ui3, int i3,
	678	EXTERN XImage * XCreateImage (Display * d, Visual * v,
	679	unsigned int ui1, int i1, int i2, char * cp,
	680	unsigned int ui2, unsigned int ui3, int i3,
681	681	int i4);
682	682	#endif
683	683	#ifndef XGetImage_TCL_DECLARED
684	684	#define XGetImage_TCL_DECLARED
685	685	/* 3 */
686		EXTERN XImage * XGetImage (Display * d, Drawable dr, int i1, int i2,
687		unsigned int ui1, unsigned int ui2,
	686	EXTERN XImage * XGetImage (Display * d, Drawable dr, int i1, int i2,
	687	unsigned int ui1, unsigned int ui2,
688	688	unsigned long ul, int i3);
689	689	#endif
690	690	#ifndef XGetAtomName_TCL_DECLARED

700	700	#ifndef XCreateColormap_TCL_DECLARED
701	701	#define XCreateColormap_TCL_DECLARED
702	702	/* 6 */
703		EXTERN Colormap XCreateColormap (Display * d, Window w, Visual * v,
	703	EXTERN Colormap XCreateColormap (Display * d, Window w, Visual * v,
704	704	int i);
705	705	#endif
706	706	#ifndef XGContextFromGC_TCL_DECLARED

741	741	#ifndef XChangeProperty_TCL_DECLARED
742	742	#define XChangeProperty_TCL_DECLARED
743	743	/* 14 */
744		EXTERN void XChangeProperty (Display * d, Window w, Atom a1,
745		Atom a2, int i1, int i2,
	744	EXTERN void XChangeProperty (Display * d, Window w, Atom a1,
	745	Atom a2, int i1, int i2,
746	746	_Xconst unsigned char * c, int i3);
747	747	#endif
748	748	#ifndef XChangeWindowAttributes_TCL_DECLARED
749	749	#define XChangeWindowAttributes_TCL_DECLARED
750	750	/* 15 */
751		EXTERN void XChangeWindowAttributes (Display * d, Window w,
	751	EXTERN void XChangeWindowAttributes (Display * d, Window w,
752	752	unsigned long ul, XSetWindowAttributes * x);
753	753	#endif
754	754	#ifndef XConfigureWindow_TCL_DECLARED
755	755	#define XConfigureWindow_TCL_DECLARED
756	756	/* 16 */
757		EXTERN void XConfigureWindow (Display * d, Window w,
	757	EXTERN void XConfigureWindow (Display * d, Window w,
758	758	unsigned int i, XWindowChanges * x);
759	759	#endif
760	760	#ifndef XCopyArea_TCL_DECLARED
761	761	#define XCopyArea_TCL_DECLARED
762	762	/* 17 */
763		EXTERN void XCopyArea (Display * d, Drawable dr1, Drawable dr2,
764		GC g, int i1, int i2, unsigned int ui1,
	763	EXTERN void XCopyArea (Display * d, Drawable dr1, Drawable dr2,
	764	GC g, int i1, int i2, unsigned int ui1,
765	765	unsigned int ui2, int i3, int i4);
766	766	#endif
767	767	#ifndef XCopyPlane_TCL_DECLARED
768	768	#define XCopyPlane_TCL_DECLARED
769	769	/* 18 */
770		EXTERN void XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
771		GC g, int i1, int i2, unsigned int ui1,
772		unsigned int ui2, int i3, int i4,
	770	EXTERN void XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
	771	GC g, int i1, int i2, unsigned int ui1,
	772	unsigned int ui2, int i3, int i4,
773	773	unsigned long ul);
774	774	#endif
775	775	#ifndef XCreateBitmapFromData_TCL_DECLARED
776	776	#define XCreateBitmapFromData_TCL_DECLARED
777	777	/* 19 */
778		EXTERN Pixmap XCreateBitmapFromData (Display * display, Drawable d,
779		_Xconst char * data, unsigned int width,
	778	EXTERN Pixmap XCreateBitmapFromData (Display * display, Drawable d,
	779	_Xconst char * data, unsigned int width,
780	780	unsigned int height);
781	781	#endif
782	782	#ifndef XDefineCursor_TCL_DECLARED

792	792	#ifndef XDrawArc_TCL_DECLARED
793	793	#define XDrawArc_TCL_DECLARED
794	794	/* 22 */
795		EXTERN void XDrawArc (Display * d, Drawable dr, GC g, int i1,
796		int i2, unsigned int ui1, unsigned int ui2,
	795	EXTERN void XDrawArc (Display * d, Drawable dr, GC g, int i1,
	796	int i2, unsigned int ui1, unsigned int ui2,
797	797	int i3, int i4);
798	798	#endif
799	799	#ifndef XDrawLines_TCL_DECLARED
800	800	#define XDrawLines_TCL_DECLARED
801	801	/* 23 */
802		EXTERN void XDrawLines (Display * d, Drawable dr, GC g,
	802	EXTERN void XDrawLines (Display * d, Drawable dr, GC g,
803	803	XPoint * x, int i1, int i2);
804	804	#endif
805	805	#ifndef XDrawRectangle_TCL_DECLARED
806	806	#define XDrawRectangle_TCL_DECLARED
807	807	/* 24 */
808		EXTERN void XDrawRectangle (Display * d, Drawable dr, GC g,
809		int i1, int i2, unsigned int ui1,
	808	EXTERN void XDrawRectangle (Display * d, Drawable dr, GC g,
	809	int i1, int i2, unsigned int ui1,
810	810	unsigned int ui2);
811	811	#endif
812	812	#ifndef XFillArc_TCL_DECLARED
813	813	#define XFillArc_TCL_DECLARED
814	814	/* 25 */
815		EXTERN void XFillArc (Display * d, Drawable dr, GC g, int i1,
816		int i2, unsigned int ui1, unsigned int ui2,
	815	EXTERN void XFillArc (Display * d, Drawable dr, GC g, int i1,
	816	int i2, unsigned int ui1, unsigned int ui2,
817	817	int i3, int i4);
818	818	#endif
819	819	#ifndef XFillPolygon_TCL_DECLARED
820	820	#define XFillPolygon_TCL_DECLARED
821	821	/* 26 */
822		EXTERN void XFillPolygon (Display * d, Drawable dr, GC g,
	822	EXTERN void XFillPolygon (Display * d, Drawable dr, GC g,
823	823	XPoint * x, int i1, int i2, int i3);
824	824	#endif
825	825	#ifndef XFillRectangles_TCL_DECLARED
826	826	#define XFillRectangles_TCL_DECLARED
827	827	/* 27 */
828		EXTERN void XFillRectangles (Display * d, Drawable dr, GC g,
	828	EXTERN void XFillRectangles (Display * d, Drawable dr, GC g,
829	829	XRectangle * x, int i);
830	830	#endif
831	831	#ifndef XFreeColormap_TCL_DECLARED

836	836	#ifndef XFreeColors_TCL_DECLARED
837	837	#define XFreeColors_TCL_DECLARED
838	838	/* 29 */
839		EXTERN void XFreeColors (Display * d, Colormap c,
	839	EXTERN void XFreeColors (Display * d, Colormap c,
840	840	unsigned long * ulp, int i, unsigned long ul);
841	841	#endif
842	842	#ifndef XFreeModifiermap_TCL_DECLARED

847	847	#ifndef XGetGeometry_TCL_DECLARED
848	848	#define XGetGeometry_TCL_DECLARED
849	849	/* 31 */
850		EXTERN Status XGetGeometry (Display * d, Drawable dr, Window * w,
851		int * i1, int * i2, unsigned int * ui1,
852		unsigned int * ui2, unsigned int * ui3,
	850	EXTERN Status XGetGeometry (Display * d, Drawable dr, Window * w,
	851	int * i1, int * i2, unsigned int * ui1,
	852	unsigned int * ui2, unsigned int * ui3,
853	853	unsigned int * ui4);
854	854	#endif
855	855	#ifndef XGetWindowProperty_TCL_DECLARED
856	856	#define XGetWindowProperty_TCL_DECLARED
857	857	/* 32 */
858		EXTERN int XGetWindowProperty (Display * d, Window w, Atom a1,
859		long l1, long l2, Bool b, Atom a2, Atom * ap,
860		int * ip, unsigned long * ulp1,
	858	EXTERN int XGetWindowProperty (Display * d, Window w, Atom a1,
	859	long l1, long l2, Bool b, Atom a2, Atom * ap,
	860	int * ip, unsigned long * ulp1,
861	861	unsigned long * ulp2, unsigned char ** cpp);
862	862	#endif
863	863	#ifndef XGrabKeyboard_TCL_DECLARED
864	864	#define XGrabKeyboard_TCL_DECLARED
865	865	/* 33 */
866		EXTERN int XGrabKeyboard (Display * d, Window w, Bool b, int i1,
	866	EXTERN int XGrabKeyboard (Display * d, Window w, Bool b, int i1,
867	867	int i2, Time t);
868	868	#endif
869	869	#ifndef XGrabPointer_TCL_DECLARED
870	870	#define XGrabPointer_TCL_DECLARED
871	871	/* 34 */
872		EXTERN int XGrabPointer (Display * d, Window w1, Bool b,
873		unsigned int ui, int i1, int i2, Window w2,
	872	EXTERN int XGrabPointer (Display * d, Window w1, Bool b,
	873	unsigned int ui, int i1, int i2, Window w2,
874	874	Cursor c, Time t);
875	875	#endif
876	876	#ifndef XKeysymToKeycode_TCL_DECLARED

886	886	#ifndef XMoveResizeWindow_TCL_DECLARED
887	887	#define XMoveResizeWindow_TCL_DECLARED
888	888	/* 37 */
889		EXTERN void XMoveResizeWindow (Display * d, Window w, int i1,
	889	EXTERN void XMoveResizeWindow (Display * d, Window w, int i1,
890	890	int i2, unsigned int ui1, unsigned int ui2);
891	891	#endif
892	892	#ifndef XMoveWindow_TCL_DECLARED

897	897	#ifndef XQueryPointer_TCL_DECLARED
898	898	#define XQueryPointer_TCL_DECLARED
899	899	/* 39 */
900		EXTERN Bool XQueryPointer (Display * d, Window w1, Window * w2,
901		Window * w3, int * i1, int * i2, int * i3,
	900	EXTERN Bool XQueryPointer (Display * d, Window w1, Window * w2,
	901	Window * w3, int * i1, int * i2, int * i3,
902	902	int * i4, unsigned int * ui);
903	903	#endif
904	904	#ifndef XRaiseWindow_TCL_DECLARED

914	914	#ifndef XResizeWindow_TCL_DECLARED
915	915	#define XResizeWindow_TCL_DECLARED
916	916	/* 42 */
917		EXTERN void XResizeWindow (Display * d, Window w,
	917	EXTERN void XResizeWindow (Display * d, Window w,
918	918	unsigned int ui1, unsigned int ui2);
919	919	#endif
920	920	#ifndef XSelectInput_TCL_DECLARED

925	925	#ifndef XSendEvent_TCL_DECLARED
926	926	#define XSendEvent_TCL_DECLARED
927	927	/* 44 */
928		EXTERN Status XSendEvent (Display * d, Window w, Bool b, long l,
	928	EXTERN Status XSendEvent (Display * d, Window w, Bool b, long l,
929	929	XEvent * x);
930	930	#endif
931	931	#ifndef XSetIconName_TCL_DECLARED
932	932	#define XSetIconName_TCL_DECLARED
933	933	/* 45 */
934		EXTERN void XSetIconName (Display * d, Window w,
	934	EXTERN void XSetIconName (Display * d, Window w,
935	935	_Xconst char * c);
936	936	#endif
937	937	#ifndef XSetInputFocus_TCL_DECLARED

942	942	#ifndef XSetSelectionOwner_TCL_DECLARED
943	943	#define XSetSelectionOwner_TCL_DECLARED
944	944	/* 47 */
945		EXTERN void XSetSelectionOwner (Display * d, Atom a, Window w,
	945	EXTERN void XSetSelectionOwner (Display * d, Atom a, Window w,
946	946	Time t);
947	947	#endif
948	948	#ifndef XSetWindowBackground_TCL_DECLARED
949	949	#define XSetWindowBackground_TCL_DECLARED
950	950	/* 48 */
951		EXTERN void XSetWindowBackground (Display * d, Window w,
	951	EXTERN void XSetWindowBackground (Display * d, Window w,
952	952	unsigned long ul);
953	953	#endif
954	954	#ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
955	955	#define XSetWindowBackgroundPixmap_TCL_DECLARED
956	956	/* 49 */
957		EXTERN void XSetWindowBackgroundPixmap (Display * d, Window w,
	957	EXTERN void XSetWindowBackgroundPixmap (Display * d, Window w,
958	958	Pixmap p);
959	959	#endif
960	960	#ifndef XSetWindowBorder_TCL_DECLARED
961	961	#define XSetWindowBorder_TCL_DECLARED
962	962	/* 50 */
963		EXTERN void XSetWindowBorder (Display * d, Window w,
	963	EXTERN void XSetWindowBorder (Display * d, Window w,
964	964	unsigned long ul);
965	965	#endif
966	966	#ifndef XSetWindowBorderPixmap_TCL_DECLARED
967	967	#define XSetWindowBorderPixmap_TCL_DECLARED
968	968	/* 51 */
969		EXTERN void XSetWindowBorderPixmap (Display * d, Window w,
	969	EXTERN void XSetWindowBorderPixmap (Display * d, Window w,
970	970	Pixmap p);
971	971	#endif
972	972	#ifndef XSetWindowBorderWidth_TCL_DECLARED
973	973	#define XSetWindowBorderWidth_TCL_DECLARED
974	974	/* 52 */
975		EXTERN void XSetWindowBorderWidth (Display * d, Window w,
	975	EXTERN void XSetWindowBorderWidth (Display * d, Window w,
976	976	unsigned int ui);
977	977	#endif
978	978	#ifndef XSetWindowColormap_TCL_DECLARED
979	979	#define XSetWindowColormap_TCL_DECLARED
980	980	/* 53 */
981		EXTERN void XSetWindowColormap (Display * d, Window w,
	981	EXTERN void XSetWindowColormap (Display * d, Window w,
982	982	Colormap c);
983	983	#endif
984	984	#ifndef XUngrabKeyboard_TCL_DECLARED

999	999	#ifndef TkPutImage_TCL_DECLARED
1000	1000	#define TkPutImage_TCL_DECLARED
1001	1001	/* 57 */
1002		EXTERN void TkPutImage (unsigned long * colors, int ncolors,
1003		Display * display, Drawable d, GC gc,
1004		XImage * image, int src_x, int src_y,
1005		int dest_x, int dest_y, unsigned int width,
	1002	EXTERN void TkPutImage (unsigned long * colors, int ncolors,
	1003	Display * display, Drawable d, GC gc,
	1004	XImage * image, int src_x, int src_y,
	1005	int dest_x, int dest_y, unsigned int width,
1006	1006	unsigned int height);
1007	1007	#endif
1008	1008	#ifndef XParseColor_TCL_DECLARED
1009	1009	#define XParseColor_TCL_DECLARED
1010	1010	/* 58 */
1011		EXTERN Status XParseColor (Display * display, Colormap map,
	1011	EXTERN Status XParseColor (Display * display, Colormap map,
1012	1012	_Xconst char * spec, XColor * colorPtr);
1013	1013	#endif
1014	1014	#ifndef XCreateGC_TCL_DECLARED
1015	1015	#define XCreateGC_TCL_DECLARED
1016	1016	/* 59 */
1017		EXTERN GC XCreateGC (Display * display, Drawable d,
	1017	EXTERN GC XCreateGC (Display * display, Drawable d,
1018	1018	unsigned long valuemask, XGCValues * values);
1019	1019	#endif
1020	1020	#ifndef XFreeGC_TCL_DECLARED

1025	1025	#ifndef XInternAtom_TCL_DECLARED
1026	1026	#define XInternAtom_TCL_DECLARED
1027	1027	/* 61 */
1028		EXTERN Atom XInternAtom (Display * display,
1029		_Xconst char * atom_name,
	1028	EXTERN Atom XInternAtom (Display * display,
	1029	_Xconst char * atom_name,
1030	1030	Bool only_if_exists);
1031	1031	#endif
1032	1032	#ifndef XSetBackground_TCL_DECLARED
1033	1033	#define XSetBackground_TCL_DECLARED
1034	1034	/* 62 */
1035		EXTERN void XSetBackground (Display * display, GC gc,
	1035	EXTERN void XSetBackground (Display * display, GC gc,
1036	1036	unsigned long foreground);
1037	1037	#endif
1038	1038	#ifndef XSetForeground_TCL_DECLARED
1039	1039	#define XSetForeground_TCL_DECLARED
1040	1040	/* 63 */
1041		EXTERN void XSetForeground (Display * display, GC gc,
	1041	EXTERN void XSetForeground (Display * display, GC gc,
1042	1042	unsigned long foreground);
1043	1043	#endif
1044	1044	#ifndef XSetClipMask_TCL_DECLARED
1045	1045	#define XSetClipMask_TCL_DECLARED
1046	1046	/* 64 */
1047		EXTERN void XSetClipMask (Display * display, GC gc,
	1047	EXTERN void XSetClipMask (Display * display, GC gc,
1048	1048	Pixmap pixmap);
1049	1049	#endif
1050	1050	#ifndef XSetClipOrigin_TCL_DECLARED
1051	1051	#define XSetClipOrigin_TCL_DECLARED
1052	1052	/* 65 */
1053		EXTERN void XSetClipOrigin (Display * display, GC gc,
	1053	EXTERN void XSetClipOrigin (Display * display, GC gc,
1054	1054	int clip_x_origin, int clip_y_origin);
1055	1055	#endif
1056	1056	#ifndef XSetTSOrigin_TCL_DECLARED
1057	1057	#define XSetTSOrigin_TCL_DECLARED
1058	1058	/* 66 */
1059		EXTERN void XSetTSOrigin (Display * display, GC gc,
	1059	EXTERN void XSetTSOrigin (Display * display, GC gc,
1060	1060	int ts_x_origin, int ts_y_origin);
1061	1061	#endif
1062	1062	#ifndef XChangeGC_TCL_DECLARED
1063	1063	#define XChangeGC_TCL_DECLARED
1064	1064	/* 67 */
1065		EXTERN void XChangeGC (Display * d, GC gc, unsigned long mask,
	1065	EXTERN void XChangeGC (Display * d, GC gc, unsigned long mask,
1066	1066	XGCValues * values);
1067	1067	#endif
1068	1068	#ifndef XSetFont_TCL_DECLARED

1078	1078	#ifndef XSetStipple_TCL_DECLARED
1079	1079	#define XSetStipple_TCL_DECLARED
1080	1080	/* 70 */
1081		EXTERN void XSetStipple (Display * display, GC gc,
	1081	EXTERN void XSetStipple (Display * display, GC gc,
1082	1082	Pixmap stipple);
1083	1083	#endif
1084	1084	#ifndef XSetFillRule_TCL_DECLARED
1085	1085	#define XSetFillRule_TCL_DECLARED
1086	1086	/* 71 */
1087		EXTERN void XSetFillRule (Display * display, GC gc,
	1087	EXTERN void XSetFillRule (Display * display, GC gc,
1088	1088	int fill_rule);
1089	1089	#endif
1090	1090	#ifndef XSetFillStyle_TCL_DECLARED
1091	1091	#define XSetFillStyle_TCL_DECLARED
1092	1092	/* 72 */
1093		EXTERN void XSetFillStyle (Display * display, GC gc,
	1093	EXTERN void XSetFillStyle (Display * display, GC gc,
1094	1094	int fill_style);
1095	1095	#endif
1096	1096	#ifndef XSetFunction_TCL_DECLARED

1101	1101	#ifndef XSetLineAttributes_TCL_DECLARED
1102	1102	#define XSetLineAttributes_TCL_DECLARED
1103	1103	/* 74 */
1104		EXTERN void XSetLineAttributes (Display * display, GC gc,
1105		unsigned int line_width, int line_style,
	1104	EXTERN void XSetLineAttributes (Display * display, GC gc,
	1105	unsigned int line_width, int line_style,
1106	1106	int cap_style, int join_style);
1107	1107	#endif
1108	1108	#ifndef _XInitImageFuncPtrs_TCL_DECLARED

1118	1118	#ifndef XGetVisualInfo_TCL_DECLARED
1119	1119	#define XGetVisualInfo_TCL_DECLARED
1120	1120	/* 77 */
1121		EXTERN XVisualInfo * XGetVisualInfo (Display * display, long vinfo_mask,
1122		XVisualInfo * vinfo_template,
	1121	EXTERN XVisualInfo * XGetVisualInfo (Display * display, long vinfo_mask,
	1122	XVisualInfo * vinfo_template,
1123	1123	int * nitems_return);
1124	1124	#endif
1125	1125	#ifndef XSetWMClientMachine_TCL_DECLARED
1126	1126	#define XSetWMClientMachine_TCL_DECLARED
1127	1127	/* 78 */
1128		EXTERN void XSetWMClientMachine (Display * display, Window w,
	1128	EXTERN void XSetWMClientMachine (Display * display, Window w,
1129	1129	XTextProperty * text_prop);
1130	1130	#endif
1131	1131	#ifndef XStringListToTextProperty_TCL_DECLARED
1132	1132	#define XStringListToTextProperty_TCL_DECLARED
1133	1133	/* 79 */
1134		EXTERN Status XStringListToTextProperty (char ** list, int count,
	1134	EXTERN Status XStringListToTextProperty (char ** list, int count,
1135	1135	XTextProperty * text_prop_return);
1136	1136	#endif
1137	1137	#ifndef XDrawSegments_TCL_DECLARED
1138	1138	#define XDrawSegments_TCL_DECLARED
1139	1139	/* 80 */
1140		EXTERN void XDrawSegments (Display * display, Drawable d, GC gc,
	1140	EXTERN void XDrawSegments (Display * display, Drawable d, GC gc,
1141	1141	XSegment * segments, int nsegments);
1142	1142	#endif
1143	1143	#ifndef XForceScreenSaver_TCL_DECLARED

1148	1148	#ifndef XDrawLine_TCL_DECLARED
1149	1149	#define XDrawLine_TCL_DECLARED
1150	1150	/* 82 */
1151		EXTERN void XDrawLine (Display * d, Drawable dr, GC g, int x1,
	1151	EXTERN void XDrawLine (Display * d, Drawable dr, GC g, int x1,
1152	1152	int y1, int x2, int y2);
1153	1153	#endif
1154	1154	#ifndef XFillRectangle_TCL_DECLARED
1155	1155	#define XFillRectangle_TCL_DECLARED
1156	1156	/* 83 */
1157		EXTERN void XFillRectangle (Display * display, Drawable d, GC gc,
1158		int x, int y, unsigned int width,
	1157	EXTERN void XFillRectangle (Display * display, Drawable d, GC gc,
	1158	int x, int y, unsigned int width,
1159	1159	unsigned int height);
1160	1160	#endif
1161	1161	#ifndef XClearWindow_TCL_DECLARED

1166	1166	#ifndef XDrawPoint_TCL_DECLARED
1167	1167	#define XDrawPoint_TCL_DECLARED
1168	1168	/* 85 */
1169		EXTERN void XDrawPoint (Display * display, Drawable d, GC gc,
	1169	EXTERN void XDrawPoint (Display * display, Drawable d, GC gc,
1170	1170	int x, int y);
1171	1171	#endif
1172	1172	#ifndef XDrawPoints_TCL_DECLARED
1173	1173	#define XDrawPoints_TCL_DECLARED
1174	1174	/* 86 */
1175		EXTERN void XDrawPoints (Display * display, Drawable d, GC gc,
	1175	EXTERN void XDrawPoints (Display * display, Drawable d, GC gc,
1176	1176	XPoint * points, int npoints, int mode);
1177	1177	#endif
1178	1178	#ifndef XWarpPointer_TCL_DECLARED
1179	1179	#define XWarpPointer_TCL_DECLARED
1180	1180	/* 87 */
1181		EXTERN void XWarpPointer (Display * display, Window src_w,
1182		Window dest_w, int src_x, int src_y,
1183		unsigned int src_width,
1184		unsigned int src_height, int dest_x,
	1181	EXTERN void XWarpPointer (Display * display, Window src_w,
	1182	Window dest_w, int src_x, int src_y,
	1183	unsigned int src_width,
	1184	unsigned int src_height, int dest_x,
1185	1185	int dest_y);
1186	1186	#endif
1187	1187	#ifndef XQueryColor_TCL_DECLARED
1188	1188	#define XQueryColor_TCL_DECLARED
1189	1189	/* 88 */
1190		EXTERN void XQueryColor (Display * display, Colormap colormap,
	1190	EXTERN void XQueryColor (Display * display, Colormap colormap,
1191	1191	XColor * def_in_out);
1192	1192	#endif
1193	1193	#ifndef XQueryColors_TCL_DECLARED
1194	1194	#define XQueryColors_TCL_DECLARED
1195	1195	/* 89 */
1196		EXTERN void XQueryColors (Display * display, Colormap colormap,
	1196	EXTERN void XQueryColors (Display * display, Colormap colormap,
1197	1197	XColor * defs_in_out, int ncolors);
1198	1198	#endif
1199	1199	#ifndef XQueryTree_TCL_DECLARED
1200	1200	#define XQueryTree_TCL_DECLARED
1201	1201	/* 90 */
1202		EXTERN Status XQueryTree (Display * d, Window w1, Window * w2,
	1202	EXTERN Status XQueryTree (Display * d, Window w1, Window * w2,
1203	1203	Window * w3, Window ** w4, unsigned int * ui);
1204	1204	#endif
1205	1205	#ifndef XSync_TCL_DECLARED

1211	1211
1212	1212	typedef struct TkIntXlibStubs {
1213	1213	int magic;
1214		CONST struct TkIntXlibStubHooks *hooks;
	1214	const struct TkIntXlibStubHooks *hooks;
1215	1215
1216	1216	#ifdef __WIN32__ /* WIN */
1217	1217	void (xSetDashes) (Display display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */

1276	1276	void (xResizeWindow) (Display d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */
1277	1277	void (xSelectInput) (Display d, Window w, long l); /* 60 */
1278	1278	Status (xSendEvent) (Display d, Window w, Bool b, long l, XEvent * x); /* 61 */
1279		void (xSetCommand) (Display d, Window w, CONST char ** c, int i); /* 62 */
	1279	void (xSetCommand) (Display d, Window w, const char ** c, int i); /* 62 */
1280	1280	void (xSetIconName) (Display d, Window w, _Xconst char * c); /* 63 */
1281	1281	void (xSetInputFocus) (Display d, Window w, int i, Time t); /* 64 */
1282	1282	void (xSetSelectionOwner) (Display d, Atom a, Window w, Time t); /* 65 */

1419	1419	} TkIntXlibStubs;
1420	1420
1421	1421	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
1422		extern CONST TkIntXlibStubs *tkIntXlibStubsPtr;
	1422	extern const TkIntXlibStubs *tkIntXlibStubsPtr;
1423	1423	#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
1424	1424
1425	1425	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)

+29

-35

generic/tkListbox.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkListbox.c,v 1.49 2008/10/09 21:21:03 dgp Exp $
	13	* RCS: @(#) $Id: tkListbox.c,v 1.54 2008/12/09 21:22:56 dgp Exp $
14	14	*/
15	15
16	16	#include "default.h"

212	212	STATE_DISABLED, STATE_NORMAL
213	213	};
214	214
215		static char *stateStrings[] = {
	215	static const char *const stateStrings[] = {
216	216	"disabled", "normal", NULL
217	217	};
218	218

220	220	ACTIVE_STYLE_DOTBOX, ACTIVE_STYLE_NONE, ACTIVE_STYLE_UNDERLINE
221	221	};
222	222
223		static char *activeStyleStrings[] = {
	223	static const char *const activeStyleStrings[] = {
224	224	"dotbox", "none", "underline", NULL
225	225	};
226	226

339	339	* dispatch the listbox widget command.
340	340	*/
341	341
342		static const char *commandNames[] = {
	342	static const char *const commandNames[] = {
343	343	"activate", "bbox", "cget", "configure", "curselection", "delete", "get",
344	344	"index", "insert", "itemcget", "itemconfigure", "nearest", "scan",
345	345	"see", "selection", "size", "xview", "yview", NULL

352	352	COMMAND_SIZE, COMMAND_XVIEW, COMMAND_YVIEW
353	353	};
354	354
355		static const char *selCommandNames[] = {
	355	static const char *const selCommandNames[] = {
356	356	"anchor", "clear", "includes", "set", NULL
357	357	};
358	358	enum selcommand {
359	359	SELECTION_ANCHOR, SELECTION_CLEAR, SELECTION_INCLUDES, SELECTION_SET
360	360	};
361	361
362		static const char *scanCommandNames[] = {
	362	static const char *const scanCommandNames[] = {
363	363	"mark", "dragto", NULL
364	364	};
365	365	enum scancommand {
366	366	SCAN_MARK, SCAN_DRAGTO
367	367	};
368	368
369		static const char *indexNames[] = {
	369	static const char *const indexNames[] = {
370	370	"active", "anchor", "end", NULL
371	371	};
372	372	enum indices {

567	567	return TCL_ERROR;
568	568	}
569	569
570		Tcl_SetResult(interp, Tk_PathName(listPtr->tkwin), TCL_STATIC);
	570	Tcl_SetObjResult(interp, TkNewWindowObj(listPtr->tkwin));
571	571	return TCL_OK;
572	572	}
573	573

693	693	if (objPtr == NULL) {
694	694	result = TCL_ERROR;
695	695	break;
696		} else {
697		Tcl_SetObjResult(interp, objPtr);
698		result = TCL_OK;
699	696	}
	697	Tcl_SetObjResult(interp, objPtr);
	698	result = TCL_OK;
700	699	} else {
701	700	result = ConfigureListbox(interp, listPtr, objc-2, objv+2, 0);
702	701	}

1093	1092	*/
1094	1093
1095	1094	if ((listPtr->topIndex <= index) && (index < lastVisibleIndex)) {
1096		char buf[TCL_INTEGER_SPACE * 4];
1097	1095	Tcl_Obj *el;
1098	1096	char *stringRep;
1099	1097	int pixelWidth, stringLen, x, y, result;

1115	1113	x = listPtr->inset + listPtr->selBorderWidth - listPtr->xOffset;
1116	1114	y = ((index - listPtr->topIndex)*listPtr->lineHeight)
1117	1115	+ listPtr->inset + listPtr->selBorderWidth;
1118		sprintf(buf, "%d %d %d %d", x, y, pixelWidth, fm.linespace);
1119		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	1116	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d %d %d",
	1117	x, y, pixelWidth, fm.linespace));
1120	1118	}
1121	1119	return TCL_OK;
1122	1120	}

1239	1237
1240	1238	int index, count, type, windowWidth, windowUnits;
1241	1239	int offset = 0; /* Initialized to stop gcc warnings. */
1242		double fraction, fraction2;
	1240	double fraction;
1243	1241
1244	1242	windowWidth = Tk_Width(listPtr->tkwin)
1245	1243	- 2*(listPtr->inset + listPtr->selBorderWidth);

1247	1245	if (listPtr->maxWidth == 0) {
1248	1246	Tcl_SetResult(interp, "0.0 1.0", TCL_STATIC);
1249	1247	} else {
1250		char buf[TCL_DOUBLE_SPACE];
	1248	double fraction2;
1251	1249
1252	1250	fraction = listPtr->xOffset/((double) listPtr->maxWidth);
1253	1251	fraction2 = (listPtr->xOffset + windowWidth)

1255	1253	if (fraction2 > 1.0) {
1256	1254	fraction2 = 1.0;
1257	1255	}
1258		Tcl_PrintDouble(NULL, fraction, buf);
1259		Tcl_SetResult(interp, buf, TCL_VOLATILE);
1260		Tcl_PrintDouble(NULL, fraction2, buf);
1261		Tcl_AppendResult(interp, " ", buf, NULL);
	1256	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%g %g",
	1257	fraction, fraction2));
1262	1258	}
1263	1259	} else if (objc == 3) {
1264	1260	if (Tcl_GetIntFromObj(interp, objv[2], &index) != TCL_OK) {

1315	1311	Tcl_Obj const objv[]) / Array of arguments to the procedure */
1316	1312	{
1317	1313	int index, count, type;
1318		double fraction, fraction2;
	1314	double fraction;
1319	1315
1320	1316	if (objc == 2) {
1321	1317	if (listPtr->nElements == 0) {
1322	1318	Tcl_SetResult(interp, "0.0 1.0", TCL_STATIC);
1323	1319	} else {
1324		char buf[TCL_DOUBLE_SPACE];
1325
1326		fraction = listPtr->topIndex/((double) listPtr->nElements);
1327		fraction2 = (listPtr->topIndex+listPtr->fullLines)
1328		/((double) listPtr->nElements);
	1320	double fraction2, numEls = (double) listPtr->nElements;
	1321
	1322	fraction = listPtr->topIndex / numEls;
	1323	fraction2 = (listPtr->topIndex+listPtr->fullLines) / numEls;
1329	1324	if (fraction2 > 1.0) {
1330	1325	fraction2 = 1.0;
1331	1326	}
1332		Tcl_PrintDouble(NULL, fraction, buf);
1333		Tcl_SetResult(interp, buf, TCL_VOLATILE);
1334		Tcl_PrintDouble(NULL, fraction2, buf);
1335		Tcl_AppendResult(interp, " ", buf, NULL);
	1327	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%g %g",
	1328	fraction, fraction2));
1336	1329	}
1337	1330	} else if (objc == 3) {
1338	1331	if (GetListboxIndex(interp, listPtr, objv[2], 0, &index) != TCL_OK) {

1342	1335	} else {
1343	1336	type = Tk_GetScrollInfoObj(interp, objc, objv, &fraction, &count);
1344	1337	switch (type) {
1345		case TK_SCROLL_ERROR:
1346		return TCL_ERROR;
1347	1338	case TK_SCROLL_MOVETO:
1348	1339	index = (int) (listPtr->nElements*fraction + 0.5);
1349	1340	break;

1357	1348	case TK_SCROLL_UNITS:
1358	1349	index = listPtr->topIndex + count;
1359	1350	break;
	1351	case TK_SCROLL_ERROR:
	1352	default:
	1353	return TCL_ERROR;
1360	1354	}
1361	1355	ChangeListboxView(listPtr, index);
1362	1356	}

3281	3275	if (result != TCL_OK) {
3282	3276	Tcl_AddErrorInfo(interp,
3283	3277	"\n (vertical scrolling command executed by listbox)");
3284		Tcl_BackgroundError(interp);
	3278	Tcl_BackgroundException(interp, result);
3285	3279	}
3286	3280	Tcl_Release(interp);
3287	3281	}

3346	3340	if (result != TCL_OK) {
3347	3341	Tcl_AddErrorInfo(interp,
3348	3342	"\n (horizontal scrolling command executed by listbox)");
3349		Tcl_BackgroundError(interp);
	3343	Tcl_BackgroundException(interp, result);
3350	3344	}
3351	3345	Tcl_Release(interp);
3352	3346	}

3407	3401	if (Tcl_ListObjLength(listPtr->interp, varListObj, &i) != TCL_OK) {
3408	3402	Tcl_SetVar2Ex(interp, listPtr->listVarName, NULL, oldListObj,
3409	3403	TCL_GLOBAL_ONLY);
3410		return "invalid listvar value";
	3404	return (char *) "invalid listvar value";
3411	3405	}
3412	3406
3413	3407	listPtr->listObj = varListObj;

+2

-3

generic/tkMain.c less more

12	12	* See the file "license.terms" for information on usage and redistribution of
13	13	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
14	14	*
15		* RCS: @(#) $Id: tkMain.c,v 1.30 2008/04/27 22:38:56 dkf Exp $
	15	* RCS: @(#) $Id: tkMain.c,v 1.32 2008/12/15 16:17:18 dgp Exp $
16	16	*/
17	17
18	18	#include <ctype.h>
19	19	#include <stdio.h>
20	20	#include <string.h>
21		#include "tclInt.h"
22	21	#include "tkInt.h"
23	22	#ifdef NO_STDLIB_H
24	23	# include "../compat/stdlib.h"

254	253	* Invoke application-specific initialization.
255	254	*/
256	255
257		if ((*appInitProc)(interp) != TCL_OK) {
	256	if (appInitProc(interp) != TCL_OK) {
258	257	TkpDisplayWarning(Tcl_GetStringResult(interp),
259	258	"Application initialization failed");
260	259	}

+13

-13

generic/tkMenu.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkMenu.c,v 1.44 2008/10/05 18:22:21 dkf Exp $
	14	* RCS: @(#) $Id: tkMenu.c,v 1.48 2008/11/27 23:26:05 nijtmans Exp $
15	15	*/
16	16
17	17	/*

98	98	* to update code in TkpMenuInit that changes the font string entry.
99	99	*/
100	100
101		char *tkMenuStateStrings[] = {"active", "normal", "disabled", NULL};
102
103		static const char *menuEntryTypeStrings[] = {
	101	static const char *const menuStateStrings[] = {"active", "normal", "disabled", NULL};
	102
	103	static const char *const menuEntryTypeStrings[] = {
104	104	"cascade", "checkbutton", "command", "radiobutton", "separator", NULL
105	105	};
106	106

109	109	* is used with the "enum compound" declaration in tkMenu.h
110	110	*/
111	111
112		static char *compoundStrings[] = {
	112	static const char *const compoundStrings[] = {
113	113	"bottom", "center", "left", "none", "right", "top", NULL
114	114	};
115	115

156	156	{TK_OPTION_STRING_TABLE, "-state", NULL, NULL,
157	157	DEF_MENU_ENTRY_STATE,
158	158	-1, Tk_Offset(TkMenuEntry, state), 0,
159		(ClientData) tkMenuStateStrings},
	159	(ClientData) menuStateStrings},
160	160	{TK_OPTION_INT, "-underline", NULL, NULL,
161	161	DEF_MENU_ENTRY_UNDERLINE, -1, Tk_Offset(TkMenuEntry, underline)},
162	162	{TK_OPTION_END}

226	226	Tk_Offset(TkMenuEntry, borderPtr), -1, TK_OPTION_NULL_OK},
227	227	{TK_OPTION_STRING_TABLE, "-state", NULL, NULL,
228	228	DEF_MENU_ENTRY_STATE, -1, Tk_Offset(TkMenuEntry, state), 0,
229		(ClientData) tkMenuStateStrings},
	229	(ClientData) menuStateStrings},
230	230	{TK_OPTION_END}
231	231	};
232	232

240	240	* Menu type strings for use with Tcl_GetIndexFromObj.
241	241	*/
242	242
243		static const char *menuTypeStrings[] = {
	243	static const char *const menuTypeStrings[] = {
244	244	"normal", "tearoff", "menubar", NULL
245	245	};
246	246

309	309	* with MenuWidgetObjCmd.
310	310	*/
311	311
312		static const char *menuOptions[] = {
	312	static const char *const menuOptions[] = {
313	313	"activate", "add", "cget", "clone", "configure", "delete", "entrycget",
314	314	"entryconfigure", "index", "insert", "invoke", "post", "postcascade",
315	315	"type", "unpost", "xposition", "yposition", NULL

454	454	TkMenuReferences *menuRefPtr;
455	455	int i, index, toplevel;
456	456	char *windowName;
457		static const char *typeStringList[] = {"-type", NULL};
	457	static const char *const typeStringList[] = {"-type", NULL};
458	458	TkMenuOptionTables *optionTablesPtr = clientData;
459	459
460	460	if (objc < 2) {

632	632	}
633	633	}
634	634
635		Tcl_SetResult(interp, Tk_PathName(menuPtr->tkwin), TCL_STATIC);
	635	Tcl_SetObjResult(interp, TkNewWindowObj(menuPtr->tkwin));
636	636	return TCL_OK;
637	637	}
638	638

2153	2153	*indexPtr = i;
2154	2154	goto success;
2155	2155	}
2156		Tcl_SetResult(interp, NULL, TCL_STATIC);
	2156	Tcl_ResetResult(interp);
2157	2157	}
2158	2158
2159	2159	for (i = 0; i < menuPtr->numEntries; i++) {

2955	2955	return TCL_OK;
2956	2956
2957	2957	error:
2958		Tcl_SetResult(interp, NULL, TCL_STATIC);
	2958	Tcl_ResetResult(interp);
2959	2959	return TCL_ERROR;
2960	2960	}
2961	2961

+1

-3

generic/tkMenu.h less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkMenu.h,v 1.14 2007/12/13 15:24:16 dgp Exp $
	11	* RCS: @(#) $Id: tkMenu.h,v 1.15 2008/10/17 23:18:37 nijtmans Exp $
12	12	*/
13	13
14	14	#ifndef _TKMENU

239	239	/*
240	240	* Menu states
241	241	*/
242
243		MODULE_SCOPE char *tkMenuStateStrings[];
244	242
245	243	#define ENTRY_ACTIVE 0
246	244	#define ENTRY_NORMAL 1

+9

-11

generic/tkMenubutton.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkMenubutton.c,v 1.22 2008/10/05 18:22:21 dkf Exp $
	12	* RCS: @(#) $Id: tkMenubutton.c,v 1.24 2008/11/08 22:52:29 dkf Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

21	21	* is used together with the "enum direction" declaration in tkMenubutton.h.
22	22	*/
23	23
24		static char *directionStrings[] = {
	24	static const char *const directionStrings[] = {
25	25	"above", "below", "flush", "left", "right", NULL
26	26	};
27	27

30	30	* used together with the "enum state" declaration in tkMenubutton.h.
31	31	*/
32	32
33		static char *stateStrings[] = {
	33	static const char *const stateStrings[] = {
34	34	"active", "disabled", "normal", NULL
35	35	};
36	36

39	39	* is used with the "enum compound" declaration in tkMenuButton.h
40	40	*/
41	41
42		static char *compoundStrings[] = {
	42	static const char *const compoundStrings[] = {
43	43	"bottom", "center", "left", "none", "right", "top", NULL
44	44	};
45	45

152	152	* dispatch the scale widget command.
153	153	*/
154	154
155		static const char *commandNames[] = {
	155	static const char *const commandNames[] = {
156	156	"cget", "configure", NULL
157	157	};
158	158

307	307	return TCL_ERROR;
308	308	}
309	309
310		Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(mbPtr->tkwin), -1));
	310	Tcl_SetObjResult(interp, TkNewWindowObj(mbPtr->tkwin));
311	311	return TCL_OK;
312	312	}
313	313

362	362	mbPtr->optionTable, objv[2], mbPtr->tkwin);
363	363	if (objPtr == NULL) {
364	364	goto error;
365		} else {
366		Tcl_SetObjResult(interp, objPtr);
367		}
	365	}
	366	Tcl_SetObjResult(interp, objPtr);
368	367	break;
369	368
370	369	case COMMAND_CONFIGURE:

374	373	mbPtr->tkwin);
375	374	if (objPtr == NULL) {
376	375	goto error;
377		} else {
378		Tcl_SetObjResult(interp, objPtr);
379	376	}
	377	Tcl_SetObjResult(interp, objPtr);
380	378	} else {
381	379	result = ConfigureMenuButton(interp, mbPtr, objc-2, objv+2);
382	380	}

+2

-2

generic/tkMessage.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkMessage.c,v 1.21 2008/07/23 23:24:23 nijtmans Exp $
	14	* RCS: @(#) $Id: tkMessage.c,v 1.22 2008/10/17 23:18:37 nijtmans Exp $
15	15	*/
16	16
17	17	#include "default.h"

306	306	Tcl_Obj const objv[]) / Argument strings. */
307	307	{
308	308	register Message *msgPtr = clientData;
309		static const char *optionStrings[] = { "cget", "configure", NULL };
	309	static const char *const optionStrings[] = { "cget", "configure", NULL };
310	310	enum options { MESSAGE_CGET, MESSAGE_CONFIGURE };
311	311	int index;
312	312	int result = TCL_OK;

+184

-57

generic/tkObj.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkObj.c,v 1.20 2008/04/27 22:38:56 dkf Exp $
	10	* RCS: @(#) $Id: tkObj.c,v 1.25 2008/11/29 00:12:58 ferrieux Exp $
11	11	*/
12	12
13	13	#include "tkInt.h"

35	35
36	36	#define SET_COMPLEXPIXEL(objPtr, repPtr) \
37	37	(objPtr)->internalRep.twoPtrValue.ptr1 = 0; \
38		(objPtr)->internalRep.twoPtrValue.ptr2 = (void *) repPtr
	38	(objPtr)->internalRep.twoPtrValue.ptr2 = repPtr
39	39
40	40	#define GET_COMPLEXPIXEL(objPtr) \
41	41	((PixelRep *) (objPtr)->internalRep.twoPtrValue.ptr2)

86	86	* initial display-independant settings.
87	87	*/
88	88
89		static Tcl_ObjType pixelObjType = {
	89	static const Tcl_ObjType pixelObjType = {
90	90	"pixel", /* name */
91	91	FreePixelInternalRep, /* freeIntRepProc */
92	92	DupPixelInternalRep, /* dupIntRepProc */

100	100	* initial display-independant settings.
101	101	*/
102	102
103		static Tcl_ObjType mmObjType = {
	103	static const Tcl_ObjType mmObjType = {
104	104	"mm", /* name */
105	105	FreeMMInternalRep, /* freeIntRepProc */
106	106	DupMMInternalRep, /* dupIntRepProc */

113	113	* Tcl object.
114	114	*/
115	115
116		static Tcl_ObjType windowObjType = {
	116	static const Tcl_ObjType windowObjType = {
117	117	"window", /* name */
118	118	FreeWindowInternalRep, /* freeIntRepProc */
119	119	DupWindowInternalRep, /* dupIntRepProc */

124	124	/*
125	125	*----------------------------------------------------------------------
126	126	*
127		* Tk_GetPixelsFromObj --
	127	* GetPixelsFromObjEx --
128	128	*
129	129	* Attempt to return a pixel value from the Tcl object "objPtr". If the
130	130	* object is not already a pixel value, an attempt will be made to

142	142	*----------------------------------------------------------------------
143	143	*/
144	144
	145	static
145	146	int
146		Tk_GetPixelsFromObj(
	147	GetPixelsFromObjEx(
147	148	Tcl_Interp interp, / Used for error reporting if not NULL. */
148	149	Tk_Window tkwin,
149	150	Tcl_Obj objPtr, / The object from which to get pixels. */
150		int intPtr) / Place to store resulting pixels. */
151		{
152		int result;
	151	int *intPtr,
	152	double dblPtr) / Places to store resulting pixels. */
	153	{
	154	int result,fresh;
153	155	double d;
154	156	PixelRep *pixelPtr;
155	157	static double bias[] = {
156	158	1.0, 10.0, 25.4, 0.35278 /25.4 / 72.0/
157	159	};
158	160
	161	retry:
159	162	if (objPtr->typePtr != &pixelObjType) {
160	163	result = SetPixelFromAny(interp, objPtr);
161	164	if (result != TCL_OK) {
162	165	return result;
163	166	}
	167	fresh=1;
	168	} else {
	169	fresh=0;
164	170	}
165	171
166	172	if (SIMPLE_PIXELREP(objPtr)) {
167	173	*intPtr = GET_SIMPLEPIXEL(objPtr);
	174	if (dblPtr) {
	175	dblPtr=(double)(intPtr);
	176	}
168	177	} else {
169	178	pixelPtr = GET_COMPLEXPIXEL(objPtr);
170		if (pixelPtr->tkwin != tkwin) {
	179	if ((!fresh) && (pixelPtr->tkwin != tkwin))
	180	{
	181	/* in case of exo-screen conversions of non-pixels
	182	* we force a recomputation from the string
	183	*/
	184
	185	FreePixelInternalRep(objPtr);
	186	goto retry;
	187	}
	188	if ((pixelPtr->tkwin != tkwin)\|\|dblPtr) {
171	189	d = pixelPtr->value;
172	190	if (pixelPtr->units >= 0) {
173	191	d = bias[pixelPtr->units] WidthOfScreen(Tk_Screen(tkwin));

179	197	pixelPtr->returnValue = (int) (d + 0.5);
180	198	}
181	199	pixelPtr->tkwin = tkwin;
	200	if (dblPtr) {
	201	*dblPtr=(double)d;
	202	}
182	203	}
183	204	*intPtr = pixelPtr->returnValue;
184	205	}
	206	return TCL_OK;
	207	}
	208
	209	/*
	210	*----------------------------------------------------------------------
	211	*
	212	* Tk_GetPixelsFromObj --
	213	*
	214	* Attempt to return a pixel value from the Tcl object "objPtr". If the
	215	* object is not already a pixel value, an attempt will be made to
	216	* convert it to one.
	217	*
	218	* Results:
	219	* The return value is a standard Tcl object result. If an error occurs
	220	* during conversion, an error message is left in the interpreter's
	221	* result unless "interp" is NULL.
	222	*
	223	* Side effects:
	224	* If the object is not already a pixel, the conversion will free any old
	225	* internal representation.
	226	*
	227	*----------------------------------------------------------------------
	228	*/
	229
	230	int
	231	Tk_GetPixelsFromObj(
	232	Tcl_Interp interp, / Used for error reporting if not NULL. */
	233	Tk_Window tkwin,
	234	Tcl_Obj objPtr, / The object from which to get pixels. */
	235	int intPtr) / Place to store resulting pixels. */
	236	{
	237	return GetPixelsFromObjEx(interp,tkwin,objPtr,intPtr,NULL);
	238	}
	239
	240	/*
	241	*----------------------------------------------------------------------
	242	*
	243	* Tk_GetDoublePixelsFromObj --
	244	*
	245	* Attempt to return a double pixel value from the Tcl object
	246	* "objPtr". If the object is not already a pixel value, an attempt will
	247	* be made to convert it to one, the internal unit being pixels.
	248	*
	249	* Results:
	250	* The return value is a standard Tcl object result. If an error occurs
	251	* during conversion, an error message is left in the interpreter's
	252	* result unless "interp" is NULL.
	253	*
	254	* Side effects:
	255	* If the object is not already a pixel, the conversion will free any old
	256	* internal representation.
	257	*
	258	*----------------------------------------------------------------------
	259	*/
	260
	261	int
	262	Tk_GetDoublePixelsFromObj(
	263	Tcl_Interp interp, / Used for error reporting if not NULL. */
	264	Tk_Window tkwin,
	265	Tcl_Obj objPtr, / The object from which to get pixels. */
	266	double doublePtr) / Place to store resulting pixels. */
	267	{
	268	double d;
	269	int result,val;
	270
	271	result=GetPixelsFromObjEx(interp, tkwin, objPtr, &val, &d);
	272	if (result != TCL_OK) {
	273	return result;
	274	}
	275	if (!SIMPLE_PIXELREP(objPtr)) {
	276	PixelRep *pixelPtr;
	277	pixelPtr = GET_COMPLEXPIXEL(objPtr);
	278	if (pixelPtr->units >= 0) {
	279	/* internally "shimmer" to pixel units */
	280	pixelPtr->units=-1;
	281	pixelPtr->value=d;
	282	}
	283	}
	284	*doublePtr = d;
185	285	return TCL_OK;
186	286	}
187	287

322	422
323	423	typePtr = objPtr->typePtr;
324	424	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
325		(*typePtr->freeIntRepProc)(objPtr);
	425	typePtr->freeIntRepProc(objPtr);
326	426	}
327	427
328	428	objPtr->typePtr = &pixelObjType;

343	443
344	444	error:
345	445	if (interp != NULL) {
346		/*
347		* Must copy string before resetting the result in case a caller is
348		* trying to convert the interpreter's result to pixels.
349		*/
350
351		char buf[100];
352
353		sprintf(buf, "bad screen distance \"%.50s\"", string);
354		Tcl_ResetResult(interp);
355		Tcl_AppendResult(interp, buf, NULL);
	446	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
	447	"bad screen distance \"%.50s\"", string));
356	448	}
357	449	return TCL_ERROR;
358	450	}

399	491	}
400	492	}
401	493
402		mmPtr = (MMRep *) objPtr->internalRep.otherValuePtr;
	494	mmPtr = objPtr->internalRep.otherValuePtr;
403	495	if (mmPtr->tkwin != tkwin) {
404	496	d = mmPtr->value;
405	497	if (mmPtr->units == -1) {

438	530	FreeMMInternalRep(
439	531	Tcl_Obj objPtr) / MM object with internal rep to free. */
440	532	{
441		ckfree((char *) objPtr->internalRep.otherValuePtr);
	533	ckfree(objPtr->internalRep.otherValuePtr);
442	534	objPtr->internalRep.otherValuePtr = NULL;
443	535	objPtr->typePtr = NULL;
444	536	}

469	561	MMRep oldPtr, newPtr;
470	562
471	563	copyPtr->typePtr = srcPtr->typePtr;
472		oldPtr = (MMRep *) srcPtr->internalRep.otherValuePtr;
	564	oldPtr = srcPtr->internalRep.otherValuePtr;
473	565	newPtr = (MMRep *) ckalloc(sizeof(MMRep));
474	566	newPtr->value = oldPtr->value;
475	567	newPtr->units = oldPtr->units;
476	568	newPtr->tkwin = oldPtr->tkwin;
477	569	newPtr->returnValue = oldPtr->returnValue;
478		copyPtr->internalRep.otherValuePtr = (void *) newPtr;
	570	copyPtr->internalRep.otherValuePtr = newPtr;
479	571	}
480	572
481	573	/*

505	597	char buffer[TCL_DOUBLE_SPACE];
506	598	register int len;
507	599
508		mmPtr = (MMRep *) objPtr->internalRep.otherValuePtr;
	600	mmPtr = objPtr->internalRep.otherValuePtr;
509	601	/* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */
510	602	if ((mmPtr->units != -1) \|\| (objPtr->bytes != NULL)) {
511	603	Tcl_Panic("UpdateStringOfMM: false precondition");

559	651	*/
560	652
561	653	tclDoubleObjType = Tcl_GetObjType("double");
562		tclIntObjType = Tcl_GetObjType("int");
	654	tclIntObjType = Tcl_GetObjType("int");
563	655	}
564	656
565	657	if (objPtr->typePtr == tclDoubleObjType) {

627	719
628	720	typePtr = objPtr->typePtr;
629	721	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
630		(*typePtr->freeIntRepProc)(objPtr);
631		}
632
633		objPtr->typePtr = &mmObjType;
634
635		mmPtr = (MMRep *) ckalloc(sizeof(MMRep));
636		mmPtr->value = d;
637		mmPtr->units = units;
638		mmPtr->tkwin = NULL;
	722	typePtr->freeIntRepProc(objPtr);
	723	}
	724
	725	objPtr->typePtr = &mmObjType;
	726
	727	mmPtr = (MMRep *) ckalloc(sizeof(MMRep));
	728	mmPtr->value = d;
	729	mmPtr->units = units;
	730	mmPtr->tkwin = NULL;
639	731	mmPtr->returnValue = d;
640	732
641		objPtr->internalRep.otherValuePtr = (void *) mmPtr;
	733	objPtr->internalRep.otherValuePtr = mmPtr;
642	734
643	735	return TCL_OK;
644	736	}

671	763	Tcl_Obj objPtr, / The object from which to get window. */
672	764	Tk_Window windowPtr) / Place to store resulting window. */
673	765	{
674		TkMainInfo mainPtr = ((TkWindow )tkwin)->mainPtr;
	766	TkMainInfo mainPtr = ((TkWindow ) tkwin)->mainPtr;
675	767	register WindowRep *winPtr;
676	768	int result;
677	769

680	772	return result;
681	773	}
682	774
683		winPtr = (WindowRep *) objPtr->internalRep.otherValuePtr;
684		if ( winPtr->tkwin == NULL
685		\|\| winPtr->mainPtr == NULL
686		\|\| winPtr->mainPtr != mainPtr
687		\|\| winPtr->epoch != mainPtr->deletionEpoch)
688		{
689		/* Cache is invalid.
	775	winPtr = objPtr->internalRep.otherValuePtr;
	776	if (winPtr->tkwin == NULL
	777	\|\| winPtr->mainPtr == NULL
	778	\|\| winPtr->mainPtr != mainPtr
	779	\|\| winPtr->epoch != mainPtr->deletionEpoch) {
	780	/*
	781	* Cache is invalid.
690	782	*/
	783
691	784	winPtr->tkwin = Tk_NameToWindow(interp,
692	785	Tcl_GetStringFromObj(objPtr, NULL), tkwin);
	786	if (winPtr->tkwin == NULL) {
	787	/* ASSERT: Tk_NameToWindow has left error message in interp */
	788	return TCL_ERROR;
	789	}
	790
693	791	winPtr->mainPtr = mainPtr;
694	792	winPtr->epoch = mainPtr ? mainPtr->deletionEpoch : 0;
695	793	}
696	794
697	795	*windowPtr = winPtr->tkwin;
698
699		if (winPtr->tkwin == NULL) {
700		/* ASSERT: Tk_NameToWindow has left error message in interp */
701		return TCL_ERROR;
702		}
703	796	return TCL_OK;
704	797	}
705	798

738	831	Tcl_GetStringFromObj(objPtr, NULL);
739	832	typePtr = objPtr->typePtr;
740	833	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
741		(*typePtr->freeIntRepProc)(objPtr);
	834	typePtr->freeIntRepProc(objPtr);
742	835	}
743	836
744	837	winPtr = (WindowRep *) ckalloc(sizeof(WindowRep));

746	839	winPtr->mainPtr = NULL;
747	840	winPtr->epoch = 0;
748	841
749		objPtr->internalRep.otherValuePtr = (void *) winPtr;
	842	objPtr->internalRep.otherValuePtr = winPtr;
750	843	objPtr->typePtr = &windowObjType;
751	844
752	845	return TCL_OK;

782	875	newPtr->tkwin = oldPtr->tkwin;
783	876	newPtr->mainPtr = oldPtr->mainPtr;
784	877	newPtr->epoch = oldPtr->epoch;
785		copyPtr->internalRep.otherValuePtr = (void *) newPtr;
	878	copyPtr->internalRep.otherValuePtr = newPtr;
786	879	copyPtr->typePtr = srcPtr->typePtr;
787	880	}
788	881

808	901	FreeWindowInternalRep(
809	902	Tcl_Obj objPtr) / Window object with internal rep to free. */
810	903	{
811		ckfree((char *) objPtr->internalRep.otherValuePtr);
	904	ckfree(objPtr->internalRep.otherValuePtr);
812	905	objPtr->internalRep.otherValuePtr = NULL;
813	906	objPtr->typePtr = NULL;
814	907	}
815	908
816	909	/*
817		*--------------------------------------------------------------
	910	*----------------------------------------------------------------------
	911	*
	912	* TkNewWindowObj --
	913	*
	914	* This function allocates a new Tcl_Obj that refers to a particular to a
	915	* particular Tk window.
	916	*
	917	* Results:
	918	* A standard Tcl object reference, with refcount 0.
	919	*
	920	* Side effects:
	921	* None.
	922	*
	923	*----------------------------------------------------------------------
	924	*/
	925
	926	Tcl_Obj *
	927	TkNewWindowObj(
	928	Tk_Window tkwin)
	929	{
	930	Tcl_Obj *objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
	931	TkMainInfo mainPtr = ((TkWindow ) tkwin)->mainPtr;
	932	register WindowRep *winPtr;
	933
	934	SetWindowFromAny(NULL, objPtr);
	935
	936	winPtr = objPtr->internalRep.otherValuePtr;
	937	winPtr->tkwin = tkwin;
	938	winPtr->mainPtr = mainPtr;
	939	winPtr->epoch = mainPtr->deletionEpoch;
	940	return objPtr;
	941	}
	942
	943	/*
	944	*----------------------------------------------------------------------
818	945	*
819	946	* TkParsePadAmount --
820	947	*

832	959	* An error message is written to the interpreter if something is not
833	960	* right.
834	961	*
835		*--------------------------------------------------------------
	962	*----------------------------------------------------------------------
836	963	*/
837	964
838	965	int

+12

-14

generic/tkOldConfig.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkOldConfig.c,v 1.24 2008/04/27 22:38:56 dkf Exp $
	13	* RCS: @(#) $Id: tkOldConfig.c,v 1.28 2008/11/27 23:26:05 nijtmans Exp $
14	14	*/
15	15
16	16	#include "tkPort.h"

542	542	break;
543	543	}
544	544	case TK_CONFIG_CUSTOM:
545		if ((*specPtr->customPtr->parseProc)(
546		specPtr->customPtr->clientData, interp, tkwin, value,
547		widgRec, specPtr->offset) != TCL_OK) {
	545	if (specPtr->customPtr->parseProc(specPtr->customPtr->clientData,
	546	interp, tkwin, value, widgRec, specPtr->offset)!=TCL_OK) {
548	547	return TCL_ERROR;
549	548	}
550	549	break;

606	605	register Tk_ConfigSpec *specPtr;
607	606	int needFlags, hateFlags;
608	607	char *list;
609		char *leader = "{";
	608	const char *leader = "{";
610	609
611	610	needFlags = flags & ~(TK_CONFIG_USER_BIT - 1);
612	611	if (Tk_Depth(tkwin) <= 1) {

626	625	* handle that one spec specially.
627	626	*/
628	627
629		Tcl_SetResult(interp, NULL, TCL_STATIC);
	628	Tcl_ResetResult(interp);
630	629	if (argvName != NULL) {
631	630	specPtr = FindConfigSpec(interp, specs, argvName, needFlags,hateFlags);
632	631	if (specPtr == NULL) {
633	632	return TCL_ERROR;
634	633	}
635		Tcl_SetResult(interp,
636		FormatConfigInfo(interp, tkwin, specPtr, widgRec),
637		TCL_DYNAMIC);
	634	list = FormatConfigInfo(interp, tkwin, specPtr, widgRec);
	635	Tcl_SetResult(interp, list, TCL_VOLATILE);
	636	ckfree(list);
638	637	return TCL_OK;
639	638	}
640	639

722	721	if ((freeProc == TCL_DYNAMIC) \|\| (freeProc == (Tcl_FreeProc *) free)) {
723	722	ckfree((char *) argv[4]);
724	723	} else {
725		(freeProc)((char ) argv[4]);
	724	freeProc((char *) argv[4]);
726	725	}
727	726	}
728	727	return result;

871	870	break;
872	871	}
873	872	case TK_CONFIG_CUSTOM:
874		result = (*specPtr->customPtr->printProc)(
875		specPtr->customPtr->clientData, tkwin, widgRec,
876		specPtr->offset, freeProcPtr);
	873	result = specPtr->customPtr->printProc(specPtr->customPtr->clientData,
	874	tkwin, widgRec, specPtr->offset, freeProcPtr);
877	875	break;
878	876	default:
879	877	result = "?? unknown type ??";

944	942	if ((freeProc == TCL_DYNAMIC) \|\| (freeProc == (Tcl_FreeProc *) free)) {
945	943	ckfree((char *) result);
946	944	} else {
947		(freeProc)((char ) result);
	945	freeProc((char *) result);
948	946	}
949	947	}
950	948	return TCL_OK;

+2

-2

generic/tkOldTest.c less more

13	13	* See the file "license.terms" for information on usage and redistribution of
14	14	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
15	15	*
16		* RCS: @(#) $Id: tkOldTest.c,v 1.3 2008/07/23 23:24:21 nijtmans Exp $
	16	* RCS: @(#) $Id: tkOldTest.c,v 1.4 2008/11/03 22:20:22 nijtmans Exp $
17	17	*/
18	18
19	19	#define USE_OLD_IMAGE

143	143	* will be returned in later callbacks. */
144	144	{
145	145	TImageMaster *timPtr;
146		char *varName;
	146	const char *varName;
147	147	int i;
148	148
149	149	varName = "log";

+4

-4

generic/tkOption.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkOption.c,v 1.26 2008/08/21 09:43:53 dkf Exp $
	13	* RCS: @(#) $Id: tkOption.c,v 1.28 2008/10/30 23:18:59 nijtmans Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

224	224	static void OptionInit(TkMainInfo *mainPtr);
225	225	static int ParsePriority(Tcl_Interp interp, char string);
226	226	static int ReadOptionFile(Tcl_Interp *interp, Tk_Window tkwin,
227		char *fileName, int priority);
	227	const char *fileName, int priority);
228	228	static void SetupStacks(TkWindow *winPtr, int leaf);
229	229
230	230	/*

620	620	ThreadSpecificData *tsdPtr =
621	621	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
622	622
623		static const char *optionCmds[] = {
	623	static const char *const optionCmds[] = {
624	624	"add", "clear", "get", "readfile", NULL
625	625	};
626	626

1066	1066	Tcl_Interp interp, / Interpreter to use for reporting results. */
1067	1067	Tk_Window tkwin, /* Token for window: options are entered for
1068	1068	* this window's main window. */
1069		char fileName, / Name of file containing options. */
	1069	const char fileName, / Name of file containing options. */
1070	1070	int priority) /* Priority level to use for options in this
1071	1071	* file, such as TK_USER_DEFAULT_PRIO or
1072	1072	* TK_INTERACTIVE_PRIO. Must be between 0 and

+31

-19

generic/tkPack.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkPack.c,v 1.28 2008/04/27 22:38:56 dkf Exp $
	12	* RCS: @(#) $Id: tkPack.c,v 1.32 2008/12/07 16:35:44 das Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"
16	16
17	17	typedef enum {TOP, BOTTOM, LEFT, RIGHT} Side;
18		static const char *sideNames[] = {
	18	static const char *const sideNames[] = {
19	19	"top", "bottom", "left", "right", NULL
20	20	};
21	21

150	150	TkPrintPadAmount(
151	151	Tcl_Interp interp, / The interpreter into which the result is
152	152	* written. */
153		char switchName, / One of "padx", "pady", "ipadx" or "ipady" */
	153	const char switchName, / One of "padx", "pady", "ipadx" or "ipady" */
154	154	int halfSpace, /* The left or top padding amount */
155	155	int allSpace) /* The total amount of padding */
156	156	{

190	190	{
191	191	Tk_Window tkwin = clientData;
192	192	char *argv2;
193		static const char *optionStrings[] = {
	193	static const char *const optionStrings[] = {
194	194	/* after, append, before and unpack are deprecated */
195	195	"after", "append", "before", "unpack",
196	196	"configure", "forget", "info", "propagate", "slaves", NULL };

406	406	case PACK_SLAVES: {
407	407	Tk_Window master;
408	408	Packer masterPtr, slavePtr;
	409	Tcl_Obj *resultObj;
409	410
410	411	if (objc != 3) {
411	412	Tcl_WrongNumArgs(interp, 2, objv, "window");

414	415	if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
415	416	return TCL_ERROR;
416	417	}
	418	resultObj = Tcl_NewObj();
417	419	masterPtr = GetPacker(master);
418	420	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
419	421	slavePtr = slavePtr->nextPtr) {
420		Tcl_AppendElement(interp, Tk_PathName(slavePtr->tkwin));
421		}
	422	Tcl_ListObjAppendElement(NULL, resultObj,
	423	TkNewWindowObj(slavePtr->tkwin));
	424	}
	425	Tcl_SetObjResult(interp, resultObj);
422	426	break;
423	427	}
424	428	case PACK_UNPACK: {

888	892	childWidth = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
889	893	+ slavePtr->padX + slavePtr->iPadX;
890	894	if ((slavePtr->side == TOP) \|\| (slavePtr->side == BOTTOM)) {
891		curExpand = (cavityWidth - childWidth)/numExpand;
892		if (curExpand < minExpand) {
893		minExpand = curExpand;
	895	if (numExpand) {
	896	curExpand = (cavityWidth - childWidth)/numExpand;
	897	if (curExpand < minExpand) {
	898	minExpand = curExpand;
	899	}
894	900	}
895	901	} else {
896	902	cavityWidth -= childWidth;

899	905	}
900	906	}
901	907	}
902		curExpand = cavityWidth/numExpand;
903		if (curExpand < minExpand) {
904		minExpand = curExpand;
	908	if (numExpand) {
	909	curExpand = cavityWidth/numExpand;
	910	if (curExpand < minExpand) {
	911	minExpand = curExpand;
	912	}
905	913	}
906	914	return (minExpand < 0) ? 0 : minExpand;
907	915	}

943	951	childHeight = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
944	952	+ slavePtr->padY + slavePtr->iPadY;
945	953	if ((slavePtr->side == LEFT) \|\| (slavePtr->side == RIGHT)) {
946		curExpand = (cavityHeight - childHeight)/numExpand;
947		if (curExpand < minExpand) {
948		minExpand = curExpand;
	954	if (numExpand) {
	955	curExpand = (cavityHeight - childHeight)/numExpand;
	956	if (curExpand < minExpand) {
	957	minExpand = curExpand;
	958	}
949	959	}
950	960	} else {
951	961	cavityHeight -= childHeight;

954	964	}
955	965	}
956	966	}
957		curExpand = cavityHeight/numExpand;
958		if (curExpand < minExpand) {
959		minExpand = curExpand;
	967	if (numExpand) {
	968	curExpand = cavityHeight/numExpand;
	969	if (curExpand < minExpand) {
	970	minExpand = curExpand;
	971	}
960	972	}
961	973	return (minExpand < 0) ? 0 : minExpand;
962	974	}

1447	1459	Tk_Window other, slave, parent, ancestor;
1448	1460	int i, j, numWindows, tmp, positionGiven;
1449	1461	char *string;
1450		static const char *optionStrings[] = {
	1462	static const char *const optionStrings[] = {
1451	1463	"-after", "-anchor", "-before", "-expand", "-fill",
1452	1464	"-in", "-ipadx", "-ipady", "-padx", "-pady", "-side", NULL };
1453	1465	enum options {

+7

-7

generic/tkPanedWindow.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkPanedWindow.c,v 1.34 2008/10/05 18:22:21 dkf Exp $
	14	* RCS: @(#) $Id: tkPanedWindow.c,v 1.37 2008/11/08 22:52:29 dkf Exp $
15	15	*/
16	16
17	17	#include "default.h"

36	36	* The following table defines the legal values for the -orient option.
37	37	*/
38	38
39		static char *orientStrings[] = {
	39	static const char *const orientStrings[] = {
40	40	"horizontal", "vertical", NULL
41	41	};
42	42

46	46	* The following table defines the legal values for the -stretch option.
47	47	*/
48	48
49		static char *stretchStrings[] = {
	49	static const char *const stretchStrings[] = {
50	50	"always", "first", "last", "middle", "never", NULL
51	51	};
52	52

492	492	return TCL_ERROR;
493	493	}
494	494
495		Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(pwPtr->tkwin), -1));
	495	Tcl_SetObjResult(interp, TkNewWindowObj(pwPtr->tkwin));
496	496	return TCL_OK;
497	497	}
498	498

523	523	{
524	524	PanedWindow *pwPtr = clientData;
525	525	int result = TCL_OK;
526		static const char *optionStrings[] = {
	526	static const char *const optionStrings[] = {
527	527	"add", "cget", "configure", "forget", "identify", "panecget",
528	528	"paneconfigure", "panes", "proxy", "sash", NULL
529	529	};

1067	1067	int objc, /* Number of arguments. */
1068	1068	Tcl_Obj const objv[]) / Argument objects. */
1069	1069	{
1070		static const char *sashOptionStrings[] = {
	1070	static const char *const sashOptionStrings[] = {
1071	1071	"coord", "dragto", "mark", "place", NULL
1072	1072	};
1073	1073	enum sashOptions {

2758	2758	int objc, /* Number of arguments. */
2759	2759	Tcl_Obj const objv[]) / Argument objects. */
2760	2760	{
2761		static const char *optionStrings[] = {
	2761	static const char *const optionStrings[] = {
2762	2762	"coord", "forget", "place", NULL
2763	2763	};
2764	2764	enum options {

+23

-21

generic/tkPlace.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkPlace.c,v 1.25 2008/04/27 22:38:56 dkf Exp $
	12	* RCS: @(#) $Id: tkPlace.c,v 1.28 2008/11/08 22:52:29 dkf Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

25	25	* actual window size.
26	26	*/
27	27
28		static char *borderModeStrings[] = {
	28	static const char *const borderModeStrings[] = {
29	29	"inside", "outside", "ignore", NULL
30	30	};
31	31

211	211	{
212	212	Tk_Window tkwin;
213	213	Slave *slavePtr;
214		char *string;
215	214	TkDisplay *dispPtr;
216	215	Tk_OptionTable optionTable;
217		static const char *optionStrings[] = {
	216	static const char *const optionStrings[] = {
218	217	"configure", "forget", "info", "slaves", NULL
219	218	};
220	219	enum options { PLACE_CONFIGURE, PLACE_FORGET, PLACE_INFO, PLACE_SLAVES };

236	235	* Handle special shortcut where window name is first argument.
237	236	*/
238	237
239		string = Tcl_GetString(objv[1]);
240		if (string[0] == '.') {
241		tkwin = Tk_NameToWindow(interp, string, Tk_MainWindow(interp));
242		if (tkwin == NULL) {
	238	if (Tcl_GetString(objv[1])[0] == '.') {
	239	if (TkGetWindowFromObj(interp, Tk_MainWindow(interp), objv[1],
	240	&tkwin) != TCL_OK) {
243	241	return TCL_ERROR;
244	242	}
245	243

262	260	* possible additional arguments.
263	261	*/
264	262
265		tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
266		Tk_MainWindow(interp));
267		if (tkwin == NULL) {
	263	if (TkGetWindowFromObj(interp, Tk_MainWindow(interp), objv[2],
	264	&tkwin) != TCL_OK) {
268	265	return TCL_ERROR;
269	266	}
270	267

347	344	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
348	345	slavePtr = slavePtr->nextPtr) {
349	346	Tcl_ListObjAppendElement(interp, listPtr,
350		Tcl_NewStringObj(Tk_PathName(slavePtr->tkwin),-1));
	347	TkNewWindowObj(slavePtr->tkwin));
351	348	}
352	349	Tcl_SetObjResult(interp, listPtr);
353	350	}

404	401	slavePtr->optionTable = table;
405	402	Tcl_SetHashValue(hPtr, slavePtr);
406	403	Tk_CreateEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
407		(ClientData) slavePtr);
	404	slavePtr);
408	405	return slavePtr;
409	406	}
410	407

508	505	}
509	506	}
510	507	}
511
	508
512	509	if (masterPtr->abortPtr != NULL) {
513	510	*masterPtr->abortPtr = 1;
514	511	}

860	857	* placement operation. */
861	858
862	859	masterPtr->flags &= ~PARENT_RECONFIG_PENDING;
863
	860
864	861	/*
865	862	* Abort any nested call to RecomputePlacement for this window, since
866		* we'll do everything necessary here, and set up so this call
867		* can be aborted if necessary.
	863	* we'll do everything necessary here, and set up so this call can be
	864	* aborted if necessary.
868	865	*/
869	866
870	867	if (masterPtr->abortPtr != NULL) {

1076	1073	register Slave slavePtr, nextPtr;
1077	1074	TkDisplay dispPtr = ((TkWindow ) masterPtr->tkwin)->dispPtr;
1078	1075
1079		if (eventPtr->type == ConfigureNotify) {
	1076	switch (eventPtr->type) {
	1077	case ConfigureNotify:
1080	1078	if ((masterPtr->slavePtr != NULL)
1081	1079	&& !(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
1082	1080	masterPtr->flags \|= PARENT_RECONFIG_PENDING;
1083	1081	Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
1084	1082	}
1085		} else if (eventPtr->type == DestroyNotify) {
	1083	return;
	1084	case DestroyNotify:
1086	1085	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
1087	1086	slavePtr = nextPtr) {
1088	1087	slavePtr->masterPtr = NULL;

1099	1098	*masterPtr->abortPtr = 1;
1100	1099	}
1101	1100	Tcl_EventuallyFree(masterPtr, TCL_DYNAMIC);
1102		} else if (eventPtr->type == MapNotify) {
	1101	return;
	1102	case MapNotify:
1103	1103	/*
1104	1104	* When a master gets mapped, must redo the geometry computation so
1105	1105	* that all of its slaves get remapped.

1110	1110	masterPtr->flags \|= PARENT_RECONFIG_PENDING;
1111	1111	Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
1112	1112	}
1113		} else if (eventPtr->type == UnmapNotify) {
	1113	return;
	1114	case UnmapNotify:
1114	1115	/*
1115	1116	* Unmap all of the slaves when the master gets unmapped, so that they
1116	1117	* don't keep redisplaying themselves.

1120	1121	slavePtr = slavePtr->nextPtr) {
1121	1122	Tk_UnmapWindow(slavePtr->tkwin);
1122	1123	}
	1124	return;
1123	1125	}
1124	1126	}
1125	1127

+10

-10

generic/tkPlatDecls.h less more

7	7	* See the file "license.terms" for information on usage and redistribution
8	8	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkPlatDecls.h,v 1.18 2008/04/08 03:28:05 kennykb Exp $
	10	* RCS: @(#) $Id: tkPlatDecls.h,v 1.19 2008/10/22 20:56:43 nijtmans Exp $
11	11	*/
12	12
13	13	#ifndef _TKPLATDECLS

59	59	#ifndef Tk_TranslateWinEvent_TCL_DECLARED
60	60	#define Tk_TranslateWinEvent_TCL_DECLARED
61	61	/* 5 */
62		EXTERN int Tk_TranslateWinEvent (HWND hwnd, UINT message,
63		WPARAM wParam, LPARAM lParam,
	62	EXTERN int Tk_TranslateWinEvent (HWND hwnd, UINT message,
	63	WPARAM wParam, LPARAM lParam,
64	64	LRESULT * result);
65	65	#endif
66	66	#endif /* WIN */

69	69	#define Tk_MacOSXSetEmbedHandler_TCL_DECLARED
70	70	/* 0 */
71	71	EXTERN void Tk_MacOSXSetEmbedHandler (
72		Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr,
73		Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr,
74		Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr,
75		Tk_MacOSXEmbedGetClipProc * getClipProc,
	72	Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr,
	73	Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr,
	74	Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr,
	75	Tk_MacOSXEmbedGetClipProc * getClipProc,
76	76	Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc);
77	77	#endif
78	78	#ifndef Tk_MacOSXTurnOffMenus_TCL_DECLARED

98	98	#ifndef TkGenWMConfigureEvent_TCL_DECLARED
99	99	#define TkGenWMConfigureEvent_TCL_DECLARED
100	100	/* 5 */
101		EXTERN void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y,
	101	EXTERN void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y,
102	102	int width, int height, int flags);
103	103	#endif
104	104	#ifndef TkMacOSXInvalClipRgns_TCL_DECLARED

130	130
131	131	typedef struct TkPlatStubs {
132	132	int magic;
133		CONST struct TkPlatStubHooks *hooks;
	133	const struct TkPlatStubHooks *hooks;
134	134
135	135	#ifdef __WIN32__ /* WIN */
136	136	Window (tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); / 0 */

156	156	} TkPlatStubs;
157	157
158	158	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
159		extern CONST TkPlatStubs *tkPlatStubsPtr;
	159	extern const TkPlatStubs *tkPlatStubsPtr;
160	160	#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
161	161
162	162	#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)

+11

-16

generic/tkRectOval.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkRectOval.c,v 1.18 2008/04/27 22:38:57 dkf Exp $
	11	* RCS: @(#) $Id: tkRectOval.c,v 1.19 2008/11/09 20:51:28 nijtmans Exp $
12	12	*/
13	13
14	14	#include <stdio.h>

44	44	* Information used for parsing configuration specs:
45	45	*/
46	46
47		static Tk_CustomOption stateOption = {
48		(Tk_OptionParseProc *) TkStateParseProc,
49		TkStatePrintProc, (ClientData) 2
	47	static const Tk_CustomOption stateOption = {
	48	TkStateParseProc, TkStatePrintProc, (ClientData) 2
50	49	};
51		static Tk_CustomOption tagsOption = {
52		(Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
53		Tk_CanvasTagsPrintProc, (ClientData) NULL
	50	static const Tk_CustomOption tagsOption = {
	51	Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
54	52	};
55		static Tk_CustomOption dashOption = {
56		(Tk_OptionParseProc *) TkCanvasDashParseProc,
57		TkCanvasDashPrintProc, (ClientData) NULL
	53	static const Tk_CustomOption dashOption = {
	54	TkCanvasDashParseProc, TkCanvasDashPrintProc, (ClientData) NULL
58	55	};
59		static Tk_CustomOption offsetOption = {
60		(Tk_OptionParseProc *) TkOffsetParseProc,
61		TkOffsetPrintProc, (ClientData) TK_OFFSET_RELATIVE
	56	static const Tk_CustomOption offsetOption = {
	57	TkOffsetParseProc, TkOffsetPrintProc, (ClientData) TK_OFFSET_RELATIVE
62	58	};
63		static Tk_CustomOption pixelOption = {
64		(Tk_OptionParseProc *) TkPixelParseProc,
65		TkPixelPrintProc, (ClientData) NULL
	59	static const Tk_CustomOption pixelOption = {
	60	TkPixelParseProc, TkPixelPrintProc, (ClientData) NULL
66	61	};
67	62
68	63	static Tk_ConfigSpec configSpecs[] = {

+13

-19

generic/tkScale.c less more

15	15	* See the file "license.terms" for information on usage and redistribution of
16	16	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
17	17	*
18		* RCS: @(#) $Id: tkScale.c,v 1.30 2008/07/23 23:24:23 nijtmans Exp $
	18	* RCS: @(#) $Id: tkScale.c,v 1.33 2008/11/08 22:52:29 dkf Exp $
19	19	*/
20	20
21	21	#include "default.h"

27	27	* used together with the "enum orient" declaration in tkScale.h.
28	28	*/
29	29
30		static char *orientStrings[] = {
	30	static const char *const orientStrings[] = {
31	31	"horizontal", "vertical", NULL
32	32	};
33	33

36	36	* used together with the "enum state" declaration in tkScale.h.
37	37	*/
38	38
39		static char *stateStrings[] = {
	39	static const char *const stateStrings[] = {
40	40	"active", "disabled", "normal", NULL
41	41	};
42	42

141	141	* scale widget command.
142	142	*/
143	143
144		static const char *commandNames[] = {
	144	static const char *const commandNames[] = {
145	145	"cget", "configure", "coords", "get", "identify", "set", NULL
146	146	};
147	147

302	302	return TCL_ERROR;
303	303	}
304	304
305		Tcl_SetResult(interp, Tk_PathName(scalePtr->tkwin), TCL_STATIC);
	305	Tcl_SetObjResult(interp, TkNewWindowObj(scalePtr->tkwin));
306	306	return TCL_OK;
307	307	}
308	308

356	356	scalePtr->optionTable, objv[2], scalePtr->tkwin);
357	357	if (objPtr == NULL) {
358	358	goto error;
359		} else {
360		Tcl_SetObjResult(interp, objPtr);
361		}
	359	}
	360	Tcl_SetObjResult(interp, objPtr);
362	361	break;
363	362	case COMMAND_CONFIGURE:
364	363	if (objc <= 3) {

367	366	(objc == 3) ? objv[2] : NULL, scalePtr->tkwin);
368	367	if (objPtr == NULL) {
369	368	goto error;
370		} else {
371		Tcl_SetObjResult(interp, objPtr);
372	369	}
	370	Tcl_SetObjResult(interp, objPtr);
373	371	} else {
374	372	result = ConfigureScale(interp, scalePtr, objc-2, objv+2);
375	373	}
376	374	break;
377	375	case COMMAND_COORDS: {
378		int x, y ;
	376	int x, y;
379	377	double value;
380		char buf[TCL_INTEGER_SPACE * 2];
381	378
382	379	if ((objc != 2) && (objc != 3)) {
383	380	Tcl_WrongNumArgs(interp, 1, objv, "coords ?value?");

399	396	y = scalePtr->horizTroughY + scalePtr->width/2
400	397	+ scalePtr->borderWidth;
401	398	}
402		sprintf(buf, "%d %d", x, y);
403		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	399	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d", x, y));
404	400	break;
405	401	}
406	402	case COMMAND_GET: {
407	403	double value;
408	404	int x, y;
409		char buf[TCL_DOUBLE_SPACE];
410	405
411	406	if ((objc != 2) && (objc != 4)) {
412	407	Tcl_WrongNumArgs(interp, 1, objv, "get ?x y?");

421	416	}
422	417	value = TkScalePixelToValue(scalePtr, x, y);
423	418	}
424		sprintf(buf, scalePtr->format, value);
425		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	419	Tcl_SetObjResult(interp, Tcl_ObjPrintf(scalePtr->format, value));
426	420	break;
427	421	}
428	422	case COMMAND_IDENTIFY: {

1175	1169	int flags) /* Information about what happened. */
1176	1170	{
1177	1171	register TkScale *scalePtr = clientData;
1178		char *resultStr;
	1172	const char *resultStr;
1179	1173	double value;
1180	1174	Tcl_Obj *valuePtr;
1181	1175	int result;

1226	1220	}
1227	1221	TkEventuallyRedrawScale(scalePtr, REDRAW_SLIDER);
1228	1222
1229		return resultStr;
	1223	return (char *) resultStr;
1230	1224	}
1231	1225
1232	1226	/*

+18

-23

generic/tkScrollbar.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkScrollbar.c,v 1.15 2008/10/03 13:13:31 dkf Exp $
	13	* RCS: @(#) $Id: tkScrollbar.c,v 1.17 2008/11/09 20:51:28 nijtmans Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

21	21	* Custom option for handling "-orient"
22	22	*/
23	23
24		static Tk_CustomOption orientOption = {
25		(Tk_OptionParseProc *) TkOrientParseProc,
26		TkOrientPrintProc,
27		NULL
	24	static const Tk_CustomOption orientOption = {
	25	TkOrientParseProc, TkOrientPrintProc, (ClientData) NULL
28	26	};
29	27
30	28	/*

195	193	return TCL_ERROR;
196	194	}
197	195
198		Tcl_SetResult(interp, Tk_PathName(scrollPtr->tkwin), TCL_STATIC);
	196	Tcl_SetObjResult(interp, TkNewWindowObj(scrollPtr->tkwin));
199	197	return TCL_OK;
200	198	}
201	199

298	296	} else if ((c == 'd') && (strncmp(argv[1], "delta", length) == 0)) {
299	297	int xDelta, yDelta, pixels, length;
300	298	double fraction;
301		char buf[TCL_DOUBLE_SPACE];
302	299
303	300	if (argc != 4) {
304	301	Tcl_AppendResult(interp, "wrong # args: should be \"",

323	320	} else {
324	321	fraction = ((double) pixels / (double) length);
325	322	}
326		Tcl_PrintDouble(NULL, fraction, buf);
327		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	323	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(fraction));
328	324	} else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
329	325	int x, y, pos, length;
330	326	double fraction;
331		char buf[TCL_DOUBLE_SPACE];
332	327
333	328	if (argc != 4) {
334	329	Tcl_AppendResult(interp, "wrong # args: should be \"",

358	353	} else if (fraction > 1.0) {
359	354	fraction = 1.0;
360	355	}
361		Tcl_PrintDouble(NULL, fraction, buf);
362		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	356	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(fraction));
363	357	} else if ((c == 'g') && (strncmp(argv[1], "get", length) == 0)) {
364	358	if (argc != 2) {
365	359	Tcl_AppendResult(interp, "wrong # args: should be \"",

367	361	goto error;
368	362	}
369	363	if (scrollPtr->flags & NEW_STYLE_COMMANDS) {
370		char first[TCL_DOUBLE_SPACE], last[TCL_DOUBLE_SPACE];
371
372		Tcl_PrintDouble(NULL, scrollPtr->firstFraction, first);
373		Tcl_PrintDouble(NULL, scrollPtr->lastFraction, last);
374		Tcl_AppendResult(interp, first, " ", last, NULL);
	364	Tcl_Obj *resObjs[2];
	365
	366	resObjs[0] = Tcl_NewDoubleObj(scrollPtr->firstFraction);
	367	resObjs[1] = Tcl_NewDoubleObj(scrollPtr->lastFraction);
	368	Tcl_SetObjResult(interp, Tcl_NewListObj(2, resObjs));
375	369	} else {
376		char buf[TCL_INTEGER_SPACE * 4];
377
378		sprintf(buf, "%d %d %d %d", scrollPtr->totalUnits,
379		scrollPtr->windowUnits, scrollPtr->firstUnit,
380		scrollPtr->lastUnit);
381		Tcl_SetResult(interp, buf, TCL_VOLATILE);
	370	Tcl_Obj *resObjs[4];
	371
	372	resObjs[0] = Tcl_NewIntObj(scrollPtr->totalUnits);
	373	resObjs[1] = Tcl_NewIntObj(scrollPtr->windowUnits);
	374	resObjs[2] = Tcl_NewIntObj(scrollPtr->firstUnit);
	375	resObjs[3] = Tcl_NewIntObj(scrollPtr->lastUnit);
	376	Tcl_SetObjResult(interp, Tcl_NewListObj(4, resObjs));
382	377	}
383	378	} else if ((c == 'i') && (strncmp(argv[1], "identify", length) == 0)) {
384	379	int x, y, thing;

+18

-16

generic/tkSelect.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkSelect.c,v 1.23 2008/10/05 18:22:21 dkf Exp $
	12	* RCS: @(#) $Id: tkSelect.c,v 1.27 2008/12/09 21:22:56 dgp Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

66	66	int offset, char *buffer, int maxBytes);
67	67	static void LostSelection(ClientData clientData);
68	68	static int SelGetProc(ClientData clientData,
69		Tcl_Interp interp, char portion);
	69	Tcl_Interp interp, const char portion);
70	70
71	71	/*
72	72	*--------------------------------------------------------------

434	434	*/
435	435
436	436	if (clearProc != NULL) {
437		(*clearProc)(clearData);
	437	clearProc(clearData);
438	438	}
439	439	}
440	440

498	498	XSetSelectionOwner(winPtr->display, selection, None, CurrentTime);
499	499
500	500	if (clearProc != NULL) {
501		(*clearProc)(clearData);
	501	clearProc(clearData);
502	502	}
503	503	}
504	504

603	603	goto cantget;
604	604	}
605	605	buffer[count] = 0;
606		result = (*proc)(clientData, interp, buffer);
	606	result = proc(clientData, interp, buffer);
607	607	} else {
608	608	offset = 0;
609	609	result = TCL_OK;

611	611	ip.nextPtr = tsdPtr->pendingPtr;
612	612	tsdPtr->pendingPtr = &ip;
613	613	while (1) {
614		count = (selPtr->proc)(selPtr->clientData, offset, buffer,
	614	count = selPtr->proc(selPtr->clientData, offset, buffer,
615	615	TK_SEL_BYTES_AT_ONCE);
616	616	if ((count < 0) \|\| (ip.selPtr == NULL)) {
617	617	tsdPtr->pendingPtr = ip.nextPtr;

621	621	Tcl_Panic("selection handler returned too many bytes");
622	622	}
623	623	buffer[count] = '\0';
624		result = (*proc)(clientData, interp, buffer);
	624	result = proc(clientData, interp, buffer);
625	625	if ((result != TCL_OK) \|\| (count < TK_SEL_BYTES_AT_ONCE)
626	626	\|\| (ip.selPtr == NULL)) {
627	627	break;

678	678	char selName = NULL, string;
679	679	int count, index;
680	680	Tcl_Obj **objs;
681		static const char *optionStrings[] = {
	681	static const char *const optionStrings[] = {
682	682	"clear", "get", "handle", "own", NULL
683	683	};
684	684	enum options {

697	697
698	698	switch ((enum options) index) {
699	699	case SELECTION_CLEAR: {
700		static const char *clearOptionStrings[] = {
	700	static const char *const clearOptionStrings[] = {
701	701	"-displayof", "-selection", NULL
702	702	};
703	703	enum clearOptions { CLEAR_DISPLAYOF, CLEAR_SELECTION };

756	756	char *targetName = NULL;
757	757	Tcl_DString selBytes;
758	758	int result;
759		static const char *getOptionStrings[] = {
	759	static const char *const getOptionStrings[] = {
760	760	"-displayof", "-selection", "-type", NULL
761	761	};
762	762	enum getOptions { GET_DISPLAYOF, GET_SELECTION, GET_TYPE };

831	831	char *formatName = NULL;
832	832	register CommandInfo *cmdInfoPtr;
833	833	int cmdLength;
834		static const char *handleOptionStrings[] = {
	834	static const char *const handleOptionStrings[] = {
835	835	"-format", "-selection", "-type", NULL
836	836	};
837	837	enum handleOptions {

919	919	register LostCommand *lostPtr;
920	920	char *script = NULL;
921	921	int cmdLength;
922		static const char *ownOptionStrings[] = {
	922	static const char *const ownOptionStrings[] = {
923	923	"-command", "-displayof", "-selection", NULL
924	924	};
925	925	enum ownOptions { OWN_COMMAND, OWN_DISPLAYOF, OWN_SELECTION };

1258	1258	*/
1259	1259
1260	1260	if (infoPtr->clearProc != NULL) {
1261		(*infoPtr->clearProc)(infoPtr->clearData);
	1261	infoPtr->clearProc(infoPtr->clearData);
1262	1262	}
1263	1263	ckfree((char *) infoPtr);
1264	1264	}

1289	1289	* selection. */
1290	1290	Tcl_Interp interp, / Interpreter used for error reporting (not
1291	1291	* used). */
1292		char portion) / New information to be appended. */
	1292	const char portion) / New information to be appended. */
1293	1293	{
1294	1294	Tcl_DStringAppend(clientData, portion, -1);
1295	1295	return TCL_OK;

1559	1559	LostCommand *lostPtr = clientData;
1560	1560	Tcl_Obj *objPtr;
1561	1561	Tcl_Interp *interp;
	1562	int code;
1562	1563
1563	1564	interp = lostPtr->interp;
1564	1565	Tcl_Preserve(interp);

1572	1573	Tcl_IncrRefCount(objPtr);
1573	1574	Tcl_ResetResult(interp);
1574	1575
1575		if (TkCopyAndGlobalEval(interp, lostPtr->command) != TCL_OK) {
1576		Tcl_BackgroundError(interp);
	1576	code = TkCopyAndGlobalEval(interp, lostPtr->command);
	1577	if (code != TCL_OK) {
	1578	Tcl_BackgroundException(interp, code);
1577	1579	}
1578	1580
1579	1581	Tcl_SetObjResult(interp, objPtr);

+2

-5

generic/tkSelect.h less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkSelect.h,v 1.10 2008/09/03 06:01:52 dgp Exp $
	11	* RCS: @(#) $Id: tkSelect.h,v 1.12 2008/10/29 13:28:06 dgp Exp $
12	12	*/
13	13
14	14	#ifndef _TKSELECT

76	76	Atom selection; /* Selection being requested. */
77	77	Atom property; /* Property where selection will appear. */
78	78	Atom target; /* Desired form for selection. */
79		int (proc) (ClientData clientData, Tcl_Interp interp, char portion); / Procedure to call to handle pieces of
	79	Tk_GetSelProc proc; / Procedure to call to handle pieces of
80	80	* selection. */
81	81	ClientData clientData; /* Argument for proc. */
82	82	int result; /* Initially -1. Set to a Tcl return value

160	160	MODULE_SCOPE int TkSelDefaultSelection(TkSelectionInfo *infoPtr,
161	161	Atom target, char *buffer, int maxBytes,
162	162	Atom *typePtr);
163		MODULE_SCOPE int TkSelGetSelection(Tcl_Interp *interp, Tk_Window tkwin,
164		Atom selection, Atom target, Tk_GetSelProc *proc,
165		ClientData clientData);
166	163	#ifndef TkSelUpdateClipboard
167	164	MODULE_SCOPE void TkSelUpdateClipboard(TkWindow *winPtr,
168	165	TkClipboardTarget *targetPtr);

+2

-2

generic/tkSquare.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkSquare.c,v 1.12 2008/07/23 23:24:21 nijtmans Exp $
	14	* RCS: @(#) $Id: tkSquare.c,v 1.13 2008/10/17 23:18:37 nijtmans Exp $
15	15	*/
16	16
17	17	#if 0

223	223	{
224	224	Square *squarePtr = clientData;
225	225	int result = TCL_OK;
226		static const char *squareOptions[] = {"cget", "configure", NULL};
	226	static const char *const squareOptions[] = {"cget", "configure", NULL};
227	227	enum {
228	228	SQUARE_CGET, SQUARE_CONFIGURE
229	229	};

+12

-1

generic/tkStubInit.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkStubInit.c,v 1.64 2008/08/19 15:52:12 georgeps Exp $
	10	* RCS: @(#) $Id: tkStubInit.c,v 1.66 2008/12/04 21:33:25 nijtmans Exp $
11	11	*/
12	12
13	13	#include "tkInt.h"

308	308	NULL, /* 155 */
309	309	TkpTestembedCmd, /* 156 */
310	310	TkpTesttextCmd, /* 157 */
	311	TkSelGetSelection, /* 158 */
	312	TkTextGetIndex, /* 159 */
	313	TkTextIndexBackBytes, /* 160 */
	314	TkTextIndexForwBytes, /* 161 */
	315	TkTextMakeByteIndex, /* 162 */
	316	TkTextPrintIndex, /* 163 */
	317	TkTextSetMark, /* 164 */
	318	TkTextXviewCmd, /* 165 */
	319	TkTextChanged, /* 166 */
	320	TkBTreeNumLines, /* 167 */
	321	TkTextInsertDisplayProc, /* 168 */
311	322	};
312	323
313	324	static const TkIntPlatStubs tkIntPlatStubs = {

+3

-3

generic/tkStyle.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkStyle.c,v 1.9 2008/04/27 22:38:58 dkf Exp $
	11	* RCS: @(#) $Id: tkStyle.c,v 1.11 2008/11/08 18:44:40 dkf Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

151	151	* object points to the Style structure for the stylefont, or NULL.
152	152	*/
153	153
154		static Tcl_ObjType styleObjType = {
	154	static const Tcl_ObjType styleObjType = {
155	155	"style", /* name */
156	156	FreeStyleObjProc, /* freeIntRepProc */
157	157	DupStyleObjProc, /* dupIntRepProc */

1496	1496	name = Tcl_GetString(objPtr);
1497	1497	typePtr = objPtr->typePtr;
1498	1498	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
1499		(*typePtr->freeIntRepProc)(objPtr);
	1499	typePtr->freeIntRepProc(objPtr);
1500	1500	}
1501	1501
1502	1502	objPtr->typePtr = &styleObjType;

+11

-11

generic/tkTest.c less more

12	12	* See the file "license.terms" for information on usage and redistribution of
13	13	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
14	14	*
15		* RCS: @(#) $Id: tkTest.c,v 1.38 2008/10/05 18:22:21 dkf Exp $
	15	* RCS: @(#) $Id: tkTest.c,v 1.41 2008/11/12 00:15:26 nijtmans Exp $
16	16	*/
17	17
18	18	#include "tkInt.h"

60	60	*/
61	61
62	62	static int ImageCreate(Tcl_Interp *interp,
63		char name, int argc, Tcl_Obj const objv[],
64		Tk_ImageType *typePtr, Tk_ImageMaster master,
	63	const char name, int argc, Tcl_Obj const objv[],
	64	const Tk_ImageType *typePtr, Tk_ImageMaster master,
65	65	ClientData *clientDataPtr);
66	66	static ClientData ImageGet(Tk_Window tkwin, ClientData clientData);
67	67	static void ImageDisplay(ClientData clientData,

619	619	int objc, /* Number of arguments. */
620	620	Tcl_Obj const objv[]) / Argument objects. */
621	621	{
622		static const char *options[] = {
	622	static const char *const options[] = {
623	623	"alltypes", "chain1", "chain2", "configerror", "delete", "info",
624	624	"internal", "new", "notenoughparams", "twowindows", NULL
625	625	};

698	698	Tcl_Obj *customPtr;
699	699	} TypesRecord;
700	700	TypesRecord *recordPtr;
701		static char *stringTable[] = {
	701	static const char *const stringTable[] = {
702	702	"one", "two", "three", "four", NULL
703	703	};
704	704	static const Tk_OptionSpec typesSpecs[] = {

971	971	char *custom;
972	972	} InternalRecord;
973	973	InternalRecord *recordPtr;
974		static char *internalStringTable[] = {
	974	static const char *const internalStringTable[] = {
975	975	"one", "two", "three", "four", NULL
976	976	};
977	977	static const Tk_OptionSpec internalSpecs[] = {

1251	1251	Tcl_Obj const objv[]) / Argument objects. */
1252	1252	{
1253	1253	int result = TCL_OK;
1254		static const char *options[] = {
	1254	static const char *const options[] = {
1255	1255	"cget", "configure", "csave", NULL
1256	1256	};
1257	1257	enum {

1433	1433	int objc, /* Number of arguments. */
1434	1434	Tcl_Obj const objv[]) / Argument objects. */
1435	1435	{
1436		static const char *options[] = {"counts", "subfonts", NULL};
	1436	static const char *const options[] = {"counts", "subfonts", NULL};
1437	1437	enum option {COUNTS, SUBFONTS};
1438	1438	int index;
1439	1439	Tk_Window tkwin;

1490	1490	ImageCreate(
1491	1491	Tcl_Interp interp, / Interpreter for application containing
1492	1492	* image. */
1493		char name, / Name to use for image. */
	1493	const char name, / Name to use for image. */
1494	1494	int objc, /* Number of arguments. */
1495	1495	Tcl_Obj const objv[], / Argument strings for options (doesn't
1496	1496	* include image name or type). */
1497		Tk_ImageType typePtr, / Pointer to our type record (not used). */
	1497	const Tk_ImageType typePtr, / Pointer to our type record (not used). */
1498	1498	Tk_ImageMaster master, /* Token for image, to be used by us in later
1499	1499	* callbacks. */
1500	1500	ClientData clientDataPtr) / Store manager's token for image here; it
1501	1501	* will be returned in later callbacks. */
1502	1502	{
1503	1503	TImageMaster *timPtr;
1504		char *varName;
	1504	const char *varName;
1505	1505	int i;
1506	1506
1507	1507	varName = "log";

+95

-77

generic/tkText.c less more

12	12	* See the file "license.terms" for information on usage and redistribution of
13	13	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
14	14	*
15		* RCS: @(#) $Id: tkText.c,v 1.81 2008/07/23 23:24:22 nijtmans Exp $
	15	* RCS: @(#) $Id: tkText.c,v 1.87 2008/12/07 16:32:44 das Exp $
16	16	*/
17	17
18	18	#include "default.h"

49	49	* table below.
50	50	*/
51	51
52		static char *stateStrings[] = {
	52	static const char *const stateStrings[] = {
53	53	"disabled", "normal", NULL
54	54	};
55	55

59	59	* table below.
60	60	*/
61	61
62		static char *wrapStrings[] = {
	62	static const char *const wrapStrings[] = {
63	63	"char", "none", "word", NULL
64	64	};
65	65

69	69	* the string table below.
70	70	*/
71	71
72		static char *tabStyleStrings[] = {
	72	static const char *const tabStyleStrings[] = {
73	73	"tabular", "wordprocessor", NULL
	74	};
	75
	76	/*
	77	* The 'TkTextInsertUnfocussed' enum in tkText.h is used to define a type for
	78	* the -insertunfocussed option of the Text widget. These values are used as
	79	* indice into the string table below.
	80	*/
	81
	82	static const char *const insertUnfocussedStrings[] = {
	83	"hollow", "none", "solid", NULL
74	84	};
75	85
76	86	/*

176	186	{TK_OPTION_INT, "-insertontime", "insertOnTime", "OnTime",
177	187	DEF_TEXT_INSERT_ON_TIME, -1, Tk_Offset(TkText, insertOnTime),
178	188	0, 0, 0},
	189	{TK_OPTION_STRING_TABLE,
	190	"-insertunfocussed", "insertUnfocussed", "InsertUnfocussed",
	191	DEF_TEXT_INSERT_UNFOCUSSED, -1, Tk_Offset(TkText, insertUnfocussed),
	192	0, (ClientData) insertUnfocussedStrings, 0},
179	193	{TK_OPTION_PIXELS, "-insertwidth", "insertWidth", "InsertWidth",
180	194	DEF_TEXT_INSERT_WIDTH, -1, Tk_Offset(TkText, insertWidth),
181	195	0, 0, 0},

442	456	int objc, /* Number of arguments. */
443	457	Tcl_Obj const objv[]) / Argument objects. */
444	458	{
445		Tk_Window tkwin = (Tk_Window) clientData;
	459	Tk_Window tkwin = clientData;
446	460
447	461	if (objc < 2) {
448	462	Tcl_WrongNumArgs(interp, 1, objv, "pathName ?-option value ...?");

512	526	textPtr->interp = interp;
513	527	textPtr->widgetCmd = Tcl_CreateObjCommand(interp,
514	528	Tk_PathName(textPtr->tkwin), TextWidgetObjCmd,
515		(ClientData) textPtr, TextCmdDeletedProc);
	529	textPtr, TextCmdDeletedProc);
516	530
517	531	if (sharedPtr == NULL) {
518	532	sharedPtr = (TkSharedText *) ckalloc(sizeof(TkSharedText));

627	641	optionTable = Tk_CreateOptionTable(interp, optionSpecs);
628	642
629	643	Tk_SetClass(textPtr->tkwin, "Text");
630		Tk_SetClassProcs(textPtr->tkwin, &textClass, (ClientData) textPtr);
	644	Tk_SetClassProcs(textPtr->tkwin, &textClass, textPtr);
631	645	textPtr->optionTable = optionTable;
632	646
633	647	Tk_CreateEventHandler(textPtr->tkwin,
634	648	ExposureMask\|StructureNotifyMask\|FocusChangeMask,
635		TextEventProc, (ClientData) textPtr);
	649	TextEventProc, textPtr);
636	650	Tk_CreateEventHandler(textPtr->tkwin, KeyPressMask\|KeyReleaseMask
637	651	\|ButtonPressMask\|ButtonReleaseMask\|EnterWindowMask
638	652	\|LeaveWindowMask\|PointerMotionMask\|VirtualEventMask,
639		TkTextBindProc, (ClientData) textPtr);
	653	TkTextBindProc, textPtr);
640	654	Tk_CreateSelHandler(textPtr->tkwin, XA_PRIMARY, XA_STRING,
641		TextFetchSelection, (ClientData) textPtr, XA_STRING);
	655	TextFetchSelection, textPtr, XA_STRING);
642	656
643	657	if (Tk_InitOptions(interp, (char *) textPtr, optionTable, textPtr->tkwin)
644	658	!= TCL_OK) {

650	664	return TCL_ERROR;
651	665	}
652	666
653		Tcl_SetObjResult(interp,
654		Tcl_NewStringObj(Tk_PathName(textPtr->tkwin),-1));
	667	Tcl_SetObjResult(interp, TkNewWindowObj(textPtr->tkwin));
655	668	return TCL_OK;
656	669	}
657	670

680	693	int objc, /* Number of arguments. */
681	694	Tcl_Obj const objv[]) / Argument objects. */
682	695	{
683		register TkText textPtr = (TkText ) clientData;
	696	register TkText *textPtr = clientData;
684	697	int result = TCL_OK;
685	698	int index;
686	699
687		static const char *optionStrings[] = {
	700	static const char *const optionStrings[] = {
688	701	"bbox", "cget", "compare", "configure", "count", "debug", "delete",
689	702	"dlineinfo", "dump", "edit", "get", "image", "index", "insert",
690	703	"mark", "peer", "replace", "scan", "search", "see", "tag", "window",

1531	1544	int objc, /* Number of arguments. */
1532	1545	Tcl_Obj const objv[]) / Argument objects. */
1533	1546	{
1534		register TkSharedText sharedPtr = (TkSharedText ) clientData;
	1547	register TkSharedText *sharedPtr = clientData;
1535	1548	int result = TCL_OK;
1536	1549	int index;
1537	1550
1538		static const char *optionStrings[] = {
	1551	static const char *const optionStrings[] = {
1539	1552	"delete", "insert", NULL
1540	1553	};
1541	1554	enum options {

1640	1653	Tk_Window tkwin = textPtr->tkwin;
1641	1654	int index;
1642	1655
1643		static const char *peerOptionStrings[] = {
	1656	static const char *const peerOptionStrings[] = {
1644	1657	"create", "names", NULL
1645	1658	};
1646	1659	enum peerOptions {

2196	2209	if (TkBTreeCharTagged(&first, textPtr->selTagPtr)
2197	2210	\|\| TkBTreeNextTag(&search)) {
2198	2211	Tk_OwnSelection(textPtr->tkwin, XA_PRIMARY, TkTextLostSelection,
2199		(ClientData) textPtr);
	2212	textPtr);
2200	2213	textPtr->flags \|= GOT_SELECTION;
2201	2214	}
2202	2215	}

2207	2220
2208	2221	if (textPtr->flags & GOT_FOCUS) {
2209	2222	Tcl_DeleteTimerHandler(textPtr->insertBlinkHandler);
2210		textPtr->insertBlinkHandler = (Tcl_TimerToken) NULL;
2211		TextBlinkProc((ClientData) textPtr);
	2223	textPtr->insertBlinkHandler = NULL;
	2224	TextBlinkProc(textPtr);
2212	2225	}
2213	2226
2214	2227	/*

2251	2264	TextWorldChangedCallback(
2252	2265	ClientData instanceData) /* Information about widget. */
2253	2266	{
2254		TkText *textPtr;
2255
2256		textPtr = (TkText *) instanceData;
	2267	TkText *textPtr = instanceData;
	2268
2257	2269	TextWorldChanged(textPtr, TK_TEXT_LINE_GEOMETRY);
2258	2270	}
2259	2271

2339	2351	ClientData clientData, /* Information about window. */
2340	2352	register XEvent eventPtr) / Information about event. */
2341	2353	{
2342		register TkText textPtr = (TkText ) clientData;
	2354	register TkText *textPtr = clientData;
2343	2355	TkTextIndex index, index2;
2344	2356
2345	2357	if (eventPtr->type == Expose) {

2399	2411	textPtr->flags \|= GOT_FOCUS \| INSERT_ON;
2400	2412	if (textPtr->insertOffTime != 0) {
2401	2413	textPtr->insertBlinkHandler = Tcl_CreateTimerHandler(
2402		textPtr->insertOnTime, TextBlinkProc,
2403		(ClientData) textPtr);
	2414	textPtr->insertOnTime, TextBlinkProc, textPtr);
2404	2415	}
2405	2416	} else {
2406	2417	textPtr->flags &= ~(GOT_FOCUS \| INSERT_ON);
2407		textPtr->insertBlinkHandler = (Tcl_TimerToken) NULL;
	2418	textPtr->insertBlinkHandler = NULL;
2408	2419	}
2409	2420	if (textPtr->inactiveSelBorder != textPtr->selBorder) {
2410	2421	TkTextRedrawTag(NULL, textPtr, NULL, NULL, textPtr->selTagPtr,

2449	2460	TextCmdDeletedProc(
2450	2461	ClientData clientData) /* Pointer to widget record for widget. */
2451	2462	{
2452		TkText textPtr = (TkText ) clientData;
	2463	TkText *textPtr = clientData;
2453	2464	Tk_Window tkwin = textPtr->tkwin;
2454	2465
2455	2466	/*

2652	2663
2653	2664	Tcl_Obj *seeInsertObj = Tcl_NewObj();
2654	2665	Tcl_Obj *markSet1InsertObj = Tcl_NewObj();
2655		Tcl_Obj *markSet2InsertObj = Tcl_NewObj();
	2666	Tcl_Obj *markSet2InsertObj = NULL;
2656	2667	Tcl_Obj *insertCmdObj = Tcl_NewObj();
2657	2668	Tcl_Obj *deleteCmdObj = Tcl_NewObj();
2658	2669

2717	2728	* underlying data shared by all peers.
2718	2729	*/
2719	2730
2720		iAtom = TkUndoMakeSubAtom(&TextUndoRedoCallback,
2721		(ClientData)textPtr->sharedTextPtr, insertCmdObj, NULL);
	2731	iAtom = TkUndoMakeSubAtom(&TextUndoRedoCallback, textPtr->sharedTextPtr,
	2732	insertCmdObj, NULL);
2722	2733	TkUndoMakeCmdSubAtom(NULL, markSet2InsertObj, iAtom);
2723	2734	TkUndoMakeCmdSubAtom(NULL, seeInsertObj, iAtom);
2724	2735
2725		dAtom = TkUndoMakeSubAtom(&TextUndoRedoCallback,
2726		(ClientData)textPtr->sharedTextPtr, deleteCmdObj, NULL);
	2736	dAtom = TkUndoMakeSubAtom(&TextUndoRedoCallback, textPtr->sharedTextPtr,
	2737	deleteCmdObj, NULL);
2727	2738	TkUndoMakeCmdSubAtom(NULL, markSet1InsertObj, dAtom);
2728	2739	TkUndoMakeCmdSubAtom(NULL, seeInsertObj, dAtom);
2729	2740

2772	2783	Tcl_Obj objPtr) / Arguments of a command to be handled by the
2773	2784	* shared text data structure. */
2774	2785	{
2775		TkSharedText sharedPtr = (TkSharedText ) clientData;
	2786	TkSharedText *sharedPtr = clientData;
2776	2787	int res, objc;
2777	2788	Tcl_Obj **objv;
2778	2789	TkText *textPtr;

2837	2848	* the Tcl level.
2838	2849	*/
2839	2850
2840		return SharedTextObjCmd((ClientData)sharedPtr, interp, objc+1, objv-1);
	2851	return SharedTextObjCmd(sharedPtr, interp, objc+1, objv-1);
2841	2852	}
2842	2853
2843	2854	/*

3198	3209	* not including terminating NULL
3199	3210	* character. */
3200	3211	{
3201		register TkText textPtr = (TkText ) clientData;
	3212	register TkText *textPtr = clientData;
3202	3213	TkTextIndex eof;
3203	3214	int count, chunkSize, offsetInSeg;
3204	3215	TkTextSearch search;

3329	3340	TkTextLostSelection(
3330	3341	ClientData clientData) /* Information about text widget. */
3331	3342	{
3332		register TkText textPtr = (TkText ) clientData;
	3343	register TkText *textPtr = clientData;
3333	3344
3334	3345	if (TkpAlwaysShowSelection(textPtr->tkwin)) {
3335	3346	TkTextIndex start, end;

3423	3434	TextBlinkProc(
3424	3435	ClientData clientData) /* Pointer to record describing text. */
3425	3436	{
3426		register TkText textPtr = (TkText ) clientData;
	3437	register TkText *textPtr = clientData;
3427	3438	TkTextIndex index;
3428	3439	int x, y, w, h, charWidth;
3429	3440
3430	3441	if ((textPtr->state == TK_TEXT_STATE_DISABLED) \|\|
3431	3442	!(textPtr->flags & GOT_FOCUS) \|\| (textPtr->insertOffTime == 0)) {
	3443	if (!(textPtr->flags & GOT_FOCUS) &&
	3444	(textPtr->insertUnfocussed != TK_TEXT_INSERT_NOFOCUS_NONE)) {
	3445	/*
	3446	* The widget doesn't have the focus yet it is configured to
	3447	* display the cursor when it doesn't have the focus. Act now!
	3448	*/
	3449
	3450	textPtr->flags \|= INSERT_ON;
	3451	goto redrawInsert;
	3452	}
3432	3453	if ((textPtr->insertOffTime == 0) && !(textPtr->flags & INSERT_ON)) {
3433	3454	/*
3434	3455	* The widget was configured to have zero offtime while the

3443	3464	if (textPtr->flags & INSERT_ON) {
3444	3465	textPtr->flags &= ~INSERT_ON;
3445	3466	textPtr->insertBlinkHandler = Tcl_CreateTimerHandler(
3446		textPtr->insertOffTime, TextBlinkProc, (ClientData) textPtr);
	3467	textPtr->insertOffTime, TextBlinkProc, textPtr);
3447	3468	} else {
3448	3469	textPtr->flags \|= INSERT_ON;
3449	3470	textPtr->insertBlinkHandler = Tcl_CreateTimerHandler(
3450		textPtr->insertOnTime, TextBlinkProc, (ClientData) textPtr);
	3471	textPtr->insertOnTime, TextBlinkProc, textPtr);
3451	3472	}
3452	3473	redrawInsert:
3453	3474	TkTextMarkSegToIndex(textPtr, textPtr->insertMarkPtr, &index);

3574	3595	int i, argsLeft, code;
3575	3596	SearchSpec searchSpec;
3576	3597
3577		static const char *switchStrings[] = {
	3598	static const char *const switchStrings[] = {
3578	3599	"--", "-all", "-backwards", "-count", "-elide", "-exact", "-forwards",
3579	3600	"-hidden", "-nocase", "-nolinestop", "-overlap", "-regexp",
3580	3601	"-strictlimits", NULL

3603	3624	searchSpec.strictLimits = 0;
3604	3625	searchSpec.numLines =
3605	3626	TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr);
3606		searchSpec.clientData = (ClientData)textPtr;
	3627	searchSpec.clientData = textPtr;
3607	3628	searchSpec.addLineProc = &TextSearchAddNextLine;
3608	3629	searchSpec.foundMatchProc = &TextSearchFoundMatch;
3609	3630	searchSpec.lineIndexProc = &TextSearchGetLineIndex;

3788	3809	{
3789	3810	const TkTextIndex *indexPtr;
3790	3811	int line;
3791		TkText textPtr = (TkText ) searchSpecPtr->clientData;
	3812	TkText *textPtr = searchSpecPtr->clientData;
3792	3813
3793	3814	indexPtr = TkTextGetIndexFromObj(interp, textPtr, objPtr);
3794	3815	if (indexPtr == NULL) {

3853	3874	TkTextSegment *segPtr;
3854	3875	TkTextIndex curIndex;
3855	3876	int index, leftToScan;
3856		TkText textPtr = (TkText ) searchSpecPtr->clientData;
	3877	TkText *textPtr = searchSpecPtr->clientData;
3857	3878
3858	3879	index = 0;
3859	3880	curIndex.tree = textPtr->sharedTextPtr->tree;

3923	3944	TkTextLine linePtr, thisLinePtr;
3924	3945	TkTextIndex curIndex;
3925	3946	TkTextSegment *segPtr;
3926		TkText textPtr = (TkText ) searchSpecPtr->clientData;
	3947	TkText *textPtr = searchSpecPtr->clientData;
3927	3948	int nothingYet = 1;
3928	3949
3929	3950	/*

4000	4021	*lenPtr = Tcl_GetCharLength(theLine);
4001	4022	}
4002	4023	}
4003		return (ClientData)linePtr;
	4024	return linePtr;
4004	4025	}
4005	4026
4006	4027	/*

4044	4065	TkTextIndex curIndex, foundIndex;
4045	4066	TkTextSegment *segPtr;
4046	4067	TkTextLine *linePtr;
4047		TkText textPtr = (TkText ) searchSpecPtr->clientData;
	4068	TkText *textPtr = searchSpecPtr->clientData;
4048	4069
4049	4070	if (lineNum == searchSpecPtr->stopLine) {
4050	4071	/*

4095	4116	* reached the end of the match or we have reached the end of the line.
4096	4117	*/
4097	4118
4098		linePtr = (TkTextLine *)clientData;
	4119	linePtr = clientData;
4099	4120	if (linePtr == NULL) {
4100	4121	linePtr = TkBTreeFindLine(textPtr->sharedTextPtr->tree, textPtr,
4101	4122	lineNum);

4276	4297	/*
4277	4298	* Map these strings to TkTextTabAlign values.
4278	4299	*/
4279		static const char *tabOptionStrings[] = {
	4300	static const char *const tabOptionStrings[] = {
4280	4301	"left", "right", "center", "numeric", NULL
4281	4302	};
4282	4303

4325	4346	}
4326	4347
4327	4348	prevStop = lastStop;
4328		if (Tk_GetMMFromObj(interp, textPtr->tkwin, objv[i],
4329		&lastStop) != TCL_OK) {
	4349	if (Tk_GetDoublePixelsFromObj (interp, textPtr->tkwin, objv[i],
	4350	&lastStop) != TCL_OK) {
4330	4351	goto error;
4331	4352	}
4332		lastStop *= WidthOfScreen(Tk_Screen(textPtr->tkwin));
4333		lastStop /= WidthMMOfScreen(Tk_Screen(textPtr->tkwin));
4334	4353
4335	4354	if (i > 0 && (tabPtr->location <= (tabPtr-1)->location)) {
4336	4355	/*

4448	4467	#define TK_DUMP_IMG 0x10
4449	4468	#define TK_DUMP_ALL (TK_DUMP_TEXT\|TK_DUMP_MARK\|TK_DUMP_TAG\| \
4450	4469	TK_DUMP_WIN\|TK_DUMP_IMG)
4451		static const char *optStrings[] = {
	4470	static const char *const optStrings[] = {
4452	4471	"-all", "-command", "-image", "-mark", "-tag", "-text", "-window",
4453	4472	NULL
4454	4473	};

4684	4703	}
4685	4704	} else if ((offset >= startByte)) {
4686	4705	if ((what & TK_DUMP_MARK) && (segPtr->typePtr->name[0] == 'm')) {
4687		char *name;
	4706	const char *name;
4688	4707	TkTextMark markPtr = (TkTextMark ) &segPtr->body;
4689	4708
4690	4709	if (segPtr == textPtr->insertMarkPtr) {

4716	4735	} else if ((what & TK_DUMP_IMG) &&
4717	4736	(segPtr->typePtr->name[0] == 'i')) {
4718	4737	TkTextEmbImage eiPtr = (TkTextEmbImage )&segPtr->body;
4719		char *name = (eiPtr->name == NULL) ? "" : eiPtr->name;
	4738	const char *name = (eiPtr->name == NULL) ? "" : eiPtr->name;
4720	4739
4721	4740	TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
4722	4741	lineno, offset, &index);

4725	4744	} else if ((what & TK_DUMP_WIN) &&
4726	4745	(segPtr->typePtr->name[0] == 'w')) {
4727	4746	TkTextEmbWindow ewPtr = (TkTextEmbWindow )&segPtr->body;
4728		char *pathname;
	4747	const char *pathname;
4729	4748
4730	4749	if (ewPtr->tkwin == (Tk_Window) NULL) {
4731	4750	pathname = "";

4959	4978	{
4960	4979	int index;
4961	4980
4962		static const char *editOptionStrings[] = {
	4981	static const char *const editOptionStrings[] = {
4963	4982	"modified", "redo", "reset", "separator", "undo", NULL
4964	4983	};
4965	4984	enum editOptions {

5239	5258	* for regexp search, utf-8 bytes for exact search).
5240	5259	*/
5241	5260
5242		if ((*searchSpecPtr->lineIndexProc)(interp, fromPtr, searchSpecPtr,
	5261	if (searchSpecPtr->lineIndexProc(interp, fromPtr, searchSpecPtr,
5243	5262	&searchSpecPtr->startLine,
5244	5263	&searchSpecPtr->startOffset) != TCL_OK) {
5245	5264	return TCL_ERROR;

5251	5270
5252	5271	if (toPtr != NULL) {
5253	5272	const TkTextIndex indexToPtr, indexFromPtr;
5254		TkText textPtr = (TkText ) searchSpecPtr->clientData;
	5273	TkText *textPtr = searchSpecPtr->clientData;
5255	5274
5256	5275	indexToPtr = TkTextGetIndexFromObj(interp, textPtr, toPtr);
5257	5276	if (indexToPtr == NULL) {

5275	5294	}
5276	5295	}
5277	5296
5278		if ((*searchSpecPtr->lineIndexProc)(interp, toPtr, searchSpecPtr,
	5297	if (searchSpecPtr->lineIndexProc(interp, toPtr, searchSpecPtr,
5279	5298	&searchSpecPtr->stopLine,
5280	5299	&searchSpecPtr->stopOffset) != TCL_OK) {
5281	5300	return TCL_ERROR;

5461	5480	* this line, which is what 'lastOffset' represents.
5462	5481	*/
5463	5482
5464		lineInfo = (*searchSpecPtr->addLineProc)(lineNum, searchSpecPtr,
5465		theLine, &lastOffset, &linesSearched);
	5483	lineInfo = searchSpecPtr->addLineProc(lineNum, searchSpecPtr, theLine,
	5484	&lastOffset, &linesSearched);
5466	5485
5467	5486	if (lineInfo == NULL) {
5468	5487	/*

5646	5665	*/
5647	5666
5648	5667	if (extraLines > maxExtraLines) {
5649		if ((*searchSpecPtr->addLineProc)(lineNum
	5668	if (searchSpecPtr->addLineProc(lineNum
5650	5669	+ extraLines, searchSpecPtr, theLine,
5651	5670	&lastTotal, &extraLines) == NULL) {
5652	5671	p = NULL;

5726	5745	matchOffset = p - startOfLine;
5727	5746
5728	5747	if (searchSpecPtr->all &&
5729		!(*searchSpecPtr->foundMatchProc)(lineNum,
5730		searchSpecPtr, lineInfo, theLine, matchOffset,
5731		matchLength)) {
	5748	!searchSpecPtr->foundMatchProc(lineNum, searchSpecPtr,
	5749	lineInfo, theLine, matchOffset, matchLength)) {
5732	5750	/*
5733	5751	* We reached the end of the search.
5734	5752	*/

5869	5887	*/
5870	5888
5871	5889	if (extraLines > maxExtraLines) {
5872		if ((*searchSpecPtr->addLineProc)(lineNum
	5890	if (searchSpecPtr->addLineProc(lineNum
5873	5891	+ extraLines, searchSpecPtr, theLine,
5874	5892	&lastTotal, &extraLines) == NULL) {
5875	5893	/*

6048	6066
6049	6067	if (lastBackwardsLineMatch != -1) {
6050	6068	recordBackwardsMatch:
6051		(*searchSpecPtr->foundMatchProc)(
6052		lastBackwardsLineMatch, searchSpecPtr, NULL,
6053		NULL, lastBackwardsMatchOffset, matchLength);
	6069	searchSpecPtr->foundMatchProc(lastBackwardsLineMatch,
	6070	searchSpecPtr, NULL, NULL,
	6071	lastBackwardsMatchOffset, matchLength);
6054	6072	lastBackwardsLineMatch = -1;
6055	6073	if (!searchSpecPtr->all) {
6056	6074	goto searchDone;

6115	6133	*/
6116	6134
6117	6135	if (searchSpecPtr->all &&
6118		!(*searchSpecPtr->foundMatchProc)(lineNum,
	6136	!searchSpecPtr->foundMatchProc(lineNum,
6119	6137	searchSpecPtr, lineInfo, theLine, matchOffset,
6120	6138	matchLength)) {
6121	6139	/*

6206	6224	continue;
6207	6225	}
6208	6226	}
6209		(*searchSpecPtr->foundMatchProc)(lineNum, searchSpecPtr,
	6227	searchSpecPtr->foundMatchProc(lineNum, searchSpecPtr,
6210	6228	lineInfo, theLine, matchOffset, matchLength);
6211	6229	if (!searchSpecPtr->all) {
6212	6230	goto searchDone;

6221	6239	* non-all case.
6222	6240	*/
6223	6241
6224		(*searchSpecPtr->foundMatchProc)(lineNum, searchSpecPtr,
	6242	searchSpecPtr->foundMatchProc(lineNum, searchSpecPtr,
6225	6243	lineInfo, theLine, matchOffset, matchLength);
6226	6244	} else {
6227	6245	lastBackwardsLineMatch = lineNum;

6240	6258
6241	6259	if ((lastBackwardsLineMatch == -1) && (matchOffset >= 0)
6242	6260	&& !searchSpecPtr->all) {
6243		(*searchSpecPtr->foundMatchProc)(lineNum, searchSpecPtr, lineInfo,
	6261	searchSpecPtr->foundMatchProc(lineNum, searchSpecPtr, lineInfo,
6244	6262	theLine, matchOffset, matchLength);
6245	6263	goto searchDone;
6246	6264	}

6267	6285	if (lastBackwardsLineMatch != -1
6268	6286	&& ((lineNum < 0)
6269	6287	\|\| (lineNum + 2 < lastBackwardsLineMatch))) {
6270		(*searchSpecPtr->foundMatchProc)(lastBackwardsLineMatch,
	6288	searchSpecPtr->foundMatchProc(lastBackwardsLineMatch,
6271	6289	searchSpecPtr, NULL, NULL,
6272	6290	lastBackwardsMatchOffset, matchLength);
6273	6291	lastBackwardsLineMatch = -1;

6313	6331	searchDone:
6314	6332
6315	6333	if (lastBackwardsLineMatch != -1) {
6316		(*searchSpecPtr->foundMatchProc)(lastBackwardsLineMatch, searchSpecPtr,
	6334	searchSpecPtr->foundMatchProc(lastBackwardsLineMatch, searchSpecPtr,
6317	6335	NULL, NULL, lastBackwardsMatchOffset, matchLength);
6318	6336	}
6319	6337

+16

-34

generic/tkText.h less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkText.h,v 1.34 2007/12/13 15:24:17 dgp Exp $
	11	* RCS: @(#) $Id: tkText.h,v 1.36 2008/12/06 10:48:29 dkf Exp $
12	12	*/
13	13
14	14	#ifndef _TKTEXT

26	26	# undef TCL_STORAGE_CLASS
27	27	# define TCL_STORAGE_CLASS DLLEXPORT
28	28	#endif
29
30		/*
31		* Opaque types for structures whose guts are only needed by a single file.
32		*/
33
34		typedef struct TkTextBTree_ *TkTextBTree;
35	29
36	30	/*
37	31	* The data structure below defines a single logical line of text (from

584	578	} TkSharedText;
585	579
586	580	/*
	581	* The following enum is used to define a type for the -insertunfocussed
	582	* option of the Text widget.
	583	*/
	584
	585	typedef enum {
	586	TK_TEXT_INSERT_NOFOCUS_HOLLOW,
	587	TK_TEXT_INSERT_NOFOCUS_NONE,
	588	TK_TEXT_INSERT_NOFOCUS_SOLID
	589	} TkTextInsertUnfocussed;
	590
	591	/*
587	592	* A data structure of the following type is kept for each text widget that
588	593	* currently exists for this process:
589	594	*/

715	720	Tk_3DBorder insertBorder; /* Used to draw vertical bar for insertion
716	721	* cursor. */
717	722	int insertWidth; /* Total width of insert cursor. */
718		int insertBorderWidth; /* Width of 3-D border around insert cursor. */
	723	int insertBorderWidth; /* Width of 3-D border around insert cursor */
	724	TkTextInsertUnfocussed insertUnfocussed;
	725	/* How to display the insert cursor when the
	726	* text widget does not have the focus. */
719	727	int insertOnTime; /* Number of milliseconds cursor should spend
720	728	* in "on" state for each blink. */
721	729	int insertOffTime; /* Number of milliseconds cursor should spend

995	1003	MODULE_SCOPE TkTextLine TkBTreeNextLine(const TkText textPtr,
996	1004	TkTextLine *linePtr);
997	1005	MODULE_SCOPE int TkBTreeNextTag(TkTextSearch *searchPtr);
998		MODULE_SCOPE int TkBTreeNumLines(TkTextBTree tree,
999		const TkText *textPtr);
1000	1006	MODULE_SCOPE int TkBTreeNumPixels(TkTextBTree tree,
1001	1007	const TkText *textPtr);
1002	1008	MODULE_SCOPE TkTextLine TkBTreePreviousLine(TkText textPtr,

1016	1022	MODULE_SCOPE void TkTextBindProc(ClientData clientData,
1017	1023	XEvent *eventPtr);
1018	1024	MODULE_SCOPE void TkTextSelectionEvent(TkText *textPtr);
1019		MODULE_SCOPE void TkTextChanged(TkSharedText *sharedTextPtr,
1020		TkText textPtr, const TkTextIndex index1Ptr,
1021		const TkTextIndex *index2Ptr);
1022	1025	MODULE_SCOPE int TkTextIndexBbox(TkText *textPtr,
1023	1026	const TkTextIndex indexPtr, int xPtr, int *yPtr,
1024	1027	int widthPtr, int heightPtr, int *charWidthPtr);

1039	1042	MODULE_SCOPE void TkTextFreeDInfo(TkText *textPtr);
1040	1043	MODULE_SCOPE void TkTextDeleteTag(TkText textPtr, TkTextTag tagPtr);
1041	1044	MODULE_SCOPE void TkTextFreeTag(TkText textPtr, TkTextTag tagPtr);
1042		MODULE_SCOPE int TkTextGetIndex(Tcl_Interp interp, TkText textPtr,
1043		const char string, TkTextIndex indexPtr);
1044	1045	MODULE_SCOPE int TkTextGetObjIndex(Tcl_Interp interp, TkText textPtr,
1045	1046	Tcl_Obj idxPtr, TkTextIndex indexPtr);
1046	1047	MODULE_SCOPE int TkTextSharedGetObjIndex(Tcl_Interp *interp,

1052	1053	TkText textPtr, Tcl_Obj stringPtr);
1053	1054	MODULE_SCOPE void TkTextFindDisplayLineEnd(TkText *textPtr,
1054	1055	TkTextIndex indexPtr, int end, int xOffset);
1055		MODULE_SCOPE int TkTextIndexBackBytes(const TkText *textPtr,
1056		const TkTextIndex *srcPtr, int count,
1057		TkTextIndex *dstPtr);
1058	1056	MODULE_SCOPE void TkTextIndexBackChars(const TkText *textPtr,
1059	1057	const TkTextIndex *srcPtr, int count,
1060	1058	TkTextIndex *dstPtr, TkTextCountType type);

1064	1062	const TkTextIndex *index1Ptr,
1065	1063	const TkTextIndex *index2Ptr,
1066	1064	TkTextCountType type);
1067		MODULE_SCOPE int TkTextIndexForwBytes(const TkText *textPtr,
1068		const TkTextIndex *srcPtr, int count,
1069		TkTextIndex *dstPtr);
1070	1065	MODULE_SCOPE void TkTextIndexForwChars(const TkText *textPtr,
1071	1066	const TkTextIndex *srcPtr, int count,
1072	1067	TkTextIndex *dstPtr, TkTextCountType type);

1076	1071	const TkTextIndex *indexPtr);
1077	1072	MODULE_SCOPE TkTextSegment TkTextIndexToSeg(const TkTextIndex indexPtr,
1078	1073	int *offsetPtr);
1079		MODULE_SCOPE void TkTextInsertDisplayProc(TkText *textPtr,
1080		TkTextDispChunk *chunkPtr, int x, int y,
1081		int height, int baseline, Display *display,
1082		Drawable dst, int screenY);
1083	1074	MODULE_SCOPE void TkTextLostSelection(ClientData clientData);
1084	1075	MODULE_SCOPE TkTextIndex TkTextMakeCharIndex(TkTextBTree tree, TkText textPtr,
1085	1076	int lineIndex, int charIndex,

1090	1081	MODULE_SCOPE int TkTextIsElided(const TkText *textPtr,
1091	1082	const TkTextIndex *indexPtr,
1092	1083	TkTextElideInfo *infoPtr);
1093		MODULE_SCOPE TkTextIndex *TkTextMakeByteIndex(TkTextBTree tree,
1094		const TkText *textPtr, int lineIndex,
1095		int byteIndex, TkTextIndex *indexPtr);
1096	1084	MODULE_SCOPE int TkTextMakePixelIndex(TkText *textPtr,
1097	1085	int pixelIndex, TkTextIndex *indexPtr);
1098	1086	MODULE_SCOPE void TkTextInvalidateLineMetrics(

1113	1101	MODULE_SCOPE void TkTextPickCurrent(TkText textPtr, XEvent eventPtr);
1114	1102	MODULE_SCOPE void TkTextPixelIndex(TkText *textPtr, int x, int y,
1115	1103	TkTextIndex indexPtr, int nearest);
1116		MODULE_SCOPE int TkTextPrintIndex(const TkText *textPtr,
1117		const TkTextIndex indexPtr, char string);
1118	1104	MODULE_SCOPE Tcl_Obj * TkTextNewIndexObj(TkText *textPtr,
1119	1105	const TkTextIndex *indexPtr);
1120	1106	MODULE_SCOPE void TkTextRedrawRegion(TkText *textPtr, int x, int y,

1130	1116	int objc, Tcl_Obj *const objv[]);
1131	1117	MODULE_SCOPE int TkTextSegToOffset(const TkTextSegment *segPtr,
1132	1118	const TkTextLine *linePtr);
1133		MODULE_SCOPE TkTextSegment TkTextSetMark(TkText textPtr,
1134		const char name, TkTextIndex indexPtr);
1135	1119	MODULE_SCOPE void TkTextSetYView(TkText *textPtr,
1136	1120	TkTextIndex *indexPtr, int pickPlace);
1137	1121	MODULE_SCOPE int TkTextTagCmd(TkText textPtr, Tcl_Interp interp,

1144	1128	int objc, Tcl_Obj *const objv[]);
1145	1129	MODULE_SCOPE int TkTextWindowIndex(TkText textPtr, const char name,
1146	1130	TkTextIndex *indexPtr);
1147		MODULE_SCOPE int TkTextXviewCmd(TkText textPtr, Tcl_Interp interp,
1148		int objc, Tcl_Obj *const objv[]);
1149	1131	MODULE_SCOPE int TkTextYviewCmd(TkText textPtr, Tcl_Interp interp,
1150	1132	int objc, Tcl_Obj *const objv[]);
1151	1133	MODULE_SCOPE void TkTextWinFreeClient(Tcl_HashEntry *hPtr,

+7

-7

generic/tkTextBTree.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkTextBTree.c,v 1.27 2007/12/13 15:24:17 dgp Exp $
	13	* RCS: @(#) $Id: tkTextBTree.c,v 1.28 2008/11/08 18:44:40 dkf Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

866	866	while (linePtr->segPtr != NULL) {
867	867	segPtr = linePtr->segPtr;
868	868	linePtr->segPtr = segPtr->nextPtr;
869		(*segPtr->typePtr->deleteProc)(segPtr, linePtr, 1);
	869	segPtr->typePtr->deleteProc(segPtr, linePtr, 1);
870	870	}
871	871	ckfree((char *) linePtr->pixels);
872	872	ckfree((char *) linePtr);

1206	1206	if (count == 0) {
1207	1207	return prevPtr;
1208	1208	}
1209		segPtr = (*segPtr->typePtr->splitProc)(segPtr, count);
	1209	segPtr = segPtr->typePtr->splitProc(segPtr, count);
1210	1210	if (prevPtr == NULL) {
1211	1211	indexPtr->linePtr->segPtr = segPtr;
1212	1212	} else {

1281	1281	segPtr != NULL;
1282	1282	prevPtrPtr = &(prevPtrPtr)->nextPtr, segPtr = prevPtrPtr) {
1283	1283	if (segPtr->typePtr->cleanupProc != NULL) {
1284		prevPtrPtr = (segPtr->typePtr->cleanupProc)(segPtr, linePtr);
	1284	*prevPtrPtr = segPtr->typePtr->cleanupProc(segPtr, linePtr);
1285	1285	if (segPtr != *prevPtrPtr) {
1286	1286	anyChanges = 1;
1287	1287	}

1451	1451	}
1452	1452
1453	1453	nextPtr = segPtr->nextPtr;
1454		if ((*segPtr->typePtr->deleteProc)(segPtr, curLinePtr, 0) != 0) {
	1454	if (segPtr->typePtr->deleteProc(segPtr, curLinePtr, 0) != 0) {
1455	1455	/*
1456	1456	* This segment refuses to die. Move it to prevPtr and advance
1457	1457	* prevPtr if the segment has left gravity.

1482	1482	for (segPtr = lastPtr; segPtr != NULL;
1483	1483	segPtr = segPtr->nextPtr) {
1484	1484	if (segPtr->typePtr->lineChangeProc != NULL) {
1485		(*segPtr->typePtr->lineChangeProc)(segPtr, index2Ptr->linePtr);
	1485	segPtr->typePtr->lineChangeProc(segPtr, index2Ptr->linePtr);
1486	1486	}
1487	1487	}
1488	1488	curNodePtr = index2Ptr->linePtr->parentPtr;

3934	3934	for (segPtr = linePtr->segPtr; segPtr != NULL;
3935	3935	segPtr = segPtr->nextPtr) {
3936	3936	if (segPtr->typePtr->checkProc != NULL) {
3937		(*segPtr->typePtr->checkProc)(segPtr, linePtr);
	3937	segPtr->typePtr->checkProc(segPtr, linePtr);
3938	3938	}
3939	3939	if ((segPtr->size == 0) && (!segPtr->typePtr->leftGravity)
3940	3940	&& (segPtr->nextPtr != NULL)

+260

-267

generic/tkTextDisp.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkTextDisp.c,v 1.69 2008/04/27 22:38:58 dkf Exp $
	14	* RCS: @(#) $Id: tkTextDisp.c,v 1.72 2008/12/09 21:22:56 dgp Exp $
15	15	*/
16	16
17	17	#include "tkInt.h"

445	445	* LayoutDLine(). */
446	446	} BaseCharInfo;
447	447
	448	/* TODO: Thread safety */
448	449	static TkTextDispChunk *baseCharChunkPtr = NULL;
449	450
450	451	#endif /* TK_LAYOUT_WITH_BASE_CHUNKS */

660	661
661	662	textPtr->refCount++;
662	663	dInfoPtr->lineUpdateTimer = Tcl_CreateTimerHandler(0,
663		AsyncUpdateLineMetrics, (ClientData) textPtr);
	664	AsyncUpdateLineMetrics, textPtr);
664	665	textPtr->refCount++;
665	666	dInfoPtr->scrollbarTimer = Tcl_CreateTimerHandler(200,
666		AsyncUpdateYScrollbar, (ClientData) textPtr);
	667	AsyncUpdateYScrollbar, textPtr);
667	668
668	669	textPtr->dInfoPtr = dInfoPtr;
669	670	}

705	706	}
706	707	Tk_FreeGC(textPtr->display, dInfoPtr->scrollGC);
707	708	if (dInfoPtr->flags & REDRAW_PENDING) {
708		Tcl_CancelIdleCall(DisplayText, (ClientData) textPtr);
	709	Tcl_CancelIdleCall(DisplayText, textPtr);
709	710	}
710	711	if (dInfoPtr->lineUpdateTimer != NULL) {
711	712	Tcl_DeleteTimerHandler(dInfoPtr->lineUpdateTimer);

1264	1265	*/
1265	1266
1266	1267	TkTextLine *linePtr = TkBTreeNextLine(NULL, curIndex.linePtr);
1267		if (linePtr != NULL) {
1268		dlPtr->logicalLinesMerged++;
1269		curIndex.byteIndex = 0;
1270		curIndex.linePtr = linePtr;
1271		segPtr = curIndex.linePtr->segPtr;
1272		} else {
	1268	if (linePtr == NULL) {
1273	1269	break;
1274	1270	}
	1271
	1272	dlPtr->logicalLinesMerged++;
	1273	curIndex.byteIndex = 0;
	1274	curIndex.linePtr = linePtr;
	1275	segPtr = curIndex.linePtr->segPtr;
1275	1276	}
1276	1277	}
1277	1278

1458	1459
1459	1460	code = 1;
1460	1461	} else {
1461		code = (*segPtr->typePtr->layoutProc)(textPtr, &curIndex, segPtr,
	1462	code = segPtr->typePtr->layoutProc(textPtr, &curIndex, segPtr,
1462	1463	byteOffset, maxX-tabSize, maxBytes, noCharsYet, wrapMode,
1463	1464	chunkPtr);
1464	1465	}

1610	1611	FreeStyle(textPtr, chunkPtr->stylePtr);
1611	1612	breakChunkPtr->nextPtr = chunkPtr->nextPtr;
1612	1613	if (chunkPtr->undisplayProc != NULL) {
1613		(*chunkPtr->undisplayProc)(textPtr, chunkPtr);
	1614	chunkPtr->undisplayProc(textPtr, chunkPtr);
1614	1615	}
1615	1616	ckfree((char *) chunkPtr);
1616	1617	}
1617	1618	if (breakByteOffset != breakChunkPtr->numBytes) {
1618	1619	if (breakChunkPtr->undisplayProc != NULL) {
1619		(*breakChunkPtr->undisplayProc)(textPtr, breakChunkPtr);
	1620	breakChunkPtr->undisplayProc(textPtr, breakChunkPtr);
1620	1621	}
1621	1622	segPtr = TkTextIndexToSeg(&breakIndex, &byteOffset);
1622		(*segPtr->typePtr->layoutProc)(textPtr, &breakIndex,
1623		segPtr, byteOffset, maxX, breakByteOffset, 0,
1624		wrapMode, breakChunkPtr);
	1623	segPtr->typePtr->layoutProc(textPtr, &breakIndex, segPtr,
	1624	byteOffset, maxX, breakByteOffset, 0, wrapMode,
	1625	breakChunkPtr);
1625	1626	#if TK_LAYOUT_WITH_BASE_CHUNKS
1626	1627	FinalizeBaseChunk(NULL);
1627	1628	#endif /* TK_LAYOUT_WITH_BASE_CHUNKS */

2305	2306	for (chunkPtr = firstPtr->chunkPtr; chunkPtr != NULL;
2306	2307	chunkPtr = nextChunkPtr) {
2307	2308	if (chunkPtr->undisplayProc != NULL) {
2308		(*chunkPtr->undisplayProc)(textPtr, chunkPtr);
	2309	chunkPtr->undisplayProc(textPtr, chunkPtr);
2309	2310	}
2310	2311	FreeStyle(textPtr, chunkPtr->stylePtr);
2311	2312	nextChunkPtr = chunkPtr->nextPtr;

2403	2404	if (chunkPtr->displayProc == TkTextInsertDisplayProc) {
2404	2405	int x = chunkPtr->x + dInfoPtr->x - dInfoPtr->curXPixelOffset;
2405	2406
2406		(*chunkPtr->displayProc)(textPtr, chunkPtr, x,
	2407	chunkPtr->displayProc(textPtr, chunkPtr, x,
2407	2408	y + dlPtr->spaceAbove,
2408	2409	dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
2409	2410	dlPtr->baseline - dlPtr->spaceAbove, display, pixmap,

2451	2452
2452	2453	x = -chunkPtr->width;
2453	2454	}
2454		(*chunkPtr->displayProc)(textPtr, chunkPtr, x,
	2455	chunkPtr->displayProc(textPtr, chunkPtr, x,
2455	2456	y + dlPtr->spaceAbove, dlPtr->height - dlPtr->spaceAbove -
2456	2457	dlPtr->spaceBelow, dlPtr->baseline - dlPtr->spaceAbove,
2457	2458	display, pixmap, dlPtr->y + dlPtr->spaceAbove);

2725	2726	rightX2 + xOffset, y, sValuePtr->borderWidth,
2726	2727	sValuePtr->borderWidth, 1, sValuePtr->relief);
2727	2728	Tk_3DHorizontalBevel(textPtr->tkwin, pixmap, sValuePtr->border,
2728		leftX + xOffset, y, rightX2 + sValuePtr->borderWidth -
	2729	leftX + xOffset, y, rightX2 + sValuePtr->borderWidth -
2729	2730	leftX, sValuePtr->borderWidth, leftXIn, 0, 1,
2730	2731	sValuePtr->relief);
2731	2732	}

2877	2878	AsyncUpdateLineMetrics(
2878	2879	ClientData clientData) /* Information about widget. */
2879	2880	{
2880		register TkText textPtr = (TkText ) clientData;
	2881	register TkText *textPtr = clientData;
2881	2882	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
2882	2883	int lineNum;
2883	2884

2947	2948	*/
2948	2949
2949	2950	dInfoPtr->lineUpdateTimer = Tcl_CreateTimerHandler(1,
2950		AsyncUpdateLineMetrics, (ClientData) textPtr);
	2951	AsyncUpdateLineMetrics, textPtr);
2951	2952	}
2952	2953
2953	2954	/*

3048	3049	*/
3049	3050
3050	3051	if (TkBTreeLinePixelEpoch(textPtr, linePtr)
3051		!= textPtr->dInfoPtr->lineMetricUpdateEpoch) {
3052		if (doThisMuch == -1) {
3053		count += 8 * TkTextUpdateOneLine(textPtr, linePtr, 0,
3054		NULL, 0);
3055		} else {
3056		TkTextIndex index;
3057		TkTextIndex *indexPtr;
3058		int pixelHeight;
3059
3060		/*
3061		* If the metric epoch is the same as the widget's epoch,
3062		* then we know that indexPtrs are still valid, and if the
3063		* cached metricIndex (if any) is for the same line as we
3064		* wish to examine, then we are looking at a long line
3065		* wrapped many times, which we will examine in pieces.
3066		*/
3067
3068		if (textPtr->dInfoPtr->metricEpoch ==
3069		textPtr->sharedTextPtr->stateEpoch &&
3070		textPtr->dInfoPtr->metricIndex.linePtr==linePtr) {
3071		indexPtr = &textPtr->dInfoPtr->metricIndex;
3072		pixelHeight = textPtr->dInfoPtr->metricPixelHeight;
3073		} else {
3074		/*
3075		* We must reset the partial line height calculation
3076		* data here, so we don't use it when it is out of
3077		* date.
3078		*/
3079
3080		textPtr->dInfoPtr->metricEpoch = -1;
3081		index.tree = textPtr->sharedTextPtr->tree;
3082		index.linePtr = linePtr;
3083		index.byteIndex = 0;
3084		index.textPtr = NULL;
3085		indexPtr = &index;
3086		pixelHeight = 0;
3087		}
3088
3089		/*
3090		* Update the line and update the counter, counting 8 for
3091		* each display line we actually re-layout.
3092		*/
3093
3094		count += 8 * TkTextUpdateOneLine(textPtr, linePtr,
3095		pixelHeight, indexPtr, 1);
3096
3097		if (indexPtr->linePtr == linePtr) {
3098		/*
3099		* We didn't complete the logical line, because it
3100		* produced very many display lines - it must be a
3101		* long line wrapped many times. So we must cache as
3102		* far as we got for next time around.
3103		*/
3104
3105		if (pixelHeight == 0) {
3106		/*
3107		* These have already been stored, unless we just
3108		* started the new line.
3109		*/
3110
3111		textPtr->dInfoPtr->metricIndex = index;
3112		textPtr->dInfoPtr->metricEpoch =
3113		textPtr->sharedTextPtr->stateEpoch;
3114		}
3115		textPtr->dInfoPtr->metricPixelHeight =
3116		TkBTreeLinePixelCount(textPtr, linePtr);
3117		break;
3118		} else {
3119		/*
3120		* We're done with this long line.
3121		*/
3122
3123		textPtr->dInfoPtr->metricEpoch = -1;
3124		}
3125		}
3126		} else {
	3052	== textPtr->dInfoPtr->lineMetricUpdateEpoch) {
3127	3053	/*
3128	3054	* This line is already up to date. That means there's nothing
3129	3055	* to do here.
3130	3056	*/
	3057	} else if (doThisMuch == -1) {
	3058	count += 8 * TkTextUpdateOneLine(textPtr, linePtr, 0,NULL,0);
	3059	} else {
	3060	TkTextIndex index;
	3061	TkTextIndex *indexPtr;
	3062	int pixelHeight;
	3063
	3064	/*
	3065	* If the metric epoch is the same as the widget's epoch, then
	3066	* we know that indexPtrs are still valid, and if the cached
	3067	* metricIndex (if any) is for the same line as we wish to
	3068	* examine, then we are looking at a long line wrapped many
	3069	* times, which we will examine in pieces.
	3070	*/
	3071
	3072	if (textPtr->dInfoPtr->metricEpoch ==
	3073	textPtr->sharedTextPtr->stateEpoch &&
	3074	textPtr->dInfoPtr->metricIndex.linePtr==linePtr) {
	3075	indexPtr = &textPtr->dInfoPtr->metricIndex;
	3076	pixelHeight = textPtr->dInfoPtr->metricPixelHeight;
	3077	} else {
	3078	/*
	3079	* We must reset the partial line height calculation data
	3080	* here, so we don't use it when it is out of date.
	3081	*/
	3082
	3083	textPtr->dInfoPtr->metricEpoch = -1;
	3084	index.tree = textPtr->sharedTextPtr->tree;
	3085	index.linePtr = linePtr;
	3086	index.byteIndex = 0;
	3087	index.textPtr = NULL;
	3088	indexPtr = &index;
	3089	pixelHeight = 0;
	3090	}
	3091
	3092	/*
	3093	* Update the line and update the counter, counting 8 for each
	3094	* display line we actually re-layout.
	3095	*/
	3096
	3097	count += 8 * TkTextUpdateOneLine(textPtr, linePtr,
	3098	pixelHeight, indexPtr, 1);
	3099
	3100	if (indexPtr->linePtr == linePtr) {
	3101	/*
	3102	* We didn't complete the logical line, because it
	3103	* produced very many display lines, which must be because
	3104	* it must be a long line wrapped many times. So we must
	3105	* cache as far as we got for next time around.
	3106	*/
	3107
	3108	if (pixelHeight == 0) {
	3109	/*
	3110	* These have already been stored, unless we just
	3111	* started the new line.
	3112	*/
	3113
	3114	textPtr->dInfoPtr->metricIndex = index;
	3115	textPtr->dInfoPtr->metricEpoch =
	3116	textPtr->sharedTextPtr->stateEpoch;
	3117	}
	3118	textPtr->dInfoPtr->metricPixelHeight =
	3119	TkBTreeLinePixelCount(textPtr, linePtr);
	3120	break;
	3121	}
	3122
	3123	/*
	3124	* We're done with this long line.
	3125	*/
	3126
	3127	textPtr->dInfoPtr->metricEpoch = -1;
3131	3128	}
3132	3129	} else {
3133	3130	/*

3328	3325	if (dInfoPtr->lineUpdateTimer == NULL) {
3329	3326	textPtr->refCount++;
3330	3327	dInfoPtr->lineUpdateTimer = Tcl_CreateTimerHandler(1,
3331		AsyncUpdateLineMetrics, (ClientData) textPtr);
	3328	AsyncUpdateLineMetrics, textPtr);
3332	3329	}
3333	3330	}
3334	3331

3378	3375	* of the original index within its display
3379	3376	* line. */
3380	3377	{
	3378	TkTextIndex index;
	3379
3381	3380	if (!end && indexPtr->byteIndex == 0) {
3382	3381	/*
3383	3382	* Nothing to do.

3387	3386	*xOffset = 0;
3388	3387	}
3389	3388	return;
3390		} else {
3391		TkTextIndex index = *indexPtr;
3392
	3389	}
	3390
	3391	index = *indexPtr;
	3392	index.byteIndex = 0;
	3393	index.textPtr = NULL;
	3394
	3395	while (1) {
	3396	TkTextIndex endOfLastLine;
	3397
	3398	if (TkTextIndexBackBytes(textPtr, &index, 1, &endOfLastLine)) {
	3399	/*
	3400	* Reached beginning of text.
	3401	*/
	3402
	3403	break;
	3404	}
	3405
	3406	if (!TkTextIsElided(textPtr, &endOfLastLine, NULL)) {
	3407	/*
	3408	* The eol is not elided, so 'index' points to the start of a
	3409	* display line (as well as logical line).
	3410	*/
	3411
	3412	break;
	3413	}
	3414
	3415	/*
	3416	* indexPtr's logical line is actually merged with the previous
	3417	* logical line whose eol is elided. Continue searching back to get a
	3418	* real line start.
	3419	*/
	3420
	3421	index = endOfLastLine;
3393	3422	index.byteIndex = 0;
3394		index.textPtr = NULL;
3395
3396		while (1) {
3397		TkTextIndex endOfLastLine;
3398
3399		if (TkTextIndexBackBytes(textPtr, &index, 1, &endOfLastLine)) {
	3423	}
	3424
	3425	while (1) {
	3426	DLine *dlPtr;
	3427	int byteCount;
	3428	TkTextIndex nextLineStart;
	3429
	3430	dlPtr = LayoutDLine(textPtr, &index);
	3431	byteCount = dlPtr->byteCount;
	3432
	3433	TkTextIndexForwBytes(textPtr, &index, byteCount, &nextLineStart);
	3434
	3435	/*
	3436	* 'byteCount' goes up to the beginning of the next display line, so
	3437	* equality here says we need one more line. We try to perform a quick
	3438	* comparison which is valid for the case where the logical line is
	3439	* the same, but otherwise fall back on a full TkTextIndexCmp.
	3440	*/
	3441
	3442	if (((index.linePtr == indexPtr->linePtr)
	3443	&& (index.byteIndex + byteCount > indexPtr->byteIndex))
	3444	\|\| (dlPtr->logicalLinesMerged > 0
	3445	&& TkTextIndexCmp(&nextLineStart, indexPtr) > 0)) {
	3446	/*
	3447	* It's on this display line.
	3448	*/
	3449
	3450	if (xOffset != NULL) {
3400	3451	/*
3401		* Reached beginning of text.
	3452	* This call takes a byte index relative to the start of the
	3453	* current _display_ line, not logical line. We are about to
	3454	* overwrite indexPtr->byteIndex, so we must do this now.
3402	3455	*/
3403	3456
3404		break;
3405		}
3406
3407		if (!TkTextIsElided(textPtr, &endOfLastLine, NULL)) {
	3457	*xOffset = DlineXOfIndex(textPtr, dlPtr,
	3458	indexPtr->byteIndex - dlPtr->index.byteIndex);
	3459	}
	3460	if (end) {
3408	3461	/*
3409		* The eol is not elided, so 'index' points to the start of a
3410		* display line (as well as logical line).
	3462	* The index we want is one less than the number of bytes in
	3463	* the display line.
3411	3464	*/
3412	3465
3413		break;
3414		}
3415
3416		/*
3417		* indexPtr's logical line is actually merged with the previous
3418		* logical line whose eol is elided. Continue searching back to
3419		* get a real line start.
3420		*/
3421
3422		index = endOfLastLine;
3423		index.byteIndex = 0;
3424		}
3425
3426		while (1) {
3427		DLine *dlPtr;
3428		int byteCount;
3429		TkTextIndex nextLineStart;
3430
3431		dlPtr = LayoutDLine(textPtr, &index);
3432		byteCount = dlPtr->byteCount;
3433
3434		TkTextIndexForwBytes(textPtr, &index, byteCount, &nextLineStart);
3435
3436		/*
3437		* 'byteCount' goes up to the beginning of the next display line,
3438		* so equality here says we need one more line. We try to perform
3439		* a quick comparison which is valid for the case where the
3440		* logical line is the same, but otherwise fall back on a full
3441		* TkTextIndexCmp.
3442		*/
3443
3444		if (((index.linePtr == indexPtr->linePtr)
3445		&& (index.byteIndex + byteCount > indexPtr->byteIndex))
3446		\|\| (dlPtr->logicalLinesMerged > 0
3447		&& TkTextIndexCmp(&nextLineStart, indexPtr) > 0)) {
3448		/*
3449		* It's on this display line.
3450		*/
3451
3452		if (xOffset != NULL) {
3453		/*
3454		* This call takes a byte index relative to the start of
3455		* the current _display_ line, not logical line. We are
3456		* about to overwrite indexPtr->byteIndex, so we must do
3457		* this now.
3458		*/
3459
3460		*xOffset = DlineXOfIndex(textPtr, dlPtr,
3461		indexPtr->byteIndex - dlPtr->index.byteIndex);
3462		}
3463		if (end) {
3464		/*
3465		* The index we want is one less than the number of bytes
3466		* in the display line.
3467		*/
3468
3469		TkTextIndexBackBytes(textPtr, &nextLineStart, 1, indexPtr);
3470		} else {
3471		*indexPtr = index;
3472		}
3473		FreeDLines(textPtr, dlPtr, NULL, DLINE_FREE_TEMP);
3474		return;
	3466	TkTextIndexBackBytes(textPtr, &nextLineStart, 1, indexPtr);
	3467	} else {
	3468	*indexPtr = index;
3475	3469	}
3476	3470	FreeDLines(textPtr, dlPtr, NULL, DLINE_FREE_TEMP);
3477		index = nextLineStart;
3478		}
	3471	return;
	3472	}
	3473
	3474	FreeDLines(textPtr, dlPtr, NULL, DLINE_FREE_TEMP);
	3475	index = nextLineStart;
3479	3476	}
3480	3477	}
3481	3478

3859	3856	if (textPtr->dInfoPtr->scrollbarTimer == NULL) {
3860	3857	textPtr->refCount++;
3861	3858	textPtr->dInfoPtr->scrollbarTimer = Tcl_CreateTimerHandler(200,
3862		AsyncUpdateYScrollbar, (ClientData) textPtr);
	3859	AsyncUpdateYScrollbar, textPtr);
3863	3860	}
3864	3861	return displayLines;
3865	3862	}

3885	3882	DisplayText(
3886	3883	ClientData clientData) /* Information about widget. */
3887	3884	{
3888		register TkText textPtr = (TkText ) clientData;
	3885	register TkText *textPtr = clientData;
3889	3886	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
3890	3887	register DLine *dlPtr;
3891	3888	DLine *prevPtr;

3904	3901	}
3905	3902
3906	3903	interp = textPtr->interp;
3907		Tcl_Preserve((ClientData) interp);
	3904	Tcl_Preserve(interp);
3908	3905
3909	3906	if (tkTextDebug) {
3910	3907	Tcl_SetVar2(interp, "tk_textRelayout", NULL, "", TCL_GLOBAL_ONLY);

4342	4339	}
4343	4340
4344	4341	end:
4345		Tcl_Release((ClientData) interp);
	4342	Tcl_Release(interp);
4346	4343	}
4347	4344
4348	4345	/*

4371	4368	dInfoPtr->flags \|= REPICK_NEEDED;
4372	4369	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
4373	4370	dInfoPtr->flags \|= REDRAW_PENDING;
4374		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	4371	Tcl_DoWhenIdle(DisplayText, textPtr);
4375	4372	}
4376	4373	}
4377	4374

4415	4412
4416	4413	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
4417	4414	dInfoPtr->flags \|= REDRAW_PENDING;
4418		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	4415	Tcl_DoWhenIdle(DisplayText, textPtr);
4419	4416	}
4420	4417	TkDestroyRegion(damageRgn);
4421	4418	}

4552	4549	*/
4553	4550
4554	4551	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
4555		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	4552	Tcl_DoWhenIdle(DisplayText, textPtr);
4556	4553	}
4557	4554	dInfoPtr->flags \|= REDRAW_PENDING\|DINFO_OUT_OF_DATE\|REPICK_NEEDED;
4558	4555

4734	4731	*/
4735	4732
4736	4733	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
4737		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	4734	Tcl_DoWhenIdle(DisplayText, textPtr);
4738	4735	}
4739	4736	dInfoPtr->flags \|= REDRAW_PENDING\|DINFO_OUT_OF_DATE\|REPICK_NEEDED;
4740	4737

4839	4836	*/
4840	4837
4841	4838	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
4842		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	4839	Tcl_DoWhenIdle(DisplayText, textPtr);
4843	4840	}
4844	4841	dInfoPtr->flags \|= REDRAW_PENDING\|REDRAW_BORDERS\|DINFO_OUT_OF_DATE
4845	4842	\|REPICK_NEEDED;

4934	4931	if (dInfoPtr->lineUpdateTimer == NULL) {
4935	4932	textPtr->refCount++;
4936	4933	dInfoPtr->lineUpdateTimer = Tcl_CreateTimerHandler(1,
4937		AsyncUpdateLineMetrics, (ClientData) textPtr);
	4934	AsyncUpdateLineMetrics, textPtr);
4938	4935	}
4939	4936	}
4940	4937	}

5118	5115
5119	5116	scheduleUpdate:
5120	5117	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
5121		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	5118	Tcl_DoWhenIdle(DisplayText, textPtr);
5122	5119	}
5123	5120	dInfoPtr->flags \|= REDRAW_PENDING\|DINFO_OUT_OF_DATE\|REPICK_NEEDED;
5124	5121	}

5384	5381	*/
5385	5382
5386	5383	if (chunkPtr != NULL) {
5387		(*chunkPtr->bboxProc)(textPtr, chunkPtr, byteCount,
	5384	chunkPtr->bboxProc(textPtr, chunkPtr, byteCount,
5388	5385	dlPtr->y + dlPtr->spaceAbove,
5389	5386	dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
5390	5387	dlPtr->baseline - dlPtr->spaceAbove, &x, &y, &width,

5398	5395	dInfoPtr->newXPixelOffset -= ((-delta) );
5399	5396	}
5400	5397	} else {
5401		delta -= (lineWidth - width);
5402		if (delta > 0) {
5403		if (delta > oneThird) {
5404		dInfoPtr->newXPixelOffset = (x - lineWidth/2);
5405		} else {
5406		dInfoPtr->newXPixelOffset += (delta );
5407		}
	5398	delta -= lineWidth - width;
	5399	if (delta <= 0) {
	5400	return TCL_OK;
	5401	} else if (delta > oneThird) {
	5402	dInfoPtr->newXPixelOffset = (x - lineWidth/2);
5408	5403	} else {
5409		return TCL_OK;
	5404	dInfoPtr->newXPixelOffset += (delta );
5410	5405	}
5411	5406	}
5412	5407	}
5413	5408	dInfoPtr->flags \|= DINFO_OUT_OF_DATE;
5414	5409	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
5415	5410	dInfoPtr->flags \|= REDRAW_PENDING;
5416		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	5411	Tcl_DoWhenIdle(DisplayText, textPtr);
5417	5412	}
5418	5413	return TCL_OK;
5419	5414	}

5494	5489	dInfoPtr->flags \|= DINFO_OUT_OF_DATE;
5495	5490	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
5496	5491	dInfoPtr->flags \|= REDRAW_PENDING;
5497		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	5492	Tcl_DoWhenIdle(DisplayText, textPtr);
5498	5493	}
5499	5494	return TCL_OK;
5500	5495	}

5579	5574	return;
5580	5575	}
5581	5576	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
5582		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	5577	Tcl_DoWhenIdle(DisplayText, textPtr);
5583	5578	}
5584	5579	dInfoPtr->flags \|= REDRAW_PENDING\|DINFO_OUT_OF_DATE\|REPICK_NEEDED;
5585	5580	}

5696	5691
5697	5692	scheduleUpdate:
5698	5693	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
5699		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	5694	Tcl_DoWhenIdle(DisplayText, textPtr);
5700	5695	}
5701	5696	dInfoPtr->flags \|= REDRAW_PENDING\|DINFO_OUT_OF_DATE\|REPICK_NEEDED;
5702	5697	}

5976	5971	dInfoPtr->flags \|= DINFO_OUT_OF_DATE;
5977	5972	if (!(dInfoPtr->flags & REDRAW_PENDING)) {
5978	5973	dInfoPtr->flags \|= REDRAW_PENDING;
5979		Tcl_DoWhenIdle(DisplayText, (ClientData) textPtr);
	5974	Tcl_DoWhenIdle(DisplayText, textPtr);
5980	5975	}
5981	5976	} else if (c=='m' && strncmp(Tcl_GetString(objv[2]), "mark", length)==0) {
5982	5977	dInfoPtr->scanMarkXPixel = dInfoPtr->newXPixelOffset;

6067	6062	if (code != TCL_OK) {
6068	6063	Tcl_AddErrorInfo(interp,
6069	6064	"\n (horizontal scrolling command executed by text)");
6070		Tcl_BackgroundError(interp);
	6065	Tcl_BackgroundException(interp, code);
6071	6066	}
6072	6067	}
6073	6068	}

6189	6184	notFirst = 1;
6190	6185	}
6191	6186	break;
6192		} else {
6193		dlPtr = dlPtr->nextPtr;
6194		}
	6187	}
	6188	dlPtr = dlPtr->nextPtr;
6195	6189	} while (dlPtr->index.linePtr == linePtr);
6196	6190
6197	6191	return count;

6350	6344	if (code != TCL_OK) {
6351	6345	Tcl_AddErrorInfo(interp,
6352	6346	"\n (vertical scrolling command executed by text)");
6353		Tcl_BackgroundError(interp);
	6347	Tcl_BackgroundException(interp, code);
6354	6348	}
6355	6349	}
6356	6350	}

6377	6371	AsyncUpdateYScrollbar(
6378	6372	ClientData clientData) /* Information about widget. */
6379	6373	{
6380		register TkText textPtr = (TkText ) clientData;
	6374	register TkText *textPtr = clientData;
6381	6375
6382	6376	textPtr->dInfoPtr->scrollbarTimer = NULL;
6383	6377

6542	6536	}
6543	6537	*indexPtr = textPtr->topIndex;
6544	6538	return;
6545		} else {
6546		for (dlPtr = validDlPtr = dInfoPtr->dLinePtr;
6547		y >= (dlPtr->y + dlPtr->height);
6548		dlPtr = dlPtr->nextPtr) {
6549		if (dlPtr->chunkPtr != NULL) {
6550		validDlPtr = dlPtr;
6551		}
6552		if (dlPtr->nextPtr == NULL) {
6553		/*
6554		* Y-coordinate is off the bottom of the displayed text. Use
6555		* the last character on the last line.
6556		*/
6557
6558		x = dInfoPtr->maxX - 1;
6559		nearby = 1;
6560		break;
6561		}
6562		}
6563		if (dlPtr->chunkPtr == NULL) dlPtr = validDlPtr;
	6539	}
	6540	for (dlPtr = validDlPtr = dInfoPtr->dLinePtr;
	6541	y >= (dlPtr->y + dlPtr->height);
	6542	dlPtr = dlPtr->nextPtr) {
	6543	if (dlPtr->chunkPtr != NULL) {
	6544	validDlPtr = dlPtr;
	6545	}
	6546	if (dlPtr->nextPtr == NULL) {
	6547	/*
	6548	* Y-coordinate is off the bottom of the displayed text. Use the
	6549	* last character on the last line.
	6550	*/
	6551
	6552	x = dInfoPtr->maxX - 1;
	6553	nearby = 1;
	6554	break;
	6555	}
	6556	}
	6557	if (dlPtr->chunkPtr == NULL) {
	6558	dlPtr = validDlPtr;
6564	6559	}
6565	6560
6566	6561	if (nearest != NULL) {

6653	6648	*/
6654	6649
6655	6650	if (chunkPtr->numBytes > 1) {
6656		indexPtr->byteIndex += (*chunkPtr->measureProc)(chunkPtr, x);
	6651	indexPtr->byteIndex += chunkPtr->measureProc(chunkPtr, x);
6657	6652	}
6658	6653	}
6659	6654

6741	6736	if (byteIndex < chunkPtr->numBytes) {
6742	6737	int y, width, height;
6743	6738
6744		(*chunkPtr->bboxProc)(textPtr, chunkPtr, byteIndex,
	6739	chunkPtr->bboxProc(textPtr, chunkPtr, byteIndex,
6745	6740	dlPtr->y + dlPtr->spaceAbove,
6746	6741	dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
6747	6742	dlPtr->baseline - dlPtr->spaceAbove, &x, &y, &width,
6748	6743	&height);
6749	6744	break;
6750		} else {
6751		byteIndex -= chunkPtr->numBytes;
6752		}
	6745	}
	6746	byteIndex -= chunkPtr->numBytes;
6753	6747	if (chunkPtr->nextPtr == NULL \|\| byteIndex == 0) {
6754	6748	x = chunkPtr->x + chunkPtr->width;
6755	6749	break;

6837	6831	* coordinate on the screen. Translate it to reflect horizontal scrolling.
6838	6832	*/
6839	6833
6840		(*chunkPtr->bboxProc)(textPtr, chunkPtr, byteIndex,
	6834	chunkPtr->bboxProc(textPtr, chunkPtr, byteIndex,
6841	6835	dlPtr->y + dlPtr->spaceAbove,
6842	6836	dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
6843	6837	dlPtr->baseline - dlPtr->spaceAbove, xPtr, yPtr, widthPtr,

7078	7072
7079	7073	ciPtr = &bciPtr->ci;
7080	7074	} else {
7081		bciPtr = (BaseCharInfo *) baseCharChunkPtr->clientData;
	7075	bciPtr = baseCharChunkPtr->clientData;
7082	7076	ciPtr = (CharInfo *) ckalloc(sizeof(CharInfo));
7083	7077	baseString = &bciPtr->baseChars;
7084	7078	}

7086	7080	lineOffset = Tcl_DStringLength(baseString);
7087	7081	line = Tcl_DStringAppend(baseString,p,maxBytes);
7088	7082
7089		chunkPtr->clientData = (ClientData) ciPtr;
	7083	chunkPtr->clientData = ciPtr;
7090	7084	ciPtr->baseChunkPtr = baseCharChunkPtr;
7091	7085	ciPtr->baseOffset = lineOffset;
7092	7086	ciPtr->chars = NULL;

7170	7164	#if !TK_LAYOUT_WITH_BASE_CHUNKS
7171	7165	ciPtr = (CharInfo *)
7172	7166	ckalloc((unsigned) bytesThatFit + Tk_Offset(CharInfo, chars) + 1);
7173		chunkPtr->clientData = (ClientData) ciPtr;
	7167	chunkPtr->clientData = ciPtr;
7174	7168	memcpy(ciPtr->chars, p, (unsigned) bytesThatFit);
7175	7169	#endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
7176	7170

7272	7266	* here. */
7273	7267	{
7274	7268	Tk_Font tkfont = chunkPtr->stylePtr->sValuePtr->tkfont;
7275		CharInfo ciPtr = (CharInfo ) chunkPtr->clientData;
	7269	CharInfo *ciPtr = chunkPtr->clientData;
7276	7270
7277	7271	#if !TK_LAYOUT_WITH_BASE_CHUNKS
7278	7272	if (chars == NULL) {

7361	7355	int screenY) /* Y-coordinate in text window that
7362	7356	* corresponds to y. */
7363	7357	{
7364		CharInfo ciPtr = (CharInfo ) chunkPtr->clientData;
	7358	CharInfo *ciPtr = chunkPtr->clientData;
7365	7359	const char *string;
7366	7360	TextStyle *stylePtr;
7367	7361	StyleValues *sValuePtr;

7379	7373	}
7380	7374
7381	7375	#if TK_DRAW_IN_CONTEXT
7382		bciPtr = (BaseCharInfo *) ciPtr->baseChunkPtr->clientData;
	7376	bciPtr = ciPtr->baseChunkPtr->clientData;
7383	7377	numBytes = Tcl_DStringLength(&bciPtr->baseChars);
7384	7378	string = Tcl_DStringValue(&bciPtr->baseChars);
7385	7379

7512	7506	TkText textPtr, / Overall information about text widget. */
7513	7507	TkTextDispChunk chunkPtr) / Chunk that is about to be freed. */
7514	7508	{
7515		CharInfo ciPtr = (CharInfo ) chunkPtr->clientData;
	7509	CharInfo *ciPtr = chunkPtr->clientData;
7516	7510
7517	7511	if (ciPtr) {
7518	7512	#if TK_LAYOUT_WITH_BASE_CHUNKS

7615	7609	int heightPtr) / Gets filled in with height of character, in
7616	7610	* pixels. */
7617	7611	{
7618		CharInfo ciPtr = (CharInfo ) chunkPtr->clientData;
	7612	CharInfo *ciPtr = chunkPtr->clientData;
7619	7613	int maxX;
7620	7614
7621	7615	maxX = chunkPtr->width + chunkPtr->x;

7778	7772	if (chunkPtr2->displayProc != CharDisplayProc) {
7779	7773	continue;
7780	7774	}
7781		ciPtr = (CharInfo *) chunkPtr2->clientData;
	7775	ciPtr = chunkPtr2->clientData;
7782	7776	for (p = ciPtr->chars, i = 0; i < ciPtr->numBytes; p++, i++) {
7783	7777	if (isdigit(UCHAR(*p))) {
7784	7778	gotDigit = 1;

7799	7793	if (decimalChunkPtr != NULL) {
7800	7794	int curX;
7801	7795
7802		ciPtr = (CharInfo *) decimalChunkPtr->clientData;
	7796	ciPtr = decimalChunkPtr->clientData;
7803	7797	CharChunkMeasureChars(decimalChunkPtr, NULL, 0, 0, decimal,
7804	7798	decimalChunkPtr->x, -1, 0, &curX);
7805	7799	desired = tabX - (curX - x);
7806	7800	goto update;
7807		} else {
7808		/*
7809		* There wasn't a decimal point. Right justify the text.
7810		*/
7811
7812		width = 0;
7813		for (chunkPtr2 = chunkPtr->nextPtr; chunkPtr2 != NULL;
7814		chunkPtr2 = chunkPtr2->nextPtr) {
7815		width += chunkPtr2->width;
7816		}
7817		desired = tabX - width;
7818		}
	7801	}
	7802
	7803	/*
	7804	* There wasn't a decimal point. Right justify the text.
	7805	*/
	7806
	7807	width = 0;
	7808	for (chunkPtr2 = chunkPtr->nextPtr; chunkPtr2 != NULL;
	7809	chunkPtr2 = chunkPtr2->nextPtr) {
	7810	width += chunkPtr2->width;
	7811	}
	7812	desired = tabX - width;
7819	7813
7820	7814	/*
7821	7815	* Shift all of the chunks to the right so that the left edge is at the

8115	8109	break;
8116	8110	}
8117	8111	if (special < end) {
8118		if (ch == '\t') {
8119		start++;
8120		} else {
	8112	if (ch != '\t') {
8121	8113	break;
8122	8114	}
	8115	start++;
8123	8116	}
8124	8117	}
8125	8118

8166	8159	int intPtr) / Filled in with number of pages or lines or
8167	8160	* pixels to scroll, if any. */
8168	8161	{
8169		static const char *subcommands[] = {
	8162	static const char *const subcommands[] = {
8170	8163	"moveto", "scroll", NULL
8171	8164	};
8172	8165	enum viewSubcmds {
8173	8166	VIEW_MOVETO, VIEW_SCROLL
8174	8167	};
8175		static const char *units[] = {
	8168	static const char *const units[] = {
8176	8169	"units", "pages", "pixels", NULL
8177	8170	};
8178	8171	enum viewUnits {

8279	8272	if (chunkPtr->displayProc != CharDisplayProc) {
8280	8273	continue;
8281	8274	}
8282		ciPtr = (CharInfo *)chunkPtr->clientData;
	8275	ciPtr = chunkPtr->clientData;
8283	8276	if (ciPtr->baseChunkPtr != baseCharChunkPtr) {
8284	8277	break;
8285	8278	}

8296	8289	}
8297	8290
8298	8291	if (addChunkPtr != NULL) {
8299		ciPtr = (CharInfo *)addChunkPtr->clientData;
	8292	ciPtr = addChunkPtr->clientData;
8300	8293	ciPtr->chars = baseChars + ciPtr->baseOffset;
8301	8294
8302	8295	#if TK_DRAW_IN_CONTEXT

8347	8340	if (chunkPtr->undisplayProc != CharUndisplayProc) {
8348	8341	continue;
8349	8342	}
8350		ciPtr = (CharInfo *) chunkPtr->clientData;
	8343	ciPtr = chunkPtr->clientData;
8351	8344	if (ciPtr->baseChunkPtr != baseChunkPtr) {
8352	8345	break;
8353	8346	}

8465	8458	* Reinstitute this base chunk for re-layout.
8466	8459	*/
8467	8460
8468		ciPtr = (CharInfo *) chunkPtr->clientData;
	8461	ciPtr = chunkPtr->clientData;
8469	8462	baseCharChunkPtr = ciPtr->baseChunkPtr;
8470	8463
8471	8464	/*
8472	8465	* Remove the chunk data from the base chunk data.
8473	8466	*/
8474	8467
8475		bciPtr = (BaseCharInfo *) baseCharChunkPtr->clientData;
	8468	bciPtr = baseCharChunkPtr->clientData;
8476	8469
8477	8470	if ((ciPtr->baseOffset + ciPtr->numBytes)
8478	8471	!= Tcl_DStringLength(&bciPtr->baseChars)) {

+14

-14

generic/tkTextImage.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkTextImage.c,v 1.23 2008/07/23 23:24:23 nijtmans Exp $
	11	* RCS: @(#) $Id: tkTextImage.c,v 1.25 2008/10/30 23:18:59 nijtmans Exp $
12	12	*/
13	13
14	14	#include "tkPort.h"

70	70	* Definitions for alignment values:
71	71	*/
72	72
73		static char *alignStrings[] = {
	73	static const char *const alignStrings[] = {
74	74	"baseline", "bottom", "center", "top", NULL
75	75	};
76	76

99	99	{TK_OPTION_END}
100	100	};
101	101
102
	102
103	103	/*
104	104	*--------------------------------------------------------------
105	105	*

129	129	int idx;
130	130	register TkTextSegment *eiPtr;
131	131	TkTextIndex index;
132		static const char *optionStrings[] = {
	132	static const char *const optionStrings[] = {
133	133	"cget", "configure", "create", "names", NULL
134	134	};
135	135	enum opts {

291	291	}
292	292	return TCL_ERROR;
293	293	}
294
	294
295	295	/*
296	296	*--------------------------------------------------------------
297	297	*

419	419
420	420	return TCL_OK;
421	421	}
422
	422
423	423	/*
424	424	*--------------------------------------------------------------
425	425	*

474	474	ckfree((char *) eiPtr);
475	475	return 0;
476	476	}
477
	477
478	478	/*
479	479	*--------------------------------------------------------------
480	480	*

500	500	eiPtr->body.ei.linePtr = linePtr;
501	501	return eiPtr;
502	502	}
503
	503
504	504	/*
505	505	*--------------------------------------------------------------
506	506	*

588	588	eiPtr->body.ei.chunkCount += 1;
589	589	return 1;
590	590	}
591
	591
592	592	/*
593	593	*--------------------------------------------------------------
594	594	*

620	620	eiPtr->size);
621	621	}
622	622	}
623
	623
624	624	/*
625	625	*--------------------------------------------------------------
626	626	*

679	679
680	680	Tk_RedrawImage(image, 0, 0, width, height, dst, imageX, imageY);
681	681	}
682
	682
683	683	/*
684	684	*--------------------------------------------------------------
685	685	*

748	748	break;
749	749	}
750	750	}
751
	751
752	752	/*
753	753	*--------------------------------------------------------------
754	754	*

787	787	indexPtr->byteIndex = TkTextSegToOffset(eiPtr, indexPtr->linePtr);
788	788	return 1;
789	789	}
790
	790
791	791	/*
792	792	*--------------------------------------------------------------
793	793	*

832	832	TkTextInvalidateLineMetrics(eiPtr->body.ei.sharedTextPtr, NULL,
833	833	index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
834	834	}
835
	835
836	836	/*
837	837	* Local Variables:
838	838	* mode: c

+27

-27

generic/tkTextIndex.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkTextIndex.c,v 1.30 2008/10/05 18:22:22 dkf Exp $
	12	* RCS: @(#) $Id: tkTextIndex.c,v 1.34 2008/12/05 15:51:31 nijtmans Exp $
13	13	*/
14	14
15	15	#include "default.h"

71	71	* text widgets internally.
72	72	*/
73	73
74		Tcl_ObjType tkTextIndexType = {
	74	const Tcl_ObjType tkTextIndexType = {
75	75	"textindex", /* name */
76	76	FreeTextIndexInternalRep, /* freeIntRepProc */
77	77	DupTextIndexInternalRep, /* dupIntRepProc */
78	78	NULL, /* updateStringProc */
79	79	SetTextIndexFromAny /* setFromAnyProc */
80	80	};
81
	81
82	82	static void
83	83	FreeTextIndexInternalRep(
84	84	Tcl_Obj indexObjPtr) / TextIndex object with internal rep to

148	148	"via TkTextGetIndexFromObj API", -1);
149	149	return TCL_ERROR;
150	150	}
151
	151
152	152	/*
153	153	*---------------------------------------------------------------------------
154	154	*

198	198	}
199	199	return indexPtr;
200	200	}
201
	201
202	202	const TkTextIndex *
203	203	TkTextGetIndexFromObj(
204	204	Tcl_Interp interp, / Use this for error reporting. */

238	238	if (objPtr->bytes == NULL) {
239	239	objPtr->typePtr->updateStringProc(objPtr);
240	240	}
241		if ((objPtr->typePtr->freeIntRepProc) != NULL) {
242		(*objPtr->typePtr->freeIntRepProc)(objPtr);
	241	if (objPtr->typePtr->freeIntRepProc != NULL) {
	242	objPtr->typePtr->freeIntRepProc(objPtr);
243	243	}
244	244	}
245	245
246	246	return MakeObjIndex((cache ? textPtr : NULL), objPtr, &index);
247	247	}
248
	248
249	249	/*
250	250	*---------------------------------------------------------------------------
251	251	*

290	290	UpdateStringOfTextIndex(retVal);
291	291	return retVal;
292	292	}
293
	293
294	294	/*
295	295	*---------------------------------------------------------------------------
296	296	*

358	358	}
359	359	return TkTextMeasureDown(textPtr, indexPtr, pixelOffset);
360	360	}
361
	361
362	362	/*
363	363	*---------------------------------------------------------------------------
364	364	*

381	381
382	382	TkTextIndex *
383	383	TkTextMakeByteIndex(
384		TkTextBTree tree, /* Tree that lineIndex and byteIndex refer
	384	TkTextBTree tree, /* Tree that lineIndex and byteIndex refer
385	385	* to. */
386	386	const TkText *textPtr,
387	387	int lineIndex, /* Index of desired line (0 means first line

451	451	}
452	452	return indexPtr;
453	453	}
454
	454
455	455	/*
456	456	*---------------------------------------------------------------------------
457	457	*

546	546	}
547	547	return indexPtr;
548	548	}
549
	549
550	550	/*
551	551	*---------------------------------------------------------------------------
552	552	*

586	586	}
587	587	return segPtr;
588	588	}
589
	589
590	590	/*
591	591	*---------------------------------------------------------------------------
592	592	*

619	619	}
620	620	return offset;
621	621	}
622
	622
623	623	/*
624	624	*---------------------------------------------------------------------------
625	625	*

648	648	return GetIndex(interp, NULL, textPtr, Tcl_GetString(idxObj), indexPtr,
649	649	NULL);
650	650	}
651
	651
652	652	/*
653	653	*---------------------------------------------------------------------------
654	654	*

677	677	return GetIndex(interp, sharedTextPtr, NULL, Tcl_GetString(idxObj),
678	678	indexPtr, NULL);
679	679	}
680
	680
681	681	/*
682	682	*---------------------------------------------------------------------------
683	683	*

706	706	{
707	707	return GetIndex(interp, NULL, textPtr, string, indexPtr, NULL);
708	708	}
709
	709
710	710	/*
711	711	*---------------------------------------------------------------------------
712	712	*

999	999	Tcl_AppendResult(interp, "bad text index \"", string, "\"", NULL);
1000	1000	return TCL_ERROR;
1001	1001	}
1002
	1002
1003	1003	/*
1004	1004	*---------------------------------------------------------------------------
1005	1005	*

1063	1063	return sprintf(string, "%d.%d",
1064	1064	TkBTreeLinesTo(textPtr, indexPtr->linePtr) + 1, charIndex);
1065	1065	}
1066
	1066
1067	1067	/*
1068	1068	*---------------------------------------------------------------------------
1069	1069	*

1116	1116	}
1117	1117	return 0;
1118	1118	}
1119
	1119
1120	1120	/*
1121	1121	*---------------------------------------------------------------------------
1122	1122	*

1360	1360	}
1361	1361	return p;
1362	1362	}
1363
	1363
1364	1364	/*
1365	1365	*---------------------------------------------------------------------------
1366	1366	*

1430	1430	dstPtr->linePtr = linePtr;
1431	1431	}
1432	1432	}
1433
	1433
1434	1434	/*
1435	1435	*---------------------------------------------------------------------------
1436	1436	*

1609	1609	ckfree((char *) infoPtr);
1610	1610	}
1611	1611	}
1612
	1612
1613	1613	/*
1614	1614	*---------------------------------------------------------------------------
1615	1615	*

1874	1874	}
1875	1875	return 0;
1876	1876	}
1877
	1877
1878	1878	/*
1879	1879	*---------------------------------------------------------------------------
1880	1880	*

2089	2089	ckfree((char *) infoPtr);
2090	2090	}
2091	2091	}
2092
	2092
2093	2093	/*
2094	2094	*----------------------------------------------------------------------
2095	2095	*

2293	2293	done:
2294	2294	return p;
2295	2295	}
2296
	2296
2297	2297	/*
2298	2298	* Local Variables:
2299	2299	* mode: c

+47

-22

generic/tkTextMark.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkTextMark.c,v 1.21 2008/07/23 23:24:23 nijtmans Exp $
	12	* RCS: @(#) $Id: tkTextMark.c,v 1.23 2008/12/06 10:48:29 dkf Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"
16	16	#include "tkText.h"
	17	#include "tk3d.h"
17	18
18	19	/*
19	20	* Macro that determines the size of a mark segment:

105	106	TkTextIndex index;
106	107	const Tk_SegType *newTypePtr;
107	108	int optionIndex;
108		static const char *markOptionStrings[] = {
	109	static const char *const markOptionStrings[] = {
109	110	"gravity", "names", "next", "previous", "set", "unset", NULL
110	111	};
111	112	enum markOptions {

144	145	Tcl_GetString(objv[3]), "\"", NULL);
145	146	return TCL_ERROR;
146	147	}
147		markPtr = (TkTextSegment *) Tcl_GetHashValue(hPtr);
	148	markPtr = Tcl_GetHashValue(hPtr);
148	149	}
149	150	if (objc == 4) {
150	151	if (markPtr->typePtr == &tkTextRightMarkType) {

156	157	}
157	158	str = Tcl_GetStringFromObj(objv[4],&length);
158	159	c = str[0];
159		if ((c == 'l') && (strncmp(str, "left", (unsigned)length) == 0)) {
	160	if ((c == 'l') && (strncmp(str, "left", (unsigned) length) == 0)) {
160	161	newTypePtr = &tkTextLeftMarkType;
161	162	} else if ((c == 'r') &&
162		(strncmp(str, "right", (unsigned)length) == 0)) {
	163	(strncmp(str, "right", (unsigned) length) == 0)) {
163	164	newTypePtr = &tkTextRightMarkType;
164	165	} else {
165	166	Tcl_AppendResult(interp, "bad mark gravity \"", str,

214	215	hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->markTable,
215	216	Tcl_GetString(objv[i]));
216	217	if (hPtr != NULL) {
217		markPtr = (TkTextSegment *) Tcl_GetHashValue(hPtr);
	218	markPtr = Tcl_GetHashValue(hPtr);
218	219
219	220	/*
220	221	* Special case not needed with peer widgets.

275	276	widgetSpecific = 0;
276	277	hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->markTable, name,
277	278	&isNew);
278		markPtr = (TkTextSegment *) Tcl_GetHashValue(hPtr);
	279	markPtr = Tcl_GetHashValue(hPtr);
279	280	}
280	281	if (!isNew) {
281	282	/*

288	289	TkTextIndex index, index2;
289	290
290	291	TkTextMarkSegToIndex(textPtr, textPtr->insertMarkPtr, &index);
291		TkTextIndexForwChars(NULL,&index, 1, &index2, COUNT_INDICES);
	292	TkTextIndexForwChars(NULL, &index, 1, &index2, COUNT_INDICES);
292	293
293	294	/*
294	295	* While we wish to redisplay, no heights have changed, so no need

297	298
298	299	TkTextChanged(NULL, textPtr, &index, &index2);
299	300	if (TkBTreeLinesTo(textPtr, indexPtr->linePtr) ==
300		TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr)) {
301		TkTextIndexBackChars(NULL,indexPtr, 1, &insertIndex,
	301	TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr)) {
	302	TkTextIndexBackChars(NULL, indexPtr, 1, &insertIndex,
302	303	COUNT_INDICES);
303	304	indexPtr = &insertIndex;
304	305	}

329	330	if (markPtr == textPtr->insertMarkPtr) {
330	331	TkTextIndex index2;
331	332
332		TkTextIndexForwChars(NULL,indexPtr, 1, &index2, COUNT_INDICES);
	333	TkTextIndexForwChars(NULL, indexPtr, 1, &index2, COUNT_INDICES);
333	334
334	335	/*
335	336	* While we wish to redisplay, no heights have changed, so no need to

413	414	} else if (!strcmp(name, "current")) {
414	415	segPtr = textPtr->currentMarkPtr;
415	416	} else {
416		Tcl_HashEntry *hPtr;
417		hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->markTable, name);
	417	Tcl_HashEntry *hPtr =
	418	Tcl_FindHashEntry(&textPtr->sharedTextPtr->markTable, name);
	419
418	420	if (hPtr == NULL) {
419	421	return TCL_ERROR;
420	422	}
421		segPtr = (TkTextSegment *) Tcl_GetHashValue(hPtr);
	423	segPtr = Tcl_GetHashValue(hPtr);
422	424	}
423	425	TkTextMarkSegToIndex(textPtr, segPtr, indexPtr);
424	426	return TCL_OK;

585	587	int rightSideWidth;
586	588	int ix = 0, iy = 0, iw = 0, ih = 0, charWidth = 0;
587	589
588		if(textPtr->insertCursorType) {
	590	if (textPtr->insertCursorType) {
589	591	TkTextMarkSegToIndex(textPtr, textPtr->insertMarkPtr, &index);
590	592	TkTextIndexBbox(textPtr, &index, &ix, &iy, &iw, &ih, &charWidth);
591	593	rightSideWidth = charWidth + halfWidth;

613	615	* the cursor.
614	616	*/
615	617
616		if (textPtr->flags & INSERT_ON) {
	618	if (textPtr->flags & GOT_FOCUS) {
	619	if (textPtr->flags & INSERT_ON) {
	620	Tk_Fill3DRectangle(textPtr->tkwin, dst, textPtr->insertBorder,
	621	x - halfWidth, y, charWidth + textPtr->insertWidth,
	622	height, textPtr->insertBorderWidth, TK_RELIEF_RAISED);
	623	} else if (textPtr->selBorder == textPtr->insertBorder) {
	624	Tk_Fill3DRectangle(textPtr->tkwin, dst, textPtr->border,
	625	x - halfWidth, y, charWidth + textPtr->insertWidth,
	626	height, 0, TK_RELIEF_FLAT);
	627	}
	628	} else if (textPtr->insertUnfocussed == TK_TEXT_INSERT_NOFOCUS_HOLLOW) {
	629	if (textPtr->insertBorderWidth < 1) {
	630	/*
	631	* Hack to work around the fact that a "solid" border always
	632	* paints in black.
	633	*/
	634
	635	TkBorder borderPtr = (TkBorder ) textPtr->insertBorder;
	636
	637	XDrawRectangle(Tk_Display(textPtr->tkwin), dst, borderPtr->bgGC,
	638	x - halfWidth, y, charWidth + textPtr->insertWidth - 1,
	639	height - 1);
	640	} else {
	641	Tk_Draw3DRectangle(textPtr->tkwin, dst, textPtr->insertBorder,
	642	x - halfWidth, y, charWidth + textPtr->insertWidth,
	643	height, textPtr->insertBorderWidth, TK_RELIEF_RAISED);
	644	}
	645	} else if (textPtr->insertUnfocussed == TK_TEXT_INSERT_NOFOCUS_SOLID) {
617	646	Tk_Fill3DRectangle(textPtr->tkwin, dst, textPtr->insertBorder,
618	647	x - halfWidth, y, charWidth + textPtr->insertWidth, height,
619	648	textPtr->insertBorderWidth, TK_RELIEF_RAISED);
620		} else if (textPtr->selBorder == textPtr->insertBorder) {
621		Tk_Fill3DRectangle(textPtr->tkwin, dst, textPtr->border,
622		x - halfWidth, y, charWidth + textPtr->insertWidth, height,
623		0, TK_RELIEF_FLAT);
624	649	}
625	650	}
626	651

749	774	* position.
750	775	*/
751	776
752		segPtr = (TkTextSegment *) Tcl_GetHashValue(hPtr);
	777	segPtr = Tcl_GetHashValue(hPtr);
753	778	TkTextMarkSegToIndex(textPtr, segPtr, &index);
754	779	segPtr = segPtr->nextPtr;
755	780	} else {

847	872	* position.
848	873	*/
849	874
850		segPtr = (TkTextSegment *) Tcl_GetHashValue(hPtr);
	875	segPtr = Tcl_GetHashValue(hPtr);
851	876	TkTextMarkSegToIndex(textPtr, segPtr, &index);
852	877	} else {
853	878	/*

+4

-4

generic/tkTextTag.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkTextTag.c,v 1.29 2008/07/23 23:24:23 nijtmans Exp $
	13	* RCS: @(#) $Id: tkTextTag.c,v 1.30 2008/10/17 23:18:37 nijtmans Exp $
14	14	*/
15	15
16	16	#include "default.h"

24	24	* a whole is not.
25	25	*/
26	26
27		static char *wrapStrings[] = {
	27	static const char *const wrapStrings[] = {
28	28	"char", "none", "word", "", NULL
29	29	};
30	30

35	35	* widget as a whole is not.
36	36	*/
37	37
38		static char *tabStyleStrings[] = {
	38	static const char *const tabStyleStrings[] = {
39	39	"tabular", "wordprocessor", "", NULL
40	40	};
41	41

131	131	* parsed this command enough to know that
132	132	* objv[1] is "tag". */
133	133	{
134		static const char *tagOptionStrings[] = {
	134	static const char *const tagOptionStrings[] = {
135	135	"add", "bind", "cget", "configure", "delete", "lower", "names",
136	136	"nextrange", "prevrange", "raise", "ranges", "remove", NULL
137	137	};

+4

-4

generic/tkTextWind.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkTextWind.c,v 1.24 2008/07/23 23:24:23 nijtmans Exp $
	13	* RCS: @(#) $Id: tkTextWind.c,v 1.26 2008/12/09 21:22:56 dgp Exp $
14	14	*/
15	15
16	16	#include "tkPort.h"

86	86	* Definitions for alignment values:
87	87	*/
88	88
89		static char *alignStrings[] = {
	89	static const char *const alignStrings[] = {
90	90	"baseline", "bottom", "center", "top", NULL
91	91	};
92	92

142	142	* objv[1] is "window". */
143	143	{
144	144	int optionIndex;
145		static const char *windOptionStrings[] = {
	145	static const char *const windOptionStrings[] = {
146	146	"cget", "configure", "create", "names", NULL
147	147	};
148	148	enum windOptions {

910	910	}
911	911	if (code != TCL_OK) {
912	912	createError:
913		Tcl_BackgroundError(textPtr->interp);
	913	Tcl_BackgroundException(textPtr->interp, code);
914	914	goto gotWindow;
915	915	}
916	916	Tcl_DStringInit(&name);

+1

-4

generic/tkTrig.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkTrig.c,v 1.10 2007/12/13 15:24:21 dgp Exp $
	13	* RCS: @(#) $Id: tkTrig.c,v 1.11 2008/11/22 22:28:52 das Exp $
14	14	*/
15	15
16	16	#include <stdio.h>

21	21	#define MIN(a,b) (((a) < (b)) ? (a) : (b))
22	22	#undef MAX
23	23	#define MAX(a,b) (((a) > (b)) ? (a) : (b))
24		#ifndef PI
25		# define PI 3.14159265358979323846
26		#endif /* PI */
27	24
28	25	/*
29	26	*--------------------------------------------------------------

+2

-2

generic/tkUndo.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkUndo.c,v 1.13 2007/12/13 15:24:21 dgp Exp $
	11	* RCS: @(#) $Id: tkUndo.c,v 1.14 2008/11/08 18:44:40 dkf Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

655	655
656	656	while (action != NULL) {
657	657	if (action->funcPtr != NULL) {
658		result = (*action->funcPtr)(interp, action->clientData,
	658	result = action->funcPtr(interp, action->clientData,
659	659	action->action);
660	660	} else if (action->command != NULL) {
661	661	Tcl_Obj cmdNameObj, evalObj;

+203

-7

generic/tkUtil.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkUtil.c,v 1.21 2007/12/13 15:24:21 dgp Exp $
	12	* RCS: @(#) $Id: tkUtil.c,v 1.27 2008/12/10 05:02:51 das Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

19	19	* object, used for quickly finding a mapping in a TkStateMap.
20	20	*/
21	21
22		Tcl_ObjType tkStateKeyObjType = {
	22	const Tcl_ObjType tkStateKeyObjType = {
23	23	"statekey", /* name */
24	24	NULL, /* freeIntRepProc */
25	25	NULL, /* dupIntRepProc */

122	122	*--------------------------------------------------------------
123	123	*/
124	124
125		char *
	125	const char *
126	126	TkStatePrintProc(
127	127	ClientData clientData, /* Ignored. */
128	128	Tk_Window tkwin, /* Window containing canvas widget. */

223	223	*--------------------------------------------------------------
224	224	*/
225	225
226		char *
	226	const char *
227	227	TkOrientPrintProc(
228	228	ClientData clientData, /* Ignored. */
229	229	Tk_Window tkwin, /* Window containing canvas widget. */

395	395	*----------------------------------------------------------------------
396	396	*/
397	397
398		char *
	398	const char *
399	399	TkOffsetPrintProc(
400	400	ClientData clientData, /* not used */
401	401	Tk_Window tkwin, /* not used */

494	494	*----------------------------------------------------------------------
495	495	*/
496	496
497		char *
	497	const char *
498	498	TkPixelPrintProc(
499	499	ClientData clientData, /* not used */
500	500	Tk_Window tkwin, /* not used */

949	949	if (strcmp(key, mPtr->strKey) == 0) {
950	950	typePtr = keyPtr->typePtr;
951	951	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
952		(*typePtr->freeIntRepProc)(keyPtr);
	952	typePtr->freeIntRepProc(keyPtr);
953	953	}
954	954	keyPtr->internalRep.twoPtrValue.ptr1 = (void *) mapPtr;
955	955	keyPtr->internalRep.twoPtrValue.ptr2 = INT2PTR(mPtr->numKey);

977	977	}
978	978
979	979	/*
	980	* ----------------------------------------------------------------------
	981	*
	982	* TkBackgroundEvalObjv --
	983	*
	984	* Evaluate a command while ensuring that we do not affect the
	985	* interpreters state. This is important when evaluating script
	986	* during background tasks.
	987	*
	988	* Results:
	989	* A standard Tcl result code.
	990	*
	991	* Side Effects:
	992	* The interpreters variables and code may be modified by the script
	993	* but the result will not be modified.
	994	*
	995	* ----------------------------------------------------------------------
	996	*/
	997
	998	int
	999	TkBackgroundEvalObjv(
	1000	Tcl_Interp *interp,
	1001	int objc,
	1002	Tcl_Obj const objv,
	1003	int flags)
	1004	{
	1005	Tcl_DString errorInfo, errorCode;
	1006	Tcl_SavedResult state;
	1007	int n, r = TCL_OK;
	1008
	1009	Tcl_DStringInit(&errorInfo);
	1010	Tcl_DStringInit(&errorCode);
	1011
	1012	Tcl_Preserve(interp);
	1013
	1014	/*
	1015	* Record the state of the interpreter
	1016	*/
	1017
	1018	Tcl_SaveResult(interp, &state);
	1019	Tcl_DStringAppend(&errorInfo,
	1020	Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY), -1);
	1021	Tcl_DStringAppend(&errorCode,
	1022	Tcl_GetVar(interp, "errorCode", TCL_GLOBAL_ONLY), -1);
	1023
	1024	/*
	1025	* Evaluate the command and handle any error.
	1026	*/
	1027
	1028	for (n = 0; n < objc; ++n) {
	1029	Tcl_IncrRefCount(objv[n]);
	1030	}
	1031	r = Tcl_EvalObjv(interp, objc, objv, flags);
	1032	for (n = 0; n < objc; ++n) {
	1033	Tcl_DecrRefCount(objv[n]);
	1034	}
	1035	if (r == TCL_ERROR) {
	1036	Tcl_AddErrorInfo(interp, "\n (background event handler)");
	1037	Tcl_BackgroundError(interp);
	1038	}
	1039
	1040	Tcl_Release(interp);
	1041
	1042	/*
	1043	* Restore the state of the interpreter
	1044	*/
	1045
	1046	Tcl_SetVar(interp, "errorInfo",
	1047	Tcl_DStringValue(&errorInfo), TCL_GLOBAL_ONLY);
	1048	Tcl_SetVar(interp, "errorCode",
	1049	Tcl_DStringValue(&errorCode), TCL_GLOBAL_ONLY);
	1050	Tcl_RestoreResult(interp, &state);
	1051
	1052	/*
	1053	* Clean up references.
	1054	*/
	1055
	1056	Tcl_DStringFree(&errorInfo);
	1057	Tcl_DStringFree(&errorCode);
	1058
	1059	return r;
	1060	}
	1061
	1062	/*
	1063	*----------------------------------------------------------------------
	1064	*
	1065	* TkMakeEnsemble --
	1066	*
	1067	* Create an ensemble from a table of implementation commands.
	1068	* This may be called recursively to create sub-ensembles.
	1069	*
	1070	* Results:
	1071	* Handle for the ensemble, or NULL if creation of it fails.
	1072	*
	1073	*----------------------------------------------------------------------
	1074	*/
	1075
	1076	Tcl_Command
	1077	TkMakeEnsemble(
	1078	Tcl_Interp *interp,
	1079	const char *namespace,
	1080	const char *name,
	1081	ClientData clientData,
	1082	const TkEnsemble map[])
	1083	{
	1084	Tcl_Namespace *namespacePtr = NULL;
	1085	Tcl_Command ensemble = NULL;
	1086	Tcl_Obj *dictObj = NULL;
	1087	Tcl_DString ds;
	1088	int i;
	1089
	1090	if (map == NULL) {
	1091	return NULL;
	1092	}
	1093
	1094	Tcl_DStringInit(&ds);
	1095
	1096	namespacePtr = Tcl_FindNamespace(interp, namespace, NULL, 0);
	1097	if (namespacePtr == NULL) {
	1098	namespacePtr = Tcl_CreateNamespace(interp, namespace, NULL, NULL);
	1099	if (namespacePtr == NULL) {
	1100	Tcl_Panic("failed to create namespace \"%s\"", namespace);
	1101	}
	1102	}
	1103
	1104	ensemble = Tcl_FindEnsemble(interp, Tcl_NewStringObj(name,-1), 0);
	1105	if (ensemble == NULL) {
	1106	ensemble = Tcl_CreateEnsemble(interp, name,
	1107	namespacePtr, TCL_ENSEMBLE_PREFIX);
	1108	if (ensemble == NULL) {
	1109	Tcl_Panic("failed to create ensemble \"%s\"", name);
	1110	}
	1111	}
	1112
	1113	Tcl_DStringSetLength(&ds, 0);
	1114	Tcl_DStringAppend(&ds, namespace, -1);
	1115	if (!(strlen(namespace) == 2 && namespace[1] == ':')) {
	1116	Tcl_DStringAppend(&ds, "::", -1);
	1117	}
	1118	Tcl_DStringAppend(&ds, name, -1);
	1119
	1120	dictObj = Tcl_NewObj();
	1121	for (i = 0; map[i].name != NULL ; ++i) {
	1122	Tcl_Obj nameObj, fqdnObj;
	1123
	1124	nameObj = Tcl_NewStringObj(map[i].name, -1);
	1125	fqdnObj = Tcl_NewStringObj(Tcl_DStringValue(&ds),
	1126	Tcl_DStringLength(&ds));
	1127	Tcl_AppendStringsToObj(fqdnObj, "::", map[i].name, NULL);
	1128	Tcl_DictObjPut(NULL, dictObj, nameObj, fqdnObj);
	1129	if (map[i].proc) {
	1130	Tcl_CreateObjCommand(interp, Tcl_GetString(fqdnObj),
	1131	map[i].proc, clientData, NULL);
	1132	} else if (map[i].subensemble) {
	1133	TkMakeEnsemble(interp, Tcl_DStringValue(&ds),
	1134	map[i].name, clientData, map[i].subensemble);
	1135	}
	1136	}
	1137
	1138	if (ensemble) {
	1139	Tcl_SetEnsembleMappingDict(interp, ensemble, dictObj);
	1140	}
	1141
	1142	Tcl_DStringFree(&ds);
	1143	return ensemble;
	1144	}
	1145
	1146	/*
	1147	*----------------------------------------------------------------------
	1148	*
	1149	* TkSendVirtualEvent --
	1150	*
	1151	* Send a virtual event notification to the specified target window.
	1152	* Equivalent to "event generate $target <<$eventName>>"
	1153	*
	1154	* Note that we use Tk_QueueWindowEvent, not Tk_HandleEvent,
	1155	* so this routine does not reenter the interpreter.
	1156	*
	1157	*----------------------------------------------------------------------
	1158	*/
	1159
	1160	void
	1161	TkSendVirtualEvent(Tk_Window target, const char *eventName)
	1162	{
	1163	XEvent event;
	1164
	1165	memset(&event, 0, sizeof(event));
	1166	event.xany.type = VirtualEvent;
	1167	event.xany.serial = NextRequest(Tk_Display(target));
	1168	event.xany.send_event = False;
	1169	event.xany.window = Tk_WindowId(target);
	1170	event.xany.display = Tk_Display(target);
	1171	((XVirtualEvent *) &event)->name = Tk_GetUid(eventName);
	1172
	1173	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	1174	}
	1175	/*
980	1176	* Local Variables:
981	1177	* mode: c
982	1178	* c-basic-offset: 4

+4

-4

generic/tkVisual.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkVisual.c,v 1.11 2008/04/27 22:38:58 dkf Exp $
	13	* RCS: @(#) $Id: tkVisual.c,v 1.12 2008/10/28 22:33:06 nijtmans Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

21	21	*/
22	22
23	23	typedef struct VisualDictionary {
24		char name; / Textual name of class. */
	24	const char name; / Textual name of class. */
25	25	int minLength; /* Minimum # characters that must be specified
26	26	* for an unambiguous match. */
27	27	int class; /* X symbol for class. */
28	28	} VisualDictionary;
29		static VisualDictionary visualNames[] = {
	29	static const VisualDictionary visualNames[] = {
30	30	{"best", 1, 0},
31	31	{"directcolor", 2, DirectColor},
32	32	{"grayscale", 1, GrayScale},

103	103	ptrdiff_t length;
104	104	int c, numVisuals, prio, bestPrio, i;
105	105	const char *p;
106		VisualDictionary *dictPtr;
	106	const VisualDictionary *dictPtr;
107	107	TkColormap *cmapPtr;
108	108	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
109	109

+122

-116

generic/tkWindow.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkWindow.c,v 1.96 2008/08/19 15:52:12 georgeps Exp $
	13	* RCS: @(#) $Id: tkWindow.c,v 1.101 2008/12/10 00:34:51 das Exp $
14	14	*/
15	15
16	16	#include "tkInt.h"

93	93	* The following structure defines all of the commands supported by Tk, and
94	94	* the C functions that execute them.
95	95	*/
96
	96	typedef int (TkInitProc)(Tcl_Interp *interp, ClientData clientData);
97	97	typedef struct {
98		char name; / Name of command. */
	98	const char name; / Name of command. */
99	99	Tcl_CmdProc cmdProc; / Command's string-based function. */
100	100	Tcl_ObjCmdProc objProc; / Command's object-based function. */
	101	TkInitProc initProc; / Command's initialization function */
101	102	int isSafe; /* If !0, this command will be exposed in a
102	103	* safe interpreter. Otherwise it will be
103	104	* hidden in a safe interpreter. */

111	112	* Commands that are part of the intrinsics:
112	113	*/
113	114
114		{"bell", NULL, Tk_BellObjCmd, 0, 1},
115		{"bind", NULL, Tk_BindObjCmd, 1, 1},
116		{"bindtags", NULL, Tk_BindtagsObjCmd, 1, 1},
117		{"clipboard", NULL, Tk_ClipboardObjCmd, 0, 1},
118		{"destroy", NULL, Tk_DestroyObjCmd, 1, 1},
119		{"event", NULL, Tk_EventObjCmd, 1, 1},
120		{"focus", NULL, Tk_FocusObjCmd, 1, 1},
121		{"font", NULL, Tk_FontObjCmd, 1, 1},
122		{"grab", NULL, Tk_GrabObjCmd, 0, 1},
123		{"grid", NULL, Tk_GridObjCmd, 1, 1},
124		{"image", NULL, Tk_ImageObjCmd, 1, 1},
125		{"lower", NULL, Tk_LowerObjCmd, 1, 1},
126		{"option", NULL, Tk_OptionObjCmd, 1, 1},
127		{"pack", NULL, Tk_PackObjCmd, 1, 1},
128		{"place", NULL, Tk_PlaceObjCmd, 1, 0},
129		{"raise", NULL, Tk_RaiseObjCmd, 1, 1},
130		{"selection", NULL, Tk_SelectionObjCmd, 0, 1},
131		{"tk", NULL, Tk_TkObjCmd, 1, 1},
132		{"tkwait", NULL, Tk_TkwaitObjCmd, 1, 1},
133		{"update", NULL, Tk_UpdateObjCmd, 1, 1},
134		{"winfo", NULL, Tk_WinfoObjCmd, 1, 1},
135		{"wm", NULL, Tk_WmObjCmd, 0, 1},
	115	{"bell", NULL, Tk_BellObjCmd, NULL, 0, 1},
	116	{"bind", NULL, Tk_BindObjCmd, NULL, 1, 1},
	117	{"bindtags", NULL, Tk_BindtagsObjCmd, NULL, 1, 1},
	118	{"clipboard", NULL, Tk_ClipboardObjCmd, NULL, 0, 1},
	119	{"destroy", NULL, Tk_DestroyObjCmd, NULL, 1, 1},
	120	{"event", NULL, Tk_EventObjCmd, NULL, 1, 1},
	121	{"focus", NULL, Tk_FocusObjCmd, NULL, 1, 1},
	122	{"font", NULL, Tk_FontObjCmd, NULL, 1, 1},
	123	{"grab", NULL, Tk_GrabObjCmd, NULL, 0, 1},
	124	{"grid", NULL, Tk_GridObjCmd, NULL, 1, 1},
	125	{"image", NULL, Tk_ImageObjCmd, NULL, 1, 1},
	126	{"lower", NULL, Tk_LowerObjCmd, NULL, 1, 1},
	127	{"option", NULL, Tk_OptionObjCmd, NULL, 1, 1},
	128	{"pack", NULL, Tk_PackObjCmd, NULL, 1, 1},
	129	{"place", NULL, Tk_PlaceObjCmd, NULL, 1, 0},
	130	{"raise", NULL, Tk_RaiseObjCmd, NULL, 1, 1},
	131	{"selection", NULL, Tk_SelectionObjCmd, NULL, 0, 1},
	132	{"tk", NULL, NULL, TkInitTkCmd, 1, 1},
	133	{"tkwait", NULL, Tk_TkwaitObjCmd, NULL, 1, 1},
	134	{"update", NULL, Tk_UpdateObjCmd, NULL, 1, 1},
	135	{"winfo", NULL, Tk_WinfoObjCmd, NULL, 1, 1},
	136	{"wm", NULL, Tk_WmObjCmd, NULL, 0, 1},
136	137
137	138	/*
138	139	* Default widget class commands.
139	140	*/
140	141
141		{"button", NULL, Tk_ButtonObjCmd, 1, 0},
142		{"canvas", NULL, Tk_CanvasObjCmd, 1, 1},
143		{"checkbutton", NULL, Tk_CheckbuttonObjCmd, 1, 0},
144		{"entry", NULL, Tk_EntryObjCmd, 1, 0},
145		{"frame", NULL, Tk_FrameObjCmd, 1, 0},
146		{"label", NULL, Tk_LabelObjCmd, 1, 0},
147		{"labelframe", NULL, Tk_LabelframeObjCmd, 1, 0},
148		{"listbox", NULL, Tk_ListboxObjCmd, 1, 0},
149		{"menubutton", NULL, Tk_MenubuttonObjCmd, 1, 0},
150		{"message", NULL, Tk_MessageObjCmd, 1, 0},
151		{"panedwindow", NULL, Tk_PanedWindowObjCmd, 1, 0},
152		{"radiobutton", NULL, Tk_RadiobuttonObjCmd, 1, 0},
153		{"scale", NULL, Tk_ScaleObjCmd, 1, 0},
154		{"scrollbar", Tk_ScrollbarCmd, NULL, 1, 1},
155		{"spinbox", NULL, Tk_SpinboxObjCmd, 1, 0},
156		{"text", NULL, Tk_TextObjCmd, 1, 1},
157		{"toplevel", NULL, Tk_ToplevelObjCmd, 0, 0},
	142	{"button", NULL, Tk_ButtonObjCmd, NULL, 1, 0},
	143	{"canvas", NULL, Tk_CanvasObjCmd, NULL, 1, 1},
	144	{"checkbutton", NULL, Tk_CheckbuttonObjCmd, NULL, 1, 0},
	145	{"entry", NULL, Tk_EntryObjCmd, NULL, 1, 0},
	146	{"frame", NULL, Tk_FrameObjCmd, NULL, 1, 0},
	147	{"label", NULL, Tk_LabelObjCmd, NULL, 1, 0},
	148	{"labelframe", NULL, Tk_LabelframeObjCmd, NULL, 1, 0},
	149	{"listbox", NULL, Tk_ListboxObjCmd, NULL, 1, 0},
	150	{"menubutton", NULL, Tk_MenubuttonObjCmd, NULL, 1, 0},
	151	{"message", NULL, Tk_MessageObjCmd, NULL, 1, 0},
	152	{"panedwindow", NULL, Tk_PanedWindowObjCmd, NULL, 1, 0},
	153	{"radiobutton", NULL, Tk_RadiobuttonObjCmd, NULL, 1, 0},
	154	{"scale", NULL, Tk_ScaleObjCmd, NULL, 1, 0},
	155	{"scrollbar", Tk_ScrollbarCmd,NULL, NULL, 1, 1},
	156	{"spinbox", NULL, Tk_SpinboxObjCmd, NULL, 1, 0},
	157	{"text", NULL, Tk_TextObjCmd, NULL, 1, 1},
	158	{"toplevel", NULL, Tk_ToplevelObjCmd, NULL, 0, 0},
158	159
159	160	/*
160	161	* Classic widget class commands.
161	162	*/
162	163
163		{"::tk::button", NULL, Tk_ButtonObjCmd, 1, 0},
164		{"::tk::canvas", NULL, Tk_CanvasObjCmd, 1, 1},
165		{"::tk::checkbutton",NULL, Tk_CheckbuttonObjCmd, 1, 0},
166		{"::tk::entry", NULL, Tk_EntryObjCmd, 1, 0},
167		{"::tk::frame", NULL, Tk_FrameObjCmd, 1, 0},
168		{"::tk::label", NULL, Tk_LabelObjCmd, 1, 0},
169		{"::tk::labelframe",NULL, Tk_LabelframeObjCmd, 1, 0},
170		{"::tk::listbox", NULL, Tk_ListboxObjCmd, 1, 0},
171		{"::tk::menubutton",NULL, Tk_MenubuttonObjCmd, 1, 0},
172		{"::tk::message", NULL, Tk_MessageObjCmd, 1, 0},
173		{"::tk::panedwindow",NULL, Tk_PanedWindowObjCmd, 1, 0},
174		{"::tk::radiobutton",NULL, Tk_RadiobuttonObjCmd, 1, 0},
175		{"::tk::scale", NULL, Tk_ScaleObjCmd, 1, 0},
176		{"::tk::scrollbar", Tk_ScrollbarCmd, NULL, 1, 1},
177		{"::tk::spinbox", NULL, Tk_SpinboxObjCmd, 1, 0},
178		{"::tk::text", NULL, Tk_TextObjCmd, 1, 1},
179		{"::tk::toplevel", NULL, Tk_ToplevelObjCmd, 0, 0},
	164	{"::tk::button", NULL, Tk_ButtonObjCmd, NULL, 1, 0},
	165	{"::tk::canvas", NULL, Tk_CanvasObjCmd, NULL, 1, 1},
	166	{"::tk::checkbutton",NULL, Tk_CheckbuttonObjCmd, NULL, 1, 0},
	167	{"::tk::entry", NULL, Tk_EntryObjCmd, NULL, 1, 0},
	168	{"::tk::frame", NULL, Tk_FrameObjCmd, NULL, 1, 0},
	169	{"::tk::label", NULL, Tk_LabelObjCmd, NULL, 1, 0},
	170	{"::tk::labelframe",NULL, Tk_LabelframeObjCmd, NULL, 1, 0},
	171	{"::tk::listbox", NULL, Tk_ListboxObjCmd, NULL, 1, 0},
	172	{"::tk::menubutton",NULL, Tk_MenubuttonObjCmd, NULL, 1, 0},
	173	{"::tk::message", NULL, Tk_MessageObjCmd, NULL, 1, 0},
	174	{"::tk::panedwindow",NULL, Tk_PanedWindowObjCmd, NULL, 1, 0},
	175	{"::tk::radiobutton",NULL, Tk_RadiobuttonObjCmd, NULL, 1, 0},
	176	{"::tk::scale", NULL, Tk_ScaleObjCmd, NULL, 1, 0},
	177	{"::tk::scrollbar", Tk_ScrollbarCmd,NULL, NULL, 1, 1},
	178	{"::tk::spinbox", NULL, Tk_SpinboxObjCmd, NULL, 1, 0},
	179	{"::tk::text", NULL, Tk_TextObjCmd, NULL, 1, 1},
	180	{"::tk::toplevel", NULL, Tk_ToplevelObjCmd, NULL, 0, 0},
180	181
181	182	/*
182	183	* Standard dialog support. Note that the Unix/X11 platform implements

184	185	*/
185	186
186	187	#if defined(__WIN32__) \|\| defined(MAC_OSX_TK)
187		{"tk_chooseColor", NULL, Tk_ChooseColorObjCmd, 0, 1},
188		{"tk_chooseDirectory", NULL, Tk_ChooseDirectoryObjCmd,0,1},
189		{"tk_getOpenFile", NULL, Tk_GetOpenFileObjCmd, 0, 1},
190		{"tk_getSaveFile", NULL, Tk_GetSaveFileObjCmd, 0, 1},
191		{"tk_messageBox", NULL, Tk_MessageBoxObjCmd, 0, 1},
	188	{"tk_chooseColor", NULL, Tk_ChooseColorObjCmd, NULL, 0, 1},
	189	{"tk_chooseDirectory", NULL, Tk_ChooseDirectoryObjCmd,NULL, 0,1},
	190	{"tk_getOpenFile", NULL, Tk_GetOpenFileObjCmd, NULL, 0, 1},
	191	{"tk_getSaveFile", NULL, Tk_GetSaveFileObjCmd, NULL, 0, 1},
	192	{"tk_messageBox", NULL, Tk_MessageBoxObjCmd, NULL, 0, 1},
192	193	#endif
193	194
194	195	/*

197	198
198	199	#if defined(MAC_OSX_TK)
199	200	{"::tk::unsupported::MacWindowStyle",
200		NULL, TkUnsupported1ObjCmd, 1, 1},
	201	NULL, TkUnsupported1ObjCmd, NULL, 1, 1},
201	202	#endif
202		{NULL, NULL, NULL, 0, 0}
	203	{NULL, NULL, NULL, NULL, 0, 0}
203	204	};
204	205
205	206	/*

853	854	const char screenName, / Name of screen on which to create window.
854	855	* Empty or NULL string means use DISPLAY
855	856	* environment variable. */
856		char baseName) / Base name for application; usually of the
	857	const char baseName) / Base name for application; usually of the
857	858	* form "prog instance". */
858	859	{
859	860	Tk_Window tkwin;

925	926	hPtr = Tcl_CreateHashEntry(&mainPtr->nameTable, ".", &dummy);
926	927	Tcl_SetHashValue(hPtr, winPtr);
927	928	winPtr->pathName = Tcl_GetHashKey(&mainPtr->nameTable, hPtr);
	929	Tcl_InitHashTable(&mainPtr->busyTable, TCL_ONE_WORD_KEYS);
928	930
929	931	/*
930	932	* We have just created another Tk application; increment the refcount on

945	947
946	948	isSafe = Tcl_IsSafe(interp);
947	949	for (cmdPtr = commands; cmdPtr->name != NULL; cmdPtr++) {
948		if ((cmdPtr->cmdProc == NULL) && (cmdPtr->objProc == NULL)) {
	950	if ((cmdPtr->cmdProc == NULL) && (cmdPtr->objProc == NULL)
	951	&& (cmdPtr->initProc == NULL)) {
949	952	Tcl_Panic("TkCreateMainWindow: builtin command with NULL string and object procs");
950	953	}
951	954	if (cmdPtr->passMainWindow) {

953	956	} else {
954	957	clientData = NULL;
955	958	}
956		if (cmdPtr->cmdProc != NULL) {
	959	if (cmdPtr->initProc != NULL) {
	960	cmdPtr->initProc(interp, clientData);
	961	} else if (cmdPtr->cmdProc != NULL) {
957	962	Tcl_CreateCommand(interp, cmdPtr->name, cmdPtr->cmdProc,
958	963	clientData, NULL);
959	964	} else {

1017	1022	* window. */
1018	1023	{
1019	1024	TkWindow parentPtr = (TkWindow ) parent;
1020		TkWindow *winPtr;
1021
1022		if ((parentPtr != NULL) && (parentPtr->flags & TK_ALREADY_DEAD)) {
1023		Tcl_AppendResult(interp,
1024		"can't create window: parent has been destroyed", NULL);
1025		return NULL;
1026		} else if ((parentPtr != NULL) &&
1027		(parentPtr->flags & TK_CONTAINER)) {
1028		Tcl_AppendResult(interp,
1029		"can't create window: its parent has -container = yes", NULL);
1030		return NULL;
1031		}
1032
1033		if (screenName == NULL) {
1034		winPtr = TkAllocWindow(parentPtr->dispPtr, parentPtr->screenNum,
1035		parentPtr);
1036		if (NameWindow(interp, winPtr, parentPtr, name) != TCL_OK) {
1037		Tk_DestroyWindow((Tk_Window) winPtr);
	1025
	1026	if (parentPtr) {
	1027	if (parentPtr->flags & TK_ALREADY_DEAD) {
	1028	Tcl_AppendResult(interp,
	1029	"can't create window: parent has been destroyed", NULL);
1038	1030	return NULL;
1039		}
1040		return (Tk_Window) winPtr;
	1031	} else if (parentPtr->flags & TK_CONTAINER) {
	1032	Tcl_AppendResult(interp,
	1033	"can't create window: its parent has -container = yes",
	1034	NULL);
	1035	return NULL;
	1036	} else if (screenName == NULL) {
	1037	TkWindow *winPtr = TkAllocWindow(parentPtr->dispPtr,
	1038	parentPtr->screenNum, parentPtr);
	1039
	1040	if (NameWindow(interp, winPtr, parentPtr, name) != TCL_OK) {
	1041	Tk_DestroyWindow((Tk_Window) winPtr);
	1042	return NULL;
	1043	}
	1044	return (Tk_Window) winPtr;
	1045	}
1041	1046	}
1042	1047	return CreateTopLevelWindow(interp, parent, name, screenName,
1043	1048	/* flags */ 0);

1079	1084	* window. */
1080	1085	{
1081	1086	TkWindow parentPtr = (TkWindow ) parent;
1082		TkWindow *winPtr;
1083
1084		if ((parentPtr != NULL) && (parentPtr->flags & TK_ALREADY_DEAD)) {
1085		Tcl_AppendResult(interp,
1086		"can't create window: parent has been destroyed", NULL);
1087		return NULL;
1088		} else if ((parentPtr != NULL) &&
1089		(parentPtr->flags & TK_CONTAINER)) {
1090		Tcl_AppendResult(interp,
1091		"can't create window: its parent has -container = yes", NULL);
1092		return NULL;
1093		}
1094		if (screenName == NULL) {
1095		winPtr = TkAllocWindow(parentPtr->dispPtr, parentPtr->screenNum,
1096		parentPtr);
1097		/*
1098		* Add the anonymous window flag now, so that NameWindow will behave
1099		* correctly.
1100		*/
1101
1102		winPtr->flags \|= TK_ANONYMOUS_WINDOW;
1103		if (NameWindow(interp, winPtr, parentPtr, NULL) != TCL_OK) {
1104		Tk_DestroyWindow((Tk_Window) winPtr);
	1087
	1088	if (parentPtr) {
	1089	if (parentPtr->flags & TK_ALREADY_DEAD) {
	1090	Tcl_AppendResult(interp,
	1091	"can't create window: parent has been destroyed", NULL);
1105	1092	return NULL;
1106		}
1107		return (Tk_Window) winPtr;
	1093	} else if (parentPtr->flags & TK_CONTAINER) {
	1094	Tcl_AppendResult(interp,
	1095	"can't create window: its parent has -container = yes",
	1096	NULL);
	1097	return NULL;
	1098	} else if (screenName == NULL) {
	1099	TkWindow *winPtr = TkAllocWindow(parentPtr->dispPtr,
	1100	parentPtr->screenNum, parentPtr);
	1101	/*
	1102	* Add the anonymous window flag now, so that NameWindow will
	1103	* behave correctly.
	1104	*/
	1105
	1106	winPtr->flags \|= TK_ANONYMOUS_WINDOW;
	1107	if (NameWindow(interp, winPtr, parentPtr, NULL) != TCL_OK) {
	1108	Tk_DestroyWindow((Tk_Window) winPtr);
	1109	return NULL;
	1110	}
	1111	return (Tk_Window) winPtr;
	1112	}
1108	1113	}
1109	1114	return CreateTopLevelWindow(interp, parent, NULL, screenName,
1110	1115	TK_ANONYMOUS_WINDOW);

1528	1533	"::tk::AlwaysShowSelection");
1529	1534	}
1530	1535
	1536	Tcl_DeleteHashTable(&winPtr->mainPtr->busyTable);
1531	1537	Tcl_DeleteHashTable(&winPtr->mainPtr->nameTable);
1532	1538	TkBindFree(winPtr->mainPtr);
1533	1539	TkDeleteAllImages(winPtr->mainPtr);

1703	1709
1704	1710	createProc = Tk_GetClassProc(winPtr->classProcsPtr, createProc);
1705	1711	if (createProc != NULL && parent != None) {
1706		winPtr->window = (*createProc)(tkwin, parent, winPtr->instanceData);
	1712	winPtr->window = createProc(tkwin, parent, winPtr->instanceData);
1707	1713	} else {
1708	1714	winPtr->window = TkpMakeWindow(winPtr, parent);
1709	1715	}

2932	2938	char *p;
2933	2939	int argc, code;
2934	2940	const char **argv;
2935		char *args[20];
	2941	const char *args[20];
2936	2942	const char *argString = NULL;
2937	2943	Tcl_DString class;
2938	2944	ThreadSpecificData *tsdPtr;

+9

-9

generic/ttk/ttk.decls less more

0	0	#
1		# $Id: ttk.decls,v 1.2 2006/12/10 19:19:44 jenglish Exp $
	1	# $Id: ttk.decls,v 1.3 2008/10/22 20:56:43 nijtmans Exp $
2	2	#
3	3
4	4	library ttk

26	26
27	27	declare 5 current {
28	28	int Ttk_RegisterElementSpec(
29		Ttk_Theme theme,
	29	Ttk_Theme theme,
30	30	const char *elementName,
31	31	Ttk_ElementSpec *elementSpec,
32	32	void *clientData);

35	35	declare 6 current {
36	36	Ttk_ElementImpl Ttk_RegisterElement(
37	37	Tcl_Interp *interp,
38		Ttk_Theme theme,
	38	Ttk_Theme theme,
39	39	const char *elementName,
40	40	Ttk_ElementSpec *elementSpec,
41	41	void *clientData);

43	43
44	44	declare 7 current {
45	45	int Ttk_RegisterElementFactory(
46		Tcl_Interp *interp,
	46	Tcl_Interp *interp,
47	47	const char *name,
48	48	Ttk_ElementFactory factoryProc,
49	49	void *clientData);

84	84	#
85	85	declare 20 current {
86	86	int Ttk_GetPaddingFromObj(
87		Tcl_Interp *interp,
88		Tk_Window tkwin,
89		Tcl_Obj *objPtr,
	87	Tcl_Interp *interp,
	88	Tk_Window tkwin,
	89	Tcl_Obj *objPtr,
90	90	Ttk_Padding *pad_rtn);
91	91	}
92	92	declare 21 current {
93	93	int Ttk_GetBorderFromObj(
94		Tcl_Interp *interp,
95		Tcl_Obj *objPtr,
	94	Tcl_Interp *interp,
	95	Tcl_Obj *objPtr,
96	96	Ttk_Padding *pad_rtn);
97	97	}
98	98	declare 22 current {

+28

-26

generic/ttk/ttkButton.c less more

0		/* $Id: ttkButton.c,v 1.9 2008/04/27 22:41:12 dkf Exp $
	0	/* $Id: ttkButton.c,v 1.11 2008/11/13 01:13:54 jenglish Exp $
1	1	* Copyright (c) 2003, Joe English
2	2	*
3	3	* label, button, checkbutton, radiobutton, and menubutton widgets.

56	56	static Tk_OptionSpec BaseOptionSpecs[] =
57	57	{
58	58	{TK_OPTION_STRING, "-text", "text", "Text", "",
59		Tk_Offset(Base,base.textObj), -1,
	59	Tk_Offset(Base,base.textObj), -1,
60	60	0,0,GEOMETRY_CHANGED },
61	61	{TK_OPTION_STRING, "-textvariable", "textVariable", "Variable", "",
62		Tk_Offset(Base,base.textVariableObj), -1,
	62	Tk_Offset(Base,base.textVariableObj), -1,
63	63	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
64	64	{TK_OPTION_INT, "-underline", "underline", "Underline",
65		"-1", Tk_Offset(Base,base.underlineObj), -1,
	65	"-1", Tk_Offset(Base,base.underlineObj), -1,
66	66	0,0,0 },
67	67	/* SB: OPTION_INT, see <<NOTE-NULLOPTIONS>> */
68	68	{TK_OPTION_STRING, "-width", "width", "Width",
69		NULL, Tk_Offset(Base,base.widthObj), -1,
	69	NULL, Tk_Offset(Base,base.widthObj), -1,
70	70	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
71	71
72	72	/*
73	73	* Image options
74	74	*/
75	75	{TK_OPTION_STRING, "-image", "image", "Image", NULL/default/,
76		Tk_Offset(Base,base.imageObj), -1,
	76	Tk_Offset(Base,base.imageObj), -1,
77	77	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
78	78
79	79	/*

117	117	TtkResizeWidget(&basePtr->core);
118	118	}
119	119
120		static int
	120	static void
121	121	BaseInitialize(Tcl_Interp interp, void recordPtr)
122	122	{
123	123	Base *basePtr = recordPtr;
124	124	basePtr->base.textVariableTrace = 0;
125	125	basePtr->base.imageSpec = NULL;
126		return TCL_OK;
127	126	}
128	127
129	128	static void

132	131	Base *basePtr = recordPtr;
133	132	if (basePtr->base.textVariableTrace)
134	133	Ttk_UntraceVariable(basePtr->base.textVariableTrace);
135		if (basePtr->base.imageSpec)
	134	if (basePtr->base.imageSpec)
136	135	TtkFreeImageSpec(basePtr->base.imageSpec);
137	136	}
138	137

219	218
220	219	static Tk_OptionSpec LabelOptionSpecs[] =
221	220	{
222		{TK_OPTION_BORDER, "-background", "frameColor", "FrameColor",
	221	{TK_OPTION_BORDER, "-background", "frameColor", "FrameColor",
223	222	NULL, Tk_Offset(Label,label.backgroundObj), -1,
224	223	TK_OPTION_NULL_OK,0,0 },
225		{TK_OPTION_COLOR, "-foreground", "textColor", "TextColor",
	224	{TK_OPTION_COLOR, "-foreground", "textColor", "TextColor",
226	225	NULL, Tk_Offset(Label,label.foregroundObj), -1,
227	226	TK_OPTION_NULL_OK,0,0 },
228	227	{TK_OPTION_FONT, "-font", "font", "Font",
229	228	NULL, Tk_Offset(Label,label.fontObj), -1,
230	229	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
231		{TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
	230	{TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
232	231	NULL, Tk_Offset(Label,label.borderWidthObj), -1,
233	232	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
234	233	{TK_OPTION_RELIEF, "-relief", "relief", "Relief",
235	234	NULL, Tk_Offset(Label,label.reliefObj), -1,
236	235	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
237	236	{TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
238		NULL, Tk_Offset(Label,label.anchorObj), -1,
	237	NULL, Tk_Offset(Label,label.anchorObj), -1,
239	238	TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED},
240	239	{TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
241	240	NULL, Tk_Offset(Label, label.justifyObj), -1,

417	416	WIDGET_TAKES_FOCUS,
418	417
419	418	{TK_OPTION_STRING, "-variable", "variable", "Variable",
420		"", Tk_Offset(Checkbutton, checkbutton.variableObj), -1, 0,0,0},
	419	"", Tk_Offset(Checkbutton, checkbutton.variableObj), -1,
	420	TK_OPTION_DONT_SET_DEFAULT,0,0},
421	421	{TK_OPTION_STRING, "-onvalue", "onValue", "OnValue",
422		"1", Tk_Offset(Checkbutton, checkbutton.onValueObj), -1, 0,0,0},
	422	"1", Tk_Offset(Checkbutton, checkbutton.onValueObj), -1,
	423	0,0,0},
423	424	{TK_OPTION_STRING, "-offvalue", "offValue", "OffValue",
424		"0", Tk_Offset(Checkbutton, checkbutton.offValueObj), -1, 0,0,0},
	425	"0", Tk_Offset(Checkbutton, checkbutton.offValueObj), -1,
	426	0,0,0},
425	427	{TK_OPTION_STRING, "-command", "command", "Command",
426		"", Tk_Offset(Checkbutton, checkbutton.commandObj), -1, 0,0,0},
	428	"", Tk_Offset(Checkbutton, checkbutton.commandObj), -1,
	429	0,0,0},
427	430
428	431	WIDGET_INHERIT_OPTIONS(BaseOptionSpecs)
429	432	};

452	455	}
453	456	}
454	457
455		static int CheckbuttonInitialize(Tcl_Interp interp, void recordPtr)
	458	static void
	459	CheckbuttonInitialize(Tcl_Interp interp, void recordPtr)
456	460	{
457	461	Checkbutton *checkPtr = recordPtr;
458		Tcl_Obj *objPtr;
	462	Tcl_Obj *variableObj;
459	463
460	464	/* default -variable is the widget name:
461	465	*/
462		objPtr = Tcl_NewStringObj(Tk_PathName(checkPtr->core.tkwin), -1);
463		Tcl_IncrRefCount(objPtr);
464		Tcl_DecrRefCount(checkPtr->checkbutton.variableObj);
465		checkPtr->checkbutton.variableObj = objPtr;
466
467		return BaseInitialize(interp, recordPtr);
	466	variableObj = Tcl_NewStringObj(Tk_PathName(checkPtr->core.tkwin), -1);
	467	Tcl_IncrRefCount(variableObj);
	468	checkPtr->checkbutton.variableObj = variableObj;
	469	BaseInitialize(interp, recordPtr);
468	470	}
469	471
470	472	static void

631	633	/*
632	634	* Variable trace procedure for radiobuttons.
633	635	*/
634		static void
	636	static void
635	637	RadiobuttonVariableChanged(void clientData, const char value)
636	638	{
637	639	Radiobutton *radioPtr = clientData;

+30

-30

generic/ttk/ttkDecls.h less more

0	0	/*
1		* $Id: ttkDecls.h,v 1.6 2008/03/27 12:04:02 das Exp $
	1	* $Id: ttkDecls.h,v 1.7 2008/10/22 20:56:43 nijtmans Exp $
2	2	*
3	3	* This file is (mostly) automatically generated from ttk.decls.
4	4	*/

37	37	/* 2 */
38	38	TTKAPI Ttk_Theme Ttk_GetCurrentTheme (Tcl_Interp * interp);
39	39	/* 3 */
40		TTKAPI Ttk_Theme Ttk_CreateTheme (Tcl_Interp * interp,
	40	TTKAPI Ttk_Theme Ttk_CreateTheme (Tcl_Interp * interp,
41	41	const char * name, Ttk_Theme parent);
42	42	/* 4 */
43		TTKAPI void Ttk_RegisterCleanup (Tcl_Interp * interp,
44		void * deleteData,
	43	TTKAPI void Ttk_RegisterCleanup (Tcl_Interp * interp,
	44	void * deleteData,
45	45	Ttk_CleanupProc * cleanupProc);
46	46	/* 5 */
47		TTKAPI int Ttk_RegisterElementSpec (Ttk_Theme theme,
48		const char * elementName,
49		Ttk_ElementSpec * elementSpec,
	47	TTKAPI int Ttk_RegisterElementSpec (Ttk_Theme theme,
	48	const char * elementName,
	49	Ttk_ElementSpec * elementSpec,
50	50	void * clientData);
51	51	/* 6 */
52		TTKAPI Ttk_ElementImpl Ttk_RegisterElement (Tcl_Interp * interp,
53		Ttk_Theme theme, const char * elementName,
54		Ttk_ElementSpec * elementSpec,
	52	TTKAPI Ttk_ElementImpl Ttk_RegisterElement (Tcl_Interp * interp,
	53	Ttk_Theme theme, const char * elementName,
	54	Ttk_ElementSpec * elementSpec,
55	55	void * clientData);
56	56	/* 7 */
57		TTKAPI int Ttk_RegisterElementFactory (Tcl_Interp * interp,
58		const char * name,
59		Ttk_ElementFactory factoryProc,
	57	TTKAPI int Ttk_RegisterElementFactory (Tcl_Interp * interp,
	58	const char * name,
	59	Ttk_ElementFactory factoryProc,
60	60	void * clientData);
61	61	/* 8 */
62		TTKAPI void Ttk_RegisterLayout (Ttk_Theme theme,
63		const char * className,
	62	TTKAPI void Ttk_RegisterLayout (Ttk_Theme theme,
	63	const char * className,
64	64	Ttk_LayoutSpec layoutSpec);
65	65	/* Slot 9 is reserved */
66	66	/* 10 */
67		TTKAPI int Ttk_GetStateSpecFromObj (Tcl_Interp * interp,
	67	TTKAPI int Ttk_GetStateSpecFromObj (Tcl_Interp * interp,
68	68	Tcl_Obj * objPtr, Ttk_StateSpec * spec_rtn);
69	69	/* 11 */
70		TTKAPI Tcl_Obj * Ttk_NewStateSpecObj (unsigned int onbits,
	70	TTKAPI Tcl_Obj * Ttk_NewStateSpecObj (unsigned int onbits,
71	71	unsigned int offbits);
72	72	/* 12 */
73		TTKAPI Ttk_StateMap Ttk_GetStateMapFromObj (Tcl_Interp * interp,
	73	TTKAPI Ttk_StateMap Ttk_GetStateMapFromObj (Tcl_Interp * interp,
74	74	Tcl_Obj * objPtr);
75	75	/* 13 */
76		TTKAPI Tcl_Obj * Ttk_StateMapLookup (Tcl_Interp * interp,
	76	TTKAPI Tcl_Obj * Ttk_StateMapLookup (Tcl_Interp * interp,
77	77	Ttk_StateMap map, Ttk_State state);
78	78	/* 14 */
79		TTKAPI int Ttk_StateTableLookup (Ttk_StateTable map[],
	79	TTKAPI int Ttk_StateTableLookup (Ttk_StateTable map[],
80	80	Ttk_State state);
81	81	/* Slot 15 is reserved */
82	82	/* Slot 16 is reserved */

84	84	/* Slot 18 is reserved */
85	85	/* Slot 19 is reserved */
86	86	/* 20 */
87		TTKAPI int Ttk_GetPaddingFromObj (Tcl_Interp * interp,
88		Tk_Window tkwin, Tcl_Obj * objPtr,
	87	TTKAPI int Ttk_GetPaddingFromObj (Tcl_Interp * interp,
	88	Tk_Window tkwin, Tcl_Obj * objPtr,
89	89	Ttk_Padding * pad_rtn);
90	90	/* 21 */
91		TTKAPI int Ttk_GetBorderFromObj (Tcl_Interp * interp,
	91	TTKAPI int Ttk_GetBorderFromObj (Tcl_Interp * interp,
92	92	Tcl_Obj * objPtr, Ttk_Padding * pad_rtn);
93	93	/* 22 */
94		TTKAPI int Ttk_GetStickyFromObj (Tcl_Interp * interp,
	94	TTKAPI int Ttk_GetStickyFromObj (Tcl_Interp * interp,
95	95	Tcl_Obj * objPtr, Ttk_Sticky * sticky_rtn);
96	96	/* 23 */
97	97	TTKAPI Ttk_Padding Ttk_MakePadding (short l, short t, short r, short b);

100	100	/* 25 */
101	101	TTKAPI Ttk_Padding Ttk_AddPadding (Ttk_Padding pad1, Ttk_Padding pad2);
102	102	/* 26 */
103		TTKAPI Ttk_Padding Ttk_RelievePadding (Ttk_Padding padding, int relief,
	103	TTKAPI Ttk_Padding Ttk_RelievePadding (Ttk_Padding padding, int relief,
104	104	int n);
105	105	/* 27 */
106	106	TTKAPI Ttk_Box Ttk_MakeBox (int x, int y, int width, int height);
107	107	/* 28 */
108	108	TTKAPI int Ttk_BoxContains (Ttk_Box box, int x, int y);
109	109	/* 29 */
110		TTKAPI Ttk_Box Ttk_PackBox (Ttk_Box * cavity, int w, int h,
	110	TTKAPI Ttk_Box Ttk_PackBox (Ttk_Box * cavity, int w, int h,
111	111	Ttk_Side side);
112	112	/* 30 */
113		TTKAPI Ttk_Box Ttk_StickBox (Ttk_Box parcel, int w, int h,
	113	TTKAPI Ttk_Box Ttk_StickBox (Ttk_Box parcel, int w, int h,
114	114	Ttk_Sticky sticky);
115	115	/* 31 */
116		TTKAPI Ttk_Box Ttk_AnchorBox (Ttk_Box parcel, int w, int h,
	116	TTKAPI Ttk_Box Ttk_AnchorBox (Ttk_Box parcel, int w, int h,
117	117	Tk_Anchor anchor);
118	118	/* 32 */
119	119	TTKAPI Ttk_Box Ttk_PadBox (Ttk_Box b, Ttk_Padding p);
120	120	/* 33 */
121	121	TTKAPI Ttk_Box Ttk_ExpandBox (Ttk_Box b, Ttk_Padding p);
122	122	/* 34 */
123		TTKAPI Ttk_Box Ttk_PlaceBox (Ttk_Box * cavity, int w, int h,
	123	TTKAPI Ttk_Box Ttk_PlaceBox (Ttk_Box * cavity, int w, int h,
124	124	Ttk_Side side, Ttk_Sticky sticky);
125	125	/* 35 */
126	126	TTKAPI Tcl_Obj * Ttk_NewBoxObj (Ttk_Box box);

129	129	/* Slot 38 is reserved */
130	130	/* Slot 39 is reserved */
131	131	/* 40 */
132		TTKAPI int Ttk_GetOrientFromObj (Tcl_Interp * interp,
	132	TTKAPI int Ttk_GetOrientFromObj (Tcl_Interp * interp,
133	133	Tcl_Obj * objPtr, int * orient);
134	134
135	135	#endif /* !defined(USE_TTK_STUBS) */

+12

-12

generic/ttk/ttkDefaultTheme.c less more

0		/* $Id: ttkDefaultTheme.c,v 1.12 2008/07/04 19:05:04 jenglish Exp $
	0	/* $Id: ttkDefaultTheme.c,v 1.13 2008/11/02 09:54:02 nijtmans Exp $
1	1	*
2	2	* Copyright (c) 2003, Joe English
3	3	*

38	38	enum BorderColor { FLAT = 1, LITE = 2, DARK = 3, BRDR = 4 };
39	39
40	40	/* top-left outer, top-left inner, bottom-right inner, bottom-right outer */
41		static int shadowColors[6][4] =
	41	static int const shadowColors[6][4] =
42	42	{
43	43	{ FLAT, FLAT, FLAT, FLAT }, /* TK_RELIEF_FLAT = 0*/
44	44	{ DARK, LITE, DARK, LITE }, /* TK_RELIEF_GROOVE = 1*/

49	49	};
50	50
51	51	/* top-left, bottom-right */
52		static int thinShadowColors[6][4] =
	52	static int const thinShadowColors[6][4] =
53	53	{
54	54	{ FLAT, FLAT }, /* TK_RELIEF_FLAT = 0*/
55	55	{ DARK, LITE }, /* TK_RELIEF_GROOVE = 1*/

203	203	* TtkDrawArrow, TtkFillArrow --
204	204	* Draw an arrow in the indicated direction inside the specified box.
205	205	*/
206		/public/
	206	/public/
207	207	void TtkFillArrow(
208	208	Display *display, Drawable d, GC gc, Ttk_Box b, ArrowDirection dir)
209	209	{

213	213	XDrawLines(display, d, gc, points, 4, CoordModeOrigin);
214	214	}
215	215
216		/public/
	216	/public/
217	217	void TtkDrawArrow(
218	218	Display *display, Drawable d, GC gc, Ttk_Box b, ArrowDirection dir)
219	219	{

295	295
296	296	if (defaultState == TTK_BUTTON_DEFAULT_ACTIVE) {
297	297	GC gc = Tk_GCForColor(borderColor, d);
298		XDrawRectangle(Tk_Display(tkwin), d, gc,
	298	XDrawRectangle(Tk_Display(tkwin), d, gc,
299	299	b.x, b.y, b.width-1, b.height-1);
300	300	}
301	301	if (defaultState != TTK_BUTTON_DEFAULT_DISABLED) {

378	378	int width; /* Width of each image */
379	379	int height; /* Height of each image */
380	380	int nimages; /* #images / row */
381		char *pixels; / array[height] of char[widthnimage] /
	381	const char const pixels; /* array[height] of char[widthnimage] /
382	382	Ttk_StateTable map;/ used to look up image index by state */
383	383	} IndicatorSpec;
384	384
385	385	#if 0
386	386	/XPM/
387		static char *button_images[] = {
	387	static const char *const button_images[] = {
388	388	/* width height ncolors chars_per_pixel */
389	389	"52 26 7 1",
390	390	/* colors */

407	407	{ 3, TTK_STATE_SELECTED\|TTK_STATE_DISABLED, 0 },
408	408	{ 0, 0, 0 }
409	409	};
410		static char *checkbutton_pixels[] = {
	410	static const char *const checkbutton_pixels[] = {
411	411	"AAAAAAAAAAAABAAAAAAAAAAAABAAAAAAAAAAAABAAAAAAAAAAAAB",
412	412	"AEEEEEEEEEECBAEEEEEEEEEECBAEEEEEEEEEECBAEEEEEEEEEECB",
413	413	"AEDDDDDDDDDCBAEDDDDDDDDDCBAEFFFFFFFFFCBAEFFFFFFFFFCB",

439	439	{ 0, 0, 0 }
440	440	};
441	441
442		static char *radiobutton_pixels[] = {
	442	static const char *const radiobutton_pixels[] = {
443	443	"FFFFAAAAFFFFFFFFFAAAAFFFFFFFFFAAAAFFFFFFFFFAAAAFFFFF",
444	444	"FFAAEEEEAAFFFFFAAEEEEAAFFFFFAAEEEEAAFFFFFAAEEEEAAFFF",
445	445	"FAEEDDDDECBFFFAEEDDDDECBFFFAEEFFFFECBFFFAEEFFFFECBFF",

620	620	{
621	621	{ "-arrowsize", TK_OPTION_PIXELS,
622	622	Tk_Offset(ArrowElement,sizeObj), STRINGIFY(SCROLLBAR_WIDTH) },
623		{ "-background", TK_OPTION_BORDER,
	623	{ "-background", TK_OPTION_BORDER,
624	624	Tk_Offset(ArrowElement,borderObj), DEFAULT_BACKGROUND },
625		{ "-bordercolor", TK_OPTION_COLOR,
	625	{ "-bordercolor", TK_OPTION_COLOR,
626	626	Tk_Offset(ArrowElement,borderColorObj), "black" },
627	627	{ "-relief", TK_OPTION_RELIEF,
628	628	Tk_Offset(ArrowElement,reliefObj),"raised"},

+145

-33

generic/ttk/ttkEntry.c less more

0	0	/*
1		* $Id: ttkEntry.c,v 1.9 2007/05/18 21:46:11 jenglish Exp $
	1	* $Id: ttkEntry.c,v 1.16 2008/12/15 17:51:31 das Exp $
2	2	*
3	3	* DERIVED FROM: tk/generic/tkEntry.c r1.35.
4	4	*

72	72
73	73	/* Style parameters:
74	74	*/
75		typedef struct
76		{
	75	typedef struct {
77	76	Tcl_Obj foregroundObj; / Foreground color for normal text */
78	77	Tcl_Obj backgroundObj; / Entry widget background color */
79	78	Tcl_Obj selBorderObj; / Border and background for selection */

83	82	Tcl_Obj insertWidthObj; / Insert cursor width */
84	83	} EntryStyleData;
85	84
86		typedef struct
87		{
	85	typedef struct {
88	86	/*
89	87	* Internal state:
90	88	*/

134	132
135	133	} EntryPart;
136	134
137		typedef struct
138		{
	135	typedef struct {
139	136	WidgetCore core;
140	137	EntryPart entry;
141	138	} Entry;

157	154	#define DEF_ENTRY_FONT "TkTextFont"
158	155	#define DEF_LIST_HEIGHT "10"
159	156
160		static Tk_OptionSpec EntryOptionSpecs[] =
161		{
	157	static Tk_OptionSpec EntryOptionSpecs[] = {
162	158	WIDGET_TAKES_FOCUS,
163	159
164	160	{TK_OPTION_BOOLEAN, "-exportselection", "exportSelection",

522	518	ExpandPercents(entryPtr, template, new, index, count, reason, &script);
523	519	code = Tcl_EvalEx(interp,
524	520	Tcl_DStringValue(&script), Tcl_DStringLength(&script),
525		TCL_EVAL_GLOBAL \| TCL_EVAL_DIRECT);
	521	TCL_EVAL_GLOBAL);
526	522	Tcl_DStringFree(&script);
527	523	if (WidgetDestroyed(&entryPtr->core))
528	524	return TCL_ERROR;

565	561	* TCL_BREAK if the change is rejected
566	562	* TCL_ERROR if any errors occured
567	563	*
568		* The change will be rejected if -validatecommand returns 0,
	564	* The change will be rejected if -validatecommand returns 0,
569	565	* or if -validatecommand or -invalidcommand modifies the value.
570	566	*/
571	567	static int

924	920	* +++ Initialization and cleanup.
925	921	*/
926	922
927		static int
	923	static void
928	924	EntryInitialize(Tcl_Interp interp, void recordPtr)
929	925	{
930	926	Entry *entryPtr = recordPtr;

949	945	entryPtr->entry.insertPos = 0;
950	946	entryPtr->entry.selectFirst = -1;
951	947	entryPtr->entry.selectLast = -1;
952
953		return TCL_OK;
954	948	}
955	949
956	950	static void

1187	1181
1188	1182	EntryInitStyleData(entryPtr, &es);
1189	1183
1190		showCursor =
	1184	showCursor =
1191	1185	(entryPtr->core.flags & CURSOR_ON) != 0
1192	1186	&& EntryEditable(entryPtr)
1193	1187	&& entryPtr->entry.insertPos >= leftIndex

1249	1243	Tk_SetCaretPos(tkwin, cursorX, cursorY, cursorHeight);
1250	1244
1251	1245	gc = EntryGetGC(entryPtr, es.insertColorObj);
1252		XFillRectangle(Tk_Display(tkwin), d, gc,
	1246	XFillRectangle(Tk_Display(tkwin), d, gc,
1253	1247	cursorX-cursorWidth/2, cursorY, cursorWidth, cursorHeight);
1254	1248	Tk_FreeGC(Tk_Display(tkwin), gc);
1255	1249	}

1391	1385	if ((index == entryPtr->entry.numChars) && (index > 0)) {
1392	1386	index--;
1393	1387	}
1394		Tk_CharBbox(entryPtr->entry.textLayout, index,
	1388	Tk_CharBbox(entryPtr->entry.textLayout, index,
1395	1389	&b.x, &b.y, &b.width, &b.height);
1396	1390	b.x += entryPtr->entry.layoutX;
1397	1391	b.y += entryPtr->entry.layoutY;

1638	1632	return TtkScrollviewCommand(interp, objc, objv, entryPtr->entry.xscrollHandle);
1639	1633	}
1640	1634
1641		static WidgetCommandSpec EntryCommands[] =
1642		{
	1635	static WidgetCommandSpec EntryCommands[] = {
1643	1636	{ "bbox", EntryBBoxCommand },
1644	1637	{ "cget", TtkWidgetCgetCommand },
1645	1638	{ "configure", TtkWidgetConfigureCommand },

1661	1654	* +++ Entry widget definition.
1662	1655	*/
1663	1656
1664		static WidgetSpec EntryWidgetSpec =
1665		{
	1657	static WidgetSpec EntryWidgetSpec = {
1666	1658	"TEntry", /* className */
1667	1659	sizeof(Entry), /* recordSize */
1668	1660	EntryOptionSpecs, /* optionSpecs */

1694	1686	ComboboxPart combobox;
1695	1687	} Combobox;
1696	1688
1697		static Tk_OptionSpec ComboboxOptionSpecs[] =
1698		{
	1689	static Tk_OptionSpec ComboboxOptionSpecs[] = {
1699	1690	{TK_OPTION_STRING, "-height", "height", "Height",
1700	1691	DEF_LIST_HEIGHT, Tk_Offset(Combobox, combobox.heightObj), -1,
1701	1692	0,0,0 },

1711	1702	/* ComboboxInitialize --
1712	1703	* Initialization hook for combobox widgets.
1713	1704	*/
1714		static int
	1705	static void
1715	1706	ComboboxInitialize(Tcl_Interp interp, void recordPtr)
1716	1707	{
1717	1708	Combobox *cb = recordPtr;
	1709
1718	1710	cb->combobox.currentIndex = -1;
1719	1711	TtkTrackElementState(&cb->core);
1720		return EntryInitialize(interp, recordPtr);
	1712	EntryInitialize(interp, recordPtr);
1721	1713	}
1722	1714
1723	1715	/* ComboboxConfigure --

1741	1733	* Setting the current index updates the combobox value,
1742	1734	* but the value and -values may be changed independently
1743	1735	* of the index. Instead of trying to keep currentIndex
1744		* in sync at all times, [$cb current] double-checks
	1736	* in sync at all times, [$cb current] double-checks
1745	1737	*/
1746	1738	static int ComboboxCurrentCommand(
1747	1739	Tcl_Interp interp, int objc, Tcl_Obj const objv[], void *recordPtr)

1757	1749	if (objc == 2) {
1758	1750	/* Check if currentIndex still valid:
1759	1751	*/
1760		if ( currentIndex < 0
	1752	if ( currentIndex < 0
1761	1753	\|\| currentIndex >= nValues
1762	1754	\|\| strcmp(currentValue,Tcl_GetString(values[currentIndex]))
1763	1755	)

1782	1774	return TCL_ERROR;
1783	1775	}
1784	1776	if (currentIndex < 0 \|\| currentIndex >= nValues) {
1785		Tcl_AppendResult(interp,
	1777	Tcl_AppendResult(interp,
1786	1778	"Index ", Tcl_GetString(objv[2]), " out of range",
1787	1779	NULL);
1788	1780	return TCL_ERROR;

1801	1793	/*------------------------------------------------------------------------
1802	1794	* +++ Combobox widget definition.
1803	1795	*/
1804		static WidgetCommandSpec ComboboxCommands[] =
1805		{
	1796	static WidgetCommandSpec ComboboxCommands[] = {
1806	1797	{ "bbox", EntryBBoxCommand },
1807	1798	{ "cget", TtkWidgetCgetCommand },
1808	1799	{ "configure", TtkWidgetConfigureCommand },

1821	1812	{0,0}
1822	1813	};
1823	1814
1824		static WidgetSpec ComboboxWidgetSpec =
1825		{
	1815	static WidgetSpec ComboboxWidgetSpec = {
1826	1816	"TCombobox", /* className */
1827	1817	sizeof(Combobox), /* recordSize */
1828	1818	ComboboxOptionSpecs, /* optionSpecs */

1838	1828	};
1839	1829
1840	1830	/*------------------------------------------------------------------------
	1831	* +++ Spinbox widget.
	1832	*/
	1833
	1834	typedef struct {
	1835	Tcl_Obj *valuesObj;
	1836
	1837	Tcl_Obj *fromObj;
	1838	Tcl_Obj *toObj;
	1839	Tcl_Obj *incrementObj;
	1840	Tcl_Obj *formatObj;
	1841
	1842	Tcl_Obj *wrapObj;
	1843	Tcl_Obj *commandObj;
	1844	} SpinboxPart;
	1845
	1846	typedef struct {
	1847	WidgetCore core;
	1848	EntryPart entry;
	1849	SpinboxPart spinbox;
	1850	} Spinbox;
	1851
	1852	static Tk_OptionSpec SpinboxOptionSpecs[] = {
	1853	{TK_OPTION_STRING, "-values", "values", "Values",
	1854	"", Tk_Offset(Spinbox, spinbox.valuesObj), -1,
	1855	0,0,0 },
	1856
	1857	{TK_OPTION_DOUBLE, "-from", "from", "From",
	1858	"0", Tk_Offset(Spinbox,spinbox.fromObj), -1,
	1859	0,0,0 },
	1860	{TK_OPTION_DOUBLE, "-to", "to", "To",
	1861	"0", Tk_Offset(Spinbox,spinbox.toObj), -1,
	1862	0,0,0 },
	1863	{TK_OPTION_DOUBLE, "-increment", "increment", "Increment",
	1864	"1", Tk_Offset(Spinbox,spinbox.incrementObj), -1,
	1865	0,0,0 },
	1866	{TK_OPTION_STRING, "-format", "format", "Format",
	1867	"", Tk_Offset(Spinbox, spinbox.formatObj), -1,
	1868	0,0,0 },
	1869
	1870	{TK_OPTION_STRING, "-command", "command", "Command",
	1871	"", Tk_Offset(Spinbox, spinbox.commandObj), -1,
	1872	0,0,0 },
	1873	{TK_OPTION_BOOLEAN, "-wrap", "wrap", "Wrap",
	1874	"0", Tk_Offset(Spinbox,spinbox.wrapObj), -1,
	1875	0,0,0 },
	1876
	1877	WIDGET_INHERIT_OPTIONS(EntryOptionSpecs)
	1878	};
	1879
	1880	/* SpinboxInitialize --
	1881	* Initialization hook for spinbox widgets.
	1882	*/
	1883	static void
	1884	SpinboxInitialize(Tcl_Interp interp, void recordPtr)
	1885	{
	1886	Spinbox *sb = recordPtr;
	1887	TtkTrackElementState(&sb->core);
	1888	EntryInitialize(interp, recordPtr);
	1889	}
	1890
	1891	/* SpinboxConfigure --
	1892	* Configuration hook for spinbox widgets.
	1893	*/
	1894	static int
	1895	SpinboxConfigure(Tcl_Interp interp, void recordPtr, int mask)
	1896	{
	1897	Spinbox *sb = recordPtr;
	1898	int unused;
	1899
	1900	/* Make sure -values is a valid list:
	1901	*/
	1902	if (Tcl_ListObjLength(interp,sb->spinbox.valuesObj,&unused) != TCL_OK)
	1903	return TCL_ERROR;
	1904
	1905	return EntryConfigure(interp, recordPtr, mask);
	1906	}
	1907
	1908	static WidgetCommandSpec SpinboxCommands[] = {
	1909	{ "bbox", EntryBBoxCommand },
	1910	{ "cget", TtkWidgetCgetCommand },
	1911	{ "configure", TtkWidgetConfigureCommand },
	1912	{ "delete", EntryDeleteCommand },
	1913	{ "get", EntryGetCommand },
	1914	{ "icursor", EntryICursorCommand },
	1915	{ "identify", TtkWidgetIdentifyCommand },
	1916	{ "index", EntryIndexCommand },
	1917	{ "insert", EntryInsertCommand },
	1918	{ "instate", TtkWidgetInstateCommand },
	1919	{ "selection", EntrySelectionCommand },
	1920	{ "state", TtkWidgetStateCommand },
	1921	{ "set", EntrySetCommand },
	1922	{ "validate", EntryValidateCommand },
	1923	{ "xview", EntryXViewCommand },
	1924	{0,0}
	1925	};
	1926
	1927	static WidgetSpec SpinboxWidgetSpec = {
	1928	"TSpinbox", /* className */
	1929	sizeof(Spinbox), /* recordSize */
	1930	SpinboxOptionSpecs, /* optionSpecs */
	1931	SpinboxCommands, /* subcommands */
	1932	SpinboxInitialize, /* initializeProc */
	1933	EntryCleanup, /* cleanupProc */
	1934	SpinboxConfigure, /* configureProc */
	1935	EntryPostConfigure, /* postConfigureProc */
	1936	TtkWidgetGetLayout, /* getLayoutProc */
	1937	TtkWidgetSize, /* sizeProc */
	1938	EntryDoLayout, /* layoutProc */
	1939	EntryDisplay /* displayProc */
	1940	};
	1941
	1942	/*------------------------------------------------------------------------
1841	1943	* +++ Textarea element.
1842	1944	*
1843	1945	* Text display area for Entry widgets.

1901	2003	TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))
1902	2004	TTK_END_LAYOUT
1903	2005
	2006	TTK_BEGIN_LAYOUT(SpinboxLayout)
	2007	TTK_GROUP("Spinbox.field", TTK_PACK_TOP\|TTK_FILL_X,
	2008	TTK_GROUP("null", TTK_PACK_RIGHT,
	2009	TTK_NODE("Spinbox.uparrow", TTK_PACK_TOP\|TTK_STICK_E)
	2010	TTK_NODE("Spinbox.downarrow", TTK_PACK_BOTTOM\|TTK_STICK_E))
	2011	TTK_GROUP("Spinbox.padding", TTK_FILL_BOTH,
	2012	TTK_NODE("Spinbox.textarea", TTK_FILL_BOTH)))
	2013	TTK_END_LAYOUT
	2014
1904	2015	/*------------------------------------------------------------------------
1905	2016	* +++ Initialization.
1906	2017	*/
1907
1908	2018	MODULE_SCOPE
1909	2019	void TtkEntry_Init(Tcl_Interp *interp)
1910	2020	{

1914	2024
1915	2025	Ttk_RegisterLayout(themePtr, "TEntry", EntryLayout);
1916	2026	Ttk_RegisterLayout(themePtr, "TCombobox", ComboboxLayout);
	2027	Ttk_RegisterLayout(themePtr, "TSpinbox", SpinboxLayout);
1917	2028
1918	2029	RegisterWidget(interp, "ttk::entry", &EntryWidgetSpec);
1919	2030	RegisterWidget(interp, "ttk::combobox", &ComboboxWidgetSpec);
	2031	RegisterWidget(interp, "ttk::spinbox", &SpinboxWidgetSpec);
1920	2032	}
1921	2033
1922	2034	/EOF/

+2

-4

generic/ttk/ttkFrame.c less more

0		/* $Id: ttkFrame.c,v 1.12 2008/01/08 20:02:27 jenglish Exp $
	0	/* $Id: ttkFrame.c,v 1.13 2008/11/09 23:53:09 jenglish Exp $
1	1	* Copyright (c) 2004, Joe English
2	2	*
3	3	* ttk::frame and ttk::labelframe widgets.

514	514	/* LabelframeInitialize --
515	515	* Initialization hook.
516	516	*/
517		static int LabelframeInitialize(Tcl_Interp interp, void recordPtr)
	517	static void LabelframeInitialize(Tcl_Interp interp, void recordPtr)
518	518	{
519	519	Labelframe *lframe = recordPtr;
520	520

523	523	lframe->label.labelWidget = 0;
524	524	lframe->label.labelLayout = 0;
525	525	lframe->label.labelParcel = Ttk_MakeBox(-1,-1,-1,-1);
526
527		return TCL_OK;
528	526	}
529	527
530	528	/* LabelframeCleanup --

+4

-4

generic/ttk/ttkGenStubs.tcl less more

7	7	# See the file "license.terms" for information on usage and redistribution
8	8	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	#
10		# $Id: ttkGenStubs.tcl,v 1.1 2007/03/07 23:46:34 das Exp $
	10	# $Id: ttkGenStubs.tcl,v 1.2 2008/10/22 20:56:43 nijtmans Exp $
11	11	#
12	12	# SOURCE: tcl/tools/genStubs.tcl, revision 1.20
13	13	#

433	433	[lindex $arg 2]
434	434	if {[string length $line] + [string length $next] \
435	435	+ $pad > 76} {
436		append text $line \n
	436	append text [string trimright $line] \n
437	437	set line "\t\t\t\t"
438	438	set pad 28
439	439	}

451	451	[lindex $arg 2]
452	452	if {[string length $line] + [string length $next] \
453	453	+ $pad > 76} {
454		append text $line \n
	454	append text [string trimright $line] \n
455	455	set line "\t\t\t\t"
456	456	set pad 28
457	457	}

875	875	if {[string length [namespace which lassign]] == 0} {
876	876	proc lassign {valueList args} {
877	877	if {[llength $args] == 0} {
878		error "wrong # args: lassign list varname ?varname..?"
	878	error "wrong # args: should be \"lassign list ?varName ...?\""
879	879	}
880	880
881	881	uplevel [list foreach $args $valueList {break}]

+2

-2

generic/ttk/ttkLayout.c less more

4	4	*
5	5	* Copyright (c) 2003 Joe English. Freely redistributable.
6	6	*
7		* $Id: ttkLayout.c,v 1.12 2008/05/23 20:20:05 jenglish Exp $
	7	* $Id: ttkLayout.c,v 1.13 2008/12/07 16:34:56 das Exp $
8	8	*/
9	9
10	10	#include <string.h>

732	732	last = node;
733	733	}
734	734
735		if (spec->opcode & _TTK_CHILDREN) {
	735	if (spec->opcode & _TTK_CHILDREN && last) {
736	736	int depth = 1;
737	737	last->child = Ttk_BuildLayoutTemplate(spec+1);
738	738

+2

-4

generic/ttk/ttkNotebook.c less more

0		/* $Id: ttkNotebook.c,v 1.15 2008/07/23 23:24:45 nijtmans Exp $
	0	/* $Id: ttkNotebook.c,v 1.16 2008/11/09 23:53:09 jenglish Exp $
1	1	* Copyright (c) 2004, Joe English
2	2	*/
3	3

1213	1213	* +++ Widget class hooks.
1214	1214	*/
1215	1215
1216		static int NotebookInitialize(Tcl_Interp interp, void recordPtr)
	1216	static void NotebookInitialize(Tcl_Interp interp, void recordPtr)
1217	1217	{
1218	1218	Notebook *nb = recordPtr;
1219	1219

1231	1231
1232	1232	Tk_CreateEventHandler(
1233	1233	nb->core.tkwin, NotebookEventMask, NotebookEventHandler, recordPtr);
1234
1235		return TCL_OK;
1236	1234	}
1237	1235
1238	1236	static void NotebookCleanup(void *recordPtr)

+2

-4

generic/ttk/ttkPanedwindow.c less more

0		/* $Id: ttkPanedwindow.c,v 1.16 2008/07/23 23:24:45 nijtmans Exp $
	0	/* $Id: ttkPanedwindow.c,v 1.17 2008/11/09 23:53:09 jenglish Exp $
1	1	*
2	2	* Copyright (c) 2005, Joe English. Freely redistributable.
3	3	*

492	492	* +++ Initialization and cleanup hooks.
493	493	*/
494	494
495		static int PanedInitialize(Tcl_Interp interp, void recordPtr)
	495	static void PanedInitialize(Tcl_Interp interp, void recordPtr)
496	496	{
497	497	Paned *pw = recordPtr;
498	498

502	502	pw->paned.paneOptionTable = Tk_CreateOptionTable(interp,PaneOptionSpecs);
503	503	pw->paned.sashLayout = 0;
504	504	pw->paned.sashThickness = 1;
505
506		return TCL_OK;
507	505	}
508	506
509	507	static void PanedCleanup(void *recordPtr)

+2

-3

generic/ttk/ttkProgress.c less more

0		/* $Id: ttkProgress.c,v 1.6 2008/04/27 22:41:12 dkf Exp $
	0	/* $Id: ttkProgress.c,v 1.7 2008/11/09 23:53:09 jenglish Exp $
1	1	*
2	2	* Copyright (c) Joe English, Pat Thoyts, Michael Kirkham
3	3	*

184	184	* +++ Widget class methods:
185	185	*/
186	186
187		static int ProgressbarInitialize(Tcl_Interp interp, void recordPtr)
	187	static void ProgressbarInitialize(Tcl_Interp interp, void recordPtr)
188	188	{
189	189	Progressbar *pb = recordPtr;
190	190	pb->progress.variableTrace = 0;
191	191	pb->progress.timer = 0;
192		return TCL_OK;
193	192	}
194	193
195	194	static void ProgressbarCleanup(void *recordPtr)

+2

-4

generic/ttk/ttkScale.c less more

0		/* $Id: ttkScale.c,v 1.8 2008/04/27 22:41:12 dkf Exp $
	0	/* $Id: ttkScale.c,v 1.9 2008/11/09 23:53:09 jenglish Exp $
1	1	* Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
2	2	*
3	3	* ttk::scale widget.

99	99	/* ScaleInitialize --
100	100	* Scale widget initialization hook.
101	101	*/
102		static int ScaleInitialize(Tcl_Interp interp, void recordPtr)
	102	static void ScaleInitialize(Tcl_Interp interp, void recordPtr)
103	103	{
104	104	Scale *scalePtr = recordPtr;
105
106	105	TtkTrackElementState(&scalePtr->core);
107		return TCL_OK;
108	106	}
109	107
110	108	static void ScaleCleanup(void *recordPtr)

+2

-4

generic/ttk/ttkScrollbar.c less more

0		/* $Id: ttkScrollbar.c,v 1.8 2008/04/27 22:41:12 dkf Exp $
	0	/* $Id: ttkScrollbar.c,v 1.9 2008/11/09 23:53:09 jenglish Exp $
1	1	* Copyright (c) 2003, Joe English
2	2	*
3	3	* ttk::scrollbar widget.

48	48	* +++ Widget hooks.
49	49	*/
50	50
51		static int
	51	static void
52	52	ScrollbarInitialize(Tcl_Interp interp, void recordPtr)
53	53	{
54	54	Scrollbar *sb = recordPtr;

56	56	sb->scrollbar.last = 1.0;
57	57
58	58	TtkTrackElementState(&sb->core);
59
60		return TCL_OK;
61	59	}
62	60
63	61	static Ttk_Layout ScrollbarGetLayout(

+10

-3

generic/ttk/ttkState.c less more

0	0	/*
1		* $Id: ttkState.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
	1	* $Id: ttkState.c,v 1.3 2008/12/03 18:44:49 jenglish Exp $
2	2	*
3	3	* Tk widget state utilities.
4	4	*

15	15	* Table of state names. Must be kept in sync with TTK_STATE_*
16	16	* #defines in ttkTheme.h.
17	17	*/
18		static const char *stateNames[] =
	18	static const char *const stateNames[] =
19	19	{
20	20	"active", /* Mouse cursor is over widget or element */
21	21	"disabled", /* Widget is disabled */

26	26	"alternate", /* Widget-specific alternate display style */
27	27	"invalid", /* Bad value */
28	28	"readonly", /* Editing/modification disabled */
	29	"hover", /* Mouse cursor is over widget */
	30	"reserved1", /* Reserved for future extension */
	31	"reserved2", /* Reserved for future extension */
	32	"reserved3", /* Reserved for future extension */
	33	"user3", /* User-definable state */
	34	"user2", /* User-definable state */
	35	"user1", /* User-definable state */
29	36	NULL
30	37	};
31	38

218	225
219	226	/* Ttk_GetStateMapFromObj --
220	227	* Returns a Ttk_StateMap from a Tcl_Obj*.
221		* Since a Ttk_StateMap is just a specially-formatted Tcl_Obj,
	228	* Since a Ttk_StateMap is just a specially-formatted Tcl_Obj,
222	229	* this basically just checks for errors.
223	230	*/
224	231	Ttk_StateMap Ttk_GetStateMapFromObj(

+5

-10

generic/ttk/ttkTheme.c less more

8	8	* See the file "license.terms" for information on usage and redistribution
9	9	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* $Id: ttkTheme.c,v 1.15 2008/07/23 23:24:45 nijtmans Exp $
	11	* $Id: ttkTheme.c,v 1.16 2008/10/24 20:01:10 jenglish Exp $
12	12	*/
13	13
14	14	#include <stdlib.h>
15	15	#include <string.h>
16	16	#include <tk.h>
	17	#include <tkInt.h>
17	18	#include "ttkThemeInt.h"
18	19
19		#ifdef NO_PRIVATE_HEADERS
20		EXTERN const Tk_OptionSpec TkGetOptionSpec(const char name,
21		Tk_OptionTable optionTable);
22		#else
23		#include <tkInt.h>
24		#endif
	20	#define PKG_ASSOC_KEY "Ttk"
25	21
26	22	/*------------------------------------------------------------------------
27	23	* +++ Styles.

474	470
475	471	static StylePackageData GetStylePackageData(Tcl_Interp interp)
476	472	{
477		return (StylePackageData*)Tcl_GetAssocData(interp, "StylePackage", NULL);
	473	return Tcl_GetAssocData(interp, PKG_ASSOC_KEY, NULL);
478	474	}
479	475
480	476	/*

1707	1703	pkgPtr->cache = Ttk_CreateResourceCache(interp);
1708	1704	pkgPtr->themeChangePending = 0;
1709	1705
1710		Tcl_SetAssocData(interp, "StylePackage", Ttk_StylePkgFree,
1711		(ClientData)pkgPtr);
	1706	Tcl_SetAssocData(interp, PKG_ASSOC_KEY, Ttk_StylePkgFree, pkgPtr);
1712	1707
1713	1708	/*
1714	1709	* Create the default system theme:

+4

-4

generic/ttk/ttkTheme.h less more

0		/* $Id: ttkTheme.h,v 1.14 2008/05/23 20:20:05 jenglish Exp $
	0	/* $Id: ttkTheme.h,v 1.16 2008/12/03 18:44:49 jenglish Exp $
1	1	* Copyright (c) 2003 Joe English. Freely redistributable.
2	2	*
3	3	* Declarations for Tk theme engine.

47	47	#define TTK_STATE_ALTERNATE (1<<6)
48	48	#define TTK_STATE_INVALID (1<<7)
49	49	#define TTK_STATE_READONLY (1<<8)
50		#define TTK_STATE_USER7 (1<<9)
	50	#define TTK_STATE_HOVER (1<<9)
51	51	#define TTK_STATE_USER6 (1<<10)
52	52	#define TTK_STATE_USER5 (1<<11)
53	53	#define TTK_STATE_USER4 (1<<12)

235	235
236	236	typedef struct Ttk_ElementOptionSpec
237	237	{
238		char optionName; / Command-line name of the widget option */
	238	const char optionName; / Command-line name of the widget option */
239	239	Tk_OptionType type; /* Accepted option types */
240	240	int offset; /* Offset of Tcl_Obj* field in element record */
241		char defaultValue; / Default value to used if resource missing */
	241	const char defaultValue; / Default value to used if resource missing */
242	242	} Ttk_ElementOptionSpec;
243	243
244	244	#define TK_OPTION_ANY TK_OPTION_STRING

+2

-4

generic/ttk/ttkTreeview.c less more

0		/* $Id: ttkTreeview.c,v 1.29 2008/07/23 23:24:45 nijtmans Exp $
	0	/* $Id: ttkTreeview.c,v 1.30 2008/11/09 23:53:09 jenglish Exp $
1	1	* Copyright (c) 2004, Joe English
2	2	*
3	3	* ttk::treeview widget implementation.

984	984	* +++ Initialization and cleanup.
985	985	*/
986	986
987		static int TreeviewInitialize(Tcl_Interp interp, void recordPtr)
	987	static void TreeviewInitialize(Tcl_Interp interp, void recordPtr)
988	988	{
989	989	Treeview *tv = recordPtr;
990	990	int unused;

1049	1049	*/
1050	1050	tv->tree.treeArea = tv->tree.headingArea = Ttk_MakeBox(0,0,0,0);
1051	1051	tv->tree.slack = 0;
1052
1053		return TCL_OK;
1054	1052	}
1055	1053
1056	1054	static void TreeviewCleanup(void *recordPtr)

+133

-110

generic/ttk/ttkWidget.c less more

0		/* $Id: ttkWidget.c,v 1.13 2008/07/23 23:24:44 nijtmans Exp $
	0	/* $Id: ttkWidget.c,v 1.20 2008/12/03 18:44:50 jenglish Exp $
1	1	* Copyright (c) 2003, Joe English
2	2	*
3	3	* Core widget utilities.

60	60	static Drawable BeginDrawing(Tk_Window tkwin)
61	61	{
62	62	return Tk_GetPixmap(Tk_Display(tkwin), Tk_WindowId(tkwin),
63		Tk_Width(tkwin), Tk_Height(tkwin),
64		DefaultDepthOfScreen(Tk_Screen(tkwin)));
	63	Tk_Width(tkwin), Tk_Height(tkwin), Tk_Depth(tkwin));
65	64	}
66	65
67	66	/* EndDrawing --

115	114	}
116	115
117	116	if (!(corePtr->flags & REDISPLAY_PENDING)) {
118		Tcl_DoWhenIdle(DrawWidget, (ClientData) corePtr);
	117	Tcl_DoWhenIdle(DrawWidget, corePtr);
119	118	corePtr->flags \|= REDISPLAY_PENDING;
120	119	}
121	120	}

170	169	return commands[index].command(interp, objc, objv, clientData);
171	170	}
172	171
173		/*
174		* WidgetInstanceObjCmd --
	172	/* WidgetInstanceObjCmd --
175	173	* Widget instance command implementation.
176	174	*/
177	175	static int
178	176	WidgetInstanceObjCmd(
179		ClientData clientData, /* Widget record pointer */
180		Tcl_Interp interp, / Current interpreter. */
181		int objc, /* Number of arguments. */
182		Tcl_Obj const objv[]) / Argument objects. */
183		{
184		WidgetCore corePtr = (WidgetCore )clientData;
	177	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
	178	{
	179	WidgetCore *corePtr = clientData;
185	180	const WidgetCommandSpec *commands = corePtr->widgetSpec->commands;
186		int status = TCL_OK;
	181	int status;
187	182
188	183	Tcl_Preserve(clientData);
189	184	status = TtkWidgetEnsembleCommand(commands,1, interp,objc,objv,clientData);

192	187	return status;
193	188	}
194	189
195		/*
196		* Command deletion callback for widget instance commands.
	190	/*------------------------------------------------------------------------
	191	* +++ Widget destruction.
	192	*
	193	* A widget can be destroyed when the application explicitly
	194	* destroys the window or one of its ancestors via [destroy]
	195	* or Tk_DestroyWindow(); when the application deletes the widget
	196	* instance command; when there is an error in the widget constructor;
	197	* or when another application calls XDestroyWindow on the window ID.
	198	*
	199	* The window receives a <DestroyNotify> event in all cases,
	200	* so we do the bulk of the cleanup there. See [#2207435] for
	201	* further notes (esp. re: Tk_FreeConfigOptions).
	202	*
	203	* Widget code that reenters the interp should only do so
	204	* when the widtget is Tcl_Preserve()d, and should check
	205	* the WIDGET_DESTROYED flag bit upon return.
	206	*/
	207
	208	/* WidgetInstanceObjCmdDeleted --
	209	* Widget instance command deletion callback.
197	210	*/
198	211	static void
199	212	WidgetInstanceObjCmdDeleted(ClientData clientData)
200	213	{
201		WidgetCore corePtr = (WidgetCore ) clientData;
	214	WidgetCore *corePtr = clientData;
202	215	corePtr->widgetCmd = NULL;
203	216	if (corePtr->tkwin != NULL)
204	217	Tk_DestroyWindow(corePtr->tkwin);
205	218	}
206	219
207		/*
208		* WidgetCleanup --
209		* Final cleanup for widget.
210		*
211		* @@@ TODO: check all code paths leading to widget destruction,
212		* @@@ describe here.
213		* @@@ Call widget-specific cleanup routine at an appropriate point.
	220	/* FreeWidget --
	221	* Final cleanup for widget; called via Tcl_EventuallyFree().
214	222	*/
215	223	static void
216		WidgetCleanup(char *memPtr)
	224	FreeWidget(char *memPtr)
217	225	{
218	226	ckfree(memPtr);
	227	}
	228
	229	/* DestroyWidget --
	230	* Main widget destructor; called from <DestroyNotify> event handler.
	231	*/
	232	static void
	233	DestroyWidget(WidgetCore *corePtr)
	234	{
	235	corePtr->flags \|= WIDGET_DESTROYED;
	236
	237	corePtr->widgetSpec->cleanupProc(corePtr);
	238
	239	Tk_FreeConfigOptions(
	240	(ClientData)corePtr, corePtr->optionTable, corePtr->tkwin);
	241
	242	if (corePtr->layout) {
	243	Ttk_FreeLayout(corePtr->layout);
	244	}
	245
	246	if (corePtr->flags & REDISPLAY_PENDING) {
	247	Tcl_CancelIdleCall(DrawWidget, corePtr);
	248	}
	249
	250	corePtr->tkwin = NULL;
	251	if (corePtr->widgetCmd) {
	252	Tcl_Command cmd = corePtr->widgetCmd;
	253	corePtr->widgetCmd = 0;
	254	/* NB: this can reenter the interpreter via a command traces */
	255	Tcl_DeleteCommandFromToken(corePtr->interp, cmd);
	256	}
	257	Tcl_EventuallyFree(corePtr, FreeWidget);
219	258	}
220	259
221	260	/*

241	280	\| FocusChangeMask
242	281	\| VirtualEventMask
243	282	\| ActivateMask
	283	\| EnterWindowMask
	284	\| LeaveWindowMask
244	285	;
245	286
246	287	static void CoreEventProc(ClientData clientData, XEvent *eventPtr)
247	288	{
248		WidgetCore corePtr = (WidgetCore ) clientData;
	289	WidgetCore *corePtr = clientData;
249	290
250	291	switch (eventPtr->type)
251	292	{

258	299	}
259	300	break;
260	301	case DestroyNotify :
261		corePtr->flags \|= WIDGET_DESTROYED;
262
263		Tk_DeleteEventHandler(corePtr->tkwin,
264		CoreEventMask,CoreEventProc,clientData);
265
266		if (corePtr->flags & REDISPLAY_PENDING) {
267		Tcl_CancelIdleCall(DrawWidget, clientData);
268		}
269
270		corePtr->widgetSpec->cleanupProc(corePtr);
271
272		Tk_FreeConfigOptions(
273		clientData, corePtr->optionTable, corePtr->tkwin);
274		corePtr->tkwin = NULL;
275
276		if (corePtr->layout) {
277		Ttk_FreeLayout(corePtr->layout);
278		}
279
280		/* NB: this can reenter the interpreter via a command traces */
281		if (corePtr->widgetCmd) {
282		Tcl_Command cmd = corePtr->widgetCmd;
283		corePtr->widgetCmd = 0;
284		Tcl_DeleteCommandFromToken(corePtr->interp, cmd);
285		}
286		Tcl_EventuallyFree(clientData, WidgetCleanup);
287		break;
288
	302	Tk_DeleteEventHandler(
	303	corePtr->tkwin, CoreEventMask,CoreEventProc,clientData);
	304	DestroyWidget(corePtr);
	305	break;
289	306	case FocusIn:
290	307	case FocusOut:
291	308	/* Don't process "virtual crossing" events */

308	325	corePtr->state \|= TTK_STATE_BACKGROUND;
309	326	TtkRedisplayWidget(corePtr);
310	327	break;
	328	case LeaveNotify:
	329	corePtr->state &= ~TTK_STATE_HOVER;
	330	TtkRedisplayWidget(corePtr);
	331	break;
	332	case EnterNotify:
	333	corePtr->state \|= TTK_STATE_HOVER;
	334	TtkRedisplayWidget(corePtr);
	335	break;
311	336	case VirtualEvent:
312	337	if (!strcmp("ThemeChanged", ((XVirtualEvent *)(eventPtr))->name)) {
313	338	(void)UpdateLayout(corePtr->interp, corePtr);

328	353	*/
329	354	static void WidgetWorldChanged(ClientData clientData)
330	355	{
331		WidgetCore corePtr = (WidgetCore)clientData;
	356	WidgetCore *corePtr = clientData;
332	357	SizeChanged(corePtr);
333	358	TtkRedisplayWidget(corePtr);
334	359	}

346	371	int TtkWidgetConstructorObjCmd(
347	372	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
348	373	{
349		WidgetSpec widgetSpec = (WidgetSpec )clientData;
	374	WidgetSpec *widgetSpec = clientData;
350	375	const char *className = widgetSpec->className;
	376	Tk_OptionTable optionTable =
	377	Tk_CreateOptionTable(interp, widgetSpec->optionSpecs);
	378	Tk_Window tkwin;
	379	void *recordPtr;
351	380	WidgetCore *corePtr;
352		ClientData recordPtr;
353		Tk_Window tkwin;
354		Tk_OptionTable optionTable;
	381	Tk_SavedOptions savedOptions;
355	382	int i;
356	383
357		if (objc < 2 \|\| objc % 1 == 1) {
	384	if (objc < 2 \|\| objc % 2 == 1) {
358	385	Tcl_WrongNumArgs(interp, 1, objv, "pathName ?-option value ...?");
359	386	return TCL_ERROR;
360	387	}
361	388
362		tkwin = Tk_CreateWindowFromPath(interp, Tk_MainWindow(interp),
363		Tcl_GetStringFromObj(objv[1], NULL), (char *) NULL);
364		if (tkwin == NULL)
365		return TCL_ERROR;
366
367		/*
368		* Check if a -class resource has been specified:
	389	/* Check if a -class option has been specified.
369	390	* We have to do this before the InitOptions() call,
370	391	* since InitOptions() is affected by the widget class.
371	392	*/
372	393	for (i = 2; i < objc; i += 2) {
373		const char *resourceName = Tcl_GetString(objv[i]);
374		if (!strcmp(resourceName, "-class")) {
	394	if (!strcmp(Tcl_GetString(objv[i]), "-class")) {
375	395	className = Tcl_GetString(objv[i+1]);
376	396	break;
377	397	}
378	398	}
379	399
380		Tk_SetClass(tkwin, className);
381
382		/*
383		* Set the BackgroundPixmap to ParentRelative here, so
384		* subclasses don't need to worry about setting the background.
385		*/
386		Tk_SetWindowBackgroundPixmap(tkwin, ParentRelative);
387
388		optionTable = Tk_CreateOptionTable(interp, widgetSpec->optionSpecs);
	400	tkwin = Tk_CreateWindowFromPath(
	401	interp, Tk_MainWindow(interp), Tcl_GetString(objv[1]), NULL);
	402	if (tkwin == NULL)
	403	return TCL_ERROR;
389	404
390	405	/*
391	406	* Allocate and initialize the widget record.
392	407	*/
393	408	recordPtr = ckalloc(widgetSpec->recordSize);
394	409	memset(recordPtr, 0, widgetSpec->recordSize);
395		corePtr = (WidgetCore *)recordPtr;
	410	corePtr = recordPtr;
396	411
397	412	corePtr->tkwin = tkwin;
398	413	corePtr->interp = interp;

400	415	corePtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(tkwin),
401	416	WidgetInstanceObjCmd, recordPtr, WidgetInstanceObjCmdDeleted);
402	417	corePtr->optionTable = optionTable;
403
	418	corePtr->layout = NULL;
	419	corePtr->flags = 0;
	420	corePtr->state = 0;
	421
	422	Tk_SetClass(tkwin, className);
404	423	Tk_SetClassProcs(tkwin, &widgetClassProcs, recordPtr);
405
406		if (Tk_InitOptions(interp, recordPtr, optionTable, tkwin) != TCL_OK)
407		goto error_nocleanup;
408
409		if (widgetSpec->initializeProc(interp, recordPtr) != TCL_OK)
410		goto error_nocleanup;
411
412		if (Tk_SetOptions(interp, recordPtr, optionTable, objc - 2,
413		objv + 2, tkwin, NULL/savePtr/, (int )NULL/maskPtr*/) != TCL_OK)
	424	Tk_SetWindowBackgroundPixmap(tkwin, ParentRelative);
	425
	426	widgetSpec->initializeProc(interp, recordPtr);
	427
	428	Tk_CreateEventHandler(tkwin, CoreEventMask, CoreEventProc, recordPtr);
	429
	430	/*
	431	* Initial configuration.
	432	*/
	433
	434	Tcl_Preserve(corePtr);
	435	if (Tk_InitOptions(interp, recordPtr, optionTable, tkwin) != TCL_OK) {
414	436	goto error;
415
	437	}
	438
	439	if (Tk_SetOptions(interp, recordPtr, optionTable,
	440	objc - 2, objv + 2, tkwin, &savedOptions, NULL) != TCL_OK) {
	441	Tk_RestoreSavedOptions(&savedOptions);
	442	goto error;
	443	} else {
	444	Tk_FreeSavedOptions(&savedOptions);
	445	}
416	446	if (widgetSpec->configureProc(interp, recordPtr, ~0) != TCL_OK)
417	447	goto error;
418
419	448	if (widgetSpec->postConfigureProc(interp, recordPtr, ~0) != TCL_OK)
420	449	goto error;
421	450
422	451	if (WidgetDestroyed(corePtr))
423	452	goto error;
424	453
425		if (UpdateLayout(interp, corePtr) != TCL_OK)
426		goto error;
	454	Tcl_Release(corePtr);
427	455
428	456	SizeChanged(corePtr);
429		Tk_CreateEventHandler(tkwin, CoreEventMask, CoreEventProc, recordPtr);
430
431	457	Tk_MakeWindowExist(tkwin);
432	458
433	459	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(tkwin), -1));
434
435	460	return TCL_OK;
436	461
437	462	error:
438		widgetSpec->cleanupProc(recordPtr);
439		error_nocleanup:
440		if (corePtr->layout) {
441		Ttk_FreeLayout(corePtr->layout);
442		corePtr->layout = 0;
443		}
444		Tk_FreeConfigOptions(recordPtr, optionTable, tkwin);
445		Tk_DestroyWindow(tkwin);
446		corePtr->tkwin = 0;
447		Tcl_DeleteCommandFromToken(interp, corePtr->widgetCmd);
448		ckfree(recordPtr);
	463	if (WidgetDestroyed(corePtr)) {
	464	Tcl_SetResult(interp, "Widget has been destroyed", TCL_STATIC);
	465	} else {
	466	Tk_DestroyWindow(tkwin);
	467	}
	468	Tcl_Release(corePtr);
449	469	return TCL_ERROR;
450	470	}
451	471

521	541	/* TtkNullInitialize --
522	542	* Default widget initializeProc (no-op)
523	543	*/
524		int TtkNullInitialize(Tcl_Interp interp, void recordPtr)
525		{
526		return TCL_OK;
	544	void TtkNullInitialize(Tcl_Interp interp, void recordPtr)
	545	{
527	546	}
528	547
529	548	/* TtkNullPostConfigure --

620	639
621	640	if (objc == 2) {
622	641	result = Tk_GetOptionInfo(interp, recordPtr,
623		corePtr->optionTable, (Tcl_Obj *) NULL, corePtr->tkwin);
	642	corePtr->optionTable, NULL, corePtr->tkwin);
624	643	} else if (objc == 3) {
625	644	result = Tk_GetOptionInfo(interp, recordPtr,
626	645	corePtr->optionTable, objv[2], corePtr->tkwin);

650	669	Tk_FreeSavedOptions(&savedOptions);
651	670
652	671	status = corePtr->widgetSpec->postConfigureProc(interp,recordPtr,mask);
	672	if (WidgetDestroyed(corePtr)) {
	673	Tcl_SetResult(interp, "Widget has been destroyed", TCL_STATIC);
	674	status = TCL_ERROR;
	675	}
653	676	if (status != TCL_OK) {
654	677	return status;
655	678	}

+3

-3

generic/ttk/ttkWidget.h less more

0		/* $Id: ttkWidget.h,v 1.10 2008/05/23 20:20:05 jenglish Exp $
	0	/* $Id: ttkWidget.h,v 1.11 2008/11/09 23:53:09 jenglish Exp $
1	1	* Copyright (c) 2003, Joe English
2	2	* Helper routines for widget implementations.
3	3	*/

74	74	/*
75	75	* Hooks:
76	76	*/
77		int (initializeProc)(Tcl_Interp , void *recordPtr);
	77	void (initializeProc)(Tcl_Interp , void *recordPtr);
78	78	void (cleanupProc)(void recordPtr);
79	79	int (configureProc)(Tcl_Interp , void *recordPtr, int flags);
80	80	int (postConfigureProc)(Tcl_Interp , void *recordPtr, int flags);

87	87	/*
88	88	* Common factors for widget implementations:
89	89	*/
90		MODULE_SCOPE int TtkNullInitialize(Tcl_Interp , void );
	90	MODULE_SCOPE void TtkNullInitialize(Tcl_Interp , void );
91	91	MODULE_SCOPE int TtkNullPostConfigure(Tcl_Interp , void , int);
92	92	MODULE_SCOPE void TtkNullCleanup(void *recordPtr);
93	93	MODULE_SCOPE Ttk_Layout TtkWidgetGetLayout(

+59

-4

library/console.tcl less more

3	3	# can be used by non-unix systems that do not have built-in support
4	4	# for shells.
5	5	#
6		# RCS: @(#) $Id: console.tcl,v 1.38 2008/05/13 13:25:18 patthoyts Exp $
	6	# RCS: @(#) $Id: console.tcl,v 1.39 2008/12/10 05:02:51 das Exp $
7	7	#
8	8	# Copyright (c) 1995-1997 Sun Microsystems, Inc.
9	9	# Copyright (c) 1998-2000 Ajuba Solutions.
10		# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
	10	# Copyright (c) 2007-2008 Daniel A. Steffen <das@users.sourceforge.net>
11	11	#
12	12	# See the file "license.terms" for information on usage and redistribution
13	13	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.

21	21	variable magicKeys 1 ; # enable brace matching and proc/var recognition
22	22	variable maxLines 600 ; # maximum # of lines buffered in console
23	23	variable showMatches 1 ; # show multiple expand matches
24
	24	variable useFontchooser [llength [info command ::tk::fontchooser]]
25	25	variable inPlugin [info exists embed_args]
26	26	variable defaultPrompt ; # default prompt if tcl_prompt1 isn't used
27
28	27
29	28	if {$inPlugin} {
30	29	set defaultPrompt {subst {[history nextid] % }}

97	96	}
98	97
99	98	AmpMenuArgs .menubar.edit add separator
	99	if {$::tk::console::useFontchooser} {
	100	if {[tk windowingsystem] eq "aqua"} {
	101	.menubar.edit add command -label tk_choose_font_marker
	102	set index [.menubar.edit index tk_choose_font_marker]
	103	.menubar.edit entryconfigure $index \
	104	-label [mc "Show Fonts"]\
	105	-accelerator "$mod-T"\
	106	-command [list ::tk::console::FontchooserToggle]
	107	bind Console <<TkFontchooserVisibility>> \
	108	[list ::tk::console::FontchooserVisibility $index]
	109	::tk::console::FontchooserVisibility $index
	110	} else {
	111	AmpMenuArgs .menubar.edit add command -label [mc "&Font..."] \
	112	-command [list ::tk::console::FontchooserToggle]
	113	}
	114	bind Console <FocusIn> [list ::tk::console::FontchooserFocus %W 1]
	115	bind Console <FocusOut> [list ::tk::console::FontchooserFocus %W 0]
	116	}
100	117	AmpMenuArgs .menubar.edit add command -label [mc "&Increase Font Size"] \
101	118	-accel "$mod++" -command {event generate .console <<Console_FontSizeIncr>>}
102	119	AmpMenuArgs .menubar.edit add command -label [mc "&Decrease Font Size"] \

395	412	event add $ev $key
396	413	bind Console $key {}
397	414	}
	415	if {$::tk::console::useFontchooser} {
	416	bind Console <Command-Key-t> [list ::tk::console::FontchooserToggle]
	417	}
398	418	}
399	419	bind Console <<Console_Expand>> {
400	420	if {[%W compare insert > promptEnd]} {

556	576	if {$size < 0} {set sign -1} else {set sign 1}
557	577	set size [expr {(abs($size) + 1) * $sign}]
558	578	font configure TkConsoleFont -size $size
	579	if {$::tk::console::useFontchooser} {
	580	tk fontchooser configure -font TkConsoleFont
	581	}
559	582	}
560	583	bind Console <<Console_FontSizeDecr>> {
561	584	set size [font configure TkConsoleFont -size]

563	586	if {$size < 0} {set sign -1} else {set sign 1}
564	587	set size [expr {(abs($size) - 1) * $sign}]
565	588	font configure TkConsoleFont -size $size
	589	if {$::tk::console::useFontchooser} {
	590	tk fontchooser configure -font TkConsoleFont
	591	}
566	592	}
567	593
568	594	##

666	692
667	693	Tcl $::tcl_patchLevel
668	694	Tk $::tk_patchLevel"
	695	}
	696
	697	# ::tk::console::Fontchooser* --
	698	# Let the user select the console font (TIP 324).
	699
	700	proc ::tk::console::FontchooserToggle {} {
	701	if {[tk fontchooser configure -visible]} {
	702	tk fontchooser hide
	703	} else {
	704	tk fontchooser show
	705	}
	706	}
	707	proc ::tk::console::FontchooserVisibility {index} {
	708	if {[tk fontchooser configure -visible]} {
	709	.menubar.edit entryconfigure $index -label [msgcat::mc "Hide Fonts"]
	710	} else {
	711	.menubar.edit entryconfigure $index -label [msgcat::mc "Show Fonts"]
	712	}
	713	}
	714	proc ::tk::console::FontchooserFocus {w isFocusIn} {
	715	if {$isFocusIn} {
	716	tk fontchooser configure -parent $w -font TkConsoleFont \
	717	-command [namespace code [list FontchooserApply]]
	718	} else {
	719	tk fontchooser configure -parent $w -font {} -command {}
	720	}
	721	}
	722	proc ::tk::console::FontchooserApply {font args} {
	723	catch {font configure TkConsoleFont {*}[font actual $font]}
669	724	}
670	725
671	726	# ::tk::console::TagProc --

+1

-2

library/demos/combo.tcl less more

1	1	#
2	2	# This demonstration script creates several combobox widgets.
3	3	#
4		# RCS: @(#) $Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp $
	4	# RCS: @(#) $Id: combo.tcl,v 1.4 2008/12/11 18:13:08 jenglish Exp $
5	5
6	6	if {![info exists widgetDemo]} {
7	7	error "This script should be run from the \"widget\" demo."
8	8	}
9	9
10	10	package require Tk
11		package require Ttk
12	11
13	12	set w .combo
14	13	catch {destroy $w}

+45

-18

library/demos/ctext.tcl less more

2	2	# This demonstration script creates a canvas widget with a text
3	3	# item that can be edited and reconfigured in various ways.
4	4	#
5		# RCS: @(#) $Id: ctext.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
	5	# RCS: @(#) $Id: ctext.tcl,v 1.6 2008/11/22 23:03:20 dkf Exp $
6	6
7	7	if {![info exists widgetDemo]} {
8	8	error "This script should be run from the \"widget\" demo."

18	18	positionWindow $w
19	19	set c $w.c
20	20
21		label $w.msg -font $font -wraplength 5i -justify left -text "This window displays a string of text to demonstrate the text facilities of canvas widgets. You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification. The text also supports the following simple bindings for editing:
	21	label $w.msg -font $font -wraplength 5i -justify left -text "This window displays a string of text to demonstrate the text facilities of canvas widgets. You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification, and on a pie slice to change its angle. The text also supports the following simple bindings for editing:
22	22	1. You can point, click, and type.
23	23	2. You can also select with button 1.
24	24	3. You can copy the selection to the mouse position with button 2.

51	51	$c bind text <Control-h> "textBs $c"
52	52	$c bind text <BackSpace> "textBs $c"
53	53	$c bind text <Delete> "textDel $c"
54		$c bind text <2> "textPaste $c @%x,%y"
	54	$c bind text <2> "textPaste $c @%x,%y"
55	55
56	56	# Next, create some items that allow the text's anchor position
57	57	# to be edited.
58	58
59		proc mkTextConfig {w x y option value color} {
	59	proc mkTextConfigBox {w x y option value color} {
60	60	set item [$w create rect $x $y [expr {$x+30}] [expr {$y+30}] \
61	61	-outline black -fill $color -width 1]
	62	$w bind $item <1> "$w itemconf text $option $value"
	63	$w addtag config withtag $item
	64	}
	65	proc mkTextConfigPie {w x y a option value color} {
	66	set item [$w create arc $x $y [expr {$x+90}] [expr {$y+90}] \
	67	-start [expr {$a-15}] -extent 30 -outline black -fill $color \
	68	-width 1]
62	69	$w bind $item <1> "$w itemconf text $option $value"
63	70	$w addtag config withtag $item
64	71	}

66	73	set x 50
67	74	set y 50
68	75	set color LightSkyBlue1
69		mkTextConfig $c $x $y -anchor se $color
70		mkTextConfig $c [expr {$x+30}] [expr {$y }] -anchor s $color
71		mkTextConfig $c [expr {$x+60}] [expr {$y }] -anchor sw $color
72		mkTextConfig $c [expr {$x }] [expr {$y+30}] -anchor e $color
73		mkTextConfig $c [expr {$x+30}] [expr {$y+30}] -anchor center $color
74		mkTextConfig $c [expr {$x+60}] [expr {$y+30}] -anchor w $color
75		mkTextConfig $c [expr {$x }] [expr {$y+60}] -anchor ne $color
76		mkTextConfig $c [expr {$x+30}] [expr {$y+60}] -anchor n $color
77		mkTextConfig $c [expr {$x+60}] [expr {$y+60}] -anchor nw $color
	76	mkTextConfigBox $c $x $y -anchor se $color
	77	mkTextConfigBox $c [expr {$x+30}] [expr {$y }] -anchor s $color
	78	mkTextConfigBox $c [expr {$x+60}] [expr {$y }] -anchor sw $color
	79	mkTextConfigBox $c [expr {$x }] [expr {$y+30}] -anchor e $color
	80	mkTextConfigBox $c [expr {$x+30}] [expr {$y+30}] -anchor center $color
	81	mkTextConfigBox $c [expr {$x+60}] [expr {$y+30}] -anchor w $color
	82	mkTextConfigBox $c [expr {$x }] [expr {$y+60}] -anchor ne $color
	83	mkTextConfigBox $c [expr {$x+30}] [expr {$y+60}] -anchor n $color
	84	mkTextConfigBox $c [expr {$x+60}] [expr {$y+60}] -anchor nw $color
78	85	set item [$c create rect \
79	86	[expr {$x+40}] [expr {$y+40}] [expr {$x+50}] [expr {$y+50}] \
80	87	-outline black -fill red]
81	88	$c bind $item <1> "$c itemconf text -anchor center"
82	89	$c create text [expr {$x+45}] [expr {$y-5}] \
83		-text {Text Position} -anchor s -font {Times 24} -fill brown
	90	-text {Text Position} -anchor s -font {Times 20} -fill brown
	91
	92	# Now create some items that allow the text's angle to be changed.
	93
	94	set x 205
	95	set y 50
	96	set color Yellow
	97	mkTextConfigPie $c $x $y 0 -angle 90 $color
	98	mkTextConfigPie $c $x $y 30 -angle 120 $color
	99	mkTextConfigPie $c $x $y 60 -angle 150 $color
	100	mkTextConfigPie $c $x $y 90 -angle 180 $color
	101	mkTextConfigPie $c $x $y 120 -angle 210 $color
	102	mkTextConfigPie $c $x $y 150 -angle 240 $color
	103	mkTextConfigPie $c $x $y 180 -angle 270 $color
	104	mkTextConfigPie $c $x $y 210 -angle 300 $color
	105	mkTextConfigPie $c $x $y 240 -angle 330 $color
	106	mkTextConfigPie $c $x $y 270 -angle 0 $color
	107	mkTextConfigPie $c $x $y 300 -angle 30 $color
	108	mkTextConfigPie $c $x $y 330 -angle 60 $color
	109	$c create text [expr {$x+45}] [expr {$y-5}] \
	110	-text {Text Angle} -anchor s -font {Times 20} -fill brown
84	111
85	112	# Lastly, create some items that allow the text's justification to be
86	113	# changed.

88	115	set x 350
89	116	set y 50
90	117	set color SeaGreen2
91		mkTextConfig $c $x $y -justify left $color
92		mkTextConfig $c [expr {$x+30}] $y -justify center $color
93		mkTextConfig $c [expr {$x+60}] $y -justify right $color
	118	mkTextConfigBox $c $x $y -justify left $color
	119	mkTextConfigBox $c [expr {$x+30}] $y -justify center $color
	120	mkTextConfigBox $c [expr {$x+60}] $y -justify right $color
94	121	$c create text [expr {$x+45}] [expr {$y-5}] \
95		-text {Justification} -anchor s -font {Times 24} -fill brown
	122	-text {Justification} -anchor s -font {Times 20} -fill brown
96	123
97	124	$c bind config <Enter> "textEnter $c"
98	125	$c bind config <Leave> "$c itemconf current -fill \$textConfigFill"

+71

-0

library/demos/fontchoose.tcl less more

	0	# fontchoose.tcl --
	1	#
	2	# Show off the stock font selector dialog
	3	#
	4	# RCS: @(#) $Id: fontchoose.tcl,v 1.1 2008/12/12 02:02:35 patthoyts Exp $
	5
	6	if {![info exists widgetDemo]} {
	7	error "This script should be run from the \"widget\" demo."
	8	}
	9
	10	package require Tk
	11
	12	set w .fontchoice
	13	catch {destroy $w}
	14	toplevel $w
	15	wm title $w "Font Selection Dialog"
	16	wm iconname $w "fontchooser"
	17	positionWindow $w
	18
	19	catch {font create FontchooseDemoFont {*}[font actual TkDefaultFont]}
	20
	21	# The font chooser needs to be configured and then shown.
	22	proc SelectFont {parent} {
	23	tk fontchooser configure -font FontchooseDemoFont \
	24	-command ApplyFont -parent $parent
	25	tk fontchooser show
	26	}
	27
	28	proc ApplyFont {font} {
	29	font configure FontchooseDemoFont {*}[font actual $font]
	30	}
	31
	32	# When the visibility of the fontchooser changes, the following event is fired
	33	# to the parent widget.
	34	#
	35	bind $w <<TkFontchooserVisibility>> {
	36	if {[tk fontchooser configure -visible]} {
	37	%W.f.font state disabled
	38	} else {
	39	%W.f.font state !disabled
	40	}
	41	}
	42
	43
	44	set f [ttk::frame $w.f -relief sunken -padding 2]
	45
	46	text $f.msg -font FontchooseDemoFont -width 40 -height 6 -borderwidth 0 \
	47	-yscrollcommand [list $f.vs set]
	48	ttk::scrollbar $f.vs -command [list $f.msg yview]
	49
	50	$f.msg insert end "Press the buttons below to choose a new font for the\
	51	text shown in this window.\n" {}
	52
	53	ttk::button $f.font -text "Set font ..." -command [list SelectFont $w]
	54
	55	grid $f.msg $f.vs -sticky news
	56	grid $f.font - -sticky e
	57	grid columnconfigure $f 0 -weight 1
	58	grid rowconfigure $f 0 -weight 1
	59	bind $w <Visibility> {
	60	bind %W <Visibility> {}
	61	grid propagate %W.f 0
	62	}
	63
	64	## See Code / Dismiss buttons
	65	set btns [addSeeDismiss $w.buttons $w]
	66
	67	grid $f -sticky news
	68	grid $btns -sticky ew
	69	grid columnconfigure $w 0 -weight 1
	70	grid rowconfigure $w 0 -weight 1

+3

-3

library/demos/items.tcl less more

2	2	# This demonstration script creates a canvas that displays the
3	3	# canvas item types.
4	4	#
5		# RCS: @(#) $Id: items.tcl,v 1.7 2004/12/21 11:56:35 dkf Exp $
	5	# RCS: @(#) $Id: items.tcl,v 1.9 2008/11/22 22:38:52 dkf Exp $
6	6
7	7	if {![info exists widgetDemo]} {
8	8	error "This script should be run from the \"widget\" demo."

127	127	-text "Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge." \
128	128	-justify center -tags item
129	129	$c create rectangle 24.9c 13.9c 25.1c 14.1c
130		$c create text 25c 14c -font $font2 -anchor c -fill $red -stipple gray50 \
131		-text "Stippled characters" -tags item
	130	$c create text 25c 14c -font $font2 -anchor c -fill $red -angle 15 \
	131	-text "Angled characters" -tags item
132	132
133	133	$c create text 5c 16.2c -text Arcs -anchor n
134	134	$c create arc 0.5c 17c 7c 20c -fill $green -outline black \

+3

-9

library/demos/mclist.tcl less more

2	2	# This demonstration script creates a toplevel window containing a Ttk
3	3	# tree widget configured as a multi-column listbox.
4	4	#
5		# RCS: @(#) $Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp $
	5	# RCS: @(#) $Id: mclist.tcl,v 1.4 2008/12/11 18:13:08 jenglish Exp $
6	6
7	7	if {![info exists widgetDemo]} {
8	8	error "This script should be run from the \"widget\" demo."
9	9	}
10	10
11	11	package require Tk
12		package require Ttk
13	12
14	13	set w .mclist
15	14	catch {destroy $w}

28	27	ttk::frame $w.container
29	28	ttk::treeview $w.tree -columns {country capital currency} -show headings \
30	29	-yscroll "$w.vsb set" -xscroll "$w.hsb set"
31		if {[tk windowingsystem] ne "aqua"} {
32		ttk::scrollbar $w.vsb -orient vertical -command "$w.tree yview"
33		ttk::scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
34		} else {
35		scrollbar $w.vsb -orient vertical -command "$w.tree yview"
36		scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
37		}
	30	ttk::scrollbar $w.vsb -orient vertical -command "$w.tree yview"
	31	ttk::scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
38	32	pack $w.container -fill both -expand 1
39	33	grid $w.tree $w.vsb -in $w.container -sticky nsew
40	34	grid $w.hsb -in $w.container -sticky nsew

+1

-2

library/demos/msgbox.tcl less more

1	1	#
2	2	# This demonstration script creates message boxes of various type
3	3	#
4		# RCS: @(#) $Id: msgbox.tcl,v 1.6 2007/12/13 15:27:07 dgp Exp $
	4	# RCS: @(#) $Id: msgbox.tcl,v 1.7 2008/12/11 18:13:08 jenglish Exp $
5	5
6	6	if {![info exists widgetDemo]} {
7	7	error "This script should be run from the \"widget\" demo."
8	8	}
9	9
10	10	package require Tk
11		package require Ttk
12	11
13	12	set w .msgbox
14	13	catch {destroy $w}

+27

-2

library/demos/text.tcl less more

2	2	# This demonstration script creates a text widget that describes
3	3	# the basic editing functions.
4	4	#
5		# RCS: @(#) $Id: text.tcl,v 1.8 2007/12/13 15:27:07 dgp Exp $
	5	# RCS: @(#) $Id: text.tcl,v 1.9 2008/12/10 05:02:51 das Exp $
6	6
7	7	if {![info exists widgetDemo]} {
8	8	error "This script should be run from the \"widget\" demo."

18	18	positionWindow $w
19	19
20	20	## See Code / Dismiss buttons
21		set btns [addSeeDismiss $w.buttons $w]
	21	set btns [addSeeDismiss $w.buttons $w {} \
	22	{ttk::button $w.buttons.fontchooser -command fontchooserToggle}]
22	23	pack $btns -side bottom -fill x
23	24
24	25	text $w.text -yscrollcommand [list $w.scroll set] -setgrid 1 \

26	27	scrollbar $w.scroll -command [list $w.text yview]
27	28	pack $w.scroll -side right -fill y
28	29	pack $w.text -expand yes -fill both
	30
	31	# TIP 324 Demo: [tk fontchooser]
	32	proc fontchooserToggle {} {
	33	tk fontchooser [expr {[tk fontchooser configure -visible] ?
	34	"hide" : "show"}]
	35	}
	36	proc fontchooserVisibility {w} {
	37	$w configure -text [expr {[tk fontchooser configure -visible] ?
	38	"Hide Font Dialog" : "Show Font Dialog"}]
	39	}
	40	proc fontchooserFocus {w} {
	41	tk fontchooser configure -font [$w cget -font] \
	42	-command [list fontchooserFontSel $w]
	43	}
	44	proc fontchooserFontSel {w font args} {
	45	$w configure -font [font actual $font]
	46	}
	47	tk fontchooser configure -parent $w
	48	bind $w.text <FocusIn> [list fontchooserFocus $w.text]
	49	fontchooserVisibility $w.buttons.fontchooser
	50	bind $w <<TkFontchooserVisibility>> [list \
	51	fontchooserVisibility $w.buttons.fontchooser]
	52	focus $w.text
	53
29	54	$w.text insert 0.0 \
30	55	{This window is a text widget. It displays one or more lines of text
31	56	and allows you to edit the text. Here is a summary of the things you

+1

-2

library/demos/toolbar.tcl less more

1	1	#
2	2	# This demonstration script creates a toolbar that can be torn off.
3	3	#
4		# RCS: @(#) $Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp $
	4	# RCS: @(#) $Id: toolbar.tcl,v 1.4 2008/12/11 18:13:08 jenglish Exp $
5	5
6	6	if {![info exists widgetDemo]} {
7	7	error "This script should be run from the \"widget\" demo."
8	8	}
9	9
10	10	package require Tk
11		package require Ttk
12	11
13	12	set w .toolbar
14	13	destroy $w

+3

-9

library/demos/tree.tcl less more

2	2	# This demonstration script creates a toplevel window containing a Ttk
3	3	# tree widget.
4	4	#
5		# RCS: @(#) $Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp $
	5	# RCS: @(#) $Id: tree.tcl,v 1.5 2008/12/11 18:13:08 jenglish Exp $
6	6
7	7	if {![info exists widgetDemo]} {
8	8	error "This script should be run from the \"widget\" demo."
9	9	}
10	10
11	11	package require Tk
12		package require Ttk
13	12
14	13	set w .tree
15	14	catch {destroy $w}

73	72	## Create the tree and set it up
74	73	ttk::treeview $w.tree -columns {fullpath type size} -displaycolumns {size} \
75	74	-yscroll "$w.vsb set" -xscroll "$w.hsb set"
76		if {[tk windowingsystem] ne "aqua"} {
77		ttk::scrollbar $w.vsb -orient vertical -command "$w.tree yview"
78		ttk::scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
79		} else {
80		scrollbar $w.vsb -orient vertical -command "$w.tree yview"
81		scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
82		}
	75	ttk::scrollbar $w.vsb -orient vertical -command "$w.tree yview"
	76	ttk::scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
83	77	$w.tree heading \#0 -text "Directory Structure"
84	78	$w.tree heading size -text "File Size"
85	79	$w.tree column size -stretch 0 -width 70

+1

-2

library/demos/ttkbut.tcl less more

3	3	# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
4	4	# radiobuttons.
5	5	#
6		# RCS: @(#) $Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp $
	6	# RCS: @(#) $Id: ttkbut.tcl,v 1.5 2008/12/11 18:13:08 jenglish Exp $
7	7
8	8	if {![info exists widgetDemo]} {
9	9	error "This script should be run from the \"widget\" demo."
10	10	}
11	11
12	12	package require Tk
13		package require Ttk
14	13
15	14	set w .ttkbut
16	15	catch {destroy $w}

+1

-2

library/demos/ttkmenu.tcl less more

2	2	# This demonstration script creates a toplevel window containing several Ttk
3	3	# menubutton widgets.
4	4	#
5		# RCS: @(#) $Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp $
	5	# RCS: @(#) $Id: ttkmenu.tcl,v 1.4 2008/12/11 18:13:08 jenglish Exp $
6	6
7	7	if {![info exists widgetDemo]} {
8	8	error "This script should be run from the \"widget\" demo."
9	9	}
10	10
11	11	package require Tk
12		package require Ttk
13	12
14	13	set w .ttkmenu
15	14	catch {destroy $w}

+2

-7

library/demos/ttknote.tcl less more

2	2	# This demonstration script creates a toplevel window containing a Ttk
3	3	# notebook widget.
4	4	#
5		# RCS: @(#) $Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp $
	5	# RCS: @(#) $Id: ttknote.tcl,v 1.6 2008/12/11 18:13:08 jenglish Exp $
6	6
7	7	if {![info exists widgetDemo]} {
8	8	error "This script should be run from the \"widget\" demo."
9	9	}
10	10
11	11	package require Tk
12		package require Ttk
13	12
14	13	set w .ttknote
15	14	catch {destroy $w}

54	53	$w.note add $w.note.editor -text "Text Editor" -underline 0
55	54	text $w.note.editor.t -width 40 -height 10 -wrap char \
56	55	-yscroll "$w.note.editor.s set"
57		if {[tk windowingsystem] ne "aqua"} {
58		ttk::scrollbar $w.note.editor.s -orient vertical -command "$w.note.editor.t yview"
59		} else {
60		scrollbar $w.note.editor.s -orient vertical -command "$w.note.editor.t yview"
61		}
	56	ttk::scrollbar $w.note.editor.s -orient vertical -command "$w.note.editor.t yview"
62	57	pack $w.note.editor.s -side right -fill y -padx {0 2} -pady 2
63	58	pack $w.note.editor.t -fill both -expand 1 -pady 2 -padx {2 0}

+1

-2

library/demos/ttkpane.tcl less more

1	1	#
2	2	# This demonstration script creates a Ttk pane with some content.
3	3	#
4		# RCS: @(#) $Id: ttkpane.tcl,v 1.4 2008/06/24 13:37:32 patthoyts Exp $
	4	# RCS: @(#) $Id: ttkpane.tcl,v 1.5 2008/12/11 18:13:08 jenglish Exp $
5	5
6	6	if {![info exists widgetDemo]} {
7	7	error "This script should be run from the \"widget\" demo."
8	8	}
9	9
10	10	package require Tk
11		package require Ttk
12	11
13	12	set w .ttkpane
14	13	catch {destroy $w}

+1

-2

library/demos/ttkprogress.tcl less more

1	1	#
2	2	# This demonstration script creates several progress bar widgets.
3	3	#
4		# RCS: @(#) $Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp $
	4	# RCS: @(#) $Id: ttkprogress.tcl,v 1.4 2008/12/11 18:13:08 jenglish Exp $
5	5
6	6	if {![info exists widgetDemo]} {
7	7	error "This script should be run from the \"widget\" demo."
8	8	}
9	9
10	10	package require Tk
11		package require Ttk
12	11
13	12	set w .ttkprogress
14	13	catch {destroy $w}

+3

-2

library/demos/widget less more

9	9	# separate ".tcl" files is this directory, which are sourced by this script as
10	10	# needed.
11	11	#
12		# RCS: @(#) $Id: widget,v 1.51 2008/03/11 22:30:17 das Exp $
	12	# RCS: @(#) $Id: widget,v 1.54 2008/12/20 01:33:59 das Exp $
13	13
14	14	package require Tcl 8.5
15	15	package require Tk 8.5
16	16	package require msgcat
17		package require Ttk
18	17
19	18	eval destroy [winfo child .]
20	19	set tk_demoDirectory [file join [pwd] [file dirname [info script]]]

386	385	@@demo msgbox Message boxes
387	386	@@demo filebox File selection dialog
388	387	@@demo clrpick Color picker
	388	@@new
	389	@@demo fontchoose Font selection dialog
389	390
390	391	@@subtitle Animation
391	392	@@new

+423

-0

library/fontchooser.tcl less more

	0	# fontchooser.tcl -
	1	#
	2	# A themeable Tk font selection dialog. See TIP #324.
	3	#
	4	# Copyright (C) 2008 Keith Vetter
	5	# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
	6	#
	7	# See the file "license.terms" for information on usage and redistribution
	8	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
	9	#
	10	# RCS: @(#) $Id: fontchooser.tcl,v 1.2 2008/12/10 13:41:19 patthoyts Exp $
	11
	12	namespace eval ::tk::fontchooser {
	13	variable S
	14
	15	set S(W) .__tk__fontchooser
	16	set S(fonts) [lsort -dictionary [font families]]
	17	set S(styles) [list \
	18	[::msgcat::mc "Regular"] \
	19	[::msgcat::mc "Italic"] \
	20	[::msgcat::mc "Bold"] \
	21	[::msgcat::mc "Bold Italic"] \
	22	]
	23
	24	set S(sizes) {8 9 10 11 12 14 16 18 20 22 24 26 28 36 48 72}
	25	set S(strike) 0
	26	set S(under) 0
	27	set S(first) 1
	28	set S(sampletext) [::msgcat::mc "AaBbYyZz01"]
	29	set S(-parent) .
	30	set S(-title) [::msgcat::mc "Font"]
	31	set S(-command) ""
	32	set S(-font) TkDefaultFont
	33
	34	# Canonical versions of font families, styles, etc. for easier searching
	35	set S(fonts,lcase) {}
	36	foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]}
	37	set S(styles,lcase) {}
	38	foreach style $S(styles) { lappend S(styles,lcase) [string tolower $style]}
	39	set S(sizes,lcase) $S(sizes)
	40
	41	::ttk::style layout FontchooserFrame {
	42	Entry.field -sticky news -border true -children {
	43	FontchooserFrame.padding -sticky news
	44	}
	45	}
	46	bind [winfo class .] <<ThemeChanged>> \
	47	[list +ttk::style layout FontchooserFrame \
	48	[ttk::style layout FontchooserFrame]]
	49
	50	namespace ensemble create -map {
	51	show ::tk::fontchooser::Show
	52	hide ::tk::fontchooser::Hide
	53	configure ::tk::fontchooser::Configure
	54	}
	55	}
	56
	57	proc ::tk::fontchooser::Show {} {
	58	variable S
	59	if {![winfo exists $S(W)]} {
	60	Create
	61	wm transient $S(W) [winfo toplevel $S(-parent)]
	62	tk::PlaceWindow $S(W) widget $S(-parent)
	63	}
	64	wm deiconify $S(W)
	65	}
	66
	67	proc ::tk::fontchooser::Hide {} {
	68	variable S
	69	wm withdraw $S(W)
	70	}
	71
	72	proc ::tk::fontchooser::Configure {args} {
	73	variable S
	74
	75	set specs {
	76	{-parent "" "" . }
	77	{-title "" "" ""}
	78	{-font "" "" ""}
	79	{-command "" "" ""}
	80	}
	81
	82	if {[llength $args] == 0} {
	83	set result {}
	84	foreach spec $specs {
	85	foreach {name xx yy default} $spec break
	86	lappend result $name \
	87	[expr {[info exists S($name)] ? $S($name) : $default}]
	88	}
	89	lappend result -visible \
	90	[expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}]
	91	return $result
	92	}
	93	if {[llength $args] == 1} {
	94	set option [lindex $args 0]
	95	if {[string equal $option "-visible"]} {
	96	return [expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}]
	97	} elseif {[info exists S($option)]} {
	98	return $S($option)
	99	}
	100	return -code error "bad option \"$option\": must be\
	101	-command, -font, -parent, -title or -visible"
	102	}
	103
	104	set cache [dict create -parent $S(-parent) -title $S(-title) \
	105	-font $S(-font) -command $S(-command)]
	106	set r [tclParseConfigSpec [namespace which -variable S] $specs "" $args]
	107	if {![winfo exists $S(-parent)]} {
	108	set err "bad window path name \"$S(-parent)\""
	109	array set S $cache
	110	return -code error $err
	111	}
	112	if {[string trim $S(-title)] eq ""} {
	113	set S(-title) [::msgcat::mc "Font"]
	114	}
	115	if {[winfo exists $S(W)] && [lsearch $args -font] != -1} {
	116	Init $S(-font)
	117	event generate $S(-parent) <<TkFontchooserFontChanged>>
	118	}
	119	return $r
	120	}
	121
	122	proc ::tk::fontchooser::Create {} {
	123	variable S
	124	set windowName __tk__fontchooser
	125	if {$S(-parent) eq "."} {
	126	set S(W) .$windowName
	127	} else {
	128	set S(W) $S(-parent).$windowName
	129	}
	130
	131	# Now build the dialog
	132	if {![winfo exists $S(W)]} {
	133	toplevel $S(W) -class TkFontDialog
	134	if {[package provide tcltest] ne {}} {set ::tk_dialog $S(W)}
	135	wm withdraw $S(W)
	136	wm title $S(W) $S(-title)
	137	wm transient $S(W) [winfo toplevel $S(-parent)]
	138	wm geometry $S(W) 430x316
	139
	140	set outer [::ttk::frame $S(W).outer -padding {10 10}]
	141	::tk::AmpWidget ::ttk::label $S(W).font -text [::msgcat::mc "&Font:"]
	142	::tk::AmpWidget ::ttk::label $S(W).style -text [::msgcat::mc "Font st&yle:"]
	143	::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"]
	144	ttk::entry $S(W).efont -textvariable [namespace which -variable S](font)
	145	ttk::entry $S(W).estyle -textvariable [namespace which -variable S](style)
	146	ttk::entry $S(W).esize -textvariable [namespace which -variable S](size) \
	147	-width 0 -validate key -validatecommand {string is double %P}
	148
	149	ttk_slistbox $S(W).lfonts -height 7 -exportselection 0 \
	150	-selectmode browse -activestyle none \
	151	-listvariable [namespace which -variable S](fonts)
	152	ttk_slistbox $S(W).lstyles -width 5 -height 7 -exportselection 0 \
	153	-selectmode browse -activestyle none \
	154	-listvariable [namespace which -variable S](styles)
	155	ttk_slistbox $S(W).lsizes -width 6 -height 7 -exportselection 0 \
	156	-selectmode browse -activestyle none \
	157	-listvariable [namespace which -variable S](sizes) \
	158
	159	set WE $S(W).effects
	160	::ttk::labelframe $WE -text [::msgcat::mc "Effects"]
	161	::tk::AmpWidget ::ttk::checkbutton $WE.strike \
	162	-variable [namespace which -variable S](strike) \
	163	-text [::msgcat::mc "Stri&keout"] \
	164	-command [namespace code [list Click strike]]
	165	::tk::AmpWidget ::ttk::checkbutton $WE.under \
	166	-variable [namespace which -variable S](under) \
	167	-text [::msgcat::mc "&Underline"] \
	168	-command [namespace code [list Click under]]
	169
	170	set bbox [::ttk::frame $S(W).bbox]
	171	::ttk::button $S(W).ok -text [::msgcat::mc OK] -default active\
	172	-command [namespace code [list Done 1]]
	173	::ttk::button $S(W).cancel -text [::msgcat::mc Cancel] \
	174	-command [namespace code [list Done 0]]
	175	::tk::AmpWidget ::ttk::button $S(W).apply -text [::msgcat::mc "&Apply"] \
	176	-command [namespace code [list Apply]]
	177	wm protocol $S(W) WM_DELETE_WINDOW [namespace code [list Done 0]]
	178
	179	bind $S(W) <Return> [namespace code [list Done 1]]
	180	bind $S(W) <Escape> [namespace code [list Done 0]]
	181	bind $S(W) <Map> [namespace code [list Visibility %W 1]]
	182	bind $S(W) <Unmap> [namespace code [list Visibility %W 0]]
	183	bind $S(W) <Destroy> [namespace code [list Visibility %W 0]]
	184	bind $S(W).lfonts.list <<ListboxSelect>> [namespace code [list Click font]]
	185	bind $S(W).lstyles.list <<ListboxSelect>> [namespace code [list Click style]]
	186	bind $S(W).lsizes.list <<ListboxSelect>> [namespace code [list Click size]]
	187	bind $S(W) <Alt-Key> [list ::tk::AltKeyInDialog $S(W) %A]
	188	bind $S(W).font <<AltUnderlined>> [list ::focus $S(W).efont]
	189	bind $S(W).style <<AltUnderlined>> [list ::focus $S(W).estyle]
	190	bind $S(W).size <<AltUnderlined>> [list ::focus $S(W).esize]
	191	bind $S(W).apply <<AltUnderlined>> [namespace code [list Apply]]
	192	bind $WE.strike <<AltUnderlined>> [list $WE.strike invoke]
	193	bind $WE.under <<AltUnderlined>> [list $WE.under invoke]
	194
	195	set WS $S(W).sample
	196	::ttk::labelframe $WS -text [::msgcat::mc "Sample"]
	197	::ttk::label $WS.sample -relief sunken -anchor center \
	198	-textvariable [namespace which -variable S](sampletext)
	199	set S(sample) $WS.sample
	200	grid $WS.sample -sticky news -padx 8 -pady 6
	201	grid rowconfigure $WS 0 -weight 1
	202	grid columnconfigure $WS 0 -weight 1
	203	grid propagate $WS 0
	204
	205	grid $S(W).ok -in $bbox -sticky new -pady {0 2}
	206	grid $S(W).cancel -in $bbox -sticky new -pady 2
	207	if {$S(-command) ne ""} {
	208	grid $S(W).apply -in $bbox -sticky new -pady 2
	209	}
	210	grid columnconfigure $bbox 0 -weight 1
	211
	212	grid $WE.strike -sticky w -padx 10
	213	grid $WE.under -sticky w -padx 10 -pady {0 30}
	214	grid columnconfigure $WE 1 -weight 1
	215
	216	grid $S(W).font x $S(W).style x $S(W).size x -in $outer -sticky w
	217	grid $S(W).efont x $S(W).estyle x $S(W).esize x $bbox -in $outer -sticky ew
	218	grid $S(W).lfonts x $S(W).lstyles x $S(W).lsizes x ^ -in $outer -sticky news
	219	grid $WE x $WS - - x ^ -in $outer -sticky news -pady {15 30}
	220	grid configure $bbox -sticky n
	221	grid columnconfigure $outer {1 3 5} -minsize 10
	222	grid columnconfigure $outer {0 2 4} -weight 1
	223
	224	grid $outer -sticky news
	225	grid rowconfigure $S(W) 0 -weight 1
	226	grid columnconfigure $S(W) 0 -weight 1
	227
	228	Init $S(-font)
	229
	230	trace add variable [namespace which -variable S](size) \
	231	write [namespace code [list Tracer]]
	232	trace add variable [namespace which -variable S](style) \
	233	write [namespace code [list Tracer]]
	234	trace add variable [namespace which -variable S](font) \
	235	write [namespace code [list Tracer]]
	236	} else {
	237	Init $S(-font)
	238	}
	239
	240	return
	241	}
	242
	243	# ::tk::fontchooser::Done --
	244	#
	245	# Handles teardown of the dialog, calling -command if needed
	246	#
	247	# Arguments:
	248	# ok true if user pressed OK
	249	#
	250	proc ::tk::::fontchooser::Done {ok} {
	251	variable S
	252
	253	if {! $ok} {
	254	set S(result) ""
	255	}
	256	trace vdelete S(size) w [namespace code [list Tracer]]
	257	trace vdelete S(style) w [namespace code [list Tracer]]
	258	trace vdelete S(font) w [namespace code [list Tracer]]
	259	destroy $S(W)
	260	if {$ok && $S(-command) ne ""} {
	261	uplevel #0 $S(-command) [list $S(result)]
	262	}
	263	}
	264
	265	# ::tk::fontchooser::Apply --
	266	#
	267	# Call the -command procedure appending the current font
	268	# Errors are reported via the background error mechanism
	269	#
	270	proc ::tk::fontchooser::Apply {} {
	271	variable S
	272	if {$S(-command) ne ""} {
	273	if {[catch {uplevel #0 $S(-command) [list $S(result)]} err]} {
	274	::bgerror $err
	275	}
	276	}
	277	event generate $S(-parent) <<TkFontchooserFontChanged>>
	278	}
	279
	280	# ::tk::fontchooser::Init --
	281	#
	282	# Initializes dialog to a default font
	283	#
	284	# Arguments:
	285	# defaultFont font to use as the default
	286	#
	287	proc ::tk::fontchooser::Init {{defaultFont ""}} {
	288	variable S
	289
	290	if {$S(first) \|\| $defaultFont ne ""} {
	291	if {$defaultFont eq ""} {
	292	set defaultFont [[entry .___e] cget -font]
	293	destroy .___e
	294	}
	295	array set F [font actual $defaultFont]
	296	set S(font) $F(-family)
	297	set S(size) $F(-size)
	298	set S(strike) $F(-overstrike)
	299	set S(under) $F(-underline)
	300	set S(style) "Regular"
	301	if {$F(-weight) eq "bold" && $F(-slant) eq "italic"} {
	302	set S(style) "Bold Italic"
	303	} elseif {$F(-weight) eq "bold"} {
	304	set S(style) "Bold"
	305	} elseif {$F(-slant) eq "italic"} {
	306	set S(style) "Italic"
	307	}
	308
	309	set S(first) 0
	310	}
	311
	312	Tracer a b c
	313	Update
	314	}
	315
	316	# ::tk::fontchooser::Click --
	317	#
	318	# Handles all button clicks, updating the appropriate widgets
	319	#
	320	# Arguments:
	321	# who which widget got pressed
	322	#
	323	proc ::tk::fontchooser::Click {who} {
	324	variable S
	325
	326	if {$who eq "font"} {
	327	set S(font) [$S(W).lfonts get [$S(W).lfonts curselection]]
	328	} elseif {$who eq "style"} {
	329	set S(style) [$S(W).lstyles get [$S(W).lstyles curselection]]
	330	} elseif {$who eq "size"} {
	331	set S(size) [$S(W).lsizes get [$S(W).lsizes curselection]]
	332	}
	333	Update
	334	}
	335
	336	# ::tk::fontchooser::Tracer --
	337	#
	338	# Handles traces on key variables, updating the appropriate widgets
	339	#
	340	# Arguments:
	341	# standard trace arguments (not used)
	342	#
	343	proc ::tk::fontchooser::Tracer {var1 var2 op} {
	344	variable S
	345
	346	set bad 0
	347	set nstate normal
	348	# Make selection in each listbox
	349	foreach var {font style size} {
	350	set value [string tolower $S($var)]
	351	$S(W).l${var}s selection clear 0 end
	352	set n [lsearch -exact $S(${var}s,lcase) $value]
	353	$S(W).l${var}s selection set $n
	354	if {$n != -1} {
	355	set S($var) [lindex $S(${var}s) $n]
	356	$S(W).e$var icursor end
	357	$S(W).e$var selection clear
	358	} else { ;# No match, try prefix
	359	# Size is weird: valid numbers are legal but don't display
	360	# unless in the font size list
	361	set n [lsearch -glob $S(${var}s,lcase) "$value*"]
	362	set bad 1
	363	if {$var ne "size" \|\| ! [string is double -strict $value]} {
	364	set nstate disabled
	365	}
	366	}
	367	$S(W).l${var}s see $n
	368	}
	369	if {!$bad} { Update }
	370	$S(W).ok configure -state $nstate
	371	}
	372
	373	# ::tk::fontchooser::Update --
	374	#
	375	# Shows a sample of the currently selected font
	376	#
	377	proc ::tk::fontchooser::Update {} {
	378	variable S
	379
	380	set S(result) [list $S(font) $S(size)]
	381	if {$S(style) eq "Bold"} { lappend S(result) bold }
	382	if {$S(style) eq "Italic"} { lappend S(result) italic }
	383	if {$S(style) eq "Bold Italic"} { lappend S(result) bold italic}
	384	if {$S(strike)} { lappend S(result) overstrike}
	385	if {$S(under)} { lappend S(result) underline}
	386
	387	$S(sample) configure -font $S(result)
	388	}
	389
	390	# ::tk::fontchooser::Visibility --
	391	#
	392	# Notify the parent when the dialog visibility changes
	393	#
	394	proc ::tk::fontchooser::Visibility {w visible} {
	395	variable S
	396	if {$w eq $S(W)} {
	397	event generate $S(-parent) <<TkFontchooserVisibility>>
	398	}
	399	}
	400
	401	# ::tk::fontchooser::ttk_listbox --
	402	#
	403	# Create a properly themed scrolled listbox.
	404	# This is exactly right on XP but may need adjusting on other platforms.
	405	#
	406	proc ::tk::fontchooser::ttk_slistbox {w args} {
	407	set f [ttk::frame $w -style FontchooserFrame -padding 2]
	408	if {[catch {
	409	listbox $f.list -relief flat -highlightthickness 0 -borderwidth 0 {*}$args
	410	ttk::scrollbar $f.vs -command [list $f.list yview]
	411	$f.list configure -yscrollcommand [list $f.vs set]
	412	grid $f.list $f.vs -sticky news
	413	grid rowconfigure $f 0 -weight 1
	414	grid columnconfigure $f 0 -weight 1
	415	interp hide {} $w
	416	interp alias {} $w {} $f.list
	417	} err]} {
	418	destroy $f
	419	return -code error $err
	420	}
	421	return $w
	422	}

+1354

-1350

library/mkpsenc.tcl less more

0	0	# mkpsenc.tcl --
1	1	#
2		# Creates Postscript encoding vector for given encoding
3		#
4
5		proc ::tk::CreatePostscriptEncoding {encoding} {
6		# now check for known. Even if it is known, it can be other
7		# than we need. GhostScript seems to be happy with such approach
8		set result "/CurrentEncoding \[\n"
9		for {set i 0} {$i<256} {incr i 8} {
10		for {set j 0} {$j<8} {incr j} {
11		set enc [encoding convertfrom $encoding [format %c [expr {$i+$j}]]]
12		if {[catch {format %04X [scan $enc %c]} hexcode]} {set hexcode {}}
13		if [info exists ::tk::psglyphs($hexcode)] {
14		append result "/$::tk::psglyphs($hexcode)"
15		} else {
16		append result "/space"
	2	# This file generates the postscript prolog used by Tk.
	3
	4	namespace eval ::tk {
	5	# Creates Postscript encoding vector for given encoding
	6	#
	7	proc CreatePostscriptEncoding {encoding} {
	8	variable psglyphs
	9	# Now check for known. Even if it is known, it can be other than we
	10	# need. GhostScript seems to be happy with such approach
	11	set result "/CurrentEncoding \[\n"
	12	for {set i 0} {$i<256} {incr i 8} {
	13	for {set j 0} {$j<8} {incr j} {
	14	set enc [encoding convertfrom $encoding \
	15	[format %c [expr {$i+$j}]]]
	16	catch {
	17	set hexcode {}
	18	set hexcode [format %04X [scan $enc %c]]
	19	}
	20	if {[info exists psglyphs($hexcode)]} {
	21	append result "/$psglyphs($hexcode)"
	22	} else {
	23	append result "/space"
	24	}
17	25	}
	26	append result "\n"
18	27	}
19		append result "\n"
	28	append result "\] def\n"
	29	return $result
20	30	}
21		append result "\] def\n"
22		return $result
23		}
24
25		# List of adobe glyph names. Converted from glyphlist.txt, downloaded
26		# from Adobe
27
28		namespace eval ::tk {
29		array set psglyphs {
30		0020 space
31		0021 exclam
32		0022 quotedbl
33		0023 numbersign
34		0024 dollar
35		0025 percent
36		0026 ampersand
37		0027 quotesingle
38		0028 parenleft
39		0029 parenright
40		002A asterisk
41		002B plus
42		002C comma
43		002D hyphen
44		002E period
45		002F slash
46		0030 zero
47		0031 one
48		0032 two
49		0033 three
50		0034 four
51		0035 five
52		0036 six
53		0037 seven
54		0038 eight
55		0039 nine
56		003A colon
57		003B semicolon
58		003C less
59		003D equal
60		003E greater
61		003F question
62		0040 at
63		0041 A
64		0042 B
65		0043 C
66		0044 D
67		0045 E
68		0046 F
69		0047 G
70		0048 H
71		0049 I
72		004A J
73		004B K
74		004C L
75		004D M
76		004E N
77		004F O
78		0050 P
79		0051 Q
80		0052 R
81		0053 S
82		0054 T
83		0055 U
84		0056 V
85		0057 W
86		0058 X
87		0059 Y
88		005A Z
89		005B bracketleft
90		005C backslash
91		005D bracketright
92		005E asciicircum
93		005F underscore
94		0060 grave
95		0061 a
96		0062 b
97		0063 c
98		0064 d
99		0065 e
100		0066 f
101		0067 g
102		0068 h
103		0069 i
104		006A j
105		006B k
106		006C l
107		006D m
108		006E n
109		006F o
110		0070 p
111		0071 q
112		0072 r
113		0073 s
114		0074 t
115		0075 u
116		0076 v
117		0077 w
118		0078 x
119		0079 y
120		007A z
121		007B braceleft
122		007C bar
123		007D braceright
124		007E asciitilde
125		00A0 space
126		00A1 exclamdown
127		00A2 cent
128		00A3 sterling
129		00A4 currency
130		00A5 yen
131		00A6 brokenbar
132		00A7 section
133		00A8 dieresis
134		00A9 copyright
135		00AA ordfeminine
136		00AB guillemotleft
137		00AC logicalnot
138		00AD hyphen
139		00AE registered
140		00AF macron
141		00B0 degree
142		00B1 plusminus
143		00B2 twosuperior
144		00B3 threesuperior
145		00B4 acute
146		00B5 mu
147		00B6 paragraph
148		00B7 periodcentered
149		00B8 cedilla
150		00B9 onesuperior
151		00BA ordmasculine
152		00BB guillemotright
153		00BC onequarter
154		00BD onehalf
155		00BE threequarters
156		00BF questiondown
157		00C0 Agrave
158		00C1 Aacute
159		00C2 Acircumflex
160		00C3 Atilde
161		00C4 Adieresis
162		00C5 Aring
163		00C6 AE
164		00C7 Ccedilla
165		00C8 Egrave
166		00C9 Eacute
167		00CA Ecircumflex
168		00CB Edieresis
169		00CC Igrave
170		00CD Iacute
171		00CE Icircumflex
172		00CF Idieresis
173		00D0 Eth
174		00D1 Ntilde
175		00D2 Ograve
176		00D3 Oacute
177		00D4 Ocircumflex
178		00D5 Otilde
179		00D6 Odieresis
180		00D7 multiply
181		00D8 Oslash
182		00D9 Ugrave
183		00DA Uacute
184		00DB Ucircumflex
185		00DC Udieresis
186		00DD Yacute
187		00DE Thorn
188		00DF germandbls
189		00E0 agrave
190		00E1 aacute
191		00E2 acircumflex
192		00E3 atilde
193		00E4 adieresis
194		00E5 aring
195		00E6 ae
196		00E7 ccedilla
197		00E8 egrave
198		00E9 eacute
199		00EA ecircumflex
200		00EB edieresis
201		00EC igrave
202		00ED iacute
203		00EE icircumflex
204		00EF idieresis
205		00F0 eth
206		00F1 ntilde
207		00F2 ograve
208		00F3 oacute
209		00F4 ocircumflex
210		00F5 otilde
211		00F6 odieresis
212		00F7 divide
213		00F8 oslash
214		00F9 ugrave
215		00FA uacute
216		00FB ucircumflex
217		00FC udieresis
218		00FD yacute
219		00FE thorn
220		00FF ydieresis
221		0100 Amacron
222		0101 amacron
223		0102 Abreve
224		0103 abreve
225		0104 Aogonek
226		0105 aogonek
227		0106 Cacute
228		0107 cacute
229		0108 Ccircumflex
230		0109 ccircumflex
231		010A Cdotaccent
232		010B cdotaccent
233		010C Ccaron
234		010D ccaron
235		010E Dcaron
236		010F dcaron
237		0110 Dcroat
238		0111 dcroat
239		0112 Emacron
240		0113 emacron
241		0114 Ebreve
242		0115 ebreve
243		0116 Edotaccent
244		0117 edotaccent
245		0118 Eogonek
246		0119 eogonek
247		011A Ecaron
248		011B ecaron
249		011C Gcircumflex
250		011D gcircumflex
251		011E Gbreve
252		011F gbreve
253		0120 Gdotaccent
254		0121 gdotaccent
255		0122 Gcommaaccent
256		0123 gcommaaccent
257		0124 Hcircumflex
258		0125 hcircumflex
259		0126 Hbar
260		0127 hbar
261		0128 Itilde
262		0129 itilde
263		012A Imacron
264		012B imacron
265		012C Ibreve
266		012D ibreve
267		012E Iogonek
268		012F iogonek
269		0130 Idotaccent
270		0131 dotlessi
271		0132 IJ
272		0133 ij
273		0134 Jcircumflex
274		0135 jcircumflex
275		0136 Kcommaaccent
276		0137 kcommaaccent
277		0138 kgreenlandic
278		0139 Lacute
279		013A lacute
280		013B Lcommaaccent
281		013C lcommaaccent
282		013D Lcaron
283		013E lcaron
284		013F Ldot
285		0140 ldot
286		0141 Lslash
287		0142 lslash
288		0143 Nacute
289		0144 nacute
290		0145 Ncommaaccent
291		0146 ncommaaccent
292		0147 Ncaron
293		0148 ncaron
294		0149 napostrophe
295		014A Eng
296		014B eng
297		014C Omacron
298		014D omacron
299		014E Obreve
300		014F obreve
301		0150 Ohungarumlaut
302		0151 ohungarumlaut
303		0152 OE
304		0153 oe
305		0154 Racute
306		0155 racute
307		0156 Rcommaaccent
308		0157 rcommaaccent
309		0158 Rcaron
310		0159 rcaron
311		015A Sacute
312		015B sacute
313		015C Scircumflex
314		015D scircumflex
315		015E Scedilla
316		015F scedilla
317		0160 Scaron
318		0161 scaron
319		0162 Tcommaaccent
320		0163 tcommaaccent
321		0164 Tcaron
322		0165 tcaron
323		0166 Tbar
324		0167 tbar
325		0168 Utilde
326		0169 utilde
327		016A Umacron
328		016B umacron
329		016C Ubreve
330		016D ubreve
331		016E Uring
332		016F uring
333		0170 Uhungarumlaut
334		0171 uhungarumlaut
335		0172 Uogonek
336		0173 uogonek
337		0174 Wcircumflex
338		0175 wcircumflex
339		0176 Ycircumflex
340		0177 ycircumflex
341		0178 Ydieresis
342		0179 Zacute
343		017A zacute
344		017B Zdotaccent
345		017C zdotaccent
346		017D Zcaron
347		017E zcaron
348		017F longs
349		0192 florin
350		01A0 Ohorn
351		01A1 ohorn
352		01AF Uhorn
353		01B0 uhorn
354		01E6 Gcaron
355		01E7 gcaron
356		01FA Aringacute
357		01FB aringacute
358		01FC AEacute
359		01FD aeacute
360		01FE Oslashacute
361		01FF oslashacute
362		0218 Scommaaccent
363		0219 scommaaccent
364		021A Tcommaaccent
365		021B tcommaaccent
366		02BC afii57929
367		02BD afii64937
368		02C6 circumflex
369		02C7 caron
370		02C9 macron
371		02D8 breve
372		02D9 dotaccent
373		02DA ring
374		02DB ogonek
375		02DC tilde
376		02DD hungarumlaut
377		0300 gravecomb
378		0301 acutecomb
379		0303 tildecomb
380		0309 hookabovecomb
381		0323 dotbelowcomb
382		0384 tonos
383		0385 dieresistonos
384		0386 Alphatonos
385		0387 anoteleia
386		0388 Epsilontonos
387		0389 Etatonos
388		038A Iotatonos
389		038C Omicrontonos
390		038E Upsilontonos
391		038F Omegatonos
392		0390 iotadieresistonos
393		0391 Alpha
394		0392 Beta
395		0393 Gamma
396		0394 Delta
397		0395 Epsilon
398		0396 Zeta
399		0397 Eta
400		0398 Theta
401		0399 Iota
402		039A Kappa
403		039B Lambda
404		039C Mu
405		039D Nu
406		039E Xi
407		039F Omicron
408		03A0 Pi
409		03A1 Rho
410		03A3 Sigma
411		03A4 Tau
412		03A5 Upsilon
413		03A6 Phi
414		03A7 Chi
415		03A8 Psi
416		03A9 Omega
417		03AA Iotadieresis
418		03AB Upsilondieresis
419		03AC alphatonos
420		03AD epsilontonos
421		03AE etatonos
422		03AF iotatonos
423		03B0 upsilondieresistonos
424		03B1 alpha
425		03B2 beta
426		03B3 gamma
427		03B4 delta
428		03B5 epsilon
429		03B6 zeta
430		03B7 eta
431		03B8 theta
432		03B9 iota
433		03BA kappa
434		03BB lambda
435		03BC mu
436		03BD nu
437		03BE xi
438		03BF omicron
439		03C0 pi
440		03C1 rho
441		03C2 sigma1
442		03C3 sigma
443		03C4 tau
444		03C5 upsilon
445		03C6 phi
446		03C7 chi
447		03C8 psi
448		03C9 omega
449		03CA iotadieresis
450		03CB upsilondieresis
451		03CC omicrontonos
452		03CD upsilontonos
453		03CE omegatonos
454		03D1 theta1
455		03D2 Upsilon1
456		03D5 phi1
457		03D6 omega1
458		0401 afii10023
459		0402 afii10051
460		0403 afii10052
461		0404 afii10053
462		0405 afii10054
463		0406 afii10055
464		0407 afii10056
465		0408 afii10057
466		0409 afii10058
467		040A afii10059
468		040B afii10060
469		040C afii10061
470		040E afii10062
471		040F afii10145
472		0410 afii10017
473		0411 afii10018
474		0412 afii10019
475		0413 afii10020
476		0414 afii10021
477		0415 afii10022
478		0416 afii10024
479		0417 afii10025
480		0418 afii10026
481		0419 afii10027
482		041A afii10028
483		041B afii10029
484		041C afii10030
485		041D afii10031
486		041E afii10032
487		041F afii10033
488		0420 afii10034
489		0421 afii10035
490		0422 afii10036
491		0423 afii10037
492		0424 afii10038
493		0425 afii10039
494		0426 afii10040
495		0427 afii10041
496		0428 afii10042
497		0429 afii10043
498		042A afii10044
499		042B afii10045
500		042C afii10046
501		042D afii10047
502		042E afii10048
503		042F afii10049
504		0430 afii10065
505		0431 afii10066
506		0432 afii10067
507		0433 afii10068
508		0434 afii10069
509		0435 afii10070
510		0436 afii10072
511		0437 afii10073
512		0438 afii10074
513		0439 afii10075
514		043A afii10076
515		043B afii10077
516		043C afii10078
517		043D afii10079
518		043E afii10080
519		043F afii10081
520		0440 afii10082
521		0441 afii10083
522		0442 afii10084
523		0443 afii10085
524		0444 afii10086
525		0445 afii10087
526		0446 afii10088
527		0447 afii10089
528		0448 afii10090
529		0449 afii10091
530		044A afii10092
531		044B afii10093
532		044C afii10094
533		044D afii10095
534		044E afii10096
535		044F afii10097
536		0451 afii10071
537		0452 afii10099
538		0453 afii10100
539		0454 afii10101
540		0455 afii10102
541		0456 afii10103
542		0457 afii10104
543		0458 afii10105
544		0459 afii10106
545		045A afii10107
546		045B afii10108
547		045C afii10109
548		045E afii10110
549		045F afii10193
550		0462 afii10146
551		0463 afii10194
552		0472 afii10147
553		0473 afii10195
554		0474 afii10148
555		0475 afii10196
556		0490 afii10050
557		0491 afii10098
558		04D9 afii10846
559		05B0 afii57799
560		05B1 afii57801
561		05B2 afii57800
562		05B3 afii57802
563		05B4 afii57793
564		05B5 afii57794
565		05B6 afii57795
566		05B7 afii57798
567		05B8 afii57797
568		05B9 afii57806
569		05BB afii57796
570		05BC afii57807
571		05BD afii57839
572		05BE afii57645
573		05BF afii57841
574		05C0 afii57842
575		05C1 afii57804
576		05C2 afii57803
577		05C3 afii57658
578		05D0 afii57664
579		05D1 afii57665
580		05D2 afii57666
581		05D3 afii57667
582		05D4 afii57668
583		05D5 afii57669
584		05D6 afii57670
585		05D7 afii57671
586		05D8 afii57672
587		05D9 afii57673
588		05DA afii57674
589		05DB afii57675
590		05DC afii57676
591		05DD afii57677
592		05DE afii57678
593		05DF afii57679
594		05E0 afii57680
595		05E1 afii57681
596		05E2 afii57682
597		05E3 afii57683
598		05E4 afii57684
599		05E5 afii57685
600		05E6 afii57686
601		05E7 afii57687
602		05E8 afii57688
603		05E9 afii57689
604		05EA afii57690
605		05F0 afii57716
606		05F1 afii57717
607		05F2 afii57718
608		060C afii57388
609		061B afii57403
610		061F afii57407
611		0621 afii57409
612		0622 afii57410
613		0623 afii57411
614		0624 afii57412
615		0625 afii57413
616		0626 afii57414
617		0627 afii57415
618		0628 afii57416
619		0629 afii57417
620		062A afii57418
621		062B afii57419
622		062C afii57420
623		062D afii57421
624		062E afii57422
625		062F afii57423
626		0630 afii57424
627		0631 afii57425
628		0632 afii57426
629		0633 afii57427
630		0634 afii57428
631		0635 afii57429
632		0636 afii57430
633		0637 afii57431
634		0638 afii57432
635		0639 afii57433
636		063A afii57434
637		0640 afii57440
638		0641 afii57441
639		0642 afii57442
640		0643 afii57443
641		0644 afii57444
642		0645 afii57445
643		0646 afii57446
644		0647 afii57470
645		0648 afii57448
646		0649 afii57449
647		064A afii57450
648		064B afii57451
649		064C afii57452
650		064D afii57453
651		064E afii57454
652		064F afii57455
653		0650 afii57456
654		0651 afii57457
655		0652 afii57458
656		0660 afii57392
657		0661 afii57393
658		0662 afii57394
659		0663 afii57395
660		0664 afii57396
661		0665 afii57397
662		0666 afii57398
663		0667 afii57399
664		0668 afii57400
665		0669 afii57401
666		066A afii57381
667		066D afii63167
668		0679 afii57511
669		067E afii57506
670		0686 afii57507
671		0688 afii57512
672		0691 afii57513
673		0698 afii57508
674		06A4 afii57505
675		06AF afii57509
676		06BA afii57514
677		06D2 afii57519
678		06D5 afii57534
679		1E80 Wgrave
680		1E81 wgrave
681		1E82 Wacute
682		1E83 wacute
683		1E84 Wdieresis
684		1E85 wdieresis
685		1EF2 Ygrave
686		1EF3 ygrave
687		200C afii61664
688		200D afii301
689		200E afii299
690		200F afii300
691		2012 figuredash
692		2013 endash
693		2014 emdash
694		2015 afii00208
695		2017 underscoredbl
696		2018 quoteleft
697		2019 quoteright
698		201A quotesinglbase
699		201B quotereversed
700		201C quotedblleft
701		201D quotedblright
702		201E quotedblbase
703		2020 dagger
704		2021 daggerdbl
705		2022 bullet
706		2024 onedotenleader
707		2025 twodotenleader
708		2026 ellipsis
709		202C afii61573
710		202D afii61574
711		202E afii61575
712		2030 perthousand
713		2032 minute
714		2033 second
715		2039 guilsinglleft
716		203A guilsinglright
717		203C exclamdbl
718		2044 fraction
719		2070 zerosuperior
720		2074 foursuperior
721		2075 fivesuperior
722		2076 sixsuperior
723		2077 sevensuperior
724		2078 eightsuperior
725		2079 ninesuperior
726		207D parenleftsuperior
727		207E parenrightsuperior
728		207F nsuperior
729		2080 zeroinferior
730		2081 oneinferior
731		2082 twoinferior
732		2083 threeinferior
733		2084 fourinferior
734		2085 fiveinferior
735		2086 sixinferior
736		2087 seveninferior
737		2088 eightinferior
738		2089 nineinferior
739		208D parenleftinferior
740		208E parenrightinferior
741		20A1 colonmonetary
742		20A3 franc
743		20A4 lira
744		20A7 peseta
745		20AA afii57636
746		20AB dong
747		20AC Euro
748		2105 afii61248
749		2111 Ifraktur
750		2113 afii61289
751		2116 afii61352
752		2118 weierstrass
753		211C Rfraktur
754		211E prescription
755		2122 trademark
756		2126 Omega
757		212E estimated
758		2135 aleph
759		2153 onethird
760		2154 twothirds
761		215B oneeighth
762		215C threeeighths
763		215D fiveeighths
764		215E seveneighths
765		2190 arrowleft
766		2191 arrowup
767		2192 arrowright
768		2193 arrowdown
769		2194 arrowboth
770		2195 arrowupdn
771		21A8 arrowupdnbse
772		21B5 carriagereturn
773		21D0 arrowdblleft
774		21D1 arrowdblup
775		21D2 arrowdblright
776		21D3 arrowdbldown
777		21D4 arrowdblboth
778		2200 universal
779		2202 partialdiff
780		2203 existential
781		2205 emptyset
782		2206 Delta
783		2207 gradient
784		2208 element
785		2209 notelement
786		220B suchthat
787		220F product
788		2211 summation
789		2212 minus
790		2215 fraction
791		2217 asteriskmath
792		2219 periodcentered
793		221A radical
794		221D proportional
795		221E infinity
796		221F orthogonal
797		2220 angle
798		2227 logicaland
799		2228 logicalor
800		2229 intersection
801		222A union
802		222B integral
803		2234 therefore
804		223C similar
805		2245 congruent
806		2248 approxequal
807		2260 notequal
808		2261 equivalence
809		2264 lessequal
810		2265 greaterequal
811		2282 propersubset
812		2283 propersuperset
813		2284 notsubset
814		2286 reflexsubset
815		2287 reflexsuperset
816		2295 circleplus
817		2297 circlemultiply
818		22A5 perpendicular
819		22C5 dotmath
820		2302 house
821		2310 revlogicalnot
822		2320 integraltp
823		2321 integralbt
824		2329 angleleft
825		232A angleright
826		2500 SF100000
827		2502 SF110000
828		250C SF010000
829		2510 SF030000
830		2514 SF020000
831		2518 SF040000
832		251C SF080000
833		2524 SF090000
834		252C SF060000
835		2534 SF070000
836		253C SF050000
837		2550 SF430000
838		2551 SF240000
839		2552 SF510000
840		2553 SF520000
841		2554 SF390000
842		2555 SF220000
843		2556 SF210000
844		2557 SF250000
845		2558 SF500000
846		2559 SF490000
847		255A SF380000
848		255B SF280000
849		255C SF270000
850		255D SF260000
851		255E SF360000
852		255F SF370000
853		2560 SF420000
854		2561 SF190000
855		2562 SF200000
856		2563 SF230000
857		2564 SF470000
858		2565 SF480000
859		2566 SF410000
860		2567 SF450000
861		2568 SF460000
862		2569 SF400000
863		256A SF540000
864		256B SF530000
865		256C SF440000
866		2580 upblock
867		2584 dnblock
868		2588 block
869		258C lfblock
870		2590 rtblock
871		2591 ltshade
872		2592 shade
873		2593 dkshade
874		25A0 filledbox
875		25A1 H22073
876		25AA H18543
877		25AB H18551
878		25AC filledrect
879		25B2 triagup
880		25BA triagrt
881		25BC triagdn
882		25C4 triaglf
883		25CA lozenge
884		25CB circle
885		25CF H18533
886		25D8 invbullet
887		25D9 invcircle
888		25E6 openbullet
889		263A smileface
890		263B invsmileface
891		263C sun
892		2640 female
893		2642 male
894		2660 spade
895		2663 club
896		2665 heart
897		2666 diamond
898		266A musicalnote
899		266B musicalnotedbl
900		F6BE dotlessj
901		F6BF LL
902		F6C0 ll
903		F6C1 Scedilla
904		F6C2 scedilla
905		F6C3 commaaccent
906		F6C4 afii10063
907		F6C5 afii10064
908		F6C6 afii10192
909		F6C7 afii10831
910		F6C8 afii10832
911		F6C9 Acute
912		F6CA Caron
913		F6CB Dieresis
914		F6CC DieresisAcute
915		F6CD DieresisGrave
916		F6CE Grave
917		F6CF Hungarumlaut
918		F6D0 Macron
919		F6D1 cyrBreve
920		F6D2 cyrFlex
921		F6D3 dblGrave
922		F6D4 cyrbreve
923		F6D5 cyrflex
924		F6D6 dblgrave
925		F6D7 dieresisacute
926		F6D8 dieresisgrave
927		F6D9 copyrightserif
928		F6DA registerserif
929		F6DB trademarkserif
930		F6DC onefitted
931		F6DD rupiah
932		F6DE threequartersemdash
933		F6DF centinferior
934		F6E0 centsuperior
935		F6E1 commainferior
936		F6E2 commasuperior
937		F6E3 dollarinferior
938		F6E4 dollarsuperior
939		F6E5 hypheninferior
940		F6E6 hyphensuperior
941		F6E7 periodinferior
942		F6E8 periodsuperior
943		F6E9 asuperior
944		F6EA bsuperior
945		F6EB dsuperior
946		F6EC esuperior
947		F6ED isuperior
948		F6EE lsuperior
949		F6EF msuperior
950		F6F0 osuperior
951		F6F1 rsuperior
952		F6F2 ssuperior
953		F6F3 tsuperior
954		F6F4 Brevesmall
955		F6F5 Caronsmall
956		F6F6 Circumflexsmall
957		F6F7 Dotaccentsmall
958		F6F8 Hungarumlautsmall
959		F6F9 Lslashsmall
960		F6FA OEsmall
961		F6FB Ogoneksmall
962		F6FC Ringsmall
963		F6FD Scaronsmall
964		F6FE Tildesmall
965		F6FF Zcaronsmall
966		F721 exclamsmall
967		F724 dollaroldstyle
968		F726 ampersandsmall
969		F730 zerooldstyle
970		F731 oneoldstyle
971		F732 twooldstyle
972		F733 threeoldstyle
973		F734 fouroldstyle
974		F735 fiveoldstyle
975		F736 sixoldstyle
976		F737 sevenoldstyle
977		F738 eightoldstyle
978		F739 nineoldstyle
979		F73F questionsmall
980		F760 Gravesmall
981		F761 Asmall
982		F762 Bsmall
983		F763 Csmall
984		F764 Dsmall
985		F765 Esmall
986		F766 Fsmall
987		F767 Gsmall
988		F768 Hsmall
989		F769 Ismall
990		F76A Jsmall
991		F76B Ksmall
992		F76C Lsmall
993		F76D Msmall
994		F76E Nsmall
995		F76F Osmall
996		F770 Psmall
997		F771 Qsmall
998		F772 Rsmall
999		F773 Ssmall
1000		F774 Tsmall
1001		F775 Usmall
1002		F776 Vsmall
1003		F777 Wsmall
1004		F778 Xsmall
1005		F779 Ysmall
1006		F77A Zsmall
1007		F7A1 exclamdownsmall
1008		F7A2 centoldstyle
1009		F7A8 Dieresissmall
1010		F7AF Macronsmall
1011		F7B4 Acutesmall
1012		F7B8 Cedillasmall
1013		F7BF questiondownsmall
1014		F7E0 Agravesmall
1015		F7E1 Aacutesmall
1016		F7E2 Acircumflexsmall
1017		F7E3 Atildesmall
1018		F7E4 Adieresissmall
1019		F7E5 Aringsmall
1020		F7E6 AEsmall
1021		F7E7 Ccedillasmall
1022		F7E8 Egravesmall
1023		F7E9 Eacutesmall
1024		F7EA Ecircumflexsmall
1025		F7EB Edieresissmall
1026		F7EC Igravesmall
1027		F7ED Iacutesmall
1028		F7EE Icircumflexsmall
1029		F7EF Idieresissmall
1030		F7F0 Ethsmall
1031		F7F1 Ntildesmall
1032		F7F2 Ogravesmall
1033		F7F3 Oacutesmall
1034		F7F4 Ocircumflexsmall
1035		F7F5 Otildesmall
1036		F7F6 Odieresissmall
1037		F7F8 Oslashsmall
1038		F7F9 Ugravesmall
1039		F7FA Uacutesmall
1040		F7FB Ucircumflexsmall
1041		F7FC Udieresissmall
1042		F7FD Yacutesmall
1043		F7FE Thornsmall
1044		F7FF Ydieresissmall
1045		F8E5 radicalex
1046		F8E6 arrowvertex
1047		F8E7 arrowhorizex
1048		F8E8 registersans
1049		F8E9 copyrightsans
1050		F8EA trademarksans
1051		F8EB parenlefttp
1052		F8EC parenleftex
1053		F8ED parenleftbt
1054		F8EE bracketlefttp
1055		F8EF bracketleftex
1056		F8F0 bracketleftbt
1057		F8F1 bracelefttp
1058		F8F2 braceleftmid
1059		F8F3 braceleftbt
1060		F8F4 braceex
1061		F8F5 integralex
1062		F8F6 parenrighttp
1063		F8F7 parenrightex
1064		F8F8 parenrightbt
1065		F8F9 bracketrighttp
1066		F8FA bracketrightex
1067		F8FB bracketrightbt
1068		F8FC bracerighttp
1069		F8FD bracerightmid
1070		F8FE bracerightbt
1071		FB00 ff
1072		FB01 fi
1073		FB02 fl
1074		FB03 ffi
1075		FB04 ffl
1076		FB1F afii57705
1077		FB2A afii57694
1078		FB2B afii57695
1079		FB35 afii57723
1080		FB4B afii57700
1081		}
1082
1083		# precalculate entire prolog when this file is loaded
1084		# (to speed things up)
1085		set ps_preamable "%%BeginProlog\n"
1086		append ps_preamable [CreatePostscriptEncoding [encoding system]]
1087		append ps_preamable {
1088		50 dict begin
1089		% This is a standard prolog for Postscript generated by Tk's canvas
1090		% widget.
1091		% RCS: @(#) $Id: mkpsenc.tcl,v 1.3 2002/07/19 14:37:21 drh Exp $
1092
1093		% The definitions below just define all of the variables used in
1094		% any of the procedures here. This is needed for obscure reasons
1095		% explained on p. 716 of the Postscript manual (Section H.2.7,
1096		% "Initializing Variables," in the section on Encapsulated Postscript).
1097
1098		/baseline 0 def
1099		/stipimage 0 def
1100		/height 0 def
1101		/justify 0 def
1102		/lineLength 0 def
1103		/spacing 0 def
1104		/stipple 0 def
1105		/strings 0 def
1106		/xoffset 0 def
1107		/yoffset 0 def
1108		/tmpstip null def
1109
1110
1111		/cstringshow {
1112		{
1113		dup type /stringtype eq
1114		{ show } { glyphshow }
1115		ifelse
	31
	32	# List of adobe glyph names. Converted from glyphlist.txt, downloaded from
	33	# Adobe.
	34
	35	variable psglyphs
	36	array set psglyphs {
	37	0020 space
	38	0021 exclam
	39	0022 quotedbl
	40	0023 numbersign
	41	0024 dollar
	42	0025 percent
	43	0026 ampersand
	44	0027 quotesingle
	45	0028 parenleft
	46	0029 parenright
	47	002A asterisk
	48	002B plus
	49	002C comma
	50	002D hyphen
	51	002E period
	52	002F slash
	53	0030 zero
	54	0031 one
	55	0032 two
	56	0033 three
	57	0034 four
	58	0035 five
	59	0036 six
	60	0037 seven
	61	0038 eight
	62	0039 nine
	63	003A colon
	64	003B semicolon
	65	003C less
	66	003D equal
	67	003E greater
	68	003F question
	69	0040 at
	70	0041 A
	71	0042 B
	72	0043 C
	73	0044 D
	74	0045 E
	75	0046 F
	76	0047 G
	77	0048 H
	78	0049 I
	79	004A J
	80	004B K
	81	004C L
	82	004D M
	83	004E N
	84	004F O
	85	0050 P
	86	0051 Q
	87	0052 R
	88	0053 S
	89	0054 T
	90	0055 U
	91	0056 V
	92	0057 W
	93	0058 X
	94	0059 Y
	95	005A Z
	96	005B bracketleft
	97	005C backslash
	98	005D bracketright
	99	005E asciicircum
	100	005F underscore
	101	0060 grave
	102	0061 a
	103	0062 b
	104	0063 c
	105	0064 d
	106	0065 e
	107	0066 f
	108	0067 g
	109	0068 h
	110	0069 i
	111	006A j
	112	006B k
	113	006C l
	114	006D m
	115	006E n
	116	006F o
	117	0070 p
	118	0071 q
	119	0072 r
	120	0073 s
	121	0074 t
	122	0075 u
	123	0076 v
	124	0077 w
	125	0078 x
	126	0079 y
	127	007A z
	128	007B braceleft
	129	007C bar
	130	007D braceright
	131	007E asciitilde
	132	00A0 space
	133	00A1 exclamdown
	134	00A2 cent
	135	00A3 sterling
	136	00A4 currency
	137	00A5 yen
	138	00A6 brokenbar
	139	00A7 section
	140	00A8 dieresis
	141	00A9 copyright
	142	00AA ordfeminine
	143	00AB guillemotleft
	144	00AC logicalnot
	145	00AD hyphen
	146	00AE registered
	147	00AF macron
	148	00B0 degree
	149	00B1 plusminus
	150	00B2 twosuperior
	151	00B3 threesuperior
	152	00B4 acute
	153	00B5 mu
	154	00B6 paragraph
	155	00B7 periodcentered
	156	00B8 cedilla
	157	00B9 onesuperior
	158	00BA ordmasculine
	159	00BB guillemotright
	160	00BC onequarter
	161	00BD onehalf
	162	00BE threequarters
	163	00BF questiondown
	164	00C0 Agrave
	165	00C1 Aacute
	166	00C2 Acircumflex
	167	00C3 Atilde
	168	00C4 Adieresis
	169	00C5 Aring
	170	00C6 AE
	171	00C7 Ccedilla
	172	00C8 Egrave
	173	00C9 Eacute
	174	00CA Ecircumflex
	175	00CB Edieresis
	176	00CC Igrave
	177	00CD Iacute
	178	00CE Icircumflex
	179	00CF Idieresis
	180	00D0 Eth
	181	00D1 Ntilde
	182	00D2 Ograve
	183	00D3 Oacute
	184	00D4 Ocircumflex
	185	00D5 Otilde
	186	00D6 Odieresis
	187	00D7 multiply
	188	00D8 Oslash
	189	00D9 Ugrave
	190	00DA Uacute
	191	00DB Ucircumflex
	192	00DC Udieresis
	193	00DD Yacute
	194	00DE Thorn
	195	00DF germandbls
	196	00E0 agrave
	197	00E1 aacute
	198	00E2 acircumflex
	199	00E3 atilde
	200	00E4 adieresis
	201	00E5 aring
	202	00E6 ae
	203	00E7 ccedilla
	204	00E8 egrave
	205	00E9 eacute
	206	00EA ecircumflex
	207	00EB edieresis
	208	00EC igrave
	209	00ED iacute
	210	00EE icircumflex
	211	00EF idieresis
	212	00F0 eth
	213	00F1 ntilde
	214	00F2 ograve
	215	00F3 oacute
	216	00F4 ocircumflex
	217	00F5 otilde
	218	00F6 odieresis
	219	00F7 divide
	220	00F8 oslash
	221	00F9 ugrave
	222	00FA uacute
	223	00FB ucircumflex
	224	00FC udieresis
	225	00FD yacute
	226	00FE thorn
	227	00FF ydieresis
	228	0100 Amacron
	229	0101 amacron
	230	0102 Abreve
	231	0103 abreve
	232	0104 Aogonek
	233	0105 aogonek
	234	0106 Cacute
	235	0107 cacute
	236	0108 Ccircumflex
	237	0109 ccircumflex
	238	010A Cdotaccent
	239	010B cdotaccent
	240	010C Ccaron
	241	010D ccaron
	242	010E Dcaron
	243	010F dcaron
	244	0110 Dcroat
	245	0111 dcroat
	246	0112 Emacron
	247	0113 emacron
	248	0114 Ebreve
	249	0115 ebreve
	250	0116 Edotaccent
	251	0117 edotaccent
	252	0118 Eogonek
	253	0119 eogonek
	254	011A Ecaron
	255	011B ecaron
	256	011C Gcircumflex
	257	011D gcircumflex
	258	011E Gbreve
	259	011F gbreve
	260	0120 Gdotaccent
	261	0121 gdotaccent
	262	0122 Gcommaaccent
	263	0123 gcommaaccent
	264	0124 Hcircumflex
	265	0125 hcircumflex
	266	0126 Hbar
	267	0127 hbar
	268	0128 Itilde
	269	0129 itilde
	270	012A Imacron
	271	012B imacron
	272	012C Ibreve
	273	012D ibreve
	274	012E Iogonek
	275	012F iogonek
	276	0130 Idotaccent
	277	0131 dotlessi
	278	0132 IJ
	279	0133 ij
	280	0134 Jcircumflex
	281	0135 jcircumflex
	282	0136 Kcommaaccent
	283	0137 kcommaaccent
	284	0138 kgreenlandic
	285	0139 Lacute
	286	013A lacute
	287	013B Lcommaaccent
	288	013C lcommaaccent
	289	013D Lcaron
	290	013E lcaron
	291	013F Ldot
	292	0140 ldot
	293	0141 Lslash
	294	0142 lslash
	295	0143 Nacute
	296	0144 nacute
	297	0145 Ncommaaccent
	298	0146 ncommaaccent
	299	0147 Ncaron
	300	0148 ncaron
	301	0149 napostrophe
	302	014A Eng
	303	014B eng
	304	014C Omacron
	305	014D omacron
	306	014E Obreve
	307	014F obreve
	308	0150 Ohungarumlaut
	309	0151 ohungarumlaut
	310	0152 OE
	311	0153 oe
	312	0154 Racute
	313	0155 racute
	314	0156 Rcommaaccent
	315	0157 rcommaaccent
	316	0158 Rcaron
	317	0159 rcaron
	318	015A Sacute
	319	015B sacute
	320	015C Scircumflex
	321	015D scircumflex
	322	015E Scedilla
	323	015F scedilla
	324	0160 Scaron
	325	0161 scaron
	326	0162 Tcommaaccent
	327	0163 tcommaaccent
	328	0164 Tcaron
	329	0165 tcaron
	330	0166 Tbar
	331	0167 tbar
	332	0168 Utilde
	333	0169 utilde
	334	016A Umacron
	335	016B umacron
	336	016C Ubreve
	337	016D ubreve
	338	016E Uring
	339	016F uring
	340	0170 Uhungarumlaut
	341	0171 uhungarumlaut
	342	0172 Uogonek
	343	0173 uogonek
	344	0174 Wcircumflex
	345	0175 wcircumflex
	346	0176 Ycircumflex
	347	0177 ycircumflex
	348	0178 Ydieresis
	349	0179 Zacute
	350	017A zacute
	351	017B Zdotaccent
	352	017C zdotaccent
	353	017D Zcaron
	354	017E zcaron
	355	017F longs
	356	0192 florin
	357	01A0 Ohorn
	358	01A1 ohorn
	359	01AF Uhorn
	360	01B0 uhorn
	361	01E6 Gcaron
	362	01E7 gcaron
	363	01FA Aringacute
	364	01FB aringacute
	365	01FC AEacute
	366	01FD aeacute
	367	01FE Oslashacute
	368	01FF oslashacute
	369	0218 Scommaaccent
	370	0219 scommaaccent
	371	021A Tcommaaccent
	372	021B tcommaaccent
	373	02BC afii57929
	374	02BD afii64937
	375	02C6 circumflex
	376	02C7 caron
	377	02C9 macron
	378	02D8 breve
	379	02D9 dotaccent
	380	02DA ring
	381	02DB ogonek
	382	02DC tilde
	383	02DD hungarumlaut
	384	0300 gravecomb
	385	0301 acutecomb
	386	0303 tildecomb
	387	0309 hookabovecomb
	388	0323 dotbelowcomb
	389	0384 tonos
	390	0385 dieresistonos
	391	0386 Alphatonos
	392	0387 anoteleia
	393	0388 Epsilontonos
	394	0389 Etatonos
	395	038A Iotatonos
	396	038C Omicrontonos
	397	038E Upsilontonos
	398	038F Omegatonos
	399	0390 iotadieresistonos
	400	0391 Alpha
	401	0392 Beta
	402	0393 Gamma
	403	0394 Delta
	404	0395 Epsilon
	405	0396 Zeta
	406	0397 Eta
	407	0398 Theta
	408	0399 Iota
	409	039A Kappa
	410	039B Lambda
	411	039C Mu
	412	039D Nu
	413	039E Xi
	414	039F Omicron
	415	03A0 Pi
	416	03A1 Rho
	417	03A3 Sigma
	418	03A4 Tau
	419	03A5 Upsilon
	420	03A6 Phi
	421	03A7 Chi
	422	03A8 Psi
	423	03A9 Omega
	424	03AA Iotadieresis
	425	03AB Upsilondieresis
	426	03AC alphatonos
	427	03AD epsilontonos
	428	03AE etatonos
	429	03AF iotatonos
	430	03B0 upsilondieresistonos
	431	03B1 alpha
	432	03B2 beta
	433	03B3 gamma
	434	03B4 delta
	435	03B5 epsilon
	436	03B6 zeta
	437	03B7 eta
	438	03B8 theta
	439	03B9 iota
	440	03BA kappa
	441	03BB lambda
	442	03BC mu
	443	03BD nu
	444	03BE xi
	445	03BF omicron
	446	03C0 pi
	447	03C1 rho
	448	03C2 sigma1
	449	03C3 sigma
	450	03C4 tau
	451	03C5 upsilon
	452	03C6 phi
	453	03C7 chi
	454	03C8 psi
	455	03C9 omega
	456	03CA iotadieresis
	457	03CB upsilondieresis
	458	03CC omicrontonos
	459	03CD upsilontonos
	460	03CE omegatonos
	461	03D1 theta1
	462	03D2 Upsilon1
	463	03D5 phi1
	464	03D6 omega1
	465	0401 afii10023
	466	0402 afii10051
	467	0403 afii10052
	468	0404 afii10053
	469	0405 afii10054
	470	0406 afii10055
	471	0407 afii10056
	472	0408 afii10057
	473	0409 afii10058
	474	040A afii10059
	475	040B afii10060
	476	040C afii10061
	477	040E afii10062
	478	040F afii10145
	479	0410 afii10017
	480	0411 afii10018
	481	0412 afii10019
	482	0413 afii10020
	483	0414 afii10021
	484	0415 afii10022
	485	0416 afii10024
	486	0417 afii10025
	487	0418 afii10026
	488	0419 afii10027
	489	041A afii10028
	490	041B afii10029
	491	041C afii10030
	492	041D afii10031
	493	041E afii10032
	494	041F afii10033
	495	0420 afii10034
	496	0421 afii10035
	497	0422 afii10036
	498	0423 afii10037
	499	0424 afii10038
	500	0425 afii10039
	501	0426 afii10040
	502	0427 afii10041
	503	0428 afii10042
	504	0429 afii10043
	505	042A afii10044
	506	042B afii10045
	507	042C afii10046
	508	042D afii10047
	509	042E afii10048
	510	042F afii10049
	511	0430 afii10065
	512	0431 afii10066
	513	0432 afii10067
	514	0433 afii10068
	515	0434 afii10069
	516	0435 afii10070
	517	0436 afii10072
	518	0437 afii10073
	519	0438 afii10074
	520	0439 afii10075
	521	043A afii10076
	522	043B afii10077
	523	043C afii10078
	524	043D afii10079
	525	043E afii10080
	526	043F afii10081
	527	0440 afii10082
	528	0441 afii10083
	529	0442 afii10084
	530	0443 afii10085
	531	0444 afii10086
	532	0445 afii10087
	533	0446 afii10088
	534	0447 afii10089
	535	0448 afii10090
	536	0449 afii10091
	537	044A afii10092
	538	044B afii10093
	539	044C afii10094
	540	044D afii10095
	541	044E afii10096
	542	044F afii10097
	543	0451 afii10071
	544	0452 afii10099
	545	0453 afii10100
	546	0454 afii10101
	547	0455 afii10102
	548	0456 afii10103
	549	0457 afii10104
	550	0458 afii10105
	551	0459 afii10106
	552	045A afii10107
	553	045B afii10108
	554	045C afii10109
	555	045E afii10110
	556	045F afii10193
	557	0462 afii10146
	558	0463 afii10194
	559	0472 afii10147
	560	0473 afii10195
	561	0474 afii10148
	562	0475 afii10196
	563	0490 afii10050
	564	0491 afii10098
	565	04D9 afii10846
	566	05B0 afii57799
	567	05B1 afii57801
	568	05B2 afii57800
	569	05B3 afii57802
	570	05B4 afii57793
	571	05B5 afii57794
	572	05B6 afii57795
	573	05B7 afii57798
	574	05B8 afii57797
	575	05B9 afii57806
	576	05BB afii57796
	577	05BC afii57807
	578	05BD afii57839
	579	05BE afii57645
	580	05BF afii57841
	581	05C0 afii57842
	582	05C1 afii57804
	583	05C2 afii57803
	584	05C3 afii57658
	585	05D0 afii57664
	586	05D1 afii57665
	587	05D2 afii57666
	588	05D3 afii57667
	589	05D4 afii57668
	590	05D5 afii57669
	591	05D6 afii57670
	592	05D7 afii57671
	593	05D8 afii57672
	594	05D9 afii57673
	595	05DA afii57674
	596	05DB afii57675
	597	05DC afii57676
	598	05DD afii57677
	599	05DE afii57678
	600	05DF afii57679
	601	05E0 afii57680
	602	05E1 afii57681
	603	05E2 afii57682
	604	05E3 afii57683
	605	05E4 afii57684
	606	05E5 afii57685
	607	05E6 afii57686
	608	05E7 afii57687
	609	05E8 afii57688
	610	05E9 afii57689
	611	05EA afii57690
	612	05F0 afii57716
	613	05F1 afii57717
	614	05F2 afii57718
	615	060C afii57388
	616	061B afii57403
	617	061F afii57407
	618	0621 afii57409
	619	0622 afii57410
	620	0623 afii57411
	621	0624 afii57412
	622	0625 afii57413
	623	0626 afii57414
	624	0627 afii57415
	625	0628 afii57416
	626	0629 afii57417
	627	062A afii57418
	628	062B afii57419
	629	062C afii57420
	630	062D afii57421
	631	062E afii57422
	632	062F afii57423
	633	0630 afii57424
	634	0631 afii57425
	635	0632 afii57426
	636	0633 afii57427
	637	0634 afii57428
	638	0635 afii57429
	639	0636 afii57430
	640	0637 afii57431
	641	0638 afii57432
	642	0639 afii57433
	643	063A afii57434
	644	0640 afii57440
	645	0641 afii57441
	646	0642 afii57442
	647	0643 afii57443
	648	0644 afii57444
	649	0645 afii57445
	650	0646 afii57446
	651	0647 afii57470
	652	0648 afii57448
	653	0649 afii57449
	654	064A afii57450
	655	064B afii57451
	656	064C afii57452
	657	064D afii57453
	658	064E afii57454
	659	064F afii57455
	660	0650 afii57456
	661	0651 afii57457
	662	0652 afii57458
	663	0660 afii57392
	664	0661 afii57393
	665	0662 afii57394
	666	0663 afii57395
	667	0664 afii57396
	668	0665 afii57397
	669	0666 afii57398
	670	0667 afii57399
	671	0668 afii57400
	672	0669 afii57401
	673	066A afii57381
	674	066D afii63167
	675	0679 afii57511
	676	067E afii57506
	677	0686 afii57507
	678	0688 afii57512
	679	0691 afii57513
	680	0698 afii57508
	681	06A4 afii57505
	682	06AF afii57509
	683	06BA afii57514
	684	06D2 afii57519
	685	06D5 afii57534
	686	1E80 Wgrave
	687	1E81 wgrave
	688	1E82 Wacute
	689	1E83 wacute
	690	1E84 Wdieresis
	691	1E85 wdieresis
	692	1EF2 Ygrave
	693	1EF3 ygrave
	694	200C afii61664
	695	200D afii301
	696	200E afii299
	697	200F afii300
	698	2012 figuredash
	699	2013 endash
	700	2014 emdash
	701	2015 afii00208
	702	2017 underscoredbl
	703	2018 quoteleft
	704	2019 quoteright
	705	201A quotesinglbase
	706	201B quotereversed
	707	201C quotedblleft
	708	201D quotedblright
	709	201E quotedblbase
	710	2020 dagger
	711	2021 daggerdbl
	712	2022 bullet
	713	2024 onedotenleader
	714	2025 twodotenleader
	715	2026 ellipsis
	716	202C afii61573
	717	202D afii61574
	718	202E afii61575
	719	2030 perthousand
	720	2032 minute
	721	2033 second
	722	2039 guilsinglleft
	723	203A guilsinglright
	724	203C exclamdbl
	725	2044 fraction
	726	2070 zerosuperior
	727	2074 foursuperior
	728	2075 fivesuperior
	729	2076 sixsuperior
	730	2077 sevensuperior
	731	2078 eightsuperior
	732	2079 ninesuperior
	733	207D parenleftsuperior
	734	207E parenrightsuperior
	735	207F nsuperior
	736	2080 zeroinferior
	737	2081 oneinferior
	738	2082 twoinferior
	739	2083 threeinferior
	740	2084 fourinferior
	741	2085 fiveinferior
	742	2086 sixinferior
	743	2087 seveninferior
	744	2088 eightinferior
	745	2089 nineinferior
	746	208D parenleftinferior
	747	208E parenrightinferior
	748	20A1 colonmonetary
	749	20A3 franc
	750	20A4 lira
	751	20A7 peseta
	752	20AA afii57636
	753	20AB dong
	754	20AC Euro
	755	2105 afii61248
	756	2111 Ifraktur
	757	2113 afii61289
	758	2116 afii61352
	759	2118 weierstrass
	760	211C Rfraktur
	761	211E prescription
	762	2122 trademark
	763	2126 Omega
	764	212E estimated
	765	2135 aleph
	766	2153 onethird
	767	2154 twothirds
	768	215B oneeighth
	769	215C threeeighths
	770	215D fiveeighths
	771	215E seveneighths
	772	2190 arrowleft
	773	2191 arrowup
	774	2192 arrowright
	775	2193 arrowdown
	776	2194 arrowboth
	777	2195 arrowupdn
	778	21A8 arrowupdnbse
	779	21B5 carriagereturn
	780	21D0 arrowdblleft
	781	21D1 arrowdblup
	782	21D2 arrowdblright
	783	21D3 arrowdbldown
	784	21D4 arrowdblboth
	785	2200 universal
	786	2202 partialdiff
	787	2203 existential
	788	2205 emptyset
	789	2206 Delta
	790	2207 gradient
	791	2208 element
	792	2209 notelement
	793	220B suchthat
	794	220F product
	795	2211 summation
	796	2212 minus
	797	2215 fraction
	798	2217 asteriskmath
	799	2219 periodcentered
	800	221A radical
	801	221D proportional
	802	221E infinity
	803	221F orthogonal
	804	2220 angle
	805	2227 logicaland
	806	2228 logicalor
	807	2229 intersection
	808	222A union
	809	222B integral
	810	2234 therefore
	811	223C similar
	812	2245 congruent
	813	2248 approxequal
	814	2260 notequal
	815	2261 equivalence
	816	2264 lessequal
	817	2265 greaterequal
	818	2282 propersubset
	819	2283 propersuperset
	820	2284 notsubset
	821	2286 reflexsubset
	822	2287 reflexsuperset
	823	2295 circleplus
	824	2297 circlemultiply
	825	22A5 perpendicular
	826	22C5 dotmath
	827	2302 house
	828	2310 revlogicalnot
	829	2320 integraltp
	830	2321 integralbt
	831	2329 angleleft
	832	232A angleright
	833	2500 SF100000
	834	2502 SF110000
	835	250C SF010000
	836	2510 SF030000
	837	2514 SF020000
	838	2518 SF040000
	839	251C SF080000
	840	2524 SF090000
	841	252C SF060000
	842	2534 SF070000
	843	253C SF050000
	844	2550 SF430000
	845	2551 SF240000
	846	2552 SF510000
	847	2553 SF520000
	848	2554 SF390000
	849	2555 SF220000
	850	2556 SF210000
	851	2557 SF250000
	852	2558 SF500000
	853	2559 SF490000
	854	255A SF380000
	855	255B SF280000
	856	255C SF270000
	857	255D SF260000
	858	255E SF360000
	859	255F SF370000
	860	2560 SF420000
	861	2561 SF190000
	862	2562 SF200000
	863	2563 SF230000
	864	2564 SF470000
	865	2565 SF480000
	866	2566 SF410000
	867	2567 SF450000
	868	2568 SF460000
	869	2569 SF400000
	870	256A SF540000
	871	256B SF530000
	872	256C SF440000
	873	2580 upblock
	874	2584 dnblock
	875	2588 block
	876	258C lfblock
	877	2590 rtblock
	878	2591 ltshade
	879	2592 shade
	880	2593 dkshade
	881	25A0 filledbox
	882	25A1 H22073
	883	25AA H18543
	884	25AB H18551
	885	25AC filledrect
	886	25B2 triagup
	887	25BA triagrt
	888	25BC triagdn
	889	25C4 triaglf
	890	25CA lozenge
	891	25CB circle
	892	25CF H18533
	893	25D8 invbullet
	894	25D9 invcircle
	895	25E6 openbullet
	896	263A smileface
	897	263B invsmileface
	898	263C sun
	899	2640 female
	900	2642 male
	901	2660 spade
	902	2663 club
	903	2665 heart
	904	2666 diamond
	905	266A musicalnote
	906	266B musicalnotedbl
	907	F6BE dotlessj
	908	F6BF LL
	909	F6C0 ll
	910	F6C1 Scedilla
	911	F6C2 scedilla
	912	F6C3 commaaccent
	913	F6C4 afii10063
	914	F6C5 afii10064
	915	F6C6 afii10192
	916	F6C7 afii10831
	917	F6C8 afii10832
	918	F6C9 Acute
	919	F6CA Caron
	920	F6CB Dieresis
	921	F6CC DieresisAcute
	922	F6CD DieresisGrave
	923	F6CE Grave
	924	F6CF Hungarumlaut
	925	F6D0 Macron
	926	F6D1 cyrBreve
	927	F6D2 cyrFlex
	928	F6D3 dblGrave
	929	F6D4 cyrbreve
	930	F6D5 cyrflex
	931	F6D6 dblgrave
	932	F6D7 dieresisacute
	933	F6D8 dieresisgrave
	934	F6D9 copyrightserif
	935	F6DA registerserif
	936	F6DB trademarkserif
	937	F6DC onefitted
	938	F6DD rupiah
	939	F6DE threequartersemdash
	940	F6DF centinferior
	941	F6E0 centsuperior
	942	F6E1 commainferior
	943	F6E2 commasuperior
	944	F6E3 dollarinferior
	945	F6E4 dollarsuperior
	946	F6E5 hypheninferior
	947	F6E6 hyphensuperior
	948	F6E7 periodinferior
	949	F6E8 periodsuperior
	950	F6E9 asuperior
	951	F6EA bsuperior
	952	F6EB dsuperior
	953	F6EC esuperior
	954	F6ED isuperior
	955	F6EE lsuperior
	956	F6EF msuperior
	957	F6F0 osuperior
	958	F6F1 rsuperior
	959	F6F2 ssuperior
	960	F6F3 tsuperior
	961	F6F4 Brevesmall
	962	F6F5 Caronsmall
	963	F6F6 Circumflexsmall
	964	F6F7 Dotaccentsmall
	965	F6F8 Hungarumlautsmall
	966	F6F9 Lslashsmall
	967	F6FA OEsmall
	968	F6FB Ogoneksmall
	969	F6FC Ringsmall
	970	F6FD Scaronsmall
	971	F6FE Tildesmall
	972	F6FF Zcaronsmall
	973	F721 exclamsmall
	974	F724 dollaroldstyle
	975	F726 ampersandsmall
	976	F730 zerooldstyle
	977	F731 oneoldstyle
	978	F732 twooldstyle
	979	F733 threeoldstyle
	980	F734 fouroldstyle
	981	F735 fiveoldstyle
	982	F736 sixoldstyle
	983	F737 sevenoldstyle
	984	F738 eightoldstyle
	985	F739 nineoldstyle
	986	F73F questionsmall
	987	F760 Gravesmall
	988	F761 Asmall
	989	F762 Bsmall
	990	F763 Csmall
	991	F764 Dsmall
	992	F765 Esmall
	993	F766 Fsmall
	994	F767 Gsmall
	995	F768 Hsmall
	996	F769 Ismall
	997	F76A Jsmall
	998	F76B Ksmall
	999	F76C Lsmall
	1000	F76D Msmall
	1001	F76E Nsmall
	1002	F76F Osmall
	1003	F770 Psmall
	1004	F771 Qsmall
	1005	F772 Rsmall
	1006	F773 Ssmall
	1007	F774 Tsmall
	1008	F775 Usmall
	1009	F776 Vsmall
	1010	F777 Wsmall
	1011	F778 Xsmall
	1012	F779 Ysmall
	1013	F77A Zsmall
	1014	F7A1 exclamdownsmall
	1015	F7A2 centoldstyle
	1016	F7A8 Dieresissmall
	1017	F7AF Macronsmall
	1018	F7B4 Acutesmall
	1019	F7B8 Cedillasmall
	1020	F7BF questiondownsmall
	1021	F7E0 Agravesmall
	1022	F7E1 Aacutesmall
	1023	F7E2 Acircumflexsmall
	1024	F7E3 Atildesmall
	1025	F7E4 Adieresissmall
	1026	F7E5 Aringsmall
	1027	F7E6 AEsmall
	1028	F7E7 Ccedillasmall
	1029	F7E8 Egravesmall
	1030	F7E9 Eacutesmall
	1031	F7EA Ecircumflexsmall
	1032	F7EB Edieresissmall
	1033	F7EC Igravesmall
	1034	F7ED Iacutesmall
	1035	F7EE Icircumflexsmall
	1036	F7EF Idieresissmall
	1037	F7F0 Ethsmall
	1038	F7F1 Ntildesmall
	1039	F7F2 Ogravesmall
	1040	F7F3 Oacutesmall
	1041	F7F4 Ocircumflexsmall
	1042	F7F5 Otildesmall
	1043	F7F6 Odieresissmall
	1044	F7F8 Oslashsmall
	1045	F7F9 Ugravesmall
	1046	F7FA Uacutesmall
	1047	F7FB Ucircumflexsmall
	1048	F7FC Udieresissmall
	1049	F7FD Yacutesmall
	1050	F7FE Thornsmall
	1051	F7FF Ydieresissmall
	1052	F8E5 radicalex
	1053	F8E6 arrowvertex
	1054	F8E7 arrowhorizex
	1055	F8E8 registersans
	1056	F8E9 copyrightsans
	1057	F8EA trademarksans
	1058	F8EB parenlefttp
	1059	F8EC parenleftex
	1060	F8ED parenleftbt
	1061	F8EE bracketlefttp
	1062	F8EF bracketleftex
	1063	F8F0 bracketleftbt
	1064	F8F1 bracelefttp
	1065	F8F2 braceleftmid
	1066	F8F3 braceleftbt
	1067	F8F4 braceex
	1068	F8F5 integralex
	1069	F8F6 parenrighttp
	1070	F8F7 parenrightex
	1071	F8F8 parenrightbt
	1072	F8F9 bracketrighttp
	1073	F8FA bracketrightex
	1074	F8FB bracketrightbt
	1075	F8FC bracerighttp
	1076	F8FD bracerightmid
	1077	F8FE bracerightbt
	1078	FB00 ff
	1079	FB01 fi
	1080	FB02 fl
	1081	FB03 ffi
	1082	FB04 ffl
	1083	FB1F afii57705
	1084	FB2A afii57694
	1085	FB2B afii57695
	1086	FB35 afii57723
	1087	FB4B afii57700
1116	1088	}
1117		forall
1118		} bind def
1119
1120
1121
1122		/cstringwidth {
1123		0 exch 0 exch
1124		{
1125		dup type /stringtype eq
1126		{ stringwidth } {
1127		currentfont /Encoding get exch 1 exch put (\001) stringwidth
1128		}
1129		ifelse
1130		exch 3 1 roll add 3 1 roll add exch
	1089
	1090	proc ps_literal {string} {
	1091	variable ps_preamable ;# sic
	1092	foreach line [split $string \n] {
	1093	set line [string trim $line]
	1094	if {$line eq ""} continue
	1095	append ps_preamable $line \n
	1096	}
	1097	return
1131	1098	}
1132		forall
1133		} bind def
1134
1135		% font ISOEncode font
1136		% This procedure changes the encoding of a font from the default
1137		% Postscript encoding to current system encoding. It's typically invoked just
1138		% before invoking "setfont". The body of this procedure comes from
1139		% Section 5.6.1 of the Postscript book.
1140
1141		/ISOEncode {
1142		dup length dict begin
	1099	proc ps_variable {name value} {
	1100	variable ps_preamable
	1101	append ps_preamable "/$name $value def\n"
	1102	return
	1103	}
	1104	proc ps_function {name body} {
	1105	variable ps_preamable
	1106	append ps_preamable "/$name \{"
	1107	foreach line [split $body \n] {
	1108	set line [string trim $line]
	1109	# Strip blank lines and comments from the bodies of functions
	1110	if {$line eq "" } continue
	1111	if {[string match {[%#]*} $line]} continue
	1112	append ps_preamable $line " "
	1113	}
	1114	append ps_preamable "\} bind def\n"
	1115	return
	1116	}
	1117
	1118	# Precalculate entire prolog when this file is loaded (to speed things up)
	1119	ps_literal {
	1120	%%BeginProlog
	1121	% This is a standard prolog for Postscript generated by Tk's canvas
	1122	% widget.
	1123	% RCS: @(#) $Id: mkpsenc.tcl,v 1.4 2008/12/05 10:27:50 dkf Exp $
	1124	}
	1125	ps_literal [CreatePostscriptEncoding [encoding system]]
	1126	ps_literal {50 dict begin}
	1127
	1128	# The definitions below just define all of the variables used in any of
	1129	# the procedures here. This is needed for obscure reasons explained on p.
	1130	# 716 of the Postscript manual (Section H.2.7, "Initializing Variables,"
	1131	# in the section on Encapsulated Postscript).
	1132	ps_variable baseline 0
	1133	ps_variable stipimage 0
	1134	ps_variable height 0
	1135	ps_variable justify 0
	1136	ps_variable lineLength 0
	1137	ps_variable spacing 0
	1138	ps_variable stipple 0
	1139	ps_variable strings 0
	1140	ps_variable xoffset 0
	1141	ps_variable yoffset 0
	1142	ps_variable tmpstip null
	1143	ps_variable baselineSampler "( TXygqPZ)"
	1144	# Put an extra-tall character in; done this way to avoid encoding trouble
	1145	ps_literal {baselineSampler 0 196 put}
	1146
	1147	ps_function cstringshow {
	1148	{
	1149	dup type /stringtype eq
	1150	{ show } { glyphshow }
	1151	ifelse
	1152	} forall
	1153	}
	1154
	1155	ps_function cstringwidth {
	1156	0 exch 0 exch
	1157	{
	1158	dup type /stringtype eq
	1159	{ stringwidth } {
	1160	currentfont /Encoding get exch 1 exch put (\001) stringwidth
	1161	}
	1162	ifelse
	1163	exch 3 1 roll add 3 1 roll add exch
	1164	} forall
	1165	}
	1166
	1167	# font ISOEncode font
	1168	# This procedure changes the encoding of a font from the default
	1169	# Postscript encoding to current system encoding. It's typically invoked
	1170	# just before invoking "setfont". The body of this procedure comes from
	1171	# Section 5.6.1 of the Postscript book.
	1172	ps_function ISOEncode {
	1173	dup length dict begin
1143	1174	{1 index /FID ne {def} {pop pop} ifelse} forall
1144	1175	/Encoding CurrentEncoding def
1145	1176	currentdict
1146		end
1147
1148		% I'm not sure why it's necessary to use "definefont" on this new
1149		% font, but it seems to be important; just use the name "Temporary"
1150		% for the font.
1151
1152		/Temporary exch definefont
1153		} bind def
1154
1155		% StrokeClip
1156		%
1157		% This procedure converts the current path into a clip area under
1158		% the assumption of stroking. It's a bit tricky because some Postscript
1159		% interpreters get errors during strokepath for dashed lines. If
1160		% this happens then turn off dashes and try again.
1161
1162		/StrokeClip {
1163		{strokepath} stopped {
1164		(This Postscript printer gets limitcheck overflows when) =
1165		(stippling dashed lines; lines will be printed solid instead.) =
1166		[] 0 setdash strokepath} if
1167		clip
1168		} bind def
1169
1170		% desiredSize EvenPixels closestSize
1171		%
1172		% The procedure below is used for stippling. Given the optimal size
1173		% of a dot in a stipple pattern in the current user coordinate system,
1174		% compute the closest size that is an exact multiple of the device's
1175		% pixel size. This allows stipple patterns to be displayed without
1176		% aliasing effects.
1177
1178		/EvenPixels {
1179		% Compute exact number of device pixels per stipple dot.
1180		dup 0 matrix currentmatrix dtransform
1181		dup mul exch dup mul add sqrt
1182
1183		% Round to an integer, make sure the number is at least 1, and compute
1184		% user coord distance corresponding to this.
1185		dup round dup 1 lt {pop 1} if
1186		exch div mul
1187		} bind def
1188
1189		% width height string StippleFill --
1190		%
1191		% Given a path already set up and a clipping region generated from
1192		% it, this procedure will fill the clipping region with a stipple
1193		% pattern. "String" contains a proper image description of the
1194		% stipple pattern and "width" and "height" give its dimensions. Each
1195		% stipple dot is assumed to be about one unit across in the current
1196		% user coordinate system. This procedure trashes the graphics state.
1197
1198		/StippleFill {
1199		% The following code is needed to work around a NeWSprint bug.
1200
1201		/tmpstip 1 index def
1202
1203		% Change the scaling so that one user unit in user coordinates
1204		% corresponds to the size of one stipple dot.
1205		1 EvenPixels dup scale
1206
1207		% Compute the bounding box occupied by the path (which is now
1208		% the clipping region), and round the lower coordinates down
1209		% to the nearest starting point for the stipple pattern. Be
1210		% careful about negative numbers, since the rounding works
1211		% differently on them.
1212
1213		pathbbox
1214		4 2 roll
1215		5 index div dup 0 lt {1 sub} if cvi 5 index mul 4 1 roll
1216		6 index div dup 0 lt {1 sub} if cvi 6 index mul 3 2 roll
1217
1218		% Stack now: width height string y1 y2 x1 x2
1219		% Below is a doubly-nested for loop to iterate across this area
1220		% in units of the stipple pattern size, going up columns then
1221		% across rows, blasting out a stipple-pattern-sized rectangle at
1222		% each position
1223
1224		6 index exch {
1225		2 index 5 index 3 index {
1226		% Stack now: width height string y1 y2 x y
1227
1228		gsave
1229		1 index exch translate
1230		5 index 5 index true matrix tmpstip imagemask
1231		grestore
	1177	end
	1178	% I'm not sure why it's necessary to use "definefont" on this new
	1179	% font, but it seems to be important; just use the name "Temporary"
	1180	% for the font.
	1181	/Temporary exch definefont
	1182	}
	1183
	1184	# StrokeClip
	1185	#
	1186	# This procedure converts the current path into a clip area under the
	1187	# assumption of stroking. It's a bit tricky because some Postscript
	1188	# interpreters get errors during strokepath for dashed lines. If this
	1189	# happens then turn off dashes and try again.
	1190	ps_function StrokeClip {
	1191	{strokepath} stopped {
	1192	(This Postscript printer gets limitcheck overflows when) =
	1193	(stippling dashed lines; lines will be printed solid instead.) =
	1194	[] 0 setdash strokepath} if
	1195	clip
	1196	}
	1197
	1198	# desiredSize EvenPixels closestSize
	1199	#
	1200	# The procedure below is used for stippling. Given the optimal size of a
	1201	# dot in a stipple pattern in the current user coordinate system, compute
	1202	# the closest size that is an exact multiple of the device's pixel size.
	1203	# This allows stipple patterns to be displayed without aliasing effects.
	1204	ps_function EvenPixels {
	1205	% Compute exact number of device pixels per stipple dot.
	1206	dup 0 matrix currentmatrix dtransform
	1207	dup mul exch dup mul add sqrt
	1208	% Round to an integer, make sure the number is at least 1, and compute
	1209	% user coord distance corresponding to this.
	1210	dup round dup 1 lt {pop 1} if
	1211	exch div mul
	1212	}
	1213
	1214	# width height string StippleFill --
	1215	#
	1216	# Given a path already set up and a clipping region generated from it,
	1217	# this procedure will fill the clipping region with a stipple pattern.
	1218	# "String" contains a proper image description of the stipple pattern and
	1219	# "width" and "height" give its dimensions. Each stipple dot is assumed to
	1220	# be about one unit across in the current user coordinate system. This
	1221	# procedure trashes the graphics state.
	1222	ps_function StippleFill {
	1223	% The following code is needed to work around a NeWSprint bug.
	1224	/tmpstip 1 index def
	1225	% Change the scaling so that one user unit in user coordinates
	1226	% corresponds to the size of one stipple dot.
	1227	1 EvenPixels dup scale
	1228	% Compute the bounding box occupied by the path (which is now the
	1229	% clipping region), and round the lower coordinates down to the
	1230	% nearest starting point for the stipple pattern. Be careful about
	1231	% negative numbers, since the rounding works differently on them.
	1232	pathbbox
	1233	4 2 roll
	1234	5 index div dup 0 lt {1 sub} if cvi 5 index mul 4 1 roll
	1235	6 index div dup 0 lt {1 sub} if cvi 6 index mul 3 2 roll
	1236	% Stack now: width height string y1 y2 x1 x2
	1237	% Below is a doubly-nested for loop to iterate across this area
	1238	% in units of the stipple pattern size, going up columns then
	1239	% across rows, blasting out a stipple-pattern-sized rectangle at
	1240	% each position
	1241	6 index exch {
	1242	2 index 5 index 3 index {
	1243	% Stack now: width height string y1 y2 x y
	1244	gsave
	1245	1 index exch translate
	1246	5 index 5 index true matrix tmpstip imagemask
	1247	grestore
	1248	} for
	1249	pop
1232	1250	} for
1233		pop
1234		} for
1235		pop pop pop pop pop
1236		} bind def
1237
1238		% -- AdjustColor --
1239		% Given a color value already set for output by the caller, adjusts
1240		% that value to a grayscale or mono value if requested by the CL
1241		% variable.
1242
1243		/AdjustColor {
1244		CL 2 lt {
1245		currentgray
1246		CL 0 eq {
1247		.5 lt {0} {1} ifelse
	1251	pop pop pop pop pop
	1252	}
	1253
	1254	# -- AdjustColor --
	1255	#
	1256	# Given a color value already set for output by the caller, adjusts that
	1257	# value to a grayscale or mono value if requested by the CL variable.
	1258	ps_function AdjustColor {
	1259	CL 2 lt {
	1260	currentgray
	1261	CL 0 eq {
	1262	.5 lt {0} {1} ifelse
	1263	} if
	1264	setgray
1248	1265	} if
1249		setgray
1250		} if
1251		} bind def
1252
1253		% x y strings spacing xoffset yoffset justify stipple DrawText --
1254		% This procedure does all of the real work of drawing text. The
1255		% color and font must already have been set by the caller, and the
1256		% following arguments must be on the stack:
1257		%
1258		% x, y - Coordinates at which to draw text.
1259		% strings - An array of strings, one for each line of the text item,
1260		% in order from top to bottom.
1261		% spacing - Spacing between lines.
1262		% xoffset - Horizontal offset for text bbox relative to x and y: 0 for
1263		% nw/w/sw anchor, -0.5 for n/center/s, and -1.0 for ne/e/se.
1264		% yoffset - Vertical offset for text bbox relative to x and y: 0 for
1265		% nw/n/ne anchor, +0.5 for w/center/e, and +1.0 for sw/s/se.
1266		% justify - 0 for left justification, 0.5 for center, 1 for right justify.
1267		% stipple - Boolean value indicating whether or not text is to be
1268		% drawn in stippled fashion. If text is stippled,
1269		% procedure StippleText must have been defined to call
1270		% StippleFill in the right way.
1271		%
1272		% Also, when this procedure is invoked, the color and font must already
1273		% have been set for the text.
1274
1275		/DrawText {
1276		/stipple exch def
1277		/justify exch def
1278		/yoffset exch def
1279		/xoffset exch def
1280		/spacing exch def
1281		/strings exch def
1282
1283		% First scan through all of the text to find the widest line.
1284
1285		/lineLength 0 def
1286		strings {
1287		cstringwidth pop
1288		dup lineLength gt {/lineLength exch def} {pop} ifelse
	1266	}
	1267
	1268	# x y strings spacing xoffset yoffset justify stipple DrawText --
	1269	#
	1270	# This procedure does all of the real work of drawing text. The color and
	1271	# font must already have been set by the caller, and the following
	1272	# arguments must be on the stack:
	1273	#
	1274	# x, y - Coordinates at which to draw text.
	1275	# strings - An array of strings, one for each line of the text item, in
	1276	# order from top to bottom.
	1277	# spacing - Spacing between lines.
	1278	# xoffset - Horizontal offset for text bbox relative to x and y: 0 for
	1279	# nw/w/sw anchor, -0.5 for n/center/s, and -1.0 for ne/e/se.
	1280	# yoffset - Vertical offset for text bbox relative to x and y: 0 for
	1281	# nw/n/ne anchor, +0.5 for w/center/e, and +1.0 for sw/s/se.
	1282	# justify - 0 for left justification, 0.5 for center, 1 for right justify.
	1283	# stipple - Boolean value indicating whether or not text is to be drawn in
	1284	# stippled fashion. If text is stippled, procedure StippleText
	1285	# must have been defined to call StippleFill in the right way.
	1286	#
	1287	# Also, when this procedure is invoked, the color and font must already
	1288	# have been set for the text.
	1289	ps_function DrawText {
	1290	/stipple exch def
	1291	/justify exch def
	1292	/yoffset exch def
	1293	/xoffset exch def
	1294	/spacing exch def
	1295	/strings exch def
	1296	% First scan through all of the text to find the widest line.
	1297	/lineLength 0 def
	1298	strings {
	1299	cstringwidth pop
	1300	dup lineLength gt {/lineLength exch def} {pop} ifelse
	1301	newpath
	1302	} forall
	1303	% Compute the baseline offset and the actual font height.
	1304	0 0 moveto baselineSampler false charpath
	1305	pathbbox dup /baseline exch def
	1306	exch pop exch sub /height exch def pop
1289	1307	newpath
1290		} forall
1291
1292		% Compute the baseline offset and the actual font height.
1293
1294		0 0 moveto (TXygqPZ) false charpath
1295		pathbbox dup /baseline exch def
1296		exch pop exch sub /height exch def pop
1297		newpath
1298
1299		% Translate coordinates first so that the origin is at the upper-left
1300		% corner of the text's bounding box. Remember that x and y for
1301		% positioning are still on the stack.
1302
1303		translate
1304		lineLength xoffset mul
1305		strings length 1 sub spacing mul height add yoffset mul translate
1306
1307		% Now use the baseline and justification information to translate so
1308		% that the origin is at the baseline and positioning point for the
1309		% first line of text.
1310
1311		justify lineLength mul baseline neg translate
1312
1313		% Iterate over each of the lines to output it. For each line,
1314		% compute its width again so it can be properly justified, then
1315		% display it.
1316
1317		strings {
1318		dup cstringwidth pop
1319		justify neg mul 0 moveto
1320		stipple {
1321
1322
1323		% The text is stippled, so turn it into a path and print
1324		% by calling StippledText, which in turn calls StippleFill.
1325		% Unfortunately, many Postscript interpreters will get
1326		% overflow errors if we try to do the whole string at
1327		% once, so do it a character at a time.
1328
1329		gsave
1330		/char (X) def
1331		{
1332		dup type /stringtype eq {
1333		% This segment is a string.
1334		{
1335		char 0 3 -1 roll put
1336		currentpoint
1337		gsave
1338		char true charpath clip StippleText
1339		grestore
1340		char stringwidth translate
1341		moveto
1342		} forall
1343		} {
1344		% This segment is glyph name
1345		% Temporary override
1346		currentfont /Encoding get exch 1 exch put
1347		currentpoint
1348		gsave (\001) true charpath clip StippleText
1349		grestore
1350		(\001) stringwidth translate
1351		moveto
1352		} ifelse
1353		} forall
1354		grestore
1355		} {cstringshow} ifelse
1356		0 spacing neg translate
1357		} forall
1358		} bind def
1359
1360		%%EndProlog
1361		}
1362
	1308	% Translate and rotate coordinates first so that the origin is at the
	1309	% upper-left corner of the text's bounding box. Remember that angle
	1310	% for rotating, and x and y for positioning are still on the stack.
	1311	translate
	1312	lineLength xoffset mul
	1313	strings length 1 sub spacing mul height add yoffset mul translate
	1314	rotate
	1315	% Now use the baseline and justification information to translate so
	1316	% that the origin is at the baseline and positioning point for the
	1317	% first line of text.
	1318	justify lineLength mul baseline neg translate
	1319	% Iterate over each of the lines to output it. For each line,
	1320	% compute its width again so it can be properly justified, then
	1321	% display it.
	1322	strings {
	1323	dup cstringwidth pop
	1324	justify neg mul 0 moveto
	1325	stipple {
	1326	% The text is stippled, so turn it into a path and print
	1327	% by calling StippledText, which in turn calls StippleFill.
	1328	% Unfortunately, many Postscript interpreters will get
	1329	% overflow errors if we try to do the whole string at
	1330	% once, so do it a character at a time.
	1331	gsave
	1332	/char (X) def
	1333	{
	1334	dup type /stringtype eq {
	1335	% This segment is a string.
	1336	{
	1337	char 0 3 -1 roll put
	1338	currentpoint
	1339	gsave
	1340	char true charpath clip StippleText
	1341	grestore
	1342	char stringwidth translate
	1343	moveto
	1344	} forall
	1345	} {
	1346	% This segment is glyph name
	1347	% Temporary override
	1348	currentfont /Encoding get exch 1 exch put
	1349	currentpoint
	1350	gsave (\001) true charpath clip StippleText
	1351	grestore
	1352	(\001) stringwidth translate
	1353	moveto
	1354	} ifelse
	1355	} forall
	1356	grestore
	1357	} {cstringshow} ifelse
	1358	0 spacing neg translate
	1359	} forall
	1360	}
	1361
	1362	ps_literal %%EndProlog
	1363
	1364	rename ps_function {}
	1365	rename ps_literal {}
	1366	rename ps_variable {}
1363	1367	}
1364	1368
1365	1369	proc tk::ensure_psenc_is_loaded {} {

+1

-3

library/msgbox.tcl less more

2	2	# Implements messageboxes for platforms that do not have native
3	3	# messagebox support.
4	4	#
5		# RCS: @(#) $Id: msgbox.tcl,v 1.36 2008/01/31 23:33:42 hobbs Exp $
	5	# RCS: @(#) $Id: msgbox.tcl,v 1.37 2008/12/11 18:13:08 jenglish Exp $
6	6	#
7	7	# Copyright (c) 1994-1997 Sun Microsystems, Inc.
8	8	#
9	9	# See the file "license.terms" for information on usage and redistribution
10	10	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	#
12
13		package require Ttk
14	12
15	13	# Ensure existence of ::tk::dialog namespace
16	14	#

+18

-1

library/msgs/de.msg less more

2	2	::msgcat::mcset de "&About..." "&\u00dcber..."
3	3	::msgcat::mcset de "All Files" "Alle Dateien"
4	4	::msgcat::mcset de "Application Error" "Applikationsfehler"
	5	::msgcat::mcset de "&Apply" "&Anwenden"
	6	::msgcat::mcset de "Bold" "Fett"
	7	::msgcat::mcset de "Bold Italic" "Fett kursiv"
5	8	::msgcat::mcset de "&Blue" "&Blau"
6	9	::msgcat::mcset de "&Cancel" "&Abbruch"
	10	::msgcat::mcset de "Cancel" "Abbruch"
7	11	::msgcat::mcset de "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
8	12	::msgcat::mcset de "Choose Directory" "W\u00e4hle Verzeichnis"
9	13	::msgcat::mcset de "&Clear" "&R\u00fccksetzen"

17	21	::msgcat::mcset de "Directory \"%1\$s\" does not exist." "Das Verzeichnis \"%1\$s\" existiert nicht."
18	22	::msgcat::mcset de "&Directory:" "&Verzeichnis:"
19	23	::msgcat::mcset de "&Edit" "&Bearbeiten"
	24	::msgcat::mcset de "Effects" "Effekte"
20	25	::msgcat::mcset de "Error: %1\$s" "Fehler: %1\$s"
21	26	::msgcat::mcset de "E&xit" "&Ende"
22	27	::msgcat::mcset de "&File" "&Datei"

29	34	::msgcat::mcset de "Fi&les:" "Dat&eien:"
30	35	::msgcat::mcset de "&Filter"
31	36	::msgcat::mcset de "Fil&ter:"
	37	::msgcat::mcset de "Font" "Schriftart"
	38	::msgcat::mcset de "&Font:" "Schriftart:"
	39	::msgcat::mcset de "Font st&yle:" "Schriftschnitt:"
32	40	::msgcat::mcset de "&Green" "&Gr\u00fcn"
33	41	::msgcat::mcset de "&Help" "&Hilfe"
34	42	::msgcat::mcset de "Hi" "Hallo"
35	43	::msgcat::mcset de "&Hide Console" "&Konsole unsichtbar machen"
36	44	::msgcat::mcset de "&Ignore" "&Ignorieren"
37	45	::msgcat::mcset de "Invalid file name \"%1\$s\"." "Ung\u00fcltiger Dateiname \"%1\$s\"."
	46	::msgcat::mcset de "Italic" "Kursiv"
38	47	::msgcat::mcset de "Log Files" "Protokolldatei"
39	48	::msgcat::mcset de "&No" "&Nein"
	49	::msgcat::mcset de "&OK"
40	50	::msgcat::mcset de "OK"
41	51	::msgcat::mcset de "Ok"
42	52	::msgcat::mcset de "Open" "\u00d6ffnen"
43	53	::msgcat::mcset de "&Open" "\u00d6&ffnen"
44		::msgcat::mcset de "Open Multiple Files"
	54	::msgcat::mcset de "Open Multiple Files" "Mehrere Dateien \u00F6ffnen"
45	55	::msgcat::mcset de "P&aste" "E&inf\u00fcgen"
46	56	::msgcat::mcset de "&Quit" "&Beenden"
47	57	::msgcat::mcset de "&Red" "&Rot"
	58	::msgcat::mcset de "Regular" "Standard"
48	59	::msgcat::mcset de "Replace existing file?" "Existierende Datei ersetzen?"
49	60	::msgcat::mcset de "&Retry" "&Wiederholen"
	61	::msgcat::mcset de "Sample" "Beispiel"
50	62	::msgcat::mcset de "&Save" "&Speichern"
51	63	::msgcat::mcset de "Save As" "Speichern unter"
52	64	::msgcat::mcset de "Save To Log" "In Protokoll speichern"
53	65	::msgcat::mcset de "Select Log File" "Protokolldatei ausw\u00e4hlen"
54	66	::msgcat::mcset de "Select a file to source" "Auszuf\u00fchrende Datei ausw\u00e4hlen"
55	67	::msgcat::mcset de "&Selection:" "Auswah&l:"
	68	::msgcat::mcset de "&Size:" "Schriftgrad:"
	69	::msgcat::mcset de "Show &Hidden Directories" "Zeige versteckte Dateien"
	70	::msgcat::mcset de "Show &Hidden Files and Directories" "Zeige versteckte Dateien und Verzeichnisse"
56	71	::msgcat::mcset de "Skip Messages" "Weitere Nachrichten \u00fcberspringen"
57	72	::msgcat::mcset de "&Source..." "&Ausf\u00fchren..."
	73	::msgcat::mcset de "Stri&keout" "&Durchgestrichen"
58	74	::msgcat::mcset de "Tcl Scripts" "Tcl-Skripte"
59	75	::msgcat::mcset de "Tcl for Windows" "Tcl f\u00fcr Windows"
60	76	::msgcat::mcset de "Text Files" "Textdateien"
	77	::msgcat::mcset de "&Underline" "&Unterstrichen"
61	78	::msgcat::mcset de "&Yes" "&Ja"
62	79	::msgcat::mcset de "abort" "abbrechen"
63	80	::msgcat::mcset de "blue" "blau"

+15

-0

library/msgs/en.msg less more

2	2	::msgcat::mcset en "&About..."
3	3	::msgcat::mcset en "All Files"
4	4	::msgcat::mcset en "Application Error"
	5	::msgcat::mcset en "&Apply"
	6	::msgcat::mcset en "Bold"
	7	::msgcat::mcset en "Bold Italic"
5	8	::msgcat::mcset en "&Blue"
	9	::msgcat::mcset en "Cancel"
6	10	::msgcat::mcset en "&Cancel"
7	11	::msgcat::mcset en "Cannot change to the directory \"%1\$s\".\nPermission denied."
8	12	::msgcat::mcset en "Choose Directory"

17	21	::msgcat::mcset en "Directory \"%1\$s\" does not exist."
18	22	::msgcat::mcset en "&Directory:"
19	23	::msgcat::mcset en "&Edit"
	24	::msgcat::mcset en "Effects"
20	25	::msgcat::mcset en "Error: %1\$s"
21	26	::msgcat::mcset en "E&xit"
22	27	::msgcat::mcset en "&File"

29	34	::msgcat::mcset en "Fi&les:"
30	35	::msgcat::mcset en "&Filter"
31	36	::msgcat::mcset en "Fil&ter:"
	37	::msgcat::mcset en "Font"
	38	::msgcat::mcset en "&Font:"
	39	::msgcat::mcset en "Font st&yle:"
32	40	::msgcat::mcset en "&Green"
33	41	::msgcat::mcset en "&Help"
34	42	::msgcat::mcset en "Hi"
35	43	::msgcat::mcset en "&Hide Console"
36	44	::msgcat::mcset en "&Ignore"
37	45	::msgcat::mcset en "Invalid file name \"%1\$s\"."
	46	::msgcat::mcset en "Italic"
38	47	::msgcat::mcset en "Log Files"
39	48	::msgcat::mcset en "&No"
40	49	::msgcat::mcset en "&OK"
	50	::msgcat::mcset en "OK"
41	51	::msgcat::mcset en "Ok"
42	52	::msgcat::mcset en "Open"
43	53	::msgcat::mcset en "&Open"

45	55	::msgcat::mcset en "P&aste"
46	56	::msgcat::mcset en "&Quit"
47	57	::msgcat::mcset en "&Red"
	58	::msgcat::mcset en "Regular"
48	59	::msgcat::mcset en "Replace existing file?"
49	60	::msgcat::mcset en "&Retry"
	61	::msgcat::mcset en "Sample"
50	62	::msgcat::mcset en "&Save"
51	63	::msgcat::mcset en "Save As"
52	64	::msgcat::mcset en "Save To Log"
53	65	::msgcat::mcset en "Select Log File"
54	66	::msgcat::mcset en "Select a file to source"
55	67	::msgcat::mcset en "&Selection:"
	68	::msgcat::mcset en "&Size:"
56	69	::msgcat::mcset en "Show &Hidden Directories"
57	70	::msgcat::mcset en "Show &Hidden Files and Directories"
58	71	::msgcat::mcset en "Skip Messages"
59	72	::msgcat::mcset en "&Source..."
	73	::msgcat::mcset en "Stri&keout"
60	74	::msgcat::mcset en "Tcl Scripts"
61	75	::msgcat::mcset en "Tcl for Windows"
62	76	::msgcat::mcset en "Text Files"
	77	::msgcat::mcset en "&Underline"
63	78	::msgcat::mcset en "&Yes"
64	79	::msgcat::mcset en "abort"
65	80	::msgcat::mcset en "blue"

+1

-0

library/tclIndex less more

275	275	set auto_index(tk_getFileType) [list source [file join $dir xmfbox.tcl]]
276	276	set auto_index(::tk::unsupported::ExposePrivateCommand) [list source [file join $dir unsupported.tcl]]
277	277	set auto_index(::tk::unsupported::ExposePrivateVariable) [list source [file join $dir unsupported.tcl]]
	278	set auto_index(::tk::fontchooser) [list source [file join $dir fontchooser.tcl]]

+54

-38

library/text.tcl less more

2	2	# This file defines the default bindings for Tk text widgets and provides
3	3	# procedures that help in implementing the bindings.
4	4	#
5		# RCS: @(#) $Id: text.tcl,v 1.41 2006/09/10 17:06:32 das Exp $
	5	# RCS: @(#) $Id: text.tcl,v 1.42 2008/11/12 16:38:13 patthoyts Exp $
6	6	#
7	7	# Copyright (c) 1992-1994 The Regents of the University of California.
8	8	# Copyright (c) 1994-1997 Sun Microsystems, Inc.

32	32	# char, word, or line.
33	33	# x, y - Last known mouse coordinates for scanning
34	34	# and auto-scanning.
	35	#
35	36	#-------------------------------------------------------------------------
36	37
37	38	#-------------------------------------------------------------------------

223	224	}
224	225
225	226	bind Text <Control-space> {
226		%W mark set tk::anchor%W insert
	227	%W mark set [tk::TextAnchor %W] insert
227	228	}
228	229	bind Text <Select> {
229		%W mark set tk::anchor%W insert
	230	%W mark set [tk::TextAnchor %W] insert
230	231	}
231	232	bind Text <Control-Shift-space> {
232	233	set tk::Priv(selectMode) char

526	527	set Priv(selectMode) char
527	528	set Priv(mouseMoved) 0
528	529	set Priv(pressX) $x
	530	set anchorname [tk::TextAnchor $w]
529	531	$w mark set insert [TextClosestGap $w $x $y]
530		$w mark set tk::anchor$w insert
	532	$w mark set $anchorname insert
531	533	# Set the anchor mark's gravity depending on the click position
532	534	# relative to the gap
533		set bbox [$w bbox [$w index tk::anchor$w]]
	535	set bbox [$w bbox [$w index $anchorname]]
534	536	if {$x > [lindex $bbox 0]} {
535		$w mark gravity tk::anchor$w right
	537	$w mark gravity $anchorname right
536	538	} else {
537		$w mark gravity tk::anchor$w left
	539	$w mark gravity $anchorname left
538	540	}
539	541	# Allow focus in any case on Windows, because that will let the
540	542	# selection be displayed even for state disabled text widgets.

564	566	# x - Mouse x position.
565	567	# y - Mouse y position.
566	568
	569	set ::tk::Priv(textanchoruid) 0
	570
	571	proc ::tk::TextAnchor {w} {
	572	variable Priv
	573	if {![info exists Priv(textanchor,$w)]} {
	574	set Priv(textanchor,$w) tk::anchor[incr Priv(textanchoruid)]
	575	}
	576	return $Priv(textanchor,$w)
	577	}
	578
567	579	proc ::tk::TextSelectTo {w x y {extend 0}} {
568	580	global tcl_platform
569	581	variable ::tk::Priv
570	582
	583	set anchorname [tk::TextAnchor $w]
571	584	set cur [TextClosestGap $w $x $y]
572		if {[catch {$w index tk::anchor$w}]} {
573		$w mark set tk::anchor$w $cur
574		}
575		set anchor [$w index tk::anchor$w]
	585	if {[catch {$w index $anchorname}]} {
	586	$w mark set $anchorname $cur
	587	}
	588	set anchor [$w index $anchorname]
576	589	if {[$w compare $cur != $anchor] \|\| (abs($Priv(pressX) - $x) >= 3)} {
577	590	set Priv(mouseMoved) 1
578	591	}
579	592	switch -- $Priv(selectMode) {
580	593	char {
581		if {[$w compare $cur < tk::anchor$w]} {
	594	if {[$w compare $cur < $anchorname]} {
582	595	set first $cur
583		set last tk::anchor$w
	596	set last $anchorname
584	597	} else {
585		set first tk::anchor$w
	598	set first $anchorname
586	599	set last $cur
587	600	}
588	601	}
589	602	word {
590	603	# Set initial range based only on the anchor (1 char min width)
591		if {[$w mark gravity tk::anchor$w] eq "right"} {
592		set first "tk::anchor$w"
593		set last "tk::anchor$w + 1c"
	604	if {[$w mark gravity $anchorname] eq "right"} {
	605	set first $anchorname
	606	set last "$anchorname + 1c"
594	607	} else {
595		set first "tk::anchor$w - 1c"
596		set last "tk::anchor$w"
	608	set first "$anchorname - 1c"
	609	set last $anchorname
597	610	}
598	611	# Extend range (if necessary) based on the current point
599	612	if {[$w compare $cur < $first]} {

608	621	}
609	622	line {
610	623	# Set initial range based only on the anchor
611		set first "tk::anchor$w linestart"
612		set last "tk::anchor$w lineend"
	624	set first "$anchorname linestart"
	625	set last "$anchorname lineend"
613	626
614	627	# Extend range (if necessary) based on the current point
615	628	if {[$w compare $cur < $first]} {

641	654
642	655	proc ::tk::TextKeyExtend {w index} {
643	656
	657	set anchorname [tk::TextAnchor $w]
644	658	set cur [$w index $index]
645		if {[catch {$w index tk::anchor$w}]} {
646		$w mark set tk::anchor$w $cur
647		}
648		set anchor [$w index tk::anchor$w]
649		if {[$w compare $cur < tk::anchor$w]} {
	659	if {[catch {$w index $anchorname}]} {
	660	$w mark set $anchorname $cur
	661	}
	662	set anchor [$w index $anchorname]
	663	if {[$w compare $cur < $anchorname]} {
650	664	set first $cur
651		set last tk::anchor$w
	665	set last $anchorname
652	666	} else {
653		set first tk::anchor$w
	667	set first $anchorname
654	668	set last $cur
655	669	}
656	670	$w tag remove sel 0.0 $first

751	765
752	766	proc ::tk::TextKeySelect {w new} {
753	767
	768	set anchorname [tk::TextAnchor $w]
754	769	if {[$w tag nextrange sel 1.0 end] eq ""} {
755	770	if {[$w compare $new < insert]} {
756	771	$w tag add sel $new insert
757	772	} else {
758	773	$w tag add sel insert $new
759	774	}
760		$w mark set tk::anchor$w insert
	775	$w mark set $anchorname insert
761	776	} else {
762		if {[$w compare $new < tk::anchor$w]} {
	777	if {[$w compare $new < $anchorname]} {
763	778	set first $new
764		set last tk::anchor$w
	779	set last $anchorname
765	780	} else {
766		set first tk::anchor$w
	781	set first $anchorname
767	782	set last $new
768	783	}
769	784	$w tag remove sel 1.0 $first

797	812	# the two clicks will be selected. [Bug: 5929].
798	813	return
799	814	}
	815	set anchorname [tk::TextAnchor $w]
800	816	set a [$w index $index]
801	817	set b [$w index sel.first]
802	818	set c [$w index sel.last]
803	819	if {[$w compare $a < $b]} {
804		$w mark set tk::anchor$w sel.last
	820	$w mark set $anchorname sel.last
805	821	return
806	822	}
807	823	if {[$w compare $a > $c]} {
808		$w mark set tk::anchor$w sel.first
	824	$w mark set $anchorname sel.first
809	825	return
810	826	}
811	827	scan $a "%d.%d" lineA chA

817	833	return
818	834	}
819	835	if {[string length [$w get $b $a]] < ($total/2)} {
820		$w mark set tk::anchor$w sel.last
	836	$w mark set $anchorname sel.last
821	837	} else {
822		$w mark set tk::anchor$w sel.first
	838	$w mark set $anchorname sel.first
823	839	}
824	840	return
825	841	}
826	842	if {($lineA-$lineB) < ($lineC-$lineA)} {
827		$w mark set tk::anchor$w sel.last
	843	$w mark set $anchorname sel.last
828	844	} else {
829		$w mark set tk::anchor$w sel.first
	845	$w mark set $anchorname sel.first
830	846	}
831	847	}
832	848

+2

-2

library/tk.tcl less more

2	2	# Initialization script normally executed in the interpreter for each
3	3	# Tk-based application. Arranges class bindings for widgets.
4	4	#
5		# RCS: @(#) $Id: tk.tcl,v 1.79 2008/08/28 16:29:34 dgp Exp $
	5	# RCS: @(#) $Id: tk.tcl,v 1.81 2008/12/19 14:32:25 dgp Exp $
6	6	#
7	7	# Copyright (c) 1992-1994 The Regents of the University of California.
8	8	# Copyright (c) 1994-1996 Sun Microsystems, Inc.

14	14	# Insist on running with compatible version of Tcl
15	15	package require Tcl 8.6
16	16	# Verify that we have Tk binary and script components from the same release
17		package require -exact Tk 8.6a3
	17	package require -exact Tk 8.6b1
18	18
19	19	# Create a ::tk namespace
20	20	namespace eval ::tk {

+1

-3

library/tkfbox.tcl less more

10	10	# files by clicking on the file icons or by entering a filename
11	11	# in the "Filename:" entry.
12	12	#
13		# RCS: @(#) $Id: tkfbox.tcl,v 1.69 2008/08/25 17:13:04 tmh Exp $
	13	# RCS: @(#) $Id: tkfbox.tcl,v 1.70 2008/12/11 18:13:08 jenglish Exp $
14	14	#
15	15	# Copyright (c) 1994-1998 Sun Microsystems, Inc.
16	16	#
17	17	# See the file "license.terms" for information on usage and redistribution
18	18	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
19	19	#
20
21		package require Ttk
22	20
23	21	#----------------------------------------------------------------------
24	22	#

+8

-1

library/ttk/altTheme.tcl less more

0	0	#
1		# $Id: altTheme.tcl,v 1.7 2008/05/23 20:20:05 jenglish Exp $
	1	# $Id: altTheme.tcl,v 1.9 2008/11/29 00:43:48 patthoyts Exp $
2	2	#
3	3	# Ttk widget set: Alternate theme
4	4	#

58	58	ttk::style configure TCombobox -padding 1
59	59	ttk::style map TCombobox -fieldbackground \
60	60	[list readonly $colors(-frame) disabled $colors(-frame)]
	61	ttk::style configure ComboboxPopdownFrame \
	62	-relief solid -borderwidth 1
	63
	64	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
	65	ttk::style map TSpinbox -fieldbackground \
	66	[list readonly $colors(-frame) disabled $colors(-frame)] \
	67	-arrowcolor [list disabled $colors(-disabledfg)]
61	68
62	69	ttk::style configure Toolbutton -relief flat -padding 2
63	70	ttk::style map Toolbutton -relief \

+8

-1

library/ttk/clamTheme.tcl less more

0	0	#
1		# $Id: clamTheme.tcl,v 1.7 2008/05/23 20:20:06 jenglish Exp $
	1	# $Id: clamTheme.tcl,v 1.10 2008/12/07 18:42:55 jenglish Exp $
2	2	#
3	3	# "Clam" theme.
4	4	#

104	104	readonly $colors(-frame)] \
105	105	-foreground [list {readonly focus} $colors(-selectfg)] \
106	106	;
	107	ttk::style configure ComboboxPopdownFrame \
	108	-relief solid -borderwidth 1
	109
	110	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
	111	ttk::style map TSpinbox \
	112	-background [list readonly $colors(-frame)] \
	113	-arrowcolor [list disabled $colors(-disabledfg)]
107	114
108	115	ttk::style configure TNotebook.Tab -padding {6 2 6 2}
109	116	ttk::style map TNotebook.Tab \

+7

-1

library/ttk/classicTheme.tcl less more

0	0	#
1		# $Id: classicTheme.tcl,v 1.7 2008/05/23 20:20:06 jenglish Exp $
	1	# $Id: classicTheme.tcl,v 1.9 2008/11/29 00:43:48 patthoyts Exp $
2	2	#
3	3	# "classic" Tk theme.
4	4	#

69	69	ttk::style configure TCombobox -padding 1
70	70	ttk::style map TCombobox -fieldbackground \
71	71	[list readonly $colors(-frame) disabled $colors(-frame)]
	72	ttk::style configure ComboboxPopdownFrame \
	73	-relief solid -borderwidth 1
	74
	75	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
	76	ttk::style map TSpinbox -fieldbackground \
	77	[list readonly $colors(-frame) disabled $colors(-frame)]
72	78
73	79	ttk::style configure TLabelframe -borderwidth 2 -relief groove
74	80

+34

-18

library/ttk/combobox.tcl less more

0	0	#
1		# $Id: combobox.tcl,v 1.12 2008/02/23 18:41:07 jenglish Exp $
	1	# $Id: combobox.tcl,v 1.18 2008/12/07 21:24:12 jenglish Exp $
2	2	#
3	3	# Combobox bindings.
4		#
5		# Each combobox $cb has a child $cb.popdown, which contains
6		# a listbox $cb.popdown.l and a scrollbar. The listbox -listvariable
7		# is set to a namespace variable, which is used to synchronize the
8		# combobox values with the listbox values.
9	4	#
10	5	# <<NOTE-WM-TRANSIENT>>:
11	6	#

59	54	bind TCombobox <Double-ButtonPress-1> { ttk::combobox::Press "2" %W %x %y }
60	55	bind TCombobox <Triple-ButtonPress-1> { ttk::combobox::Press "3" %W %x %y }
61	56	bind TCombobox <B1-Motion> { ttk::combobox::Drag %W %x }
62
63		bind TCombobox <MouseWheel> { ttk::combobox::Scroll %W [expr {%D/-120}] }
64		if {[tk windowingsystem] eq "x11"} {
65		bind TCombobox <ButtonPress-4> { ttk::combobox::Scroll %W -1 }
66		bind TCombobox <ButtonPress-5> { ttk::combobox::Scroll %W 1 }
67		}
	57	bind TCombobox <Motion> { ttk::combobox::Motion %W %x %y }
	58
	59	ttk::bindMouseWheel TCombobox [list ttk::combobox::Scroll %W]
68	60
69	61	bind TCombobox <<TraverseIn>> { ttk::combobox::TraverseIn %W }
70	62

151	143	}
152	144	}
153	145
	146	## Motion --
	147	# Set cursor.
	148	#
	149	proc ttk::combobox::Motion {w x y} {
	150	if { [$w identify $x $y] eq "textarea"
	151	&& [$w instate {!readonly !disabled}]
	152	} {
	153	ttk::setCursor $w text
	154	} else {
	155	ttk::setCursor $w ""
	156	}
	157	}
	158
154	159	## TraverseIn -- receive focus due to keyboard navigation
155	160	# For editable comboboxes, set the selection and insert cursor.
156	161	#

264	269	variable scrollbar
265	270
266	271	if {![winfo exists $cb.popdown]} {
267		set popdown [PopdownToplevel $cb.popdown]
	272	set poplevel [PopdownToplevel $cb.popdown]
	273
	274	set popdown [ttk::frame $poplevel.f -style ComboboxPopdownFrame]
268	275
269	276	$scrollbar $popdown.sb \
270	277	-orient vertical -command [list $popdown.l yview]

279	286	bindtags $popdown.l \
280	287	[list $popdown.l ComboboxListbox Listbox $popdown all]
281	288
282		grid $popdown.l $popdown.sb -sticky news
	289	grid $popdown.l -row 0 -column 0 -padx {1 0} -pady 1 -sticky nsew
	290	grid $popdown.sb -row 0 -column 1 -padx {0 1} -pady 1 -sticky ns
283	291	grid columnconfigure $popdown 0 -weight 1
284	292	grid rowconfigure $popdown 0 -weight 1
	293
	294	grid $popdown -sticky news -padx 0 -pady 0
	295	grid rowconfigure $poplevel 0 -weight 1
	296	grid columnconfigure $poplevel 0 -weight 1
285	297	}
286	298	return $cb.popdown
287	299	}

296	308	switch -- [tk windowingsystem] {
297	309	default -
298	310	x11 {
299		$w configure -relief solid -borderwidth 1
	311	$w configure -relief flat -borderwidth 0
300	312	wm overrideredirect $w true
301	313	}
302	314	win32 {
303		$w configure -relief solid -borderwidth 1
	315	$w configure -relief flat -borderwidth 0
304	316	wm overrideredirect $w true
	317	wm attributes $w -topmost 1
305	318	}
306	319	aqua {
307	320	$w configure -relief solid -borderwidth 0

320	333	proc ttk::combobox::ConfigureListbox {cb} {
321	334	variable Values
322	335
323		set popdown [PopdownWindow $cb]
	336	set popdown [PopdownWindow $cb].f
324	337	set values [$cb cget -values]
325	338	set current [$cb current]
326	339	if {$current < 0} {

335	348	if {$height > [$cb cget -height]} {
336	349	set height [$cb cget -height]
337	350	grid $popdown.sb
	351	grid configure $popdown.l -padx {1 0}
338	352	} else {
339	353	grid remove $popdown.sb
	354	grid configure $popdown.l -padx 1
340	355	}
341	356	$popdown.l configure -height $height
342	357	}

390	405
391	406	# Post the listbox:
392	407	#
	408	wm attribute $popdown -topmost 1
393	409	wm deiconify $popdown
394	410	raise $popdown
395	411	}

408	424	# Return the combobox main widget that owns the listbox.
409	425	#
410	426	proc ttk::combobox::LBMaster {lb} {
411		winfo parent [winfo parent $lb]
	427	winfo parent [winfo parent [winfo parent $lb]]
412	428	}
413	429
414	430	## LBSelect $lb --

+168

-15

library/ttk/cursors.tcl less more

0	0	#
1		# $Id: cursors.tcl,v 1.1 2006/10/31 01:42:27 hobbs Exp $
	1	# $Id: cursors.tcl,v 1.2 2008/10/28 20:02:03 jenglish Exp $
2	2	#
3		# Ttk package: Symbolic cursor names.
	3	# Map symbolic cursor names to platform-appropriate cursors.
4	4	#
5		# @@@ TODO: Figure out appropriate platform-specific cursors
6		# for the various functions.
	5	# The following cursors are defined:
	6	#
	7	# standard -- default cursor for most controls
	8	# "" -- inherit cursor from parent window
	9	# none -- no cursor
	10	#
	11	# text -- editable widgets (entry, text)
	12	# link -- hyperlinks within text
	13	# crosshair -- graphic selection, fine control
	14	# busy -- operation in progress
	15	# forbidden -- action not allowed
	16	#
	17	# hresize -- horizontal resizing
	18	# vresize -- vertical resizing
	19	#
	20	# Also resize cursors for each of the compass points,
	21	# {nw,n,ne,w,e,sw,s,se}resize.
	22	#
	23	# Platform notes:
	24	#
	25	# Windows doesn't distinguish resizing at the 8 compass points,
	26	# only horizontal, vertical, and the two diagonals.
	27	#
	28	# OSX doesn't have resize cursors for nw, ne, sw, or se corners.
	29	# We use the Tk-defined X11 fallbacks for these.
	30	#
	31	# X11 doesn't have a "forbidden" cursor (usually a slashed circle);
	32	# "pirate" seems to be the conventional cursor for this purpose.
	33	#
	34	# Windows has an IDC_HELP cursor, but it's not available from Tk.
	35	#
	36	# Tk does not support "none" on Windows.
7	37	#
8	38
9	39	namespace eval ttk {
10	40
11	41	variable Cursors
12	42
13		switch -glob $::tcl_platform(platform) {
14		"windows" {
	43	# Use X11 cursor names as defaults, since Tk supplies these
	44	# on all platforms.
	45	#
	46	array set Cursors {
	47	"" ""
	48	none none
	49
	50	standard left_ptr
	51	text xterm
	52	link hand2
	53	crosshair crosshair
	54	busy watch
	55	forbidden pirate
	56
	57	hresize sb_h_double_arrow
	58	vresize sb_v_double_arrow
	59
	60	nresize top_side
	61	sresize bottom_side
	62	wresize left_side
	63	eresize right_side
	64	nwresize top_left_corner
	65	neresize top_right_corner
	66	swresize bottom_left_corner
	67	seresize bottom_right_corner
	68	move fleur
	69
	70	}
	71
	72	# Platform-specific overrides for Windows and OSX.
	73	#
	74	switch [tk windowingsystem] {
	75	"win32" {
15	76	array set Cursors {
16		hresize sb_h_double_arrow
17		vresize sb_v_double_arrow
	77	none {}
	78
	79	standard arrow
	80	text ibeam
	81	link hand2
	82	crosshair crosshair
	83	busy wait
	84	forbidden no
	85
	86	vresize size_ns
	87	nresize size_ns
	88	sresize size_ns
	89
	90	wresize size_we
	91	eresize size_we
	92	hresize size_we
	93
	94	nwresize size_nw_se
	95	swresize size_ne_sw
	96
	97	neresize size_ne_sw
18	98	seresize size_nw_se
19	99	}
20	100	}
21	101
22		"unix" -
23		* {
24		array set Cursors {
25		hresize sb_h_double_arrow
26		vresize sb_v_double_arrow
27		seresize bottom_right_corner
	102	"aqua" {
	103	if {[package vsatisfies [package provide Tk] 8.5]} {
	104	# appeared 2007-04-23, Tk 8.5a6
	105	array set Cursors {
	106	standard arrow
	107	text ibeam
	108	link pointinghand
	109	crosshair crosshair
	110	busy watch
	111	forbidden notallowed
	112
	113	hresize resizeleftright
	114	vresize resizeupdown
	115	nresize resizeup
	116	sresize resizedown
	117	wresize resizeleft
	118	eresize resizeright
	119	}
28	120	}
29	121	}
30
31	122	}
32	123	}
33	124
	125	## ttk::cursor $cursor --
	126	# Return platform-specific cursor for specified symbolic cursor.
	127	#
	128	proc ttk::cursor {name} {
	129	variable Cursors
	130	return $Cursors($name)
	131	}
	132
	133	## ttk::setCursor $w $cursor --
	134	# Set the cursor for specified window.
	135	#
	136	# [ttk::setCursor] should be used in <Motion> bindings
	137	# instead of directly calling [$w configure -cursor ...],
	138	# as the latter always incurs a server round-trip and
	139	# can lead to high CPU load (see [#1184746])
	140	#
	141
	142	proc ttk::setCursor {w name} {
	143	variable Cursors
	144	if {[$w cget -cursor] ne $Cursors($name)} {
	145	$w configure -cursor $Cursors($name)
	146	}
	147	}
	148
	149	## Interactive test harness:
	150	#
	151	proc ttk::CursorSampler {f} {
	152	ttk::frame $f
	153
	154	set r 0
	155	foreach row {
	156	{nwresize nresize neresize}
	157	{ wresize move eresize}
	158	{swresize sresize seresize}
	159	{text link crosshair}
	160	{hresize vresize ""}
	161	{busy forbidden ""}
	162	{none standard ""}
	163	} {
	164	set c 0
	165	foreach cursor $row {
	166	set w $f.${r}${c}
	167	ttk::label $w -text $cursor -cursor [ttk::cursor $cursor] \
	168	-relief solid -borderwidth 1 -padding 3
	169	grid $w -row $r -column $c -sticky nswe
	170	grid columnconfigure $f $c -uniform cols -weight 1
	171	incr c
	172	}
	173	grid rowconfigure $f $r -uniform rows -weight 1
	174	incr r
	175	}
	176
	177	return $f
	178	}
	179
	180	if {[info exists argv0] && $argv0 eq [info script]} {
	181	wm title . "[array size ::ttk::Cursors] cursors"
	182	pack [ttk::CursorSampler .f] -expand true -fill both
	183	bind . <KeyPress-Escape> [list destroy .]
	184	focus .f
	185	}
	186
34	187	#EOF

+13

-1

library/ttk/defaults.tcl less more

0	0	#
1		# $Id: defaults.tcl,v 1.7 2008/05/23 20:20:06 jenglish Exp $
	1	# $Id: defaults.tcl,v 1.9 2008/11/29 00:43:48 patthoyts Exp $
2	2	#
3	3	# Settings for default theme.
4	4	#

65	65	ttk::style map TCombobox -fieldbackground \
66	66	[list readonly $colors(-frame) disabled $colors(-frame)]
67	67
	68	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
	69	ttk::style map TSpinbox -fieldbackground \
	70	[list readonly $colors(-frame) disabled $colors(-frame)] \
	71	-arrowcolor [list disabled $colors(-disabledfg)]
	72
68	73	ttk::style configure TLabelframe \
69	74	-relief groove -borderwidth 2
70	75

93	98	-background [list selected $colors(-selectbg)] \
94	99	-foreground [list selected $colors(-selectfg)] ;
95	100
	101	# Combobox popdown frame
	102	ttk::style layout ComboboxPopdownFrame {
	103	ComboboxPopdownFrame.border -sticky nswe
	104	}
	105	ttk::style configure ComboboxPopdownFrame \
	106	-borderwidth 1 -relief solid
	107
96	108	#
97	109	# Toolbar buttons:
98	110	#

+6

-2

library/ttk/entry.tcl less more

0	0	#
1		# $Id: entry.tcl,v 1.4 2007/12/13 15:27:08 dgp Exp $
	1	# $Id: entry.tcl,v 1.6 2008/11/01 15:34:24 patthoyts Exp $
2	2	#
3	3	# DERIVED FROM: tk/library/entry.tcl r1.22
4	4	#

32	32	set State(deadband) 3 ;# #pixels for mouse-moved deadband.
33	33	}
34	34	}
	35
	36	### Option database settings.
	37	#
	38	option add *TEntry.cursor [ttk::cursor text]
35	39
36	40	### Bindings.
37	41	#

223	227	# position following the next end-of-word position.
224	228	#
225	229	set ::ttk::entry::State(startNext) \
226		[string equal $tcl_platform(platform) "windows"]
	230	[string equal $::tcl_platform(platform) "windows"]
227	231
228	232	proc ttk::entry::NextWord {w start} {
229	233	variable State

+7

-10

library/ttk/panedwindow.tcl less more

0	0	#
1		# $Id: panedwindow.tcl,v 1.5 2007/12/13 15:27:08 dgp Exp $
	1	# $Id: panedwindow.tcl,v 1.6 2008/10/28 20:02:03 jenglish Exp $
2	2	#
3	3	# Bindings for ttk::panedwindow widget.
4	4	#

25	25	bind TPanedwindow <Leave> { ttk::panedwindow::ResetCursor %W }
26	26	# See <<NOTE-PW-LEAVE-NOTIFYINFERIOR>>
27	27	bind TPanedwindow <<EnteredChild>> { ttk::panedwindow::ResetCursor %W }
28
29	28
30	29	## Sash movement:
31	30	#

65	64	proc ttk::panedwindow::ResetCursor {w} {
66	65	variable State
67	66	if {!$State(pressed)} {
68		$w configure -cursor {}
	67	ttk::setCursor $w {}
69	68	}
70	69	}
71	70
72	71	proc ttk::panedwindow::SetCursor {w x y} {
73		variable ::ttk::Cursors
74
75		if {![llength [$w identify $x $y]]} {
76		ResetCursor $w
77		} else {
	72	set cursor ""
	73	if {[llength [$w identify $x $y]]} {
78	74	# Assume we're over a sash.
79	75	switch -- [$w cget -orient] {
80		horizontal { $w configure -cursor $Cursors(hresize) }
81		vertical { $w configure -cursor $Cursors(vresize) }
	76	horizontal { set cursor hresize }
	77	vertical { set cursor vresize }
82	78	}
83	79	}
	80	ttk::setCursor $w $cursor
84	81	}
85	82
86	83	#EOF

+42

-6

library/ttk/scale.tcl less more

1	1	#
2	2	# Bindings for the TScale widget
3	3	#
4		# $Id: scale.tcl,v 1.1 2006/10/31 01:42:27 hobbs Exp $
	4	# $Id: scale.tcl,v 1.2 2008/10/17 12:29:25 patthoyts Exp $
5	5
6	6	namespace eval ttk::scale {
7	7	variable State

14	14	bind TScale <B1-Motion> { ttk::scale::Drag %W %x %y }
15	15	bind TScale <ButtonRelease-1> { ttk::scale::Release %W %x %y }
16	16
	17	bind TScale <ButtonPress-2> { ttk::scale::Jump %W %x %y }
	18	bind TScale <B2-Motion> { ttk::scale::Drag %W %x %y }
	19	bind TScale <ButtonRelease-2> { ttk::scale::Release %W %x %y }
	20
	21	bind TScale <ButtonPress-3> { ttk::scale::Jump %W %x %y }
	22	bind TScale <B3-Motion> { ttk::scale::Drag %W %x %y }
	23	bind TScale <ButtonRelease-3> { ttk::scale::Release %W %x %y }
	24
	25	bind TScale <Left> { ttk::scale::Increment %W -1 }
	26	bind TScale <Up> { ttk::scale::Increment %W -1 }
	27	bind TScale <Right> { ttk::scale::Increment %W 1 }
	28	bind TScale <Down> { ttk::scale::Increment %W 1 }
	29	bind TScale <Control-Left> { ttk::scale::Increment %W -10 }
	30	bind TScale <Control-Up> { ttk::scale::Increment %W -10 }
	31	bind TScale <Control-Right> { ttk::scale::Increment %W 10 }
	32	bind TScale <Control-Down> { ttk::scale::Increment %W 10 }
	33	bind TScale <Home> { %W set [%W cget -from] }
	34	bind TScale <End> { %W set [%W cget -to] }
	35
17	36	proc ttk::scale::Press {w x y} {
18	37	variable State
19	38	set State(dragging) 0

21	40	switch -glob -- [$w identify $x $y] {
22	41	*track -
23	42	*trough {
24		if {[$w get $x $y] <= [$w get]} {
25		ttk::Repeatedly Increment $w -1
26		} else {
27		ttk::Repeatedly Increment $w 1
28		}
	43	set inc [expr {([$w get $x $y] <= [$w get]) ? -1 : 1}]
	44	ttk::Repeatedly Increment $w $inc
29	45	}
30	46	*slider {
31	47	set State(dragging) 1
32	48	set State(initial) [$w get]
	49	}
	50	}
	51	}
	52
	53	# scale::Jump -- ButtonPress-2/3 binding for scale acts like
	54	# Press except that clicking in the trough jumps to the
	55	# clicked position.
	56	proc ttk::scale::Jump {w x y} {
	57	variable State
	58	set State(dragging) 0
	59
	60	switch -glob -- [$w identify $x $y] {
	61	*track -
	62	*trough {
	63	$w set [$w get $x $y]
	64	set State(dragging) 1
	65	set State(initial) [$w get]
	66	}
	67	*slider {
	68	Press $w $x $y
33	69	}
34	70	}
35	71	}

+11

-3

library/ttk/sizegrip.tcl less more

0	0	#
1		# $Id: sizegrip.tcl,v 1.2 2008/04/04 14:18:30 patthoyts Exp $
	1	# $Id: sizegrip.tcl,v 1.3 2008/10/28 20:02:03 jenglish Exp $
2	2	#
3		# Ttk widget set -- sizegrip widget bindings.
	3	# Sizegrip widget bindings.
4	4	#
5	5	# Dragging a sizegrip widget resizes the containing toplevel.
6	6	#
7	7	# NOTE: the sizegrip widget must be in the lower right hand corner.
8	8	#
9	9
10		option add *TSizegrip.cursor $::ttk::Cursors(seresize)
	10	switch -- [tk windowingsystem] {
	11	x11 -
	12	win32 {
	13	option add *TSizegrip.cursor [ttk::cursor seresize]
	14	}
	15	aqua {
	16	# Aqua sizegrips use default Arrow cursor.
	17	}
	18	}
11	19
12	20	namespace eval ttk::sizegrip {
13	21	variable State

+175

-0

library/ttk/spinbox.tcl less more

	0	#
	1	# $Id: spinbox.tcl,v 1.3 2008/12/07 21:24:12 jenglish Exp $
	2	#
	3	# ttk::spinbox bindings
	4	#
	5
	6	namespace eval ttk::spinbox { }
	7
	8	### Spinbox bindings.
	9	#
	10	# Duplicate the Entry bindings, override if needed:
	11	#
	12
	13	ttk::copyBindings TEntry TSpinbox
	14
	15	bind TSpinbox <Motion> { ttk::spinbox::Motion %W %x %y }
	16	bind TSpinbox <ButtonPress-1> { ttk::spinbox::Press %W %x %y }
	17	bind TSpinbox <ButtonRelease-1> { ttk::spinbox::Release %W }
	18	bind TSpinbox <Double-Button-1> { ttk::spinbox::DoubleClick %W %x %y }
	19	bind TSpinbox <Triple-Button-1> {} ;# disable TEntry triple-click
	20
	21	bind TSpinbox <KeyPress-Up> { event generate %W <<Increment>> }
	22	bind TSpinbox <KeyPress-Down> { event generate %W <<Decrement>> }
	23
	24	bind TSpinbox <<Increment>> { ttk::spinbox::Spin %W +1 }
	25	bind TSpinbox <<Decrement>> { ttk::spinbox::Spin %W -1 }
	26
	27	ttk::bindMouseWheel TSpinbox [list ttk::spinbox::MouseWheel %W]
	28
	29	## Motion --
	30	# Sets cursor.
	31	#
	32	proc ttk::spinbox::Motion {w x y} {
	33	if { [$w identify $x $y] eq "textarea"
	34	&& [$w instate {!readonly !disabled}]
	35	} {
	36	ttk::setCursor $w text
	37	} else {
	38	ttk::setCursor $w ""
	39	}
	40	}
	41
	42	## Press --
	43	#
	44	proc ttk::spinbox::Press {w x y} {
	45	if {[$w instate disabled]} { return }
	46	focus $w
	47	switch -glob -- [$w identify $x $y] {
	48	*textarea { ttk::entry::Press $w $x }
	49	*rightarrow -
	50	*uparrow { ttk::Repeatedly event generate $w <<Increment>> }
	51	*leftarrow -
	52	*downarrow { ttk::Repeatedly event generate $w <<Decrement>> }
	53	*spinbutton {
	54	if {$y * 2 >= [winfo height $w]} {
	55	set event <<Decrement>>
	56	} else {
	57	set event <<Increment>>
	58	}
	59	ttk::Repeatedly event generate $w $event
	60	}
	61	}
	62	}
	63
	64	## DoubleClick --
	65	# Select all if over the text area; otherwise same as Press.
	66	#
	67	proc ttk::spinbox::DoubleClick {w x y} {
	68	if {[$w instate disabled]} { return }
	69
	70	switch -glob -- [$w identify $x $y] {
	71	*textarea { SelectAll $w }
	72	* { Press $w $x $y }
	73	}
	74	}
	75
	76	proc ttk::spinbox::Release {w} {
	77	ttk::CancelRepeat
	78	}
	79
	80	## MouseWheel --
	81	# Mousewheel callback. Turn these into <<Increment>> (-1, up)
	82	# or <<Decrement> (+1, down) events.
	83	#
	84	proc ttk::spinbox::MouseWheel {w dir} {
	85	if {$dir < 0} {
	86	event generate $w <<Increment>>
	87	} else {
	88	event generate $w <<Decrement>>
	89	}
	90	}
	91
	92	## SelectAll --
	93	# Select widget contents.
	94	#
	95	proc ttk::spinbox::SelectAll {w} {
	96	$w selection range 0 end
	97	$w icursor end
	98	}
	99
	100	## Limit --
	101	# Limit $v to lie between $min and $max
	102	#
	103	proc ttk::spinbox::Limit {v min max} {
	104	if {$v < $min} { return $min }
	105	if {$v > $max} { return $max }
	106	return $v
	107	}
	108
	109	## Wrap --
	110	# Adjust $v to lie between $min and $max, wrapping if out of bounds.
	111	#
	112	proc ttk::spinbox::Wrap {v min max} {
	113	if {$v < $min} { return $max }
	114	if {$v > $max} { return $min }
	115	return $v
	116	}
	117
	118	## Adjust --
	119	# Limit or wrap spinbox value depending on -wrap.
	120	#
	121	proc ttk::spinbox::Adjust {w v min max} {
	122	if {[$w cget -wrap]} {
	123	return [Wrap $v $min $max]
	124	} else {
	125	return [Limit $v $min $max]
	126	}
	127	}
	128
	129	## Spin --
	130	# Handle <<Increment>> and <<Decrement>> events.
	131	# If -values is specified, cycle through the list.
	132	# Otherwise cycle through numeric range based on
	133	# -from, -to, and -increment.
	134	#
	135	proc ttk::spinbox::Spin {w dir} {
	136	set nvalues [llength [set values [$w cget -values]]]
	137	set value [$w get]
	138	if {$nvalues} {
	139	set current [lsearch -exact $values $value]
	140	set index [Adjust $w [expr {$current + $dir}] 0 [expr {$nvalues - 1}]]
	141	$w set [lindex $values $index]
	142	} else {
	143	if {[catch {
	144	set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
	145	}]} {
	146	set v [$w cget -from]
	147	}
	148	$w set [FormatValue $w [Adjust $w $v [$w cget -from] [$w cget -to]]]
	149	}
	150	SelectAll $w
	151	uplevel #0 [$w cget -command]
	152	}
	153
	154	## FormatValue --
	155	# Reformat numeric value based on -format.
	156	#
	157	proc ttk::spinbox::FormatValue {w val} {
	158	set fmt [$w cget -format]
	159	if {$fmt eq ""} {
	160	# Try to guess a suitable -format based on -increment.
	161	set delta [expr {abs([$w cget -increment])}]
	162	if {0 < $delta && $delta < 1} {
	163	# NB: This guesses wrong if -increment has more than 1
	164	# significant digit itself, e.g., -increment 0.25
	165	set nsd [expr {int(ceil(-log10($delta)))}]
	166	set fmt "%.${nsd}f"
	167	} else {
	168	set fmt "%.0f"
	169	}
	170	}
	171	return [format $fmt $val]
	172	}
	173
	174	#EOF

+3

-8

library/ttk/treeview.tcl less more

0		# $Id: treeview.tcl,v 1.6 2008/05/23 20:20:06 jenglish Exp $
	0	# $Id: treeview.tcl,v 1.7 2008/10/28 20:02:03 jenglish Exp $
1	1	#
2	2	# ttk::treeview widget bindings and utilities.
3	3	#

102	102	# Sets cursor, active element ...
103	103	#
104	104	proc ttk::treeview::Motion {w x y} {
105		variable ::ttk::Cursors
106		variable State
107
108	105	set cursor {}
109	106	set activeHeading {}
110	107
111	108	switch -- [$w identify region $x $y] {
112		separator { set cursor $Cursors(hresize) }
	109	separator { set cursor hresize }
113	110	heading { set activeHeading [$w identify column $x $y] }
114	111	}
115	112
116		if {[$w cget -cursor] ne $cursor} {
117		$w configure -cursor $cursor
118		}
	113	ttk::setCursor $w $cursor
119	114	ActivateHeading $w $activeHeading
120	115	}
121	116

+10

-7

library/ttk/ttk.tcl less more

0	0	#
1		# $Id: ttk.tcl,v 1.8 2007/12/13 15:27:08 dgp Exp $
	1	# $Id: ttk.tcl,v 1.10 2008/12/05 11:11:58 patthoyts Exp $
2	2	#
3	3	# Ttk widget set initialization script.
4	4	#

104	104	source [file join $::ttk::library panedwindow.tcl]
105	105	source [file join $::ttk::library entry.tcl]
106	106	source [file join $::ttk::library combobox.tcl] ;# dependency: entry.tcl
	107	source [file join $::ttk::library spinbox.tcl] ;# dependency: entry.tcl
107	108	source [file join $::ttk::library treeview.tcl]
108	109	source [file join $::ttk::library sizegrip.tcl]
109	110

122	123	uplevel #0 [list source [file join $library defaults.tcl]]
123	124
124	125	set builtinThemes [style theme names]
125		foreach {theme script} {
	126	foreach {theme scripts} {
126	127	classic classicTheme.tcl
127	128	alt altTheme.tcl
128	129	clam clamTheme.tcl
129	130	winnative winTheme.tcl
130		xpnative xpTheme.tcl
	131	xpnative {xpTheme.tcl vistaTheme.tcl}
131	132	aqua aquaTheme.tcl
132	133	} {
133	134	if {[lsearch -exact $builtinThemes $theme] >= 0} {
134		uplevel #0 [list source [file join $library $script]]
	135	foreach script $scripts {
	136	uplevel #0 [list source [file join $library $script]]
	137	}
135	138	}
136	139	}
137	140	}

149	152	#
150	153
151	154	proc ttk::DefaultTheme {} {
152		set preferred [list aqua xpnative winnative]
	155	set preferred [list aqua vista xpnative winnative]
153	156
154	157	set userTheme [option get . tkTheme TkTheme]
155		if {$userTheme != {} && ![catch {
	158	if {$userTheme ne {} && ![catch {
156	159	uplevel #0 [list package require ttk::theme::$userTheme]
157	160	}]} {
158	161	return $userTheme
159	162	}
160	163
161	164	foreach theme $preferred {
162		if {[package provide ttk::theme::$theme] != ""} {
	165	if {[package provide ttk::theme::$theme] ne ""} {
163	166	return $theme
164	167	}
165	168	}

+31

-5

library/ttk/utils.tcl less more

0	0	#
1		# $Id: utils.tcl,v 1.6 2008/01/06 19:16:12 jenglish Exp $
	1	# $Id: utils.tcl,v 1.7 2008/12/07 21:24:12 jenglish Exp $
2	2	#
3	3	# Utilities for widget implementations.
4	4	#

250	250	}
251	251	}
252	252
253		## Standard mousewheel bindings.
254		#
255		# Usage: [ttk::copyBindings TtkScrollable $bindtag]
256		# adds mousewheel support to a scrollable widget.
	253	### Mousewheel bindings.
257	254	#
258	255	# Platform inconsistencies:
259	256	#

275	272	# MouseWheel scrolling is accelerated on X11, which is conventional
276	273	# for Tk and appears to be conventional for other toolkits (although
277	274	# Gtk+ and Qt do not appear to use as large a factor).
	275	#
	276
	277	## ttk::bindMouseWheel $bindtag $command...
	278	# Adds basic mousewheel support to $bindtag.
	279	# $command will be passed one additional argument
	280	# specifying the mousewheel direction (-1: up, +1: down).
	281	#
	282
	283	proc ttk::bindMouseWheel {bindtag callback} {
	284	switch -- [tk windowingsystem] {
	285	x11 {
	286	bind $bindtag <ButtonPress-4> "$callback -1"
	287	bind $bindtag <ButtonPress-5> "$callback +1"
	288	}
	289	win32 {
	290	bind $bindtag <MouseWheel> [append callback { [expr {-(%D/120)}]}]
	291	}
	292	aqua {
	293	bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
	294	}
	295	}
	296	}
	297
	298	## Mousewheel bindings for standard scrollable widgets.
	299	#
	300	# Usage: [ttk::copyBindings TtkScrollable $bindtag]
	301	#
	302	# $bindtag should be for a widget that supports the
	303	# standard scrollbar protocol.
278	304	#
279	305
280	306	switch -- [tk windowingsystem] {

+204

-0

library/ttk/vistaTheme.tcl less more

	0	#
	1	# Settings for Microsoft Windows Vista and Server 2008
	2	#
	3
	4	# The Vista theme can only be defined on Windows Vista and above. The theme
	5	# is created in C due to the need to assign a theme-enabled function for
	6	# detecting when themeing is disabled. On systems that cannot support the
	7	# Vista theme, there will be no such theme created and we must not
	8	# evaluate this script.
	9
	10	if {"vista" ni [ttk::style theme names]} {
	11	return
	12	}
	13
	14	namespace eval ttk::theme::vista {
	15
	16	ttk::style theme settings vista {
	17
	18	ttk::style configure . \
	19	-background SystemButtonFace \
	20	-foreground SystemWindowText \
	21	-selectforeground SystemHighlightText \
	22	-selectbackground SystemHighlight \
	23	-font TkDefaultFont \
	24	;
	25
	26	ttk::style map "." \
	27	-foreground [list disabled SystemGrayText] \
	28	;
	29
	30	ttk::style configure TButton -anchor center -padding {1 1} -width -11
	31	ttk::style configure TRadiobutton -padding 2
	32	ttk::style configure TCheckbutton -padding 2
	33	ttk::style configure TMenubutton -padding {8 4}
	34
	35	ttk::style configure TNotebook -tabmargins {2 2 2 0}
	36	ttk::style map TNotebook.Tab \
	37	-expand [list selected {2 2 2 2}]
	38
	39	# Treeview:
	40	ttk::style configure Heading -font TkHeadingFont
	41	ttk::style configure Treeview -background SystemWindow
	42	ttk::style map Treeview \
	43	-background [list selected SystemHighlight] \
	44	-foreground [list selected SystemHighlightText] ;
	45
	46	# Label and Toolbutton
	47	ttk::style configure TLabelframe.Label -foreground "#0046d5"
	48
	49	ttk::style configure Toolbutton -padding {4 4}
	50
	51	# Combobox
	52	ttk::style configure TCombobox -padding 2
	53	ttk::style element create Combobox.field vsapi \
	54	COMBOBOX 2 {{} 1}
	55	ttk::style element create Combobox.border vsapi \
	56	COMBOBOX 4 {disabled 4 focus 3 active 2 hover 2 {} 1}
	57	ttk::style element create Combobox.rightdownarrow vsapi \
	58	COMBOBOX 6 {disabled 4 pressed 3 active 2 {} 1}
	59	ttk::style layout TCombobox {
	60	Combobox.border -sticky nswe -border 0 -children {
	61	Combobox.rightdownarrow -side right -sticky ns
	62	Combobox.padding -expand 1 -sticky nswe -children {
	63	Combobox.focus -expand 1 -sticky nswe -children {
	64	Combobox.textarea -sticky nswe
	65	}
	66	}
	67	}
	68	}
	69	# Vista.Combobox droplist frame
	70	ttk::style element create ComboboxPopdownFrame.background vsapi\
	71	LISTBOX 3 {disabled 4 active 3 focus 2 {} 1}
	72	ttk::style layout ComboboxPopdownFrame {
	73	ComboboxPopdownFrame.background -sticky news -border 1 -children {
	74	ComboboxPopdownFrame.padding -sticky news
	75	}
	76	}
	77	ttk::style map TCombobox \
	78	-selectbackground [list !focus SystemWindow] \
	79	-selectforeground [list !focus SystemWindowText] \
	80	-foreground [list {readonly focus} SystemHighlightText] \
	81	-focusfill [list {readonly focus} SystemHighlight] \
	82	;
	83
	84	# Entry
	85	ttk::style configure TEntry -padding {1 1 1 1} ;# Needs lookup
	86	ttk::style element create Entry.field vsapi \
	87	EDIT 6 {disabled 4 focus 3 hover 2 {} 1} -padding {2 2 2 2}
	88	ttk::style element create Entry.background vsapi \
	89	EDIT 3 {disabled 3 readonly 3 focus 4 hover 2 {} 1}
	90	ttk::style layout TEntry {
	91	Entry.field -sticky news -border 0 -children {
	92	Entry.background -sticky news -children {
	93	Entry.padding -sticky news -children {
	94	Entry.textarea -sticky news
	95	}
	96	}
	97	}
	98	}
	99	ttk::style map TEntry \
	100	-selectbackground [list !focus SystemWindow] \
	101	-selectforeground [list !focus SystemWindowText] \
	102	;
	103
	104	# Spinbox
	105	ttk::style configure TSpinbox -padding 0 ;#{2 0 15 1}
	106	ttk::style element create Spinbox.field vsapi \
	107	EDIT 9 {disabled 4 focus 3 hover 2 {} 1} -padding {1 1 1 2}
	108	ttk::style element create Spinbox.background vsapi \
	109	EDIT 3 {disabled 3 readonly 3 focus 4 hover 2 {} 1}
	110	ttk::style element create Spinbox.innerbg vsapi \
	111	EDIT 3 {disabled 3 readonly 3 focus 4 hover 2 {} 1}\
	112	-padding {2 0 15 1}
	113	ttk::style element create Spinbox.uparrow vsapi \
	114	SPIN 1 {disabled 4 pressed 3 active 2 {} 1} \
	115	-height 5 -width 8
	116	ttk::style element create Spinbox.downarrow vsapi \
	117	SPIN 2 {disabled 4 pressed 3 active 2 {} 1} \
	118	-height 5 -width 8
	119	ttk::style layout TSpinbox {
	120	Spinbox.field -sticky nswe -children {
	121	Spinbox.background -sticky news -children {
	122	Spinbox.padding -sticky news -children {
	123	Spinbox.innerbg -sticky news -children {
	124	Spinbox.textarea -expand 1 -sticky {}
	125	}
	126	}
	127	Spinbox.uparrow -side top -sticky ens
	128	Spinbox.downarrow -side bottom -sticky ens
	129	}
	130	}
	131	}
	132	ttk::style map TSpinbox \
	133	-selectbackground [list !focus SystemWindow] \
	134	-selectforeground [list !focus SystemWindowText] \
	135	;
	136
	137
	138	# SCROLLBAR elements (Vista includes a state for 'hover')
	139	ttk::style element create Vertical.Scrollbar.uparrow vsapi \
	140	SCROLLBAR 1 {disabled 4 pressed 3 active 2 hover 17 {} 1}
	141	ttk::style element create Vertical.Scrollbar.downarrow vsapi \
	142	SCROLLBAR 1 {disabled 8 pressed 7 active 6 hover 18 {} 5}
	143	ttk::style element create Vertical.Scrollbar.trough vsapi \
	144	SCROLLBAR 7 {disabled 4 pressed 3 active 2 hover 5 {} 1}
	145	ttk::style element create Vertical.Scrollbar.thumb vsapi \
	146	SCROLLBAR 3 {disabled 4 pressed 3 active 2 hover 5 {} 1}
	147	ttk::style element create Vertical.Scrollbar.grip vsapi \
	148	SCROLLBAR 9 {disabled 4 pressed 3 active 2 hover 5 {} 1}
	149	ttk::style element create Horizontal.Scrollbar.leftarrow vsapi \
	150	SCROLLBAR 1 {disabled 12 pressed 11 active 10 hover 19 {} 9}
	151	ttk::style element create Horizontal.Scrollbar.rightarrow vsapi \
	152	SCROLLBAR 1 {disabled 16 pressed 15 active 14 hover 20 {} 13}
	153	ttk::style element create Horizontal.Scrollbar.trough vsapi \
	154	SCROLLBAR 5 {disabled 4 pressed 3 active 2 hover 5 {} 1}
	155	ttk::style element create Horizontal.Scrollbar.thumb vsapi \
	156	SCROLLBAR 2 {disabled 4 pressed 3 active 2 hover 5 {} 1}
	157	ttk::style element create Horizontal.Scrollbar.grip vsapi \
	158	SCROLLBAR 8 {disabled 4 pressed 3 active 2 hover 5 {} 1}
	159
	160	# Progressbar
	161	ttk::style element create Horizontal.Progressbar.pbar vsapi \
	162	PROGRESS 3 {{} 1} -padding 8
	163	ttk::style layout Horizontal.TProgressbar {
	164	Horizontal.Progressbar.trough -sticky nswe -children {
	165	Horizontal.Progressbar.pbar -side left -sticky ns
	166	}
	167	}
	168	ttk::style element create Vertical.Progressbar.pbar vsapi \
	169	PROGRESS 3 {{} 1} -padding 8
	170	ttk::style layout Vertical.TProgressbar {
	171	Vertical.Progressbar.trough -sticky nswe -children {
	172	Vertical.Progressbar.pbar -side bottom -sticky we
	173	}
	174	}
	175
	176	# Scale
	177	ttk::style element create Horizontal.Scale.slider vsapi \
	178	TRACKBAR 3 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
	179	-width 6 -height 12
	180	ttk::style layout Horizontal.TScale {
	181	Scale.focus -expand 1 -sticky nswe -children {
	182	Horizontal.Scale.trough -expand 1 -sticky nswe -children {
	183	Horizontal.Scale.track -sticky we
	184	Horizontal.Scale.slider -side left -sticky {}
	185	}
	186	}
	187	}
	188	ttk::style element create Vertical.Scale.slider vsapi \
	189	TRACKBAR 6 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
	190	-width 12 -height 6
	191	ttk::style layout Vertical.TScale {
	192	Scale.focus -expand 1 -sticky nswe -children {
	193	Vertical.Scale.trough -expand 1 -sticky nswe -children {
	194	Vertical.Scale.track -sticky ns
	195	Vertical.Scale.slider -side top -sticky {}
	196	}
	197	}
	198	}
	199
	200
	201	package provide ttk::theme::vista 1.0
	202	}
	203	}⏎

+7

-1

library/ttk/winTheme.tcl less more

0	0	#
1		# $Id: winTheme.tcl,v 1.7 2008/05/23 20:20:06 jenglish Exp $
	1	# $Id: winTheme.tcl,v 1.9 2008/11/29 00:43:48 patthoyts Exp $
2	2	#
3	3	# Settings for 'winnative' theme.
4	4	#

44	44	-focusfill [list {readonly focus} SystemHighlight] \
45	45	;
46	46
	47	ttk::style element create ComboboxPopdownFrame.border from default
	48	ttk::style configure ComboboxPopdownFrame \
	49	-borderwidth 1 -relief solid
	50
	51	ttk::style configure TSpinbox -padding {2 0 16 0}
	52
47	53	ttk::style configure TLabelframe -borderwidth 2 -relief groove
48	54
49	55	ttk::style configure Toolbutton -relief flat -padding {8 4}

+7

-23

library/ttk/xpTheme.tcl less more

0	0	#
1		# $Id: xpTheme.tcl,v 1.9 2008/05/23 20:20:06 jenglish Exp $
	1	# $Id: xpTheme.tcl,v 1.12 2008/12/05 11:11:58 patthoyts Exp $
2	2	#
3	3	# Settings for 'xpnative' theme
4	4	#

51	51	-focusfill [list {readonly focus} SystemHighlight] \
52	52	;
53	53
	54	ttk::style configure TSpinbox -padding {2 0 14 0}
	55	ttk::style map TSpinbox \
	56	-selectbackground [list !focus SystemWindow] \
	57	-selectforeground [list !focus SystemWindowText] \
	58	;
	59
54	60	ttk::style configure Toolbutton -padding {4 4}
55	61
56		# Vista requires some style modifications. There are some
57		# additional or different elements in use.
58		if {[tk windowingsystem] eq "win32"
59		&& [info exists tcl_platform(osVersion)]
60		&& $tcl_platform(osVersion) >= 6.0} {
61
62		ttk::style element create Combobox.field vsapi \
63		COMBOBOX 2 {{} 1}
64		ttk::style element create Combobox.border vsapi \
65		COMBOBOX 4 {disabled 4 focus 3 active 2 {} 1}
66		ttk::style layout TCombobox {
67		Combobox.border -sticky nswe -border 0 -children {
68		Combobox.downarrow -side right -sticky ns
69		Combobox.padding -expand 1 -sticky nswe -children {
70		Combobox.focus -expand 1 -sticky nswe -children {
71		Combobox.textarea -sticky nswe
72		}
73		}
74		}
75		}
76
77		}
78	62	}
79	63	}

+2

-2

macosx/GNUmakefile less more

8	8	# See the file "license.terms" for information on usage and redistribution of
9	9	# this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	#
11		# RCS: @(#) $Id: GNUmakefile,v 1.11 2008/08/19 00:08:34 das Exp $
	11	# RCS: @(#) $Id: GNUmakefile,v 1.12 2008/10/23 12:20:16 das Exp $
12	12	#
13	13	########################################################################################################
14	14

130	130	override CONFIGURE_ARGS := ${CONFIGURE_ARGS} --enable-xft
131	131	VERSION := ${VERSION}-X11
132	132	wish := ${wish}-X11
133		override EMBEDDED_BUILD := 0
	133	override EMBEDDED_BUILD :=
134	134	endif
135	135
136	136	INSTALL_TARGETS = install-binaries install-libraries

+2

-2

macosx/Wish-Common.xcconfig less more

8	8	// See the file "license.terms" for information on usage and redistribution
9	9	// of this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	//
11		// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.11 2008/04/01 16:30:54 dgp Exp $
	11	// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.12 2008/11/14 13:01:39 das Exp $
12	12	//
13	13
14	14	HEADER_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TK_SRCROOT)/xlib "$(DERIVED_FILE_DIR)/tcl" "$(DERIVED_FILE_DIR)/tk" $(HEADER_SEARCH_PATHS)

26	26	GCC_VERSION = 4.0
27	27	CC = $(GCC)-$(GCC_VERSION)
28	28	LD = $(CC)
29		WARNING_CFLAGS_GCC3 = -Wall -Wno-implicit-int -Wno-unused-parameter -Wno-deprecated-declarations
	29	WARNING_CFLAGS_GCC3 = -Wall -Wno-unused-parameter -Wno-deprecated-declarations
30	30	WARNING_CFLAGS = -Wextra -Wno-missing-field-initializers -Winit-self -Wpointer-arith -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS_GCC3) $(WARNING_CFLAGS)
31	31	REZ_RESOURCE_MAP_READ_ONLY = YES
32	32	APPLICATION_INSTALL_PATH = /Applications/Utilities

+61

-5

macosx/Wish.xcode/project.pbxproj less more

7	7
8	8	/* Begin PBXBuildFile section */
9	9	F9067BCD0BFBA2900074F726 /* tkOldTest.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAFE08F27A39005CB29B / tkOldTest.c */; };
	10	F9152B090EAF8A5000CD5C7B /* tkBusy.c in Sources / = {isa = PBXBuildFile; fileRef = F9152B080EAF8A5000CD5C7B / tkBusy.c */; };
	11	F9152B0A0EAF8A5700CD5C7B /* tkBusy.c in Sources / = {isa = PBXBuildFile; fileRef = F9152B080EAF8A5000CD5C7B / tkBusy.c */; };
	12	F92EE8BF0E62F846001A6E80 /* tkImgPhInstance.c in Sources / = {isa = PBXBuildFile; fileRef = F92EE8BE0E62F846001A6E80 / tkImgPhInstance.c */; };
	13	F92EE8D30E62F939001A6E80 /* tkImgPhInstance.c in Sources / = {isa = PBXBuildFile; fileRef = F92EE8BE0E62F846001A6E80 / tkImgPhInstance.c */; };
10	14	F93599B30DF1F75400E04F67 /* tclOO.c in Sources / = {isa = PBXBuildFile; fileRef = F93599B20DF1F75400E04F67 / tclOO.c */; };
11	15	F93599B70DF1F76100E04F67 /* tclOOBasic.c in Sources / = {isa = PBXBuildFile; fileRef = F93599B60DF1F76100E04F67 / tclOOBasic.c */; };
12	16	F93599B90DF1F76600E04F67 /* tclOOCall.c in Sources / = {isa = PBXBuildFile; fileRef = F93599B80DF1F76600E04F67 / tclOOCall.c */; };

16	20	F93599C40DF1F78800E04F67 /* tclOOStubInit.c in Sources / = {isa = PBXBuildFile; fileRef = F93599C30DF1F78800E04F67 / tclOOStubInit.c */; };
17	21	F93599C60DF1F78D00E04F67 /* tclOOStubLib.c in Sources / = {isa = PBXBuildFile; fileRef = F93599C50DF1F78D00E04F67 / tclOOStubLib.c */; };
18	22	F95D77EA0DFD820D00A8BF6F /* tclIORTrans.c in Sources / = {isa = PBXBuildFile; fileRef = F95D77E90DFD820D00A8BF6F / tclIORTrans.c */; };
	23	F96437CA0EF0D4B2003F468E /* tclZlib.c in Sources / = {isa = PBXBuildFile; fileRef = F96437C90EF0D4B2003F468E / tclZlib.c */; };
	24	F96437CB0EF0D4B2003F468E /* tclZlib.c in Sources / = {isa = PBXBuildFile; fileRef = F96437C90EF0D4B2003F468E / tclZlib.c */; };
	25	F96437E70EF0D652003F468E /* libz.dylib in Frameworks / = {isa = PBXBuildFile; fileRef = F96437E60EF0D652003F468E / libz.dylib */; };
	26	F96437E80EF0D652003F468E /* libz.dylib in Frameworks / = {isa = PBXBuildFile; fileRef = F96437E60EF0D652003F468E / libz.dylib */; };
19	27	F966BDCF08F27A3F005CB29B /* tk3d.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAAC08F27A39005CB29B / tk3d.c */; };
20	28	F966BDD108F27A3F005CB29B /* tkArgv.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAAE08F27A39005CB29B / tkArgv.c */; };
21	29	F966BDD208F27A3F005CB29B /* tkAtom.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAAF08F27A39005CB29B / tkAtom.c */; };

614	622	8DD76FB20486AB0100D96B5E /* tktest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tktest; sourceTree = BUILT_PRODUCTS_DIR; };
615	623	F9099B8A0CC67D30005A9580 /* textpeer.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = textpeer.tcl; sourceTree = "<group>"; };
616	624	F9099B8B0CC67D3E005A9580 /* ttkbut.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = ttkbut.tcl; sourceTree = "<group>"; };
	625	F9152B080EAF8A5000CD5C7B /* tkBusy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkBusy.c; sourceTree = "<group>"; };
	626	F91543270EF201A90032D1E8 /* fontchoose.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fontchoose.tcl; sourceTree = "<group>"; };
	627	F915432A0EF201CF0032D1E8 /* zlib.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = zlib.test; sourceTree = "<group>"; };
	628	F915432D0EF201EE0032D1E8 /* zlib.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = zlib.n; sourceTree = "<group>"; };
	629	F9183E640EFC80CD0030B814 /* throw.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = throw.n; sourceTree = "<group>"; };
	630	F9183E650EFC80D70030B814 /* try.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = try.n; sourceTree = "<group>"; };
	631	F9183E6A0EFC81560030B814 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
	632	F9183E8F0EFC817B0030B814 /* tdbc */ = {isa = PBXFileReference; lastKnownFileType = folder; path = tdbc; sourceTree = "<group>"; };
	633	F91DC23C0E44C51B002CB8D1 /* nre.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = nre.test; sourceTree = "<group>"; };
	634	F91DC23D0E44C530002CB8D1 /* unsupported.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = unsupported.test; sourceTree = "<group>"; };
617	635	F91E62260C1AE686006C9D96 /* Tclsh-Info.plist.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Tclsh-Info.plist.in"; sourceTree = "<group>"; };
618	636	F92240290D7C620F005EC715 /* knightstour.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = knightstour.tcl; sourceTree = "<group>"; };
619	637	F92D7F100DE777240033A13A /* tsdPerf.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = tsdPerf.tcl; sourceTree = "<group>"; };
620	638	F92D7F140DE777670033A13A /* tsdPerf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tsdPerf.c; sourceTree = "<group>"; };
	639	F92EE8BE0E62F846001A6E80 /* tkImgPhInstance.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkImgPhInstance.c; sourceTree = "<group>"; };
621	640	F93599B20DF1F75400E04F67 /* tclOO.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclOO.c; sourceTree = "<group>"; };
622	641	F93599B40DF1F75900E04F67 /* tclOO.decls */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = tclOO.decls; sourceTree = "<group>"; };
623	642	F93599B50DF1F75D00E04F67 /* tclOO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclOO.h; sourceTree = "<group>"; };

650	669	F95D77E90DFD820D00A8BF6F /* tclIORTrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclIORTrans.c; sourceTree = "<group>"; };
651	670	F95FAFF90B34F1130072E431 /* macOSXLoad.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = macOSXLoad.test; sourceTree = "<group>"; };
652	671	F962F7C60DADC26200648DB8 /* vsapi.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = vsapi.test; sourceTree = "<group>"; };
	672	F96437C90EF0D4B2003F468E /* tclZlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclZlib.c; sourceTree = "<group>"; };
	673	F96437E60EF0D652003F468E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
653	674	F966BA0408F27A37005CB29B /* error.xbm */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = error.xbm; sourceTree = "<group>"; };
654	675	F966BA0508F27A37005CB29B /* gray12.xbm */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = gray12.xbm; sourceTree = "<group>"; };
655	676	F966BA0608F27A37005CB29B /* gray25.xbm */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = gray25.xbm; sourceTree = "<group>"; };

988	1009	F966BB8708F27A3A005CB29B /* optMenu.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = optMenu.tcl; sourceTree = "<group>"; };
989	1010	F966BB8808F27A3A005CB29B /* palette.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = palette.tcl; sourceTree = "<group>"; };
990	1011	F966BB8908F27A3B005CB29B /* panedwindow.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = panedwindow.tcl; sourceTree = "<group>"; };
991		F966BB8A08F27A3B005CB29B /* prolog.ps */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = prolog.ps; sourceTree = "<group>"; };
992	1012	F966BB8B08F27A3B005CB29B /* safetk.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = safetk.tcl; sourceTree = "<group>"; };
993	1013	F966BB8C08F27A3B005CB29B /* scale.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = scale.tcl; sourceTree = "<group>"; };
994	1014	F966BB8D08F27A3B005CB29B /* scrlbar.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = scrlbar.tcl; sourceTree = "<group>"; };

1096	1116	F966BC2F08F27A3C005CB29B /* get.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = get.test; sourceTree = "<group>"; };
1097	1117	F966BC3008F27A3C005CB29B /* grab.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = grab.test; sourceTree = "<group>"; };
1098	1118	F966BC3108F27A3C005CB29B /* grid.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = grid.test; sourceTree = "<group>"; };
1099		F966BC3208F27A3C005CB29B /* id.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = id.test; sourceTree = "<group>"; };
1100	1119	F966BC3308F27A3C005CB29B /* image.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = image.test; sourceTree = "<group>"; };
1101	1120	F966BC3408F27A3C005CB29B /* imgBmap.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = imgBmap.test; sourceTree = "<group>"; };
1102	1121	F966BC3508F27A3C005CB29B /* imgPhoto.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = imgPhoto.test; sourceTree = "<group>"; };

2071	2090	F96D449808F272BA004A47F5 /* tclWinThrd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclWinThrd.c; sourceTree = "<group>"; };
2072	2091	F96D449908F272BA004A47F5 /* tclWinThrd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclWinThrd.h; sourceTree = "<group>"; };
2073	2092	F96D449A08F272BA004A47F5 /* tclWinTime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclWinTime.c; sourceTree = "<group>"; };
	2093	F973E5960EE99384001A648E /* vistaTheme.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = vistaTheme.tcl; sourceTree = "<group>"; };
2074	2094	F976F6A70C325FB6005066D9 /* tkMacOSXPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkMacOSXPrivate.h; sourceTree = "<group>"; };
2075	2095	F97AE7F10B65C1E900310EA2 /* Wish-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Common.xcconfig"; sourceTree = "<group>"; };
2076	2096	F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Release.xcconfig"; sourceTree = "<group>"; };
2077	2097	F97AE8330B65C87F00310EA2 /* Wish-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Debug.xcconfig"; sourceTree = "<group>"; };
2078	2098	F9903CAF094FAADA004613E9 /* tclTomMath.decls */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = tclTomMath.decls; sourceTree = "<group>"; };
2079	2099	F9903CB0094FAADA004613E9 /* tclTomMathDecls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclTomMathDecls.h; sourceTree = "<group>"; };
	2100	F99388380EE0114B0065FE6B /* fontchooser.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fontchooser.tcl; sourceTree = "<group>"; };
	2101	F99388950EE02D980065FE6B /* fontchooser.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fontchooser.test; sourceTree = "<group>"; };
	2102	F99D61180EF5573A00BBFE01 /* TclZlib.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = TclZlib.3; sourceTree = "<group>"; };
2080	2103	F9A3082D08F2D4AB00BAE1AB /* Tk.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2081	2104	F9A3084B08F2D4CE00BAE1AB /* Wish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Wish.app; sourceTree = BUILT_PRODUCTS_DIR; };
2082	2105	F9A3084E08F2D4F400BAE1AB /* Tcl.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tcl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2083	2106	F9A493240CEBF38300B78AE2 /* chanio.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = chanio.test; sourceTree = "<group>"; };
	2107	F9C888C20EEF6571003F63AD /* fontchooser.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = fontchooser.n; sourceTree = "<group>"; };
2084	2108	F9D1360A0CDC252C00DBE0B5 /* mclist.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = mclist.tcl; sourceTree = "<group>"; };
2085	2109	F9ECB1120B26521500A28025 /* pkgIndex.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = pkgIndex.tcl; sourceTree = "<group>"; };
2086	2110	F9ECB1130B26521500A28025 /* platform.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = platform.tcl; sourceTree = "<group>"; };

2107	2131	buildActionMask = 2147483647;
2108	2132	files = (
2109	2133	F966C07508F2820D005CB29B /* CoreFoundation.framework in Frameworks */,
	2134	F96437E70EF0D652003F468E /* libz.dylib in Frameworks */,
2110	2135	F966C07708F2821B005CB29B /* Carbon.framework in Frameworks */,
2111	2136	F966C07908F28233005CB29B /* IOKit.framework in Frameworks */,
2112	2137	);

2117	2142	buildActionMask = 2147483647;
2118	2143	files = (
2119	2144	F9FD31E40CC1AD070073837D /* CoreFoundation.framework in Frameworks */,
	2145	F96437E80EF0D652003F468E /* libz.dylib in Frameworks */,
2120	2146	F9FD32170CC1AF170073837D /* libX11.dylib in Frameworks */,
2121	2147	F9FD32180CC1AF170073837D /* libXext.dylib in Frameworks */,
2122	2148	F9FD32190CC1AF170073837D /* libXss.dylib in Frameworks */,

2137	2163	F966C06F08F281DC005CB29B /* Frameworks */,
2138	2164	1AB674ADFE9D54B511CA2CBB /* Products */,
2139	2165	);
2140		comments = "Copyright (c) 2004-2008 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.25 2008/06/12 06:31:10 das Exp $\n";
	2166	comments = "Copyright (c) 2004-2008 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.26 2008/12/20 02:03:14 das Exp $\n";
2141	2167	name = Wish;
2142	2168	path = .;
2143	2169	sourceTree = SOURCE_ROOT;

2153	2179	);
2154	2180	includeInIndex = 0;
2155	2181	name = Products;
	2182	sourceTree = "<group>";
	2183	};
	2184	F9183E690EFC81560030B814 /* pkgs */ = {
	2185	isa = PBXGroup;
	2186	children = (
	2187	F9183E6A0EFC81560030B814 /* README */,
	2188	F9183E8F0EFC817B0030B814 /* tdbc */,
	2189	);
	2190	path = pkgs;
2156	2191	sourceTree = "<group>";
2157	2192	};
2158	2193	F966BA0308F27A37005CB29B /* bitmaps */ = {

2218	2253	F966BA3908F27A37005CB29B /* focus.n */,
2219	2254	F966BA3A08F27A37005CB29B /* focusNext.n */,
2220	2255	F966BA3B08F27A37005CB29B /* font.n */,
	2256	F9C888C20EEF6571003F63AD /* fontchooser.n */,
2221	2257	F966BA3C08F27A37005CB29B /* FontId.3 */,
2222	2258	F966BA3D08F27A37005CB29B /* frame.n */,
2223	2259	F966BA3E08F27A37005CB29B /* FreeXId.3 */,

2363	2399	F966BAAF08F27A39005CB29B /* tkAtom.c */,
2364	2400	F966BAB008F27A39005CB29B /* tkBind.c */,
2365	2401	F966BAB108F27A39005CB29B /* tkBitmap.c */,
	2402	F9152B080EAF8A5000CD5C7B /* tkBusy.c */,
2366	2403	F966BAB208F27A39005CB29B /* tkButton.c */,
2367	2404	F966BAB308F27A39005CB29B /* tkButton.h */,
2368	2405	F966BAB408F27A39005CB29B /* tkCanvArc.c */,

2402	2439	F966BAD708F27A39005CB29B /* tkImage.c */,
2403	2440	F966BAD808F27A39005CB29B /* tkImgBmap.c */,
2404	2441	F966BAD908F27A39005CB29B /* tkImgGIF.c */,
	2442	F92EE8BE0E62F846001A6E80 /* tkImgPhInstance.c */,
2405	2443	F966BADA08F27A39005CB29B /* tkImgPhoto.c */,
2406	2444	F966BADB08F27A39005CB29B /* tkImgPPM.c */,
2407	2445	F966BADC08F27A39005CB29B /* tkImgUtil.c */,

2474	2512	F966BB6208F27A3A005CB29B /* dialog.tcl */,
2475	2513	F966BB6308F27A3A005CB29B /* entry.tcl */,
2476	2514	F966BB6408F27A3A005CB29B /* focus.tcl */,
	2515	F99388380EE0114B0065FE6B /* fontchooser.tcl */,
2477	2516	F966BB7308F27A3A005CB29B /* listbox.tcl */,
2478	2517	F966BB7408F27A3A005CB29B /* menu.tcl */,
2479	2518	F966BB7508F27A3A005CB29B /* mkpsenc.tcl */,

2482	2521	F966BB8708F27A3A005CB29B /* optMenu.tcl */,
2483	2522	F966BB8808F27A3A005CB29B /* palette.tcl */,
2484	2523	F966BB8908F27A3B005CB29B /* panedwindow.tcl */,
2485		F966BB8A08F27A3B005CB29B /* prolog.ps */,
2486	2524	F966BB8B08F27A3B005CB29B /* safetk.tcl */,
2487	2525	F966BB8C08F27A3B005CB29B /* scale.tcl */,
2488	2526	F966BB8D08F27A3B005CB29B /* scrlbar.tcl */,

2522	2560	F966BB2C08F27A39005CB29B /* entry3.tcl */,
2523	2561	F966BB2D08F27A39005CB29B /* filebox.tcl */,
2524	2562	F966BB2E08F27A39005CB29B /* floor.tcl */,
	2563	F91543270EF201A90032D1E8 /* fontchoose.tcl */,
2525	2564	F966BB2F08F27A39005CB29B /* form.tcl */,
2526	2565	F966BB3008F27A39005CB29B /* goldberg.tcl */,
2527	2566	F966BB3108F27A39005CB29B /* hello */,

2679	2718	F966BC2A08F27A3C005CB29B /* focus.test */,
2680	2719	F966BC2B08F27A3C005CB29B /* focusTcl.test */,
2681	2720	F966BC2C08F27A3C005CB29B /* font.test */,
	2721	F99388950EE02D980065FE6B /* fontchooser.test */,
2682	2722	F966BC2D08F27A3C005CB29B /* frame.test */,
2683	2723	F966BC2E08F27A3C005CB29B /* geometry.test */,
2684	2724	F966BC2F08F27A3C005CB29B /* get.test */,
2685	2725	F966BC3008F27A3C005CB29B /* grab.test */,
2686	2726	F966BC3108F27A3C005CB29B /* grid.test */,
2687		F966BC3208F27A3C005CB29B /* id.test */,
2688	2727	F966BC3308F27A3C005CB29B /* image.test */,
2689	2728	F966BC3408F27A3C005CB29B /* imgBmap.test */,
2690	2729	F966BC3508F27A3C005CB29B /* imgPhoto.test */,

2891	2930	isa = PBXGroup;
2892	2931	children = (
2893	2932	F966C07408F2820D005CB29B /* CoreFoundation.framework */,
	2933	F96437E60EF0D652003F468E /* libz.dylib */,
2894	2934	F966C07608F2821B005CB29B /* Carbon.framework */,
2895	2935	F966C07808F28233005CB29B /* IOKit.framework */,
2896	2936	F9FD32140CC1AF170073837D /* libX11.dylib */,

2971	3011	F968884C0AF787B3000797B5 /* ttk.tcl */,
2972	3012	F968884D0AF787B3000797B5 /* utils.tcl */,
2973	3013	F968884E0AF787B3000797B5 /* winTheme.tcl */,
	3014	F973E5960EE99384001A648E /* vistaTheme.tcl */,
2974	3015	F968884F0AF787B3000797B5 /* xpTheme.tcl */,
2975	3016	);
2976	3017	path = ttk;

3010	3051	F96D434408F272B5004A47F5 /* tests */,
3011	3052	F96D3DFC08F272A4004A47F5 /* doc */,
3012	3053	F96D43D008F272B8004A47F5 /* tools */,
	3054	F9183E690EFC81560030B814 /* pkgs */,
3013	3055	F96D3DFA08F272A4004A47F5 /* ChangeLog */,
3014	3056	F96D3DFB08F272A4004A47F5 /* changes */,
3015	3057	F96D434308F272B5004A47F5 /* README */,

3229	3271	F96D3EAB08F272A7004A47F5 /* SubstObj.3 */,
3230	3272	F96D3EAC08F272A7004A47F5 /* switch.n */,
3231	3273	F96D3EAD08F272A7004A47F5 /* Tcl.n */,
	3274	F99D61180EF5573A00BBFE01 /* TclZlib.3 */,
3232	3275	F96D3EAE08F272A7004A47F5 /* Tcl_Main.3 */,
3233	3276	F96D3EAF08F272A7004A47F5 /* TCL_MEM_DEBUG.3 */,
3234	3277	F96D3EB008F272A7004A47F5 /* tclsh.1 */,

3236	3279	F96D3EB208F272A7004A47F5 /* tclvars.n */,
3237	3280	F96D3EB308F272A7004A47F5 /* tell.n */,
3238	3281	F96D3EB408F272A7004A47F5 /* Thread.3 */,
	3282	F9183E640EFC80CD0030B814 /* throw.n */,
3239	3283	F96D3EB508F272A7004A47F5 /* time.n */,
3240	3284	F96D3EB608F272A7004A47F5 /* tm.n */,
3241	3285	F96D3EB708F272A7004A47F5 /* ToUpper.3 */,

3243	3287	F96D3EB908F272A7004A47F5 /* TraceCmd.3 */,
3244	3288	F96D3EBA08F272A7004A47F5 /* TraceVar.3 */,
3245	3289	F96D3EBB08F272A7004A47F5 /* Translate.3 */,
	3290	F9183E650EFC80D70030B814 /* try.n */,
3246	3291	F96D3EBC08F272A7004A47F5 /* UniCharIsAlpha.3 */,
3247	3292	F96D3EBD08F272A7004A47F5 /* unknown.n */,
3248	3293	F96D3EBE08F272A7004A47F5 /* unload.n */,

3256	3301	F96D3EC608F272A7004A47F5 /* vwait.n */,
3257	3302	F96D3EC708F272A7004A47F5 /* while.n */,
3258	3303	F96D3EC808F272A7004A47F5 /* WrongNumArgs.3 */,
	3304	F915432D0EF201EE0032D1E8 /* zlib.n */,
3259	3305	);
3260	3306	path = doc;
3261	3307	sourceTree = "<group>";

3383	3429	F96D3F3408F272A7004A47F5 /* tclUtf.c */,
3384	3430	F96D3F3508F272A7004A47F5 /* tclUtil.c */,
3385	3431	F96D3F3608F272A7004A47F5 /* tclVar.c */,
	3432	F96437C90EF0D4B2003F468E /* tclZlib.c */,
3386	3433	F96D3F3708F272A7004A47F5 /* tommath.h */,
3387	3434	);
3388	3435	path = generic;

3706	3753	F96D439108F272B6004A47F5 /* namespace-old.test */,
3707	3754	F96D439208F272B7004A47F5 /* namespace.test */,
3708	3755	F96D439308F272B7004A47F5 /* notify.test */,
	3756	F91DC23C0E44C51B002CB8D1 /* nre.test */,
3709	3757	F96D439408F272B7004A47F5 /* obj.test */,
3710	3758	F93599C80DF1F81900E04F67 /* oo.test */,
3711	3759	F96D439508F272B7004A47F5 /* opt.test */,

3753	3801	F96D43BF08F272B7004A47F5 /* unixNotfy.test */,
3754	3802	F96D43C008F272B7004A47F5 /* unknown.test */,
3755	3803	F96D43C108F272B7004A47F5 /* unload.test */,
	3804	F91DC23D0E44C530002CB8D1 /* unsupported.test */,
3756	3805	F96D43C208F272B7004A47F5 /* uplevel.test */,
3757	3806	F96D43C308F272B7004A47F5 /* upvar.test */,
3758	3807	F96D43C408F272B7004A47F5 /* utf.test */,

3767	3816	F96D43CD08F272B7004A47F5 /* winNotify.test */,
3768	3817	F96D43CE08F272B7004A47F5 /* winPipe.test */,
3769	3818	F96D43CF08F272B7004A47F5 /* winTime.test */,
	3819	F915432A0EF201CF0032D1E8 /* zlib.test */,
3770	3820	);
3771	3821	path = tests;
3772	3822	sourceTree = "<group>";

4212	4262	F96D45D308F272BC004A47F5 /* tclUtf.c in Sources */,
4213	4263	F96D45D408F272BC004A47F5 /* tclUtil.c in Sources */,
4214	4264	F96D45D508F272BC004A47F5 /* tclVar.c in Sources */,
	4265	F96437CA0EF0D4B2003F468E /* tclZlib.c in Sources */,
4215	4266	F96D48E208F272C3004A47F5 /* bn_fast_s_mp_mul_digs.c in Sources */,
4216	4267	F96D48E408F272C3004A47F5 /* bn_fast_s_mp_sqr.c in Sources */,
4217	4268	F96D48E708F272C3004A47F5 /* bn_mp_add.c in Sources */,

4293	4344	F966BDD208F27A3F005CB29B /* tkAtom.c in Sources */,
4294	4345	F966BDD308F27A3F005CB29B /* tkBind.c in Sources */,
4295	4346	F966BDD408F27A3F005CB29B /* tkBitmap.c in Sources */,
	4347	F9152B090EAF8A5000CD5C7B /* tkBusy.c in Sources */,
4296	4348	F966BDD508F27A3F005CB29B /* tkButton.c in Sources */,
4297	4349	F966BDD708F27A3F005CB29B /* tkCanvArc.c in Sources */,
4298	4350	F966BDD808F27A3F005CB29B /* tkCanvas.c in Sources */,

4325	4377	F966BDFA08F27A3F005CB29B /* tkImage.c in Sources */,
4326	4378	F966BDFB08F27A3F005CB29B /* tkImgBmap.c in Sources */,
4327	4379	F966BDFC08F27A3F005CB29B /* tkImgGIF.c in Sources */,
	4380	F92EE8BF0E62F846001A6E80 /* tkImgPhInstance.c in Sources */,
4328	4381	F966BDFD08F27A3F005CB29B /* tkImgPhoto.c in Sources */,
4329	4382	F966BDFE08F27A3F005CB29B /* tkImgPPM.c in Sources */,
4330	4383	F966BE0708F27A3F005CB29B /* tkListbox.c in Sources */,

4522	4575	F9FD31000CC1AD070073837D /* tclUtf.c in Sources */,
4523	4576	F9FD31010CC1AD070073837D /* tclUtil.c in Sources */,
4524	4577	F9FD31020CC1AD070073837D /* tclVar.c in Sources */,
	4578	F96437CB0EF0D4B2003F468E /* tclZlib.c in Sources */,
4525	4579	F9FD31030CC1AD070073837D /* bn_fast_s_mp_mul_digs.c in Sources */,
4526	4580	F9FD31040CC1AD070073837D /* bn_fast_s_mp_sqr.c in Sources */,
4527	4581	F9FD31050CC1AD070073837D /* bn_mp_add.c in Sources */,

4603	4657	F9FD31510CC1AD070073837D /* tkAtom.c in Sources */,
4604	4658	F9FD31520CC1AD070073837D /* tkBind.c in Sources */,
4605	4659	F9FD31530CC1AD070073837D /* tkBitmap.c in Sources */,
	4660	F9152B0A0EAF8A5700CD5C7B /* tkBusy.c in Sources */,
4606	4661	F9FD31540CC1AD070073837D /* tkButton.c in Sources */,
4607	4662	F9FD31550CC1AD070073837D /* tkCanvArc.c in Sources */,
4608	4663	F9FD31560CC1AD070073837D /* tkCanvas.c in Sources */,

4635	4690	F9FD31710CC1AD070073837D /* tkImage.c in Sources */,
4636	4691	F9FD31720CC1AD070073837D /* tkImgBmap.c in Sources */,
4637	4692	F9FD31730CC1AD070073837D /* tkImgGIF.c in Sources */,
	4693	F92EE8D30E62F939001A6E80 /* tkImgPhInstance.c in Sources */,
4638	4694	F9FD31740CC1AD070073837D /* tkImgPhoto.c in Sources */,
4639	4695	F9FD31750CC1AD070073837D /* tkImgPPM.c in Sources */,
4640	4696	F9FD31760CC1AD070073837D /* tkListbox.c in Sources */,

+51

-3

macosx/Wish.xcodeproj/project.pbxproj less more

7	7
8	8	/* Begin PBXBuildFile section */
9	9	F9067BCD0BFBA2900074F726 /* tkOldTest.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAFE08F27A39005CB29B / tkOldTest.c */; };
	10	F9152B090EAF8A5000CD5C7B /* tkBusy.c in Sources / = {isa = PBXBuildFile; fileRef = F9152B080EAF8A5000CD5C7B / tkBusy.c */; };
	11	F9152B0A0EAF8A5700CD5C7B /* tkBusy.c in Sources / = {isa = PBXBuildFile; fileRef = F9152B080EAF8A5000CD5C7B / tkBusy.c */; };
10	12	F92EE8BF0E62F846001A6E80 /* tkImgPhInstance.c in Sources / = {isa = PBXBuildFile; fileRef = F92EE8BE0E62F846001A6E80 / tkImgPhInstance.c */; };
11	13	F92EE8D30E62F939001A6E80 /* tkImgPhInstance.c in Sources / = {isa = PBXBuildFile; fileRef = F92EE8BE0E62F846001A6E80 / tkImgPhInstance.c */; };
12	14	F93599B30DF1F75400E04F67 /* tclOO.c in Sources / = {isa = PBXBuildFile; fileRef = F93599B20DF1F75400E04F67 / tclOO.c */; };

18	20	F93599C40DF1F78800E04F67 /* tclOOStubInit.c in Sources / = {isa = PBXBuildFile; fileRef = F93599C30DF1F78800E04F67 / tclOOStubInit.c */; };
19	21	F93599C60DF1F78D00E04F67 /* tclOOStubLib.c in Sources / = {isa = PBXBuildFile; fileRef = F93599C50DF1F78D00E04F67 / tclOOStubLib.c */; };
20	22	F95D77EA0DFD820D00A8BF6F /* tclIORTrans.c in Sources / = {isa = PBXBuildFile; fileRef = F95D77E90DFD820D00A8BF6F / tclIORTrans.c */; };
	23	F96437CA0EF0D4B2003F468E /* tclZlib.c in Sources / = {isa = PBXBuildFile; fileRef = F96437C90EF0D4B2003F468E / tclZlib.c */; };
	24	F96437CB0EF0D4B2003F468E /* tclZlib.c in Sources / = {isa = PBXBuildFile; fileRef = F96437C90EF0D4B2003F468E / tclZlib.c */; };
	25	F96437E70EF0D652003F468E /* libz.dylib in Frameworks / = {isa = PBXBuildFile; fileRef = F96437E60EF0D652003F468E / libz.dylib */; };
	26	F96437E80EF0D652003F468E /* libz.dylib in Frameworks / = {isa = PBXBuildFile; fileRef = F96437E60EF0D652003F468E / libz.dylib */; };
21	27	F966BDCF08F27A3F005CB29B /* tk3d.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAAC08F27A39005CB29B / tk3d.c */; };
22	28	F966BDD108F27A3F005CB29B /* tkArgv.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAAE08F27A39005CB29B / tkArgv.c */; };
23	29	F966BDD208F27A3F005CB29B /* tkAtom.c in Sources / = {isa = PBXBuildFile; fileRef = F966BAAF08F27A39005CB29B / tkAtom.c */; };

618	624	8DD76FB20486AB0100D96B5E /* tktest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tktest; sourceTree = BUILT_PRODUCTS_DIR; };
619	625	F9099B8A0CC67D30005A9580 /* textpeer.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = textpeer.tcl; sourceTree = "<group>"; };
620	626	F9099B8B0CC67D3E005A9580 /* ttkbut.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = ttkbut.tcl; sourceTree = "<group>"; };
	627	F9152B080EAF8A5000CD5C7B /* tkBusy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkBusy.c; sourceTree = "<group>"; };
	628	F91543270EF201A90032D1E8 /* fontchoose.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fontchoose.tcl; sourceTree = "<group>"; };
	629	F915432A0EF201CF0032D1E8 /* zlib.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = zlib.test; sourceTree = "<group>"; };
	630	F915432D0EF201EE0032D1E8 /* zlib.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = zlib.n; sourceTree = "<group>"; };
	631	F9183E640EFC80CD0030B814 /* throw.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = throw.n; sourceTree = "<group>"; };
	632	F9183E650EFC80D70030B814 /* try.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = try.n; sourceTree = "<group>"; };
	633	F9183E6A0EFC81560030B814 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
	634	F9183E8F0EFC817B0030B814 /* tdbc */ = {isa = PBXFileReference; lastKnownFileType = folder; path = tdbc; sourceTree = "<group>"; };
621	635	F91DC23C0E44C51B002CB8D1 /* nre.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = nre.test; sourceTree = "<group>"; };
622	636	F91DC23D0E44C530002CB8D1 /* unsupported.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = unsupported.test; sourceTree = "<group>"; };
623	637	F91E62260C1AE686006C9D96 /* Tclsh-Info.plist.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Tclsh-Info.plist.in"; sourceTree = "<group>"; };

657	671	F95D77E90DFD820D00A8BF6F /* tclIORTrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclIORTrans.c; sourceTree = "<group>"; };
658	672	F95FAFF90B34F1130072E431 /* macOSXLoad.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = macOSXLoad.test; sourceTree = "<group>"; };
659	673	F962F7C60DADC26200648DB8 /* vsapi.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = vsapi.test; sourceTree = "<group>"; };
	674	F96437C90EF0D4B2003F468E /* tclZlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclZlib.c; sourceTree = "<group>"; };
	675	F96437E60EF0D652003F468E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
660	676	F966BA0408F27A37005CB29B /* error.xbm */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = error.xbm; sourceTree = "<group>"; };
661	677	F966BA0508F27A37005CB29B /* gray12.xbm */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = gray12.xbm; sourceTree = "<group>"; };
662	678	F966BA0608F27A37005CB29B /* gray25.xbm */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = gray25.xbm; sourceTree = "<group>"; };

995	1011	F966BB8708F27A3A005CB29B /* optMenu.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = optMenu.tcl; sourceTree = "<group>"; };
996	1012	F966BB8808F27A3A005CB29B /* palette.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = palette.tcl; sourceTree = "<group>"; };
997	1013	F966BB8908F27A3B005CB29B /* panedwindow.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = panedwindow.tcl; sourceTree = "<group>"; };
998		F966BB8A08F27A3B005CB29B /* prolog.ps */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = prolog.ps; sourceTree = "<group>"; };
999	1014	F966BB8B08F27A3B005CB29B /* safetk.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = safetk.tcl; sourceTree = "<group>"; };
1000	1015	F966BB8C08F27A3B005CB29B /* scale.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = scale.tcl; sourceTree = "<group>"; };
1001	1016	F966BB8D08F27A3B005CB29B /* scrlbar.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = scrlbar.tcl; sourceTree = "<group>"; };

2077	2092	F96D449808F272BA004A47F5 /* tclWinThrd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclWinThrd.c; sourceTree = "<group>"; };
2078	2093	F96D449908F272BA004A47F5 /* tclWinThrd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclWinThrd.h; sourceTree = "<group>"; };
2079	2094	F96D449A08F272BA004A47F5 /* tclWinTime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclWinTime.c; sourceTree = "<group>"; };
	2095	F973E5960EE99384001A648E /* vistaTheme.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = vistaTheme.tcl; sourceTree = "<group>"; };
2080	2096	F976F6A70C325FB6005066D9 /* tkMacOSXPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkMacOSXPrivate.h; sourceTree = "<group>"; };
2081	2097	F97AE7F10B65C1E900310EA2 /* Wish-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Common.xcconfig"; sourceTree = "<group>"; };
2082	2098	F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Release.xcconfig"; sourceTree = "<group>"; };
2083	2099	F97AE8330B65C87F00310EA2 /* Wish-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Debug.xcconfig"; sourceTree = "<group>"; };
2084	2100	F9903CAF094FAADA004613E9 /* tclTomMath.decls */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = tclTomMath.decls; sourceTree = "<group>"; };
2085	2101	F9903CB0094FAADA004613E9 /* tclTomMathDecls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclTomMathDecls.h; sourceTree = "<group>"; };
	2102	F99388380EE0114B0065FE6B /* fontchooser.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fontchooser.tcl; sourceTree = "<group>"; };
	2103	F99388950EE02D980065FE6B /* fontchooser.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fontchooser.test; sourceTree = "<group>"; };
	2104	F99D61180EF5573A00BBFE01 /* TclZlib.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = TclZlib.3; sourceTree = "<group>"; };
2086	2105	F9A3082D08F2D4AB00BAE1AB /* Tk.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2087	2106	F9A3084B08F2D4CE00BAE1AB /* Wish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Wish.app; sourceTree = BUILT_PRODUCTS_DIR; };
2088	2107	F9A3084E08F2D4F400BAE1AB /* Tcl.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tcl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2089	2108	F9A493240CEBF38300B78AE2 /* chanio.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = chanio.test; sourceTree = "<group>"; };
	2109	F9C888C20EEF6571003F63AD /* fontchooser.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = fontchooser.n; sourceTree = "<group>"; };
2090	2110	F9D1360A0CDC252C00DBE0B5 /* mclist.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = mclist.tcl; sourceTree = "<group>"; };
2091	2111	F9ECB1120B26521500A28025 /* pkgIndex.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = pkgIndex.tcl; sourceTree = "<group>"; };
2092	2112	F9ECB1130B26521500A28025 /* platform.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = platform.tcl; sourceTree = "<group>"; };

2114	2134	buildActionMask = 2147483647;
2115	2135	files = (
2116	2136	F966C07508F2820D005CB29B /* CoreFoundation.framework in Frameworks */,
	2137	F96437E70EF0D652003F468E /* libz.dylib in Frameworks */,
2117	2138	F966C07708F2821B005CB29B /* Carbon.framework in Frameworks */,
2118	2139	F966C07908F28233005CB29B /* IOKit.framework in Frameworks */,
2119	2140	);

2124	2145	buildActionMask = 2147483647;
2125	2146	files = (
2126	2147	F9FD31E40CC1AD070073837D /* CoreFoundation.framework in Frameworks */,
	2148	F96437E80EF0D652003F468E /* libz.dylib in Frameworks */,
2127	2149	F9FD32170CC1AF170073837D /* libX11.dylib in Frameworks */,
2128	2150	F9FD32180CC1AF170073837D /* libXext.dylib in Frameworks */,
2129	2151	F9FD32190CC1AF170073837D /* libXss.dylib in Frameworks */,

2144	2166	F966C06F08F281DC005CB29B /* Frameworks */,
2145	2167	1AB674ADFE9D54B511CA2CBB /* Products */,
2146	2168	);
2147		comments = "Copyright (c) 2004-2008 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.46 2008/08/25 14:33:50 das Exp $\n";
	2169	comments = "Copyright (c) 2004-2008 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.52 2008/12/20 01:57:22 das Exp $\n";
2148	2170	name = Wish;
2149	2171	path = .;
2150	2172	sourceTree = SOURCE_ROOT;

2160	2182	);
2161	2183	includeInIndex = 0;
2162	2184	name = Products;
	2185	sourceTree = "<group>";
	2186	};
	2187	F9183E690EFC81560030B814 /* pkgs */ = {
	2188	isa = PBXGroup;
	2189	children = (
	2190	F9183E6A0EFC81560030B814 /* README */,
	2191	F9183E8F0EFC817B0030B814 /* tdbc */,
	2192	);
	2193	path = pkgs;
2163	2194	sourceTree = "<group>";
2164	2195	};
2165	2196	F966BA0308F27A37005CB29B /* bitmaps */ = {

2225	2256	F966BA3908F27A37005CB29B /* focus.n */,
2226	2257	F966BA3A08F27A37005CB29B /* focusNext.n */,
2227	2258	F966BA3B08F27A37005CB29B /* font.n */,
	2259	F9C888C20EEF6571003F63AD /* fontchooser.n */,
2228	2260	F966BA3C08F27A37005CB29B /* FontId.3 */,
2229	2261	F966BA3D08F27A37005CB29B /* frame.n */,
2230	2262	F966BA3E08F27A37005CB29B /* FreeXId.3 */,

2370	2402	F966BAAF08F27A39005CB29B /* tkAtom.c */,
2371	2403	F966BAB008F27A39005CB29B /* tkBind.c */,
2372	2404	F966BAB108F27A39005CB29B /* tkBitmap.c */,
	2405	F9152B080EAF8A5000CD5C7B /* tkBusy.c */,
2373	2406	F966BAB208F27A39005CB29B /* tkButton.c */,
2374	2407	F966BAB308F27A39005CB29B /* tkButton.h */,
2375	2408	F966BAB408F27A39005CB29B /* tkCanvArc.c */,

2482	2515	F966BB6208F27A3A005CB29B /* dialog.tcl */,
2483	2516	F966BB6308F27A3A005CB29B /* entry.tcl */,
2484	2517	F966BB6408F27A3A005CB29B /* focus.tcl */,
	2518	F99388380EE0114B0065FE6B /* fontchooser.tcl */,
2485	2519	F966BB7308F27A3A005CB29B /* listbox.tcl */,
2486	2520	F966BB7408F27A3A005CB29B /* menu.tcl */,
2487	2521	F966BB7508F27A3A005CB29B /* mkpsenc.tcl */,

2490	2524	F966BB8708F27A3A005CB29B /* optMenu.tcl */,
2491	2525	F966BB8808F27A3A005CB29B /* palette.tcl */,
2492	2526	F966BB8908F27A3B005CB29B /* panedwindow.tcl */,
2493		F966BB8A08F27A3B005CB29B /* prolog.ps */,
2494	2527	F966BB8B08F27A3B005CB29B /* safetk.tcl */,
2495	2528	F966BB8C08F27A3B005CB29B /* scale.tcl */,
2496	2529	F966BB8D08F27A3B005CB29B /* scrlbar.tcl */,

2530	2563	F966BB2C08F27A39005CB29B /* entry3.tcl */,
2531	2564	F966BB2D08F27A39005CB29B /* filebox.tcl */,
2532	2565	F966BB2E08F27A39005CB29B /* floor.tcl */,
	2566	F91543270EF201A90032D1E8 /* fontchoose.tcl */,
2533	2567	F966BB2F08F27A39005CB29B /* form.tcl */,
2534	2568	F966BB3008F27A39005CB29B /* goldberg.tcl */,
2535	2569	F966BB3108F27A39005CB29B /* hello */,

2687	2721	F966BC2A08F27A3C005CB29B /* focus.test */,
2688	2722	F966BC2B08F27A3C005CB29B /* focusTcl.test */,
2689	2723	F966BC2C08F27A3C005CB29B /* font.test */,
	2724	F99388950EE02D980065FE6B /* fontchooser.test */,
2690	2725	F966BC2D08F27A3C005CB29B /* frame.test */,
2691	2726	F966BC2E08F27A3C005CB29B /* geometry.test */,
2692	2727	F966BC2F08F27A3C005CB29B /* get.test */,

2898	2933	isa = PBXGroup;
2899	2934	children = (
2900	2935	F966C07408F2820D005CB29B /* CoreFoundation.framework */,
	2936	F96437E60EF0D652003F468E /* libz.dylib */,
2901	2937	F966C07608F2821B005CB29B /* Carbon.framework */,
2902	2938	F966C07808F28233005CB29B /* IOKit.framework */,
2903	2939	F9FD32140CC1AF170073837D /* libX11.dylib */,

2978	3014	F968884C0AF787B3000797B5 /* ttk.tcl */,
2979	3015	F968884D0AF787B3000797B5 /* utils.tcl */,
2980	3016	F968884E0AF787B3000797B5 /* winTheme.tcl */,
	3017	F973E5960EE99384001A648E /* vistaTheme.tcl */,
2981	3018	F968884F0AF787B3000797B5 /* xpTheme.tcl */,
2982	3019	);
2983	3020	path = ttk;

3017	3054	F96D434408F272B5004A47F5 /* tests */,
3018	3055	F96D3DFC08F272A4004A47F5 /* doc */,
3019	3056	F96D43D008F272B8004A47F5 /* tools */,
	3057	F9183E690EFC81560030B814 /* pkgs */,
3020	3058	F96D3DFA08F272A4004A47F5 /* ChangeLog */,
3021	3059	F96D3DFB08F272A4004A47F5 /* changes */,
3022	3060	F96D434308F272B5004A47F5 /* README */,

3236	3274	F96D3EAB08F272A7004A47F5 /* SubstObj.3 */,
3237	3275	F96D3EAC08F272A7004A47F5 /* switch.n */,
3238	3276	F96D3EAD08F272A7004A47F5 /* Tcl.n */,
	3277	F99D61180EF5573A00BBFE01 /* TclZlib.3 */,
3239	3278	F96D3EAE08F272A7004A47F5 /* Tcl_Main.3 */,
3240	3279	F96D3EAF08F272A7004A47F5 /* TCL_MEM_DEBUG.3 */,
3241	3280	F96D3EB008F272A7004A47F5 /* tclsh.1 */,

3243	3282	F96D3EB208F272A7004A47F5 /* tclvars.n */,
3244	3283	F96D3EB308F272A7004A47F5 /* tell.n */,
3245	3284	F96D3EB408F272A7004A47F5 /* Thread.3 */,
	3285	F9183E640EFC80CD0030B814 /* throw.n */,
3246	3286	F96D3EB508F272A7004A47F5 /* time.n */,
3247	3287	F96D3EB608F272A7004A47F5 /* tm.n */,
3248	3288	F96D3EB708F272A7004A47F5 /* ToUpper.3 */,

3250	3290	F96D3EB908F272A7004A47F5 /* TraceCmd.3 */,
3251	3291	F96D3EBA08F272A7004A47F5 /* TraceVar.3 */,
3252	3292	F96D3EBB08F272A7004A47F5 /* Translate.3 */,
	3293	F9183E650EFC80D70030B814 /* try.n */,
3253	3294	F96D3EBC08F272A7004A47F5 /* UniCharIsAlpha.3 */,
3254	3295	F96D3EBD08F272A7004A47F5 /* unknown.n */,
3255	3296	F96D3EBE08F272A7004A47F5 /* unload.n */,

3263	3304	F96D3EC608F272A7004A47F5 /* vwait.n */,
3264	3305	F96D3EC708F272A7004A47F5 /* while.n */,
3265	3306	F96D3EC808F272A7004A47F5 /* WrongNumArgs.3 */,
	3307	F915432D0EF201EE0032D1E8 /* zlib.n */,
3266	3308	);
3267	3309	path = doc;
3268	3310	sourceTree = "<group>";

3391	3433	F96D3F3408F272A7004A47F5 /* tclUtf.c */,
3392	3434	F96D3F3508F272A7004A47F5 /* tclUtil.c */,
3393	3435	F96D3F3608F272A7004A47F5 /* tclVar.c */,
	3436	F96437C90EF0D4B2003F468E /* tclZlib.c */,
3394	3437	F96D3F3708F272A7004A47F5 /* tommath.h */,
3395	3438	);
3396	3439	path = generic;

3777	3820	F96D43CD08F272B7004A47F5 /* winNotify.test */,
3778	3821	F96D43CE08F272B7004A47F5 /* winPipe.test */,
3779	3822	F96D43CF08F272B7004A47F5 /* winTime.test */,
	3823	F915432A0EF201CF0032D1E8 /* zlib.test */,
3780	3824	);
3781	3825	path = tests;
3782	3826	sourceTree = "<group>";

4232	4276	F96D45D308F272BC004A47F5 /* tclUtf.c in Sources */,
4233	4277	F96D45D408F272BC004A47F5 /* tclUtil.c in Sources */,
4234	4278	F96D45D508F272BC004A47F5 /* tclVar.c in Sources */,
	4279	F96437CA0EF0D4B2003F468E /* tclZlib.c in Sources */,
4235	4280	F96D48E208F272C3004A47F5 /* bn_fast_s_mp_mul_digs.c in Sources */,
4236	4281	F96D48E408F272C3004A47F5 /* bn_fast_s_mp_sqr.c in Sources */,
4237	4282	F96D48E708F272C3004A47F5 /* bn_mp_add.c in Sources */,

4314	4359	F966BDD208F27A3F005CB29B /* tkAtom.c in Sources */,
4315	4360	F966BDD308F27A3F005CB29B /* tkBind.c in Sources */,
4316	4361	F966BDD408F27A3F005CB29B /* tkBitmap.c in Sources */,
	4362	F9152B090EAF8A5000CD5C7B /* tkBusy.c in Sources */,
4317	4363	F966BDD508F27A3F005CB29B /* tkButton.c in Sources */,
4318	4364	F966BDD708F27A3F005CB29B /* tkCanvArc.c in Sources */,
4319	4365	F966BDD808F27A3F005CB29B /* tkCanvas.c in Sources */,

4544	4590	F9FD31000CC1AD070073837D /* tclUtf.c in Sources */,
4545	4591	F9FD31010CC1AD070073837D /* tclUtil.c in Sources */,
4546	4592	F9FD31020CC1AD070073837D /* tclVar.c in Sources */,
	4593	F96437CB0EF0D4B2003F468E /* tclZlib.c in Sources */,
4547	4594	F9FD31030CC1AD070073837D /* bn_fast_s_mp_mul_digs.c in Sources */,
4548	4595	F9FD31040CC1AD070073837D /* bn_fast_s_mp_sqr.c in Sources */,
4549	4596	F9FD31050CC1AD070073837D /* bn_mp_add.c in Sources */,

4626	4673	F9FD31510CC1AD070073837D /* tkAtom.c in Sources */,
4627	4674	F9FD31520CC1AD070073837D /* tkBind.c in Sources */,
4628	4675	F9FD31530CC1AD070073837D /* tkBitmap.c in Sources */,
	4676	F9152B0A0EAF8A5700CD5C7B /* tkBusy.c in Sources */,
4629	4677	F9FD31540CC1AD070073837D /* tkButton.c in Sources */,
4630	4678	F9FD31550CC1AD070073837D /* tkCanvArc.c in Sources */,
4631	4679	F9FD31560CC1AD070073837D /* tkCanvas.c in Sources */,

+82

-8

macosx/configure less more

1344	1344	TK_VERSION=8.6
1345	1345	TK_MAJOR_VERSION=8
1346	1346	TK_MINOR_VERSION=6
1347		TK_PATCH_LEVEL="a3"
	1347	TK_PATCH_LEVEL="b1"
1348	1348	VERSION=${TK_VERSION}
1349	1349	LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
1350	1350

2610	2610	ac_compiler_gnu=$ac_cv_c_compiler_gnu
2611	2611
2612	2612
	2613	echo "$as_me:$LINENO: checking for inline" >&5
	2614	echo $ECHO_N "checking for inline... $ECHO_C" >&6
	2615	if test "${ac_cv_c_inline+set}" = set; then
	2616	echo $ECHO_N "(cached) $ECHO_C" >&6
	2617	else
	2618	ac_cv_c_inline=no
	2619	for ac_kw in inline __inline__ __inline; do
	2620	cat >conftest.$ac_ext <<_ACEOF
	2621	/* confdefs.h. */
	2622	_ACEOF
	2623	cat confdefs.h >>conftest.$ac_ext
	2624	cat >>conftest.$ac_ext <<_ACEOF
	2625	/* end confdefs.h. */
	2626	#ifndef __cplusplus
	2627	typedef int foo_t;
	2628	static $ac_kw foo_t static_foo () {return 0; }
	2629	$ac_kw foo_t foo () {return 0; }
	2630	#endif
	2631
	2632	_ACEOF
	2633	rm -f conftest.$ac_objext
	2634	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
	2635	(eval $ac_compile) 2>conftest.er1
	2636	ac_status=$?
	2637	grep -v '^ *+' conftest.er1 >conftest.err
	2638	rm -f conftest.er1
	2639	cat conftest.err >&5
	2640	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	2641	(exit $ac_status); } &&
	2642	{ ac_try='test -z "$ac_c_werror_flag"
	2643	\|\| test ! -s conftest.err'
	2644	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
	2645	(eval $ac_try) 2>&5
	2646	ac_status=$?
	2647	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	2648	(exit $ac_status); }; } &&
	2649	{ ac_try='test -s conftest.$ac_objext'
	2650	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
	2651	(eval $ac_try) 2>&5
	2652	ac_status=$?
	2653	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	2654	(exit $ac_status); }; }; then
	2655	ac_cv_c_inline=$ac_kw; break
	2656	else
	2657	echo "$as_me: failed program was:" >&5
	2658	sed 's/^/\| /' conftest.$ac_ext >&5
	2659
	2660	fi
	2661	rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
	2662	done
	2663
	2664	fi
	2665	echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
	2666	echo "${ECHO_T}$ac_cv_c_inline" >&6
	2667
	2668
	2669	case $ac_cv_c_inline in
	2670	inline \| yes) ;;
	2671	*)
	2672	case $ac_cv_c_inline in
	2673	no) ac_val=;;
	2674	*) ac_val=$ac_cv_c_inline;;
	2675	esac
	2676	cat >>confdefs.h <<_ACEOF
	2677	#ifndef __cplusplus
	2678	#define inline $ac_val
	2679	#endif
	2680	_ACEOF
	2681	;;
	2682	esac
	2683
	2684
2613	2685	# limits header checks must come early to prevent
2614	2686	# an autoconf bug that throws errors on configure
2615
2616	2687	ac_ext=c
2617	2688	ac_cpp='$CPP $CPPFLAGS'
2618	2689	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4456	4527	ECHO_VERSION='`echo ${VERSION}`'
4457	4528	TCL_LIB_VERSIONS_OK=ok
4458	4529	CFLAGS_DEBUG=-g
4459		CFLAGS_OPTIMIZE=-O
4460	4530	if test "$GCC" = yes; then
4461	4531
4462		CFLAGS_WARNING="-Wall -Wno-implicit-int"
4463
4464		else
4465		CFLAGS_WARNING=""
	4532	CFLAGS_OPTIMIZE="-O2"
	4533	CFLAGS_WARNING="-Wall"
	4534
	4535	else
	4536
	4537	CFLAGS_OPTIMIZE=-O
	4538	CFLAGS_WARNING=""
	4539
4466	4540	fi
4467	4541
4468	4542	TCL_NEEDS_EXP_FILE=0

4928	5002	DL_LIBS="-ldld"
4929	5003	LDFLAGS="$LDFLAGS -Wl,-E"
4930	5004	CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
4931		LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.'
	5005	LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
4932	5006	LD_LIBRARY_PATH_VAR="SHLIB_PATH"
4933	5007
4934	5008	fi

+2

-2

macosx/tkMacOSXButton.c less more

10	10	* See the file "license.terms" for information on usage and redistribution
11	11	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkMacOSXButton.c,v 1.32 2007/12/13 15:27:08 dgp Exp $
	13	* RCS: @(#) $Id: tkMacOSXButton.c,v 1.33 2008/12/07 16:30:59 das Exp $
14	14	*/
15	15
16	16	#include "tkMacOSXPrivate.h"

485	485
486	486	Tk_Draw3DRectangle(tkwin, pixmap, dpPtr->border, inset, inset,
487	487	Tk_Width(tkwin) - 2inset, Tk_Height(tkwin) - 2inset,
488		butPtr->borderWidth, dpPtr->relief);
	488	borderWidth, dpPtr->relief);
489	489	}
490	490	}
491	491	if (portChanged) {

+5

-2

macosx/tkMacOSXCarbonEvents.c less more

59	59	* software in accordance with the terms specified in this
60	60	* license.
61	61	*
62		* RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.20 2008/06/19 00:16:11 das Exp $
	62	* RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.22 2008/12/10 05:02:52 das Exp $
63	63	*/
64	64
65	65	#include "tkMacOSXPrivate.h"

210	210	{kEventClassApplication, kEventAppShown},
211	211	{kEventClassApplication, kEventAppAvailableWindowBoundsChanged},
212	212	{kEventClassAppearance, kEventAppearanceScrollBarVariantChanged},
	213	{kEventClassFont, kEventFontPanelClosed},
	214	{kEventClassFont, kEventFontSelection},
213	215	};
214	216
215	217	carbonEventHandlerUPP = NewEventHandlerUPP(CarbonEventHandlerProc);

587	589	*/
588	590
589	591	MODULE_SCOPE void
590		TkMacOSXTrackingLoop(int tracking)
	592	TkMacOSXTrackingLoop(
	593	int tracking)
591	594	{
592	595	static int previousServiceMode = TCL_SERVICE_NONE;
593	596

+2

-3

macosx/tkMacOSXClipboard.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.13 2008/10/05 21:26:11 dkf Exp $
	12	* RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.14 2008/10/27 11:55:44 dkf Exp $
13	13	*/
14	14
15	15	#include "tkMacOSXPrivate.h"

129	129
130	130	Tcl_ExternalToUtfDString(TkMacOSXCarbonEncoding, buf, length,
131	131	&encodedText);
132		result = (*proc)(clientData, interp,
133		Tcl_DStringValue(&encodedText));
	132	result = proc(clientData, interp, Tcl_DStringValue(&encodedText));
134	133	Tcl_DStringFree(&encodedText);
135	134
136	135	ckfree(buf);

+272

-246

macosx/tkMacOSXDebug.c less more

0	0	/*
1	1	* tkMacOSXDebug.c --
2	2	*
3		* Implementation of Macintosh specific functions for debugging MacOS events,
4		* regions, etc...
	3	* Implementation of Macintosh specific functions for debugging MacOS
	4	* events, regions, etc...
5	5	*
6	6	* Copyright 2001, Apple Computer, Inc.
7	7	* Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>

53	53	* software in accordance with the terms specified in this
54	54	* license.
55	55	*
56		* RCS: @(#) $Id: tkMacOSXDebug.c,v 1.20 2008/06/19 00:14:56 das Exp $
	56	* RCS: @(#) $Id: tkMacOSXDebug.c,v 1.22 2008/11/08 18:44:40 dkf Exp $
57	57	*/
58	58
59	59	#include "tkMacOSXPrivate.h"

72	72	} MyEventNameList;
73	73
74	74	static MyEventName windowEventNames [] = {
75		{ kEventWindowUpdate,"Update"},
76		{ kEventWindowDrawContent,"DrawContent"},
77		{ kEventWindowActivated,"Activated"},
78		{ kEventWindowDeactivated,"Deactivated"},
79		{ kEventWindowGetClickActivation,"GetClickActivation"},
80		{ kEventWindowShowing,"Showing"},
81		{ kEventWindowHiding,"Hiding"},
82		{ kEventWindowShown,"Shown"},
83		{ kEventWindowHidden,"Hidden"},
84		{ kEventWindowBoundsChanging,"BoundsChanging"},
85		{ kEventWindowBoundsChanged,"BoundsChanged"},
86		{ kEventWindowResizeStarted,"ResizeStarted"},
87		{ kEventWindowResizeCompleted,"ResizeCompleted"},
88		{ kEventWindowDragStarted,"DragStarted"},
89		{ kEventWindowDragCompleted,"DragCompleted"},
90		{ kEventWindowClickDragRgn,"ClickDragRgn"},
91		{ kEventWindowClickResizeRgn,"ClickResizeRgn"},
92		{ kEventWindowClickCollapseRgn,"ClickCollapseRgn"},
93		{ kEventWindowClickCloseRgn,"ClickCloseRgn"},
94		{ kEventWindowClickZoomRgn,"ClickZoomRgn"},
95		{ kEventWindowClickContentRgn,"ClickContentRgn"},
96		{ kEventWindowClickProxyIconRgn,"ClickProxyIconRgn"},
97		{ kEventWindowCursorChange,"CursorChange" },
98		{ kEventWindowCollapse,"Collapse"},
99		{ kEventWindowCollapsed,"Collapsed"},
100		{ kEventWindowCollapseAll,"CollapseAll"},
101		{ kEventWindowExpand,"Expand"},
102		{ kEventWindowExpanded,"Expanded"},
103		{ kEventWindowExpandAll,"ExpandAll"},
104		{ kEventWindowCollapse,"Collapse"},
105		{ kEventWindowClose,"Close"},
106		{ kEventWindowClosed,"Closed"},
107		{ kEventWindowCloseAll,"CloseAll"},
108		{ kEventWindowZoom,"Zoom"},
109		{ kEventWindowZoomed,"Zoomed"},
110		{ kEventWindowZoomAll,"ZoomAll"},
111		{ kEventWindowContextualMenuSelect,"ContextualMenuSelect"},
112		{ kEventWindowPathSelect,"PathSelect"},
113		{ kEventWindowGetIdealSize,"GetIdealSize"},
114		{ kEventWindowGetMinimumSize,"GetMinimumSize"},
115		{ kEventWindowGetMaximumSize,"GetMaximumSize"},
116		{ kEventWindowConstrain,"Constrain"},
117		{ kEventWindowHandleContentClick,"HandleContentClick"},
118		{ kEventWindowProxyBeginDrag,"ProxyBeginDra}"},
119		{ kEventWindowProxyEndDrag,"ProxyEndDrag"},
120		{ kEventWindowFocusAcquired,"FocusAcquired"},
121		{ kEventWindowFocusRelinquish,"FocusRelinquish"},
122		{ kEventWindowDrawFrame,"DrawFrame"},
123		{ kEventWindowDrawPart,"DrawPart"},
124		{ kEventWindowGetRegion,"GetRegion"},
125		{ kEventWindowHitTest,"HitTest"},
126		{ kEventWindowInit,"Init"},
127		{ kEventWindowDispose,"Dispose"},
128		{ kEventWindowDragHilite,"DragHilite"},
129		{ kEventWindowModified,"Modified"},
130		{ kEventWindowSetupProxyDragImage,"SetupProxyDragImage"},
131		{ kEventWindowStateChanged,"StateChanged"},
132		{ kEventWindowMeasureTitle,"MeasureTitle"},
133		{ kEventWindowDrawGrowBox,"DrawGrowBox"},
134		{ kEventWindowGetGrowImageRegion,"GetGrowImageRegion"},
135		{ kEventWindowPaint,"Paint"},
136		{ 0, NULL },
	75	{ kEventWindowUpdate,"Update"},
	76	{ kEventWindowDrawContent,"DrawContent"},
	77	{ kEventWindowActivated,"Activated"},
	78	{ kEventWindowDeactivated,"Deactivated"},
	79	{ kEventWindowGetClickActivation,"GetClickActivation"},
	80	{ kEventWindowShowing,"Showing"},
	81	{ kEventWindowHiding,"Hiding"},
	82	{ kEventWindowShown,"Shown"},
	83	{ kEventWindowHidden,"Hidden"},
	84	{ kEventWindowBoundsChanging,"BoundsChanging"},
	85	{ kEventWindowBoundsChanged,"BoundsChanged"},
	86	{ kEventWindowResizeStarted,"ResizeStarted"},
	87	{ kEventWindowResizeCompleted,"ResizeCompleted"},
	88	{ kEventWindowDragStarted,"DragStarted"},
	89	{ kEventWindowDragCompleted,"DragCompleted"},
	90	{ kEventWindowClickDragRgn,"ClickDragRgn"},
	91	{ kEventWindowClickResizeRgn,"ClickResizeRgn"},
	92	{ kEventWindowClickCollapseRgn,"ClickCollapseRgn"},
	93	{ kEventWindowClickCloseRgn,"ClickCloseRgn"},
	94	{ kEventWindowClickZoomRgn,"ClickZoomRgn"},
	95	{ kEventWindowClickContentRgn,"ClickContentRgn"},
	96	{ kEventWindowClickProxyIconRgn,"ClickProxyIconRgn"},
	97	{ kEventWindowCursorChange,"CursorChange" },
	98	{ kEventWindowCollapse,"Collapse"},
	99	{ kEventWindowCollapsed,"Collapsed"},
	100	{ kEventWindowCollapseAll,"CollapseAll"},
	101	{ kEventWindowExpand,"Expand"},
	102	{ kEventWindowExpanded,"Expanded"},
	103	{ kEventWindowExpandAll,"ExpandAll"},
	104	{ kEventWindowCollapse,"Collapse"},
	105	{ kEventWindowClose,"Close"},
	106	{ kEventWindowClosed,"Closed"},
	107	{ kEventWindowCloseAll,"CloseAll"},
	108	{ kEventWindowZoom,"Zoom"},
	109	{ kEventWindowZoomed,"Zoomed"},
	110	{ kEventWindowZoomAll,"ZoomAll"},
	111	{ kEventWindowContextualMenuSelect,"ContextualMenuSelect"},
	112	{ kEventWindowPathSelect,"PathSelect"},
	113	{ kEventWindowGetIdealSize,"GetIdealSize"},
	114	{ kEventWindowGetMinimumSize,"GetMinimumSize"},
	115	{ kEventWindowGetMaximumSize,"GetMaximumSize"},
	116	{ kEventWindowConstrain,"Constrain"},
	117	{ kEventWindowHandleContentClick,"HandleContentClick"},
	118	{ kEventWindowProxyBeginDrag,"ProxyBeginDra}"},
	119	{ kEventWindowProxyEndDrag,"ProxyEndDrag"},
	120	{ kEventWindowFocusAcquired,"FocusAcquired"},
	121	{ kEventWindowFocusRelinquish,"FocusRelinquish"},
	122	{ kEventWindowDrawFrame,"DrawFrame"},
	123	{ kEventWindowDrawPart,"DrawPart"},
	124	{ kEventWindowGetRegion,"GetRegion"},
	125	{ kEventWindowHitTest,"HitTest"},
	126	{ kEventWindowInit,"Init"},
	127	{ kEventWindowDispose,"Dispose"},
	128	{ kEventWindowDragHilite,"DragHilite"},
	129	{ kEventWindowModified,"Modified"},
	130	{ kEventWindowSetupProxyDragImage,"SetupProxyDragImage"},
	131	{ kEventWindowStateChanged,"StateChanged"},
	132	{ kEventWindowMeasureTitle,"MeasureTitle"},
	133	{ kEventWindowDrawGrowBox,"DrawGrowBox"},
	134	{ kEventWindowGetGrowImageRegion,"GetGrowImageRegion"},
	135	{ kEventWindowPaint,"Paint"},
	136	{ 0, NULL },
137	137	};
138	138
139	139	static MyEventName mouseEventNames [] = {
140		{ kEventMouseMoved, "Moved"},
141		{ kEventMouseUp, "Up"},
142		{ kEventMouseDown, "Down"},
143		{ kEventMouseDragged, "Dragged"},
144		{ kEventMouseWheelMoved, "WheelMoved"},
145		{ 0, NULL}
	140	{ kEventMouseMoved, "Moved"},
	141	{ kEventMouseUp, "Up"},
	142	{ kEventMouseDown, "Down"},
	143	{ kEventMouseDragged, "Dragged"},
	144	{ kEventMouseWheelMoved, "WheelMoved"},
	145	{ 0, NULL}
146	146	};
147	147
148	148	static MyEventName keyboardEventNames [] = {
149		{ kEventRawKeyDown, "Down"},
150		{ kEventRawKeyRepeat, "Repeat"},
151		{ kEventRawKeyUp, "Up"},
152		{ kEventRawKeyModifiersChanged, "ModifiersChanged"},
153		{ kEventHotKeyPressed, "HotKeyPressed"},
154		{ kEventHotKeyReleased, "HotKeyReleased"},
155		{ 0, NULL}
	149	{ kEventRawKeyDown, "Down"},
	150	{ kEventRawKeyRepeat, "Repeat"},
	151	{ kEventRawKeyUp, "Up"},
	152	{ kEventRawKeyModifiersChanged, "ModifiersChanged"},
	153	{ kEventHotKeyPressed, "HotKeyPressed"},
	154	{ kEventHotKeyReleased, "HotKeyReleased"},
	155	{ 0, NULL}
156	156	};
157	157
158	158	static MyEventName appEventNames [] = {
159		{ kEventAppActivated, "Activated"},
160		{ kEventAppDeactivated, "Deactivated"},
161		{ kEventAppQuit, "Quit"},
162		{ kEventAppLaunchNotification, "LaunchNotification"},
163		{ kEventAppLaunched, "Launched"},
164		{ kEventAppTerminated, "Terminated"},
165		{ kEventAppFrontSwitched, "FrontSwitched"},
166		{ 0, NULL}
	159	{ kEventAppActivated, "Activated"},
	160	{ kEventAppDeactivated, "Deactivated"},
	161	{ kEventAppQuit, "Quit"},
	162	{ kEventAppLaunchNotification, "LaunchNotification"},
	163	{ kEventAppLaunched, "Launched"},
	164	{ kEventAppTerminated, "Terminated"},
	165	{ kEventAppFrontSwitched, "FrontSwitched"},
	166	{ 0, NULL}
167	167	};
168	168
169	169	static MyEventName menuEventNames [] = {
170		{ kEventMenuBeginTracking, "BeginTracking"},
171		{ kEventMenuEndTracking, "EndTracking"},
172		{ kEventMenuChangeTrackingMode, "ChangeTrackingMode"},
173		{ kEventMenuOpening, "Opening"},
174		{ kEventMenuClosed, "Closed"},
175		{ kEventMenuTargetItem, "TargetItem"},
176		{ kEventMenuMatchKey, "MatchKey"},
177		{ kEventMenuEnableItems, "EnableItems"},
178		{ kEventMenuDispose, "Dispose"},
179		{ 0, NULL }
	170	{ kEventMenuBeginTracking, "BeginTracking"},
	171	{ kEventMenuEndTracking, "EndTracking"},
	172	{ kEventMenuChangeTrackingMode, "ChangeTrackingMode"},
	173	{ kEventMenuOpening, "Opening"},
	174	{ kEventMenuClosed, "Closed"},
	175	{ kEventMenuTargetItem, "TargetItem"},
	176	{ kEventMenuMatchKey, "MatchKey"},
	177	{ kEventMenuEnableItems, "EnableItems"},
	178	{ kEventMenuDispose, "Dispose"},
	179	{ 0, NULL }
180	180	};
181	181
182	182	static MyEventName controlEventNames [] = {
183		{ kEventControlInitialize, "Initialize" },
184		{ kEventControlDispose, "Dispose" },
185		{ kEventControlGetOptimalBounds, "GetOptimalBounds" },
186		{ kEventControlHit, "Hit" },
187		{ kEventControlSimulateHit, "SimulateHit" },
188		{ kEventControlHitTest, "HitTest" },
189		{ kEventControlDraw, "Draw" },
190		{ kEventControlApplyBackground, "ApplyBackground" },
191		{ kEventControlApplyTextColor, "ApplyTextColor" },
192		{ kEventControlSetFocusPart, "SetFocusPart" },
193		{ kEventControlGetFocusPart, "GetFocusPart" },
194		{ kEventControlActivate, "Activate" },
195		{ kEventControlDeactivate, "Deactivate" },
196		{ kEventControlSetCursor, "SetCursor" },
197		{ kEventControlContextualMenuClick, "ContextualMenuClick" },
198		{ kEventControlClick, "Click" },
199		{ kEventControlTrack, "Track" },
200		{ kEventControlGetScrollToHereStartPoint, "GetScrollToHereStartPoint" },
201		{ kEventControlGetIndicatorDragConstraint, "GetIndicatorDragConstraint" },
202		{ kEventControlIndicatorMoved, "IndicatorMoved" },
203		{ kEventControlGhostingFinished, "GhostingFinished" },
204		{ kEventControlGetActionProcPart, "GetActionProcPart" },
205		{ kEventControlGetPartRegion, "GetPartRegion" },
206		{ kEventControlGetPartBounds, "GetPartBounds" },
207		{ kEventControlSetData, "SetData" },
208		{ kEventControlGetData, "GetData" },
209		{ kEventControlValueFieldChanged, "ValueFieldChanged" },
210		{ kEventControlAddedSubControl, "AddedSubControl" },
211		{ kEventControlRemovingSubControl, "RemovingSubControl" },
212		{ kEventControlBoundsChanged, "BoundsChanged" },
213		{ kEventControlOwningWindowChanged, "OwningWindowChanged" },
214		{ kEventControlArbitraryMessage, "ArbitraryMessage" },
215		{ 0, NULL }
	183	{ kEventControlInitialize, "Initialize" },
	184	{ kEventControlDispose, "Dispose" },
	185	{ kEventControlGetOptimalBounds, "GetOptimalBounds" },
	186	{ kEventControlHit, "Hit" },
	187	{ kEventControlSimulateHit, "SimulateHit" },
	188	{ kEventControlHitTest, "HitTest" },
	189	{ kEventControlDraw, "Draw" },
	190	{ kEventControlApplyBackground, "ApplyBackground" },
	191	{ kEventControlApplyTextColor, "ApplyTextColor" },
	192	{ kEventControlSetFocusPart, "SetFocusPart" },
	193	{ kEventControlGetFocusPart, "GetFocusPart" },
	194	{ kEventControlActivate, "Activate" },
	195	{ kEventControlDeactivate, "Deactivate" },
	196	{ kEventControlSetCursor, "SetCursor" },
	197	{ kEventControlContextualMenuClick, "ContextualMenuClick" },
	198	{ kEventControlClick, "Click" },
	199	{ kEventControlTrack, "Track" },
	200	{ kEventControlGetScrollToHereStartPoint, "GetScrollToHereStartPoint" },
	201	{ kEventControlGetIndicatorDragConstraint, "GetIndicatorDragConstraint" },
	202	{ kEventControlIndicatorMoved, "IndicatorMoved" },
	203	{ kEventControlGhostingFinished, "GhostingFinished" },
	204	{ kEventControlGetActionProcPart, "GetActionProcPart" },
	205	{ kEventControlGetPartRegion, "GetPartRegion" },
	206	{ kEventControlGetPartBounds, "GetPartBounds" },
	207	{ kEventControlSetData, "SetData" },
	208	{ kEventControlGetData, "GetData" },
	209	{ kEventControlValueFieldChanged, "ValueFieldChanged" },
	210	{ kEventControlAddedSubControl, "AddedSubControl" },
	211	{ kEventControlRemovingSubControl, "RemovingSubControl" },
	212	{ kEventControlBoundsChanged, "BoundsChanged" },
	213	{ kEventControlOwningWindowChanged, "OwningWindowChanged" },
	214	{ kEventControlArbitraryMessage, "ArbitraryMessage" },
	215	{ 0, NULL }
216	216	};
217	217
218	218	static MyEventName commandEventNames [] = {
219		{ kEventCommandProcess, "Process" },
220		{ kEventCommandUpdateStatus, "UpdateStatus" },
221		{ 0, NULL }
	219	{ kEventCommandProcess, "Process" },
	220	{ kEventCommandUpdateStatus, "UpdateStatus" },
	221	{ 0, NULL }
222	222	};
223	223
224	224	static MyEventNameList eventNameList [] = {
225		{ kEventClassWindow, windowEventNames },
226		{ kEventClassMouse, mouseEventNames },
227		{ kEventClassKeyboard, keyboardEventNames },
228		{ kEventClassApplication, appEventNames },
229		{ kEventClassMenu, menuEventNames },
230		{ kEventClassControl, controlEventNames },
231		{ kEventClassCommand, commandEventNames },
232		{ 0, NULL}
	225	{ kEventClassWindow, windowEventNames },
	226	{ kEventClassMouse, mouseEventNames },
	227	{ kEventClassKeyboard, keyboardEventNames },
	228	{ kEventClassApplication, appEventNames },
	229	{ kEventClassMenu, menuEventNames },
	230	{ kEventClassControl, controlEventNames },
	231	{ kEventClassCommand, commandEventNames },
	232	{ 0, NULL}
233	233	};
234	234
235	235	#ifdef TK_MACOSXDEBUG_UNUSED
236	236	static MyEventName classicEventNames [] = {
237		{ nullEvent,"nullEvent" },
238		{ mouseDown,"mouseDown" },
239		{ mouseUp,"mouseUp" },
240		{ keyDown,"keyDown" },
241		{ keyUp,"keyUp" },
242		{ autoKey,"autoKey" },
243		{ updateEvt,"updateEvt" },
244		{ diskEvt,"diskEvt" },
245		{ activateEvt,"activateEvt" },
246		{ osEvt,"osEvt" },
247		{ kHighLevelEvent,"kHighLevelEvent" },
248		{ 0, NULL }
	237	{ nullEvent,"nullEvent" },
	238	{ mouseDown,"mouseDown" },
	239	{ mouseUp,"mouseUp" },
	240	{ keyDown,"keyDown" },
	241	{ keyUp,"keyUp" },
	242	{ autoKey,"autoKey" },
	243	{ updateEvt,"updateEvt" },
	244	{ diskEvt,"diskEvt" },
	245	{ activateEvt,"activateEvt" },
	246	{ osEvt,"osEvt" },
	247	{ kHighLevelEvent,"kHighLevelEvent" },
	248	{ 0, NULL }
249	249	};
250	250	#endif /* TK_MACOSXDEBUG_UNUSED */
251	251
252	252	MODULE_SCOPE char *
253		TkMacOSXCarbonEventToAscii(EventRef eventRef)
	253	TkMacOSXCarbonEventToAscii(
	254	EventRef eventRef)
254	255	{
255	256	EventClass eventClass;
256	257	EventKind eventKind;

275	276	list++;
276	277	}
277	278	}
278		while (names && names->name) {
	279	while (names && names->name) {
279	280	if (eventKind == names->kind) {
280	281	snprintf(buf, 250, "%-20s", names->name);
281	282	break;

291	292
292	293	#ifdef TK_MACOSXDEBUG_UNUSED
293	294	MODULE_SCOPE char *
294		TkMacOSXCarbonEventKindToAscii(EventRef eventRef, char * buf )
295		{
296		EventClass eventClass;
297		EventKind eventKind;
298		MyEventNameList * list = eventNameList;
299		MyEventName * names = NULL;
300		int found = 0;
301		eventClass = GetEventClass(eventRef);
302		eventKind = GetEventKind(eventRef);
303		while (list->names && (!names) ) {
304		if (eventClass == list -> c) {
305		names = list -> names;
306		} else {
307		list++;
308		}
309		}
310		if (names) {
311		found = 0;
312		while ( names->name && !found ) {
313		if (eventKind == names->kind) {
314		sprintf(buf,"%s",names->name);
315		found = 1;
316		} else {
317		names++;
318		}
319		}
	295	TkMacOSXCarbonEventKindToAscii(
	296	EventRef eventRef,
	297	char *buf)
	298	{
	299	EventClass eventClass;
	300	EventKind eventKind;
	301	MyEventNameList *list = eventNameList;
	302	MyEventName *names = NULL;
	303	int found = 0;
	304
	305	eventClass = GetEventClass(eventRef);
	306	eventKind = GetEventKind(eventRef);
	307	while (list->names && (!names) ) {
	308	if (eventClass == list -> c) {
	309	names = list -> names;
	310	} else {
	311	list++;
	312	}
	313	}
	314	if (names) {
	315	found = 0;
	316	while (names->name && !found) {
	317	if (eventKind == names->kind) {
	318	sprintf(buf,"%s",names->name);
	319	found = 1;
	320	} else {
	321	names++;
	322	}
	323	}
320	324	}
321	325	if (!found) {
322		sprintf ( buf,"%d", eventKind );
323		} else {
324		sprintf ( buf,"%d", eventKind );
325		}
326		return buf;
	326	sprintf(buf,"%d", eventKind);
	327	} else {
	328	sprintf(buf,"%d", eventKind);
	329	}
	330	return buf;
327	331	}
328	332
329	333	MODULE_SCOPE char *
330		TkMacOSXClassicEventToAscii(EventRecord * eventPtr, char * buf )
331		{
332		MyEventName * names = NULL;
	334	TkMacOSXClassicEventToAscii(
	335	EventRecord *eventPtr,
	336	char *buf)
	337	{
	338	MyEventName *names = NULL;
333	339	int found = 0;
334	340	names = classicEventNames;
335		while ( names -> name && !found )
	341	while (names -> name && !found) {
336	342	if (eventPtr->what == names->kind) {
337		int * iPtr;
	343	int *iPtr;
338	344	char cBuf[8];
339		iPtr=(int *) &cBuf;
	345
	346	iPtr = (int *) &cBuf;
340	347	*iPtr = eventPtr->message;
341	348	cBuf[4] = 0;
342	349	sprintf(buf, "%-16s %08x %04x %s", names->name,
343		(int) eventPtr->message,
344		eventPtr->modifiers,
345		cBuf);
	350	(int) eventPtr->message, eventPtr->modifiers, cBuf);
346	351	found = 1;
347	352	} else {
348		names++;
349		}
	353	names++;
	354	}
	355	}
350	356	if (!found) {
351		sprintf(buf,"%-16d %08x %08x, %s",
352		eventPtr->what, (int) eventPtr->message,
353		eventPtr->modifiers, buf);
	357	sprintf(buf,"%-16d %08x %08x, %s", eventPtr->what,
	358	(int) eventPtr->message, eventPtr->modifiers, buf);
354	359	}
355	360	return buf;
356
357	361	}
358	362
359	363	MODULE_SCOPE void
360		TkMacOSXPrintPoint(char * tag, Point * p )
	364	TkMacOSXPrintPoint(
	365	char *tag,
	366	Point *p)
361	367	{
362	368	TkMacOSXDbgMsg("%s %4d %4d", tag,p->h,p->v );
363	369	}
364	370
365	371	MODULE_SCOPE void
366		TkMacOSXPrintRect(char * tag, Rect * r )
	372	TkMacOSXPrintRect(
	373	char *tag,
	374	Rect *r)
367	375	{
368	376	TkMacOSXDbgMsg("%s %4d %4d %4d %4d (%dx%d)",
369		tag, r->left, r->top, r->right, r->bottom,
370		r->right - r->left + 1, r->bottom - r->top + 1);
	377	tag, r->left, r->top, r->right, r->bottom,
	378	r->right - r->left + 1, r->bottom - r->top + 1);
371	379	}
372	380
373	381	MODULE_SCOPE void
374		TkMacOSXPrintRegion(char * tag, RgnHandle rgn )
	382	TkMacOSXPrintRegion(
	383	char *tag,
	384	RgnHandle rgn)
375	385	{
376	386	Rect r;
	387
377	388	GetRegionBounds(rgn,&r);
378	389	TkMacOSXPrintRect(tag,&r);
379	390	}
380	391
381	392	MODULE_SCOPE void
382		TkMacOSXPrintWindowTitle(char * tag, WindowRef window )
	393	TkMacOSXPrintWindowTitle(
	394	char *tag,
	395	WindowRef window)
383	396	{
384	397	Str255 title;
385		GetWTitle(window,title);
386		title [title[0] + 1] = 0;
387		TkMacOSXDbgMsg("%s %s", tag, title +1 );
	398
	399	GetWTitle(window, title);
	400	title[title[0] + 1] = 0;
	401	TkMacOSXDbgMsg("%s %s", tag, title+1);
388	402	}
389	403
390	404	typedef struct {
391		int msg;
392		char * name;
	405	int msg;
	406	char *name;
393	407	} MsgName;
394	408
395	409	static MsgName msgNames [] = {

407	421	};
408	422
409	423	MODULE_SCOPE char *
410		TkMacOSXMenuMessageToAscii(int msg, char * s)
411		{
412		MsgName * msgNamePtr;
413		for (msgNamePtr = msgNames;msgNamePtr->name;) {
	424	TkMacOSXMenuMessageToAscii(
	425	int msg,
	426	char *s)
	427	{
	428	MsgName *msgNamePtr;
	429
	430	for (msgNamePtr=msgNames ; msgNamePtr->name ; msgNamePtr++) {
414	431	if (msgNamePtr->msg == msg) {
415	432	strcpy(s,msgNamePtr->name);
416	433	return s;
417		} else {
418		msgNamePtr++;
419		}
420		}
421		sprintf(s,"unknown : %d", msg );
	434	}
	435	}
	436	sprintf(s, "unknown : %d", msg);
422	437	return s;
423	438	}
424	439

435	450	};
436	451
437	452	MODULE_SCOPE char *
438		TkMacOSXMouseTrackingResultToAscii(MouseTrackingResult r, char * buf)
439		{
440		MsgName * namePtr;
	453	TkMacOSXMouseTrackingResultToAscii(
	454	MouseTrackingResult r,
	455	char *buf)
	456	{
	457	MsgName *namePtr;
	458
441	459	for (namePtr = trackingNames; namePtr->name; namePtr++) {
442	460	if (namePtr->msg == r) {
443	461	strcpy(buf, namePtr->name);

486	504	*
487	505	* TkMacOSXGetNamedDebugSymbol --
488	506	*
489		*
490		* Dynamically acquire address of a named symbol from a loaded
491		* dynamic library, so that we can use API that may not be
492		* available on all OS versions.
493		* For debugging purposes, if we cannot find the symbol with the
494		* usual dynamic library APIs, we manually walk the symbol table
495		* of the loaded library. This allows access to unexported
496		* symbols such as private_extern internal debugging functions.
497		* If module is NULL or the empty string, search all loaded
498		* libraries (could be very expensive and should be avoided).
499		*
500		* THIS FUCTION IS ONLY TO BE USED FOR DEBUGGING PURPOSES, IT MAY
501		* BREAK UNEXPECTEDLY IN THE FUTURE !
	507	* Dynamically acquire address of a named symbol from a loaded dynamic
	508	* library, so that we can use API that may not be available on all OS
	509	* versions. For debugging purposes, if we cannot find the symbol with
	510	* the usual dynamic library APIs, we manually walk the symbol table of
	511	* the loaded library. This allows access to unexported symbols such as
	512	* private_extern internal debugging functions. If module is NULL or the
	513	* empty string, search all loaded libraries (could be very expensive and
	514	* should be avoided).
	515	*
	516	* THIS FUCTION IS ONLY TO BE USED FOR DEBUGGING PURPOSES, IT MAY BREAK
	517	* UNEXPECTEDLY IN THE FUTURE!
502	518	*
503	519	* Results:
504	520	* Address of given symbol or NULL if unavailable.

511	527
512	528	MODULE_SCOPE void *
513	529	TkMacOSXGetNamedDebugSymbol(
514		const char* module,
515		const char* symbol)
516		{
517		void* addr = TkMacOSXGetNamedSymbol(module, symbol);
	530	const char *module,
	531	const char *symbol)
	532	{
	533	void *addr = TkMacOSXGetNamedSymbol(module, symbol);
	534
518	535	#ifndef __LP64__
519	536	if (!addr) {
520	537	const struct mach_header *mh = NULL;

573	590	nsect += ns;
574	591	}
575	592	} else if (!st && lc->cmd == LC_SYMTAB) {
576		st = (struct symtab_command*) lc;
	593	st = (struct symtab_command *) lc;
577	594	break;
578	595	}
579	596	lc = (struct load_command )((char ) lc + lc->cmdsize);

585	602	uint32_t strsize = st->strsize;
586	603	int32_t strx;
587	604
588		/* Offset file positions by difference to actual position
589		in memory of last segment before symbol table: */
	605	/*
	606	* Offset file positions by difference to actual position
	607	* in memory of last segment before symbol table:
	608	*/
	609
590	610	base = (intptr_t) sg->vmaddr + slide - sg->fileoff;
591		strings = (char*)(base + st->stroff);
592		sym = (struct nlist*)(base + st->symoff);
	611	strings = (char *) (base + st->stroff);
	612	sym = (struct nlist *) (base + st->symoff);
593	613	m = st->nsyms;
594	614	for (j = 0; j < m; j++) {
595	615	/* Find symbol with given name in __text section */

614	634	#endif /* __LP64__ */
615	635	return addr;
616	636	}
617
618	637	#endif /* TK_MAC_DEBUG */
	638
	639	/*
	640	* Local Variables:
	641	* c-basic-offset: 4
	642	* fill-column: 78
	643	* End:
	644	*/

+45

-38

macosx/tkMacOSXDefault.h less more

11	11	* See the file "license.terms" for information on usage and redistribution
12	12	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkMacOSXDefault.h,v 1.15 2007/12/13 15:27:08 dgp Exp $
	14	* RCS: @(#) $Id: tkMacOSXDefault.h,v 1.17 2008/12/06 10:48:29 dkf Exp $
15	15	*/
16	16
17	17	#ifndef _TKMACDEFAULT

28	28	* DISABLED - Foreground color when widget is disabled.
29	29	*/
30	30
31		#define BLACK "Black"
32		#define WHITE "White"
33		#define NORMAL_BG "systemWindowBody"
34		#define ACTIVE_BG "systemButtonFacePressed"
35		#define ACTIVE_FG "systemPushButtonPressedText"
36		#define SELECT_BG "systemHighlight"
37		#define SELECT_FG None
38		#define INACTIVE_SELECT_BG "systemHighlightSecondary"
39		#define TROUGH "#c3c3c3"
40		#define INDICATOR "#b03060"
41		#define DISABLED "#a3a3a3"
	31	#define BLACK "Black"
	32	#define WHITE "White"
	33	#define NORMAL_BG "systemWindowBody"
	34	#define ACTIVE_BG "systemButtonFacePressed"
	35	#define ACTIVE_FG "systemPushButtonPressedText"
	36	#define SELECT_BG "systemHighlight"
	37	#define SELECT_FG None
	38	#define INACTIVE_SELECT_BG "systemHighlightSecondary"
	39	#define TROUGH "#c3c3c3"
	40	#define INDICATOR "#b03060"
	41	#define DISABLED "#a3a3a3"
42	42
43	43	/*
44	44	* Defaults for labels, buttons, checkbuttons, and radiobuttons:

70	70	#define DEF_BUTTON_HIGHLIGHT "systemButtonFrame"
71	71	#define DEF_LABEL_HIGHLIGHT_WIDTH "0"
72	72	#define DEF_BUTTON_HIGHLIGHT_WIDTH "4"
73		#define DEF_BUTTON_IMAGE (char *) NULL
	73	#define DEF_BUTTON_IMAGE ((char *) NULL)
74	74	#define DEF_BUTTON_INDICATOR "1"
75	75	#define DEF_BUTTON_JUSTIFY "center"
76	76	#define DEF_BUTTON_OFF_VALUE "0"

87	87	#define DEF_BUTTON_REPEAT_INTERVAL "0"
88	88	#define DEF_BUTTON_SELECT_COLOR INDICATOR
89	89	#define DEF_BUTTON_SELECT_MONO BLACK
90		#define DEF_BUTTON_SELECT_IMAGE (char *) NULL
	90	#define DEF_BUTTON_SELECT_IMAGE ((char *) NULL)
91	91	#define DEF_BUTTON_STATE "normal"
92	92	#define DEF_LABEL_TAKE_FOCUS "0"
93		#define DEF_BUTTON_TAKE_FOCUS (char *) NULL
	93	#define DEF_BUTTON_TAKE_FOCUS ((char *) NULL)
94	94	#define DEF_BUTTON_TEXT ""
95	95	#define DEF_BUTTON_TEXT_VARIABLE ""
96	96	#define DEF_BUTTON_UNDERLINE "-1"

128	128	#define DEF_CANVAS_SELECT_BD_MONO "0"
129	129	#define DEF_CANVAS_SELECT_FG_COLOR SELECT_FG
130	130	#define DEF_CANVAS_SELECT_FG_MONO WHITE
131		#define DEF_CANVAS_TAKE_FOCUS (char *) NULL
	131	#define DEF_CANVAS_TAKE_FOCUS ((char *) NULL)
132	132	#define DEF_CANVAS_WIDTH "10c"
133	133	#define DEF_CANVAS_X_SCROLL_CMD ""
134	134	#define DEF_CANVAS_X_SCROLL_INCREMENT "0"

184	184	#define DEF_ENTRY_SELECT_BD_MONO "0"
185	185	#define DEF_ENTRY_SELECT_FG_COLOR SELECT_FG
186	186	#define DEF_ENTRY_SELECT_FG_MONO WHITE
187		#define DEF_ENTRY_SHOW (char *) NULL
	187	#define DEF_ENTRY_SHOW ((char *) NULL)
188	188	#define DEF_ENTRY_STATE "normal"
189		#define DEF_ENTRY_TAKE_FOCUS (char *) NULL
	189	#define DEF_ENTRY_TAKE_FOCUS ((char *) NULL)
190	190	#define DEF_ENTRY_TEXT_VARIABLE ""
191	191	#define DEF_ENTRY_WIDTH "20"
192	192

252	252	#define DEF_LISTBOX_SELECT_MODE "browse"
253	253	#define DEF_LISTBOX_SET_GRID "0"
254	254	#define DEF_LISTBOX_STATE "normal"
255		#define DEF_LISTBOX_TAKE_FOCUS (char *) NULL
	255	#define DEF_LISTBOX_TAKE_FOCUS ((char *) NULL)
256	256	#define DEF_LISTBOX_WIDTH "20"
257	257
258	258	/*
259	259	* Defaults for individual entries of menus:
260	260	*/
261	261
262		#define DEF_MENU_ENTRY_ACTIVE_BG (char *) NULL
263		#define DEF_MENU_ENTRY_ACTIVE_FG (char *) NULL
264		#define DEF_MENU_ENTRY_ACCELERATOR (char *) NULL
265		#define DEF_MENU_ENTRY_BG (char *) NULL
	262	#define DEF_MENU_ENTRY_ACTIVE_BG ((char *) NULL)
	263	#define DEF_MENU_ENTRY_ACTIVE_FG ((char *) NULL)
	264	#define DEF_MENU_ENTRY_ACCELERATOR ((char *) NULL)
	265	#define DEF_MENU_ENTRY_BG ((char *) NULL)
266	266	#define DEF_MENU_ENTRY_BITMAP None
267	267	#define DEF_MENU_ENTRY_COLUMN_BREAK "0"
268		#define DEF_MENU_ENTRY_COMMAND (char *) NULL
	268	#define DEF_MENU_ENTRY_COMMAND ((char *) NULL)
269	269	#define DEF_MENU_ENTRY_COMPOUND "none"
270		#define DEF_MENU_ENTRY_FG (char *) NULL
271		#define DEF_MENU_ENTRY_FONT (char *) NULL
	270	#define DEF_MENU_ENTRY_FG ((char *) NULL)
	271	#define DEF_MENU_ENTRY_FONT ((char *) NULL)
272	272	#define DEF_MENU_ENTRY_HIDE_MARGIN "0"
273		#define DEF_MENU_ENTRY_IMAGE (char *) NULL
	273	#define DEF_MENU_ENTRY_IMAGE ((char *) NULL)
274	274	#define DEF_MENU_ENTRY_INDICATOR "1"
275		#define DEF_MENU_ENTRY_LABEL (char *) NULL
276		#define DEF_MENU_ENTRY_MENU (char *) NULL
	275	#define DEF_MENU_ENTRY_LABEL ((char *) NULL)
	276	#define DEF_MENU_ENTRY_MENU ((char *) NULL)
277	277	#define DEF_MENU_ENTRY_OFF_VALUE "0"
278	278	#define DEF_MENU_ENTRY_ON_VALUE "1"
279		#define DEF_MENU_ENTRY_SELECT_IMAGE (char *) NULL
	279	#define DEF_MENU_ENTRY_SELECT_IMAGE ((char *) NULL)
280	280	#define DEF_MENU_ENTRY_STATE "normal"
281		#define DEF_MENU_ENTRY_VALUE (char *) NULL
282		#define DEF_MENU_ENTRY_CHECK_VARIABLE (char *) NULL
	281	#define DEF_MENU_ENTRY_VALUE ((char *) NULL)
	282	#define DEF_MENU_ENTRY_CHECK_VARIABLE ((char *) NULL)
283	283	#define DEF_MENU_ENTRY_RADIO_VARIABLE "selectedButton"
284		#define DEF_MENU_ENTRY_SELECT (char *) NULL
	284	#define DEF_MENU_ENTRY_SELECT ((char *) NULL)
285	285	#define DEF_MENU_ENTRY_UNDERLINE "-1"
286	286
287	287	/*

312	312	*/
313	313
314	314	#define DEF_MENU_TEAROFF "0"
315		#define DEF_MENU_TEAROFF_CMD (char *) NULL
	315	#define DEF_MENU_TEAROFF_CMD ((char *) NULL)
316	316	#define DEF_MENU_TITLE ""
317	317	#define DEF_MENU_TYPE "normal"
318	318

340	340	#define DEF_MENUBUTTON_HIGHLIGHT_BG_MONO DEF_MENUBUTTON_BG_MONO
341	341	#define DEF_MENUBUTTON_HIGHLIGHT BLACK
342	342	#define DEF_MENUBUTTON_HIGHLIGHT_WIDTH "0"
343		#define DEF_MENUBUTTON_IMAGE (char *) NULL
	343	#define DEF_MENUBUTTON_IMAGE ((char *) NULL)
344	344	#define DEF_MENUBUTTON_INDICATOR "0"
345	345	/* #define DEF_MENUBUTTON_JUSTIFY "center" */
346	346	#define DEF_MENUBUTTON_JUSTIFY "left"

449	449	#define DEF_SCALE_SLIDER_LENGTH "30"
450	450	#define DEF_SCALE_SLIDER_RELIEF "raised"
451	451	#define DEF_SCALE_STATE "normal"
452		#define DEF_SCALE_TAKE_FOCUS (char *) NULL
	452	#define DEF_SCALE_TAKE_FOCUS ((char *) NULL)
453	453	#define DEF_SCALE_TICK_INTERVAL "0"
454	454	#define DEF_SCALE_TO "100"
455	455	#define DEF_SCALE_VARIABLE ""

476	476	#define DEF_SCROLLBAR_RELIEF "flat"
477	477	#define DEF_SCROLLBAR_REPEAT_DELAY "300"
478	478	#define DEF_SCROLLBAR_REPEAT_INTERVAL "100"
479		#define DEF_SCROLLBAR_TAKE_FOCUS (char *) NULL
	479	#define DEF_SCROLLBAR_TAKE_FOCUS ((char *) NULL)
480	480	#define DEF_SCROLLBAR_TROUGH_COLOR TROUGH
481	481	#define DEF_SCROLLBAR_TROUGH_MONO WHITE
482	482	#define DEF_SCROLLBAR_WIDTH "15"

503	503	#define DEF_TEXT_INSERT_BD_MONO "0"
504	504	#define DEF_TEXT_INSERT_OFF_TIME "300"
505	505	#define DEF_TEXT_INSERT_ON_TIME "600"
	506	#define DEF_TEXT_INSERT_UNFOCUSSED "none"
506	507	#define DEF_TEXT_INSERT_WIDTH "1"
507	508	#define DEF_TEXT_MAX_UNDO "0"
508	509	#define DEF_TEXT_PADX "1"

523	524	#define DEF_TEXT_STATE "normal"
524	525	#define DEF_TEXT_TABS ""
525	526	#define DEF_TEXT_TABSTYLE "tabular"
526		#define DEF_TEXT_TAKE_FOCUS (char *) NULL
	527	#define DEF_TEXT_TAKE_FOCUS ((char *) NULL)
527	528	#define DEF_TEXT_UNDO "0"
528	529	#define DEF_TEXT_WIDTH "80"
529	530	#define DEF_TEXT_WRAP "char"

546	547	#define DEF_TOPLEVEL_SCREEN ""
547	548	#define DEF_TOPLEVEL_USE ""
548	549
	550	/*
	551	* Defaults for busy windows (not really used yet):
	552	*/
	553
	554	#define DEF_BUSY_CURSOR "watch"
	555
549	556	#endif /* _TKMACDEFAULT */

+615

-29

macosx/tkMacOSXDialog.c less more

4	4	*
5	5	* Copyright (c) 1996-1997 Sun Microsystems, Inc.
6	6	* Copyright 2001, Apple Computer, Inc.
7		* Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
	7	* Copyright (c) 2006-2008 Daniel A. Steffen <das@users.sourceforge.net>
8	8	*
9	9	* See the file "license.terms" for information on usage and redistribution
10	10	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkMacOSXDialog.c,v 1.38 2008/09/02 16:10:54 das Exp $
	12	* RCS: @(#) $Id: tkMacOSXDialog.c,v 1.43 2008/12/10 05:02:52 das Exp $
13	13	*/
14	14
15	15	#include "tkMacOSXPrivate.h"

104	104
105	105	static NavObjectFilterUPP openFileFilterUPP;
106	106	static NavEventUPP openFileEventUPP;
107
	107
108	108	/*
109	109	*----------------------------------------------------------------------
110	110	*

134	134	Tk_Window parent, tkwin = clientData;
135	135	const char *title;
136	136	int i, srcRead, dstWrote;
137		CMError cmerr;
138	137	CMProfileRef prof;
139	138	NColorPickerInfo cpinfo;
140	139	static RGBColor color = {0xffff, 0xffff, 0xffff};
141		static const char *optionStrings[] = {
	140	static const char *const optionStrings[] = {
142	141	"-initialcolor", "-parent", "-title", NULL
143	142	};
144	143	enum options {

195	194	}
196	195	}
197	196
198		cmerr = CMGetDefaultProfileBySpace(cmRGBData, &prof);
	197	ChkErr(CMGetDefaultProfileBySpace, cmRGBData, &prof);
199	198	cpinfo.theColor.profile = prof;
200	199	cpinfo.dstProfile = prof;
201	200	cpinfo.flags = kColorPickerDialogIsMoveable \| kColorPickerDialogIsModal;

208	207	TkMacOSXTrackingLoop(1);
209	208	err = ChkErr(NPickColor, &cpinfo);
210	209	TkMacOSXTrackingLoop(0);
211		cmerr = CMCloseProfile(prof);
	210	ChkErr(CMCloseProfile, prof);
212	211	if ((err == noErr) && (cpinfo.newColorChosen != 0)) {
213	212	char colorstr[8];
214	213

226	225	end:
227	226	return result;
228	227	}
229
	228
230	229	/*
231	230	*----------------------------------------------------------------------
232	231	*

261	260	char initialFile = NULL, initialDir = NULL;
262	261	Tcl_Obj *typeVariablePtr = NULL;
263	262	const char *initialtype = NULL;
264		static const char *openOptionStrings[] = {
	263	static const char *const openOptionStrings[] = {
265	264	"-defaultextension", "-filetypes", "-initialdir", "-initialfile",
266	265	"-message", "-multiple", "-parent", "-title", "-typevariable", NULL
267	266	};

314	313	}
315	314	break;
316	315	case OPEN_INITFILE:
317		initialFile = Tcl_GetString(objv[i + 1]);
	316	initialFile = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
318	317	/* empty strings should be like no selection given */
319	318	if (choiceLen == 0) {
320	319	initialFile = NULL;

322	321	break;
323	322	case OPEN_MESSAGE:
324	323	choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
	324	if (message) {
	325	CFRelease(message);
	326	}
325	327	message = CFStringCreateWithBytes(NULL, (unsigned char *) choice,
326	328	choiceLen, kCFStringEncodingUTF8, false);
327	329	break;

340	342	break;
341	343	case OPEN_TITLE:
342	344	choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
	345	if (title) {
	346	CFRelease(title);
	347	}
343	348	title = CFStringCreateWithBytes(NULL, (unsigned char *) choice,
344	349	choiceLen, kCFStringEncodingUTF8, false);
345	350	break;

369	374	while (filterPtr && i-- > 0) {
370	375	filterPtr = filterPtr->next;
371	376	}
372		Tcl_SetVar(interp, Tcl_GetString(typeVariablePtr), filterPtr->name, 0);
	377	Tcl_SetVar(interp, Tcl_GetString(typeVariablePtr), filterPtr ?
	378	filterPtr->name : "", 0);
373	379	}
374	380
375	381	end:

388	394	}
389	395	return result;
390	396	}
391
	397
392	398	/*
393	399	*----------------------------------------------------------------------
394	400	*

419	425	FSRef dirRef;
420	426	CFStringRef title = NULL, message = NULL;
421	427	OpenFileData ofd;
422		static const char *saveOptionStrings[] = {
	428	static const char *const saveOptionStrings[] = {
423	429	"-defaultextension", "-filetypes", "-initialdir", "-initialfile",
424	430	"-message", "-parent", "-title", "-typevariable", NULL
425	431	};

477	483	break;
478	484	case SAVE_MESSAGE:
479	485	choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
	486	if (message) {
	487	CFRelease(message);
	488	}
480	489	message = CFStringCreateWithBytes(NULL, (unsigned char *) choice,
481	490	choiceLen, kCFStringEncodingUTF8, false);
482	491	break;

489	498	break;
490	499	case SAVE_TITLE:
491	500	choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
	501	if (title) {
	502	CFRelease(title);
	503	}
492	504	title = CFStringCreateWithBytes(NULL, (unsigned char *) choice,
493	505	choiceLen, kCFStringEncodingUTF8, false);
494	506	break;

513	525	}
514	526	return result;
515	527	}
516
	528
517	529	/*
518	530	*----------------------------------------------------------------------
519	531	*

545	557	FSRef dirRef;
546	558	CFStringRef message = NULL, title = NULL;
547	559	OpenFileData ofd;
548		static const char *chooseOptionStrings[] = {
	560	static const char *const chooseOptionStrings[] = {
549	561	"-initialdir", "-message", "-mustexist", "-parent", "-title", NULL
550	562	};
551	563	enum chooseOptions {

581	593	break;
582	594	case CHOOSE_MESSAGE:
583	595	choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
	596	if (message) {
	597	CFRelease(message);
	598	}
584	599	message = CFStringCreateWithBytes(NULL, (unsigned char *) choice,
585	600	choiceLen, kCFStringEncodingUTF8, false);
586	601	break;

593	608	break;
594	609	case CHOOSE_TITLE:
595	610	choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
	611	if (title) {
	612	CFRelease(title);
	613	}
596	614	title = CFStringCreateWithBytes(NULL, (unsigned char *) choice,
597	615	choiceLen, kCFStringEncodingUTF8, false);
598	616	break;

619	637	}
620	638	return result;
621	639	}
622
	640
623	641	/*
624	642	*----------------------------------------------------------------------
625	643	*

704	722	}
705	723	return result;
706	724	}
707
	725
708	726	/*
709	727	*----------------------------------------------------------------------
710	728	*

728	746	openFileFilterUPP = NewNavObjectFilterUPP(OpenFileFilterProc);
729	747	openFileEventUPP = NewNavEventUPP(OpenEventProc);
730	748	}
731
	749
732	750	/*
733	751	*----------------------------------------------------------------------
734	752	*

1009	1027	}
1010	1028	return result;
1011	1029	}
1012
	1030
1013	1031	/*
1014	1032	*----------------------------------------------------------------------
1015	1033	*

1094	1112	break;
1095	1113	}
1096	1114	}
1097
	1115
1098	1116	/*
1099	1117	*----------------------------------------------------------------------
1100	1118	*

1191	1209	}
1192	1210	return (result == MATCHED);
1193	1211	}
1194
	1212
1195	1213	/*
1196	1214	*----------------------------------------------------------------------
1197	1215	*

1308	1326
1309	1327	return UNMATCHED;
1310	1328	}
1311
	1329
1312	1330	/*
1313	1331	*----------------------------------------------------------------------
1314	1332	*

1347	1365	DisposeDialog(aboutDlog);
1348	1366	SelectWindow(ActiveNonFloatingWindow());
1349	1367	}
1350
	1368
1351	1369	/*
1352	1370	*----------------------------------------------------------------------
1353	1371	*

1384	1402	int defaultNativeButtonIndex; /* 1, 2, 3: right to left */
1385	1403	int typeIndex, i, indexDefaultOption = 0, result = TCL_ERROR;
1386	1404
1387		static const char *movableAlertStrings[] = {
	1405	static const char *const movableAlertStrings[] = {
1388	1406	"-default", "-detail", "-icon", "-message", "-parent", "-title",
1389	1407	"-type", NULL
1390	1408	};
1391		static const char *movableTypeStrings[] = {
	1409	static const char *const movableTypeStrings[] = {
1392	1410	"abortretryignore", "ok", "okcancel", "retrycancel", "yesno",
1393	1411	"yesnocancel", NULL
1394	1412	};
1395		static const char *movableButtonStrings[] = {
	1413	static const char *const movableButtonStrings[] = {
1396	1414	"abort", "retry", "ignore", "ok", "cancel", "yes", "no", NULL
1397	1415	};
1398		static const char *movableIconStrings[] = {
	1416	static const char *const movableIconStrings[] = {
1399	1417	"error", "info", "question", "warning", NULL
1400	1418	};
1401	1419	enum movableAlertOptions {

1482	1500
1483	1501	case ALERT_DETAIL:
1484	1502	str = Tcl_GetString(objv[i + 1]);
	1503	if (finemessageTextCF) {
	1504	CFRelease(finemessageTextCF);
	1505	}
1485	1506	finemessageTextCF = CFStringCreateWithCString(NULL, str,
1486	1507	kCFStringEncodingUTF8);
1487	1508	break;

1509	1530
1510	1531	case ALERT_MESSAGE:
1511	1532	str = Tcl_GetString(objv[i + 1]);
	1533	if (messageTextCF) {
	1534	CFRelease(messageTextCF);
	1535	}
1512	1536	messageTextCF = CFStringCreateWithCString(NULL, str,
1513	1537	kCFStringEncodingUTF8);
1514	1538	break;

1573	1597	* we do this here.
1574	1598	*/
1575	1599
1576		str = Tcl_GetString(objv[indexDefaultOption + 1]);
1577	1600	if (Tcl_GetIndexFromObj(interp, objv[indexDefaultOption + 1],
1578	1601	movableButtonStrings, "value", TCL_EXACT, &defaultButtonIndex)
1579	1602	!= TCL_OK) {

1670	1693	}
1671	1694	return result;
1672	1695	}
1673
	1696
1674	1697	/*
1675	1698	*----------------------------------------------------------------------
1676	1699	*

1717	1740	}
1718	1741	return eventNotHandledErr;
1719	1742	}
	1743
	1744	/*
	1745	*----------------------------------------------------------------------
	1746	*/
	1747	#pragma mark [tk fontchooser] implementation (TIP 324)
	1748	/*
	1749	*----------------------------------------------------------------------
	1750	*/
	1751
	1752	#include "tkMacOSXEvent.h"
	1753	#include "tkMacOSXFont.h"
	1754
	1755	typedef struct FontchooserData {
	1756	Tcl_Obj *titleObj;
	1757	Tcl_Obj *cmdObj;
	1758	Tk_Window parent;
	1759	} FontchooserData;
	1760
	1761	static Tcl_Obj FontchooserCget(FontchooserData fcdPtr, int optionIndex);
	1762	static int FontchooserConfigureCmd(ClientData clientData, Tcl_Interp *interp,
	1763	int objc, Tcl_Obj *const objv[]);
	1764	static int FontchooserShowCmd(ClientData clientData, Tcl_Interp *interp,
	1765	int objc, Tcl_Obj *const objv[]);
	1766	static int FontchooserHideCmd(ClientData clientData, Tcl_Interp *interp,
	1767	int objc, Tcl_Obj *const objv[]);
	1768	static void FontchooserParentEventHandler(ClientData clientData,
	1769	XEvent *eventPtr);
	1770	static void DeleteFontchooserData(ClientData clientData, Tcl_Interp *interp);
	1771
	1772	MODULE_SCOPE const TkEnsemble tkFontchooserEnsemble[];
	1773	const TkEnsemble tkFontchooserEnsemble[] = {
	1774	{ "configure", FontchooserConfigureCmd },
	1775	{ "show", FontchooserShowCmd },
	1776	{ "hide", FontchooserHideCmd },
	1777	};
	1778
	1779	static Tcl_Interp *fontchooserInterp = NULL;
	1780	static FMFontFamily fontPanelFontFamily = kInvalidFontFamily;
	1781	static FMFontStyle fontPanelFontStyle = -1;
	1782	static FMFontSize fontPanelFontSize = 0;
	1783	static FMFont fontPanelFontID = kInvalidFont;
	1784
	1785	static const char *fontchooserOptionStrings[] = {
	1786	"-parent", "-title", "-font", "-command",
	1787	"-visible", NULL
	1788	};
	1789	enum FontchooserOption {
	1790	FontchooserParent, FontchooserTitle, FontchooserFont, FontchooserCmd,
	1791	FontchooserVisible
	1792	};
	1793
	1794	/*
	1795	*----------------------------------------------------------------------
	1796	*
	1797	* TkMacOSXProcessFontEvent --
	1798	*
	1799	* This processes events generated by user interaction with the
	1800	* font panel.
	1801	*
	1802	* Results:
	1803	* True if Tk events are generated - false otherwise.
	1804	*
	1805	* Side effects:
	1806	* Additional events may be place on the Tk event queue.
	1807	*
	1808	*----------------------------------------------------------------------
	1809	*/
	1810
	1811	MODULE_SCOPE int
	1812	TkMacOSXProcessFontEvent(
	1813	TkMacOSXEvent * eventPtr,
	1814	MacEventStatus * statusPtr)
	1815	{
	1816	OSStatus err;
	1817	int eventGenerated = 0;
	1818	FontchooserData *fcdPtr;
	1819
	1820	switch (eventPtr->eKind) {
	1821	case kEventFontPanelClosed:
	1822	case kEventFontSelection:
	1823	break;
	1824	default:
	1825	goto done;
	1826	}
	1827	if (!fontchooserInterp) {
	1828	goto done;
	1829	}
	1830	fcdPtr = Tcl_GetAssocData(fontchooserInterp, "::tk::fontchooser", NULL);
	1831	switch (eventPtr->eKind) {
	1832	case kEventFontPanelClosed:
	1833	if (!FPIsFontPanelVisible() && fcdPtr->parent != None) {
	1834	TkSendVirtualEvent(fcdPtr->parent, "TkFontchooserVisibility");
	1835	fontchooserInterp = NULL;
	1836	eventGenerated = 1;
	1837	}
	1838	break;
	1839	case kEventFontSelection: {
	1840	Tcl_Obj *fontObj = NULL;
	1841
	1842	fontPanelFontFamily = kInvalidFontFamily;
	1843	fontPanelFontStyle = -1;
	1844	fontPanelFontSize = 0;
	1845	fontPanelFontID = kInvalidFont;
	1846	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	1847	kEventParamFMFontFamily, typeFMFontFamily, NULL,
	1848	sizeof(FMFontFamily), NULL, &fontPanelFontFamily);
	1849	err \|= ChkErr(GetEventParameter, eventPtr->eventRef,
	1850	kEventParamFMFontStyle, typeFMFontStyle, NULL,
	1851	sizeof(FMFontStyle), NULL, &fontPanelFontStyle);
	1852	err \|= ChkErr(GetEventParameter, eventPtr->eventRef,
	1853	kEventParamFMFontSize, typeFMFontSize, NULL,
	1854	sizeof(FMFontSize), NULL, &fontPanelFontSize);
	1855	if (err != noErr) {
	1856	/*
	1857	* No/incomplete QD font spec, use ATSUI font ID
	1858	*/
	1859	Fixed fontFixedSize;
	1860
	1861	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	1862	kEventParamATSUFontID, typeATSUFontID, NULL,
	1863	sizeof(ATSUFontID), NULL, &fontPanelFontID);
	1864	if (err == noErr) {
	1865	ChkErr(FMGetFontFamilyInstanceFromFont, fontPanelFontID,
	1866	&fontPanelFontFamily, &fontPanelFontStyle);
	1867	}
	1868	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	1869	kEventParamATSUFontSize, typeATSUSize, NULL,
	1870	sizeof(Fixed), NULL, &fontFixedSize);
	1871	if (err == noErr) {
	1872	fontPanelFontSize = FixedToInt(fontFixedSize);
	1873	}
	1874	}
	1875	fontObj = TkMacOSXFontDescriptionForFMFontInfo(
	1876	fontPanelFontFamily, fontPanelFontStyle,
	1877	fontPanelFontSize, fontPanelFontID);
	1878	if (fontObj) {
	1879	if (fcdPtr->cmdObj) {
	1880	int objc, result;
	1881	Tcl_Obj objv, tmpv;
	1882
	1883	result = Tcl_ListObjGetElements(fontchooserInterp,
	1884	fcdPtr->cmdObj, &objc, &objv);
	1885	if (result == TCL_OK) {
	1886	tmpv = (Tcl_Obj *) ckalloc(sizeof(Tcl_Obj ) *
	1887	(unsigned)(objc + 2));
	1888	memcpy(tmpv, objv, sizeof(Tcl_Obj ) objc);
	1889	tmpv[objc] = fontObj;
	1890	result = TkBackgroundEvalObjv(fontchooserInterp,
	1891	objc + 1, tmpv, TCL_EVAL_GLOBAL);
	1892	ckfree((char *)tmpv);
	1893	}
	1894	}
	1895	TkSendVirtualEvent(fcdPtr->parent, "TkFontchooserFontChanged");
	1896	}
	1897	break;
	1898	}
	1899	}
	1900	done:
	1901	return eventGenerated;
	1902	}
	1903
	1904	/*
	1905	*----------------------------------------------------------------------
	1906	*
	1907	* FontchooserCget --
	1908	*
	1909	* Helper for the FontchooserConfigure command to return the
	1910	* current value of any of the options (which may be NULL in
	1911	* the structure)
	1912	*
	1913	* Results:
	1914	* Tcl object of option value.
	1915	*
	1916	* Side effects:
	1917	* None.
	1918	*
	1919	*----------------------------------------------------------------------
	1920	*/
	1921
	1922	static Tcl_Obj *
	1923	FontchooserCget(
	1924	FontchooserData *fcdPtr,
	1925	int optionIndex)
	1926	{
	1927	Tcl_Obj *resObj = NULL;
	1928
	1929	switch(optionIndex) {
	1930	case FontchooserParent: {
	1931	if (fcdPtr->parent != None) {
	1932	resObj = Tcl_NewStringObj(
	1933	((TkWindow*)fcdPtr->parent)->pathName, -1);
	1934	} else {
	1935	resObj = Tcl_NewStringObj(".", 1);
	1936	}
	1937	break;
	1938	}
	1939	case FontchooserTitle: {
	1940	if (fcdPtr->titleObj) {
	1941	resObj = fcdPtr->titleObj;
	1942	} else {
	1943	resObj = Tcl_NewObj();
	1944	}
	1945	break;
	1946	}
	1947	case FontchooserFont: {
	1948	resObj = TkMacOSXFontDescriptionForFMFontInfo(
	1949	fontPanelFontFamily, fontPanelFontStyle,
	1950	fontPanelFontSize, fontPanelFontID);
	1951	if (!resObj) {
	1952	resObj = Tcl_NewObj();
	1953	}
	1954	break;
	1955	}
	1956	case FontchooserCmd: {
	1957	if (fcdPtr->cmdObj) {
	1958	resObj = fcdPtr->cmdObj;
	1959	} else {
	1960	resObj = Tcl_NewObj();
	1961	}
	1962	break;
	1963	}
	1964	case FontchooserVisible: {
	1965	resObj = Tcl_NewBooleanObj(FPIsFontPanelVisible());
	1966	break;
	1967	}
	1968	default: {
	1969	resObj = Tcl_NewObj();
	1970	}
	1971	}
	1972	return resObj;
	1973	}
	1974
	1975	/*
	1976	* ----------------------------------------------------------------------
	1977	*
	1978	* FontchooserConfigureCmd --
	1979	*
	1980	* Implementation of the 'tk fontchooser configure' ensemble command.
	1981	* See the user documentation for what it does.
	1982	*
	1983	* Results:
	1984	* See the user documentation.
	1985	*
	1986	* Side effects:
	1987	* Per-interp data structure may be modified
	1988	*
	1989	* ----------------------------------------------------------------------
	1990	*/
	1991
	1992	static int
	1993	FontchooserConfigureCmd(
	1994	ClientData clientData, /* Main window */
	1995	Tcl_Interp *interp,
	1996	int objc,
	1997	Tcl_Obj *const objv[])
	1998	{
	1999	Tk_Window tkwin = (Tk_Window)clientData;
	2000	FontchooserData *fcdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser",
	2001	NULL);
	2002	int i, r = TCL_OK;
	2003
	2004	/*
	2005	* With no arguments we return all the options in a dict
	2006	*/
	2007
	2008	if (objc == 1) {
	2009	Tcl_Obj keyObj, valueObj;
	2010	Tcl_Obj *dictObj = Tcl_NewDictObj();
	2011	for (i = 0; r == TCL_OK && fontchooserOptionStrings[i] != NULL; ++i) {
	2012	keyObj = Tcl_NewStringObj(fontchooserOptionStrings[i], -1);
	2013	valueObj = FontchooserCget(fcdPtr, i);
	2014	r = Tcl_DictObjPut(interp, dictObj, keyObj, valueObj);
	2015	}
	2016	if (r == TCL_OK) {
	2017	Tcl_SetObjResult(interp, dictObj);
	2018	}
	2019	return r;
	2020	}
	2021
	2022	for (i = 1; i < objc; i += 2) {
	2023	int optionIndex, len;
	2024	if (Tcl_GetIndexFromObj(interp, objv[i], fontchooserOptionStrings,
	2025	"option", 0, &optionIndex) != TCL_OK) {
	2026	return TCL_ERROR;
	2027	}
	2028	if (objc == 2) {
	2029	/* With one option and no arg, return the current value */
	2030	Tcl_SetObjResult(interp, FontchooserCget(fcdPtr, optionIndex));
	2031	return TCL_OK;
	2032	}
	2033	if (i + 1 == objc) {
	2034	Tcl_AppendResult(interp, "value for \"",
	2035	Tcl_GetString(objv[i]), "\" missing", NULL);
	2036	return TCL_ERROR;
	2037	}
	2038	switch (optionIndex) {
	2039	case FontchooserVisible: {
	2040	const char *msg = "cannot change read-only option "
	2041	"\"-visible\": use the show or hide command";
	2042
	2043	Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, sizeof(msg)-1));
	2044	return TCL_ERROR;
	2045	}
	2046	case FontchooserParent: {
	2047	Tk_Window parent = Tk_NameToWindow(interp,
	2048	Tcl_GetString(objv[i+1]), tkwin);
	2049	if (parent == None) {
	2050	return TCL_ERROR;
	2051	}
	2052	if (fcdPtr->parent) {
	2053	Tk_DeleteEventHandler(fcdPtr->parent, StructureNotifyMask,
	2054	FontchooserParentEventHandler, fcdPtr);
	2055	}
	2056	fcdPtr->parent = parent;
	2057	Tk_CreateEventHandler(fcdPtr->parent, StructureNotifyMask,
	2058	FontchooserParentEventHandler, fcdPtr);
	2059	break;
	2060	}
	2061	case FontchooserTitle:
	2062	if (fcdPtr->titleObj) {
	2063	Tcl_DecrRefCount(fcdPtr->titleObj);
	2064	}
	2065	Tcl_GetStringFromObj(objv[i+1], &len);
	2066	if (len) {
	2067	fcdPtr->titleObj = objv[i+1];
	2068	if (Tcl_IsShared(fcdPtr->titleObj)) {
	2069	fcdPtr->titleObj = Tcl_DuplicateObj(fcdPtr->titleObj);
	2070	}
	2071	Tcl_IncrRefCount(fcdPtr->titleObj);
	2072	} else {
	2073	fcdPtr->titleObj = NULL;
	2074	}
	2075	break;
	2076	case FontchooserFont: {
	2077
	2078	Tcl_GetStringFromObj(objv[i+1], &len);
	2079	if (len) {
	2080	Tk_Font f = Tk_AllocFontFromObj(interp, tkwin, objv[i+1]);
	2081	if (f) {
	2082	ATSUStyle atsuStyle;
	2083
	2084	TkMacOSXFMFontInfoForFont(f, &fontPanelFontFamily,
	2085	&fontPanelFontStyle, &fontPanelFontSize,
	2086	&atsuStyle);
	2087	ChkErr(SetFontInfoForSelection,
	2088	kFontSelectionATSUIType, 1, &atsuStyle, NULL);
	2089	Tk_FreeFont(f);
	2090	} else {
	2091	return TCL_ERROR;
	2092	}
	2093	} else {
	2094	fontPanelFontFamily = kInvalidFontFamily;
	2095	ChkErr(SetFontInfoForSelection,
	2096	kFontSelectionATSUIType, 0, NULL, NULL);
	2097	}
	2098	if (FPIsFontPanelVisible()) {
	2099	TkSendVirtualEvent(fcdPtr->parent,
	2100	"TkFontchooserFontChanged");
	2101	}
	2102	break;
	2103	}
	2104	case FontchooserCmd:
	2105	if (fcdPtr->cmdObj) {
	2106	Tcl_DecrRefCount(fcdPtr->cmdObj);
	2107	}
	2108	Tcl_GetStringFromObj(objv[i+1], &len);
	2109	if (len) {
	2110	fcdPtr->cmdObj = objv[i+1];
	2111	if (Tcl_IsShared(fcdPtr->cmdObj)) {
	2112	fcdPtr->cmdObj = Tcl_DuplicateObj(fcdPtr->cmdObj);
	2113	}
	2114	Tcl_IncrRefCount(fcdPtr->cmdObj);
	2115	} else {
	2116	fcdPtr->cmdObj = NULL;
	2117	}
	2118	break;
	2119	}
	2120	}
	2121	return TCL_OK;
	2122	}
	2123
	2124	/*
	2125	* ----------------------------------------------------------------------
	2126	*
	2127	* FontchooserShowCmd --
	2128	*
	2129	* Implements the 'tk fontchooser show' ensemble command. The
	2130	* per-interp configuration data for the dialog is held in an interp
	2131	* associated structure.
	2132	*
	2133	* Results:
	2134	* See the user documentation.
	2135	*
	2136	* Side effects:
	2137	* Font Panel may be shown.
	2138	*
	2139	* ----------------------------------------------------------------------
	2140	*/
	2141
	2142	static int
	2143	FontchooserShowCmd(
	2144	ClientData clientData, /* Main window */
	2145	Tcl_Interp *interp,
	2146	int objc,
	2147	Tcl_Obj *const objv[])
	2148	{
	2149	FontchooserData *fcdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser",
	2150	NULL);
	2151
	2152	if (fcdPtr->parent == None) {
	2153	fcdPtr->parent = (Tk_Window) clientData;
	2154	Tk_CreateEventHandler(fcdPtr->parent, StructureNotifyMask,
	2155	FontchooserParentEventHandler, fcdPtr);
	2156	}
	2157	if (!FPIsFontPanelVisible()) {
	2158	ChkErr(FPShowHideFontPanel);
	2159	TkSendVirtualEvent(fcdPtr->parent, "TkFontchooserVisibility");
	2160	}
	2161	fontchooserInterp = interp;
	2162
	2163	return TCL_OK;
	2164	}
	2165
	2166	/*
	2167	* ----------------------------------------------------------------------
	2168	*
	2169	* FontchooserHideCmd --
	2170	*
	2171	* Implementation of the 'tk fontchooser hide' ensemble. See the
	2172	* user documentation for details.
	2173	*
	2174	* Results:
	2175	* See the user documentation.
	2176	*
	2177	* Side effects:
	2178	* Font Panel may be hidden.
	2179	*
	2180	* ----------------------------------------------------------------------
	2181	*/
	2182
	2183	static int
	2184	FontchooserHideCmd(
	2185	ClientData clientData, /* Main window */
	2186	Tcl_Interp *interp,
	2187	int objc,
	2188	Tcl_Obj *const objv[])
	2189	{
	2190	if (FPIsFontPanelVisible()) {
	2191	ChkErr(FPShowHideFontPanel);
	2192	}
	2193	return TCL_OK;
	2194	}
	2195
	2196	/*
	2197	* ----------------------------------------------------------------------
	2198	*
	2199	* FontchooserParentEventHandler --
	2200	*
	2201	* Event handler for StructureNotify events on the font chooser's
	2202	* parent window.
	2203	*
	2204	* Results:
	2205	* None.
	2206	*
	2207	* Side effects:
	2208	* Font chooser parent info is cleared and font panel is hidden.
	2209	*
	2210	* ----------------------------------------------------------------------
	2211	*/
	2212
	2213	static void
	2214	FontchooserParentEventHandler(
	2215	ClientData clientData,
	2216	XEvent *eventPtr)
	2217	{
	2218	FontchooserData *fcdPtr = clientData;
	2219
	2220	if (eventPtr->type == DestroyNotify) {
	2221	Tk_DeleteEventHandler(fcdPtr->parent, StructureNotifyMask,
	2222	FontchooserParentEventHandler, fcdPtr);
	2223	fcdPtr->parent = None;
	2224	if (FPIsFontPanelVisible()) {
	2225	ChkErr(FPShowHideFontPanel);
	2226	}
	2227	}
	2228	}
	2229
	2230	/*
	2231	* ----------------------------------------------------------------------
	2232	*
	2233	* DeleteFontchooserData --
	2234	*
	2235	* Clean up the font chooser configuration data when the interp
	2236	* is destroyed.
	2237	*
	2238	* Results:
	2239	* None.
	2240	*
	2241	* Side effects:
	2242	* per-interp configuration data is destroyed.
	2243	*
	2244	* ----------------------------------------------------------------------
	2245	*/
	2246
	2247	static void
	2248	DeleteFontchooserData(
	2249	ClientData clientData,
	2250	Tcl_Interp *interp)
	2251	{
	2252	FontchooserData *fcdPtr = clientData;
	2253
	2254	if (fcdPtr->titleObj) {
	2255	Tcl_DecrRefCount(fcdPtr->titleObj);
	2256	}
	2257	if (fcdPtr->cmdObj) {
	2258	Tcl_DecrRefCount(fcdPtr->cmdObj);
	2259	}
	2260	ckfree((char *)fcdPtr);
	2261
	2262	if (fontchooserInterp == interp) {
	2263	fontchooserInterp = NULL;
	2264	}
	2265	}
	2266
	2267	/*
	2268	* ----------------------------------------------------------------------
	2269	*
	2270	* TkInitFontchooser --
	2271	*
	2272	* Associate the font chooser configuration data with the Tcl
	2273	* interpreter. There is one font chooser per interp.
	2274	*
	2275	* Results:
	2276	* None.
	2277	*
	2278	* Side effects:
	2279	* per-interp configuration data is destroyed.
	2280	*
	2281	* ----------------------------------------------------------------------
	2282	*/
	2283
	2284	MODULE_SCOPE int
	2285	TkInitFontchooser(
	2286	Tcl_Interp *interp,
	2287	ClientData clientData)
	2288	{
	2289	FontchooserData fcdPtr = (FontchooserData)
	2290	ckalloc(sizeof(FontchooserData));
	2291
	2292	bzero(fcdPtr, sizeof(FontchooserData));
	2293	Tcl_SetAssocData(interp, "::tk::fontchooser", DeleteFontchooserData,
	2294	fcdPtr);
	2295	return TCL_OK;
	2296	}
	2297
	2298	/*
	2299	* Local Variables:
	2300	* mode: c
	2301	* c-basic-offset: 4
	2302	* fill-column: 79
	2303	* coding: utf-8
	2304	* End:
	2305	*/

+64

-1

macosx/tkMacOSXEmbed.c less more

13	13	* See the file "license.terms" for information on usage and redistribution of
14	14	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
15	15	*
16		* RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.18 2008/06/19 00:14:10 das Exp $
	16	* RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.19 2008/10/20 10:50:20 dkf Exp $
17	17	*/
18	18
19	19	#include "tkMacOSXInt.h"
	20	#include "tkBusy.h"
20	21
21	22	/*
22	23	* One of the following structures exists for each container in this

1118	1119	ckfree((char *) containerPtr);
1119	1120	}
1120	1121	}
	1122
	1123	/*
	1124	*----------------------------------------------------------------------
	1125	*
	1126	* TkpShowBusyWindow, TkpHideBusyWindow, TkpMakeTransparentWindowExist,
	1127	* TkpCreateBusy --
	1128	*
	1129	* Portability layer for busy windows. Holds platform-specific gunk for
	1130	* the [tk busy] command, which is currently a dummy implementation for
	1131	* OSX/Aqua. The individual functions are supposed to do the following:
	1132	*
	1133	* TkpShowBusyWindow --
	1134	* Make the busy window appear.
	1135	*
	1136	* TkpHideBusyWindow --
	1137	* Make the busy window go away.
	1138	*
	1139	* TkpMakeTransparentWindowExist --
	1140	* Actually make a transparent window.
	1141	*
	1142	* TkpCreateBusy --
	1143	* Creates the platform-specific part of a busy window structure.
	1144	*
	1145	*----------------------------------------------------------------------
	1146	*/
	1147
	1148	void
	1149	TkpShowBusyWindow(
	1150	TkBusy busy)
	1151	{
	1152	}
	1153
	1154	void
	1155	TkpHideBusyWindow(
	1156	TkBusy busy)
	1157	{
	1158	}
	1159
	1160	void
	1161	TkpMakeTransparentWindowExist(
	1162	Tk_Window tkwin, /* Token for window. */
	1163	Window parent) /* Parent window. */
	1164	{
	1165	}
	1166
	1167	void
	1168	TkpCreateBusy(
	1169	Tk_FakeWin *winPtr,
	1170	Tk_Window tkRef,
	1171	Window* parentPtr,
	1172	Tk_Window tkParent,
	1173	TkBusy busy)
	1174	{
	1175	}
	1176
	1177	/*
	1178	* Local Variables:
	1179	* mode: c
	1180	* c-basic-offset: 4
	1181	* fill-column: 78
	1182	* End:
	1183	*/

+49

-43

macosx/tkMacOSXEntry.c less more

52	52	* software in accordance with the terms specified in this
53	53	* license.
54	54	*
55		* RCS: @(#) $Id: tkMacOSXEntry.c,v 1.14 2007/12/13 15:27:09 dgp Exp $
	55	* RCS: @(#) $Id: tkMacOSXEntry.c,v 1.15 2008/11/08 18:44:40 dkf Exp $
56	56	*/
57	57
58	58	#include "tkMacOSXPrivate.h"
59	59	#include "tkMacOSXDefault.h"
60	60	#include "tkEntry.h"
61	61
62		static ThemeButtonKind ComputeIncDecParameters (int height, int *width);
63
	62	static ThemeButtonKind ComputeIncDecParameters(int height, int *width);
	63
64	64	/*
65	65	*--------------------------------------------------------------
66	66	*
67	67	* ComputeIncDecParameters --
68	68	*
69		* This procedure figures out which of the kThemeIncDec
70		* buttons to use. It also sets width to the width of the
71		* IncDec button.
	69	* This procedure figures out which of the kThemeIncDec buttons to use.
	70	* It also sets width to the width of the IncDec button.
72	71	*
73	72	* Results:
74	73	* The ThemeButtonKind of the button we should use.

78	77	*
79	78	*--------------------------------------------------------------
80	79	*/
	80
81	81	static ThemeButtonKind
82		ComputeIncDecParameters(int height, int *width)
	82	ComputeIncDecParameters(
	83	int height,
	84	int *width)
83	85	{
84	86	ThemeButtonKind kind;
85	87

111	113
112	114	return kind;
113	115	}
114
	116
115	117	/*
116	118	*--------------------------------------------------------------
117	119	*
118	120	* TkpDrawEntryBorderAndFocus --
119	121	*
120		* This procedure redraws the border of an entry window.
121		* It overrides the generic border drawing code if the
122		* entry widget parameters are such that the native widget
123		* drawing is a good fit.
124		* This version just returns 1, so platforms that don't
125		* do special native drawing don't have to implement it.
	122	* This procedure redraws the border of an entry window. It overrides the
	123	* generic border drawing code if the entry widget parameters are such
	124	* that the native widget drawing is a good fit. This version just
	125	* returns 1, so platforms that don't do special native drawing don't
	126	* have to implement it.
126	127	*
127	128	* Results:
128	129	* 1 if it has drawn the border, 0 if not.

132	133	*
133	134	*--------------------------------------------------------------
134	135	*/
	136
135	137	int
136		TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
	138	TkpDrawEntryBorderAndFocus(
	139	Entry *entryPtr,
	140	Drawable d,
	141	int isSpinbox)
137	142	{
138	143	Rect bounds;
139	144	TkMacOSXDrawingContext dc;

144	149	MacDrawable macDraw = (MacDrawable ) d;
145	150
146	151	/*
147		* I use 6 as the borderwidth. 2 of the 5 go into the actual frame the
148		* 3 are because the Mac OS Entry widgets leave more space around the
149		* Text than Tk does on X11.
	152	* I use 6 as the borderwidth. 2 of the 5 go into the actual frame the 3
	153	* are because the Mac OS Entry widgets leave more space around the Text
	154	* than Tk does on X11.
150	155	*/
151	156
152	157	if (entryPtr->borderWidth != MAC_OSX_ENTRY_BORDER

156	161	}
157	162
158	163	/*
159		* For the spinbox, we have to make the entry part smaller by the size
160		* of the buttons. We also leave 2 pixels to the left (as per the HIG)
161		* and space for one pixel to the right, 'cause it makes the buttons look
	164	* For the spinbox, we have to make the entry part smaller by the size of
	165	* the buttons. We also leave 2 pixels to the left (as per the HIG) and
	166	* space for one pixel to the right, 'cause it makes the buttons look
162	167	* nicer.
163	168	*/
164	169

174	179	}
175	180
176	181	/*
177		* The focus ring is drawn with an Alpha at the outside
178		* part of the ring, so we have to draw over the edges of the
179		* ring before drawing the focus or the text will peep through.
	182	* The focus ring is drawn with an Alpha at the outside part of the ring,
	183	* so we have to draw over the edges of the ring before drawing the focus
	184	* or the text will peep through.
180	185	*/
181	186
182	187	bgGC = Tk_GCForColor(entryPtr->highlightBgColorPtr, d);
183	188	TkDrawInsetFocusHighlight(entryPtr->tkwin, bgGC, MAC_OSX_FOCUS_WIDTH, d, 0);
184	189
185	190	/*
186		* Inset the entry Frame by the maximum width of the focus rect,
187		* which is 3 according to the Carbon docs.
	191	* Inset the entry Frame by the maximum width of the focus rect, which is
	192	* 3 according to the Carbon docs.
188	193	*/
189	194
190	195	bounds.left = macDraw->xOff + MAC_OSX_FOCUS_WIDTH;

202	207	DrawThemeEditTextFrame(&bounds, drawState);
203	208	if (entryPtr->flags & GOT_FOCUS) {
204	209	/*
205		* Don't call this if we don't have the focus, because then it
206		* erases the focus rect to white, but we've already drawn the
	210	* Don't call this if we don't have the focus, because then it erases
	211	* the focus rect to white, but we've already drawn the
207	212	* highlightbackground above.
208	213	*/
209	214

215	220	TkMacOSXRestoreDrawingContext(&dc);
216	221	return 1;
217	222	}
	223
218	224	/*
219	225	*--------------------------------------------------------------
220	226	*
221	227	* TkpDrawSpinboxButtons --
222	228	*
223		* This procedure redraws the buttons of an spinbox widget.
224		* It overrides the generic button drawing code if the
225		* spinbox widget parameters are such that the native widget
226		* drawing is a good fit.
227		* This version just returns 0, so platforms that don't
228		* do special native drawing don't have to implement it.
	229	* This procedure redraws the buttons of an spinbox widget. It overrides
	230	* the generic button drawing code if the spinbox widget parameters are
	231	* such that the native widget drawing is a good fit. This version just
	232	* returns 0, so platforms that don't do special native drawing don't
	233	* have to implement it.
229	234	*
230	235	* Results:
231	236	* 1 if it has drawn the border, 0 if not.

237	242	*/
238	243
239	244	int
240		TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
	245	TkpDrawSpinboxButtons(
	246	Spinbox *sbPtr,
	247	Drawable d)
241	248	{
242	249	Rect inBounds;
243	250	ThemeButtonKind inKind;

264	271	}
265	272
266	273	/*
267		* The actual sizes of the IncDec button are 21 for the normal,
268		* 18 for the small and 15 for the mini. But the spinbox still
269		* looks okay if the entry is a little bigger than this, so we
270		* give it a little slop.
	274	* The actual sizes of the IncDec button are 21 for the normal, 18 for the
	275	* small and 15 for the mini. But the spinbox still looks okay if the
	276	* entry is a little bigger than this, so we give it a little slop.
271	277	*/
272	278
273	279	inKind = ComputeIncDecParameters(buttonHeight, &incDecWidth);

296	302	inBounds.top = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
297	303	inBounds.bottom = macDraw->yOff + Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
298	304
299		/* We had to make the entry part of the window smaller so that we
300		* wouldn't overdraw the spin buttons with the focus highlight. So
301		* now we have to draw the highlightbackground.
	305	/*
	306	* We had to make the entry part of the window smaller so that we wouldn't
	307	* overdraw the spin buttons with the focus highlight. So now we have to
	308	* draw the highlightbackground.
302	309	*/
303	310
304	311	bgGC = Tk_GCForColor(sbPtr->entry.highlightBgColorPtr, d);

316	323	TkMacOSXRestoreDrawingContext(&dc);
317	324	return 1;
318	325	}
319

+122

-98

macosx/tkMacOSXEvent.c less more

9	9	* See the file "license.terms" for information on usage and redistribution
10	10	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkMacOSXEvent.c,v 1.23 2007/12/13 15:27:09 dgp Exp $
	12	* RCS: @(#) $Id: tkMacOSXEvent.c,v 1.25 2008/12/10 05:02:52 das Exp $
13	13	*/
14	14
15	15	#include "tkMacOSXPrivate.h"
16	16	#include "tkMacOSXEvent.h"
17	17	#include "tkMacOSXDebug.h"
18
19	18
20	19	/*
21	20	*----------------------------------------------------------------------
22	21	*
23	22	* TkMacOSXFlushWindows --
24	23	*
25		* This routine flushes all the Carbon windows of the application. It
26		* is called by XSync().
	24	* This routine flushes all the Carbon windows of the application. It is
	25	* called by XSync().
27	26	*
28	27	* Results:
29	28	* None.

61	60	* This dispatches a filtered Carbon event to the appropriate handler
62	61	*
63	62	* Note on MacEventStatus.stopProcessing: Please be conservative in the
64		* individual handlers and don't assume the event is fully handled
65		* unless you really need to ensure that other handlers don't see the
66		* event anymore. Some OS manager or library might be interested in
67		* events even after they are already handled on the Tk level.
	63	* individual handlers and don't assume the event is fully handled unless
	64	* you really need to ensure that other handlers don't see the event
	65	* anymore. Some OS manager or library might be interested in events even
	66	* after they are already handled on the Tk level.
68	67	*
69	68	* Results:
70	69	* 0 on success

82	81	MacEventStatus *statusPtr)
83	82	{
84	83	switch (eventPtr->eClass) {
85		case kEventClassMouse:
86		TkMacOSXProcessMouseEvent(eventPtr, statusPtr);
87		break;
88		case kEventClassWindow:
89		TkMacOSXProcessWindowEvent(eventPtr, statusPtr);
90		break;
91		case kEventClassKeyboard:
92		TkMacOSXProcessKeyboardEvent(eventPtr, statusPtr);
93		break;
94		case kEventClassApplication:
95		TkMacOSXProcessApplicationEvent(eventPtr, statusPtr);
96		break;
97		case kEventClassAppearance:
98		TkMacOSXProcessAppearanceEvent(eventPtr, statusPtr);
99		break;
100		case kEventClassMenu:
101		TkMacOSXProcessMenuEvent(eventPtr, statusPtr);
102		break;
103		case kEventClassCommand:
104		TkMacOSXProcessCommandEvent(eventPtr, statusPtr);
105		break;
106		default: {
107		TkMacOSXDbgMsg("Unrecognised event: %s",
108		TkMacOSXCarbonEventToAscii(eventPtr->eventRef));
109		break;
110		}
	84	case kEventClassMouse:
	85	TkMacOSXProcessMouseEvent(eventPtr, statusPtr);
	86	break;
	87	case kEventClassWindow:
	88	TkMacOSXProcessWindowEvent(eventPtr, statusPtr);
	89	break;
	90	case kEventClassKeyboard:
	91	TkMacOSXProcessKeyboardEvent(eventPtr, statusPtr);
	92	break;
	93	case kEventClassApplication:
	94	TkMacOSXProcessApplicationEvent(eventPtr, statusPtr);
	95	break;
	96	case kEventClassAppearance:
	97	TkMacOSXProcessAppearanceEvent(eventPtr, statusPtr);
	98	break;
	99	case kEventClassMenu:
	100	TkMacOSXProcessMenuEvent(eventPtr, statusPtr);
	101	break;
	102	case kEventClassCommand:
	103	TkMacOSXProcessCommandEvent(eventPtr, statusPtr);
	104	break;
	105	case kEventClassFont:
	106	TkMacOSXProcessFontEvent(eventPtr, statusPtr);
	107	break;
	108	default: {
	109	TkMacOSXDbgMsg("Unrecognised event: %s",
	110	TkMacOSXCarbonEventToAscii(eventPtr->eventRef));
	111	break;
	112	}
111	113	}
112	114	return 0;
113	115	}

117	119	*
118	120	* TkMacOSXProcessMenuEvent --
119	121	*
120		* This routine processes the event in eventPtr, and
121		* generates the appropriate Tk events from it.
	122	* This routine processes the event in eventPtr, and generates the
	123	* appropriate Tk events from it.
122	124	*
123	125	* Results:
124	126	* True if event(s) are generated - false otherwise.

136	138	{
137	139	int menuContext;
138	140	OSStatus err;
	141	MenuRef menu;
	142	MenuItemIndex index;
139	143
140	144	switch (eventPtr->eKind) {
	145	case kEventMenuBeginTracking:
	146	case kEventMenuEndTracking:
	147	case kEventMenuOpening:
	148	case kEventMenuTargetItem:
	149	break;
	150	default:
	151	return 0;
	152	}
	153	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	154	kEventParamMenuContext, typeUInt32, NULL, sizeof(menuContext),
	155	NULL, &menuContext);
	156	if (err != noErr) {
	157	return 0;
	158	}
	159
	160	if ((menuContext & kMenuContextMenuBarTracking) \|\|
	161	(menuContext & kMenuContextPopUpTracking)) {
	162	switch (eventPtr->eKind) {
141	163	case kEventMenuBeginTracking:
	164	TkMacOSXClearMenubarActive();
	165
	166	/*
	167	* Handle -postcommand
	168	*/
	169
	170	TkMacOSXPreprocessMenu();
	171	TkMacOSXTrackingLoop(1);
	172	break;
142	173	case kEventMenuEndTracking:
	174	TkMacOSXTrackingLoop(0);
	175	break;
143	176	case kEventMenuOpening:
	177	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	178	kEventParamDirectObject, typeMenuRef, NULL, sizeof(menu),
	179	NULL, &menu);
	180	if (err != noErr) {
	181	return 0;
	182	}
	183	TkMacOSXClearActiveMenu(menu);
	184	return TkMacOSXGenerateParentMenuSelectEvent(menu);
144	185	case kEventMenuTargetItem:
145		break;
146		default:
147		return 0;
148		break;
149		}
150		err = ChkErr(GetEventParameter, eventPtr->eventRef, kEventParamMenuContext,
151		typeUInt32, NULL, sizeof(menuContext), NULL, &menuContext);
152		if (err == noErr && ((menuContext & kMenuContextMenuBarTracking) \|\|
153		(menuContext & kMenuContextPopUpTracking))) {
154		switch (eventPtr->eKind) {
155		MenuRef menu;
156
157		case kEventMenuBeginTracking:
158		TkMacOSXClearMenubarActive();
159
160		/*
161		* Handle -postcommand
162		*/
163
164		TkMacOSXPreprocessMenu();
165		TkMacOSXTrackingLoop(1);
166		break;
167		case kEventMenuEndTracking:
168		TkMacOSXTrackingLoop(0);
169		break;
170		case kEventMenuOpening:
171		err = ChkErr(GetEventParameter, eventPtr->eventRef,
172		kEventParamDirectObject, typeMenuRef, NULL,
173		sizeof(menu), NULL, &menu);
174		if (err == noErr) {
175		TkMacOSXClearActiveMenu(menu);
176		return TkMacOSXGenerateParentMenuSelectEvent(menu);
177		}
178		break;
179		case kEventMenuTargetItem:
180		err = ChkErr(GetEventParameter, eventPtr->eventRef,
181		kEventParamDirectObject, typeMenuRef, NULL,
182		sizeof(menu), NULL, &menu);
183		if (err == noErr) {
184		MenuItemIndex index;
185
186		err = ChkErr(GetEventParameter, eventPtr->eventRef,
187		kEventParamMenuItemIndex, typeMenuItemIndex, NULL,
188		sizeof(index), NULL, &index);
189		if (err == noErr) {
190		return TkMacOSXGenerateMenuSelectEvent(menu, index);
191		}
192		}
193		break;
	186	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	187	kEventParamDirectObject, typeMenuRef, NULL, sizeof(menu),
	188	NULL, &menu);
	189	if (err != noErr) {
	190	return 0;
	191	}
	192
	193	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	194	kEventParamMenuItemIndex, typeMenuItemIndex, NULL,
	195	sizeof(index), NULL, &index);
	196	if (err != noErr) {
	197	return 0;
	198	}
	199	return TkMacOSXGenerateMenuSelectEvent(menu, index);
194	200	}
195	201	}
196	202	return 0;

201	207	*
202	208	* TkMacOSXProcessCommandEvent --
203	209	*
204		* This routine processes the event in eventPtr, and
205		* generates the appropriate Tk events from it.
	210	* This routine processes the event in eventPtr, and generates the
	211	* appropriate Tk events from it.
206	212	*
207	213	* Results:
208	214	* True if event(s) are generated - false otherwise.

216	222	MODULE_SCOPE int
217	223	TkMacOSXProcessCommandEvent(
218	224	TkMacOSXEvent *eventPtr,
219		MacEventStatus * statusPtr)
	225	MacEventStatus *statusPtr)
220	226	{
221	227	HICommand command;
222	228	int menuContext;
223	229	OSStatus err;
224	230
225	231	switch (eventPtr->eKind) {
226		case kEventCommandProcess:
227		case kEventCommandUpdateStatus:
228		break;
229		default:
230		return 0;
231		break;
232		}
	232	case kEventCommandProcess:
	233	case kEventCommandUpdateStatus:
	234	break;
	235	default:
	236	return 0;
	237	}
	238
233	239	err = ChkErr(GetEventParameter, eventPtr->eventRef,
234	240	kEventParamDirectObject, typeHICommand, NULL, sizeof(command),
235	241	NULL, &command);
236		if (err == noErr && (command.attributes & kHICommandFromMenu)) {
	242	if (err != noErr) {
	243	return 0;
	244	}
	245
	246	if (command.attributes & kHICommandFromMenu) {
237	247	if (eventPtr->eKind == kEventCommandProcess) {
238	248	err = ChkErr(GetEventParameter, eventPtr->eventRef,
239	249	kEventParamMenuContext, typeUInt32, NULL,
240	250	sizeof(menuContext), NULL, &menuContext);
241		if (err == noErr && (menuContext & kMenuContextMenuBar) &&
	251	if (err != noErr) {
	252	return 0;
	253	}
	254
	255	if ((menuContext & kMenuContextMenuBar) &&
242	256	(menuContext & kMenuContextMenuBarTracking)) {
243	257	TkMacOSXHandleMenuSelect(GetMenuID(command.menu.menuRef),
244	258	command.menu.menuItemIndex,

247	261	}
248	262	} else {
249	263	Tcl_CmdInfo dummy;
250		if (command.commandID == kHICommandPreferences && eventPtr->interp) {
	264
	265	if (command.commandID == kHICommandPreferences
	266	&& eventPtr->interp != NULL) {
251	267	if (Tcl_GetCommandInfo(eventPtr->interp,
252	268	"::tk::mac::ShowPreferences", &dummy)) {
253	269	if (!IsMenuItemEnabled(command.menu.menuRef,

269	285	}
270	286	return 0;
271	287	}
	288
	289	/*
	290	* Local Variables:
	291	* mode: c
	292	* c-basic-offset: 4
	293	* fill-column: 78
	294	* End:
	295	*/

+3

-1

macosx/tkMacOSXEvent.h less more

53	53	* software in accordance with the terms specified in this
54	54	* license.
55	55	*
56		* RCS: @(#) $Id: tkMacOSXEvent.h,v 1.12 2007/04/23 21:24:33 das Exp $
	56	* RCS: @(#) $Id: tkMacOSXEvent.h,v 1.13 2008/12/10 05:02:52 das Exp $
57	57	*/
58	58
59	59	#ifndef _TKMACEVENT

97	97	MacEventStatus *statusPtr);
98	98	MODULE_SCOPE int TkMacOSXProcessCommandEvent(TkMacOSXEvent *e,
99	99	MacEventStatus *statusPtr);
	100	MODULE_SCOPE int TkMacOSXProcessFontEvent(TkMacOSXEvent *e,
	101	MacEventStatus *statusPtr);
100	102	MODULE_SCOPE int TkMacOSXKeycodeToUnicode(
101	103	UniChar * uniChars, int maxChars,
102	104	EventKind eKind,

+165

-6

macosx/tkMacOSXFont.c less more

34	34	* that such fonts can not be used for controls, because controls
35	35	* definitely require a family id (this assertion needs testing).
36	36	*
37		* RCS: @(#) $Id: tkMacOSXFont.c,v 1.39 2008/08/19 00:17:44 das Exp $
	37	* RCS: @(#) $Id: tkMacOSXFont.c,v 1.43 2008/12/10 05:02:52 das Exp $
38	38	*/
39	39
40	40	#include "tkMacOSXPrivate.h"

261	261	static void InitSystemFonts(TkMainInfo *mainPtr);
262	262	static int CreateNamedSystemFont(Tcl_Interp *interp, Tk_Window tkwin,
263	263	const char* name, TkFontAttributes *faPtr);
264
	264	static void DrawCharsInContext(Display *display,
	265	Drawable drawable, GC gc, Tk_Font tkfont,
	266	const char *source, int numBytes, int rangeStart,
	267	int rangeLength, int x, int y, double angle);
265	268
266	269	/*
267	270	*-------------------------------------------------------------------------

1134	1137	int x, int y) /* Coordinates at which to place origin of the
1135	1138	* string when drawing. */
1136	1139	{
1137		TkpDrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
1138		0, numBytes, x, y);
	1140	DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
	1141	0, numBytes, x, y, 0.0);
	1142	}
	1143
	1144	void
	1145	TkpDrawAngledChars(
	1146	Display display, / Display on which to draw. */
	1147	Drawable drawable, /* Window or pixmap in which to draw. */
	1148	GC gc, /* Graphics context for drawing characters. */
	1149	Tk_Font tkfont, /* Font in which characters will be drawn;
	1150	* must be the same as font used in GC. */
	1151	const char source, / UTF-8 string to be displayed. Need not be
	1152	* '\0' terminated. All Tk meta-characters
	1153	* (tabs, control characters, and newlines)
	1154	* should be stripped out of the string that
	1155	* is passed to this function. If they are not
	1156	* stripped out, they will be displayed as
	1157	* regular printing characters. */
	1158	int numBytes, /* Number of bytes in string. */
	1159	double x, double y, /* Coordinates at which to place origin of
	1160	* string when drawing. */
	1161	double angle) /* What angle to put text at, in degrees. */
	1162	{
	1163	DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
	1164	0, numBytes, x, y, angle);
1139	1165	}
1140	1166
1141	1167	/*

1179	1205	* whole (not just the range) string when
1180	1206	* drawing. */
1181	1207	{
	1208	DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
	1209	rangeStart, rangeLength, x, y, 0.0);
	1210	}
	1211
	1212	static void
	1213	DrawCharsInContext(
	1214	Display display, / Display on which to draw. */
	1215	Drawable drawable, /* Window or pixmap in which to draw. */
	1216	GC gc, /* Graphics context for drawing characters. */
	1217	Tk_Font tkfont, /* Font in which characters will be drawn; must
	1218	* be the same as font used in GC. */
	1219	const char * source, /* UTF-8 string to be displayed. Need not be
	1220	* '\0' terminated. All Tk meta-characters
	1221	* (tabs, control characters, and newlines)
	1222	* should be stripped out of the string that
	1223	* is passed to this function. If they are not
	1224	* stripped out, they will be displayed as
	1225	* regular printing characters. */
	1226	int numBytes, /* Number of bytes in string. */
	1227	int rangeStart, /* Index of first byte to draw. */
	1228	int rangeLength, /* Length of range to draw in bytes. */
	1229	int x, int y, /* Coordinates at which to place origin of the
	1230	* whole (not just the range) string when
	1231	* drawing. */
	1232	double angle)
	1233	{
1182	1234	const MacFont * fontPtr = (const MacFont *) tkfont;
1183	1235	MacDrawable macWin = (MacDrawable ) drawable;
1184	1236	Fixed fx, fy;

1240	1292
1241	1293	urstart = Tcl_NumUtfChars(source, rangeStart);
1242	1294	urlen = Tcl_NumUtfChars(source+rangeStart,rangeLength);
	1295
	1296	/*
	1297	* Rotate the coordinate system for Quarz drawing.
	1298	*/
	1299
	1300	if (drawingContext.context && angle != 0.0) {
	1301	CGContextConcatCTM(drawingContext.context, CGAffineTransformTranslate(
	1302	CGAffineTransformRotate(CGAffineTransformMakeTranslation(
	1303	x, y), angle * PI/180.0), -x, -y));
	1304	}
1243	1305
1244	1306	ChkErr(ATSUDrawText, fontPtr->atsuLayout, lineOffset+urstart, urlen, fx,
1245	1307	fy);

1929	1991	const char name) / Name or alias name of the font to find. */
1930	1992	{
1931	1993	const MacFontFamily * familyPtr;
1932		char ** aliases;
	1994	const char const aliases;
1933	1995	int i;
1934	1996
1935	1997	familyPtr = FindFontFamily(name);

1955	2017	{
1956	2018	const MacFontFamily * familyPtr;
1957	2019	const char * fallback;
1958		char *** fallbacks;
	2020	const char const const * fallbacks;
1959	2021	int i, j;
1960	2022
1961	2023	familyPtr = FindFontFamilyOrAlias(name);

2454	2516	/*
2455	2517	*----------------------------------------------------------------------
2456	2518	*
	2519	* TkMacOSXFMFontInfoForFont --
	2520	*
	2521	* Retrieve FontManager/ATSUI font information for a Tk font.
	2522	*
	2523	* Results:
	2524	* None.
	2525	*
	2526	* Side effects:
	2527	* None.
	2528	*
	2529	*----------------------------------------------------------------------
	2530	*/
	2531
	2532	MODULE_SCOPE void
	2533	TkMacOSXFMFontInfoForFont(
	2534	Tk_Font tkfont,
	2535	FMFontFamily *fontFamilyPtr,
	2536	FMFontStyle *fontStylePtr,
	2537	FMFontSize *fontSizePtr,
	2538	ATSUStyle *fontATSUStylePtr)
	2539	{
	2540	const MacFont * fontPtr = (MacFont *) tkfont;
	2541
	2542	if (fontFamilyPtr) {
	2543	*fontFamilyPtr = fontPtr->qdFont;
	2544	}
	2545	if (fontStylePtr) {
	2546	*fontStylePtr = fontPtr->qdStyle;
	2547	}
	2548	if (fontSizePtr) {
	2549	*fontSizePtr = fontPtr->qdSize;
	2550	}
	2551	if (fontATSUStylePtr) {
	2552	*fontATSUStylePtr = fontPtr->atsuStyle;
	2553	}
	2554	}
	2555
	2556	/*
	2557	*----------------------------------------------------------------------
	2558	*
	2559	* TkMacOSXFontDescriptionForFMFontInfo --
	2560	*
	2561	* Get text description of a font specified by FontManager info.
	2562	*
	2563	* Results:
	2564	* List object or NULL.
	2565	*
	2566	* Side effects:
	2567	* None.
	2568	*
	2569	*----------------------------------------------------------------------
	2570	*/
	2571
	2572	MODULE_SCOPE Tcl_Obj *
	2573	TkMacOSXFontDescriptionForFMFontInfo(
	2574	FMFontFamily fontFamily,
	2575	FMFontStyle fontStyle,
	2576	FMFontSize fontSize,
	2577	FMFont fontID)
	2578	{
	2579	Tcl_Obj *objv[6];
	2580	int i = 0;
	2581
	2582	if (fontFamily != kInvalidFontFamily && fontStyle != -1) {
	2583	const char *familyName = FamilyNameForFamilyID(fontFamily);
	2584
	2585	if (familyName) {
	2586	objv[i++] = Tcl_NewStringObj(familyName, -1);
	2587	objv[i++] = Tcl_NewIntObj(fontSize);
	2588	#define S(s) Tcl_NewStringObj(STRINGIFY(s),(int)(sizeof(STRINGIFY(s))-1))
	2589	objv[i++] = (fontStyle & bold) ? S(bold) : S(normal);
	2590	objv[i++] = (fontStyle & italic) ? S(italic) : S(roman);
	2591	if (fontStyle & underline) objv[i++] = S(underline);
	2592	/if (fontStyle & overstrike) objv[i++] = S(overstrike);/
	2593	#undef S
	2594	}
	2595	} else if (fontID != kInvalidFont) {
	2596	CFStringRef fontName = NULL;
	2597	Tcl_Obj *fontNameObj = NULL;
	2598
	2599	ChkErr(ATSFontGetName, FMGetATSFontRefFromFont(fontID),
	2600	kATSOptionFlagsDefault, &fontName);
	2601	if (fontName) {
	2602	fontNameObj = TkMacOSXGetStringObjFromCFString(fontName);
	2603	CFRelease(fontName);
	2604	}
	2605	if (fontNameObj) {
	2606	objv[i++] = fontNameObj;
	2607	objv[i++] = Tcl_NewIntObj(fontSize);
	2608	}
	2609	}
	2610	return i ? Tcl_NewListObj(i, objv) : NULL;
	2611	}
	2612
	2613	/*
	2614	*----------------------------------------------------------------------
	2615	*
2457	2616	* TkMacOSXUseAntialiasedText --
2458	2617	*
2459	2618	* Enables or disables application-wide use of antialiased text (where

+7

-1

macosx/tkMacOSXFont.h less more

11	11	* See the file "license.terms" for information on usage and redistribution
12	12	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkMacOSXFont.h,v 1.5 2007/04/23 21:24:33 das Exp $
	14	* RCS: @(#) $Id: tkMacOSXFont.h,v 1.6 2008/12/10 05:02:52 das Exp $
15	15	*/
16	16
17	17	#ifndef TKMACOSXFONT_H

29	29
30	30	MODULE_SCOPE void TkMacOSXInitControlFontStyle(Tk_Font tkfont,
31	31	ControlFontStylePtr fsPtr);
	32	MODULE_SCOPE void TkMacOSXFMFontInfoForFont(Tk_Font tkfont,
	33	FMFontFamily fontFamilyPtr, FMFontStyle fontStylePtr,
	34	FMFontSize fontSizePtr, ATSUStyle fontATSUStylePtr);
	35	MODULE_SCOPE Tcl_Obj * TkMacOSXFontDescriptionForFMFontInfo(
	36	FMFontFamily fontFamily, FMFontStyle fontStyle, FMFontSize fontSize,
	37	FMFont fontID);
32	38
33	39	#endif /TKMACOSXFONT_H/

+24

-16

macosx/tkMacOSXHLEvents.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.18 2008/09/02 16:10:55 das Exp $
	13	* RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.19 2008/12/09 21:22:56 dgp Exp $
14	14	*/
15	15
16	16	#include "tkMacOSXPrivate.h"

207	207
208	208	if (interp &&
209	209	Tcl_GetCommandInfo(interp, "::tk::mac::OpenApplication", &dummy)){
210		if (Tcl_GlobalEval(interp, "::tk::mac::OpenApplication") != TCL_OK) {
211		Tcl_BackgroundError(interp);
	210	int code = Tcl_GlobalEval(interp, "::tk::mac::OpenApplication");
	211	if (code != TCL_OK) {
	212	Tcl_BackgroundException(interp, code);
212	213	}
213	214	}
214	215	return noErr;

243	244
244	245	if (interp && Tcl_GetCommandInfo(interp,
245	246	"::tk::mac::ReopenApplication", &dummy)) {
246		if (Tcl_GlobalEval(interp, "::tk::mac::ReopenApplication") != TCL_OK){
247		Tcl_BackgroundError(interp);
	247	int code = Tcl_GlobalEval(interp, "::tk::mac::ReopenApplication");
	248	if (code != TCL_OK){
	249	Tcl_BackgroundException(interp, code);
248	250	}
249	251	}
250	252	return err;

278	280
279	281	if (interp &&
280	282	Tcl_GetCommandInfo(interp, "::tk::mac::ShowPreferences", &dummy)){
281		if (Tcl_GlobalEval(interp, "::tk::mac::ShowPreferences") != TCL_OK) {
282		Tcl_BackgroundError(interp);
	283	int code = Tcl_GlobalEval(interp, "::tk::mac::ShowPreferences");
	284	if (code != TCL_OK) {
	285	Tcl_BackgroundException(interp, code);
283	286	}
284	287	}
285	288	return noErr;

316	319	AEKeyword keyword;
317	320	Tcl_DString command, pathName;
318	321	Tcl_CmdInfo dummy;
	322	int code;
319	323
320	324	/*
321	325	* Don't bother if we don't have an interp or the open document procedure

366	370	* Now handle the event by evaluating a script.
367	371	*/
368	372
369		if (Tcl_EvalEx(interp, Tcl_DStringValue(&command),
370		Tcl_DStringLength(&command), TCL_EVAL_GLOBAL) != TCL_OK) {
371		Tcl_BackgroundError(interp);
	373	code = Tcl_EvalEx(interp, Tcl_DStringValue(&command),
	374	Tcl_DStringLength(&command), TCL_EVAL_GLOBAL);
	375	if (code != TCL_OK) {
	376	Tcl_BackgroundException(interp, code);
372	377	}
373	378	Tcl_DStringFree(&command);
374	379	return noErr;

405	410	AEKeyword keyword;
406	411	Tcl_DString command, pathName;
407	412	Tcl_CmdInfo dummy;
	413	int code;
408	414
409	415	/*
410	416	* Don't bother if we don't have an interp or the print document procedure

450	456	* Now handle the event by evaluating a script.
451	457	*/
452	458
453		if (Tcl_EvalEx(interp, Tcl_DStringValue(&command),
454		Tcl_DStringLength(&command), TCL_EVAL_GLOBAL) != TCL_OK) {
455		Tcl_BackgroundError(interp);
	459	code = Tcl_EvalEx(interp, Tcl_DStringValue(&command),
	460	Tcl_DStringLength(&command), TCL_EVAL_GLOBAL);
	461	if (code != TCL_OK) {
	462	Tcl_BackgroundException(interp, code);
456	463	}
457	464	Tcl_DStringFree(&command);
458	465	return noErr;

619	626	Tcl_Interp interp = ((KillEvent ) eventPtr)->interp;
620	627	Tcl_CmdInfo dummy;
621	628	int quit = Tcl_GetCommandInfo(interp, "::tk::mac::Quit", &dummy);
622
623		if (Tcl_GlobalEval(interp, quit ? "::tk::mac::Quit" : "exit") != TCL_OK) {
	629	int code = Tcl_GlobalEval(interp, quit ? "::tk::mac::Quit" : "exit");
	630
	631	if (code != TCL_OK) {
624	632	/*
625	633	* Should be never reached...
626	634	*/
627	635
628		Tcl_BackgroundError(interp);
	636	Tcl_BackgroundException(interp, code);
629	637	}
630	638	return 1;
631	639	}

+25

-28

macosx/tkMacOSXInit.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkMacOSXInit.c,v 1.36 2008/06/19 00:13:02 das Exp $
	13	* RCS: @(#) $Id: tkMacOSXInit.c,v 1.38 2008/12/15 16:17:18 dgp Exp $
14	14	*/
15	15
16	16	#include "tkMacOSXPrivate.h"
17
18		#include "tclInt.h" /* for Tcl_GetStartupScript() & Tcl_SetStartupScript() */
19	17
20	18	#include <sys/stat.h>
21	19	#include <sys/utsname.h>

133	131	int i;
134	132	struct utsname name;
135	133	long osVersion = 0;
	134	struct stat st;
136	135
137	136	initialized = 1;
138	137

349	348	* clicking Wish) then use the Tk based console interpreter.
350	349	*/
351	350
352		if (!isatty(0)) {
353		struct stat st;
354
355		if (fstat(0, &st) \|\| (S_ISCHR(st.st_mode) && st.st_blocks == 0)) {
356		Tk_InitConsoleChannels(interp);
357		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
358		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
359		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
360
361		/*
362		* Only show the console if we don't have a startup script
363		* and tcl_interactive hasn't been set already.
364		*/
365
366		if (Tcl_GetStartupScript(NULL) == NULL) {
367		const char *intvar = Tcl_GetVar(interp,
368		"tcl_interactive", TCL_GLOBAL_ONLY);
369
370		if (intvar == NULL) {
371		Tcl_SetVar(interp, "tcl_interactive", "1",
372		TCL_GLOBAL_ONLY);
373		}
	351	if (getenv("TK_CONSOLE") \|\|
	352	(!isatty(0) && (fstat(0, &st) \|\|
	353	(S_ISCHR(st.st_mode) && st.st_blocks == 0)))) {
	354	Tk_InitConsoleChannels(interp);
	355	Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
	356	Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
	357	Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
	358
	359	/*
	360	* Only show the console if we don't have a startup script
	361	* and tcl_interactive hasn't been set already.
	362	*/
	363
	364	if (Tcl_GetStartupScript(NULL) == NULL) {
	365	const char *intvar = Tcl_GetVar(interp,
	366	"tcl_interactive", TCL_GLOBAL_ONLY);
	367
	368	if (intvar == NULL) {
	369	Tcl_SetVar(interp, "tcl_interactive", "1",
	370	TCL_GLOBAL_ONLY);
374	371	}
375		if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
376		return TCL_ERROR;
377		}
	372	}
	373	if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
	374	return TCL_ERROR;
378	375	}
379	376	}
380	377	}

+283

-300

macosx/tkMacOSXKeyEvent.c less more

0	0	/*
1	1	* tkMacOSXKeyEvent.c --
2	2	*
3		* This file implements functions that decode & handle keyboard events
4		* on MacOS X.
	3	* This file implements functions that decode & handle keyboard events on
	4	* MacOS X.
5	5	*
6	6	* Copyright 2001, Apple Computer, Inc.
7	7	* Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* The following terms apply to all files originating from Apple
13		* Computer, Inc. ("Apple") and associated with the software
14		* unless explicitly disclaimed in individual files.
15		*
16		*
17		* Apple hereby grants permission to use, copy, modify,
18		* distribute, and license this software and its documentation
19		* for any purpose, provided that existing copyright notices are
20		* retained in all copies and that this notice is included
21		* verbatim in any distributions. No written agreement, license,
22		* or royalty fee is required for any of the authorized
23		* uses. Modifications to this software may be copyrighted by
24		* their authors and need not follow the licensing terms
25		* described here, provided that the new terms are clearly
26		* indicated on the first page of each file where they apply.
27		*
28		*
29		* IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
30		* SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
31		* INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
32		* THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
33		* EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
34		* POSSIBILITY OF SUCH DAMAGE. APPLE, THE AUTHORS AND
35		* DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
36		* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
37		* FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS
38		* SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
39		* AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
40		* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
41		*
42		* GOVERNMENT USE: If you are acquiring this software on behalf
43		* of the U.S. government, the Government shall have only
44		* "Restricted Rights" in the software and related documentation
45		* as defined in the Federal Acquisition Regulations (FARs) in
46		* Clause 52.227.19 (c) (2). If you are acquiring the software
47		* on behalf of the Department of Defense, the software shall be
48		* classified as "Commercial Computer Software" and the
49		* Government shall have only "Restricted Rights" as defined in
50		* Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the
51		* foregoing, the authors grant the U.S. Government and others
52		* acting in its behalf permission to use and distribute the
53		* software in accordance with the terms specified in this
54		* license.
55		*
56		* RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.25 2008/09/02 16:10:55 das Exp $
	12	* The following terms apply to all files originating from Apple Computer,
	13	* Inc. ("Apple") and associated with the software unless explicitly
	14	* disclaimed in individual files.
	15	*
	16	* Apple hereby grants permission to use, copy, modify, distribute, and
	17	* license this software and its documentation for any purpose, provided
	18	* that existing copyright notices are retained in all copies and that
	19	* this notice is included verbatim in any distributions. No written
	20	* agreement, license, or royalty fee is required for any of the
	21	* authorized uses. Modifications to this software may be copyrighted by
	22	* their authors and need not follow the licensing terms described here,
	23	* provided that the new terms are clearly indicated on the first page of
	24	* each file where they apply.
	25	*
	26	* IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE SOFTWARE BE
	27	* LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
	28	* CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS
	29	* DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF APPLE OR THE AUTHORS
	30	* HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. APPLE, THE AUTHORS
	31	* AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT
	32	* NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR
	33	* A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED
	34	* ON AN "AS IS" BASIS, AND APPLE,THE AUTHORS AND DISTRIBUTORS HAVE NO
	35	* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
	36	* MODIFICATIONS.
	37	*
	38	* GOVERNMENT USE: If you are acquiring this software on behalf of the
	39	* U.S. government, the Government shall have only "Restricted Rights" in
	40	* the software and related documentation as defined in the Federal
	41	* Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are
	42	* acquiring the software on behalf of the Department of Defense, the
	43	* software shall be classified as "Commercial Computer Software" and the
	44	* Government shall have only "Restricted Rights" as defined in Clause
	45	* 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
	46	* authors grant the U.S. Government and others acting in its behalf
	47	* permission to use and distribute the software in accordance with the
	48	* terms specified in this license.
	49	*
	50	* RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.26 2008/10/27 11:55:44 dkf Exp $
57	51	*/
58	52
59	53	#include "tkMacOSXPrivate.h"

91	85	* Declarations for functions used only in this file.
92	86	*/
93	87
94		static int InitKeyData(KeyEventData *keyEventDataPtr);
95		static int InitKeyEvent(XEvent eventPtr, KeyEventData e, UInt32 savedKeyCode,
96		UInt32 savedModifiers);
97		static int GenerateKeyEvent(UInt32 eKind, KeyEventData *e, UInt32 savedKeyCode,
98		UInt32 savedModifiers, const UniChar *chars, int numChars);
99		static int GetKeyboardLayout(Ptr resourcePtr, TextEncoding encodingPtr);
100		static TextEncoding GetKCHREncoding(ScriptCode script, SInt32 layoutid);
101		static int KeycodeToUnicodeViaUnicodeResource(UniChar *uniChars, int maxChars,
102		Ptr uchr, EventKind eKind, UInt32 keycode, UInt32 modifiers,
103		UInt32 *deadKeyStatePtr);
104		static int KeycodeToUnicodeViaKCHRResource(UniChar *uniChars, int maxChars,
105		Ptr kchr, TextEncoding encoding, EventKind eKind, UInt32 keycode,
106		UInt32 modifiers, UInt32 *deadKeyStatePtr);
107
	88	static int GenerateKeyEvent(UInt32 eKind, KeyEventData *e,
	89	UInt32 savedKeyCode, UInt32 savedModifiers,
	90	const UniChar *chars, int numChars);
	91	static TextEncoding GetKCHREncoding(ScriptCode script, SInt32 layoutid);
	92	static int GetKeyboardLayout(Ptr *resourcePtr,
	93	TextEncoding *encodingPtr);
	94	static int InitKeyData(KeyEventData *keyEventDataPtr);
	95	static int InitKeyEvent(XEvent eventPtr, KeyEventData e,
	96	UInt32 savedKeyCode, UInt32 savedModifiers);
	97	static int KeycodeToUnicodeViaKCHRResource(UniChar *uniChars,
	98	int maxChars, Ptr kchr, TextEncoding encoding,
	99	EventKind eKind, UInt32 keycode, UInt32 modifiers,
	100	UInt32 *deadKeyStatePtr);
	101	static int KeycodeToUnicodeViaUnicodeResource(UniChar *uniChars,
	102	int maxChars, Ptr uchr, EventKind eKind,
	103	UInt32 keycode, UInt32 modifiers,
	104	UInt32 *deadKeyStatePtr);
108	105
109	106	/*
110	107	*----------------------------------------------------------------------
111	108	*
112	109	* TkMacOSXProcessKeyboardEvent --
113	110	*
114		* This routine processes the event in eventPtr, and
115		* generates the appropriate Tk events from it.
	111	* This routine processes the event in eventPtr, and generates the
	112	* appropriate Tk events from it.
116	113	*
117	114	* Results:
118	115	* True if event(s) are generated - false otherwise.

149	146	* accelerators through IsMenuKeyEvent. Tk treats accelerators as mere
150	147	* decoration, and the user has to install bindings to get them to fire.
151	148	*
152		* However, the only way to trigger the Hide & Hide Others functions
153		* is by invoking the Menu command for Hide. So there is no nice way to
154		* provide a Tk command to hide the app which would be available for a
155		* binding. So I am going to hijack Command-H and Command-Shift-H
156		* here, and run the menu commands. Since the HI Guidelines explicitly
157		* reserve these for Hide, this isn't such a bad thing. Also, if you do
158		* rebind Command-H to another menu item, Hide will lose its binding.
	149	* However, the only way to trigger the Hide & Hide Others functions is by
	150	* invoking the Menu command for Hide. So there is no nice way to provide a
	151	* Tk command to hide the app which would be available for a binding. So I
	152	* am going to hijack Command-H and Command-Shift-H here, and run the menu
	153	* commands. Since the HI Guidelines explicitly reserve these for Hide,
	154	* this isn't such a bad thing. Also, if you do rebind Command-H to another
	155	* menu item, Hide will lose its binding.
159	156	*
160		* Note that I don't really do anything at this point,
161		* I just mark stopProcessing as 0 and return, and then the
162		* RecieveAndProcessEvent code will dispatch the event to the default
163		* handler.
	157	* Note that I don't really do anything at this point, I just mark
	158	* stopProcessing as 0 and return, and then the RecieveAndProcessEvent code
	159	* will dispatch the event to the default handler.
164	160	*/
165	161
166	162	if ((eventPtr->eKind == kEventRawKeyDown

171	167
172	168	GetMenuItemCommandID (menuRef, menuItemIndex, &menuCmd);
173	169	switch (menuCmd) {
174		case kHICommandHide:
175		case kHICommandHideOthers:
176		case kHICommandShowAll:
177		case kHICommandPreferences:
178		case kHICommandQuit:
179		statusPtr->stopProcessing = 0;
180
181		/*
182		* TODO: may not be on event on queue.
183		*/
184
185		return 0;
186		break;
187		default:
188		break;
	170	case kHICommandHide:
	171	case kHICommandHideOthers:
	172	case kHICommandShowAll:
	173	case kHICommandPreferences:
	174	case kHICommandQuit:
	175	statusPtr->stopProcessing = 0;
	176
	177	/*
	178	* TODO: may not be on event on queue.
	179	*/
	180
	181	return 0;
	182	default:
	183	break;
189	184	}
190	185	}
191	186

213	208	}
214	209
215	210	switch (eventPtr->eKind) {
216		case kEventRawKeyUp:
217		case kEventRawKeyDown:
218		case kEventRawKeyRepeat: {
219		UInt32 *deadKeyStatePtr;
220
221		if (kEventRawKeyDown == eventPtr->eKind) {
222		deadKeyStatePtr = &deadKeyStateDown;
223		} else {
224		deadKeyStatePtr = &deadKeyStateUp;
225		}
226
227		uniCharsLen = TkMacOSXKeycodeToUnicode(uniChars,
228		sizeof(uniChars)/sizeof(*uniChars), eventPtr->eKind,
229		keyEventData.keyCode, keyEventData.keyModifiers,
230		deadKeyStatePtr);
231		break;
	211	case kEventRawKeyUp:
	212	case kEventRawKeyDown:
	213	case kEventRawKeyRepeat: {
	214	UInt32 *deadKeyStatePtr;
	215
	216	if (kEventRawKeyDown == eventPtr->eKind) {
	217	deadKeyStatePtr = &deadKeyStateDown;
	218	} else {
	219	deadKeyStatePtr = &deadKeyStateUp;
232	220	}
	221
	222	uniCharsLen = TkMacOSXKeycodeToUnicode(uniChars,
	223	sizeof(uniChars)/sizeof(*uniChars), eventPtr->eKind,
	224	keyEventData.keyCode, keyEventData.keyModifiers,
	225	deadKeyStatePtr);
	226	break;
	227	}
233	228	}
234	229
235	230	if (kEventRawKeyUp == eventPtr->eKind) {

273	268	if (eventGenerated == 0) {
274	269	savedKeyCode = keyEventData.message;
275	270	return false;
276		} else if (eventGenerated == -1) {
	271	}
	272	if (eventGenerated == -1) {
277	273	savedKeyCode = 0;
278	274	statusPtr->stopProcessing = 0;
279	275	return false;
280		} else {
281		savedKeyCode = 0;
282		return true;
283		}
	276	}
	277	savedKeyCode = 0;
	278	return true;
284	279	}
285	280
286	281	/*

288	283	*
289	284	* GenerateKeyEvent --
290	285	*
291		* Given Macintosh keyUp, keyDown & autoKey events (in their "raw"
292		* form) and a list of unicode characters this function generates the
	286	* Given Macintosh keyUp, keyDown & autoKey events (in their "raw" form)
	287	* and a list of unicode characters this function generates the
293	288	* appropriate X key events.
294	289	*
295		* Parameter eKind is a raw keyboard event. e contains the data sent
296		* with the event. savedKeyCode and savedModifiers contain the values
297		* from the last event that came before (see
298		* TkMacOSXProcessKeyboardEvent()). chars/numChars has the Unicode
299		* characters for which we want to create events.
	290	* Parameter eKind is a raw keyboard event. e contains the data sent with
	291	* the event. savedKeyCode and savedModifiers contain the values from the
	292	* last event that came before (see TkMacOSXProcessKeyboardEvent()).
	293	* chars/numChars has the Unicode characters for which we want to create
	294	* events.
300	295	*
301	296	* Results:
302	297	* 1 if an event was generated, -1 for any error.

331	326	}
332	327
333	328	/*
334		* Use special '-1' to signify a special keycode to our
335		* platform specific code in tkMacOSXKeyboard.c. This is
336		* rather like what happens on Windows.
	329	* Use special '-1' to signify a special keycode to our platform
	330	* specific code in tkMacOSXKeyboard.c. This is rather like what
	331	* happens on Windows.
337	332	*/
338	333
339	334	event.xany.send_event = -1;

344	339
345	340	event.xkey.keycode = (e->keyModifiers ^ savedModifiers);
346	341	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
347
348	342	} else {
349	343	for (i = 0; i < numChars; ++i) {
350	344	/*
351	345	* Encode one char in the trans_chars array that was already
352		* introduced for MS Windows. Don't encode the string, if it is
353		* a control character but was not generated with a real control
	346	* introduced for MS Windows. Don't encode the string, if it is a
	347	* control character but was not generated with a real control
354	348	* modifier. Such control characters get generated by KeyTrans()
355		* for special keys, but we rather want to identify those by
356		* their KeySyms.
	349	* for special keys, but we rather want to identify those by their
	350	* KeySyms.
357	351	*/
358	352
359	353	event.xkey.trans_chars[0] = 0;
360	354	if ((controlKey & e->keyModifiers) \|\| (chars[i] >= ' ')) {
361		int done;
362		done = Tcl_UniCharToUtf(chars[i],event.xkey.trans_chars);
	355	int done = Tcl_UniCharToUtf(chars[i],event.xkey.trans_chars);
	356
363	357	event.xkey.trans_chars[done] = 0;
364	358	}
365	359
366	360	switch(eKind) {
367		case kEventRawKeyDown:
368		event.xany.type = KeyPress;
369		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
370		break;
371		case kEventRawKeyUp:
372		event.xany.type = KeyRelease;
373		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
374		break;
375		case kEventRawKeyRepeat:
376		event.xany.type = KeyRelease;
377		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
378		event.xany.type = KeyPress;
379		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
380		break;
381		default:
382		TkMacOSXDbgMsg("Invalid parameter eKind %ld", eKind);
383		return -1;
	361	case kEventRawKeyDown:
	362	event.xany.type = KeyPress;
	363	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	364	break;
	365	case kEventRawKeyUp:
	366	event.xany.type = KeyRelease;
	367	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	368	break;
	369	case kEventRawKeyRepeat:
	370	event.xany.type = KeyRelease;
	371	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	372	event.xany.type = KeyPress;
	373	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	374	break;
	375	default:
	376	TkMacOSXDbgMsg("Invalid parameter eKind %ld", eKind);
	377	return -1;
384	378	}
385	379	}
386	380	}

393	387	*
394	388	* InitKeyData --
395	389	*
396		* This routine initializes a KeyEventData structure by asking the OS
397		* and Tk for all the global information needed here.
398		*
399		* Results:
400		* True if the current front window can be found in Tk data structures
401		* - false otherwise.
	390	* This routine initializes a KeyEventData structure by asking the OS and
	391	* Tk for all the global information needed here.
	392	*
	393	* Results:
	394	* True if the current front window can be found in Tk data structures,
	395	* false otherwise.
402	396	*
403	397	* Side Effects:
404	398	* None

416	410	if (keyEventDataPtr->whichWindow == NULL) {
417	411	return false;
418	412	}
	413
419	414	XQueryPointer(NULL, None, NULL, NULL, &keyEventDataPtr->global_x,
420	415	&keyEventDataPtr->global_y, &keyEventDataPtr->local_x,
421	416	&keyEventDataPtr->local_y, &keyEventDataPtr->state);
422
423	417	return true;
424	418	}
425	419

441	435	*/
442	436
443	437	/*
444		* We have a general problem here. How do we handle 'Option-char'
445		* keypresses? The problem is that we might want to bind to some of these
446		* (e.g. Cmd-Opt-d is 'uncomment' in Alpha). OTOH Option-d actually produces
447		* a real character on MacOS, namely a mathematical delta.
	438	* We have a general problem here. How do we handle 'Option-char' keypresses?
	439	* The problem is that we might want to bind to some of these (e.g. Cmd-Opt-d
	440	* is 'uncomment' in Alpha). OTOH Option-d actually produces a real character
	441	* on MacOS, namely a mathematical delta.
448	442	*
449	443	* The current behaviour is that a binding goes by the combinations of
450		* modifiers and base keysym, that is Option-d. The string value of the
451		* event is the mathematical delta character, so if no binding calls
452		* [break], the text widget will insert that character.
	444	* modifiers and base keysym, that is Option-d. The string value of the event
	445	* is the mathematical delta character, so if no binding calls [break], the
	446	* text widget will insert that character.
453	447	*
454	448	* Note that this is similar to control combinations on all platforms. They
455	449	* also generate events that have the base character as keysym and a real
456		* control character as character value. So Ctrl+C gets us the keysym XK_C,
457		* the modifier Control (so you can bind <Control-C>) and a string value as
	450	* control character as character value. So Ctrl+C gets us the keysym XK_C, the
	451	* modifier Control (so you can bind <Control-C>) and a string value as
458	452	* "\u0003".
459	453	*
460	454	* For a different solutions we may want for the event to contain keysyms for
461		* both the 'Opt-d' side of things and the mathematical delta. Then a
462		* binding on Opt-d will trigger, but a binding on mathematical delta would
463		* also trigger. This would require changes in the core, though.
	455	* both the 'Opt-d' side of things and the mathematical delta. Then a binding
	456	* on Opt-d will trigger, but a binding on mathematical delta would also
	457	* trigger. This would require changes in the core, though.
464	458	*/
465	459
466	460	static int

475	469	TkDisplay *dispPtr;
476	470
477	471	/*
478		* The focus must be in the FrontWindow on the Macintosh.
479		* We then query Tk to determine the exact Tk window
480		* that owns the focus.
	472	* The focus must be in the FrontWindow on the Macintosh. We then query Tk
	473	* to determine the exact Tk window that owns the focus.
481	474	*/
482	475
483	476	window = TkMacOSXGetXWindow(e->whichWindow);

506	499	eventPtr->xkey.window = Tk_WindowId(tkwin);
507	500	eventPtr->xkey.display = Tk_Display(tkwin);
508	501	eventPtr->xkey.root = XRootWindow(Tk_Display(tkwin), 0);
509		eventPtr->xkey.state = e->state;
	502	eventPtr->xkey.state = e->state;
510	503	eventPtr->xkey.trans_chars[0] = 0;
511	504
512	505	Tk_TopCoordsToWindow(tkwin, e->local_x, e->local_y, &eventPtr->xkey.x,

514	507
515	508	eventPtr->xkey.keycode = e->ch \| ((savedKeyCode & charCodeMask) << 8) \|
516	509	((e->message&keyCodeMask) << 8);
517
518	510	return 1;
519	511	}
520	512

529	521	* Keyboard Layout Services, where available.
530	522	*
531	523	* Results:
532		* 1 if there is returned a Unicode 'uchr' resource in *resourcePtr, 0
533		* if it is a classic 'KCHR' resource. A pointer to the actual resource
534		* data goes into *resourcePtr. If the resource is a 'KCHR' resource,
535		* the corresponding Mac encoding goes into *encodingPtr.
	524	* 1 if there is returned a Unicode 'uchr' resource in *resourcePtr, 0 if
	525	* it is a classic 'KCHR' resource. A pointer to the actual resource data
	526	* goes into *resourcePtr. If the resource is a 'KCHR' resource, the
	527	* corresponding Mac encoding goes into *encodingPtr.
536	528	*
537	529	* Side effects:
538	530	* Sets some internal static variables.

564	556	KLGetCurrentKeyboardLayout(&currentLayout);
565	557
566	558	if (currentLayout != NULL) {
567
568	559	/*
569	560	* The layout pointer could in theory be the same for different
570	561	* layouts, only the id gives us the information that the

573	564	*/
574	565
575	566	KLGetKeyboardLayoutProperty(currentLayout, kKLIdentifier,
576		(const void**)&currentLayoutId);
	567	(const void **) &currentLayoutId);
577	568
578	569	if ((lastLayout != currentLayout)
579	570	\|\| (lastLayoutId != currentLayoutId)) {
580
581	571	#ifdef TK_MAC_DEBUG_KEYBOARD
582	572	TkMacOSXDbgMsg("Use KLS");
583	573	#endif
584
585	574	hasLayoutChanged = true;
586	575
587	576	/*

594	583	KCHR = NULL;
595	584
596	585	if ((KLGetKeyboardLayoutProperty(currentLayout,
597		kKLuchrData, (const void**)&uchr)
598		== noErr)
	586	kKLuchrData, (const void **) &uchr) == noErr)
599	587	&& (uchr != NULL)) {
600	588	/* done */
601	589	} else if ((KLGetKeyboardLayoutProperty(currentLayout,
602		kKLKCHRData, (const void**)&KCHR)
603		== noErr)
	590	kKLKCHRData, (const void**)&KCHR) == noErr)
604	591	&& (KCHR != NULL)) {
605	592	/* done */
606	593	}

626	613	* lastEncoding.
627	614	*
628	615	* If we didn't get a new 'KCHR' and if we have no 'uchr' either, get
629		* some 'KCHR' from the OS cache and leave lastEncoding at its
630		* current value. This should better not happen, it doesn't really
631		* work.
	616	* some 'KCHR' from the OS cache and leave lastEncoding at its current
	617	* value. This should better not happen, it doesn't really work.
632	618	*/
633	619
634	620	if (KCHR) {

639	625	lastEncoding & ~0xFFFFL);
640	626	#endif
641	627	} else if (!uchr) {
642		KCHR = (Ptr)(intptr_t)GetScriptManagerVariable(smKCHRCache);
	628	KCHR = (Ptr)(intptr_t) GetScriptManagerVariable(smKCHRCache);
643	629	}
644	630	}
645	631
646	632	if (uchr) {
647	633	*resourcePtr = uchr;
648	634	return 1;
649		} else {
650		*resourcePtr = KCHR;
651		*encodingPtr = lastEncoding;
652		return 0;
653		}
	635	}
	636	*resourcePtr = KCHR;
	637	*encodingPtr = lastEncoding;
	638	return 0;
654	639	}
655	640
656	641	/*

697	682	}
698	683
699	684	/*
700		* GetTextEncodingFromScriptInfo() doesn't know about more exotic
701		* layouts. This provides a fallback for good measure. In an ideal
702		* world, exotic layouts would always provide a 'uchr' resource anyway,
703		* so we wouldn't need this.
	685	* GetTextEncodingFromScriptInfo() doesn't know about more exotic layouts.
	686	* This provides a fallback for good measure. In an ideal world, exotic
	687	* layouts would always provide a 'uchr' resource anyway, so we wouldn't
	688	* need this.
704	689	*
705		* We can add more keyboard layouts, if we get actual complaints. Farsi
706		* or other Celtic/Gaelic layouts would be candidates.
	690	* We can add more keyboard layouts, if we get actual complaints. Farsi or
	691	* other Celtic/Gaelic layouts would be candidates.
707	692	*/
708	693
709	694	switch (layoutid) {

712	697	* Iceland for legacy applications.
713	698	*/
714	699
715		case 1800: case 1821:
716		return kTextEncodingMacIcelandic;
	700	case 1800: case 1821:
	701	return kTextEncodingMacIcelandic;
717	702
718	703	/*
719	704	* Irish and Welsh. These layouts are mentioned in <Script.h>.

722	707	* can't locate layouts of this type for testing.
723	708	*/
724	709
725		case 581: case 779:
726		return kTextEncodingMacCeltic;
	710	case 581: case 779:
	711	return kTextEncodingMacCeltic;
727	712	}
728	713
729	714	/*
730		* The valid script codes are also the valid default encoding codes, so
731		* if nothing else helps, fall back on those.
	715	* The valid script codes are also the valid default encoding codes, so if
	716	* nothing else helps, fall back on those.
732	717	*/
733	718
734	719	return script;

740	725	* KeycodeToUnicodeViaUnicodeResource --
741	726	*
742	727	* Given MacOS key event data this function generates the Unicode
743		* characters. It does this using a 'uchr' and the UCKeyTranslate
744		* API.
745		*
746		* The parameter deadKeyStatePtr can be NULL, if no deadkey handling
747		* is needed.
748		*
749		* Tested and known to work with US, Hebrew, Greek and Russian layouts
750		* as well as "Unicode Hex Input".
	728	* characters. It does this using a 'uchr' and the UCKeyTranslate API.
	729	*
	730	* The parameter deadKeyStatePtr can be NULL, if no deadkey handling is
	731	* needed.
	732	*
	733	* Tested and known to work with US, Hebrew, Greek and Russian layouts as
	734	* well as "Unicode Hex Input".
751	735	*
752	736	* Results:
753	737	* The number of characters generated if any, 0 if we are waiting for
754		* another byte of a dead-key sequence. Fills in the uniChars array
755		* with a Unicode string.
	738	* another byte of a dead-key sequence. Fills in the uniChars array with a
	739	* Unicode string.
756	740	*
757	741	* Side Effects:
758	742	* None

788	772	}
789	773
790	774	switch(eKind) {
791		case kEventRawKeyDown:
792		action = kUCKeyActionDown;
793		break;
794		case kEventRawKeyUp:
795		action = kUCKeyActionUp;
796		break;
797		case kEventRawKeyRepeat:
798		action = kUCKeyActionAutoKey;
799		break;
800		default:
801		TkMacOSXDbgMsg("Invalid parameter eKind %d", eKind);
802		return 0;
	775	case kEventRawKeyDown:
	776	action = kUCKeyActionDown;
	777	break;
	778	case kEventRawKeyUp:
	779	action = kUCKeyActionUp;
	780	break;
	781	case kEventRawKeyRepeat:
	782	action = kUCKeyActionAutoKey;
	783	break;
	784	default:
	785	TkMacOSXDbgMsg("Invalid parameter eKind %d", eKind);
	786	return 0;
803	787	}
804	788
805	789	err = ChkErr(UCKeyTranslate, (const UCKeyboardLayout *) uchr, keycode,

815	799	}
816	800
817	801	/*
818		* some IMEs leave residue :-(
	802	* Some IMEs leave residue. :-(
819	803	*/
820	804
821	805	*deadKeyStatePtr = 0;

835	819	* Given MacOS key event data this function generates the Unicode
836	820	* characters. It does this using a 'KCHR' and the KeyTranslate API.
837	821	*
838		* The parameter deadKeyStatePtr can be NULL, if no deadkey handling
839		* is needed.
	822	* The parameter deadKeyStatePtr can be NULL, if no deadkey handling is
	823	* needed.
840	824	*
841	825	* Results:
842	826	* The number of characters generated if any, 0 if we are waiting for
843		* another byte of a dead-key sequence. Fills in the uniChars array
844		* with a Unicode string.
	827	* another byte of a dead-key sequence. Fills in the uniChars array with a
	828	* Unicode string.
845	829	*
846	830	* Side Effects:
847	831	* None

863	847	UInt32 result;
864	848	char macBuff[3];
865	849	char *macStr;
866		int macStrLen;
	850	int macStrLen, uniStrLen;
867	851	UInt32 dummy_state = 0;
	852	CFStringRef cfString;
868	853
869	854	if (NULL == deadKeyStatePtr) {
870	855	deadKeyStatePtr = &dummy_state;

876	861	if ((0 == result) && (0 != dummy_state)) {
877	862	/*
878	863	* 'dummy_state' gets only filled if the caller did not want deadkey
879		* processing (deadKeyStatePtr was NULL originally), but we still
880		* have a deadkey. We just push the keycode for the space bar to get
881		* the real key value.
	864	* processing (deadKeyStatePtr was NULL originally), but we still have
	865	* a deadkey. We just push the keycode for the space bar to get the
	866	* real key value.
882	867	*/
883	868
884	869	result = KeyTranslate(kchr, 0x31, deadKeyStatePtr);

894	879	}
895	880
896	881	macBuff[0] = (char) (result >> 16);
897		macBuff[1] = (char) result;
	882	macBuff[1] = (char) result;
898	883	macBuff[2] = 0;
899	884
900	885	if (0 != macBuff[0]) {
901	886	/*
902		* If the first byte is valid, the second is too
	887	* If the first byte is valid, the second is too.
903	888	*/
904	889
905	890	macStr = macBuff;
906	891	macStrLen = 2;
907	892	} else if (0 != macBuff[1]) {
908	893	/*
909		* Only the second is valid
	894	* Only the second is valid.
910	895	*/
911	896
912	897	macStr = macBuff+1;
913	898	macStrLen = 1;
914	899	} else {
915	900	/*
916		* No valid bytes at all -- shouldn't happen
	901	* No valid bytes at all -- shouldn't happen.
917	902	*/
918	903
919	904	macStr = NULL;

922	907
923	908	if (macStrLen <= 0) {
924	909	return 0;
925		} else {
926
927		/*
928		* Use the CFString conversion routines. This is the easiest and
929		* most compatible way to get from an 8-bit string and a MacOS script
930		* code to a Unicode string.
931		*
932		* FIXME: The system ships with an Irish 'KCHR' but without the
933		* corresponding macCeltic encoding, which triggers the error below.
934		* Tcl doesn't have the macCeltic encoding either right now, so until
935		* we get that, we can just as well stick to this code. The right
936		* fix would be to use the Tcl encodings and add macCeltic and
937		* probably others there. Suitable Unicode data files for the
938		* missing encodings are available from www.evertype.com.
939		*/
940
941		CFStringRef cfString;
942		int uniStrLen;
943
944		cfString = CFStringCreateWithCStringNoCopy(NULL, macStr, encoding,
945		kCFAllocatorNull);
946		if (cfString == NULL) {
947		TkMacOSXDbgMsg("CFString: Can't convert with encoding %ld",
948		encoding);
949		return 0;
950		}
951
952		uniStrLen = CFStringGetLength(cfString);
953		if (uniStrLen > maxChars) {
954		uniStrLen = maxChars;
955		}
956		CFStringGetCharacters(cfString, CFRangeMake(0,uniStrLen), uniChars);
957		CFRelease(cfString);
958
959		return uniStrLen;
960		}
	910	}
	911
	912	/*
	913	* Use the CFString conversion routines. This is the easiest and most
	914	* compatible way to get from an 8-bit string and a MacOS script code to a
	915	* Unicode string.
	916	*
	917	* FIXME: The system ships with an Irish 'KCHR' but without the
	918	* corresponding macCeltic encoding, which triggers the error below. Tcl
	919	* doesn't have the macCeltic encoding either right now, so until we get
	920	* that, we can just as well stick to this code. The right fix would be to
	921	* use the Tcl encodings and add macCeltic and probably others
	922	* there. Suitable Unicode data files for the missing encodings are
	923	* available from www.evertype.com.
	924	*/
	925
	926	cfString = CFStringCreateWithCStringNoCopy(NULL, macStr, encoding,
	927	kCFAllocatorNull);
	928	if (cfString == NULL) {
	929	TkMacOSXDbgMsg("CFString: Can't convert with encoding %ld", encoding);
	930	return 0;
	931	}
	932
	933	uniStrLen = CFStringGetLength(cfString);
	934	if (uniStrLen > maxChars) {
	935	uniStrLen = maxChars;
	936	}
	937	CFStringGetCharacters(cfString, CFRangeMake(0,uniStrLen), uniChars);
	938	CFRelease(cfString);
	939
	940	return uniStrLen;
961	941	}
962	942
963	943	/*

968	948	* Given MacOS key event data this function generates the Unicode
969	949	* characters. It does this using OS resources and APIs.
970	950	*
971		* The parameter deadKeyStatePtr can be NULL, if no deadkey handling
972		* is needed.
973		*
974		* This function is called from XKeycodeToKeysym() in
975		* tkMacOSKeyboard.c.
	951	* The parameter deadKeyStatePtr can be NULL, if no deadkey handling is
	952	* needed.
	953	*
	954	* This function is called from XKeycodeToKeysym() in tkMacOSKeyboard.c.
976	955	*
977	956	* Results:
978	957	* The number of characters generated if any, 0 if we are waiting for
979		* another byte of a dead-key sequence. Fills in the uniChars array
980		* with a Unicode string.
	958	* another byte of a dead-key sequence. Fills in the uniChars array with a
	959	* Unicode string.
981	960	*
982	961	* Side Effects:
983	962	* None

996	975	{
997	976	Ptr resource = NULL;
998	977	TextEncoding encoding;
999		int len;
1000
1001
1002		if (GetKeyboardLayout(&resource,&encoding)) {
1003		len = KeycodeToUnicodeViaUnicodeResource(
1004		uniChars, maxChars, resource, eKind,
1005		keycode, modifiers, deadKeyStatePtr);
	978
	979	if (GetKeyboardLayout(&resource, &encoding)) {
	980	return KeycodeToUnicodeViaUnicodeResource(uniChars, maxChars,
	981	resource, eKind, keycode, modifiers, deadKeyStatePtr);
1006	982	} else {
1007		len = KeycodeToUnicodeViaKCHRResource(
1008		uniChars, maxChars, resource, encoding, eKind,
1009		keycode, modifiers, deadKeyStatePtr);
1010		}
1011
1012		return len;
	983	return KeycodeToUnicodeViaKCHRResource(uniChars, maxChars, resource,
	984	encoding, eKind, keycode, modifiers, deadKeyStatePtr);
	985	}
1013	986	}
1014	987
1015	988	/*

1038	1011	Time time)
1039	1012	{
1040	1013	keyboardGrabWinPtr = Tk_IdToWindow(display, grab_window);
	1014
1041	1015	return GrabSuccess;
1042	1016	}
1043	1017

1089	1063	*
1090	1064	* TkpSetCapture --
1091	1065	*
1092		* This function captures the mouse so that all future events
1093		* will be reported to this window, even if the mouse is outside
1094		* the window. If the specified window is NULL, then the mouse
1095		* is released.
	1066	* This function captures the mouse so that all future events will be
	1067	* reported to this window, even if the mouse is outside the window. If
	1068	* the specified window is NULL, then the mouse is released.
1096	1069	*
1097	1070	* Results:
1098	1071	* None.

1119	1092	w = winPtr;
1120	1093	m = kWindowModalityAppModal;
1121	1094	} else if (grabWinPtr) {
1122		w = (TkWindow*)grabWinPtr;
	1095	w = (TkWindow *) grabWinPtr;
1123	1096	m = kWindowModalityNone;
1124	1097	}
	1098
1125	1099	if (w && w->window != None && TkMacOSXHostToplevelExists(w)) {
1126	1100	ChkErr(SetWindowModality, TkMacOSXDrawableWindow(w->window), m,
1127	1101	NULL);

1136	1110	*
1137	1111	* Tk_SetCaretPos --
1138	1112	*
1139		* This enables correct placement of the XIM caret. This is called
1140		* by widgets to indicate their cursor placement, and the caret
1141		* location is used by TkpGetString to place the XIM caret.
	1113	* This enables correct placement of the XIM caret. This is called by
	1114	* widgets to indicate their cursor placement, and the caret location is
	1115	* used by TkpGetString to place the XIM caret.
1142	1116	*
1143	1117	* Results:
1144	1118	* None

1183	1157
1184	1158	GetKeyboardLayout(&resource, &encoding);
1185	1159	}
	1160
	1161	/*
	1162	* Local Variables:
	1163	* mode: c
	1164	* c-basic-offset: 4
	1165	* fill-column: 79
	1166	* coding: utf-8
	1167	* End:
	1168	*/

+95

-93

macosx/tkMacOSXKeyboard.c less more

9	9	* See the file "license.terms" for information on usage and redistribution
10	10	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.23 2007/12/13 15:27:10 dgp Exp $
	12	* RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.24 2008/10/27 11:55:44 dkf Exp $
13	13	*/
14	14
15	15	#include "tkMacOSXInt.h"

163	163	*
164	164	* InitLatin1Table --
165	165	*
166		* Creates a simple table to be used for mapping from keysyms to
167		* keycodes. Always needs to be called before using latin1Table,
168		* because the keyboard layout may have changed, and than the table must
169		* be re-computed.
	166	* Creates a simple table to be used for mapping from keysyms to keycodes.
	167	* Always needs to be called before using latin1Table, because the
	168	* keyboard layout may have changed, and than the table must be
	169	* re-computed.
170	170	*
171	171	* Results:
172	172	* None.

203	203
204	204	/*
205	205	* In the common X11 implementations, a keymap has four columns
206		* "plain", "Shift", "Mode_switch" and "Mode_switch + Shift". We
207		* don't use "Mode_switch", but we use "Option" instead. (This is
208		* similar to Apple's X11 implementation, where "Mode_switch" is used
209		* as an alias for "Option".)
	206	* "plain", "Shift", "Mode_switch" and "Mode_switch + Shift". We don't
	207	* use "Mode_switch", but we use "Option" instead. (This is similar to
	208	* Apple's X11 implementation, where "Mode_switch" is used as an alias
	209	* for "Option".)
210	210	*
211	211	* So here we go through all 4 columns of the keymap and find all
212		* Latin-1 compatible keycodes. We go through the columns
213		* back-to-front from the more exotic columns to the more simple, so
214		* that simple keycode-modifier combinations are preferred in the
215		* resulting table.
	212	* Latin-1 compatible keycodes. We go through the columns back-to-front
	213	* from the more exotic columns to the more simple, so that simple
	214	* keycode-modifier combinations are preferred in the resulting table.
216	215	*/
217	216
218	217	for (state = 3; state >= 0; state--) {

268	267	}
269	268
270	269	/*
271		* When determining what keysym to produce we first check to see if the
272		* key is a function key. We then check to see if the character is
273		* another non-printing key. Finally, we return the key syms for all
274		* ASCII and Latin-1 chars.
	270	* When determining what keysym to produce we first check to see if the key
	271	* is a function key. We then check to see if the character is another
	272	* non-printing key. Finally, we return the key syms for all ASCII and
	273	* Latin-1 chars.
275	274	*/
276	275
277	276	newKeycode = keycode >> 16;

299	298	}
300	299
301	300	newChar = 0;
302		TkMacOSXKeycodeToUnicode(
303		&newChar, 1, kEventRawKeyDown,
304		newKeycode & 0x00FF, newKeycode & 0xFF00, NULL);
305
306		/*
307		* X11 keysyms are identical to Unicode for ASCII and Latin-1. Give up
308		* for other characters for now.
	301	TkMacOSXKeycodeToUnicode(&newChar, 1, kEventRawKeyDown,
	302	newKeycode & 0x00FF, newKeycode & 0xFF00, NULL);
	303
	304	/*
	305	* X11 keysyms are identical to Unicode for ASCII and Latin-1. Give up for
	306	* other characters for now.
309	307	*/
310	308
311	309	if ((newChar >= XK_space) && (newChar <= LATIN1_MAX)) {

362	360
363	361	XModifierKeymap *
364	362	XGetModifierMapping(
365		Display* display)
366		{
367		XModifierKeymap * modmap;
	363	Display *display)
	364	{
	365	XModifierKeymap *modmap;
368	366
369	367	(void) display; /unused/
370	368
371	369	/*
372		* MacOSX doesn't use the key codes for the modifiers for anything, and
373		* we don't generate them either. So there is no modifier map.
	370	* MacOSX doesn't use the key codes for the modifiers for anything, and we
	371	* don't generate them either. So there is no modifier map.
374	372	*/
375	373
376	374	modmap = (XModifierKeymap *) ckalloc(sizeof(XModifierKeymap));

411	409	* XKeysymToString, XStringToKeysym --
412	410	*
413	411	* These X window functions map keysyms to strings & strings to keysyms.
414		* However, Tk already does this for the most common keysyms.
415		* Therefore, these functions only need to support keysyms that will be
416		* specific to the Macintosh. Currently, there are none.
	412	* However, Tk already does this for the most common keysyms. Therefore,
	413	* these functions only need to support keysyms that will be specific to
	414	* the Macintosh. Currently, there are none.
417	415	*
418	416	* Results:
419	417	* None.

443	441	*
444	442	* XKeysymToMacKeycode --
445	443	*
446		* An internal function like XKeysymToKeycode but only generating the
447		* Mac specific keycode plus the modifiers Shift and Option.
	444	* An internal function like XKeysymToKeycode but only generating the Mac
	445	* specific keycode plus the modifiers Shift and Option.
448	446	*
449	447	* Results:
450	448	* A Mac keycode with the actual keycode in the low byte and Mac-style

461	459	Display *display,
462	460	KeySym keysym)
463	461	{
	462	KeyInfo *kPtr;
	463
464	464	if (keysym <= LATIN1_MAX) {
465
466	465	/*
467	466	* Handle keysyms in the Latin-1 range where keysym and Unicode
468	467	* character code point are the same.

470	469
471	470	InitLatin1Table(display);
472	471	return latin1Table[keysym];
473
474		} else {
475
476		/*
477		* Handle special keys from our exception tables. Don't mind if this
478		* is slow, neither the test suite nor [event generate] need to be
479		* optimized (we hope).
480		*/
481
482		KeyInfo *kPtr;
483
484		for (kPtr = keyArray; kPtr->keycode != 0; kPtr++) {
485		if (kPtr->keysym == keysym) {
486		return kPtr->keycode;
487		}
488		}
489		for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) {
490		if (kPtr->keysym == keysym) {
491		return kPtr->keycode;
492		}
493		}
494
495		/*
496		* For other keysyms (not Latin-1 and not special keys), we'd need a
497		* generic keysym-to-unicode table. We don't have that, so we give
498		* up here.
499		*/
500
501		return 0;
502		}
	472	}
	473
	474	/*
	475	* Handle special keys from our exception tables. Don't mind if this is
	476	* slow, neither the test suite nor [event generate] need to be optimized
	477	* (we hope).
	478	*/
	479
	480	for (kPtr = keyArray; kPtr->keycode != 0; kPtr++) {
	481	if (kPtr->keysym == keysym) {
	482	return kPtr->keycode;
	483	}
	484	}
	485	for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) {
	486	if (kPtr->keysym == keysym) {
	487	return kPtr->keycode;
	488	}
	489	}
	490
	491	/*
	492	* For other keysyms (not Latin-1 and not special keys), we'd need a
	493	* generic keysym-to-unicode table. We don't have that, so we give up here.
	494	*/
	495
	496	return 0;
503	497	}
504	498
505	499	/*

507	501	*
508	502	* XKeysymToKeycode --
509	503	*
510		* The function XKeysymToKeycode takes an X11 keysym and converts it
511		* into a Mac keycode. It is in the stubs table for compatibility but
512		* not used anywhere in the core.
	504	* The function XKeysymToKeycode takes an X11 keysym and converts it into
	505	* a Mac keycode. It is in the stubs table for compatibility but not used
	506	* anywhere in the core.
513	507	*
514	508	* Results:
515	509	* A 32 bit keycode with the the mac keycode (without modifiers) in the

579	573	*
580	574	* The function TkpSetKeycodeAndState takes a keysym and fills in the
581	575	* appropriate members of an XEvent. It is similar to XKeysymToKeycode,
582		* but it also sets the modifier mask in the XEvent. It is used by
583		* [event generate] and it is in the stubs table.
	576	* but it also sets the modifier mask in the XEvent. It is used by [event
	577	* generate] and it is in the stubs table.
584	578	*
585	579	* Results:
586	580	* Fills an XEvent, sets the member xkey.keycode with a keycode

625	619	}
626	620
627	621	if (keysym <= LATIN1_MAX) {
628		int done;
629		done = Tcl_UniCharToUtf(keysym,eventPtr->xkey.trans_chars);
	622	int done = Tcl_UniCharToUtf(keysym, eventPtr->xkey.trans_chars);
	623
630	624	eventPtr->xkey.trans_chars[done] = 0;
631	625	} else {
632	626	eventPtr->xkey.trans_chars[0] = 0;

676	670
677	671	if (eventPtr->xany.send_event == -1) {
678	672	int modifier = eventPtr->xkey.keycode;
	673
679	674	if (modifier == cmdKey) {
680	675	return XK_Meta_L;
681	676	} else if (modifier == shiftKey) {

697	692	} else if (modifier == rightControlKey) {
698	693	return XK_Control_R;
699	694	} else {
700
701	695	/*
702	696	* If we get here, we probably need to implement something new.
703	697	*/

707	701	}
708	702
709	703	/*
710		* Figure out which of the four slots in the keymap vector to use for
711		* this key. Refer to Xlib documentation for more info on how this
712		* computation works. (Note: We use "Option" in keymap columns 2 and 3
713		* where other implementations have "Mode_switch".)
	704	* Figure out which of the four slots in the keymap vector to use for this
	705	* key. Refer to Xlib documentation for more info on how this computation
	706	* works. (Note: We use "Option" in keymap columns 2 and 3 where other
	707	* implementations have "Mode_switch".)
714	708	*/
715	709
716	710	index = 0;

728	722
729	723	if ((eventPtr->xkey.state & ShiftMask)
730	724	\|\| (/* (dispPtr->lockUsage != LU_IGNORE)
731		&& */ (eventPtr->xkey.state & LockMask))) {
	725	&& */ (eventPtr->xkey.state & LockMask))) {
732	726	index \|= 1;
733	727	}
734	728

740	734
741	735	/*
742	736	* Special handling: If the key was shifted because of Lock, but lock is
743		* only caps lock, not shift lock, and the shifted keysym isn't
744		* upper-case alphabetic, then switch back to the unshifted keysym.
	737	* only caps lock, not shift lock, and the shifted keysym isn't upper-case
	738	* alphabetic, then switch back to the unshifted keysym.
745	739	*/
746	740
747	741	if ((index & 1) && !(eventPtr->xkey.state & ShiftMask)
748	742	/&& (dispPtr->lockUsage == LU_CAPS)/ ) {
749
750	743	/*
751		* FIXME: Keysyms are only identical to Unicode for ASCII and
752		* Latin-1, so we can't use Tcl_UniCharIsUpper() for keysyms outside
753		* that range. This may be a serious problem here.
	744	* FIXME: Keysyms are only identical to Unicode for ASCII and Latin-1,
	745	* so we can't use Tcl_UniCharIsUpper() for keysyms outside that range.
	746	* This may be a serious problem here.
754	747	*/
755	748
756	749	if ((sym == NoSymbol) \|\| (sym > LATIN1_MAX)

778	771	*
779	772	* TkpInitKeymapInfo --
780	773	*
781		* This procedure is invoked to scan keymap information to recompute
782		* stuff that's important for binding, such as the modifier key (if any)
783		* that corresponds to the "Mode_switch" keysym.
	774	* This procedure is invoked to scan keymap information to recompute stuff
	775	* that's important for binding, such as the modifier key (if any) that
	776	* corresponds to the "Mode_switch" keysym.
784	777	*
785	778	* Results:
786	779	* None.

800	793
801	794	/*
802	795	* Behaviours that are variable on X11 are defined constant on MacOSX.
803		* lockUsage is only used above in TkpGetKeySym(), nowhere else
804		* currently. There is no offical "Mode_switch" key.
	796	* lockUsage is only used above in TkpGetKeySym(), nowhere else currently.
	797	* There is no offical "Mode_switch" key.
805	798	*/
806	799
807	800	dispPtr->lockUsage = LU_CAPS;

825	818
826	819	/*
827	820	* MacOSX doesn't use the keycodes for the modifiers for anything, and we
828		* don't generate them either (the keycodes actually given in the
829		* simulated modifier events are bogus). So there is no modifier map.
830		* If we ever want to simulate real modifier keycodes, the list will be
831		* constant in the Carbon implementation.
	821	* don't generate them either (the keycodes actually given in the simulated
	822	* modifier events are bogus). So there is no modifier map. If we ever want
	823	* to simulate real modifier keycodes, the list will be constant in the
	824	* Carbon implementation.
832	825	*/
833	826
834	827	if (dispPtr->modKeyCodes != NULL) {

837	830	dispPtr->numModKeyCodes = 0;
838	831	dispPtr->modKeyCodes = NULL;
839	832	}
	833
	834	/*
	835	* Local Variables:
	836	* mode: c
	837	* c-basic-offset: 4
	838	* fill-column: 79
	839	* coding: utf-8
	840	* End:
	841	*/

+560

-557

macosx/tkMacOSXMenu.c less more

6	6	* Copyright 2001, Apple Computer, Inc.
7	7	* Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>
8	8	*
9		* See the file "license.terms" for information on usage and redistribution
10		* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11		*
12		* RCS: @(#) $Id: tkMacOSXMenu.c,v 1.45 2007/12/13 15:27:10 dgp Exp $
	9	* See the file "license.terms" for information on usage and redistribution of
	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
	11	*
	12	* RCS: @(#) $Id: tkMacOSXMenu.c,v 1.49 2008/12/09 21:22:56 dgp Exp $
13	13	*/
14	14
15	15	#include "tkMacOSXPrivate.h"

68	68	*/
69	69
70	70	typedef struct EntryGeometry {
71		int accelTextStart; /* Offset into the accel string where
72		* the text starts. Everything before
73		* this is modifier key descriptions.
74		*/
	71	int accelTextStart; /* Offset into the accel string where the text
	72	* starts. Everything before this is modifier
	73	* key descriptions. */
75	74	int modifierWidth; /* Width of modifier symbols. */
76	75	int accelTextWidth; /* Width of the text after the modifier
77	76	* keys. */
78		int nonAccelMargin; /* The width of the margin for entries
79		* without accelerators. */
	77	int nonAccelMargin; /* The width of the margin for entries without
	78	* accelerators. */
80	79	int modifierNum; /* Number of modifiers */
81	80	Tcl_UniChar modifierUniChars[MODIFIER_NUM];
82	81	/* Modifiers in unicode */

91	90	struct TopLevelMenubarList *nextPtr;
92	91	/* The next window in the list. */
93	92	Tk_Window tkwin; /* The toplevel window. */
94		TkMenu menuPtr; / The menu associated with this
95		* toplevel. */
	93	TkMenu menuPtr; / The menu associated with this toplevel. */
96	94	} TopLevelMenubarList;
97	95
98	96	/*
99	97	* Platform-specific flags for menus.
100	98	*
101		* MENU_APPLE_MENU 0 indicates a custom Apple menu has
102		* not been installed; 1 a custom Apple
103		* menu has been installed.
104		* MENU_HELP_MENU 0 indicates a custom Help menu has
105		* not been installed; 1 a custom Help
106		* menu has been installed.
107		* MENU_RECONFIGURE_PENDING 1 indicates that an idle handler has
108		* been scheduled to reconfigure the
109		* Macintosh MenuHandle.
	99	* MENU_APPLE_MENU 0 indicates a custom Apple menu has not been
	100	* installed; 1 a custom Apple menu has been
	101	* installed.
	102	* MENU_HELP_MENU 0 indicates a custom Help menu has not been
	103	* installed; 1 a custom Help menu has been
	104	* installed.
	105	* MENU_RECONFIGURE_PENDING 1 indicates that an idle handler has been
	106	* scheduled to reconfigure the Macintosh
	107	* MenuHandle.
110	108	*/
111	109
112	110	#define MENU_APPLE_MENU MENU_PLATFORM_FLAG1

117	115	* menus. */
118	116	#define MENUBAR_REDRAW_PENDING 1
119	117
120		static int gNoTkMenus = 0; /* This is used by Tk_MacOSXTurnOffMenus as the
121		* flag that Tk is not to draw any menus. */
	118	static int gNoTkMenus = 0; /* This is used by Tk_MacOSXTurnOffMenus as
	119	* the flag that Tk is not to draw any
	120	* menus. */
122	121
123	122	static Tcl_HashTable commandTable;
124		/* The list of menuInstancePtrs associated with
125		* menu ids */
	123	/* The list of menuInstancePtrs associated
	124	* with menu ids. */
126	125	static short currentAppleMenuID;
127	126	/* The id of the current Apple menu. 0 for
128	127	* none. */
129	128	static short currentHelpMenuID; /* The id of the current Help menu. 0 for
130	129	* none. */
131	130	static Tcl_Interp *currentMenuBarInterp;
132		/* The interpreter of the window that owns
133		* the current menubar. */
	131	/* The interpreter of the window that owns the
	132	* current menubar. */
134	133	static char *currentMenuBarName;
135	134	/* Malloced. Name of current menu in menu bar.
136	135	* NULL if no menu set. TO DO: make this a
137	136	* DString. */
138	137	static Tk_Window currentMenuBarOwner;
139	138	/* Which window owns the current menu bar. */
140		static int inPostMenu; /* We cannot be re-entrant like X
141		* windows. */
142		static short lastMenuID; /* To pass to NewMenu; need to figure out
143		* a good way to do this. */
144		static short lastCascadeID;
145		/* Cascades have to have ids that are
146		* less than 256. */
	139	static int inPostMenu; /* We cannot be re-entrant like X windows. */
	140	static short lastMenuID; /* To pass to NewMenu; need to figure out a
	141	* good way to do this. */
	142	static short lastCascadeID; /* Cascades have to have ids that are less
	143	* than 256. */
147	144	static int menuBarFlags; /* Used for whether the menu bar needs
148	145	* redrawing or not. */
149	146

159	156	* Array of unicode, charcode and utf representations of the most common
160	157	* special menu symbols.
161	158	*/
	159
162	160	typedef struct MenuSymbol {
163	161	const Tcl_UniChar unicode;
164	162	const char charCode;

201	199	* Forward declarations for procedures defined later in this file:
202	200	*/
203	201
204		MODULE_SCOPE int TkMacOSXGetNewMenuID(Tcl_Interp interp, TkMenu menuInstPtr,
205		int cascade, short *menuIDPtr);
206		MODULE_SCOPE void TkMacOSXFreeMenuID(short menuID);
207
208		static void CompleteIdlers(TkMenu *menuPtr);
209		static void DrawMenuBarWhenIdle(ClientData clientData);
210		static void DrawMenuEntryAccelerator(TkMenu menuPtr, TkMenuEntry mePtr,
211		Drawable d, GC gc, Tk_Font tkfont, const Tk_FontMetrics *fmPtr,
212		Tk_3DBorder activeBorder, int x, int y, int width, int height,
213		int drawArrow);
214		static void DrawMenuEntryBackground(TkMenu menuPtr, TkMenuEntry mePtr,
215		Drawable d, Tk_3DBorder activeBorder, Tk_3DBorder bgBorder, int x,
216		int y, int width, int heigth);
217		static void DrawMenuEntryIndicator(TkMenu menuPtr, TkMenuEntry mePtr,
218		Drawable d, GC gc, GC indicatorGC, Tk_Font tkfont,
219		const Tk_FontMetrics *fmPtr, int x, int y, int width, int height);
220		static void DrawMenuEntryLabel(TkMenu * menuPtr, TkMenuEntry *mePtr,
221		Drawable d, GC gc, Tk_Font tkfont, const Tk_FontMetrics *fmPtr, int x,
222		int y, int width, int height);
223		static void DrawMenuSeparator(TkMenu menuPtr, TkMenuEntry mePtr, Drawable d,
224		GC gc, Tk_Font tkfont, const Tk_FontMetrics *fmPtr, int x, int y,
225		int width, int height);
226		static void DrawTearoffEntry(TkMenu menuPtr, TkMenuEntry mePtr, Drawable d,
227		GC gc, Tk_Font tkfont, const Tk_FontMetrics *fmPtr, int x, int y,
228		int width, int height);
229		static void EventuallyInvokeMenu(ClientData data);
230		static void GetEntryText(TkMenuEntry mePtr, Tcl_DString dStringPtr);
231		static void GetMenuAccelGeometry(TkMenu menuPtr, TkMenuEntry mePtr,
232		Tk_Font tkfont, const Tk_FontMetrics fmPtr, int modWidthPtr,
233		int textWidthPtr, int heightPtr);
234		static void GetMenuLabelGeometry(TkMenuEntry *mePtr, Tk_Font tkfont,
235		const Tk_FontMetrics fmPtr, int widthPtr, int *heightPtr);
236		static void GetMenuIndicatorGeometry(TkMenu menuPtr, TkMenuEntry mePtr,
237		Tk_Font tkfont, const Tk_FontMetrics fmPtr, int widthPtr,
238		int *heightPtr);
239		static void GetMenuSeparatorGeometry(TkMenu menuPtr, TkMenuEntry mePtr,
240		Tk_Font tkfont, const Tk_FontMetrics fmPtr, int widthPtr,
241		int *heightPtr);
242		static TkMenuEntry* GetParentMenuEntry(TkMenu *menuPtr);
243		static void GetTearoffEntryGeometry(TkMenu menuPtr, TkMenuEntry mePtr,
244		Tk_Font tkfont, const Tk_FontMetrics fmPtr, int widthPtr,
245		int *heightPtr);
246		static char FindMarkCharacter(TkMenuEntry *mePtr);
247		static int GetUtfMarkCharacter(char markChar, const char **markUtfPtr);
248		static TkMenu* MenuPtrForMenuRef(MenuRef menu);
249		static int ParseAccelerators(const char *accelStringPtr, int modifierNumPtr,
250		Tcl_UniChar modifierUniChars, int modifierWidth);
251		static void MenuSelectEvent(TkMenu *menuPtr);
252		static void ReconfigureIndividualMenu(TkMenu *menuPtr, MenuHandle macMenuHdl,
253		int base);
254		static void ReconfigureMacintoshMenu(ClientData clientData);
255		static void RecursivelyClearActiveMenu(TkMenu *menuPtr);
256		static void RecursivelyDeleteMenu(TkMenu *menuPtr);
257		static void RecursivelyInsertMenu(TkMenu *menuPtr);
258		static void SetDefaultMenubar(void);
259		static int SetMenuCascade(TkMenu *menuPtr);
	202	MODULE_SCOPE int TkMacOSXGetNewMenuID(Tcl_Interp *interp,
	203	TkMenu *menuInstPtr, int cascade,
	204	short *menuIDPtr);
	205	MODULE_SCOPE void TkMacOSXFreeMenuID(short menuID);
	206
	207	static void CompleteIdlers(TkMenu *menuPtr);
	208	static void DrawMenuBarWhenIdle(ClientData clientData);
	209	static void DrawMenuEntryAccelerator(TkMenu *menuPtr,
	210	TkMenuEntry *mePtr, Drawable d, GC gc,
	211	Tk_Font tkfont, const Tk_FontMetrics *fmPtr,
	212	Tk_3DBorder activeBorder, int x, int y, int width,
	213	int height, int drawArrow);
	214	static void DrawMenuEntryBackground(TkMenu *menuPtr,
	215	TkMenuEntry *mePtr, Drawable d,
	216	Tk_3DBorder activeBorder, Tk_3DBorder bgBorder,
	217	int x, int y, int width, int heigth);
	218	static void DrawMenuEntryIndicator(TkMenu *menuPtr,
	219	TkMenuEntry *mePtr, Drawable d, GC gc,
	220	GC indicatorGC, Tk_Font tkfont,
	221	const Tk_FontMetrics *fmPtr, int x, int y,
	222	int width, int height);
	223	static void DrawMenuEntryLabel(TkMenu menuPtr,TkMenuEntry mePtr,
	224	Drawable d, GC gc, Tk_Font tkfont,
	225	const Tk_FontMetrics *fmPtr, int x, int y,
	226	int width, int height);
	227	static void DrawMenuSeparator(TkMenu menuPtr, TkMenuEntry mePtr,
	228	Drawable d, GC gc, Tk_Font tkfont,
	229	const Tk_FontMetrics *fmPtr, int x, int y,
	230	int width, int height);
	231	static void DrawTearoffEntry(TkMenu menuPtr, TkMenuEntry mePtr,
	232	Drawable d, GC gc, Tk_Font tkfont,
	233	const Tk_FontMetrics *fmPtr, int x, int y,
	234	int width, int height);
	235	static void EventuallyInvokeMenu(ClientData data);
	236	static void GetEntryText(TkMenuEntry *mePtr,
	237	Tcl_DString *dStringPtr);
	238	static void GetMenuAccelGeometry(TkMenu *menuPtr,
	239	TkMenuEntry *mePtr, Tk_Font tkfont,
	240	const Tk_FontMetrics fmPtr, int modWidthPtr,
	241	int textWidthPtr, int heightPtr);
	242	static void GetMenuLabelGeometry(TkMenuEntry *mePtr,
	243	Tk_Font tkfont, const Tk_FontMetrics *fmPtr,
	244	int widthPtr, int heightPtr);
	245	static void GetMenuIndicatorGeometry(TkMenu *menuPtr,
	246	TkMenuEntry *mePtr, Tk_Font tkfont,
	247	const Tk_FontMetrics fmPtr, int widthPtr,
	248	int *heightPtr);
	249	static void GetMenuSeparatorGeometry(TkMenu *menuPtr,
	250	TkMenuEntry *mePtr, Tk_Font tkfont,
	251	const Tk_FontMetrics fmPtr, int widthPtr,
	252	int *heightPtr);
	253	static TkMenuEntry * GetParentMenuEntry(TkMenu *menuPtr);
	254	static void GetTearoffEntryGeometry(TkMenu *menuPtr,
	255	TkMenuEntry *mePtr, Tk_Font tkfont,
	256	const Tk_FontMetrics fmPtr, int widthPtr,
	257	int *heightPtr);
	258	static char FindMarkCharacter(TkMenuEntry *mePtr);
	259	static int GetUtfMarkCharacter(char markChar,
	260	const char **markUtfPtr);
	261	static TkMenu * MenuPtrForMenuRef(MenuRef menu);
	262	static int ParseAccelerators(const char **accelStringPtr,
	263	int *modifierNumPtr,
	264	Tcl_UniChar *modifierUniChars,
	265	int *modifierWidth);
	266	static void MenuSelectEvent(TkMenu *menuPtr);
	267	static void ReconfigureIndividualMenu(TkMenu *menuPtr,
	268	MenuHandle macMenuHdl, int base);
	269	static void ReconfigureMacintoshMenu(ClientData clientData);
	270	static void RecursivelyClearActiveMenu(TkMenu *menuPtr);
	271	static void RecursivelyDeleteMenu(TkMenu *menuPtr);
	272	static void RecursivelyInsertMenu(TkMenu *menuPtr);
	273	static void SetDefaultMenubar(void);
	274	static int SetMenuCascade(TkMenu *menuPtr);
260	275
261	276	#ifdef USE_TK_MDEF
262	277	#define SCREEN_MARGIN 5
263	278	static MacDrawable macMDEFDrawable;
264	279	/* Drawable for use by MDEF code */
265		static int MDEFScrollFlag = 0; /* Used so that popups don't scroll too soon.*/
	280	static int MDEFScrollFlag = 0; /* Used so that popups don't scroll too
	281	* soon. */
266	282	static MenuItemDrawingUPP tkThemeMenuItemDrawingUPP;
267		/* Points to the UPP for theme Item drawing. */
	283	/* Points to the UPP for theme Item
	284	* drawing. */
268	285	static Tcl_Obj *useMDEFVar;
269	286
270		static void DrawMenuBackground(TkMenu menuPtr, Rect menuRectPtr,
271		Drawable d);
272		static void MenuDefProc(short message, MenuHandle menu, Rect *menuRectPtr,
273		Point hitPt, short *whichItem );
274		static void HandleMenuHiliteMsg(MenuRef menu, Rect *menuRectPtr, Point hitPt,
275		SInt16 whichItem, TkMenu menuPtr);
276		static void HandleMenuDrawMsg(MenuRef menu, Rect *menuRectPtr, Point hitPt,
277		SInt16 whichItem, TkMenu menuPtr);
278		static void HandleMenuFindItemMsg(MenuRef menu, Rect *menuRectPtr,
279		Point hitPt, SInt16 whichItem, TkMenu menuPtr);
280		static void HandleMenuPopUpMsg(MenuRef menu, Rect *menuRectPtr, Point hitPt,
281		SInt16 whichItem, TkMenu menuPtr);
282		static void HandleMenuCalcItemMsg(MenuRef menu, Rect *menuRectPtr, Point hitPt,
283		SInt16 whichItem, TkMenu menuPtr);
284		static void AppearanceEntryDrawWrapper(TkMenuEntry mePtr, Rect menuRectPtr,
285		MenuTrackingData mtdPtr, Drawable d, Tk_FontMetrics fmPtr,
286		Tk_Font tkfont, int erase);
287		static pascal void ThemeMenuItemDrawingProc(const Rect *inBounds,
288		SInt16 inDepth, Boolean inIsColorDevice, SInt32 inUserData);
	287	static void DrawMenuBackground(TkMenu menuPtr, Rect menuRectPtr,
	288	Drawable d);
	289	static void MenuDefProc(short message, MenuHandle menu,
	290	Rect menuRectPtr, Point hitPt, short whichItem);
	291	static void HandleMenuHiliteMsg(MenuRef menu, Rect *menuRectPtr,
	292	Point hitPt, SInt16 whichItem, TkMenu menuPtr);
	293	static void HandleMenuDrawMsg(MenuRef menu, Rect *menuRectPtr,
	294	Point hitPt, SInt16 whichItem, TkMenu menuPtr);
	295	static void HandleMenuFindItemMsg(MenuRef menu, Rect *menuRectPtr,
	296	Point hitPt, SInt16 whichItem, TkMenu menuPtr);
	297	static void HandleMenuPopUpMsg(MenuRef menu, Rect *menuRectPtr,
	298	Point hitPt, SInt16 whichItem, TkMenu menuPtr);
	299	static void HandleMenuCalcItemMsg(MenuRef menu, Rect *menuRectPtr,
	300	Point hitPt, SInt16 whichItem, TkMenu menuPtr);
	301	static void AppearanceEntryDrawWrapper(TkMenuEntry *mePtr,
	302	Rect menuRectPtr, MenuTrackingData mtdPtr,
	303	Drawable d, Tk_FontMetrics *fmPtr, Tk_Font tkfont,
	304	int erase);
	305	static pascal void ThemeMenuItemDrawingProc(const Rect *inBounds,
	306	SInt16 inDepth, Boolean inIsColorDevice,
	307	SInt32 inUserData);
289	308	#else /* USE_TK_MDEF */
290	309	# define useMDEF 0
291	310	#endif /* USE_TK_MDEF */
292	311
293	312	#define IS_THEME_MENU_FONT(tkfont) (strcmp(Tk_NameOfFont(tkfont), "menu") == 0)
294
295	313
296	314	/*
297	315	*----------------------------------------------------------------------

331	349	* first determine the baseline of the text and then adjust the bounds
332	350	* rect so the baseline aligns with the overall baseline of the menu item.
333	351	*/
	352
334	353	if (font == kThemeMenuItemCmdKeyFont) {
335	354	Point size;
336	355	SInt16 cmdKeyBaseline;

373	392	Point pt;
374	393
375	394	ChkErr(GetThemeTextDimensions, string, font, kThemeStateActive, false, &pt,
376		NULL);
	395	NULL);
377	396	return pt.h;
378	397	}
379	398

387	406	* level. See TkMacOSXGetNewMenuID for more information.
388	407	*
389	408	* Results:
390		* Returns TCL_OK if the id was not in use. Returns TCL_ERROR if the
391		* id was in use.
392		*
393		* Side effects:
394		* A hash table entry in the command table is created with a NULL
395		* value.
	409	* Returns TCL_OK if the id was not in use. Returns TCL_ERROR if the id
	410	* was in use.
	411	*
	412	* Side effects:
	413	* A hash table entry in the command table is created with a NULL value.
396	414	*
397	415	*----------------------------------------------------------------------
398	416	*/

420	438	*
421	439	* TkMacOSXGetNewMenuID --
422	440	*
423		* Allocates a new menu id and marks it in use. Each menu on the
424		* mac must be designated by a unique id, which is a short. In
425		* addition, some ids are reserved by the system. Since Tk uses
426		* mostly dynamic menus, we must allocate and free these ids on
427		* the fly. We use the id as a key into a hash table; if there
428		* is no hash entry, we know that we can use the id.
429		*
430		* Carbon allows a much larger number of menus than the old APIs.
431		* I believe this is 32768, but am not sure. This code just uses
432		* 2000 as the upper limit. Unfortunately tk leaks menus when
433		* cloning, under some circumstances (see bug on sourceforge).
434		*
435		* Results:
436		* Returns TCL_OK if succesful; TCL_ERROR if there are no more
437		* ids of the appropriate type to allocate. menuIDPtr contains
438		* the new id if succesful.
439		*
440		* Side effects:
441		* An entry is created for the menu in the command hash table,
442		* and the hash entry is stored in the appropriate field in the
443		* menu data structure.
	441	* Allocates a new menu id and marks it in use. Each menu on the mac must
	442	* be designated by a unique id, which is a short. In addition, some ids
	443	* are reserved by the system. Since Tk uses mostly dynamic menus, we
	444	* must allocate and free these ids on the fly. We use the id as a key
	445	* into a hash table; if there is no hash entry, we know that we can use
	446	* the id.
	447	*
	448	* Carbon allows a much larger number of menus than the old APIs. I
	449	* believe this is 32768, but am not sure. This code just uses 2000 as
	450	* the upper limit. Unfortunately tk leaks menus when cloning, under some
	451	* circumstances (see bug on sourceforge).
	452	*
	453	* Results:
	454	* Returns TCL_OK if succesful; TCL_ERROR if there are no more ids of the
	455	* appropriate type to allocate. menuIDPtr contains the new id if
	456	* succesful.
	457	*
	458	* Side effects:
	459	* An entry is created for the menu in the command hash table, and the
	460	* hash entry is stored in the appropriate field in the menu data
	461	* structure.
444	462	*
445	463	*----------------------------------------------------------------------
446	464	*/

459	477	short returnID = *menuIDPtr;
460	478
461	479	/*
462		* The following code relies on shorts and unsigned chars wrapping
463		* when the highest value is incremented. Also, the values between
464		* 236 and 255 inclusive are reserved for DA's by the Mac OS.
	480	* The following code relies on shorts and unsigned chars wrapping when
	481	* the highest value is incremented. Also, the values between 236 and 255
	482	* inclusive are reserved for DA's by the Mac OS.
465	483	*/
466	484
467	485	if (!cascade) {

487	505	}
488	506	} else {
489	507	/*
490		* Cascade ids must be between 0 and 235 only, so they must be
491		* dealt with separately.
	508	* Cascade ids must be between 0 and 235 only, so they must be dealt
	509	* with separately.
492	510	*/
493	511
494	512	short curID = lastCascadeID + 1;

562	580	*
563	581	* MenuPtrForMenuRef --
564	582	*
565		* Returns a pointer to the TkMenu corresponding to a given
566		* Carbon MenuRef.
	583	* Returns a pointer to the TkMenu corresponding to a given Carbon
	584	* MenuRef.
567	585	*
568	586	* Results:
569	587	* Returns a pointer to a TkMenu or NULL.

574	592	*----------------------------------------------------------------------
575	593	*/
576	594
577		TkMenu*
	595	TkMenu *
578	596	MenuPtrForMenuRef(
579	597	MenuRef menu)
580	598	{
581	599	TkMenu *menuPtr = NULL;
582	600	MenuID menuID = GetMenuID(menu);
583		Tcl_HashEntry *commandEntryPtr = Tcl_FindHashEntry(&commandTable,
584		(char*)(intptr_t)menuID);
	601	Tcl_HashEntry *commandEntryPtr =
	602	Tcl_FindHashEntry(&commandTable, (char*)(intptr_t)menuID);
585	603
586	604	if (commandEntryPtr) {
587		menuPtr = (TkMenu *) Tcl_GetHashValue(commandEntryPtr);
	605	menuPtr = Tcl_GetHashValue(commandEntryPtr);
588	606	}
589	607	return menuPtr;
590	608	}

636	654	* Returns a standard TCL error.
637	655	*
638	656	* Side effects:
639		* Allocates a Macintosh menu handle and puts in the platformData
640		* field of the menuPtr.
	657	* Allocates a Macintosh menu handle and puts in the platformData field
	658	* of the menuPtr.
641	659	*
642	660	*----------------------------------------------------------------------
643	661	*/

722	740	}
723	741
724	742	menuPtr->menuFlags \|= MENU_RECONFIGURE_PENDING;
725		Tcl_DoWhenIdle(ReconfigureMacintoshMenu, (ClientData) menuPtr);
	743	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, menuPtr);
726	744	return TCL_OK;
727	745	}
728	746

749	767	MenuRef macMenuHdl = ((MacMenu *) menuPtr->platformData)->menuHdl;
750	768
751	769	if (menuPtr->menuFlags & MENU_RECONFIGURE_PENDING) {
752		Tcl_CancelIdleCall(ReconfigureMacintoshMenu, (ClientData) menuPtr);
	770	Tcl_CancelIdleCall(ReconfigureMacintoshMenu, menuPtr);
753	771	menuPtr->menuFlags &= ~MENU_RECONFIGURE_PENDING;
754	772	}
755	773	if (GetMenuID(macMenuHdl) == currentHelpMenuID) {

795	813
796	814	int
797	815	SetMenuCascade(
798		TkMenu* menuPtr) /* The menu we are setting up to be a
	816	TkMenu menuPtr) / The menu we are setting up to be a
799	817	* cascade. */
800	818	{
801	819	MenuHandle macMenuHdl = ((MacMenu *) menuPtr->platformData)->menuHdl;

838	856	if ((menuPtr->platformData != NULL)
839	857	&& !(menuPtr->menuFlags & MENU_RECONFIGURE_PENDING)) {
840	858	menuPtr->menuFlags \|= MENU_RECONFIGURE_PENDING;
841		Tcl_DoWhenIdle(ReconfigureMacintoshMenu, (ClientData) menuPtr);
	859	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, menuPtr);
842	860	}
843	861	}
844	862

848	866	* GetEntryText --
849	867	*
850	868	* Given a menu entry, gives back the text that should go in it.
851		* Separators should be done by the caller, as they have to be
852		* handled specially. This is primarily used to do a substitution
853		* between "..." and the ellipsis character which looks nicer.
	869	* Separators should be done by the caller, as they have to be handled
	870	* specially. This is primarily used to do a substitution between "..."
	871	* and the ellipsis character which looks nicer.
854	872	*
855	873	* Results:
856	874	* itemText points to the new text for the item.

914	932	*
915	933	* FindMarkCharacter --
916	934	*
917		* Finds the Macintosh mark character based on the font of the
918		* item. We calculate a good mark character based on the font
919		* that this item is rendered in.
	935	* Finds the Macintosh mark character based on the font of the item. We
	936	* calculate a good mark character based on the font that this item is
	937	* rendered in.
920	938	*
921	939	* Results:
922	940	* Mark char.

956	974	*
957	975	* GetUtfMarkCharacter --
958	976	*
959		* Get the utf8 string for the given mark character, taking into
960		* account the special menu font char codes.
	977	* Get the utf8 string for the given mark character, taking into account
	978	* the special menu font char codes.
961	979	*
962	980	* Results:
963	981	* Length of returned utf8 string.

1080	1098	* Processes configurations for menu entries.
1081	1099	*
1082	1100	* Results:
1083		* Returns standard TCL result. If TCL_ERROR is returned, then
1084		* the interp's result contains an error message.
1085		*
1086		* Side effects:
1087		* Configuration information get set for mePtr; old resources
1088		* get freed, if any need it.
	1101	* Returns standard TCL result. If TCL_ERROR is returned, then the
	1102	* interp's result contains an error message.
	1103	*
	1104	* Side effects:
	1105	* Configuration information get set for mePtr; old resources get freed,
	1106	* if any need it.
1089	1107	*
1090	1108	*----------------------------------------------------------------------
1091	1109	*/
1092	1110
1093	1111	int
1094	1112	TkpConfigureMenuEntry(
1095		TkMenuEntry mePtr) / Information about menu entry; may
1096		* or may not already have values for
1097		* some fields. */
	1113	TkMenuEntry mePtr) / Information about menu entry; may or may
	1114	* not already have values for some fields. */
1098	1115	{
1099	1116	TkMenu *menuPtr = mePtr->menuPtr;
1100	1117	EntryGeometry geometryPtr = (EntryGeometry ) mePtr->platformEntryData;
1101	1118
1102	1119	/*
1103		* Cascade menus have to have menu IDs of less than 256. So
1104		* we need to change the child menu if this has been configured
1105		* for a cascade item.
	1120	* Cascade menus have to have menu IDs of less than 256. So we need to
	1121	* change the child menu if this has been configured for a cascade item.
1106	1122	*/
1107	1123
1108	1124	if (mePtr->type == CASCADE_ENTRY) {

1134	1150	}
1135	1151
1136	1152	/*
1137		* We need to parse the accelerator string. If it has the strings
1138		* for Command, Control, Shift or Option, we need to flag it
1139		* so we can draw the symbols for it. We also need to precalcuate
1140		* the position of the first real character we are drawing.
	1153	* We need to parse the accelerator string. If it has the strings for
	1154	* Command, Control, Shift or Option, we need to flag it so we can draw
	1155	* the symbols for it. We also need to precalcuate the position of the
	1156	* first real character we are drawing.
1141	1157	*/
1142	1158
1143	1159	if (0 == mePtr->accelLength) {

1156	1172
1157	1173	if (!(menuPtr->menuFlags & MENU_RECONFIGURE_PENDING)) {
1158	1174	menuPtr->menuFlags \|= MENU_RECONFIGURE_PENDING;
1159		Tcl_DoWhenIdle(ReconfigureMacintoshMenu, (ClientData) menuPtr);
	1175	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, menuPtr);
1160	1176	}
1161	1177
1162	1178	return TCL_OK;

1167	1183	*
1168	1184	* ReconfigureIndividualMenu --
1169	1185	*
1170		* This routine redoes the guts of the menu. It works from
1171		* a base item and offset, so that a regular menu will
1172		* just have all of its items added, but the help menu will
1173		* have all of its items appended after the apple-defined
1174		* items.
	1186	* This routine redoes the guts of the menu. It works from a base item
	1187	* and offset, so that a regular menu will just have all of its items
	1188	* added, but the help menu will have all of its items appended after the
	1189	* apple-defined items.
1175	1190	*
1176	1191	* Results:
1177	1192	* None.

1185	1200	void
1186	1201	ReconfigureIndividualMenu(
1187	1202	TkMenu menuPtr, / The menu we are affecting. */
1188		MenuHandle macMenuHdl, /* The macintosh menu we are affecting.
1189		* Will not necessarily be
1190		* menuPtr->platformData because this could
1191		* be the help menu. */
1192		int base) /* The last index that we do not want
1193		* touched. 0 for normal menus;
1194		* # of system help menu items
1195		* for help menus. */
	1203	MenuHandle macMenuHdl, /* The macintosh menu we are affecting. Will
	1204	* not necessarily be menuPtr->platformData
	1205	* because this could be the help menu. */
	1206	int base) /* The last index that we do not want touched.
	1207	* 0 for normal menus; # of system help menu
	1208	* items for help menus. */
1196	1209	{
1197	1210	int count;
1198	1211	int index;

1205	1218	*/
1206	1219
1207	1220	TkMacOSXInitNamedDebugSymbol(HIToolbox, void, DebugPrintMenu,
1208		MenuRef menu);
	1221	MenuRef menu);
1209	1222	if (DebugPrintMenu) {
1210	1223	DebugPrintMenu(macMenuHdl);
1211	1224	}

1231	1244	mePtr = menuPtr->entries[index - 1];
1232	1245
1233	1246	/*
1234		* We have to do separators separately because SetMenuItemText
1235		* does not parse meta-characters.
	1247	* We have to do separators separately because SetMenuItemText does
	1248	* not parse meta-characters.
1236	1249	*/
1237	1250
1238	1251	if (mePtr->type == SEPARATOR_ENTRY) {

1250	1263	CFRelease(cfStr);
1251	1264	} else {
1252	1265	AppendMenuItemTextWithCFString(macMenuHdl, CFSTR ("<Error>"),
1253		0, 0, NULL);
	1266	0, 0, NULL);
1254	1267	}
1255	1268	Tcl_DStringFree(&itemTextDString);
1256	1269

1272	1285	if ((mePtr->type == CHECK_BUTTON_ENTRY)
1273	1286	\|\| (mePtr->type == RADIO_BUTTON_ENTRY)) {
1274	1287	CheckMenuItem(macMenuHdl, base + index, (mePtr->entryFlags
1275		& ENTRY_SELECTED) && mePtr->indicatorOn);
	1288	& ENTRY_SELECTED) && mePtr->indicatorOn);
1276	1289	if (mePtr->indicatorOn
1277	1290	&& (mePtr->entryFlags & ENTRY_SELECTED)) {
1278	1291	SetItemMark(macMenuHdl, base + index,

1291	1304	ChkErr(SetMenuItemHierarchicalID, macMenuHdl,
1292	1305	base + index, GetMenuID(childMenuHdl));
1293	1306	}
	1307
1294	1308	/*
1295	1309	* If we changed the highligthing of this menu, its
1296		* children all have to be reconfigured so that
1297		* their state will be reflected in the menubar.
	1310	* children all have to be reconfigured so that their
	1311	* state will be reflected in the menubar.
1298	1312	*/
1299	1313
1300	1314	if (!(mePtr->childMenuRefPtr->menuPtr->menuFlags
1301		& MENU_RECONFIGURE_PENDING)) {
	1315	& MENU_RECONFIGURE_PENDING)) {
1302	1316	mePtr->childMenuRefPtr->menuPtr->menuFlags
1303	1317	\|= MENU_RECONFIGURE_PENDING;
1304	1318	Tcl_DoWhenIdle(ReconfigureMacintoshMenu,
1305		(ClientData) mePtr->childMenuRefPtr->menuPtr);
	1319	mePtr->childMenuRefPtr->menuPtr);
1306	1320	}
1307	1321	}
1308	1322	}
1309	1323
1310	1324	if ((mePtr->type != CASCADE_ENTRY) && (mePtr->accelPtr != NULL)) {
1311	1325	int accelLen, modifiers = 0, hasCmd = 0;
1312		EntryGeometry *geometryPtr =
1313		(EntryGeometry*)mePtr->platformEntryData;
	1326	EntryGeometry geometryPtr = (EntryGeometry )
	1327	mePtr->platformEntryData;
1314	1328	int offset = geometryPtr->accelTextStart;
1315	1329	char *accel = Tcl_GetStringFromObj(mePtr->accelPtr, &accelLen);
1316	1330

1340	1354	/*
1341	1355	* Convert from accelerator names to Carbon menu glyphs.
1342	1356	*/
	1357
1343	1358	struct Glyph {
1344	1359	const char *name;
1345	1360	const size_t len;

1417	1432	*
1418	1433	* ReconfigureMacintoshMenu --
1419	1434	*
1420		* Rebuilds the Macintosh MenuHandle items from the menu. Called
1421		* usually as an idle handler, but can be called synchronously
1422		* if the menu is about to be posted.
1423		*
1424		* Results:
1425		* None.
1426		*
1427		* Side effects:
1428		* Configuration information get set for mePtr; old resources
1429		* get freed, if any need it.
	1435	* Rebuilds the Macintosh MenuHandle items from the menu. Called usually
	1436	* as an idle handler, but can be called synchronously if the menu is
	1437	* about to be posted.
	1438	*
	1439	* Results:
	1440	* None.
	1441	*
	1442	* Side effects:
	1443	* Configuration information get set for mePtr; old resources get freed,
	1444	* if any need it.
1430	1445	*
1431	1446	*----------------------------------------------------------------------
1432	1447	*/
1433	1448
1434	1449	void
1435	1450	ReconfigureMacintoshMenu(
1436		ClientData clientData) /* Information about menu entry; may
1437		* or may not already have values for
1438		* some fields. */
1439		{
1440		TkMenu menuPtr = (TkMenu ) clientData;
	1451	ClientData clientData) /* Information about menu entry; may or may
	1452	* not already have values for some fields. */
	1453	{
	1454	TkMenu *menuPtr = clientData;
1441	1455	MenuHandle macMenuHdl = ((MacMenu *) menuPtr->platformData)->menuHdl;
1442	1456	MenuHandle helpMenuHdl = NULL;
1443	1457

1451	1465
1452	1466	if (GetMenuID(macMenuHdl) == currentHelpMenuID) {
1453	1467	MenuItemIndex helpIndex;
	1468
1454	1469	HMGetHelpMenu(&helpMenuHdl,&helpIndex);
1455	1470	if (helpMenuHdl != NULL) {
1456	1471	ReconfigureIndividualMenu(menuPtr, helpMenuHdl, helpIndex - 1);

1470	1485	*
1471	1486	* CompleteIdlers --
1472	1487	*
1473		* Completes all idle handling so that the menus are in sync when
1474		* the user invokes them with the mouse.
	1488	* Completes all idle handling so that the menus are in sync when the
	1489	* user invokes them with the mouse.
1475	1490	*
1476	1491	* Results:
1477	1492	* None.

1489	1504	int i;
1490	1505
1491	1506	if (menuPtr->menuFlags & MENU_RECONFIGURE_PENDING) {
1492		Tcl_CancelIdleCall(ReconfigureMacintoshMenu, (ClientData) menuPtr);
1493		ReconfigureMacintoshMenu((ClientData) menuPtr);
	1507	Tcl_CancelIdleCall(ReconfigureMacintoshMenu, menuPtr);
	1508	ReconfigureMacintoshMenu(menuPtr);
1494	1509	}
1495	1510
1496	1511	for (i = 0; i < menuPtr->numEntries; i++) {

1542	1557
1543	1558	inPostMenu++;
1544	1559	result = TkPreprocessMenu(menuPtr);
	1560
1545	1561	/*
1546		* The post commands could have deleted the menu, which means
1547		* we are dead and should go away.
	1562	* The post commands could have deleted the menu, which means we are
	1563	* dead and should go away.
1548	1564	*/
1549	1565
1550	1566	if (result != TCL_OK \|\| !menuPtr->tkwin) {

1591	1607	* TkpMenuNewEntry --
1592	1608	*
1593	1609	* Adds a pointer to a new menu entry structure with the platform-
1594		* specific fields filled in. The Macintosh uses the
1595		* platformEntryData field of the TkMenuEntry record to store
1596		* geometry information.
	1610	* specific fields filled in. The Macintosh uses the platformEntryData
	1611	* field of the TkMenuEntry record to store geometry information.
1597	1612	*
1598	1613	* Results:
1599	1614	* Standard TCL error.

1609	1624	TkpMenuNewEntry(
1610	1625	TkMenuEntry mePtr) / The menu we are adding an entry to */
1611	1626	{
1612		EntryGeometry *geometryPtr =
1613		(EntryGeometry *) ckalloc(sizeof(EntryGeometry));
	1627	EntryGeometry geometryPtr = (EntryGeometry )
	1628	ckalloc(sizeof(EntryGeometry));
1614	1629	TkMenu *menuPtr = mePtr->menuPtr;
1615	1630
1616	1631	geometryPtr->accelTextStart = 0;

1622	1637	mePtr->platformEntryData = (TkMenuPlatformEntryData) geometryPtr;
1623	1638	if (!(menuPtr->menuFlags & MENU_RECONFIGURE_PENDING)) {
1624	1639	menuPtr->menuFlags \|= MENU_RECONFIGURE_PENDING;
1625		Tcl_DoWhenIdle(ReconfigureMacintoshMenu, (ClientData) menuPtr);
	1640	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, menuPtr);
1626	1641	}
1627	1642	return TCL_OK;
1628	1643	}

1691	1706	if (currentAppleMenuID != 0) {
1692	1707	hashEntryPtr = Tcl_FindHashEntry(&commandTable,
1693	1708	(char*)(intptr_t)currentAppleMenuID);
1694		appleMenuPtr = (TkMenu *) Tcl_GetHashValue(hashEntryPtr);
	1709	appleMenuPtr = Tcl_GetHashValue(hashEntryPtr);
1695	1710	TkpDestroyMenu(appleMenuPtr);
1696	1711	TkpNewMenu(appleMenuPtr);
1697	1712	appleMenuPtr->menuFlags &= ~MENU_APPLE_MENU;
1698	1713	appleMenuPtr->menuFlags \|= MENU_RECONFIGURE_PENDING;
1699		Tcl_DoWhenIdle(ReconfigureMacintoshMenu, (ClientData) appleMenuPtr);
	1714	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, appleMenuPtr);
1700	1715	}
1701	1716
1702	1717	if (currentHelpMenuID != 0) {
1703	1718	hashEntryPtr = Tcl_FindHashEntry(&commandTable,
1704	1719	(char*)(intptr_t)currentHelpMenuID);
1705		helpMenuPtr = (TkMenu *) Tcl_GetHashValue(hashEntryPtr);
	1720	helpMenuPtr = Tcl_GetHashValue(hashEntryPtr);
1706	1721	TkpDestroyMenu(helpMenuPtr);
1707	1722	TkpNewMenu(helpMenuPtr);
1708	1723	helpMenuPtr->menuFlags &= ~MENU_HELP_MENU;
1709	1724	helpMenuPtr->menuFlags \|= MENU_RECONFIGURE_PENDING;
1710		Tcl_DoWhenIdle(ReconfigureMacintoshMenu,
1711		(ClientData) helpMenuPtr);
	1725	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, helpMenuPtr);
1712	1726	}
1713	1727
1714	1728	/*
1715		* We need to find the clone of this menu that is the menubar.
1716		* Once we do that, for every cascade in the menu, we need to
1717		* insert the Mac menu in the Mac menubar. Finally, we need
1718		* to redraw the menubar.
	1729	* We need to find the clone of this menu that is the menubar. Once we do
	1730	* that, for every cascade in the menu, we need to insert the Mac menu in
	1731	* the Mac menubar. Finally, we need to redraw the menubar.
1719	1732	*/
1720	1733
1721	1734	menuRefPtr = NULL;

1808	1821	TkMacOSXGetNewMenuID(appleMenuPtr->interp, appleMenuPtr, 0,
1809	1822	&appleID);
1810	1823	macMenuHdl = NewMenu(appleID, "\p\024");
1811		appleMenuPtr->platformData =
1812		(TkMenuPlatformData) ckalloc(sizeof(MacMenu));
	1824	appleMenuPtr->platformData = (TkMenuPlatformData)
	1825	ckalloc(sizeof(MacMenu));
1813	1826	((MacMenu *)appleMenuPtr->platformData)->menuHdl
1814	1827	= macMenuHdl;
1815	1828	appleMenuPtr->menuFlags \|= MENU_APPLE_MENU;
1816	1829	if (!(appleMenuPtr->menuFlags
1817	1830	& MENU_RECONFIGURE_PENDING)) {
1818	1831	appleMenuPtr->menuFlags \|= MENU_RECONFIGURE_PENDING;
1819		Tcl_DoWhenIdle(ReconfigureMacintoshMenu,
1820		(ClientData) appleMenuPtr);
	1832	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, appleMenuPtr);
1821	1833	}
1822	1834	InsertMenu(macMenuHdl, 0);
1823	1835	RecursivelyInsertMenu(appleMenuPtr);

1852	1864	& MENU_RECONFIGURE_PENDING)) {
1853	1865	helpMenuPtr->menuFlags
1854	1866	\|= MENU_RECONFIGURE_PENDING;
1855		Tcl_DoWhenIdle(ReconfigureMacintoshMenu,
1856		(ClientData) helpMenuPtr);
	1867	Tcl_DoWhenIdle(ReconfigureMacintoshMenu, helpMenuPtr);
1857	1868	}
1858	1869	macMenuHdl =
1859	1870	((MacMenu *) helpMenuPtr->platformData)->menuHdl;

1909	1920
1910	1921	void
1911	1922	RecursivelyInsertMenu(
1912		TkMenu menuPtr) / All of the cascade items in this menu
1913		* will be inserted into the mac menubar. */
	1923	TkMenu menuPtr) / All of the cascade items in this menu will
	1924	* be inserted into the mac menubar. */
1914	1925	{
1915	1926	int i;
1916	1927	TkMenu *cascadeMenuPtr;

1949	1960
1950	1961	void
1951	1962	RecursivelyDeleteMenu(
1952		TkMenu menuPtr) / All of the cascade items in this menu
1953		* will be deleted from the mac menubar. */
	1963	TkMenu menuPtr) / All of the cascade items in this menu will
	1964	* be deleted from the mac menubar. */
1954	1965	{
1955	1966	int i;
1956	1967	TkMenu *cascadeMenuPtr;

2009	2020	*
2010	2021	* TkpSetMainMenubar --
2011	2022	*
2012		* Puts the menu associated with a window into the menubar. Should
2013		* only be called when the window is in front.
	2023	* Puts the menu associated with a window into the menubar. Should only
	2024	* be called when the window is in front.
2014	2025	*
2015	2026	* Results:
2016	2027	* None.

2025	2036	TkpSetMainMenubar(
2026	2037	Tcl_Interp interp, / The interpreter of the application */
2027	2038	Tk_Window tkwin, /* The frame we are setting up */
2028		char menuName) / The name of the menu to put in front.
2029		* If NULL, use the default menu bar.
2030		*/
	2039	char menuName) / The name of the menu to put in front. If
	2040	* NULL, use the default menu bar. */
2031	2041	{
2032	2042	TkWindow winPtr = (TkWindow ) tkwin;
2033	2043	WindowRef macWindowPtr;

2106	2116	* None.
2107	2117	*
2108	2118	* Side effects:
2109		* On Windows and UNIX, associates the platform menu with the
2110		* platform window.
	2119	* On Windows and UNIX, associates the platform menu with the platform
	2120	* window.
2111	2121	*
2112	2122	*----------------------------------------------------------------------
2113	2123	*/

2154	2164	*
2155	2165	* EventuallyInvokeMenu --
2156	2166	*
2157		* This IdleTime callback actually invokes the menu command
2158		* scheduled in TkMacOSXDispatchMenuEvent.
	2167	* This IdleTime callback actually invokes the menu command scheduled in
	2168	* TkMacOSXDispatchMenuEvent.
2159	2169	*
2160	2170	* Results:
2161	2171	* None.

2170	2180	EventuallyInvokeMenu (
2171	2181	ClientData data)
2172	2182	{
2173		struct MenuCommandHandlerData *realData =
2174		(struct MenuCommandHandlerData *) data;
	2183	struct MenuCommandHandlerData *realData = data;
2175	2184	int code;
2176	2185
2177	2186	code = TkInvokeMenu(realData->menuPtr->interp, realData->menuPtr,

2179	2188
2180	2189	if (code != TCL_OK && code != TCL_CONTINUE && code != TCL_BREAK) {
2181	2190	Tcl_AddErrorInfo(realData->menuPtr->interp, "\n (menu invoke)");
2182		Tcl_BackgroundError(realData->menuPtr->interp);
	2191	Tcl_BackgroundException(realData->menuPtr->interp, code);
2183	2192	}
2184	2193
2185	2194	if (realData->menuPtr->tkwin) {

2196	2205	*
2197	2206	* TkMacOSXDispatchMenuEvent --
2198	2207	*
2199		* Given a menu id and an item, dispatches the command associated
2200		* with it.
	2208	* Given a menu id and an item, dispatches the command associated with
	2209	* it.
2201	2210	*
2202	2211	* Results:
2203	2212	* None.

2248	2257	&& (index > menuPtr->numEntries + 1)) {
2249	2258	/*
2250	2259	* We don't need to do anything here, the standard
2251		* Application event handler will open the built-in
2252		* Apple menu item for us.
	2260	* Application event handler will open the built-in Apple
	2261	* menu item for us.
2253	2262	*/
	2263
2254	2264	result = TCL_OK;
2255	2265	} else {
2256		struct MenuCommandHandlerData *data
2257		= (struct MenuCommandHandlerData *)
	2266	struct MenuCommandHandlerData *data =
	2267	(struct MenuCommandHandlerData *)
2258	2268	ckalloc(sizeof(struct MenuCommandHandlerData));
2259	2269
2260	2270	Tcl_Preserve(menuPtr->interp);
2261	2271	Tcl_Preserve(menuPtr);
2262	2272	data->menuPtr = menuPtr;
2263	2273	data->index = index - 1;
2264		Tcl_DoWhenIdle(EventuallyInvokeMenu,
2265		(ClientData) data);
	2274	Tcl_DoWhenIdle(EventuallyInvokeMenu, data);
2266	2275	/* result = TkInvokeMenu(menuPtr->interp, menuPtr, index - 1); */
2267	2276	}
2268	2277	} else {

2507	2516	encoding = kTextEncodingMacKeyboardGlyphs;
2508	2517	}
2509	2518	switch (mePtr->state) {
2510		case ENTRY_ACTIVE:
2511		drawState = kThemeStatePressed;
2512		break;
2513		case ENTRY_DISABLED:
2514		drawState = kThemeStateInactive;
2515		break;
2516		default:
2517		drawState = kThemeStateActive;
2518		break;
	2519	case ENTRY_ACTIVE:
	2520	drawState = kThemeStatePressed;
	2521	break;
	2522	case ENTRY_DISABLED:
	2523	drawState = kThemeStateInactive;
	2524	break;
	2525	default:
	2526	drawState = kThemeStateActive;
	2527	break;
2519	2528	}
2520	2529	cfStr = CFStringCreateWithBytes(NULL, (UInt8*)&mark, 1,
2521	2530	encoding, false);

2548	2557	* Nothing
2549	2558	*
2550	2559	* Side effects:
2551		* Commands are output to X to display the menu in its
2552		* current mode.
2553		*
2554		*----------------------------------------------------------------------
2555		*/
	2560	* Commands are output to X to display the menu in its current mode.
	2561	*
	2562	*----------------------------------------------------------------------
	2563	*/
	2564
2556	2565	void
2557	2566	DrawMenuBackground(
2558	2567	TkMenu *menuPtr,
2559		Rect menuRectPtr, / The menu rect */
	2568	Rect menuRectPtr, / The menu rect */
2560	2569	Drawable d) /* What we are drawing into */
2561	2570	{
2562	2571	Tk_3DBorder border;

2582	2591	* None.
2583	2592	*
2584	2593	* Side effects:
2585		* Commands are output to X to display the menu in its
2586		* current mode.
	2594	* Commands are output to X to display the menu in its current mode.
2587	2595	*
2588	2596	*----------------------------------------------------------------------
2589	2597	*/

2615	2623	ThemeDrawState drawState;
2616	2624
2617	2625	switch (mePtr->state) {
2618		case ENTRY_ACTIVE:
2619		drawState = kThemeStatePressed;
2620		break;
2621		case ENTRY_DISABLED:
2622		drawState = kThemeStateInactive;
2623		break;
2624		default:
2625		drawState = kThemeStateActive;
2626		break;
	2626	case ENTRY_ACTIVE:
	2627	drawState = kThemeStatePressed;
	2628	break;
	2629	case ENTRY_DISABLED:
	2630	drawState = kThemeStateInactive;
	2631	break;
	2632	default:
	2633	drawState = kThemeStateActive;
	2634	break;
2627	2635	}
2628	2636	if ((mePtr->entryFlags & ENTRY_ACCEL_MASK) == 0) {
2629	2637	leftEdge -= geometryPtr->modifierWidth;

2676	2684	* None.
2677	2685	*
2678	2686	* Side effects:
2679		* Commands are output to X to display the menu in its
2680		* current mode.
	2687	* Commands are output to X to display the menu in its current mode.
2681	2688	*
2682	2689	*----------------------------------------------------------------------
2683	2690	*/

2714	2721	*
2715	2722	* AppearanceEntryDrawWrapper --
2716	2723	*
2717		* It routes to the Appearance Managers DrawThemeEntry, which will
2718		* then call us back after setting up the drawing context.
	2724	* It routes to the Appearance Managers DrawThemeEntry, which will then
	2725	* call us back after setting up the drawing context.
2719	2726	*
2720	2727	* Results:
2721	2728	* A menu entry is drawn

2725	2732	*
2726	2733	*----------------------------------------------------------------------
2727	2734	*/
	2735
2728	2736	void
2729	2737	AppearanceEntryDrawWrapper(
2730	2738	TkMenuEntry *mePtr,

2775	2783	DrawMenuBackground(mePtr->menuPtr, &itemRect, d);
2776	2784	}
2777	2785	DrawThemeMenuItem(menuRectPtr, &itemRect,
2778		mtdPtr->virtualMenuTop, mtdPtr->virtualMenuBottom, theState,
2779		theType \| kThemeMenuItemNoBackground, tkThemeMenuItemDrawingUPP,
2780		(unsigned long) &meData);
	2786	mtdPtr->virtualMenuTop, mtdPtr->virtualMenuBottom, theState,
	2787	theType \| kThemeMenuItemNoBackground, tkThemeMenuItemDrawingUPP,
	2788	(unsigned long) &meData);
2781	2789	if (erase) {
2782	2790	EnableScreenUpdates();
2783	2791	}

2798	2806	*
2799	2807	*----------------------------------------------------------------------
2800	2808	*/
	2809
2801	2810	pascal void
2802	2811	ThemeMenuItemDrawingProc(
2803	2812	const Rect *inBounds,

2819	2828	*
2820	2829	* TkMacOSXHandleTearoffMenu() --
2821	2830	*
2822		* This routine sees if the MDEF has set a menu and a mouse position
2823		* for tearing off and makes a tearoff menu if it has.
	2831	* This routine sees if the MDEF has set a menu and a mouse position for
	2832	* tearing off and makes a tearoff menu if it has.
2824	2833	*
2825	2834	* Results:
2826	2835	* menuPtr->interp will have the result of the tearoff command.

2844	2853	*
2845	2854	* TkpInitializeMenuBindings --
2846	2855	*
2847		* For every interp, initializes the bindings for Windows
2848		* menus. Does nothing on Mac or XWindows.
2849		*
2850		* Results:
2851		* None.
2852		*
2853		* Side effects:
2854		* C-level bindings are setup for the interp which will
2855		* handle Alt-key sequences for menus without beeping
2856		* or interfering with user-defined Alt-key bindings.
	2856	* For every interp, initializes the bindings for Windows menus. Does
	2857	* nothing on Mac or XWindows.
	2858	*
	2859	* Results:
	2860	* None.
	2861	*
	2862	* Side effects:
	2863	* C-level bindings are setup for the interp which will handle Alt-key
	2864	* sequences for menus without beeping or interfering with user-defined
	2865	* Alt-key bindings.
2857	2866	*
2858	2867	*--------------------------------------------------------------
2859	2868	*/

2874	2883	*
2875	2884	* TkpComputeMenubarGeometry --
2876	2885	*
2877		* This procedure is invoked to recompute the size and
2878		* layout of a menu that is a menubar clone.
2879		*
2880		* Results:
2881		* None.
2882		*
2883		* Side effects:
2884		* Fields of menu entries are changed to reflect their
2885		* current positions, and the size of the menu window
2886		* itself may be changed.
	2886	* This procedure is invoked to recompute the size and layout of a menu
	2887	* that is a menubar clone.
	2888	*
	2889	* Results:
	2890	* None.
	2891	*
	2892	* Side effects:
	2893	* Fields of menu entries are changed to reflect their current positions,
	2894	* and the size of the menu window itself may be changed.
2887	2895	*
2888	2896	*--------------------------------------------------------------
2889	2897	*/

2906	2914	* None.
2907	2915	*
2908	2916	* Side effects:
2909		* Commands are output to X to display the menu in its
2910		* current mode.
	2917	* Commands are output to X to display the menu in its current mode.
2911	2918	*
2912	2919	*----------------------------------------------------------------------
2913	2920	*/

2957	2964	*
2958	2965	* TkMacOSXSetHelpMenuItemCount --
2959	2966	*
2960		* Has to be called after the first call to InsertMenu. Sets
2961		* up the global variable for the number of items in the
2962		* unmodified help menu.
2963		* NB. Nobody uses this any more, since you can get the number
2964		* of system help items from HMGetHelpMenu trivially.
2965		* But it is in the stubs table...
	2967	* Has to be called after the first call to InsertMenu. Sets up the
	2968	* global variable for the number of items in the unmodified help menu.
	2969	* NB. Nobody uses this any more, since you can get the number of system
	2970	* help items from HMGetHelpMenu trivially. But it is in the stubs
	2971	* table...
2966	2972	*
2967	2973	* Results:
2968	2974	* None.

3026	3032	*
3027	3033	* TkpDrawMenuEntry --
3028	3034	*
3029		* Draws the given menu entry at the given coordinates with the
3030		* given attributes.
	3035	* Draws the given menu entry at the given coordinates with the given
	3036	* attributes.
3031	3037	*
3032	3038	* Results:
3033	3039	* None.

3065	3071	int adjustedHeight = height - 2 * padY;
3066	3072
3067	3073	/*
3068		* Choose the gc for drawing the foreground part of the entry.
3069		* Under Appearance, we pass a null (appearanceGC) to tell
3070		* ourselves not to change whatever color the appearance manager has set.
	3074	* Choose the gc for drawing the foreground part of the entry. Under
	3075	* Appearance, we pass a null (appearanceGC) to tell ourselves not to
	3076	* change whatever color the appearance manager has set.
3071	3077	*/
3072	3078
3073	3079	if ((mePtr->state == ENTRY_ACTIVE) && !strictMotif) {

3118	3124	}
3119	3125
3120	3126	/*
3121		* Need to draw the entire background, including padding. On Unix,
3122		* for menubars, we have to draw the rest of the entry taking
3123		* into account the padding.
	3127	* Need to draw the entire background, including padding. On Unix, for
	3128	* menubars, we have to draw the rest of the entry taking into account the
	3129	* padding.
3124	3130	*/
3125	3131
3126	3132	DrawMenuEntryBackground(menuPtr, mePtr, d, activeBorder, bgBorder, x, y,

3149	3155	*
3150	3156	* TkpComputeStandardMenuGeometry --
3151	3157	*
3152		* This procedure is invoked to recompute the size and
3153		* layout of a menu that is not a menubar clone.
3154		*
3155		* Results:
3156		* None.
3157		*
3158		* Side effects:
3159		* Fields of menu entries are changed to reflect their
3160		* current positions, and the size of the menu window
3161		* itself may be changed.
	3158	* This procedure is invoked to recompute the size and layout of a menu
	3159	* that is not a menubar clone.
	3160	*
	3161	* Results:
	3162	* None.
	3163	*
	3164	* Side effects:
	3165	* Fields of menu entries are changed to reflect their current positions,
	3166	* and the size of the menu window itself may be changed.
3162	3167	*
3163	3168	*--------------------------------------------------------------
3164	3169	*/

3188	3193	&activeBorderWidth);
3189	3194	x = y = borderWidth;
3190	3195	indicatorSpace = labelWidth = accelWidth = maxAccelTextWidth = 0;
3191		windowHeight = windowWidth = maxWidth = lastColumnBreak = 0;
3192		maxModifierWidth = nonAccelMargin = maxNonAccelMargin = 0;
	3196	windowHeight = maxWidth = lastColumnBreak = 0;
	3197	maxModifierWidth = maxNonAccelMargin = 0;
3193	3198	maxEntryWithAccelWidth = maxEntryWithoutAccelWidth = 0;
3194	3199	maxIndicatorSpace = 0;
3195	3200
3196	3201	/*
3197		* On the Mac especially, getting font metrics can be quite slow,
3198		* so we want to do it intelligently. We are going to precalculate
3199		* them and pass them down to all of the measuring and drawing
3200		* routines. We will measure the font metrics of the menu once.
3201		* If an entry does not have its own font set, then we give
3202		* the geometry/drawing routines the menu's font and metrics.
3203		* If an entry has its own font, we will measure that font and
3204		* give all of the geometry/drawing the entry's font and metrics.
	3202	* On the Mac especially, getting font metrics can be quite slow, so we
	3203	* want to do it intelligently. We are going to precalculate them and pass
	3204	* them down to all of the measuring and drawing routines. We will measure
	3205	* the font metrics of the menu once. If an entry does not have its own
	3206	* font set, then we give the geometry/drawing routines the menu's font
	3207	* and metrics. If an entry has its own font, we will measure that font
	3208	* and give all of the geometry/drawing the entry's font and metrics.
3205	3209	*/
3206	3210
3207	3211	menuFont = Tk_GetFontFromObj(menuPtr->tkwin, menuPtr->fontPtr);

3260	3264	lastColumnBreak = i;
3261	3265	y = borderWidth;
3262	3266	}
3263		geometryPtr = (EntryGeometry *) mePtr->platformEntryData;
	3267	/geometryPtr = (EntryGeometry ) mePtr->platformEntryData;/ / dead code */
3264	3268
3265	3269	if (mePtr->type == SEPARATOR_ENTRY) {
3266	3270	GetMenuSeparatorGeometry(menuPtr, mePtr, tkfont,

3272	3276	mePtr->height = height;
3273	3277	} else {
3274	3278	/*
3275		* For each entry, compute the height required by that
3276		* particular entry, plus three widths: the width of the
3277		* label, the width to allow for an indicator to be displayed
3278		* to the left of the label (if any), and the width of the
3279		* accelerator to be displayed to the right of the label
3280		* (if any). These sizes depend, of course, on the type
3281		* of the entry.
	3279	* For each entry, compute the height required by that particular
	3280	* entry, plus three widths: the width of the label, the width to
	3281	* allow for an indicator to be displayed to the left of the label
	3282	* (if any), and the width of the accelerator to be displayed to
	3283	* the right of the label (if any). These sizes depend, of course,
	3284	* on the type of the entry.
3282	3285	*/
3283	3286
3284	3287	GetMenuLabelGeometry(mePtr, tkfont, fmPtr, &labelWidth, &height);

3380	3383	windowHeight += borderWidth;
3381	3384
3382	3385	/*
3383		* The X server doesn't like zero dimensions, so round up to at least
3384		* 1 (a zero-sized menu should never really occur, anyway).
	3386	* The X server doesn't like zero dimensions, so round up to at least 1 (a
	3387	* zero-sized menu should never really occur, anyway).
3385	3388	*/
3386	3389
3387	3390	if (windowWidth <= 0) {

3405	3408	* None.
3406	3409	*
3407	3410	* Side effects:
3408		* Commands are output to X to display the menu in its
3409		* current mode.
	3411	* Commands are output to X to display the menu in its current mode.
3410	3412	*
3411	3413	*----------------------------------------------------------------------
3412	3414	*/

3467	3469	int fullWidth = (imageWidth > textWidth ? imageWidth : textWidth);
3468	3470
3469	3471	switch ((enum compound) mePtr->compound) {
3470		case COMPOUND_TOP:
3471		textXOffset = (fullWidth - textWidth)/2;
3472		textYOffset = imageHeight/2 + 2;
3473		imageXOffset = (fullWidth - imageWidth)/2;
3474		imageYOffset = -textHeight/2;
3475		break;
3476		case COMPOUND_BOTTOM:
3477		textXOffset = (fullWidth - textWidth)/2;
3478		textYOffset = -imageHeight/2;
3479		imageXOffset = (fullWidth - imageWidth)/2;
3480		imageYOffset = textHeight/2 + 2;
3481		break;
3482		case COMPOUND_LEFT:
3483		/*
3484		* Position image in the indicator space to the left of the
3485		* entries, unless this entry is a radio\|check button because
3486		* then the indicator space will be used.
3487		*/
3488
3489		textXOffset = imageWidth + 2 - menuTextLeadingEdgeMargin;
3490		if ((mePtr->type != CHECK_BUTTON_ENTRY)
3491		&& (mePtr->type != RADIO_BUTTON_ENTRY)) {
3492		textXOffset -= indicatorSpace;
3493		imageXOffset = -indicatorSpace;
3494		}
3495		if (textXOffset < 0) {
3496		textXOffset = 0;
3497		}
3498		break;
3499		case COMPOUND_RIGHT:
3500		imageXOffset = textWidth + 2 - menuTextTrailingEdgeMargin;
3501		break;
3502		case COMPOUND_CENTER:
3503		textXOffset = (fullWidth - textWidth)/2;
3504		imageXOffset = (fullWidth - imageWidth)/2;
3505		break;
3506		case COMPOUND_NONE:
3507		/*
3508		* Never reached.
3509		*/
3510		break;
	3472	case COMPOUND_TOP:
	3473	textXOffset = (fullWidth - textWidth)/2;
	3474	textYOffset = imageHeight/2 + 2;
	3475	imageXOffset = (fullWidth - imageWidth)/2;
	3476	imageYOffset = -textHeight/2;
	3477	break;
	3478	case COMPOUND_BOTTOM:
	3479	textXOffset = (fullWidth - textWidth)/2;
	3480	textYOffset = -imageHeight/2;
	3481	imageXOffset = (fullWidth - imageWidth)/2;
	3482	imageYOffset = textHeight/2 + 2;
	3483	break;
	3484	case COMPOUND_LEFT:
	3485	/*
	3486	* Position image in the indicator space to the left of the
	3487	* entries, unless this entry is a radio\|check button because then
	3488	* the indicator space will be used.
	3489	*/
	3490
	3491	textXOffset = imageWidth + 2 - menuTextLeadingEdgeMargin;
	3492	if ((mePtr->type != CHECK_BUTTON_ENTRY)
	3493	&& (mePtr->type != RADIO_BUTTON_ENTRY)) {
	3494	textXOffset -= indicatorSpace;
	3495	imageXOffset = -indicatorSpace;
	3496	}
	3497	if (textXOffset < 0) {
	3498	textXOffset = 0;
	3499	}
	3500	break;
	3501	case COMPOUND_RIGHT:
	3502	imageXOffset = textWidth + 2 - menuTextTrailingEdgeMargin;
	3503	break;
	3504	case COMPOUND_CENTER:
	3505	textXOffset = (fullWidth - textWidth)/2;
	3506	imageXOffset = (fullWidth - imageWidth)/2;
	3507	break;
	3508	case COMPOUND_NONE:
	3509	/*
	3510	* Never reached.
	3511	*/
	3512	break;
3511	3513	}
3512	3514	}
3513	3515

3561	3563	*
3562	3564	* DrawMenuEntryBackground --
3563	3565	*
3564		* This procedure draws the background part of a menu entry.
3565		* Under Appearance, we only draw the background if the entry's
3566		* border is set, we DO NOT inherit it from the menu...
3567		*
3568		* Results:
3569		* None.
3570		*
3571		* Side effects:
3572		* Commands are output to X to display the menu in its
3573		* current mode.
	3566	* This procedure draws the background part of a menu entry. Under
	3567	* Appearance, we only draw the background if the entry's border is set,
	3568	* we DO NOT inherit it from the menu...
	3569	*
	3570	* Results:
	3571	* None.
	3572	*
	3573	* Side effects:
	3574	* Commands are output to X to display the menu in its current mode.
3574	3575	*
3575	3576	*----------------------------------------------------------------------
3576	3577	*/

3655	3656	switch ((enum compound) mePtr->compound) {
3656	3657	int margin;
3657	3658
3658		case COMPOUND_TOP:
3659		case COMPOUND_BOTTOM:
3660		if (textWidth > *widthPtr) {
3661		*widthPtr = textWidth;
3662		}
3663		*heightPtr += textHeight + 2;
3664		break;
3665		case COMPOUND_LEFT:
3666		margin = *widthPtr + 2;
3667		if (margin > menuTextLeadingEdgeMargin) {
3668		margin = menuTextLeadingEdgeMargin;
3669		}
3670		*widthPtr += textWidth + 2 - margin;
3671		if (textHeight > *heightPtr) {
3672		*heightPtr = textHeight;
3673		}
3674		break;
3675		case COMPOUND_RIGHT:
3676		margin = menuTextTrailingEdgeMargin;
3677		*widthPtr += textWidth + 2 - margin;
3678		if (textHeight > *heightPtr) {
3679		*heightPtr = textHeight;
3680		}
3681		break;
3682		case COMPOUND_CENTER:
3683		if (textWidth > *widthPtr) {
3684		*widthPtr = textWidth;
3685		}
3686		if (textHeight > *heightPtr) {
3687		*heightPtr = textHeight;
3688		}
3689		break;
3690		case COMPOUND_NONE:
3691		/*
3692		* Never reached.
3693		*/
3694		break;
	3659	case COMPOUND_TOP:
	3660	case COMPOUND_BOTTOM:
	3661	if (textWidth > *widthPtr) {
	3662	*widthPtr = textWidth;
	3663	}
	3664	*heightPtr += textHeight + 2;
	3665	break;
	3666	case COMPOUND_LEFT:
	3667	margin = *widthPtr + 2;
	3668	if (margin > menuTextLeadingEdgeMargin) {
	3669	margin = menuTextLeadingEdgeMargin;
	3670	}
	3671	*widthPtr += textWidth + 2 - margin;
	3672	if (textHeight > *heightPtr) {
	3673	*heightPtr = textHeight;
	3674	}
	3675	break;
	3676	case COMPOUND_RIGHT:
	3677	margin = menuTextTrailingEdgeMargin;
	3678	*widthPtr += textWidth + 2 - margin;
	3679	if (textHeight > *heightPtr) {
	3680	*heightPtr = textHeight;
	3681	}
	3682	break;
	3683	case COMPOUND_CENTER:
	3684	if (textWidth > *widthPtr) {
	3685	*widthPtr = textWidth;
	3686	}
	3687	if (textHeight > *heightPtr) {
	3688	*heightPtr = textHeight;
	3689	}
	3690	break;
	3691	case COMPOUND_NONE:
	3692	/*
	3693	* Never reached.
	3694	*/
	3695	break;
3695	3696	}
3696	3697	goto labelGeomDone;
3697	3698	}

3700	3701	*heightPtr = textHeight;
3701	3702	}
3702	3703
3703		labelGeomDone:
	3704	labelGeomDone:
3704	3705	*heightPtr += menuItemExtraHeight;
3705	3706	*widthPtr += menuItemExtraWidth;
3706	3707	}

3783	3784	*
3784	3785	* MenuSelectEvent --
3785	3786	*
3786		* Generates a "MenuSelect" virtual event. This can be used to
3787		* do context-sensitive menu help.
	3787	* Generates a "MenuSelect" virtual event. This can be used to do
	3788	* context-sensitive menu help.
3788	3789	*
3789	3790	* Results:
3790	3791	* None.

3924	3925	* TkpMenuNotifyToplevelCreate --
3925	3926	*
3926	3927	* This routine reconfigures the menu and the clones indicated by
3927		* menuName becuase a toplevel has been created and any system
3928		* menus need to be created. Only applicable to Windows.
	3928	* menuName becuase a toplevel has been created and any system menus need
	3929	* to be created. Only applicable to Windows.
3929	3930	*
3930	3931	* Results:
3931	3932	* None.

4023	4024	*
4024	4025	* TkpMenuThreadInit --
4025	4026	*
4026		* Does platform-specific initialization of thread-specific
4027		* menu state.
	4027	* Does platform-specific initialization of thread-specific menu state.
4028	4028	*
4029	4029	* Results:
4030	4030	* None.

4069	4069	if ((mbRefPtr != NULL) && (mbRefPtr->menuPtr != NULL)) {
4070	4070	int code;
4071	4071
4072		Tcl_Preserve((ClientData) currentMenuBarInterp);
	4072	Tcl_Preserve(currentMenuBarInterp);
4073	4073	code = TkPreprocessMenu(mbRefPtr->menuPtr->masterMenuPtr);
4074	4074	if ((code != TCL_OK) && (code != TCL_CONTINUE)
4075	4075	&& (code != TCL_BREAK)) {
4076	4076	Tcl_AddErrorInfo(currentMenuBarInterp,
4077	4077	"\n (menu preprocess)");
4078		Tcl_BackgroundError(currentMenuBarInterp);
4079		}
4080		Tcl_Release((ClientData) currentMenuBarInterp);
	4078	Tcl_BackgroundException(currentMenuBarInterp, code);
	4079	}
	4080	Tcl_Release(currentMenuBarInterp);
4081	4081	}
4082	4082	}
4083	4083	}

4089	4089	*
4090	4090	* MenuDefProc --
4091	4091	*
4092		* This routine is the MDEF handler for Tk. It receives all messages
4093		* for the menu and dispatches them.
	4092	* This routine is the MDEF handler for Tk. It receives all messages for
	4093	* the menu and dispatches them.
4094	4094	*
4095	4095	* Results:
4096	4096	* None.
4097	4097	*
4098	4098	* Side effects:
4099	4099	* This routine causes menus to be drawn and will certainly allocate
4100		* memory as a result. Also, the menu can scroll up and down, and
4101		* various other interface actions can take place.
	4100	* memory as a result. Also, the menu can scroll up and down, and various
	4101	* other interface actions can take place.
4102	4102	*
4103	4103	*----------------------------------------------------------------------
4104	4104	*/

4107	4107	MenuDefProc(
4108	4108	SInt16 message, /* What action are we taking? */
4109	4109	MenuRef menu, /* The menu we are working with */
4110		Rect menuRectPtr, / A pointer to the rect for the
4111		* whole menu. */
4112		Point hitPt, /* Where the mouse was clicked for
4113		* the appropriate messages. */
4114		SInt16 whichItem) / Output result. Which item was
4115		* hit by the user? */
	4110	Rect menuRectPtr, / A pointer to the rect for the whole
	4111	* menu. */
	4112	Point hitPt, /* Where the mouse was clicked for the
	4113	* appropriate messages. */
	4114	SInt16 whichItem) / Output result. Which item was hit by the
	4115	* user? */
4116	4116	{
4117	4117	TkMenu *menuPtr;
4118	4118	Tcl_HashEntry *commandEntryPtr;

4120	4120
4121	4121	menuID = GetMenuID(menu);
4122	4122	commandEntryPtr = Tcl_FindHashEntry(&commandTable, (char*)(intptr_t)menuID);
4123
4124		if (commandEntryPtr) {
4125		menuPtr = (TkMenu *) Tcl_GetHashValue(commandEntryPtr);
4126		} else {
4127		menuPtr = NULL;
4128		}
	4123	if (!commandEntryPtr) return;
	4124	menuPtr = Tcl_GetHashValue(commandEntryPtr);
4129	4125
4130	4126	switch (message) {
4131		case kMenuInitMsg:
4132		*whichItem = noErr;
4133		break;
4134		case kMenuDisposeMsg:
4135		break;
4136		case kMenuHiliteItemMsg:
4137		HandleMenuHiliteMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
4138		break;
4139		case kMenuCalcItemMsg:
4140		HandleMenuCalcItemMsg(menu, menuRectPtr, hitPt, whichItem,
4141		menuPtr);
4142		break;
4143		case kMenuDrawItemsMsg:
	4127	case kMenuInitMsg:
	4128	*whichItem = noErr;
	4129	break;
	4130	case kMenuDisposeMsg:
	4131	break;
	4132	case kMenuHiliteItemMsg:
	4133	HandleMenuHiliteMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
	4134	break;
	4135	case kMenuCalcItemMsg:
	4136	HandleMenuCalcItemMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
	4137	break;
	4138	case kMenuDrawItemsMsg:
4144	4139	#ifdef TK_MAC_DEBUG_MENUS
4145		TkMacOSXDbgMsg("MDEF: DrawItemsMsg");
	4140	TkMacOSXDbgMsg("MDEF: DrawItemsMsg");
4146	4141	#endif
4147		/*
4148		* We do nothing here, because we don't support the Menu Managers
4149		* dynamic item groups
4150		*/
4151		break;
4152		case kMenuThemeSavvyMsg:
4153		*whichItem = kThemeSavvyMenuResponse;
4154		break;
4155		case kMenuSizeMsg:
	4142	/*
	4143	* We do nothing here, because we don't support the Menu Managers
	4144	* dynamic item groups
	4145	*/
	4146
	4147	break;
	4148	case kMenuThemeSavvyMsg:
	4149	*whichItem = kThemeSavvyMenuResponse;
	4150	break;
	4151	case kMenuSizeMsg:
4156	4152	#ifdef TK_MAC_DEBUG_MENUS
4157		TkMacOSXDbgMsg("MDEF: SizeMsg %d, %d", hitPt.h, hitPt.v);
	4153	TkMacOSXDbgMsg("MDEF: SizeMsg %d, %d", hitPt.h, hitPt.v);
4158	4154	#endif
4159		SetMenuWidth(menu, hitPt.h < menuPtr->totalWidth ? hitPt.h :
4160		menuPtr->totalWidth);
4161		SetMenuHeight(menu, hitPt.v < menuPtr->totalHeight ? hitPt.v :
4162		menuPtr->totalHeight);
4163		break;
4164		case kMenuDrawMsg:
4165		HandleMenuDrawMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
4166		break;
4167		case kMenuFindItemMsg:
4168		HandleMenuFindItemMsg(menu, menuRectPtr, hitPt, whichItem,
4169		menuPtr);
4170		break;
4171		case kMenuPopUpMsg:
4172		HandleMenuPopUpMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
4173		break;
	4155	SetMenuWidth(menu, hitPt.h < menuPtr->totalWidth ? hitPt.h :
	4156	menuPtr->totalWidth);
	4157	SetMenuHeight(menu, hitPt.v < menuPtr->totalHeight ? hitPt.v :
	4158	menuPtr->totalHeight);
	4159	break;
	4160	case kMenuDrawMsg:
	4161	HandleMenuDrawMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
	4162	break;
	4163	case kMenuFindItemMsg:
	4164	HandleMenuFindItemMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
	4165	break;
	4166	case kMenuPopUpMsg:
	4167	HandleMenuPopUpMsg(menu, menuRectPtr, hitPt, whichItem, menuPtr);
	4168	break;
4174	4169	}
4175	4170	}
4176	4171

4201	4196	OSStatus err;
4202	4197	Tk_Font tkfont;
4203	4198	Tk_FontMetrics fontMetrics;
4204		MDEFHiliteItemData hidPtr = (MDEFHiliteItemData )whichItem;
	4199	MDEFHiliteItemData hidPtr = (MDEFHiliteItemData ) whichItem;
4205	4200	int oldItem = hidPtr->previousItem - 1;
4206	4201	int newItem = hidPtr->newItem - 1;
4207	4202	MenuTrackingData mtd, *mtdPtr = &mtd;

4259	4254	TkMenuEntry *mePtr;
4260	4255	int i;
4261	4256	Rect menuClipRect, bounds;
4262		MDEFDrawData ddPtr = (MDEFDrawData)whichItem;
	4257	MDEFDrawData ddPtr = (MDEFDrawData ) whichItem;
4263	4258	MenuTrackingData *mtdPtr = &(ddPtr->trackingData);
4264		TkWindow winPtr = (TkWindow)menuPtr->tkwin;
	4259	TkWindow winPtr = (TkWindow ) menuPtr->tkwin;
4265	4260
4266	4261	GetPort(&macMDEFDrawable.grafPtr);
4267	4262	GetPortBounds(macMDEFDrawable.grafPtr, &bounds);

4341	4336	}
4342	4337
4343	4338	/*
4344		* Now, actually draw the menu. Don't draw entries that
4345		* are higher than the top arrow, and don't draw entries
4346		* that are lower than the bottom.
	4339	* Now, actually draw the menu. Don't draw entries that are higher than
	4340	* the top arrow, and don't draw entries that are lower than the bottom.
4347	4341	*/
4348	4342
4349	4343	for (i = 0; i < menuPtr->numEntries; i++) {

4364	4358	*
4365	4359	* HandleMenuFindItemMsg --
4366	4360	*
4367		* Handles the MenuDefProc's FindItems message. We have to
4368		* respond by filling in the itemSelected, itemUnderMouse and
4369		* itemRect fields. This is also the time to scroll the menu if
4370		* it is too long to fit on the screen.
4371		*
4372		* Results:
4373		* The Menu system is informed of the selected item & the item
4374		* under the mouse.
	4361	* Handles the MenuDefProc's FindItems message. We have to respond by
	4362	* filling in the itemSelected, itemUnderMouse and itemRect fields. This
	4363	* is also the time to scroll the menu if it is too long to fit on the
	4364	* screen.
	4365	*
	4366	* Results:
	4367	* The Menu system is informed of the selected item & the item under the
	4368	* mouse.
4375	4369	*
4376	4370	* Side effects:
4377	4371	* The menu might get scrolled.
4378	4372	*
4379	4373	*----------------------------------------------------------------------
4380	4374	*/
	4375
4381	4376	void
4382	4377	HandleMenuFindItemMsg(
4383	4378	MenuRef menu,

4401	4396
4402	4397	#ifdef TK_MAC_DEBUG_MENUS
4403	4398	static Point lastHitPt = {0, 0};
	4399
4404	4400	if (hitPt.h != lastHitPt.h \|\| hitPt.v != lastHitPt.v) {
4405	4401	lastHitPt = hitPt;
4406	4402	TkMacOSXDbgMsg("MDEF: FindItemMsg: %d, %d", hitPt.h, hitPt.v);

4449	4445	}
4450	4446	if (scrollDirection == DONT_SCROLL) {
4451	4447	/*
4452		* Find out which item was hit. If it is the same as the old item,
4453		* we don't need to do anything.
	4448	* Find out which item was hit. If it is the same as the old item, we
	4449	* don't need to do anything.
4454	4450	*/
4455	4451
4456	4452	if (PtInRect(hitPt, menuRectPtr)) {

4598	4594	*
4599	4595	* HandleMenuPopUpMsg --
4600	4596	*
4601		* Handles the MenuDefProc's PopUp message. The menu is
4602		* posted with the selected item at the point given in hitPt.
	4597	* Handles the MenuDefProc's PopUp message. The menu is posted with the
	4598	* selected item at the point given in hitPt.
4603	4599	*
4604	4600	* Results:
4605	4601	* A menu is posted.

4609	4605	*
4610	4606	*----------------------------------------------------------------------
4611	4607	*/
	4608
4612	4609	void
4613	4610	HandleMenuPopUpMsg(
4614	4611	MenuRef menu,

4633	4630	GetQDGlobalsScreenBits(&screenBits);
4634	4631
4635	4632	/*
4636		* Note that for some oddball reason, h and v are reversed in the
4637		* point given to us by the MDEF.
	4633	* Note that for some oddball reason, h and v are reversed in the point
	4634	* given to us by the MDEF.
4638	4635	*/
4639	4636
4640	4637	oldItem = *whichItem;

4690	4687	*
4691	4688	* HandleMenuCalcItemMsg --
4692	4689	*
4693		* Handles the MenuDefProc's CalcItem message. It is supposed
4694		* to calculate the Rect of the menu entry in whichItem in the
4695		* menu, and put that in menuRectPtr. I assume this works, but I
4696		* have never seen the MenuManager send this message.
4697		*
4698		* Results:
4699		* The Menu Manager is informed of the bounding rect of a
4700		* menu rect.
	4690	* Handles the MenuDefProc's CalcItem message. It is supposed to
	4691	* calculate the Rect of the menu entry in whichItem in the menu, and put
	4692	* that in menuRectPtr. I assume this works, but I have never seen the
	4693	* MenuManager send this message.
	4694	*
	4695	* Results:
	4696	* The Menu Manager is informed of the bounding rect of a menu rect.
4701	4697	*
4702	4698	* Side effects:
4703	4699	* None.

4742	4738	#endif
4743	4739	}
4744	4740	#endif /* USE_TK_MDEF */
	4741
	4742	/*
	4743	* Local Variables:
	4744	* fill-column: 78
	4745	* c-basic-offset: 4
	4746	* End:
	4747	*/

+5

-7

macosx/tkMacOSXMenubutton.c less more

10	10	* See the file "license.terms" for information on usage and redistribution
11	11	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.18 2007/12/13 15:27:10 dgp Exp $
	13	* RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.20 2008/12/07 16:36:26 das Exp $
14	14	*/
15	15
16	16	#include "tkMacOSXPrivate.h"

442	442	*/
443	443
444	444	void
445		TkpComputeMenuButtonGeometry(mbPtr)
446		register TkMenuButton mbPtr; / Widget record for menu button. */
447		{
448		int width, height, mm, pixels;
	445	TkpComputeMenuButtonGeometry(
	446	register TkMenuButton mbPtr) / Widget record for menu button. */
	447	{
	448	int width, height;
449	449	int hasImageOrBitmap = 0;
450	450
451	451	mbPtr->inset = mbPtr->highlightWidth + mbPtr->borderWidth;

489	489	width += TK_POPUP_OFFSET;
490	490	}
491	491	if (mbPtr->indicatorOn) {
492		mm = WidthMMOfScreen(Tk_Screen(mbPtr->tkwin));
493		pixels = WidthOfScreen(Tk_Screen(mbPtr->tkwin));
494	492	mbPtr->indicatorHeight = kTriangleHeight;
495	493	mbPtr->indicatorWidth = kTriangleWidth + kTriangleMargin;
496	494	width += mbPtr->indicatorWidth;

+13

-9

macosx/tkMacOSXMenus.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkMacOSXMenus.c,v 1.22 2008/10/05 18:22:21 dkf Exp $
	13	* RCS: @(#) $Id: tkMacOSXMenus.c,v 1.24 2008/12/09 21:22:56 dgp Exp $
14	14	*/
15	15
16	16	#include "tkMacOSXPrivate.h"

101	101	Window window;
102	102	TkDisplay *dispPtr;
103	103	Tcl_CmdInfo dummy;
	104	int code;
104	105
105	106	if (theItem == 0) {
106	107	TkMacOSXClearMenubarActive();

115	116	Tcl_GetCommandInfo(gInterp, "tkAboutDialog", &dummy) == 0) {
116	117	TkAboutDlg();
117	118	} else {
118		if (Tcl_EvalEx(gInterp, "tkAboutDialog", -1,
119		TCL_EVAL_GLOBAL) != TCL_OK) {
120		Tcl_BackgroundError(gInterp);
	119	code = Tcl_EvalEx(gInterp, "tkAboutDialog", -1,
	120	TCL_EVAL_GLOBAL);
	121	if (code != TCL_OK) {
	122	Tcl_BackgroundException(gInterp, code);
121	123	}
122	124	Tcl_ResetResult(gInterp);
123	125	}

137	139	Tcl_GetStringFromObj(path, &len);
138	140	if (len) {
139	141	Tcl_IncrRefCount(path);
140		if (Tcl_FSEvalFile(gInterp, path) == TCL_ERROR) {
141		Tcl_BackgroundError(gInterp);
	142	code = Tcl_FSEvalFile(gInterp, path);
	143	if (code != TCL_OK) {
	144	Tcl_BackgroundException(gInterp, code);
142	145	}
143	146	Tcl_DecrRefCount(path);
144	147	}

152	155
153	156	if (path) {
154	157	Tcl_IncrRefCount(path);
155		if (Tcl_FSEvalFile(gInterp, path) == TCL_ERROR) {
156		Tcl_BackgroundError(gInterp);
	158	code = Tcl_FSEvalFile(gInterp, path);
	159	if (code != TCL_OK) {
	160	Tcl_BackgroundException(gInterp, code);
157	161	}
158	162	Tcl_DecrRefCount(path);
159	163	Tcl_ResetResult(gInterp);

375	379
376	380	XQueryPointer(NULL, None, NULL, NULL,
377	381	&event.x_root, &event.y_root, &x, &y, &event.state);
378		tkwin = Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
	382	Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
379	383	event.same_screen = true;
380	384
381	385	switch (flag) {

+426

-419

macosx/tkMacOSXMouseEvent.c less more

0	0	/*
1	1	* tkMacOSXMouseEvent.c --
2	2	*
3		* This file implements functions that decode & handle mouse events
4		* on MacOS X.
	3	* This file implements functions that decode & handle mouse events on
	4	* MacOS X.
5	5	*
6	6	* Copyright 2001, Apple Computer, Inc.
7	7	* Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>

10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12	12	* The following terms apply to all files originating from Apple
13		* Computer, Inc. ("Apple") and associated with the software
14		* unless explicitly disclaimed in individual files.
15		*
16		*
17		* Apple hereby grants permission to use, copy, modify,
18		* distribute, and license this software and its documentation
19		* for any purpose, provided that existing copyright notices are
20		* retained in all copies and that this notice is included
21		* verbatim in any distributions. No written agreement, license,
22		* or royalty fee is required for any of the authorized
23		* uses. Modifications to this software may be copyrighted by
24		* their authors and need not follow the licensing terms
25		* described here, provided that the new terms are clearly
26		* indicated on the first page of each file where they apply.
27		*
28		*
29		* IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
30		* SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
31		* INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
32		* THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
33		* EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
34		* POSSIBILITY OF SUCH DAMAGE. APPLE, THE AUTHORS AND
35		* DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
36		* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
37		* FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS
38		* SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
39		* AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
	13	* Computer, Inc. ("Apple") and associated with the software unless
	14	* explicitly disclaimed in individual files.
	15	*
	16	* Apple hereby grants permission to use, copy, modify, distribute, and
	17	* license this software and its documentation for any purpose, provided
	18	* that existing copyright notices are retained in all copies and that
	19	* this notice is included verbatim in any distributions. No written
	20	* agreement, license, or royalty fee is required for any of the
	21	* authorized uses. Modifications to this software may be copyrighted by
	22	* their authors and need not follow the licensing terms described here,
	23	* provided that the new terms are clearly indicated on the first page of
	24	* each file where they apply.
	25	*
	26	* IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE SOFTWARE
	27	* BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
	28	* CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS
	29	* DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF APPLE OR THE
	30	* AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. APPLE,
	31	* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
	32	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
	33	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
	34	* NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND
	35	* APPLE,THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
40	36	* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
41	37	*
42		* GOVERNMENT USE: If you are acquiring this software on behalf
43		* of the U.S. government, the Government shall have only
44		* "Restricted Rights" in the software and related documentation
45		* as defined in the Federal Acquisition Regulations (FARs) in
46		* Clause 52.227.19 (c) (2). If you are acquiring the software
47		* on behalf of the Department of Defense, the software shall be
48		* classified as "Commercial Computer Software" and the
49		* Government shall have only "Restricted Rights" as defined in
50		* Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the
51		* foregoing, the authors grant the U.S. Government and others
52		* acting in its behalf permission to use and distribute the
53		* software in accordance with the terms specified in this
54		* license.
55		*
56		* RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.34 2007/12/13 15:27:10 dgp Exp $
	38	* GOVERNMENT USE: If you are acquiring this software on behalf of the
	39	* U.S. government, the Government shall have only "Restricted Rights" in
	40	* the software and related documentation as defined in the Federal
	41	* Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are
	42	* acquiring the software on behalf of the Department of Defense, the
	43	* software shall be classified as "Commercial Computer Software" and the
	44	* Government shall have only "Restricted Rights" as defined in Clause
	45	* 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
	46	* authors grant the U.S. Government and others acting in its behalf
	47	* permission to use and distribute the software in accordance with the
	48	* terms specified in this license.
	49	*
	50	* RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.35 2008/10/27 11:55:45 dkf Exp $
57	51	*/
58	52
59	53	#include "tkMacOSXPrivate.h"

62	56	#include "tkMacOSXDebug.h"
63	57
64	58	typedef struct {
65		WindowRef whichWin;
66		WindowRef activeNonFloating;
	59	WindowRef whichWin;
	60	WindowRef activeNonFloating;
67	61	WindowPartCode windowPart;
68		unsigned int state;
69		long delta;
70		Window window;
71		Point global;
72		Point local;
	62	unsigned int state;
	63	long delta;
	64	Window window;
	65	Point global;
	66	Point local;
73	67	} MouseEventData;
74	68
75	69	/*
76	70	* Declarations of static variables used in this file.
77	71	*/
78	72
79		static int gEatButtonUp = 0; /* 1 if we need to eat the next up event */
	73	static int gEatButtonUp = 0; /* 1 if we need to eat the next up event. */
80	74
81	75	/*
82	76	* Declarations of functions used only in this file.
83	77	*/
84	78
85		static void BringWindowForward(WindowRef wRef, int isFrontProcess,
86		int frontWindowOnly);
87		static int GeneratePollingEvents(MouseEventData * medPtr);
88		static int GenerateMouseWheelEvent(MouseEventData * medPtr);
89		static int GenerateButtonEvent(MouseEventData * medPtr);
90		static int GenerateToolbarButtonEvent(MouseEventData * medPtr);
91		static int HandleWindowTitlebarMouseDown(MouseEventData * medPtr, Tk_Window tkwin);
92		static unsigned int ButtonModifiers2State(UInt32 buttonState, UInt32 keyModifiers);
93		static Tk_Window GetGrabWindowForWindow(Tk_Window tkwin);
94
95		static int TkMacOSXGetEatButtonUp(void);
96		static void TkMacOSXSetEatButtonUp(int f);
97
	79	static void BringWindowForward(WindowRef wRef, int isFrontProcess,
	80	int frontWindowOnly);
	81	static int GeneratePollingEvents(MouseEventData *medPtr);
	82	static int GenerateMouseWheelEvent(MouseEventData *medPtr);
	83	static int GenerateButtonEvent(MouseEventData *medPtr);
	84	static int GenerateToolbarButtonEvent(MouseEventData *medPtr);
	85	static int HandleWindowTitlebarMouseDown(MouseEventData *medPtr,
	86	Tk_Window tkwin);
	87	static unsigned int ButtonModifiers2State(UInt32 buttonState,
	88	UInt32 keyModifiers);
	89	static Tk_Window GetGrabWindowForWindow(Tk_Window tkwin);
	90	static int TkMacOSXGetEatButtonUp(void);
	91	static void TkMacOSXSetEatButtonUp(int f);
98	92
99	93	/*
100	94	*----------------------------------------------------------------------
101	95	*
102	96	* TkMacOSXProcessMouseEvent --
103	97	*
104		* This routine processes the event in eventPtr, and
105		* generates the appropriate Tk events from it.
	98	* This routine processes the event in eventPtr, and generates the
	99	* appropriate Tk events from it.
106	100	*
107	101	* Results:
108	102	* True if event(s) are generated - false otherwise.

114	108	*/
115	109
116	110	MODULE_SCOPE int
117		TkMacOSXProcessMouseEvent(TkMacOSXEvent eventPtr, MacEventStatus statusPtr)
	111	TkMacOSXProcessMouseEvent(
	112	TkMacOSXEvent *eventPtr,
	113	MacEventStatus *statusPtr)
118	114	{
119	115	Tk_Window tkwin;
120	116	Point where, where2;
121	117	int result;
122		TkDisplay * dispPtr;
	118	TkDisplay *dispPtr;
123	119	OSStatus err;
124		MouseEventData mouseEventData, * medPtr = &mouseEventData;
	120	MouseEventData mouseEventData, *medPtr = &mouseEventData;
125	121	int isFrontProcess;
126	122
127	123	switch (eventPtr->eKind) {
128		case kEventMouseDown:
129		case kEventMouseUp:
130		case kEventMouseMoved:
131		case kEventMouseDragged:
132		case kEventMouseWheelMoved:
133		break;
134		default:
135		return false;
136		break;
137		}
	124	case kEventMouseDown:
	125	case kEventMouseUp:
	126	case kEventMouseMoved:
	127	case kEventMouseDragged:
	128	case kEventMouseWheelMoved:
	129	break;
	130	default:
	131	return false;
	132	}
	133
138	134	err = ChkErr(GetEventParameter, eventPtr->eventRef,
139		kEventParamMouseLocation,
140		typeQDPoint, NULL,
141		sizeof(where), NULL,
	135	kEventParamMouseLocation, typeQDPoint, NULL, sizeof(where), NULL,
142	136	&where);
143	137	if (err != noErr) {
144	138	GetGlobalMouse(&where);
145	139	}
146		err = ChkErr(GetEventParameter, eventPtr->eventRef,
147		kEventParamWindowRef,
148		typeWindowRef, NULL,
149		sizeof(WindowRef), NULL,
150		&medPtr->whichWin);
	140
	141	err = ChkErr(GetEventParameter, eventPtr->eventRef, kEventParamWindowRef,
	142	typeWindowRef, NULL, sizeof(WindowRef), NULL, &medPtr->whichWin);
151	143	if (err == noErr) {
152	144	err = ChkErr(GetEventParameter, eventPtr->eventRef,
153		kEventParamWindowPartCode,
154		typeWindowPartCode, NULL,
155		sizeof(WindowPartCode), NULL,
156		&medPtr->windowPart);
	145	kEventParamWindowPartCode, typeWindowPartCode, NULL,
	146	sizeof(WindowPartCode), NULL, &medPtr->windowPart);
157	147	}
158	148	if (err != noErr) {
159	149	medPtr->windowPart = FindWindow(where, &medPtr->whichWin);

189	179	}
190	180	medPtr->global = where;
191	181	err = ChkErr(GetEventParameter, eventPtr->eventRef,
192		kEventParamWindowMouseLocation,
193		typeQDPoint, NULL,
194		sizeof(Point), NULL,
195		&medPtr->local);
	182	kEventParamWindowMouseLocation, typeQDPoint, NULL,
	183	sizeof(Point), NULL, &medPtr->local);
196	184	if (err == noErr) {
197	185	if (medPtr->whichWin) {
198	186	Rect widths;
	187
199	188	GetWindowStructureWidths(medPtr->whichWin, &widths);
200	189	medPtr->local.h -= widths.left;
201	190	medPtr->local.v -= widths.top;

215	204	int res = false;
216	205
217	206	switch (eventPtr->eKind) {
218		case kEventMouseUp:
219		/*
220		* The window manager only needs to know about mouse down
221		* events and sometimes we need to "eat" the mouse up.
222		* Otherwise, we just pass the event to Tk.
223		*/
224		if (TkMacOSXGetEatButtonUp()) {
225		TkMacOSXSetEatButtonUp(false);
226		} else {
227		res = GenerateButtonEvent(medPtr);
	207	case kEventMouseUp:
	208	/*
	209	* The window manager only needs to know about mouse down events
	210	* and sometimes we need to "eat" the mouse up. Otherwise, we just
	211	* pass the event to Tk.
	212	*/
	213
	214	if (TkMacOSXGetEatButtonUp()) {
	215	TkMacOSXSetEatButtonUp(false);
	216	} else {
	217	res = GenerateButtonEvent(medPtr);
	218	}
	219	break;
	220	case kEventMouseWheelMoved:
	221	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	222	kEventParamMouseWheelDelta, typeLongInteger, NULL,
	223	sizeof(long), NULL, &medPtr->delta);
	224	if (err != noErr ) {
	225	statusPtr->err = 1;
	226	} else {
	227	EventMouseWheelAxis axis;
	228
	229	err = ChkErr(GetEventParameter, eventPtr->eventRef,
	230	kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL,
	231	sizeof(EventMouseWheelAxis), NULL, &axis);
	232	if (err == noErr && axis == kEventMouseWheelAxisX) {
	233	medPtr->state \|= ShiftMask;
228	234	}
229		break;
230		case kEventMouseWheelMoved:
231		err = ChkErr(GetEventParameter, eventPtr->eventRef,
232		kEventParamMouseWheelDelta, typeLongInteger, NULL,
233		sizeof(long), NULL, &medPtr->delta);
234		if (err != noErr ) {
235		statusPtr->err = 1;
236		} else {
237		EventMouseWheelAxis axis;
238		err = ChkErr(GetEventParameter, eventPtr->eventRef,
239		kEventParamMouseWheelAxis, typeMouseWheelAxis,
240		NULL, sizeof(EventMouseWheelAxis), NULL, &axis);
241		if (err == noErr && axis == kEventMouseWheelAxisX) {
242		medPtr->state \|= ShiftMask;
243		}
244		res = GenerateMouseWheelEvent(medPtr);
245		}
246		break;
247		case kEventMouseMoved:
248		case kEventMouseDragged:
249		res = GeneratePollingEvents(medPtr);
250		break;
251		default:
252		Tcl_Panic("Unknown mouse event !");
253		}
254		if (res) {
255		statusPtr->stopProcessing = 1;
256		}
257		return res;
258		}
259		TkMacOSXSetEatButtonUp(false);
260		if (medPtr->whichWin) {
261		/*
262		* We got a mouse down in a window
263		* See if this is the activate click
264		* This click moves the window forward. We don't want
265		* the corresponding mouse-up to be reported to the application
266		* or else it will mess up some Tk scripts.
267		*/
268
269		if (!(TkpIsWindowFloating(medPtr->whichWin))
270		&& (medPtr->whichWin != medPtr->activeNonFloating
271		\|\| !isFrontProcess)) {
272		int frontWindowOnly = 1;
273		int cmdDragGrow = ((medPtr->windowPart == inDrag \|\|
274		medPtr->windowPart == inGrow) && medPtr->state & Mod1Mask);
275
276		if (!cmdDragGrow) {
277		Tk_Window grabWin = GetGrabWindowForWindow(tkwin);
278
279		frontWindowOnly = !grabWin;
280		if (grabWin && grabWin != tkwin) {
281		TkMacOSXSetEatButtonUp(true);
282		BringWindowForward(TkMacOSXDrawableWindow(
283		((TkWindow*)grabWin)->window), isFrontProcess,
284		frontWindowOnly);
285		return false;
286		}
287		}
288
289		/*
290		* Clicks in the titlebar widgets are handled without bringing the
291		* window forward.
292		*/
293		if ((result = HandleWindowTitlebarMouseDown(medPtr, tkwin)) != -1) {
294		statusPtr->stopProcessing = 1;
295		return result;
296		} else {
297		/*
298		* Only windows with the kWindowNoActivatesAttribute can
299		* receive mouse events in the background.
300		*/
301		if (!(((TkWindow *)tkwin)->wmInfoPtr->attributes &
302		kWindowNoActivatesAttribute)) {
303		/*
304		* Allow background window dragging & growing with Command
305		* down.
306		*/
307		if (!cmdDragGrow) {
308		TkMacOSXSetEatButtonUp(true);
309		BringWindowForward(medPtr->whichWin, isFrontProcess,
310		frontWindowOnly);
311		}
312		/*
313		* Allow dragging & growing of windows that were/are in the
314		* background.
315		*/
316		if (!(medPtr->windowPart == inDrag \|\|
317		medPtr->windowPart == inGrow)) {
318		return false;
319		}
320		}
321		}
322		} else {
323		if ((result = HandleWindowTitlebarMouseDown(medPtr, tkwin)) != -1) {
324		statusPtr->stopProcessing = 1;
325		return result;
326		}
327		}
328		switch (medPtr->windowPart) {
329		case inDrag: {
330		WindowAttributes attributes;
331
332		GetWindowAttributes(medPtr->whichWin, &attributes);
333		if (!(attributes & kWindowAsyncDragAttribute)) {
334		TkMacOSXTrackingLoop(1);
335		DragWindow(medPtr->whichWin, where, NULL);
336		TkMacOSXTrackingLoop(0);
337		where2.h = where2.v = 0;
338		QDLocalToGlobalPoint(GetWindowPort(medPtr->whichWin),
339		&where2);
340		if (EqualPt(where, where2)) {
341		return false;
342		}
343		return true;
344		}
345		break;
346		}
347		case inGrow:
348		/*
349		* Generally the content region is the domain of Tk
350		* sub-windows. However, one exception is the grow
351		* region. A button down in this area will be handled
352		* by the window manager. Note: this means that Tk
353		* may not get button down events in this area!
354		*/
355		if (TkMacOSXGrowToplevel(medPtr->whichWin, where) == true) {
356		statusPtr->stopProcessing = 1;
357		return true;
358		} else {
359		return GenerateButtonEvent(medPtr);
360		}
361		break;
362		case inContent:
363		return GenerateButtonEvent(medPtr);
364		break;
365		default:
366		return false;
367		break;
368		}
369		}
370		return false;
371		}
372
373		/*
374		*----------------------------------------------------------------------
375		*
376		* HandleWindowTitlebarMouseDown --
377		*
378		* Handle clicks in window titlebar.
379		*
380		* Results:
381		* 1 if event was handled, 0 if event was not handled,
382		* -1 if MouseDown was not in window titlebar.
383		*
384		* Side effects:
385		* Additional events may be place on the Tk event queue.
386		*
387		*----------------------------------------------------------------------
388		*/
389
390		int
391		HandleWindowTitlebarMouseDown(MouseEventData * medPtr, Tk_Window tkwin)
392		{
393		int result = INT_MAX;
394
395		switch (medPtr->windowPart) {
396		case inGoAway:
397		case inCollapseBox:
398		case inZoomIn:
399		case inZoomOut:
400		case inToolbarButton:
401		if (!IsWindowActive(medPtr->whichWin)) {
402		WindowRef frontWindow = FrontNonFloatingWindow();
403		WindowModality frontWindowModality = kWindowModalityNone;
404
405		if (frontWindow && frontWindow != medPtr->whichWin) {
406		ChkErr(GetWindowModality, frontWindow,
407		&frontWindowModality, NULL);
408		}
409		if (frontWindowModality == kWindowModalityAppModal) {
410		result = 0;
411		}
412		}
	235	res = GenerateMouseWheelEvent(medPtr);
	236	}
	237	break;
	238	case kEventMouseMoved:
	239	case kEventMouseDragged:
	240	res = GeneratePollingEvents(medPtr);
413	241	break;
414	242	default:
415		result = -1;
416		break;
	243	Tcl_Panic("Unknown mouse event !");
	244	}
	245	if (res) {
	246	statusPtr->stopProcessing = 1;
	247	}
	248	return res;
	249	}
	250
	251	TkMacOSXSetEatButtonUp(false);
	252	if (!medPtr->whichWin) {
	253	return false;
	254	}
	255
	256	/*
	257	* We got a mouse down in a window, so see if this is the activate click.
	258	* This click moves the window forward. We don't want the corresponding
	259	* mouse-up to be reported to the application or else it will mess up some
	260	* Tk scripts.
	261	*/
	262
	263	if (!(TkpIsWindowFloating(medPtr->whichWin))
	264	&& (medPtr->whichWin != medPtr->activeNonFloating
	265	\|\| !isFrontProcess)) {
	266	int frontWindowOnly = 1;
	267	int cmdDragGrow = ((medPtr->windowPart == inDrag \|\|
	268	medPtr->windowPart == inGrow) && medPtr->state & Mod1Mask);
	269
	270	if (!cmdDragGrow) {
	271	Tk_Window grabWin = GetGrabWindowForWindow(tkwin);
	272
	273	frontWindowOnly = !grabWin;
	274	if (grabWin && grabWin != tkwin) {
	275	TkMacOSXSetEatButtonUp(true);
	276	BringWindowForward(TkMacOSXDrawableWindow(
	277	((TkWindow *) grabWin)->window), isFrontProcess,
	278	frontWindowOnly);
	279	return false;
	280	}
	281	}
	282
	283	/*
	284	* Clicks in the titlebar widgets are handled without bringing the
	285	* window forward.
	286	*/
	287
	288	result = HandleWindowTitlebarMouseDown(medPtr, tkwin);
	289	if (result != -1) {
	290	statusPtr->stopProcessing = 1;
	291	return result;
	292	}
	293
	294	/*
	295	* Only windows with the kWindowNoActivatesAttribute can receive mouse
	296	* events in the background.
	297	*/
	298
	299	if (!(((TkWindow *)tkwin)->wmInfoPtr->attributes &
	300	kWindowNoActivatesAttribute)) {
	301	/*
	302	* Allow background window dragging & growing with Command down.
	303	*/
	304
	305	if (!cmdDragGrow) {
	306	TkMacOSXSetEatButtonUp(true);
	307	BringWindowForward(medPtr->whichWin, isFrontProcess,
	308	frontWindowOnly);
	309	}
	310
	311	/*
	312	* Allow dragging & growing of windows that were/are in the
	313	* background.
	314	*/
	315
	316	if (!(medPtr->windowPart == inDrag \|\|
	317	medPtr->windowPart == inGrow)) {
	318	return false;
	319	}
	320	}
	321	} else {
	322	result = HandleWindowTitlebarMouseDown(medPtr, tkwin);
	323	if (result != -1) {
	324	statusPtr->stopProcessing = 1;
	325	return result;
	326	}
	327	}
	328
	329	switch (medPtr->windowPart) {
	330	case inDrag: {
	331	WindowAttributes attributes;
	332
	333	GetWindowAttributes(medPtr->whichWin, &attributes);
	334	if (!(attributes & kWindowAsyncDragAttribute)) {
	335	TkMacOSXTrackingLoop(1);
	336	DragWindow(medPtr->whichWin, where, NULL);
	337	TkMacOSXTrackingLoop(0);
	338	where2.h = where2.v = 0;
	339	QDLocalToGlobalPoint(GetWindowPort(medPtr->whichWin), &where2);
	340	return (EqualPt(where, where2)) ? false : true;
	341	}
	342	break;
	343	}
	344	case inGrow:
	345	/*
	346	* Generally the content region is the domain of Tk sub-windows.
	347	* However, one exception is the grow region. A button down in this
	348	* area will be handled by the window manager. Note: this means that
	349	* Tk may not get button down events in this area!
	350	*/
	351
	352	if (TkMacOSXGrowToplevel(medPtr->whichWin, where) == true) {
	353	statusPtr->stopProcessing = 1;
	354	return true;
	355	}
	356	case inContent:
	357	return GenerateButtonEvent(medPtr);
	358	}
	359	return false;
	360	}
	361
	362	/*
	363	*----------------------------------------------------------------------
	364	*
	365	* HandleWindowTitlebarMouseDown --
	366	*
	367	* Handle clicks in window titlebar.
	368	*
	369	* Results:
	370	* 1 if event was handled, 0 if event was not handled, -1 if MouseDown
	371	* was not in window titlebar.
	372	*
	373	* Side effects:
	374	* Additional events may be place on the Tk event queue.
	375	*
	376	*----------------------------------------------------------------------
	377	*/
	378
	379	int
	380	HandleWindowTitlebarMouseDown(
	381	MouseEventData *medPtr,
	382	Tk_Window tkwin)
	383	{
	384	int result = INT_MAX;
	385
	386	switch (medPtr->windowPart) {
	387	case inGoAway:
	388	case inCollapseBox:
	389	case inZoomIn:
	390	case inZoomOut:
	391	case inToolbarButton:
	392	if (!IsWindowActive(medPtr->whichWin)) {
	393	WindowRef frontWindow = FrontNonFloatingWindow();
	394	WindowModality frontWindowModality = kWindowModalityNone;
	395
	396	if (frontWindow && frontWindow != medPtr->whichWin) {
	397	ChkErr(GetWindowModality, frontWindow,
	398	&frontWindowModality, NULL);
	399	}
	400	if (frontWindowModality == kWindowModalityAppModal) {
	401	result = 0;
	402	}
	403	}
	404	break;
	405	default:
	406	result = -1;
	407	break;
417	408	}
418	409
419	410	if (result == INT_MAX) {
420	411	result = 0;
421	412	TkMacOSXTrackingLoop(1);
422	413	switch (medPtr->windowPart) {
423		case inGoAway:
424		if (TrackGoAway(medPtr->whichWin, medPtr->global) && tkwin) {
425		TkGenWMDestroyEvent(tkwin);
426		result = 1;
427		}
428		break;
429		case inCollapseBox:
430		if (TrackBox(medPtr->whichWin, medPtr->global,
431		medPtr->windowPart) && tkwin) {
432		TkpWmSetState((TkWindow *)tkwin, IconicState);
433		result = 1;
434		}
435		break;
436		case inZoomIn:
437		case inZoomOut:
438		if (TrackBox(medPtr->whichWin, medPtr->global,
439		medPtr->windowPart)) {
440		result = TkMacOSXZoomToplevel(medPtr->whichWin,
441		medPtr->windowPart);
442		}
443		break;
444		case inToolbarButton:
445		if (TrackBox(medPtr->whichWin, medPtr->global,
446		medPtr->windowPart)) {
447		result = GenerateToolbarButtonEvent(medPtr);
448		}
449		break;
	414	case inGoAway:
	415	if (TrackGoAway(medPtr->whichWin, medPtr->global) && tkwin) {
	416	TkGenWMDestroyEvent(tkwin);
	417	result = 1;
	418	}
	419	break;
	420	case inCollapseBox:
	421	if (TrackBox(medPtr->whichWin, medPtr->global,
	422	medPtr->windowPart) && tkwin) {
	423	TkpWmSetState((TkWindow *) tkwin, IconicState);
	424	result = 1;
	425	}
	426	break;
	427	case inZoomIn:
	428	case inZoomOut:
	429	if (TrackBox(medPtr->whichWin, medPtr->global,
	430	medPtr->windowPart)) {
	431	result = TkMacOSXZoomToplevel(medPtr->whichWin,
	432	medPtr->windowPart);
	433	}
	434	break;
	435	case inToolbarButton:
	436	if (TrackBox(medPtr->whichWin, medPtr->global,
	437	medPtr->windowPart)) {
	438	result = GenerateToolbarButtonEvent(medPtr);
	439	}
	440	break;
450	441	}
451	442	TkMacOSXTrackingLoop(0);
452	443	}

459	450	*
460	451	* GeneratePollingEvents --
461	452	*
462		* This function polls the mouse position and generates X Motion,
463		* Enter & Leave events. The cursor is also updated at this
464		* time.
	453	* This function polls the mouse position and generates X Motion, Enter &
	454	* Leave events. The cursor is also updated at this time.
465	455	*
466	456	* Results:
467	457	* True if event(s) are generated - false otherwise.
468	458	*
469	459	* Side effects:
470		* Additional events may be place on the Tk event queue.
471		* The cursor may be changed.
	460	* Additional events may be place on the Tk event queue. The cursor may
	461	* be changed.
472	462	*
473	463	*----------------------------------------------------------------------
474	464	*/
475	465
476	466	static int
477		GeneratePollingEvents(MouseEventData * medPtr)
	467	GeneratePollingEvents(
	468	MouseEventData *medPtr)
478	469	{
479	470	Tk_Window tkwin, rootwin, grabWin;
480	471	int local_x, local_y;
481	472	TkDisplay *dispPtr;
482	473
483
484	474	grabWin = TkMacOSXGetCapture();
485	475
486	476	if ((!TkpIsWindowFloating(medPtr->whichWin)
487	477	&& (medPtr->activeNonFloating != medPtr->whichWin))) {
488	478	/*
489		* If the window for this event is not floating, and is not the
490		* active non-floating window, don't generate polling events.
491		* We don't send events to backgrounded windows. So either send
492		* it to the grabWin, or NULL if there is no grabWin.
	479	* If the window for this event is not floating, and is not the active
	480	* non-floating window, don't generate polling events. We don't send
	481	* events to backgrounded windows. So either send it to the grabWin,
	482	* or NULL if there is no grabWin.
493	483	*/
494	484
495	485	tkwin = grabWin;
496	486	} else {
497	487	/*
498		* First check whether the toplevel containing this mouse
499		* event is the grab window. If not, then send the event
500		* to the grab window. Otherwise, set tkWin to the subwindow
501		* which most closely contains the mouse event.
	488	* First check whether the toplevel containing this mouse event is the
	489	* grab window. If not, then send the event to the grab window.
	490	* Otherwise, set tkWin to the subwindow which most closely contains
	491	* the mouse event.
502	492	*/
503	493
504	494	dispPtr = TkGetDisplayList();

507	497	\|\| ((grabWin != NULL) && (rootwin != grabWin))) {
508	498	tkwin = grabWin;
509	499	} else {
510		tkwin = Tk_TopCoordsToWindow(rootwin,
511		medPtr->local.h, medPtr->local.v,
512		&local_x, &local_y);
	500	tkwin = Tk_TopCoordsToWindow(rootwin, medPtr->local.h,
	501	medPtr->local.v, &local_x, &local_y);
513	502	}
514	503	}
515	504
516	505	/*
517		* The following call will generate the appropiate X events and
518		* adjust any state that Tk must remember.
	506	* The following call will generate the appropiate X events and adjust any
	507	* state that Tk must remember.
519	508	*/
520	509
521	510	Tk_UpdatePointer(tkwin, medPtr->global.h, medPtr->global.v,
522	511	medPtr->state);
523
524	512	return true;
525	513	}
526	514

558	546
559	547	if (window != None) {
560	548	TkDisplay *dispPtr = TkGetDisplayList();
561		TkWindow * winPtr = (TkWindow *)Tk_IdToWindow(dispPtr->display,
562		window);
	549	TkWindow winPtr = (TkWindow )
	550	Tk_IdToWindow(dispPtr->display, window);
563	551
564	552	if (winPtr && winPtr->wmInfoPtr &&
565	553	winPtr->wmInfoPtr->master != None) {

585	573	if (!isFrontProcess) {
586	574	ProcessSerialNumber ourPsn = {0, kCurrentProcess};
587	575
588		ChkErr(SetFrontProcessWithOptions, &ourPsn, frontWindowOnly ?
589		kSetFrontProcessFrontWindowOnly : 0);
	576	ChkErr(SetFrontProcessWithOptions, &ourPsn,
	577	frontWindowOnly ? kSetFrontProcessFrontWindowOnly : 0);
590	578	}
591	579	}
592	580

595	583	*
596	584	* TkMacOSXBringWindowForward --
597	585	*
598		* Bring this window to the front in response to a mouse click. If
599		* a grab is in effect, bring the grab window to the front instead.
	586	* Bring this window to the front in response to a mouse click. If a grab
	587	* is in effect, bring the grab window to the front instead.
600	588	*
601	589	* Results:
602	590	* None.

612	600	WindowRef wRef)
613	601	{
614	602	TkDisplay *dispPtr = TkGetDisplayList();
615		Tk_Window tkwin = Tk_IdToWindow(dispPtr->display,TkMacOSXGetXWindow(wRef));
	603	Tk_Window tkwin =
	604	Tk_IdToWindow(dispPtr->display, TkMacOSXGetXWindow(wRef));
616	605	Tk_Window grabWin = GetGrabWindowForWindow(tkwin);
617	606
618	607	if (grabWin && grabWin != tkwin) {
619		wRef = TkMacOSXDrawableWindow(((TkWindow*)grabWin)->window);
	608	wRef = TkMacOSXDrawableWindow(((TkWindow *) grabWin)->window);
620	609	}
621	610	TkMacOSXSetEatButtonUp(true);
622	611	BringWindowForward(wRef, Tk_MacOSXIsAppInFront(), !grabWin);

645	634	Tk_Window grabWin = TkMacOSXGetCapture();
646	635
647	636	if (!grabWin) {
648		int grabState = TkGrabState((TkWindow*)tkwin);
	637	int grabState = TkGrabState((TkWindow *) tkwin);
649	638
650	639	if (grabState != TK_GRAB_NONE && grabState != TK_GRAB_IN_TREE) {
651		grabWin = (Tk_Window) (((TkWindow*)tkwin)->dispPtr->grabWinPtr);
	640	grabWin = (Tk_Window) (((TkWindow *) tkwin)->dispPtr->grabWinPtr);
652	641	}
653	642	}
654	643

672	661	*/
673	662
674	663	static int
675		GenerateMouseWheelEvent(MouseEventData * medPtr)
	664	GenerateMouseWheelEvent(
	665	MouseEventData *medPtr)
676	666	{
677	667	Tk_Window tkwin, rootwin;
678	668	TkDisplay *dispPtr;
679		TkWindow *winPtr;
	669	TkWindow *winPtr;
680	670	XEvent xEvent;
681	671
682	672	dispPtr = TkGetDisplayList();

684	674	if (rootwin == NULL) {
685	675	tkwin = NULL;
686	676	} else {
687		tkwin = Tk_TopCoordsToWindow(rootwin,
688		medPtr->local.h, medPtr->local.v,
689		&xEvent.xbutton.x, &xEvent.xbutton.y);
	677	tkwin = Tk_TopCoordsToWindow(rootwin, medPtr->local.h,
	678	medPtr->local.v, &xEvent.xbutton.x, &xEvent.xbutton.y);
690	679	}
691	680
692	681	/*
693		* The following call will generate the appropiate X events and
694		* adjust any state that Tk must remember.
	682	* The following call will generate the appropiate X events and adjust any
	683	* state that Tk must remember.
695	684	*/
696	685
697	686	if (!tkwin) {

700	689	if (!tkwin) {
701	690	return false;
702	691	}
	692
703	693	winPtr = (TkWindow *) tkwin;
704	694	xEvent.type = MouseWheelEvent;
705	695	xEvent.xkey.keycode = medPtr->delta;

711	701	xEvent.xany.display = winPtr->display;
712	702	xEvent.xany.window = Tk_WindowId(winPtr);
713	703	Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
714
715	704	return true;
716	705	}
717	706

721	710	* TkMacOSXGetEatButtonUp --
722	711	*
723	712	* Results:
724		* Returns the flag indicating if we need to eat the
725		* next mouse up event
	713	* Return the flag indicating if we need to eat the next mouse up event.
726	714	*
727	715	* Side effects:
728	716	* None.
729	717	*
730	718	*----------------------------------------------------------------------
731	719	*/
	720
732	721	int
733	722	TkMacOSXGetEatButtonUp(void)
734	723	{

744	733	* None.
745	734	*
746	735	* Side effects:
747		* Sets the flag indicating if we need to eat the
748		* next mouse up event
749		*
750		*----------------------------------------------------------------------
751		*/
	736	* Sets the flag indicating if we need to eat the next mouse up event
	737	*
	738	*----------------------------------------------------------------------
	739	*/
	740
752	741	void
753		TkMacOSXSetEatButtonUp(int f)
	742	TkMacOSXSetEatButtonUp(
	743	int f)
754	744	{
755	745	gEatButtonUp = f;
756	746	}

780	770	keyModifiers = isFrontProcess ? GetCurrentEventKeyModifiers() :
781	771	GetCurrentKeyModifiers();
782	772
783		return (EventModifiers)(keyModifiers & USHRT_MAX);
	773	return (EventModifiers) (keyModifiers & USHRT_MAX);
784	774	}
785	775
786	776	/*

791	781	* Returns the current state of the button & modifier keys.
792	782	*
793	783	* Results:
794		* A bitwise inclusive OR of a subset of the following:
795		* Button1Mask, ShiftMask, LockMask, ControlMask, Mod*Mask.
	784	* A bitwise inclusive OR of a subset of the following: Button1Mask,
	785	* ShiftMask, LockMask, ControlMask, Mod*Mask.
796	786	*
797	787	* Side effects:
798	788	* None.

834	824	*/
835	825
836	826	static unsigned int
837		ButtonModifiers2State(UInt32 buttonState, UInt32 keyModifiers)
	827	ButtonModifiers2State(
	828	UInt32 buttonState,
	829	UInt32 keyModifiers)
838	830	{
839	831	unsigned int state;
840	832
841		/* Tk supports at most 5 buttons */
	833	/*
	834	* Tk supports at most 5 buttons.
	835	*/
	836
842	837	state = (buttonState & ((1<<5) - 1)) << 8;
843	838
844	839	if (keyModifiers & alphaLock) {

872	867	* XQueryPointer --
873	868	*
874	869	* Check the current state of the mouse. This is not a complete
875		* implementation of this function. It only computes the root
876		* coordinates and the current mask.
877		*
878		* Results:
879		* Sets root_x_return, root_y_return, and mask_return. Returns
880		* true on success.
	870	* implementation of this function. It only computes the root coordinates
	871	* and the current mask.
	872	*
	873	* Results:
	874	* Sets root_x_return, root_y_return, and mask_return. Returns true on
	875	* success.
881	876	*
882	877	* Side effects:
883	878	* None.

887	882
888	883	Bool
889	884	XQueryPointer(
890		Display* display,
	885	Display *display,
891	886	Window w,
892		Window* root_return,
893		Window* child_return,
894		int* root_x_return,
895		int* root_y_return,
896		int* win_x_return,
897		int* win_y_return,
898		unsigned int* mask_return)
	887	Window *root_return,
	888	Window *child_return,
	889	int *root_x_return,
	890	int *root_y_return,
	891	int *win_x_return,
	892	int *win_y_return,
	893	unsigned int *mask_return)
899	894	{
900	895	int getGlobal = (root_x_return && root_y_return);
901	896	int getLocal = (win_x_return && win_y_return);

922	917	}
923	918	if (getLocal) {
924	919	WindowRef whichWin;
	920
925	921	if (ev) {
926	922	err = ChkErr(GetEventParameter, ev, kEventParamWindowRef,
927	923	typeWindowRef, NULL, sizeof(WindowRef), NULL,

965	961	*
966	962	* TkGenerateButtonEventForXPointer --
967	963	*
968		* This procedure generates an X button event for the current
969		* pointer state as reported by XQueryPointer().
	964	* This procedure generates an X button event for the current pointer
	965	* state as reported by XQueryPointer().
970	966	*
971	967	* Results:
972	968	* True if event(s) are generated - false otherwise.
973	969	*
974	970	* Side effects:
975		* Additional events may be place on the Tk event queue.
976		* Grab state may also change.
	971	* Additional events may be place on the Tk event queue. Grab state may
	972	* also change.
977	973	*
978	974	*----------------------------------------------------------------------
979	975	*/
980	976
981	977	MODULE_SCOPE int
982	978	TkGenerateButtonEventForXPointer(
983		Window window) /* X Window containing button event. */
	979	Window window) /* X Window containing button event. */
984	980	{
985	981	MouseEventData med;
986	982	int global_x, global_y, local_x, local_y;

1003	999	*
1004	1000	* TkGenerateButtonEvent --
1005	1001	*
1006		* Given a global x & y position and the button key status this
1007		* procedure generates the appropiate X button event. It also
1008		* handles the state changes needed to implement implicit grabs.
1009		*
1010		* Results:
1011		* True if event(s) are generated - false otherwise.
1012		*
1013		* Side effects:
1014		* Additional events may be place on the Tk event queue.
1015		* Grab state may also change.
	1002	* Given a global x & y position and the button key status this procedure
	1003	* generates the appropiate X button event. It also handles the state
	1004	* changes needed to implement implicit grabs.
	1005	*
	1006	* Results:
	1007	* True if event(s) are generated, false otherwise.
	1008	*
	1009	* Side effects:
	1010	* Additional events may be place on the Tk event queue. Grab state may
	1011	* also change.
1016	1012	*
1017	1013	*----------------------------------------------------------------------
1018	1014	*/
1019	1015
1020	1016	int
1021	1017	TkGenerateButtonEvent(
1022		int x, /* X location of mouse */
1023		int y, /* Y location of mouse */
1024		Window window, /* X Window containing button event. */
1025		unsigned int state) /* Button Key state suitable for X event */
	1018	int x, /* X location of mouse, */
	1019	int y, /* Y location of mouse. */
	1020	Window window, /* X Window containing button event. */
	1021	unsigned int state) /* Button Key state suitable for X event. */
1026	1022	{
1027	1023	MouseEventData med;
1028	1024

1044	1040	*
1045	1041	* GenerateButtonEvent --
1046	1042	*
1047		* Generate an X button event from a MouseEventData structure.
1048		* Handles the state changes needed to implement implicit grabs.
	1043	* Generate an X button event from a MouseEventData structure. Handles
	1044	* the state changes needed to implement implicit grabs.
1049	1045	*
1050	1046	* Results:
1051	1047	* True if event(s) are generated - false otherwise.
1052	1048	*
1053	1049	* Side effects:
1054		* Additional events may be place on the Tk event queue.
1055		* Grab state may also change.
	1050	* Additional events may be place on the Tk event queue. Grab state may
	1051	* also change.
1056	1052	*
1057	1053	*----------------------------------------------------------------------
1058	1054	*/
1059	1055
1060	1056	static int
1061		GenerateButtonEvent(MouseEventData * medPtr)
	1057	GenerateButtonEvent(
	1058	MouseEventData *medPtr)
1062	1059	{
1063	1060	Tk_Window tkwin;
1064	1061	int dummy;

1066	1063
1067	1064	#if UNUSED
1068	1065	/*
1069		* ButtonDown events will always occur in the front
1070		* window. ButtonUp events, however, may occur anywhere
1071		* on the screen. ButtonUp events should only be sent
1072		* to Tk if in the front window or during an implicit grab.
	1066	* ButtonDown events will always occur in the front window. ButtonUp
	1067	* events, however, may occur anywhere on the screen. ButtonUp events
	1068	* should only be sent to Tk if in the front window or during an implicit
	1069	* grab.
1073	1070	*/
	1071
1074	1072	if ((medPtr->activeNonFloating == NULL)
1075	1073	\|\| ((!(TkpIsWindowFloating(medPtr->whichWin))
1076	1074	&& (medPtr->activeNonFloating != medPtr->whichWin))

1088	1086	}
1089	1087
1090	1088	Tk_UpdatePointer(tkwin, medPtr->global.h, medPtr->global.v, medPtr->state);
1091
1092	1089	return true;
1093	1090	}
1094	1091

1097	1094	*
1098	1095	* GenerateToolbarButtonEvent --
1099	1096	*
1100		* Generates a "ToolbarButton" virtual event.
1101		* This can be used to manage disappearing toolbars.
	1097	* Generates a "ToolbarButton" virtual event. This can be used to manage
	1098	* disappearing toolbars.
1102	1099	*
1103	1100	* Results:
1104	1101	* None.

1110	1107	*/
1111	1108
1112	1109	static int
1113		GenerateToolbarButtonEvent(MouseEventData * medPtr)
	1110	GenerateToolbarButtonEvent(
	1111	MouseEventData *medPtr)
1114	1112	{
1115	1113	Tk_Window rootwin, tkwin = NULL;
1116	1114	TkDisplay *dispPtr;
1117		TkWindow *winPtr;
	1115	TkWindow *winPtr;
1118	1116	XVirtualEvent event;
1119	1117
1120	1118	dispPtr = TkGetDisplayList();

1126	1124	if (!tkwin) {
1127	1125	return true;
1128	1126	}
1129		winPtr = (TkWindow *)tkwin;
	1127	winPtr = (TkWindow *) tkwin;
1130	1128
1131	1129	bzero(&event, sizeof(XVirtualEvent));
1132	1130	event.type = VirtualEvent;

1146	1144	Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
1147	1145	return true;
1148	1146	}
	1147
	1148	/*
	1149	* Local Variables:
	1150	* mode: c
	1151	* c-basic-offset: 4
	1152	* fill-column: 79
	1153	* coding: utf-8
	1154	* End:
	1155	*/

+33

-26

macosx/tkMacOSXNotify.c less more

10	10	* See the file "license.terms" for information on usage and redistribution
11	11	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkMacOSXNotify.c,v 1.20 2007/12/13 15:27:10 dgp Exp $
	13	* RCS: @(#) $Id: tkMacOSXNotify.c,v 1.21 2008/11/08 18:44:40 dkf Exp $
14	14	*/
15	15
16	16	#include "tkMacOSXPrivate.h"

30	30	static void TkMacOSXNotifyExitHandler(ClientData clientData);
31	31	static void CarbonEventsSetupProc(ClientData clientData, int flags);
32	32	static void CarbonEventsCheckProc(ClientData clientData, int flags);
33
34		/*
	33
	34	/*
35	35	*----------------------------------------------------------------------
36	36	*
37	37	* Tk_MacOSXSetupTkNotifier --

65	65	GetMainEventQueue();
66	66
67	67	tsdPtr->initialized = 1;
68		/* Install Carbon events event source in main event loop thread. */
	68
	69	/*
	70	* Install Carbon events event source in main event loop thread.
	71	*/
	72
69	73	if (GetCurrentEventLoop() == GetMainEventLoop()) {
70	74	if (!pthread_main_np()) {
71	75	/*
72		* Panic if the Carbon main event loop thread (i.e. the
73		* thread where HIToolbox was first loaded) is not the
74		* main application thread, as Carbon does not support
75		* this properly.
	76	* Panic if the Carbon main event loop thread (i.e. the thread
	77	* where HIToolbox was first loaded) is not the main
	78	* application thread, as Carbon does not support this
	79	* properly.
76	80	*/
	81
77	82	Tcl_Panic("Tk_MacOSXSetupTkNotifier: %s",
78	83	"first [load] of TkAqua has to occur in the main thread!");
79	84	}

102	107	*/
103	108
104	109	static void
105		TkMacOSXNotifyExitHandler(clientData)
106		ClientData clientData; /* Not used. */
	110	TkMacOSXNotifyExitHandler(
	111	ClientData clientData) /* Not used. */
107	112	{
108	113	ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey,
109	114	sizeof(ThreadSpecificData));

118	123	*
119	124	* CarbonEventsSetupProc --
120	125	*
121		* This procedure implements the setup part of the Carbon Events
122		* event source. It is invoked by Tcl_DoOneEvent before entering
123		* the notifier to check for events.
	126	* This procedure implements the setup part of the Carbon Events event
	127	* source. It is invoked by Tcl_DoOneEvent before entering the notifier
	128	* to check for events.
124	129	*
125	130	* Results:
126	131	* None.
127	132	*
128	133	* Side effects:
129		* If Carbon events are queued, then the maximum block time will be
130		* set to 0 to ensure that the notifier returns control to Tcl.
	134	* If Carbon events are queued, then the maximum block time will be set
	135	* to 0 to ensure that the notifier returns control to Tcl.
131	136	*
132	137	*----------------------------------------------------------------------
133	138	*/
134	139
135	140	static void
136		CarbonEventsSetupProc(clientData, flags)
137		ClientData clientData;
138		int flags;
	141	CarbonEventsSetupProc(
	142	ClientData clientData,
	143	int flags)
139	144	{
140	145	static Tcl_Time blockTime = { 0, 0 };
141	146

143	148	return;
144	149	}
145	150
146		if (GetNumEventsInQueue((EventQueueRef)clientData)) {
	151	if (GetNumEventsInQueue((EventQueueRef) clientData)) {
147	152	Tcl_SetMaxBlockTime(&blockTime);
148	153	}
149	154	}

153	158	*
154	159	* CarbonEventsCheckProc --
155	160	*
156		* This procedure processes events sitting in the Carbon event
157		* queue.
	161	* This procedure processes events sitting in the Carbon event queue.
158	162	*
159	163	* Results:
160	164	* None.

166	170	*/
167	171
168	172	static void
169		CarbonEventsCheckProc(clientData, flags)
170		ClientData clientData;
171		int flags;
	173	CarbonEventsCheckProc(
	174	ClientData clientData,
	175	int flags)
172	176	{
173	177	int numFound;
174	178	OSStatus err = noErr;

177	181	return;
178	182	}
179	183
180		numFound = GetNumEventsInQueue((EventQueueRef)clientData);
	184	numFound = GetNumEventsInQueue((EventQueueRef) clientData);
181	185
182		/* Avoid starving other event sources: */
	186	/*
	187	* Avoid starving other event sources:
	188	*/
	189
183	190	if (numFound > 4) {
184	191	numFound = 4;
185	192	}

+1

-16

macosx/tkMacOSXPort.h less more

11	11	* See the file "license.terms" for information on usage and redistribution
12	12	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkMacOSXPort.h,v 1.14 2008/08/19 15:52:13 georgeps Exp $
	14	* RCS: @(#) $Id: tkMacOSXPort.h,v 1.15 2008/12/17 22:51:25 nijtmans Exp $
15	15	*/
16	16
17	17	#ifndef _TKMACPORT
18	18	#define _TKMACPORT
19
20		/*
21		* Macro to use instead of "void" for arguments that must have
22		* type "void " in ANSI C; maps them to type "char " in
23		* non-ANSI systems. This macro may be used in some of the include
24		* files below, which is why it is defined here.
25		*/
26
27		#ifndef VOID
28		# ifdef __STDC__
29		# define VOID void
30		# else
31		# define VOID char
32		# endif
33		#endif
34	19
35	20	#include <stdio.h>
36	21	#include <ctype.h>

+92

-78

macosx/tkMacOSXPrivate.h less more

7	7	* See the file "license.terms" for information on usage and redistribution
8	8	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkMacOSXPrivate.h,v 1.8 2008/09/02 16:10:55 das Exp $
	10	* RCS: @(#) $Id: tkMacOSXPrivate.h,v 1.9 2008/10/27 11:55:45 dkf Exp $
11	11	*/
12	12
13	13	#ifndef _TKMACPRIV

16	16	#ifndef _TKMACINT
17	17	#include "tkMacOSXInt.h"
18	18	#endif
19
	19
20	20	/* Define constants only available on Mac OS X 10.3 or later */
21	21	#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
22	22	#define kEventAppAvailableWindowBoundsChanged 110

171	171	#define tk_if_mac_os_x_10_5 tk_if_mac_os_x_no
172	172	#define tk_else_mac_os_x_10_5 tk_else_mac_os_x_no
173	173	#endif /* MAC_OS_X_VERSION_MAX_ALLOWED */
174
	174
175	175	/*
176	176	* Macros for DEBUG_ASSERT_MESSAGE et al from Debugging.h.
177	177	*/

189	189	/*
190	190	* Macro to do debug message output.
191	191	*/
192		#define TkMacOSXDbgMsg(m, ...) do { \
193		fprintf(stderr, "%s:%d: %s(): " m "\n", strrchr(__FILE__, '/')+1, \
194		__LINE__, __func__, ##__VA_ARGS__); \
195		} while (0)
	192	#define TkMacOSXDbgMsg(m, ...) \
	193	do { \
	194	fprintf(stderr, "%s:%d: %s(): " m "\n", strrchr(__FILE__, '/')+1, \
	195	__LINE__, __func__, ##__VA_ARGS__); \
	196	} while (0)
	197
196	198	/*
197	199	* Macro to do debug API failure message output.
198	200	*/
199	201	#if !defined(DEBUGLEVEL) \|\| !DEBUGLEVEL
200		#define TkMacOSXDbgOSErr(f, err) do { \
201		TkMacOSXDbgMsg("%s failed: %ld", #f, err); \
202		} while (0)
	202	#define TkMacOSXDbgOSErr(f, err) \
	203	do { \
	204	TkMacOSXDbgMsg("%s failed: %ld", #f, err); \
	205	} while (0)
203	206	#else
204		#define TkMacOSXDbgOSErr(f, err) do { \
205		DEBUG_ASSERT_MESSAGE(kComponentSignatureString, #f " failed:", \
206		__func__, 0, strrchr(__FILE__, '/')+1, __LINE__, err); \
207		} while (0)
208		#endif
	207	#define TkMacOSXDbgOSErr(f, err) \
	208	do { \
	209	DEBUG_ASSERT_MESSAGE(kComponentSignatureString, #f " failed:", \
	210	__func__, 0, strrchr(__FILE__, '/')+1, __LINE__, err); \
	211	} while (0)
	212	#endif
	213
209	214	/*
210	215	* Macro to do very common check for noErr return from given API and output
211	216	* debug message in case of failure.

216	221	TkMacOSXDbgOSErr(f, err); \
217	222	} \
218	223	err;})
	224
219	225	/*
220	226	* Macro to check emptyness of shared QD tmp region before use in debug builds.
221	227	*/
222		#define TkMacOSXCheckTmpQdRgnEmpty() do { \
223		if (!EmptyRgn(tkMacOSXtmpQdRgn)) { \
224		Tcl_Panic("tkMacOSXtmpQdRgn nonempty"); \
225		} \
226		} while(0)
	228	#define TkMacOSXCheckTmpQdRgnEmpty() \
	229	do { \
	230	if (!EmptyRgn(tkMacOSXtmpQdRgn)) { \
	231	Tcl_Panic("tkMacOSXtmpQdRgn nonempty"); \
	232	} \
	233	} while(0)
227	234	#else /* TK_MAC_DEBUG */
228	235	#define TkMacOSXDbgMsg(m, ...)
229	236	#define TkMacOSXDbgOSErr(f, err)

241	248	symbol = TkMacOSXGetNamedSymbol(STRINGIFY(module), \
242	249	STRINGIFY(_##symbol)); \
243	250	}
244		MODULE_SCOPE void* TkMacOSXGetNamedSymbol(const char* module,
245		const char* symbol);
246
	251
247	252	/*
248	253	* Structure encapsulating current drawing environment.
249	254	*/

271	276	*/
272	277
273	278	#if 0
274		MODULE_SCOPE void TkMacOSXEmtpyRegion(TkRegion r);
275		MODULE_SCOPE int TkMacOSXIsEmptyRegion(TkRegion r);
276		#endif
277		MODULE_SCOPE HIShapeRef TkMacOSXGetNativeRegion(TkRegion r);
278		MODULE_SCOPE void TkMacOSXSetWithNativeRegion(TkRegion r, HIShapeRef rgn);
279		MODULE_SCOPE void TkMacOSXOffsetRegion(TkRegion r, short dx, short dy);
280		MODULE_SCOPE HIShapeRef TkMacOSXHIShapeCreateEmpty(void);
	279	MODULE_SCOPE void TkMacOSXEmtpyRegion(TkRegion r);
	280	MODULE_SCOPE int TkMacOSXIsEmptyRegion(TkRegion r);
	281	#endif
	282	MODULE_SCOPE HIShapeRef TkMacOSXGetNativeRegion(TkRegion r);
	283	MODULE_SCOPE void TkMacOSXSetWithNativeRegion(TkRegion r,
	284	HIShapeRef rgn);
	285	MODULE_SCOPE void TkMacOSXOffsetRegion(TkRegion r, short dx, short dy);
	286	MODULE_SCOPE HIShapeRef TkMacOSXHIShapeCreateEmpty(void);
281	287	MODULE_SCOPE HIMutableShapeRef TkMacOSXHIShapeCreateMutableWithRect(
282		const CGRect *inRect);
283		MODULE_SCOPE OSStatus TkMacOSXHIShapeSetWithShape(
284		HIMutableShapeRef inDestShape, HIShapeRef inSrcShape);
	288	const CGRect *inRect);
	289	MODULE_SCOPE OSStatus TkMacOSXHIShapeSetWithShape(
	290	HIMutableShapeRef inDestShape,
	291	HIShapeRef inSrcShape);
285	292	#if 0
286		MODULE_SCOPE OSStatus TkMacOSXHIShapeSetWithRect(HIMutableShapeRef inShape,
287		const CGRect *inRect);
288		#endif
289		MODULE_SCOPE OSStatus TkMacOSHIShapeDifferenceWithRect(
290		HIMutableShapeRef inShape, const CGRect *inRect);
291		MODULE_SCOPE OSStatus TkMacOSHIShapeUnionWithRect(HIMutableShapeRef inShape,
292		const CGRect *inRect);
293		MODULE_SCOPE OSStatus TkMacOSHIShapeUnion(HIShapeRef inShape1,
294		HIShapeRef inShape2, HIMutableShapeRef outResult);
	293	MODULE_SCOPE OSStatus TkMacOSXHIShapeSetWithRect(HIMutableShapeRef inShape,
	294	const CGRect *inRect);
	295	#endif
	296	MODULE_SCOPE OSStatus TkMacOSHIShapeDifferenceWithRect(
	297	HIMutableShapeRef inShape, const CGRect *inRect);
	298	MODULE_SCOPE OSStatus TkMacOSHIShapeUnionWithRect(HIMutableShapeRef inShape,
	299	const CGRect *inRect);
	300	MODULE_SCOPE OSStatus TkMacOSHIShapeUnion(HIShapeRef inShape1,
	301	HIShapeRef inShape2, HIMutableShapeRef outResult);
295	302
296	303	/*
297	304	* Prototypes of TkAqua internal procs.
298	305	*/
299	306
300		MODULE_SCOPE void TkMacOSXDisplayChanged(Display *display);
301		MODULE_SCOPE void TkMacOSXInitScrollbarMetrics(void);
302		MODULE_SCOPE int TkMacOSXUseAntialiasedText(Tcl_Interp *interp, int enable);
303		MODULE_SCOPE void TkMacOSXInitCarbonEvents(Tcl_Interp *interp);
304		MODULE_SCOPE int TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable,
305		int antiAlias);
306		MODULE_SCOPE void TkMacOSXInitKeyboard(Tcl_Interp *interp);
307		MODULE_SCOPE int TkMacOSXGenerateFocusEvent(Window window, int activeFlag);
308		MODULE_SCOPE int TkMacOSXGenerateParentMenuSelectEvent(MenuRef menu);
309		MODULE_SCOPE int TkMacOSXGenerateMenuSelectEvent(MenuRef menu,
310		MenuItemIndex index);
311		MODULE_SCOPE void TkMacOSXClearActiveMenu(MenuRef menu);
	307	MODULE_SCOPE void * TkMacOSXGetNamedSymbol(const char *module,
	308	const char *symbol);
	309	MODULE_SCOPE void TkMacOSXDisplayChanged(Display *display);
	310	MODULE_SCOPE void TkMacOSXInitScrollbarMetrics(void);
	311	MODULE_SCOPE int TkMacOSXUseAntialiasedText(Tcl_Interp *interp,
	312	int enable);
	313	MODULE_SCOPE void TkMacOSXInitCarbonEvents(Tcl_Interp *interp);
	314	MODULE_SCOPE int TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable,
	315	int antiAlias);
	316	MODULE_SCOPE void TkMacOSXInitKeyboard(Tcl_Interp *interp);
	317	MODULE_SCOPE int TkMacOSXGenerateFocusEvent(Window window,
	318	int activeFlag);
	319	MODULE_SCOPE int TkMacOSXGenerateParentMenuSelectEvent(MenuRef menu);
	320	MODULE_SCOPE int TkMacOSXGenerateMenuSelectEvent(MenuRef menu,
	321	MenuItemIndex index);
	322	MODULE_SCOPE void TkMacOSXClearActiveMenu(MenuRef menu);
312	323	MODULE_SCOPE WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
313		MODULE_SCOPE int TkMacOSXIsWindowZoomed(TkWindow *winPtr);
314		MODULE_SCOPE int TkGenerateButtonEventForXPointer(Window window);
	324	MODULE_SCOPE int TkMacOSXIsWindowZoomed(TkWindow *winPtr);
	325	MODULE_SCOPE int TkGenerateButtonEventForXPointer(Window window);
315	326	MODULE_SCOPE EventModifiers TkMacOSXModifierState(void);
316		MODULE_SCOPE int TkMacOSXSetupDrawingContext(Drawable d, GC gc, int useCG,
317		TkMacOSXDrawingContext *dcPtr);
318		MODULE_SCOPE void TkMacOSXRestoreDrawingContext(TkMacOSXDrawingContext *dcPtr);
319		MODULE_SCOPE void TkMacOSXSetColorInPort(unsigned long pixel, int fg,
320		PixPatHandle penPat, CGrafPtr port);
321		MODULE_SCOPE void TkMacOSXSetColorInContext(unsigned long pixel,
322		CGContextRef context);
323		MODULE_SCOPE int TkMacOSXRunTclEventLoop(void);
324		MODULE_SCOPE OSStatus TkMacOSXStartTclEventLoopCarbonTimer(void);
325		MODULE_SCOPE OSStatus TkMacOSXStopTclEventLoopCarbonTimer(void);
326		MODULE_SCOPE void TkMacOSXTrackingLoop(int tracking);
327		MODULE_SCOPE OSStatus TkMacOSXReceiveAndDispatchEvent(void);
328		MODULE_SCOPE void TkMacOSXInstallWindowCarbonEventHandler(Tcl_Interp *interp,
329		WindowRef window);
330		MODULE_SCOPE int TkMacOSXMakeFullscreen(TkWindow *winPtr, WindowRef window,
331		int fullscreen, Tcl_Interp *interp);
332		MODULE_SCOPE void TkMacOSXEnterExitFullscreen(TkWindow *winPtr, int active);
333		MODULE_SCOPE void TkMacOSXBringWindowForward(WindowRef wRef);
334		MODULE_SCOPE WindowRef TkMacOSXDrawableWindow(Drawable drawable);
335		MODULE_SCOPE void TkMacOSXWinCGBounds(TkWindow winPtr, CGRect bounds);
336		MODULE_SCOPE HIShapeRef TkMacOSXGetClipRgn(Drawable drawable);
337		MODULE_SCOPE Tcl_Obj* TkMacOSXGetStringObjFromCFString(CFStringRef str);
	327	MODULE_SCOPE int TkMacOSXSetupDrawingContext(Drawable d, GC gc,
	328	int useCG, TkMacOSXDrawingContext *dcPtr);
	329	MODULE_SCOPE void TkMacOSXRestoreDrawingContext(
	330	TkMacOSXDrawingContext *dcPtr);
	331	MODULE_SCOPE void TkMacOSXSetColorInPort(unsigned long pixel, int fg,
	332	PixPatHandle penPat, CGrafPtr port);
	333	MODULE_SCOPE void TkMacOSXSetColorInContext(unsigned long pixel,
	334	CGContextRef context);
	335	MODULE_SCOPE int TkMacOSXRunTclEventLoop(void);
	336	MODULE_SCOPE OSStatus TkMacOSXStartTclEventLoopCarbonTimer(void);
	337	MODULE_SCOPE OSStatus TkMacOSXStopTclEventLoopCarbonTimer(void);
	338	MODULE_SCOPE void TkMacOSXTrackingLoop(int tracking);
	339	MODULE_SCOPE OSStatus TkMacOSXReceiveAndDispatchEvent(void);
	340	MODULE_SCOPE void TkMacOSXInstallWindowCarbonEventHandler(
	341	Tcl_Interp *interp, WindowRef window);
	342	MODULE_SCOPE int TkMacOSXMakeFullscreen(TkWindow *winPtr,
	343	WindowRef window, int fullscreen,
	344	Tcl_Interp *interp);
	345	MODULE_SCOPE void TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
	346	int active);
	347	MODULE_SCOPE void TkMacOSXBringWindowForward(WindowRef wRef);
	348	MODULE_SCOPE WindowRef TkMacOSXDrawableWindow(Drawable drawable);
	349	MODULE_SCOPE void TkMacOSXWinCGBounds(TkWindow winPtr, CGRect bounds);
	350	MODULE_SCOPE HIShapeRef TkMacOSXGetClipRgn(Drawable drawable);
	351	MODULE_SCOPE Tcl_Obj * TkMacOSXGetStringObjFromCFString(CFStringRef str);
338	352
339	353	#endif /* _TKMACPRIV */

+50

-32

macosx/tkMacOSXRegion.c less more

6	6	* Copyright 2001, Apple Computer, Inc.
7	7	* Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
8	8	*
9		* See the file "license.terms" for information on usage and redistribution
10		* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11		*
12		* RCS: @(#) $Id: tkMacOSXRegion.c,v 1.11 2007/12/13 15:27:10 dgp Exp $
	9	* See the file "license.terms" for information on usage and redistribution of
	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
	11	*
	12	* RCS: @(#) $Id: tkMacOSXRegion.c,v 1.12 2008/10/27 11:55:45 dkf Exp $
13	13	*/
14	14
15	15	#include "tkMacOSXPrivate.h"

20	20	*
21	21	* TkCreateRegion --
22	22	*
23		* Implements the equivelent of the X window function
24		* XCreateRegion. See X window documentation for more details.
	23	* Implements the equivelent of the X window function XCreateRegion. See
	24	* Xwindow documentation for more details.
25	25	*
26	26	* Results:
27	27	* Returns an allocated region handle.

43	43	*
44	44	* TkDestroyRegion --
45	45	*
46		* Implements the equivelent of the X window function
47		* XDestroyRegion. See X window documentation for more details.
	46	* Implements the equivelent of the X window function XDestroyRegion. See
	47	* Xwindow documentation for more details.
48	48	*
49	49	* Results:
50	50	* None.

69	69	*
70	70	* TkIntersectRegion --
71	71	*
72		* Implements the equivalent of the X window function
73		* XIntersectRegion. See X window documentation for more details.
	72	* Implements the equivalent of the X window function XIntersectRegion.
	73	* See Xwindow documentation for more details.
74	74	*
75	75	* Results:
76	76	* None.

96	96	*
97	97	* TkSubtractRegion --
98	98	*
99		* Implements the equivalent of the X window function
100		* XSubtractRegion. See X window documentation for more details.
	99	* Implements the equivalent of the X window function XSubtractRegion.
	100	* See X window documentation for more details.
101	101	*
102	102	* Results:
103	103	* None.

124	124	* TkUnionRectWithRegion --
125	125	*
126	126	* Implements the equivelent of the X window function
127		* XUnionRectWithRegion. See X window documentation for more
128		* details.
	127	* XUnionRectWithRegion. See Xwindow documentation for more details.
129	128	*
130	129	* Results:
131	130	* None.

162	161	*
163	162	* TkRectInRegion --
164	163	*
165		* Implements the equivelent of the X window function
166		* XRectInRegion. See X window documentation for more details.
	164	* Implements the equivelent of the X window function XRectInRegion. See
	165	* Xwindow documentation for more details.
167	166	*
168	167	* Results:
169	168	* Returns RectanglePart or RectangleOut. Note that this is not a

217	216	#endif
218	217	CFRelease(sectRgn);
219	218	CFRelease(rectRgn);
220		) TK_ENDIF
	219	) TK_ENDIF;
221	220	return result;
222	221	}
223	222

226	225	*
227	226	* TkClipBox --
228	227	*
229		* Implements the equivelent of the X window function XClipBox.
230		* See X window documentation for more details.
	228	* Implements the equivelent of the X window function XClipBox. See
	229	* Xwindow documentation for more details.
231	230	*
232	231	* Results:
233	232	* None.

257	256	*
258	257	* TkpBuildRegionFromAlphaData --
259	258	*
260		* Set up a rectangle of the given region based on the supplied
261		* alpha data.
	259	* Set up a rectangle of the given region based on the supplied alpha
	260	* data.
262	261	*
263	262	* Results:
264	263	* None

289	288	for (y1 = 0; y1 < height; y1++) {
290	289	lineDataPtr = dataPtr;
291	290	for (x1 = 0; x1 < width; x1 = end) {
292		/* search for first non-transparent pixel */
	291	/*
	292	* Search for first non-transparent pixel.
	293	*/
	294
293	295	while ((x1 < width) && !*lineDataPtr) {
294	296	x1++;
295	297	lineDataPtr += pixelStride;
296	298	}
297	299	end = x1;
298		/* search for first transparent pixel */
	300
	301	/*
	302	* Search for first transparent pixel.
	303	*/
	304
299	305	while ((end < width) && *lineDataPtr) {
300	306	end++;
301	307	lineDataPtr += pixelStride;

508	514	CFRelease(rgn);
509	515	}
510	516	result = HIShapeCreateCopy(emptyRgn);
511		) TK_ENDIF
	517	) TK_ENDIF;
512	518
513	519	return result;
514	520	}

526	532
527	533	result = HIShapeCreateMutableCopy(rgn);
528	534	CFRelease(rgn);
529		) TK_ENDIF
	535	) TK_ENDIF;
530	536
531	537	return result;
532	538	}

545	551	if (result == noErr) {
546	552	result = HIShapeDifference(inSrcShape, inDestShape, inDestShape);
547	553	}
548		) TK_ENDIF
	554	) TK_ENDIF;
549	555
550	556	return result;
551	557	}

594	600
595	601	result = TkMacOSHIShapeUnion(rgn, inShape, inShape);
596	602	CFRelease(rgn);
597		) TK_ENDIF
	603	) TK_ENDIF;
598	604
599	605	return result;
600	606	}

610	616	TK_IF_HI_TOOLBOX (4,
611	617	result = HIShapeUnion(inShape1, inShape2, outResult);
612	618	) TK_ELSE_HI_TOOLBOX (4,
613		/* Workaround HIShapeUnion bug in 10.3 and earlier */
	619	/*
	620	* Workaround HIShapeUnion bug in 10.3 and earlier.
	621	*/
	622
614	623	HIShapeRef rgn = HIShapeCreateCopy(outResult);
615	624
616	625	result = HIShapeUnion(inShape1, inShape2, (HIMutableShapeRef) rgn);

621	630	}
622	631	}
623	632	CFRelease(rgn);
624		) TK_ENDIF
625
626		return result;
627		}
	633	) TK_ENDIF;
	634
	635	return result;
	636	}
	637
	638	/*
	639	* Local Variables:
	640	* mode: c
	641	* c-basic-offset: 4
	642	* fill-column: 78
	643	* coding: utf-8
	644	* End:
	645	*/

+2

-2

macosx/tkMacOSXScale.c less more

10	10	* See the file "license.terms" for information on usage and redistribution
11	11	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkMacOSXScale.c,v 1.15 2007/12/13 15:27:10 dgp Exp $
	13	* RCS: @(#) $Id: tkMacOSXScale.c,v 1.16 2008/12/09 21:22:56 dgp Exp $
14	14	*/
15	15
16	16	#include "tkMacOSXPrivate.h"

173	173	result = Tcl_VarEval(interp, scalePtr->command, " ", string, NULL);
174	174	if (result != TCL_OK) {
175	175	Tcl_AddErrorInfo(interp, "\n (command executed by scale)");
176		Tcl_BackgroundError(interp);
	176	Tcl_BackgroundException(interp, result);
177	177	}
178	178	Tcl_Release((ClientData) interp);
179	179	}

+12

-9

macosx/tkMacOSXScrlbr.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.27 2008/10/03 13:13:31 dkf Exp $
	14	* RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.29 2008/12/07 16:36:26 das Exp $
15	15	*/
16	16
17	17	#include "tkMacOSXPrivate.h"

327	327	*/
328	328
329	329	void
330		TkpConfigureScrollbar(scrollPtr)
331		register TkScrollbar scrollPtr; / Information about widget; may or
332		* may not already have values for
333		* some fields. */
	330	TkpConfigureScrollbar(
	331	register TkScrollbar *scrollPtr)
	332	/* Information about widget; may or may not
	333	* already have values for some fields. */
334	334	{
335	335	}
336	336

553	553	*/
554	554
555	555	static pascal void
556		ThumbActionProc(ControlRef theControl, ControlPartCode partCode)
	556	ThumbActionProc(
	557	ControlRef theControl,
	558	ControlPartCode partCode)
557	559	{
558	560	TkScrollbar scrollPtr = (TkScrollbar )(intptr_t)
559	561	GetControlReference(theControl);
560	562	MacScrollbar macScrollPtr = (MacScrollbar ) scrollPtr;
561	563	Tcl_DString cmdString;
562		int origValue, variant;
	564	/int origValue;/ /* dead code */
	565	int variant;
563	566	short trackBarSize;
564	567	double oldFirstFraction, newFirstFraction;
565	568	char valueString[40];

574	577	}
575	578
576	579	Tcl_DStringInit(&cmdString);
577		origValue = GetControl32BitValue(macScrollPtr->sbHandle);
	580	/origValue = GetControl32BitValue(macScrollPtr->sbHandle);/ /* dead code */
578	581	GetControlBounds(macScrollPtr->sbHandle, &trackRect);
579	582
580	583	if (scrollPtr->vertical) {

786	789
787	790	mouseDownPoint.h = where.h;
788	791	mouseDownPoint.v = where.v;
789		part = HandleControlClick(macScrollPtr->sbHandle, where,
	792	HandleControlClick(macScrollPtr->sbHandle, where,
790	793	TkMacOSXModifierState(), thumbActionProc);
791	794	} else if (part == kAppearancePartIndicator) {
792	795	/*

+6

-8

macosx/tkMacOSXSend.c less more

29	29	* See the file "license.terms" for information on usage and redistribution of
30	30	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
31	31	*
32		* RCS: @(#) $Id: tkMacOSXSend.c,v 1.10 2008/07/23 23:24:44 nijtmans Exp $
	32	* RCS: @(#) $Id: tkMacOSXSend.c,v 1.12 2008/12/07 16:36:26 das Exp $
33	33	*/
34	34
35	35	#include "tkMacOSXInt.h"

255	255	Tcl_IncrRefCount(resultObjPtr);
256	256	for (i = 0; ; ) {
257	257	result = Tcl_ListObjIndex(NULL, resultObjPtr, i, &interpNamePtr);
258		if (interpNamePtr == NULL) {
	258	if (result != TCL_OK \|\| interpNamePtr == NULL) {
259	259	break;
260	260	}
261	261	interpName = Tcl_GetString(interpNamePtr);

326	326	int objc, /* Number of arguments */
327	327	Tcl_Obj const objv[]) / The arguments */
328	328	{
329		const char *sendOptions[] = {"-async", "-displayof", "-", NULL};
	329	const char *const sendOptions[] = {"-async", "-displayof", "-", NULL};
330	330	char stringRep, destName;
331		int async = 0;
	331	/int async = 0;/
332	332	int i, index, firstArg;
333	333	RegisteredInterp *riPtr;
334		Tcl_Obj resultPtr, listObjPtr;
	334	Tcl_Obj *listObjPtr;
335	335	int result = TCL_OK;
336	336
337	337	for (i = 1; i < (objc - 1); ) {

342	342	return TCL_ERROR;
343	343	}
344	344	if (index == 0) {
345		async = 1;
	345	/async = 1;/
346	346	i++;
347	347	} else if (index == 1) {
348	348	i += 2;

362	362
363	363	destName = Tcl_GetString(objv[i]);
364	364	firstArg = i + 1;
365
366		resultPtr = Tcl_GetObjResult(interp);
367	365
368	366	/*
369	367	* See if the target interpreter is local. If so, execute the command

+341

-319

macosx/tkMacOSXSubwindows.c less more

6	6	* Copyright 2001, Apple Computer, Inc.
7	7	* Copyright (c) 2006-2008 Daniel A. Steffen <das@users.sourceforge.net>
8	8	*
9		* See the file "license.terms" for information on usage and redistribution
10		* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11		*
12		* RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.28 2008/06/19 00:14:10 das Exp $
	9	* See the file "license.terms" for information on usage and redistribution of
	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
	11	*
	12	* RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.29 2008/10/27 11:55:45 dkf Exp $
13	13	*/
14	14
15	15	#include "tkMacOSXPrivate.h"

26	26	* Prototypes for functions used only in this file.
27	27	*/
28	28
29		static void MoveResizeWindow(MacDrawable *macWin);
30		static void GenerateConfigureNotify(TkWindow *winPtr, int includeWin);
31		static void UpdateOffsets(TkWindow *winPtr, int deltaX, int deltaY);
32		static void NotifyVisibility(TkWindow winPtr, XEvent eventPtr);
33
	29	static void MoveResizeWindow(MacDrawable *macWin);
	30	static void GenerateConfigureNotify(TkWindow *winPtr,
	31	int includeWin);
	32	static void UpdateOffsets(TkWindow *winPtr, int deltaX,
	33	int deltaY);
	34	static void NotifyVisibility(TkWindow winPtr, XEvent eventPtr);
	35
	36	/*
	37	*----------------------------------------------------------------------
	38	*
	39	* AllocGWorld --
	40	* Simplifies the allocation of new drawable ports.
	41	*
	42	*----------------------------------------------------------------------
	43	*/
	44
	45	static inline void
	46	AllocGWorld(
	47	int width,
	48	int height,
	49	int mono,
	50	CGrafPtr *grafPtrPtr)
	51	{
	52	Rect bounds = {0, 0, height, width};
	53
	54	#ifdef __LITTLE_ENDIAN__
	55	ChkErr(NewGWorld, grafPtrPtr, mono ? 1 : 0, &bounds, NULL, NULL,
	56	kNativeEndianPixMap);
	57	#else
	58	ChkErr(NewGWorld, grafPtrPtr, mono ? 1 : 0, &bounds, NULL, NULL, 0);
	59	#endif
	60	}
34	61
35	62	/*
36	63	*----------------------------------------------------------------------

50	77
51	78	void
52	79	XDestroyWindow(
53		Display* display, /* Display. */
	80	Display display, / Display. */
54	81	Window window) /* Window. */
55	82	{
56	83	MacDrawable macWin = (MacDrawable ) window;
	84	WindowRef winRef;
57	85
58	86	/*
59		* Remove any dangling pointers that may exist if
60		* the window we are deleting is being tracked by
61		* the grab code.
	87	* Remove any dangling pointers that may exist if the window we are
	88	* deleting is being tracked by the grab code.
62	89	*/
63	90
64	91	TkPointerDeadWindow(macWin->winPtr);
65	92	macWin->toplevel->referenceCount--;
66	93
67		if (Tk_IsTopLevel(macWin->winPtr)) {
68		WindowRef winRef;
69		/*
70		* We are relying on the Activate Mac OS event to pass the
71		* focus away from a window that is getting Destroyed to the
72		* Front non-floating window. BUT we don't get activate events
73		* when a floating window is destroyed - since the front non-floating
74		* window doesn't in fact get activated... So maybe we can check here
75		* and if we are destroying a floating window, we can pass the focus
76		* back to the front non-floating window...
77		*/
78
79		if (macWin->grafPtr != NULL) {
80		TkWindow *focusPtr = TkGetFocusWin(macWin->winPtr);
81		if (focusPtr == NULL \|\| (focusPtr->mainPtr->winPtr == macWin->winPtr)) {
82		winRef = TkMacOSXDrawableWindow(window);
83		if (TkpIsWindowFloating (winRef)) {
84		Window window;
85
86		window = TkMacOSXGetXWindow(ActiveNonFloatingWindow());
87		if (window != None) {
88		TkMacOSXGenerateFocusEvent(window, 1);
89		}
90		}
91		}
92		}
93		if (macWin->visRgn) {
94		CFRelease(macWin->visRgn);
95		}
96		if (macWin->aboveVisRgn) {
97		CFRelease(macWin->aboveVisRgn);
98		}
99
100		/*
101		* Delete the Mac window and remove it from the windowTable.
102		* The window could be NULL if the window was never mapped.
103		* However, we don't do this for embedded windows, they don't
104		* go in the window list, and they do not own their portPtr's.
105		*/
106
107		if (!(Tk_IsEmbedded(macWin->winPtr))) {
108		WindowRef winRef = TkMacOSXDrawableWindow(window);
109
110		if (winRef) {
111		TkMacOSXWindowList listPtr, prevPtr;
112		WindowGroupRef group;
113
114		if (GetWindowProperty(winRef, 'Tk ', 'TsGp', sizeof(group),
115		NULL, &group) == noErr) {
116		TkDisplay *dispPtr = TkGetDisplayList();
117		ItemCount i = CountWindowGroupContents(group,
118		kWindowGroupContentsReturnWindows);
119
120		while (i > 0) {
121		WindowRef macWin;
122
123		ChkErr(GetIndexedWindow, group, i--, 0, &macWin);
124		if (macWin) {
125		WindowGroupRef newGroup = NULL;
126		Window window = TkMacOSXGetXWindow(macWin);
127
128		if (window != None) {
129		TkWindow * winPtr = (TkWindow *)Tk_IdToWindow(
130		dispPtr->display, window);
131
132		if (winPtr && winPtr->wmInfoPtr) {
133		newGroup = GetWindowGroupOfClass(
134		winPtr->wmInfoPtr->macClass);
135		}
136		}
137		if (!newGroup) {
138		newGroup = GetWindowGroupOfClass(
139		kDocumentWindowClass);
140		}
141		ChkErr(SetWindowGroup, macWin, newGroup);
142		}
143
144		}
145		ChkErr(SetWindowGroupOwner, group, NULL);
146		ChkErr(ReleaseWindowGroup, group);
147		}
148		TkMacOSXUnregisterMacWindow(winRef);
149		DisposeWindow(winRef);
150
151		for (listPtr = tkMacOSXWindowListPtr, prevPtr = NULL;
152		tkMacOSXWindowListPtr != NULL;
153		prevPtr = listPtr, listPtr = listPtr->nextPtr) {
154		if (listPtr->winPtr == macWin->winPtr) {
155		if (prevPtr == NULL) {
156		tkMacOSXWindowListPtr = listPtr->nextPtr;
157		} else {
158		prevPtr->nextPtr = listPtr->nextPtr;
159		}
160		ckfree((char *) listPtr);
161		break;
162		}
163		}
164		}
165		}
166
167		macWin->grafPtr = NULL;
168
169		/*
170		* Delay deletion of a toplevel data structure untill all
171		* children have been deleted.
172		*/
173		if (macWin->toplevel->referenceCount == 0) {
174		ckfree((char *) macWin->toplevel);
175		}
176		} else {
	94	if (!Tk_IsTopLevel(macWin->winPtr)) {
177	95	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
178	96	if (macWin->winPtr->parentPtr != NULL) {
179	97	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);

189	107	ckfree((char *) macWin->toplevel);
190	108	}
191	109	ckfree((char *) macWin);
	110	return;
	111	}
	112
	113	/*
	114	* We are relying on the Activate Mac OS event to pass the focus away from
	115	* a window that is getting Destroyed to the Front non-floating window. BUT
	116	* we don't get activate events when a floating window is destroyed, since
	117	* the front non-floating window doesn't in fact get activated... So maybe
	118	* we can check here and if we are destroying a floating window, we can
	119	* pass the focus back to the front non-floating window...
	120	*/
	121
	122	if (macWin->grafPtr != NULL) {
	123	TkWindow *focusPtr = TkGetFocusWin(macWin->winPtr);
	124
	125	if (focusPtr == NULL
	126	\|\| (focusPtr->mainPtr->winPtr == macWin->winPtr)) {
	127	winRef = TkMacOSXDrawableWindow(window);
	128	if (TkpIsWindowFloating (winRef)) {
	129	Window window = TkMacOSXGetXWindow(ActiveNonFloatingWindow());
	130
	131	if (window != None) {
	132	TkMacOSXGenerateFocusEvent(window, 1);
	133	}
	134	}
	135	}
	136	}
	137	if (macWin->visRgn) {
	138	CFRelease(macWin->visRgn);
	139	}
	140	if (macWin->aboveVisRgn) {
	141	CFRelease(macWin->aboveVisRgn);
	142	}
	143
	144	/*
	145	* Delete the Mac window and remove it from the windowTable. The window
	146	* could be NULL if the window was never mapped. However, we don't do this
	147	* for embedded windows, they don't go in the window list, and they do not
	148	* own their portPtr's.
	149	*/
	150
	151	if (!Tk_IsEmbedded(macWin->winPtr)) {
	152	WindowRef winRef = TkMacOSXDrawableWindow(window);
	153
	154	if (winRef) {
	155	TkMacOSXWindowList listPtr, prevPtr;
	156	WindowGroupRef group;
	157
	158	if (GetWindowProperty(winRef, 'Tk ', 'TsGp', sizeof(group), NULL,
	159	&group) == noErr) {
	160	TkDisplay *dispPtr = TkGetDisplayList();
	161	ItemCount i = CountWindowGroupContents(group,
	162	kWindowGroupContentsReturnWindows);
	163	WindowRef macWin;
	164	WindowGroupRef newGroup;
	165	Window window;
	166
	167	while (i > 0) {
	168	ChkErr(GetIndexedWindow, group, i--, 0, &macWin);
	169	if (!macWin) {
	170	continue;
	171	}
	172
	173	window = TkMacOSXGetXWindow(macWin);
	174	newGroup = NULL;
	175	if (window != None) {
	176	TkWindow winPtr = (TkWindow )
	177	Tk_IdToWindow(dispPtr->display, window);
	178
	179	if (winPtr && winPtr->wmInfoPtr) {
	180	newGroup = GetWindowGroupOfClass(
	181	winPtr->wmInfoPtr->macClass);
	182	}
	183	}
	184	if (!newGroup) {
	185	newGroup =
	186	GetWindowGroupOfClass(kDocumentWindowClass);
	187	}
	188	ChkErr(SetWindowGroup, macWin, newGroup);
	189	}
	190	ChkErr(SetWindowGroupOwner, group, NULL);
	191	ChkErr(ReleaseWindowGroup, group);
	192	}
	193	TkMacOSXUnregisterMacWindow(winRef);
	194	DisposeWindow(winRef);
	195
	196	for (listPtr=tkMacOSXWindowListPtr, prevPtr=NULL;
	197	tkMacOSXWindowListPtr != NULL;
	198	prevPtr=listPtr, listPtr=listPtr->nextPtr) {
	199	if (listPtr->winPtr == macWin->winPtr) {
	200	if (prevPtr == NULL) {
	201	tkMacOSXWindowListPtr = listPtr->nextPtr;
	202	} else {
	203	prevPtr->nextPtr = listPtr->nextPtr;
	204	}
	205	ckfree((char *) listPtr);
	206	break;
	207	}
	208	}
	209	}
	210	}
	211
	212	macWin->grafPtr = NULL;
	213
	214	/*
	215	* Delay deletion of a toplevel data structure untill all children have
	216	* been deleted.
	217	*/
	218
	219	if (macWin->toplevel->referenceCount == 0) {
	220	ckfree((char *) macWin->toplevel);
192	221	}
193	222	}
194	223

197	226	*
198	227	* XMapWindow --
199	228	*
200		* Map the given X Window to the screen. See X window documentation
201		* for more details.
	229	* Map the given X Window to the screen. See X window documentation for
	230	* more details.
202	231	*
203	232	* Results:
204	233	* None.

211	240
212	241	void
213	242	XMapWindow(
214		Display* display, /* Display. */
	243	Display display, / Display. */
215	244	Window window) /* Window. */
216	245	{
217	246	MacDrawable macWin = (MacDrawable ) window;
218	247	XEvent event;
219	248
220	249	/*
221		* Under certain situations it's possible for this function to be
222		* called before the toplevel window it's associated with has actually
223		* been mapped. In that case we need to create the real Macintosh
224		* window now as this function as well as other X functions assume that
225		* the portPtr is valid.
	250	* Under certain situations it's possible for this function to be called
	251	* before the toplevel window it's associated with has actually been
	252	* mapped. In that case we need to create the real Macintosh window now as
	253	* this function as well as other X functions assume that the portPtr is
	254	* valid.
226	255	*/
	256
227	257	if (!TkMacOSXHostToplevelExists(macWin->toplevel->winPtr)) {
228	258	TkMacOSXMakeRealWindowExist(macWin->toplevel->winPtr);
229	259	}

236	266	* XXX This should be ShowSheetWindow for kSheetWindowClass
237	267	* XXX windows that have a wmPtr->master parent set.
238	268	*/
	269
239	270	WindowRef wRef = TkMacOSXDrawableWindow(window);
240	271
241	272	if ((macWin->winPtr->wmInfoPtr->macClass == kSheetWindowClass)

249	280	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr);
250	281
251	282	/*
252		* We only need to send the MapNotify event
253		* for toplevel windows.
	283	* We only need to send the MapNotify event for toplevel windows.
254	284	*/
255	285
256	286	event.xany.serial = display->request;

264	294	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
265	295	} else {
266	296	/*
267		* Generate damage for that area of the window
	297	* Generate damage for that area of the window.
268	298	*/
269	299
270	300	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);

321	351	*
322	352	* XUnmapWindow --
323	353	*
324		* Unmap the given X Window to the screen. See X window
325		* documentation for more details.
	354	* Unmap the given X Window to the screen. See X window documentation for
	355	* more details.
326	356	*
327	357	* Results:
328	358	* None.

335	365
336	366	void
337	367	XUnmapWindow(
338		Display* display, /* Display. */
	368	Display display, / Display. */
339	369	Window window) /* Window. */
340	370	{
341	371	MacDrawable macWin = (MacDrawable ) window;

344	374	display->request++;
345	375	macWin->winPtr->flags &= ~TK_MAPPED;
346	376	if (Tk_IsTopLevel(macWin->winPtr)) {
347		if (!Tk_IsEmbedded(macWin->winPtr)
348		&& macWin->winPtr->wmInfoPtr->hints.initial_state != IconicState) {
	377	if (!Tk_IsEmbedded(macWin->winPtr) &&
	378	macWin->winPtr->wmInfoPtr->hints.initial_state!=IconicState) {
349	379	/*
350	380	* XXX This should be HideSheetWindow for kSheetWindowClass
351	381	* XXX windows that have a wmPtr->master parent set.
352	382	*/
	383
353	384	WindowRef wref = TkMacOSXDrawableWindow(window);
354	385
355	386	if ((macWin->winPtr->wmInfoPtr->macClass == kSheetWindowClass)

362	393	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr);
363	394
364	395	/*
365		* We only need to send the UnmapNotify event
366		* for toplevel windows.
	396	* We only need to send the UnmapNotify event for toplevel windows.
367	397	*/
	398
368	399	event.xany.serial = display->request;
369	400	event.xany.send_event = False;
370	401	event.xany.display = display;

389	420	*
390	421	* XResizeWindow --
391	422	*
392		* Resize a given X window. See X windows documentation for
393		* further details.
	423	* Resize a given X window. See X windows documentation for further
	424	* details.
394	425	*
395	426	* Results:
396	427	* None.

403	434
404	435	void
405	436	XResizeWindow(
406		Display* display, /* Display. */
	437	Display display, / Display. */
407	438	Window window, /* Window. */
408	439	unsigned int width,
409	440	unsigned int height)

446	477
447	478	void
448	479	XMoveResizeWindow(
449		Display* display, /* Display. */
	480	Display display, / Display. */
450	481	Window window, /* Window. */
451	482	int x, int y,
452	483	unsigned int width,
453	484	unsigned int height)
454	485	{
455		MacDrawable * macWin = (MacDrawable *) window;
	486	MacDrawable macWin = (MacDrawable ) window;
456	487
457	488	display->request++;
458	489	if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {

491	522
492	523	void
493	524	XMoveWindow(
494		Display* display, /* Display. */
	525	Display display, / Display. */
495	526	Window window, /* Window. */
496		int x,
497		int y)
	527	int x, int y)
498	528	{
499	529	MacDrawable macWin = (MacDrawable ) window;
500	530

537	567	/*
538	568	* Find the Parent window, for an embedded window it will be its container.
539	569	*/
	570
540	571	if (Tk_IsEmbedded(macWin->winPtr)) {
541	572	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->winPtr);
542	573

544	575	macParent = contWinPtr->privatePtr;
545	576	} else {
546	577	/*
547		* Here we should handle out of process embedding.
548		* At this point, we are assuming that the changes.x,y is not
549		* maintained, if you need the info get it from Tk_GetRootCoords,
550		* and that the toplevel sits at 0,0 when it is drawn.
	578	* Here we should handle out of process embedding. At this point,
	579	* we are assuming that the changes.x,y is not maintained, if you
	580	* need the info get it from Tk_GetRootCoords, and that the
	581	* toplevel sits at 0,0 when it is drawn.
551	582	*/
552	583	}
553	584	} else {

558	589	macParent = macWin->winPtr->parentPtr->privatePtr;
559	590	parentBorderwidth = macWin->winPtr->parentPtr->changes.border_width;
560	591	}
	592
561	593	if (macParent) {
562	594	deltaX = macParent->xOff + parentBorderwidth +
563	595	macWin->winPtr->changes.x - macWin->xOff;

582	614	*
583	615	* GenerateConfigureNotify --
584	616	*
585		* Generates ConfigureNotify events for all the child widgets
586		* of the widget passed in the winPtr parameter. If includeWin
587		* is true, also generates ConfigureNotify event for the
588		* widget itself.
	617	* Generates ConfigureNotify events for all the child widgets of the
	618	* widget passed in the winPtr parameter. If includeWin is true, also
	619	* generates ConfigureNotify event for the widget itself.
589	620	*
590	621	* Results:
591	622	* None.

597	628	*/
598	629
599	630	static void
600		GenerateConfigureNotify (TkWindow *winPtr, int includeWin)
	631	GenerateConfigureNotify(
	632	TkWindow *winPtr,
	633	int includeWin)
601	634	{
602	635	TkWindow *childPtr;
603	636
604	637	for (childPtr = winPtr->childList; childPtr != NULL;
605		childPtr = childPtr->nextPtr) {
	638	childPtr = childPtr->nextPtr) {
606	639	if (!Tk_IsMapped(childPtr) \|\| Tk_IsTopLevel(childPtr)) {
607	640	continue;
608	641	}

631	664
632	665	void
633	666	XRaiseWindow(
634		Display* display, /* Display. */
	667	Display display, / Display. */
635	668	Window window) /* Window. */
636	669	{
637	670	MacDrawable macWin = (MacDrawable ) window;

665	698
666	699	void
667	700	XLowerWindow(
668		Display* display, /* Display. */
	701	Display display, / Display. */
669	702	Window window) /* Window. */
670	703	{
671	704	MacDrawable macWin = (MacDrawable ) window;

686	719	*
687	720	* XConfigureWindow --
688	721	*
689		* Change the size, position, stacking, or border of the specified
690		* window.
691		*
692		* Results:
693		* None.
694		*
695		* Side effects:
696		* Changes the attributes of the specified window. Note that we
697		* ignore the passed in values and use the values stored in the
698		* TkWindow data structure.
	722	* Change the size, position, stacking, or border of the specified window.
	723	*
	724	* Results:
	725	* None.
	726	*
	727	* Side effects:
	728	* Changes the attributes of the specified window. Note that we ignore the
	729	* passed in values and use the values stored in the TkWindow data
	730	* structure.
699	731	*
700	732	*----------------------------------------------------------------------
701	733	*/
702	734
703	735	void
704	736	XConfigureWindow(
705		Display* display, /* Display. */
	737	Display display, / Display. */
706	738	Window w, /* Window. */
707	739	unsigned int value_mask,
708		XWindowChanges* values)
	740	XWindowChanges *values)
709	741	{
710	742	MacDrawable macWin = (MacDrawable ) w;
711	743	TkWindow *winPtr = macWin->winPtr;

722	754	}
723	755
724	756	/*
725		* Change the stacking order of the window. Tk actuall keeps all
726		* the information we need for stacking order. All we need to do
727		* is make sure the clipping regions get updated and generate damage
728		* that will ensure things get drawn correctly.
	757	* Change the stacking order of the window. Tk actually keeps all the
	758	* information we need for stacking order. All we need to do is make sure
	759	* the clipping regions get updated and generate damage that will ensure
	760	* things get drawn correctly.
729	761	*/
730	762
731	763	if (value_mask & CWStackMode) {

748	780	*
749	781	* TkMacOSXUpdateClipRgn --
750	782	*
751		* This function updates the cliping regions for a given window
752		* and all of its children. Once updated the TK_CLIP_INVALID flag
753		* in the subwindow data structure is unset. The TK_CLIP_INVALID
754		* flag should always be unset before any drawing is attempted.
	783	* This function updates the cliping regions for a given window and all of
	784	* its children. Once updated the TK_CLIP_INVALID flag in the subwindow
	785	* data structure is unset. The TK_CLIP_INVALID flag should always be
	786	* unset before any drawing is attempted.
755	787	*
756	788	* Results:
757	789	* None.

788	820	rgn = TkMacOSXHIShapeCreateMutableWithRect(&bounds);
789	821
790	822	/*
791		* Clip away the area of any windows that may obscure this
792		* window.
	823	* Clip away the area of any windows that may obscure this window.
793	824	* For a non-toplevel window, first, clip to the parents visible
794		* clip region.
795		* Second, clip away any siblings that are higher in the
796		* stacking order.
797		* For an embedded toplevel, just clip to the container's visible
798		* clip region. Remember, we only allow one contained window
799		* in a frame, and don't support any other widgets in the frame
800		* either. This is not currently enforced, however.
	825	* clip region. Second, clip away any siblings that are higher in
	826	* the stacking order. For an embedded toplevel, just clip to the
	827	* container's visible clip region. Remember, we only allow one
	828	* contained window in a frame, and don't support any other widgets
	829	* in the frame either. This is not currently enforced, however.
801	830	*/
802	831
803	832	if (!Tk_IsTopLevel(winPtr)) {
804	833	TkMacOSXUpdateClipRgn(winPtr->parentPtr);
805	834	if (winPtr->parentPtr) {
806	835	ChkErr(HIShapeIntersect,
807		winPtr->parentPtr->privatePtr->aboveVisRgn, rgn,
808		rgn);
	836	winPtr->parentPtr->privatePtr->aboveVisRgn,
	837	rgn, rgn);
809	838	}
810	839	win2Ptr = winPtr;
811	840	while ((win2Ptr = win2Ptr->nextPtr)) {

853	882	macWin->aboveVisRgn = HIShapeCreateCopy(rgn);
854	883
855	884	/*
856		* The final clip region is the aboveVis region (or visible
857		* region) minus all the children of this window.
858		* If the window is a container, we must also subtract the region
859		* of the embedded window.
	885	* The final clip region is the aboveVis region (or visible region)
	886	* minus all the children of this window. If the window is a
	887	* container, we must also subtract the region of the embedded
	888	* window.
860	889	*/
861	890
862	891	win2Ptr = winPtr->childList;

885	914	* TODO: Here we should handle out of process embedding.
886	915	*/
887	916	}
	917
888	918	if (rgnChanged) {
889	919	HIShapeRef diffRgn = HIShapeCreateDifference(
890	920	macWin->aboveVisRgn, rgn);

928	958	*
929	959	* TkMacOSXVisableClipRgn --
930	960	*
931		* This function returnd the Macintosh cliping region for the
932		* given window. A NULL Rgn means the window is not visible.
	961	* This function returnd the Macintosh cliping region for the given
	962	* window. A NULL Rgn means the window is not visible.
933	963	*
934	964	* Results:
935	965	* The region.

961	991	*
962	992	* TkMacOSXInvalidateWindow --
963	993	*
964		* This function makes the window as invalid will generate damage
965		* for the window.
	994	* This function makes the window as invalid will generate damage for the
	995	* window.
966	996	*
967	997	* Results:
968	998	* None.

1037	1067	* This function returns the Graphics Port for a given X drawable.
1038	1068	*
1039	1069	* Results:
1040		* A CGrafPort . Either an off screen pixmap or a Window.
	1070	* A CGrafPort. Either an off screen pixmap or a Window.
1041	1071	*
1042	1072	* Side effects:
1043	1073	* None.

1052	1082	MacDrawable macWin = (MacDrawable ) drawable;
1053	1083	CGrafPtr resultPort = NULL;
1054	1084
1055		if (macWin) {
1056		if (macWin->toplevel) {
	1085	if (!macWin) {
	1086	return NULL;
	1087	}
	1088
	1089	/*
	1090	* Handle toplevel windows.
	1091	*/
	1092
	1093	if (macWin->toplevel) {
	1094	TkWindow *contWinPtr;
	1095
	1096	if (!(macWin->toplevel->flags & TK_EMBEDDED)) {
	1097	return macWin->toplevel->grafPtr;
	1098	}
	1099
	1100	/*
	1101	* If the Drawable is in an embedded window, use the Port of its
	1102	* container.
	1103	*
	1104	* TRICKY POINT: we can have cases when a toplevel is being destroyed
	1105	* where the winPtr for the toplevel has been freed, but the children
	1106	* are not all the way destroyed. The children will call this function
	1107	* as they are being destroyed, but Tk_IsEmbedded will return garbage.
	1108	* So we check the copy of the TK_EMBEDDED flag we put into the
	1109	* toplevel's macWin flags.
	1110	*/
	1111
	1112	contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
	1113
	1114	resultPort = NULL;
	1115	if (contWinPtr != NULL) {
	1116	resultPort = TkMacOSXGetDrawablePort((Drawable)
	1117	contWinPtr->privatePtr);
	1118	} else if (tkMacOSXEmbedHandler != NULL) {
	1119	resultPort = tkMacOSXEmbedHandler->getPortProc((Tk_Window)
	1120	macWin->winPtr);
	1121	}
	1122
	1123	if (!resultPort) {
1057	1124	/*
1058		* If the Drawable is in an embedded window, use the Port of its
1059		* container.
1060		*
1061		* TRICKY POINT: we can have cases when a toplevel is being
1062		* destroyed where the winPtr for the toplevel has been freed, but
1063		* the children are not all the way destroyed. The children will
1064		* call this function as they are being destroyed, but
1065		* Tk_IsEmbedded will return garbage. So we check the copy of the
1066		* TK_EMBEDDED flag we put into the toplevel's macWin flags.
	1125	* FIXME: So far as I can tell, the only time that this happens is
	1126	* when we are tearing down an embedded child interpreter, and most
	1127	* of the time, this is harmless... However, we really need to find
	1128	* why the embedding loses.
1067	1129	*/
1068	1130
1069		if (macWin->toplevel->flags & TK_EMBEDDED) {
1070		TkWindow *contWinPtr;
1071
1072		contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
1073
1074		if (contWinPtr != NULL) {
1075		resultPort = TkMacOSXGetDrawablePort(
1076		(Drawable) contWinPtr->privatePtr);
1077		} else if (tkMacOSXEmbedHandler != NULL) {
1078		resultPort = tkMacOSXEmbedHandler->getPortProc(
1079		(Tk_Window) macWin->winPtr);
1080		}
1081
1082		if (!resultPort) {
1083		/*
1084		* FIXME: So far as I can tell, the only time that this
1085		* happens is when we are tearing down an embedded child
1086		* interpreter, and most of the time, this is harmless...
1087		* However, we really need to find why the embedding loses.
1088		*/
1089		TkMacOSXDbgMsg("Couldn't find container");
1090		}
1091
1092		/*
1093		* TODO: Here we should handle out of process embedding.
1094		*/
1095		} else {
1096		resultPort = macWin->toplevel->grafPtr;
1097		}
1098		} else {
1099		if ((macWin->flags & TK_IS_PIXMAP) && !macWin->grafPtr) {
1100		Rect bounds = {0, 0, macWin->size.height, macWin->size.width};
1101
1102		ChkErr(NewGWorld, &macWin->grafPtr,
1103		(macWin->flags & TK_IS_BW_PIXMAP) ? 1 : 0,
1104		&bounds, NULL, NULL, 0
1105		#ifdef __LITTLE_ENDIAN__
1106		\| kNativeEndianPixMap
1107		#endif
1108		);
1109		}
1110		resultPort = macWin->grafPtr;
1111		}
1112		}
1113
1114		return resultPort;
	1131	TkMacOSXDbgMsg("Couldn't find container");
	1132	}
	1133
	1134	/*
	1135	* TODO: Here we should handle out of process embedding.
	1136	*/
	1137
	1138	return resultPort;
	1139	}
	1140
	1141	if ((macWin->flags & TK_IS_PIXMAP) && !macWin->grafPtr) {
	1142	AllocGWorld(macWin->size.width, macWin->size.height,
	1143	macWin->flags & TK_IS_BW_PIXMAP, &macWin->grafPtr);
	1144	}
	1145	return macWin->grafPtr;
1115	1146	}
1116	1147
1117	1148	/*

1137	1168	/*
1138	1169	* will probably need to fix this up for embedding
1139	1170	*/
	1171
1140	1172	MacDrawable macWin = (MacDrawable ) drawable;
1141		ControlRef result = NULL;
	1173	TkWindow *contWinPtr;
1142	1174
1143	1175	if (macWin == NULL) {
1144	1176	return NULL;
1145	1177	}
	1178
1146	1179	if (!(macWin->toplevel->flags & TK_EMBEDDED)) {
1147	1180	return macWin->toplevel->rootControl;
1148		} else {
1149		TkWindow *contWinPtr;
1150
1151		contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
1152
1153		if (contWinPtr != NULL) {
1154		result = TkMacOSXGetRootControl(
1155		(Drawable) contWinPtr->privatePtr);
1156		} else if (tkMacOSXEmbedHandler != NULL) {
1157		result = NULL;
1158		}
1159		}
1160		return result;
	1181	}
	1182
	1183	contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
	1184	if (contWinPtr == NULL) {
	1185	return NULL;
	1186	}
	1187
	1188	return TkMacOSXGetRootControl((Drawable) contWinPtr->privatePtr);
1161	1189	}
1162	1190
1163	1191	/*

1165	1193	*
1166	1194	* TkMacOSXInvalClipRgns --
1167	1195	*
1168		* This function invalidates the clipping regions for a given
1169		* window and all of its children. This function should be
1170		* called whenever changes are made to subwindows that would
1171		* affect the size or position of windows.
1172		*
1173		* Results:
1174		* None.
1175		*
1176		* Side effects:
1177		* The cliping regions for the window and its children are
1178		* mark invalid. (Make sure they are valid before drawing.)
	1196	* This function invalidates the clipping regions for a given window and
	1197	* all of its children. This function should be called whenever changes
	1198	* are made to subwindows that would affect the size or position of
	1199	* windows.
	1200	*
	1201	* Results:
	1202	* None.
	1203	*
	1204	* Side effects:
	1205	* The cliping regions for the window and its children are mark invalid.
	1206	* (Make sure they are valid before drawing.)
1179	1207	*
1180	1208	*----------------------------------------------------------------------
1181	1209	*/

1189	1217	MacDrawable *macWin = winPtr->privatePtr;
1190	1218
1191	1219	/*
1192		* If already marked we can stop because all
1193		* decendants will also already be marked.
	1220	* If already marked we can stop because all descendants will also already
	1221	* be marked.
1194	1222	*/
	1223
1195	1224	if (!macWin \|\| macWin->flags & TK_CLIP_INVALID) {
1196	1225	return;
1197	1226	}

1207	1236	}
1208	1237
1209	1238	/*
1210		* Invalidate clip regions for all children &
1211		* their decendants - unless the child is a toplevel.
	1239	* Invalidate clip regions for all children & their descendants, unless the
	1240	* child is a toplevel.
1212	1241	*/
	1242
1213	1243	childPtr = winPtr->childList;
1214	1244	while (childPtr) {
1215	1245	if (!Tk_IsTopLevel(childPtr)) {

1219	1249	}
1220	1250
1221	1251	/*
1222		* Also, if the window is a container, mark its embedded window
	1252	* Also, if the window is a container, mark its embedded window.
1223	1253	*/
1224	1254
1225	1255	if (Tk_IsContainer(winPtr)) {

1240	1270	*
1241	1271	* TkMacOSXWinBounds --
1242	1272	*
1243		* Given a Tk window this function determines the windows
1244		* bounds in relation to the Macintosh window's coordinate
1245		* system. This is also the same coordinate system as the
1246		* Tk toplevel window in which this window is contained.
	1273	* Given a Tk window this function determines the windows bounds in
	1274	* relation to the Macintosh window's coordinate system. This is also the
	1275	* same coordinate system as the Tk toplevel window in which this window
	1276	* is contained.
1247	1277	*
1248	1278	* Results:
1249	1279	* None.

1270	1300	*
1271	1301	* TkMacOSXWinCGBounds --
1272	1302	*
1273		* Given a Tk window this function determines the windows
1274		* bounds in relation to the Macintosh window's coordinate
1275		* system. This is also the same coordinate system as the
1276		* Tk toplevel window in which this window is contained.
	1303	* Given a Tk window this function determines the windows bounds in
	1304	* relation to the Macintosh window's coordinate system. This is also the
	1305	* same coordinate system as the Tk toplevel window in which this window
	1306	* is contained.
1277	1307	*
1278	1308	* Results:
1279	1309	* None.

1300	1330	*
1301	1331	* UpdateOffsets --
1302	1332	*
1303		* Updates the X & Y offsets of the given TkWindow from the
1304		* TopLevel it is a decendant of.
1305		*
1306		* Results:
1307		* None.
1308		*
1309		* Side effects:
1310		* The xOff & yOff fields for the Mac window datastructure
1311		* is updated to the proper offset.
	1333	* Updates the X & Y offsets of the given TkWindow from the TopLevel it is
	1334	* a decendant of.
	1335	*
	1336	* Results:
	1337	* None.
	1338	*
	1339	* Side effects:
	1340	* The xOff & yOff fields for the Mac window datastructure is updated to
	1341	* the proper offset.
1312	1342	*
1313	1343	*----------------------------------------------------------------------
1314	1344	*/

1323	1353
1324	1354	if (winPtr->privatePtr == NULL) {
1325	1355	/*
1326		* We haven't called Tk_MakeWindowExist for this window yet. The
1327		* offset information will be postponed and calulated at that
1328		* time. (This will usually only happen when a mapped parent is
1329		* being moved but has child windows that have yet to be mapped.)
	1356	* We haven't called Tk_MakeWindowExist for this window yet. The offset
	1357	* information will be postponed and calulated at that time. (This will
	1358	* usually only happen when a mapped parent is being moved but has
	1359	* child windows that have yet to be mapped.)
1330	1360	*/
	1361
1331	1362	return;
1332	1363	}
1333	1364

1396	1427	macPix->grafPtr = NULL;
1397	1428	macPix->context = NULL;
1398	1429	macPix->size = CGSizeMake(width, height);
1399		{
1400		Rect bounds = {0, 0, height, width};
1401
1402		ChkErr(NewGWorld, &macPix->grafPtr, depth == 1 ? 1 : 0, &bounds, NULL,
1403		NULL, 0
1404		#ifdef __LITTLE_ENDIAN__
1405		\| kNativeEndianPixMap
1406		#endif
1407		);
1408		}
	1430	AllocGWorld(width, height, depth==1, &macPix->grafPtr);
1409	1431
1410	1432	return (Pixmap) macPix;
1411	1433	}

+2

-2

macosx/tkMacOSXWindowEvent.c less more

47	47	* permission to use and distribute the software in accordance with the
48	48	* terms specified in this license.
49	49	*
50		* RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.33 2008/10/05 21:26:11 dkf Exp $
	50	* RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.35 2008/12/10 02:51:16 das Exp $
51	51	*/
52	52
53	53	#include "tkMacOSXPrivate.h"

890	890	Tcl_AddErrorInfo(interp,
891	891	Tk_GetAtomName((Tk_Window) winPtr, protocol));
892	892	Tcl_AddErrorInfo(interp, "\" window manager protocol)");
893		Tk_BackgroundError(interp);
	893	Tcl_BackgroundException(interp, result);
894	894	}
895	895	Tcl_Release(interp);
896	896	Tcl_Release(protPtr);

+110

-105

macosx/tkMacOSXWm.c less more

12	12	* See the file "license.terms" for information on usage and redistribution of
13	13	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
14	14	*
15		* RCS: @(#) $Id: tkMacOSXWm.c,v 1.69 2008/10/08 15:39:13 dgp Exp $
	15	* RCS: @(#) $Id: tkMacOSXWm.c,v 1.73 2008/12/07 16:36:26 das Exp $
16	16	*/
17	17
18	18	#include "tkMacOSXPrivate.h"

36	36	_WMATT_LAST_ATTRIBUTE
37	37	} WmAttribute;
38	38
39		static const char *WmAttributeNames[] = {
	39	static const char *const WmAttributeNames[] = {
40	40	"-alpha", "-fullscreen", "-modified", "-notify",
41	41	"-titlepath", "-topmost", "-transparent",
42	42	NULL

210	210	int *maxHeightPtr);
211	211	static void RemapWindows(TkWindow *winPtr,
212	212	MacDrawable *parentWin);
213
	213
214	214	/*
215	215	*----------------------------------------------------------------------
216	216	*

306	306
307	307	Tk_ManageGeometry((Tk_Window) winPtr, &wmMgrType, (ClientData) 0);
308	308	}
309
	309
310	310	/*
311	311	*----------------------------------------------------------------------
312	312	*

405	405
406	406	XMapWindow(winPtr->display, winPtr->window);
407	407	}
408
	408
409	409	/*
410	410	*----------------------------------------------------------------------
411	411	*

430	430	{
431	431	XUnmapWindow(winPtr->display, winPtr->window);
432	432	}
433
	433
434	434	/*
435	435	*----------------------------------------------------------------------
436	436	*

498	498	ckfree((char *) wmPtr);
499	499	winPtr->wmInfoPtr = NULL;
500	500	}
501
	501
502	502	/*
503	503	*----------------------------------------------------------------------
504	504	*

524	524	{
525	525	return;
526	526	}
527
	527
528	528	/*
529	529	*----------------------------------------------------------------------
530	530	*

551	551	Tcl_Obj const objv[]) / Argument objects. */
552	552	{
553	553	Tk_Window tkwin = (Tk_Window) clientData;
554		static const char *optionStrings[] = {
	554	static const char *const optionStrings[] = {
555	555	"aspect", "attributes", "client", "colormapwindows",
556	556	"command", "deiconify", "focusmodel", "forget",
557	557	"frame", "geometry", "grid", "group",

685	685	/* This should not happen */
686	686	return TCL_ERROR;
687	687	}
688
	688
689	689	/*
690	690	*----------------------------------------------------------------------
691	691	*

754	754	WmUpdateGeom(wmPtr, winPtr);
755	755	return TCL_OK;
756	756	}
757
	757
758	758	/*
759	759	*----------------------------------------------------------------------
760	760	*

930	930	}
931	931	return TCL_OK;
932	932	}
933
	933
934	934	/*
935	935	*----------------------------------------------------------------------
936	936	*

1005	1005	}
1006	1006	return result;
1007	1007	}
1008
	1008
1009	1009	/*
1010	1010	*----------------------------------------------------------------------
1011	1011	*

1077	1077	}
1078	1078	return TCL_OK;
1079	1079	}
1080
	1080
1081	1081	/*
1082	1082	*----------------------------------------------------------------------
1083	1083	*

1132	1132	strcpy(wmPtr->clientMachine, argv3);
1133	1133	return TCL_OK;
1134	1134	}
1135
	1135
1136	1136	/*
1137	1137	*----------------------------------------------------------------------
1138	1138	*

1220	1220
1221	1221	return TCL_OK;
1222	1222	}
1223
	1223
1224	1224	/*
1225	1225	*----------------------------------------------------------------------
1226	1226	*

1257	1257	}
1258	1258	if (objc == 3) {
1259	1259	if (wmPtr->cmdArgv != NULL) {
1260		Tcl_SetResult(interp, Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv),
1261		TCL_DYNAMIC);
	1260	argv3 = Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv);
	1261	Tcl_SetResult(interp, argv3, TCL_VOLATILE);
	1262	ckfree(argv3);
1262	1263	}
1263	1264	return TCL_OK;
1264	1265	}

1280	1281	wmPtr->cmdArgv = cmdArgv;
1281	1282	return TCL_OK;
1282	1283	}
1283
	1284
1284	1285	/*
1285	1286	*----------------------------------------------------------------------
1286	1287	*

1326	1327	ZoomState : NormalState);
1327	1328	return TCL_OK;
1328	1329	}
1329
	1330
1330	1331	/*
1331	1332	*----------------------------------------------------------------------
1332	1333	*

1353	1354	Tcl_Obj const objv[]) / Argument objects. */
1354	1355	{
1355	1356	register WmInfo *wmPtr = winPtr->wmInfoPtr;
1356		static const char *optionStrings[] = {
	1357	static const char *const optionStrings[] = {
1357	1358	"active", "passive", NULL };
1358	1359	enum options {
1359	1360	OPT_ACTIVE, OPT_PASSIVE };

1380	1381	}
1381	1382	return TCL_OK;
1382	1383	}
1383
	1384
1384	1385	/*
1385	1386	*----------------------------------------------------------------------
1386	1387	*

1442	1443	return TCL_OK;
1443	1444	#endif
1444	1445	}
1445
	1446
1446	1447	/*
1447	1448	*----------------------------------------------------------------------
1448	1449	*

1484	1485	Tcl_SetResult(interp, buf, TCL_VOLATILE);
1485	1486	return TCL_OK;
1486	1487	}
1487
	1488
1488	1489	/*
1489	1490	*----------------------------------------------------------------------
1490	1491	*

1547	1548	}
1548	1549	return ParseGeometry(interp, argv3, winPtr);
1549	1550	}
1550
	1551
1551	1552	/*
1552	1553	*----------------------------------------------------------------------
1553	1554	*

1637	1638	WmUpdateGeom(wmPtr, winPtr);
1638	1639	return TCL_OK;
1639	1640	}
1640
	1641
1641	1642	/*
1642	1643	*----------------------------------------------------------------------
1643	1644	*

1700	1701	}
1701	1702	return TCL_OK;
1702	1703	}
1703
	1704
1704	1705	/*
1705	1706	*----------------------------------------------------------------------
1706	1707	*

1768	1769	}
1769	1770	return TCL_OK;
1770	1771	}
1771
	1772
1772	1773	/*
1773	1774	*----------------------------------------------------------------------
1774	1775	*

1822	1823	TkpWmSetState(winPtr, IconicState);
1823	1824	return TCL_OK;
1824	1825	}
1825
	1826
1826	1827	/*
1827	1828	*----------------------------------------------------------------------
1828	1829	*

1879	1880	}
1880	1881	return TCL_OK;
1881	1882	}
1882
	1883
1883	1884	/*
1884	1885	*----------------------------------------------------------------------
1885	1886	*

1931	1932	}
1932	1933	return TCL_OK;
1933	1934	}
1934
	1935
1935	1936	/*
1936	1937	*----------------------------------------------------------------------
1937	1938	*

1997	1998
1998	1999	return TCL_OK;
1999	2000	}
2000
	2001
2001	2002	/*
2002	2003	*----------------------------------------------------------------------
2003	2004	*

2053	2054	}
2054	2055	return TCL_OK;
2055	2056	}
2056
	2057
2057	2058	/*
2058	2059	*----------------------------------------------------------------------
2059	2060	*

2136	2137	}
2137	2138	return TCL_OK;
2138	2139	}
2139
	2140
2140	2141	/*
2141	2142	*----------------------------------------------------------------------
2142	2143	*

2173	2174	if (!Tk_IsTopLevel(frameWin)) {
2174	2175	MacDrawable macWin = (MacDrawable ) winPtr->window;
2175	2176
	2177	if (!Tk_IsManageable(frameWin)) {
	2178	Tcl_AppendResult(interp, "window \"",
	2179	Tk_PathName(frameWin), "\" is not manageable: must be "
	2180	"a frame, labelframe or toplevel", NULL);
	2181	return TCL_ERROR;
	2182	}
2176	2183	TkFocusSplit(winPtr);
2177	2184	Tk_UnmapWindow(frameWin);
2178	2185	if (wmPtr == NULL) {

2198	2205	return TCL_OK;
2199	2206	#endif
2200	2207	}
2201
	2208
2202	2209	/*
2203	2210	*----------------------------------------------------------------------
2204	2211	*

2249	2256	WmUpdateGeom(wmPtr, winPtr);
2250	2257	return TCL_OK;
2251	2258	}
2252
	2259
2253	2260	/*
2254	2261	*----------------------------------------------------------------------
2255	2262	*

2300	2307	WmUpdateGeom(wmPtr, winPtr);
2301	2308	return TCL_OK;
2302	2309	}
2303
	2310
2304	2311	/*
2305	2312	*----------------------------------------------------------------------
2306	2313	*

2346	2353	ApplyMasterOverrideChanges(winPtr, NULL);
2347	2354	return TCL_OK;
2348	2355	}
2349
	2356
2350	2357	/*
2351	2358	*----------------------------------------------------------------------
2352	2359	*

2373	2380	Tcl_Obj const objv[]) / Argument objects. */
2374	2381	{
2375	2382	register WmInfo *wmPtr = winPtr->wmInfoPtr;
2376		static const char *optionStrings[] = {
	2383	static const char *const optionStrings[] = {
2377	2384	"program", "user", NULL };
2378	2385	enum options {
2379	2386	OPT_PROGRAM, OPT_USER };

2410	2417	WmUpdateGeom(wmPtr, winPtr);
2411	2418	return TCL_OK;
2412	2419	}
2413
	2420
2414	2421	/*
2415	2422	*----------------------------------------------------------------------
2416	2423	*

2502	2509	}
2503	2510	return TCL_OK;
2504	2511	}
2505
	2512
2506	2513	/*
2507	2514	*----------------------------------------------------------------------
2508	2515	*

2578	2585	oldAttributes, 1);
2579	2586	return TCL_OK;
2580	2587	}
2581
	2588
2582	2589	/*
2583	2590	*----------------------------------------------------------------------
2584	2591	*

2605	2612	Tcl_Obj const objv[]) / Argument objects. */
2606	2613	{
2607	2614	register WmInfo *wmPtr = winPtr->wmInfoPtr;
2608		static const char *optionStrings[] = {
	2615	static const char *const optionStrings[] = {
2609	2616	"program", "user", NULL };
2610	2617	enum options {
2611	2618	OPT_PROGRAM, OPT_USER };

2643	2650	WmUpdateGeom(wmPtr, winPtr);
2644	2651	return TCL_OK;
2645	2652	}
2646
	2653
2647	2654	/*
2648	2655	*----------------------------------------------------------------------
2649	2656	*

2670	2677	Tcl_Obj const objv[]) / Argument objects. */
2671	2678	{
2672	2679	TkWindow windows, window_ptr;
2673		static const char *optionStrings[] = {
	2680	static const char *const optionStrings[] = {
2674	2681	"isabove", "isbelow", NULL };
2675	2682	enum options {
2676	2683	OPT_ISABOVE, OPT_ISBELOW };

2761	2768	}
2762	2769	return TCL_OK;
2763	2770	}
2764
	2771
2765	2772	/*
2766	2773	*----------------------------------------------------------------------
2767	2774	*

2788	2795	Tcl_Obj const objv[]) / Argument objects. */
2789	2796	{
2790	2797	register WmInfo *wmPtr = winPtr->wmInfoPtr;
2791		static const char *optionStrings[] = {
	2798	static const char *const optionStrings[] = {
2792	2799	"normal", "iconic", "withdrawn", "zoomed", NULL };
2793	2800	enum options {
2794	2801	OPT_NORMAL, OPT_ICONIC, OPT_WITHDRAWN, OPT_ZOOMED };

2865	2872	}
2866	2873	return TCL_OK;
2867	2874	}
2868
	2875
2869	2876	/*
2870	2877	*----------------------------------------------------------------------
2871	2878	*

2911	2918	}
2912	2919	return TCL_OK;
2913	2920	}
2914
	2921
2915	2922	/*
2916	2923	*----------------------------------------------------------------------
2917	2924	*

2996	3003	ApplyMasterOverrideChanges(winPtr, NULL);
2997	3004	return TCL_OK;
2998	3005	}
2999
	3006
3000	3007	/*
3001	3008	*----------------------------------------------------------------------
3002	3009	*

3052	3059	wmPtr->flags \|= WM_UPDATE_PENDING;
3053	3060	}
3054	3061	}
3055
	3062
3056	3063	/*
3057	3064	*----------------------------------------------------------------------
3058	3065	*

3158	3165	wmPtr->flags \|= WM_UPDATE_PENDING;
3159	3166	}
3160	3167	}
3161
	3168
3162	3169	/*
3163	3170	*----------------------------------------------------------------------
3164	3171	*

3215	3222	wmPtr->flags \|= WM_UPDATE_PENDING;
3216	3223	}
3217	3224	}
3218
	3225
3219	3226	/*
3220	3227	*----------------------------------------------------------------------
3221	3228	*

3265	3272	Tcl_Panic("recieved unwanted reparent event");
3266	3273	}
3267	3274	}
3268
	3275
3269	3276	/*
3270	3277	*----------------------------------------------------------------------
3271	3278	*

3300	3307	wmPtr->flags \|= WM_UPDATE_PENDING;
3301	3308	}
3302	3309	}
3303
	3310
3304	3311	/*
3305	3312	*----------------------------------------------------------------------
3306	3313	*

3329	3336	TkWindow *winPtr = clientData;
3330	3337	WmInfo *wmPtr = winPtr->wmInfoPtr;
3331	3338	int x, y, width, height, min, max;
3332		unsigned long serial;
3333	3339
3334	3340	wmPtr->flags &= ~WM_UPDATE_PENDING;
3335	3341

3494	3500	}
3495	3501	return;
3496	3502	}
3497		serial = NextRequest(winPtr->display);
3498	3503	if (wmPtr->flags & WM_MOVE_PENDING) {
3499	3504	wmPtr->configWidth = width;
3500	3505	wmPtr->configHeight = height;

3519	3524	wmPtr->flags &= ~WM_SYNC_PENDING;
3520	3525	}
3521	3526	}
3522
	3527
3523	3528	/*
3524	3529	*----------------------------------------------------------------------
3525	3530	*

3545	3550
3546	3551	wmPtr->flags &= ~WM_UPDATE_SIZE_HINTS;
3547	3552	}
3548
	3553
3549	3554	/*
3550	3555	*----------------------------------------------------------------------
3551	3556	*

3686	3691	Tcl_AppendResult(interp, "bad geometry specifier \"", string, "\"", NULL);
3687	3692	return TCL_ERROR;
3688	3693	}
3689
	3694
3690	3695	/*
3691	3696	*----------------------------------------------------------------------
3692	3697	*

3782	3787	*xPtr = x;
3783	3788	*yPtr = y;
3784	3789	}
3785
	3790
3786	3791	/*
3787	3792	*----------------------------------------------------------------------
3788	3793	*

3902	3907	}
3903	3908	return (Tk_Window) winPtr;
3904	3909	}
3905
	3910
3906	3911	/*
3907	3912	*----------------------------------------------------------------------
3908	3913	*

3995	4000	*newY = y;
3996	4001	return (Tk_Window) winPtr;
3997	4002	}
3998
	4003
3999	4004	/*
4000	4005	*----------------------------------------------------------------------
4001	4006	*

4062	4067	goto noVRoot;
4063	4068	}
4064	4069	}
4065
	4070
4066	4071	/*
4067	4072	*----------------------------------------------------------------------
4068	4073	*

4119	4124	*widthPtr = wmPtr->vRootWidth;
4120	4125	*heightPtr = wmPtr->vRootHeight;
4121	4126	}
4122
	4127
4123	4128	/*
4124	4129	*----------------------------------------------------------------------
4125	4130	*

4173	4178	UpdateGeometryInfo(winPtr);
4174	4179	}
4175	4180	}
4176
	4181
4177	4182	/*
4178	4183	*----------------------------------------------------------------------
4179	4184	*

4287	4292	SendBehind(macWindow, otherMacWindow);
4288	4293	}
4289	4294	}
4290
	4295
4291	4296	/*
4292	4297	*----------------------------------------------------------------------
4293	4298	*

4378	4383	* we don't support colormaps. If we did they would be installed here.
4379	4384	*/
4380	4385	}
4381
	4386
4382	4387	/*
4383	4388	*----------------------------------------------------------------------
4384	4389	*

4447	4452	}
4448	4453	}
4449	4454	}
4450
	4455
4451	4456	/*
4452	4457	*----------------------------------------------------------------------
4453	4458	*

4475	4480	{
4476	4481	XQueryPointer(NULL, None, NULL, NULL, xPtr, yPtr, NULL, NULL, NULL);
4477	4482	}
4478
	4483
4479	4484	/*
4480	4485	*----------------------------------------------------------------------
4481	4486	*

4534	4539	geometry->right = wmPtr->x + winPtr->changes.width;
4535	4540	geometry->bottom = wmPtr->y + winPtr->changes.height;
4536	4541	}
4537
	4542
4538	4543	/*
4539	4544	*----------------------------------------------------------------------
4540	4545	*

4574	4579	return true;
4575	4580	}
4576	4581	}
4577
	4582
4578	4583	/*
4579	4584	*----------------------------------------------------------------------
4580	4585	*

4696	4701	}
4697	4702	return false;
4698	4703	}
4699
	4704
4700	4705	/*
4701	4706	*----------------------------------------------------------------------
4702	4707	*

4734	4739	CFRelease(title);
4735	4740	}
4736	4741	}
4737
	4742
4738	4743	/*
4739	4744	*----------------------------------------------------------------------
4740	4745	*

4761	4766	}
4762	4767	return None;
4763	4768	}
4764
	4769
4765	4770	/*
4766	4771	*----------------------------------------------------------------------
4767	4772	*

4793	4798	}
4794	4799	return (Window) Tcl_GetHashValue(hPtr);
4795	4800	}
4796
	4801
4797	4802	/*
4798	4803	*----------------------------------------------------------------------
4799	4804	*

4852	4857	return IsWindowInStandardState(TkMacOSXDrawableWindow(winPtr->window),
4853	4858	&idealSize, NULL);
4854	4859	}
4855
	4860
4856	4861	/*
4857	4862	*----------------------------------------------------------------------
4858	4863	*

4936	4941	(zoomPart == inZoomIn ? NormalState : ZoomState);
4937	4942	return true;
4938	4943	}
4939
	4944
4940	4945	/*
4941	4946	*----------------------------------------------------------------------
4942	4947	*

4963	4968	int objc, /* Number of arguments. */
4964	4969	Tcl_Obj const objv[]) / Argument objects. */
4965	4970	{
4966		static const char *subcmds[] = {
	4971	static const char *const subcmds[] = {
4967	4972	"style", NULL
4968	4973	};
4969	4974	enum SubCmds {

5004	5009	/* won't be reached */
5005	5010	return TCL_ERROR;
5006	5011	}
5007
	5012
5008	5013	/*
5009	5014	*----------------------------------------------------------------------
5010	5015	*

5206	5211	}
5207	5212	return TCL_OK;
5208	5213	}
5209
	5214
5210	5215	/*
5211	5216	*----------------------------------------------------------------------
5212	5217	*

5244	5249	winPtr->wmInfoPtr->flags \|= WM_HEIGHT_NOT_RESIZABLE;
5245	5250	}
5246	5251	}
5247
	5252
5248	5253	/*
5249	5254	*----------------------------------------------------------------------
5250	5255	*

5395	5400	}
5396	5401	#endif /* TK_MAC_DEBUG_WINDOWS */
5397	5402	}
5398
	5403
5399	5404	/*
5400	5405	*----------------------------------------------------------------------
5401	5406	*

5431	5436	}
5432	5437	Tcl_SetHashValue(valueHashPtr, window);
5433	5438	}
5434
	5439
5435	5440	/*
5436	5441	*----------------------------------------------------------------------
5437	5442	*

5465	5470	Tcl_DeleteHashEntry(entryPtr);
5466	5471	}
5467	5472	}
5468
	5473
5469	5474	/*
5470	5475	*----------------------------------------------------------------------
5471	5476	*

5497	5502	winPtr->privatePtr->toplevel->winPtr->wmInfoPtr->scrollWinPtr = NULL;
5498	5503	}
5499	5504	}
5500
	5505
5501	5506	/*
5502	5507	*----------------------------------------------------------------------
5503	5508	*

5530	5535	}
5531	5536	return winPtr;
5532	5537	}
5533
	5538
5534	5539	/*
5535	5540	*----------------------------------------------------------------------
5536	5541	*

5560	5565	}
5561	5566	return winPtr;
5562	5567	}
5563
	5568
5564	5569	/*
5565	5570	*----------------------------------------------------------------------
5566	5571	*

5620	5625	TkMacOSXZoomToplevel(macWin, inZoomOut);
5621	5626	}
5622	5627	}
5623
	5628
5624	5629	/*
5625	5630	*----------------------------------------------------------------------
5626	5631	*

5650	5655	GetWindowClass(wRef, &class);
5651	5656	return (class == kFloatingWindowClass);
5652	5657	}
5653
	5658
5654	5659	/*
5655	5660	*----------------------------------------------------------------------
5656	5661	*

5673	5678	{
5674	5679	return winPtr->wmInfoPtr->macClass;
5675	5680	}
5676
	5681
5677	5682	/*
5678	5683	*--------------------------------------------------------------
5679	5684	*

5708	5713	*xOffset = winPtr->wmInfoPtr->xInParent;
5709	5714	*yOffset = winPtr->wmInfoPtr->yInParent;
5710	5715	}
5711
	5716
5712	5717	/*
5713	5718	*----------------------------------------------------------------------
5714	5719	*

5734	5739	Tcl_GetTime(&now);
5735	5740	return (long) now.sec * 1000 + now.usec / 1000;
5736	5741	}
5737
	5742
5738	5743	/*
5739	5744	*----------------------------------------------------------------------
5740	5745	*

5762	5767	* Don't need to do a thing. Tk manages the focus for us.
5763	5768	*/
5764	5769	}
5765
	5770
5766	5771	/*
5767	5772	*----------------------------------------------------------------------
5768	5773	*

5808	5813
5809	5814	return NextRequest(winPtr->display);
5810	5815	}
5811
	5816
5812	5817	/*
5813	5818	*----------------------------------------------------------------------
5814	5819	*

5855	5860	WmStackorderToplevelWrapperMap(childPtr, display, table);
5856	5861	}
5857	5862	}
5858
	5863
5859	5864	/*
5860	5865	*----------------------------------------------------------------------
5861	5866	*

5934	5939	Tcl_DeleteHashTable(&table);
5935	5940	return windows;
5936	5941	}
5937
	5942
5938	5943	/*
5939	5944	*----------------------------------------------------------------------
5940	5945	*

6025	6030	+ strWidths.bottom;
6026	6031	}
6027	6032	}
6028
	6033
6029	6034	/*
6030	6035	*----------------------------------------------------------------------
6031	6036	*

6091	6096	}
6092	6097	}
6093	6098	}
6094
	6099
6095	6100	/*
6096	6101	*----------------------------------------------------------------------
6097	6102	*

6145	6150	}
6146	6151	return group;
6147	6152	}
6148
	6153
6149	6154	/*
6150	6155	*----------------------------------------------------------------------
6151	6156	*

6230	6235	TkMacOSXEnterExitFullscreen(winPtr, IsWindowActive(window));
6231	6236	return result;
6232	6237	}
6233
	6238
6234	6239	/*
6235	6240	*----------------------------------------------------------------------
6236	6241	*

6278	6283	}
6279	6284	}
6280	6285	}
6281
	6286
6282	6287	/*
6283	6288	*----------------------------------------------------------------------
6284	6289	*

6375	6380	*minWidthPtr = minWidth;
6376	6381	*minHeightPtr = minHeight;
6377	6382	}
6378
	6383
6379	6384	/*
6380	6385	*----------------------------------------------------------------------
6381	6386	*

6431	6436	*maxHeightPtr = maxHeight;
6432	6437	}
6433	6438	}
6434
	6439
6435	6440	/*
6436	6441	*----------------------------------------------------------------------
6437	6442	*

6477	6482	RemapWindows(childPtr, (MacDrawable *) winPtr->window);
6478	6483	}
6479	6484	}
6480
	6485
6481	6486	/*
6482	6487	* Local Variables:
6483	6488	* fill-column: 78

+21

-19

macosx/tkMacOSXXStubs.c less more

12	12	* See the file "license.terms" for information on usage and redistribution of
13	13	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
14	14	*
15		* RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.29 2008/08/19 15:52:13 georgeps Exp $
	15	* RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.31 2008/12/20 01:33:09 das Exp $
16	16	*/
17	17
18	18	#include "tkMacOSXPrivate.h"

170	170	Gestalt(gestaltQuickdrawVersion, (long *) &display->proto_minor_version);
171	171	display->proto_major_version = 10;
172	172	display->proto_minor_version -= gestaltMacOSXQD;
173		display->vendor = "Apple";
	173	display->vendor = (char*) "Apple";
174	174	Gestalt(gestaltSystemVersion, (long *) &display->release);
175	175
176	176	/*

625	625	}
626	626
627	627	void
628		XRefreshKeyboardMapping( XMappingEvent* x)
	628	XRefreshKeyboardMapping(
	629	XMappingEvent *x)
629	630	{
630	631	/* used by tkXEvent.c */
631	632	Debugger();

1076	1077
1077	1078	void
1078	1079	XChangeWindowAttributes(
1079		Display* display,
	1080	Display *display,
1080	1081	Window w,
1081	1082	unsigned long value_mask,
1082		XSetWindowAttributes* attributes)
	1083	XSetWindowAttributes *attributes)
1083	1084	{
1084	1085	}
1085	1086
1086	1087	void
1087	1088	XSetWindowBackground(
1088		Display *display,
1089		Window window,
1090		unsigned long value)
	1089	Display *display,
	1090	Window window,
	1091	unsigned long value)
1091	1092	{
1092	1093	}
1093	1094
1094	1095	void
1095	1096	XSetWindowBackgroundPixmap(
1096		Display* display,
	1097	Display *display,
1097	1098	Window w,
1098	1099	Pixmap background_pixmap)
1099	1100	{

1101	1102
1102	1103	void
1103	1104	XSetWindowBorder(
1104		Display* display,
	1105	Display *display,
1105	1106	Window w,
1106	1107	unsigned long border_pixel)
1107	1108	{

1109	1110
1110	1111	void
1111	1112	XSetWindowBorderPixmap(
1112		Display* display,
	1113	Display *display,
1113	1114	Window w,
1114	1115	Pixmap border_pixmap)
1115	1116	{

1117	1118
1118	1119	void
1119	1120	XSetWindowBorderWidth(
1120		Display* display,
	1121	Display *display,
1121	1122	Window w,
1122	1123	unsigned int width)
1123	1124	{

1125	1126
1126	1127	void
1127	1128	XSetWindowColormap(
1128		Display* display,
	1129	Display *display,
1129	1130	Window w,
1130	1131	Colormap colormap)
1131	1132	{

1134	1135
1135	1136	Status
1136	1137	XStringListToTextProperty(
1137		char** list,
	1138	char **list,
1138	1139	int count,
1139		XTextProperty* text_prop_return)
	1140	XTextProperty *text_prop_return)
1140	1141	{
1141	1142	Debugger();
1142	1143	return (Status) 0;
1143	1144	}
	1145
1144	1146	void
1145	1147	XSetWMClientMachine(
1146		Display* display,
	1148	Display *display,
1147	1149	Window w,
1148		XTextProperty* text_prop)
	1150	XTextProperty *text_prop)
1149	1151	{
1150	1152	Debugger();
1151	1153	}
	1154
1152	1155	XIC
1153		XCreateIC(
1154		void)
	1156	XCreateIC(void)
1155	1157	{
1156	1158	Debugger();
1157	1159	return (XIC) 0;

+68

-5

macosx/ttkMacOSXTheme.c less more

26	26	* top-level window, not to the Tk_Window. BoxToRect()
27	27	* accounts for this.
28	28	*
29		* RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.22 2008/05/04 17:17:33 jenglish Exp $
	29	* RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.26 2008/12/08 00:10:36 das Exp $
30	30	*/
31	31
32	32	#include "tkMacOSXPrivate.h"

472	472	};
473	473
474	474	/*----------------------------------------------------------------------
	475	* +++ Spinbuttons.
	476	*
	477	* From Apple HIG, part III, section "Controls", "The Stepper Control":
	478	* there should be 2 pixels of space between the stepper control
	479	* (AKA IncDecButton, AKA "little arrows") and the text field it modifies.
	480	*/
	481
	482	static Ttk_Padding SpinbuttonMargins = {2,0,2,0};
	483	static void SpinButtonElementSize(
	484	void clientData, void elementRecord, Tk_Window tkwin,
	485	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
	486	{
	487	SInt32 s;
	488
	489	ChkErr(GetThemeMetric, kThemeMetricLittleArrowsWidth, &s);
	490	*widthPtr = s + Ttk_PaddingWidth(SpinbuttonMargins);
	491	ChkErr(GetThemeMetric, kThemeMetricLittleArrowsHeight, &s);
	492	*heightPtr = s + Ttk_PaddingHeight(SpinbuttonMargins);
	493	}
	494
	495	static void SpinButtonElementDraw(
	496	void clientData, void elementRecord, Tk_Window tkwin,
	497	Drawable d, Ttk_Box b, Ttk_State state)
	498	{
	499	Rect bounds = BoxToRect(d, Ttk_PadBox(b, SpinbuttonMargins));
	500	ThemeButtonDrawInfo info;
	501
	502	/* @@@ can't currently distinguish PressedUp (== Pressed) from PressedDown;
	503	* ignore this bit for now [see #2219588]
	504	*/
	505	info.state = Ttk_StateTableLookup(ThemeStateTable,
	506	state & ~TTK_STATE_PRESSED);
	507	info.value = Ttk_StateTableLookup(ButtonValueTable, state);
	508	info.adornment = kThemeAdornmentNone;
	509
	510	BEGIN_DRAWING(d)
	511	ChkErr(DrawThemeButton,
	512	&bounds, kThemeIncDecButton, &info, NULL, NULL, NULL, 0);
	513	END_DRAWING
	514	}
	515
	516	static Ttk_ElementSpec SpinButtonElementSpec = {
	517	TK_STYLE_VERSION_2,
	518	sizeof(NullElement),
	519	TtkNullElementOptions,
	520	SpinButtonElementSize,
	521	SpinButtonElementDraw
	522	};
	523
	524
	525	/*----------------------------------------------------------------------
475	526	* +++ DrawThemeTrack-based elements --
476	527	* Progress bars and scales. (See also: <<NOTE-TRACKS>>)
477	528	*/

699	750	Drawable d, Ttk_Box b, unsigned int state)
700	751	{
701	752	Rect bounds = BoxToRect(d, b);
702		ThemeDrawState drawState = Ttk_StateTableLookup(ThemeStateTable, state);
	753	ThemeDrawState drawState;
703	754
704	755	/*
705	756	* DrawThemeSeparator only supports kThemeStateActive / kThemeStateInactive
706	757	*/
707	758	state &= TTK_STATE_BACKGROUND;
	759	drawState = Ttk_StateTableLookup(ThemeStateTable, state);
708	760	BEGIN_DRAWING(d)
709	761	ChkErr(DrawThemeSeparator, &bounds, drawState);
710	762	END_DRAWING

901	953	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
902	954	{
903	955	SInt32 s;
904		GetThemeMetric(kThemeMetricDisclosureTriangleWidth, &s); *widthPtr = s;
905		GetThemeMetric(kThemeMetricDisclosureTriangleHeight, &s); *heightPtr = s;
	956
	957	ChkErr(GetThemeMetric, kThemeMetricDisclosureTriangleWidth, &s);
	958	*widthPtr = s;
	959	ChkErr(GetThemeMetric, kThemeMetricDisclosureTriangleHeight, &s);
	960	*heightPtr = s;
906	961	}
907	962
908	963	static void DisclosureElementDraw(

975	1030	TTK_NODE("Notebook.label", TTK_EXPAND\|TTK_FILL_BOTH))))
976	1031
977	1032	/* Progress bars -- track only */
	1033	TTK_LAYOUT("TSpinbox",
	1034	TTK_NODE("Spinbox.spinbutton", TTK_PACK_RIGHT\|TTK_STICK_E)
	1035	TTK_GROUP("Spinbox.field", TTK_EXPAND\|TTK_FILL_X,
	1036	TTK_NODE("Spinbox.textarea", TTK_EXPAND\|TTK_FILL_X)))
	1037
978	1038	TTK_LAYOUT("TProgressbar",
979	1039	TTK_NODE("Progressbar.track", TTK_EXPAND\|TTK_FILL_BOTH))
980	1040

984	1044	TTK_NODE("Treeheading.image", TTK_PACK_RIGHT)
985	1045	TTK_NODE("Treeheading.text", 0))
986	1046
987		/* Tree items -- omit focus ring */
	1047	/* Tree items -- omit focus ring */
988	1048	TTK_LAYOUT("Item",
989	1049	TTK_GROUP("Treeitem.padding", TTK_FILL_BOTH,
990	1050	TTK_NODE("Treeitem.indicator", TTK_PACK_LEFT)

1023	1083	&ButtonElementSpec, &BevelButtonParms);
1024	1084	Ttk_RegisterElementSpec(themePtr, "Menubutton.button",
1025	1085	&ButtonElementSpec, &PopupButtonParms);
	1086	Ttk_RegisterElementSpec(themePtr, "Spinbox.spinbutton",
	1087	&SpinButtonElementSpec, 0);
1026	1088	Ttk_RegisterElementSpec(themePtr, "Combobox.button",
1027	1089	&ComboboxElementSpec, 0);
1028	1090	Ttk_RegisterElementSpec(themePtr, "Treeitem.indicator",

1035	1097
1036	1098	Ttk_RegisterElementSpec(themePtr, "Labelframe.border",&GroupElementSpec,0);
1037	1099	Ttk_RegisterElementSpec(themePtr, "Entry.field",&EntryElementSpec,0);
	1100	Ttk_RegisterElementSpec(themePtr, "Spinbox.field",&EntryElementSpec,0);
1038	1101
1039	1102	Ttk_RegisterElementSpec(themePtr, "separator",&SeparatorElementSpec,0);
1040	1103	Ttk_RegisterElementSpec(themePtr, "hseparator",&SeparatorElementSpec,0);

+767

-761

tests/bind.test less more

6	6	# Copyright (c) 1998-1999 by Scriptics Corporation.
7	7	# All rights reserved.
8	8	#
9		# RCS: @(#) $Id: bind.test,v 1.22 2008/07/25 23:47:15 aniap Exp $
	9	# RCS: @(#) $Id: bind.test,v 1.26 2008/11/23 21:58:24 patthoyts Exp $
10	10
11	11	package require tcltest 2.2
12	12	namespace import ::tcltest::*

194	194	bind .t <Enter> {lappend x "%W enter .t"}
195	195	bind .t.f <Enter> {lappend x "%W enter .t.f"}
196	196
197		event gen .t.f <Enter>
	197	event generate .t.f <Enter>
198	198	return $x
199	199	} -cleanup {
200	200	destroy .t.f

215	215	bind .t.f <Enter> {lappend x "%W enter .t.f"}
216	216
217	217	bindtags .t.f {.t.f {a b} xyz}
218		event gen .t.f <Enter>
	218	event generate .t.f <Enter>
219	219	return $x
220	220	} -cleanup {
221	221	destroy .t.f

230	230	bind {a b} <Enter> {lappend x "%W enter {a b}"}
231	231	bind .t <Enter> {lappend x "%W enter .t"}
232	232
233		event gen .t <Enter>
	233	event generate .t <Enter>
234	234	return $x
235	235	} -cleanup {
236	236	unsetBindings

253	253	bindtags .t.f {.t.f .t.f2 .t.f3}
254	254	bind .t.f <Enter> {lappend x "%W enter .t.f"}
255	255	bind .t.f3 <Enter> {lappend x "%W enter .t.f3"}
256		event gen .t.f <Enter>
	256	event generate .t.f <Enter>
257	257	return $x
258	258	} -cleanup {
259	259	destroy .t.f .t.f3

274	274	bind .t <Enter> {lappend x "%W enter .t"}
275	275	bindtags .t.f {a b c d e f g h i j k l m n o p q r s t u v w x y z}
276	276
277		event gen .t.f <Enter>
	277	event generate .t.f <Enter>
278	278	} -cleanup {
279	279	destroy .t.f
280	280	unsetBindings

317	317	bind b <1> "lappend x b1"
318	318	testcbind c <1> "lappend x c1" "lappend x bye.c1"
319	319	testcbind c <2> "lappend x all2" "lappend x bye.all2"
320		event gen .g <1>
	320	event generate .g <1>
321	321	}
322	322	set x [foo eval set x]
323	323	return $x

376	376	set x {}
377	377	} -body {
378	378	testcbind .t.f <1> "lappend x 1" "lappend x bye.1"
379		event gen .t.f <1>
	379	event generate .t.f <1>
380	380	destroy .t.f
381	381	return $x
382	382	} -result {bye.1}

403	403	} -body {
404	404	testcbind .t.f <1> "lappend x .t.f; testcbind Frame <1> {lappend x Frame}"
405	405	testcbind Frame <1> "lappend x never"
406		event gen .t.f <1>
	406	event generate .t.f <1>
407	407	bind .t.f <1> {}
408	408	return $x
409	409	} -cleanup {

460	460	bind b <1> {lappend x b1}
461	461	testcbind c <1> {lappend x c1} {lappend x bye.c1}
462	462	testcbind c <2> {lappend x c2} {lappend x bye.c2}
463		event gen .t.f <1>
	463	event generate .t.f <1>
464	464	bind a <1> {}
465	465	bind b <1> {}
466	466	return $x

542	542	update
543	543	set x {}
544	544	} -body {
545		testcbind .t.f <1> {lappend x before; event gen .t.f <2>; lappend x after} {lappend x bye.f1}
	545	testcbind .t.f <1> {lappend x before; event generate .t.f <2>; lappend x after} {lappend x bye.f1}
546	546	testcbind .t.f <2> {destroy .t.f} {lappend x bye.f2}
547	547	bind .t.f <Destroy> {lappend x fDestroy}
548	548	testcbind .t.f <3> {foo} {lappend x bye.f3}
549		event gen .t.f <1>
	549	event generate .t.f <1>
550	550	return $x
551	551	} -cleanup {
552	552	destroy .t.f

559	559	update
560	560	set x {}
561	561	} -body {
562		bind Test <KeyPress> {lappend x "%W %K Test press any"}
563		bind all <KeyPress> {lappend x "%W %K all press any"}
564		bind Test a {lappend x "%W %K Test press a"}
565		bind all x {lappend x "%W %K all press x"}
566		bind .t.f a {lappend x "%W %K .t.f press a"}
	562	bind Test <KeyPress> {lappend x "%W %K Test KeyPress"}
	563	bind all <KeyPress> {lappend x "%W %K all KeyPress"}
	564	bind Test : {lappend x "%W %K Test :"}
	565	bind all _ {lappend x "%W %K all _"}
	566	bind .t.f : {lappend x "%W %K .t.f :"}
567	567
568		event gen .t.f <Key-a>
569		event gen .t.f <Key-b>
570		event gen .t.f <Key-x>
	568	event generate .t.f <Key-:>
	569	event generate .t.f <Key-+>
	570	event generate .t.f <Key-_>
571	571	return $x
572	572	} -cleanup {
573	573	destroy .t.f
574	574	bind all <KeyPress> {}
575	575	bind Test <KeyPress> {}
576		bind all x {}
577		bind Test a {}
578		} -result {{.t.f a .t.f press a} {.t.f a Test press a} {.t.f a all press any} {.t.f b Test press any} {.t.f b all press any} {.t.f x Test press any} {.t.f x all press x}}
	576	bind all _ {}
	577	bind Test : {}
	578	} -result {{.t.f colon .t.f :} {.t.f colon Test :} {.t.f colon all KeyPress} {.t.f plus Test KeyPress} {.t.f plus all KeyPress} {.t.f underscore Test KeyPress} {.t.f underscore all _}}
579	579
580	580	test bind-13.2 {Tk_BindEvent procedure} -setup {
581	581	frame .t.f -class Test -width 150 -height 100

586	586	} -body {
587	587	bind Test <KeyPress> {lappend x "%W %K Test press any"; break}
588	588	bind all <KeyPress> {continue; lappend x "%W %K all press any"}
589		bind .t.f b {lappend x "%W %K .t.f press a"}
	589	bind .t.f : {lappend x "%W %K .t.f pressed colon"}
590	590
591		event gen .t.f <Key-b>
	591	event generate .t.f <Key-colon>
592	592	return $x
593	593	} -cleanup {
594	594	destroy .t.f
595	595	bind all <KeyPress> {}
596	596	bind Test <KeyPress> {}
597		} -result {{.t.f b .t.f press a} {.t.f b Test press any}}
	597	} -result {{.t.f colon .t.f pressed colon} {.t.f colon Test press any}}
598	598
599	599	test bind-13.3 {Tk_BindEvent procedure} -setup {
600	600	proc bgerror args {}

605	605	set x {}
606	606	} -body {
607	607	bind Test <KeyPress> {lappend x "%W %K Test press any"; error Test}
608		bind .t.f b {lappend x "%W %K .t.f press a"}
609		event gen .t.f <Key-b>
	608	bind .t.f : {lappend x "%W %K .t.f pressed colon"}
	609	event generate .t.f <Key-colon>
610	610	update
611	611	list $x $errorInfo
612	612	} -cleanup {
613	613	destroy .t.f
614	614	bind Test <KeyPress> {}
615	615	rename bgerror {}
616		} -result {{{.t.f b .t.f press a} {.t.f b Test press any}} {Test
	616	} -result {{{.t.f colon .t.f pressed colon} {.t.f colon Test press any}} {Test
617	617	while executing
618	618	"error Test"
619	619	(command bound to event)}}
620	620	test bind-13.4 {Tk_BindEvent procedure} -setup {
621	621	proc foo {} {
622	622	set x 44
623		event gen .t.f <Key-a>
	623	event generate .t.f <Key-:>
624	624	}
625	625	frame .t.f -class Test -width 150 -height 100
626	626	pack .t.f

628	628	update
629	629	set x {}
630	630	} -body {
631		bind Test a {lappend x "%W %K Test press a"}
632		bind .t.f a {lappend x "%W %K .t.f press a"}
	631	bind Test : {lappend x "%W %K Test"}
	632	bind .t.f : {lappend x "%W %K .t.f"}
633	633	foo
634	634	return $x
635	635	} -cleanup {
636	636	destroy .t.f
637		bind Test a {}
638		} -result {{.t.f a .t.f press a} {.t.f a Test press a}}
	637	bind Test : {}
	638	} -result {{.t.f colon .t.f} {.t.f colon Test}}
639	639
640	640	test bind-13.5 {Tk_BindEvent procedure} -body {
641	641	bind all <Destroy> {lappend x "%W destroyed"}

660	660	update
661	661	set x {}
662	662	} -body {
663		bind .t.f z {lappend x "%W z (.t.f binding)"}
664		bind Test z {lappend x "%W z (.t.f binding)"}
665		bind all z {bind .t.f z {}; lappend x "%W z (.t.f binding)"}
666		event gen .t.f <Key-z>
667		return $x
668		} -cleanup {
669		bind Test z {}
670		bind all z {}
671		destroy .t.f
672		} -result {{.t.f z (.t.f binding)} {.t.f z (.t.f binding)} {.t.f z (.t.f binding)}}
	663	bind .t.f : {lappend x "%W (.t.f binding)"}
	664	bind Test : {lappend x "%W (Test binding)"}
	665	bind all : {bind .t.f : {}; lappend x "%W (all binding)"}
	666	event generate .t.f <Key-:>
	667	return $x
	668	} -cleanup {
	669	bind Test : {}
	670	bind all : {}
	671	destroy .t.f
	672	} -result {{.t.f (.t.f binding)} {.t.f (Test binding)} {.t.f (all binding)}}
673	673	test bind-13.8 {Tk_BindEvent procedure} -setup {
674	674	frame .t.f -class Test -width 150 -height 100
675	675	pack .t.f

677	677	update
678	678	set x {}
679	679	} -body {
680		bind .t.f z {lappend x "%W z (.t.f binding)"}
681		bind Test z {lappend x "%W z (.t.f binding)"}
682		bind all z {destroy .t.f; lappend x "%W z (.t.f binding)"}
683		event gen .t.f <Key-z>
684		return $x
685		} -cleanup {
686		bind Test z {}
687		bind all z {}
688		destroy .t.f
689		} -result {{.t.f z (.t.f binding)} {.t.f z (.t.f binding)} {.t.f z (.t.f binding)}}
	680	bind .t.f : {lappend x "%W (.t.f binding)"}
	681	bind Test : {lappend x "%W (Test binding)"}
	682	bind all : {destroy .t.f; lappend x "%W (all binding)"}
	683	event generate .t.f <Key-:>
	684	return $x
	685	} -cleanup {
	686	bind Test : {}
	687	bind all : {}
	688	destroy .t.f
	689	} -result {{.t.f (.t.f binding)} {.t.f (Test binding)} {.t.f (all binding)}}
690	690
691	691	test bind-13.9 {Tk_BindEvent procedure} -setup {
692	692	frame .t.f -class Test -width 150 -height 100

697	697	} -body {
698	698	bind .t.f <1> {lappend x "%W z (.t.f <1> binding)"}
699	699	bind .t.f <ButtonPress> {lappend x "%W z (.t.f <ButtonPress> binding)"}
700		event gen .t.f <Button-1>
701		event gen .t.f <Button-2>
	700	event generate .t.f <Button-1>
	701	event generate .t.f <Button-2>
702	702	return $x
703	703	} -cleanup {
704	704	destroy .t.f

712	712	} -body {
713	713	bind .t.f <Enter> "lappend x Enter%#"
714	714	bind .t.f <Leave> "lappend x Leave%#"
715		event gen .t.f <Enter> -serial 100 -detail NotifyAncestor
716		event gen .t.f <Enter> -serial 101 -detail NotifyInferior
717		event gen .t.f <Leave> -serial 102 -detail NotifyAncestor
718		event gen .t.f <Leave> -serial 103 -detail NotifyInferior
	715	event generate .t.f <Enter> -serial 100 -detail NotifyAncestor
	716	event generate .t.f <Enter> -serial 101 -detail NotifyInferior
	717	event generate .t.f <Leave> -serial 102 -detail NotifyAncestor
	718	event generate .t.f <Leave> -serial 103 -detail NotifyInferior
719	719	return $x
720	720	} -cleanup {
721	721	destroy .t.f

728	728	set x {}
729	729	} -body {
730	730	bind .t.f <Motion> "lappend x Motion%#(%x,%y)"
731		event gen .t.f <Motion> -serial 100 -x 100 -y 200 -when tail
732		update
733		event gen .t.f <Motion> -serial 101 -x 200 -y 300 -when tail
734		event gen .t.f <Motion> -serial 102 -x 300 -y 400 -when tail
	731	event generate .t.f <Motion> -serial 100 -x 100 -y 200 -when tail
	732	update
	733	event generate .t.f <Motion> -serial 101 -x 200 -y 300 -when tail
	734	event generate .t.f <Motion> -serial 102 -x 300 -y 400 -when tail
735	735	update
736	736	return $x
737	737	} -cleanup {

745	745	} -body {
746	746	bind .t.f <Key> "lappend x %K%#"
747	747	bind .t.f <KeyRelease> "lappend x %K%#"
748		event gen .t.f <Key-Shift_L> -serial 100 -when tail
749		event gen .t.f <KeyRelease-Shift_L> -serial 101 -when tail
750		event gen .t.f <Key-Shift_L> -serial 102 -when tail
751		event gen .t.f <KeyRelease-Shift_L> -serial 103 -when tail
	748	event generate .t.f <Key-Shift_L> -serial 100 -when tail
	749	event generate .t.f <KeyRelease-Shift_L> -serial 101 -when tail
	750	event generate .t.f <Key-Shift_L> -serial 102 -when tail
	751	event generate .t.f <KeyRelease-Shift_L> -serial 103 -when tail
752	752	update
753	753	} -cleanup {
754	754	destroy .t.f

762	762	} -body {
763	763	bind .t.f <Key> "lappend x Key%K"
764	764	bind .t.f <KeyRelease> "lappend x Release%K"
765		event gen .t.f <Key> -keysym a
766		event gen .t.f <KeyRelease> -keysym a
767		return $x
768		} -cleanup {
769		destroy .t.f
770		} -result {Keya Releasea}
	765	event generate .t.f <Key> -keysym :
	766	event generate .t.f <KeyRelease> -keysym :
	767	return $x
	768	} -cleanup {
	769	destroy .t.f
	770	} -result {Keycolon Releasecolon}
771	771	test bind-13.14 {Tk_BindEvent procedure: invalid key detail} -setup {
772	772	frame .t.f -class Test -width 150 -height 100
773	773	pack .t.f

777	777	} -body {
778	778	bind .t.f <Key> "lappend x Key%K"
779	779	bind .t.f <KeyRelease> "lappend x Release%K"
780		event gen .t.f <Key> -keycode 0
781		event gen .t.f <KeyRelease> -keycode 0
	780	event generate .t.f <Key> -keycode 0
	781	event generate .t.f <KeyRelease> -keycode 0
782	782	return $x
783	783	} -cleanup {
784	784	destroy .t.f

792	792	} -body {
793	793	bind .t.f <Button> "lappend x Button%b"
794	794	bind .t.f <ButtonRelease> "lappend x Release%b"
795		event gen .t.f <Button> -button 1
796		event gen .t.f <ButtonRelease> -button 3
	795	event generate .t.f <Button> -button 1
	796	event generate .t.f <ButtonRelease> -button 3
797	797	set x
798	798	} -cleanup {
799	799	destroy .t.f

806	806	set x {}
807	807	} -body {
808	808	bind .t.f <<Paste>> "lappend x Paste"
809		event gen .t.f <<Paste>>
	809	event generate .t.f <<Paste>>
810	810	return $x
811	811	} -cleanup {
812	812	destroy .t.f

819	819	set x {}
820	820	} -body {
821	821	bind .t.f <<Paste>> "lappend x Paste"
822		event gen .t.f <<Paste>>
	822	event generate .t.f <<Paste>>
823	823	return $x
824	824	} -cleanup {
825	825	destroy .t.f

834	834	bind .t.f <Button-2> {set x Button-2}
835	835	event add <<Paste>> <Button-2>
836	836	bind .t.f <<Paste>> {set x Paste}
837		event gen .t.f <Button-2>
	837	event generate .t.f <Button-2>
838	838	return $x
839	839	} -cleanup {
840	840	destroy .t.f

850	850	} -body {
851	851	event add <<Paste>> <Button-2>
852	852	bind .t.f <<Paste>> {set x Paste}
853		event gen .t.f <Button-2>
	853	event generate .t.f <Button-2>
854	854	return $x
855	855	} -cleanup {
856	856	destroy .t.f

865	865	} -body {
866	866	event add <<Paste>> <Button-2>
867	867	bind .t.f <<Paste>> "lappend x Paste"
868		event gen .t.f <Button-2>
	868	event generate .t.f <Button-2>
869	869	return $x
870	870	} -cleanup {
871	871	destroy .t.f

880	880	} -body {
881	881	event add <<Paste>> <Button-2>
882	882	bind .t.f <<Paste>> "lappend x Paste"
883		event gen .t.f <Button>
	883	event generate .t.f <Button>
884	884	return $x
885	885	} -cleanup {
886	886	destroy .t.f

896	896	bind .t.f <Button> {set x Button}
897	897	event add <<Paste>> <Button>
898	898	bind .t.f <<Paste>> {set x Paste}
899		event gen .t.f <Button-2>
	899	event generate .t.f <Button-2>
900	900	return $x
901	901	} -cleanup {
902	902	destroy .t.f

911	911	} -body {
912	912	event add <<Paste>> <Button>
913	913	bind .t.f <<Paste>> {set x Paste}
914		event gen .t.f <Button-2>
	914	event generate .t.f <Button-2>
915	915	return $x
916	916	} -cleanup {
917	917	destroy .t.f

926	926	} -body {
927	927	event add <<Paste>> <Button>
928	928	bind .t.f <<Paste>> "lappend x Paste"
929		event gen .t.f <Button-2>
	929	event generate .t.f <Button-2>
930	930	return $x
931	931	} -cleanup {
932	932	destroy .t.f

941	941	} -body {
942	942	event add <<Paste>> <Key>
943	943	bind .t.f <<Paste>> "lappend x Paste"
944		event gen .t.f <Button>
	944	event generate .t.f <Button>
945	945	return $x
946	946	} -cleanup {
947	947	destroy .t.f

961	961	bind .t.f <Button> "lappend x Button"
962	962	bind .t.f <<Copy>> "lappend x Copy"
963	963
964		event gen .t.f <Button-2>
	964	event generate .t.f <Button-2>
965	965	bind .t.f <Button-2> {}
966		event gen .t.f <Button-2>
	966	event generate .t.f <Button-2>
967	967	bind .t.f <<Paste>> {}
968		event gen .t.f <Button-2>
	968	event generate .t.f <Button-2>
969	969	bind .t.f <Button> {}
970		event gen .t.f <Button-2>
	970	event generate .t.f <Button-2>
971	971	bind .t.f <<Copy>> {}
972		event gen .t.f <Button-2>
	972	event generate .t.f <Button-2>
973	973	return $x
974	974	} -cleanup {
975	975	destroy .t.f

984	984	set x {}
985	985	} -body {
986	986	bind .t.f <Button-2> {set x Button-2}
987		event gen .t.f <Button-2>
	987	event generate .t.f <Button-2>
988	988	return $x
989	989	} -cleanup {
990	990	destroy .t.f

998	998	} -body {
999	999	event add <<Paste>> <Button-2>
1000	1000	bind .t.f <<Paste>> {set x Paste}
1001		event gen .t.f <Button-2>
	1001	event generate .t.f <Button-2>
1002	1002	return $x
1003	1003	} -cleanup {
1004	1004	destroy .t.f

1012	1012	set x {}
1013	1013	} -body {
1014	1014	bind .t.f <Button> {set x Button}
1015		event gen .t.f <Button-2>
	1015	event generate .t.f <Button-2>
1016	1016	return $x
1017	1017	} -cleanup {
1018	1018	destroy .t.f

1026	1026	} -body {
1027	1027	event add <<Paste>> <Button>
1028	1028	bind .t.f <<Paste>> {set x Paste}
1029		event gen .t.f <Button-2>
	1029	event generate .t.f <Button-2>
1030	1030	return $x
1031	1031	} -cleanup {
1032	1032	destroy .t.f

1038	1038	focus -force .t.f
1039	1039	update
1040	1040	} -body {
1041		event gen .t.f <Button-2>
	1041	event generate .t.f <Button-2>
1042	1042	} -cleanup {
1043	1043	destroy .t.f
1044	1044	} -result {}

1050	1050	set x {}
1051	1051	} -body {
1052	1052	bind .t.f <Button-2> {set x Button-2}
1053		event gen .t.f <Button-2>
	1053	event generate .t.f <Button-2>
1054	1054	return $x
1055	1055	} -cleanup {
1056	1056	destroy .t.f

1068	1068	foreach p [bindtags .t.f] {
1069	1069	testcbind $p <1> "lappend x $p"
1070	1070	}
1071		event gen .t.f <1>
	1071	event generate .t.f <1>
1072	1072	return $x
1073	1073	} -cleanup {
1074	1074	foreach p [bindtags .t.f] {bind $p <1> {}}

1083	1083	} -body {
1084	1084	bind .t.f <Button-2> {lappend x .t.f}
1085	1085	bind Test <Button-2> {lappend x Button}
1086		event gen .t.f <Button-2>
	1086	event generate .t.f <Button-2>
1087	1087	return $x
1088	1088	} -cleanup {
1089	1089	destroy .t.f

1099	1099	set x {}
1100	1100	} -body {
1101	1101	testcbind .t.f <1> {lappend x 1}
1102		event gen .t.f <1>
	1102	event generate .t.f <1>
1103	1103	return $x
1104	1104	} -cleanup {
1105	1105	destroy .t.f

1115	1115	} -body {
1116	1116	testcbind Test <1> {lappend x Test} {lappend x Deleted}
1117	1117	bind .t.f <1> {lappend x .t.f; destroy .t.f}
1118		event gen .t.f <1>
	1118	event generate .t.f <1>
1119	1119	set y [list $x [bind Test]]
1120	1120	return $y
1121	1121	} -cleanup {

1133	1133	} -body {
1134	1134	testcbind Test <1> {lappend x Test} {lappend x Deleted}
1135	1135	bind .t.f <1> {lappend x .t.f; bind Test <1> {}; lappend x after}
1136		event gen .t.f <1>
	1136	event generate .t.f <1>
1137	1137	return $x
1138	1138	} -cleanup {
1139	1139	destroy .t.f

1150	1150	} -body {
1151	1151	testcbind Test <1> {lappend x Test}
1152	1152	bind .t.f <1> {lappend x .t.f}
1153		event gen .t.f <1>
	1153	event generate .t.f <1>
1154	1154	return $x
1155	1155	} -cleanup {
1156	1156	destroy .t.f

1166	1166	set x {}
1167	1167	} -body {
1168	1168	testcbind .t.f <1> {lappend x hi; bind .t.f <1> {}} {lappend x bye}
1169		event gen .t.f <1>
	1169	event generate .t.f <1>
1170	1170	return $x
1171	1171	} -cleanup {
1172	1172	destroy .t.f

1186	1186	bind .t.f <1> {}
1187	1187	} else {
1188	1188	set n [expr $n-1]
1189		event gen .t.f <1>
	1189	event generate .t.f <1>
1190	1190	}
1191	1191	lappend x after$n
1192	1192	} {lappend x Deleted}
1193	1193	set n 3
1194		event gen .t.f <1>
	1194	event generate .t.f <1>
1195	1195	return $x
1196	1196	} -cleanup {
1197	1197	destroy .t.f

1205	1205	} -body {
1206	1206	bind .t.f <Button-2> {lappend x b1; continue; lappend x b2}
1207	1207	bind Test <Button-2> {lappend x B1; continue; lappend x B2}
1208		event gen .t.f <Button-2>
	1208	event generate .t.f <Button-2>
1209	1209	return $x
1210	1210	} -cleanup {
1211	1211	destroy .t.f

1222	1222	} -body {
1223	1223	testcbind .t.f <Button-2> {lappend x b1; continue; lappend x b2}
1224	1224	testcbind Test <Button-2> {lappend x B1; continue; lappend x B2}
1225		event gen .t.f <Button-2>
	1225	event generate .t.f <Button-2>
1226	1226	return $x
1227	1227	} -cleanup {
1228	1228	destroy .t.f

1237	1237	} -body {
1238	1238	bind .t.f <Button-2> {lappend x b1; break; lappend x b2}
1239	1239	bind Test <Button-2> {lappend x B1; break; lappend x B2}
1240		event gen .t.f <Button-2>
	1240	event generate .t.f <Button-2>
1241	1241	return $x
1242	1242	} -cleanup {
1243	1243	destroy .t.f

1254	1254	} -body {
1255	1255	testcbind .t.f <Button-2> {lappend x b1; break; lappend x b2}
1256	1256	testcbind Test <Button-2> {lappend x B1; break; lappend x B2}
1257		event gen .t.f <Button-2>
	1257	event generate .t.f <Button-2>
1258	1258	return $x
1259	1259	} -cleanup {
1260	1260	destroy .t.f

1275	1275	} -body {
1276	1276	bind .t.f <Button-2> {lappend x b1; blap}
1277	1277	bind Test <Button-2> {lappend x B1}
1278		event gen .t.f <Button-2>
	1278	event generate .t.f <Button-2>
1279	1279	update
1280	1280	return $x
1281	1281	} -cleanup {

1298	1298	} -body {
1299	1299	testcbind .t.f <Button-2> {lappend x b1; blap}
1300	1300	testcbind Test <Button-2> {lappend x B1}
1301		event gen .t.f <Button-2>
	1301	event generate .t.f <Button-2>
1302	1302	update
1303	1303	return $x
1304	1304	} -cleanup {

1352	1352	testcbind b <1> "destroy .t.f; lappend x b1" "lappend x bye.t1"
1353	1353	testcbind c <1> "lappend x c1" "lappend x bye.c1"
1354	1354	testcbind d <1> "lappend x d1" "lappend x bye.d1"
1355		bind a <2> "event gen .t.f <1>"
	1355	bind a <2> "event generate .t.f <1>"
1356	1356	testcbind b <2> "lappend x b2" "lappend x bye.t2"
1357	1357	testcbind c <2> "lappend x c2" "lappend x bye.d2"
1358	1358	bind d <2> "lappend x d2"
1359		testcbind a <3> "event gen .t.f <2>"
1360		event gen .t.f <3>
	1359	testcbind a <3> "event generate .t.f <2>"
	1360	event generate .t.f <3>
1361	1361	return $x
1362	1362	} -cleanup {
1363	1363	destroy .t.f

1374	1374	focus -force .t.f
1375	1375	update
1376	1376	} -body {
	1377	bind .t.f 12 {set x 1}
	1378	set x 0
	1379	event generate .t.f <Key-1>
	1380	event generate .t.f <KeyRelease-1>
	1381	event generate .t.f <Key-2>
	1382	event generate .t.f <KeyRelease-2>
	1383	return $x
	1384	} -cleanup {
	1385	destroy .t.f
	1386	} -result {1}
	1387	test bind-15.2 {MatchPatterns procedure, ignoring type mismatches} -setup {
	1388	frame .t.f -class Test -width 150 -height 100
	1389	pack .t.f
	1390	focus -force .t.f
	1391	update
	1392	} -body {
	1393	bind .t.f 12 {set x 1}
	1394	set x 0
	1395	event generate .t.f <Key-1>
	1396	event generate .t.f <Enter>
	1397	event generate .t.f <KeyRelease-1>
	1398	event generate .t.f <Leave>
	1399	event generate .t.f <Key-2>
	1400	event generate .t.f <KeyRelease-2>
	1401	return $x
	1402	} -cleanup {
	1403	destroy .t.f
	1404	} -result {1}
	1405	test bind-15.3 {MatchPatterns procedure, ignoring type mismatches} -setup {
	1406	frame .t.f -class Test -width 150 -height 100
	1407	pack .t.f
	1408	focus -force .t.f
	1409	update
	1410	} -body {
	1411	bind .t.f 12 {set x 1}
	1412	set x 0
	1413	event generate .t.f <Key-1>
	1414	event generate .t.f <Button-1>
	1415	event generate .t.f <Key-2>
	1416	return $x
	1417	} -cleanup {
	1418	destroy .t.f
	1419	} -result {0}
	1420	test bind-15.4 {MatchPatterns procedure, ignoring type mismatches} -setup {
	1421	frame .t.f -class Test -width 150 -height 100
	1422	pack .t.f
	1423	focus -force .t.f
	1424	update
	1425	} -body {
	1426	bind .t.f <Double-1> {set x 1}
	1427	set x 0
	1428	event generate .t.f <Button-1>
	1429	event generate .t.f <ButtonRelease-1>
	1430	event generate .t.f <Button-1>
	1431	event generate .t.f <ButtonRelease-1>
	1432	return $x
	1433	} -cleanup {
	1434	destroy .t.f
	1435	} -result {1}
	1436	test bind-15.5 {MatchPatterns procedure, ignoring type mismatches} -setup {
	1437	frame .t.f -class Test -width 150 -height 100
	1438	pack .t.f
	1439	focus -force .t.f
	1440	update
	1441	} -body {
	1442	bind .t.f <Double-ButtonRelease> {set x 1}
	1443	set x 0
	1444	event generate .t.f <Button-1>
	1445	event generate .t.f <ButtonRelease-1>
	1446	event generate .t.f <Button-2>
	1447	event generate .t.f <ButtonRelease-2>
	1448	return $x
	1449	} -cleanup {
	1450	destroy .t.f
	1451	} -result {1}
	1452	test bind-15.6 {MatchPatterns procedure, ignoring type mismatches} -setup {
	1453	frame .t.f -class Test -width 150 -height 100
	1454	pack .t.f
	1455	focus -force .t.f
	1456	update
	1457	} -body {
	1458	bind .t.f <Double-1> {set x 1}
	1459	set x 0
	1460	event generate .t.f <Button-1>
	1461	event generate .t.f <Key-a>
	1462	event generate .t.f <ButtonRelease-1>
	1463	event generate .t.f <Button-1>
	1464	event generate .t.f <ButtonRelease-1>
	1465	return $x
	1466	} -cleanup {
	1467	destroy .t.f
	1468	} -result {0}
	1469	test bind-15.7 {MatchPatterns procedure, ignoring type mismatches} -setup {
	1470	frame .t.f -class Test -width 150 -height 100
	1471	pack .t.f
	1472	focus -force .t.f
	1473	update
	1474	} -body {
	1475	bind .t.f <Double-1> {set x 1}
	1476	set x 0
	1477	event generate .t.f <Button-1>
	1478	event generate .t.f <Key-Shift_L>
	1479	event generate .t.f <ButtonRelease-1>
	1480	event generate .t.f <Button-1>
	1481	event generate .t.f <ButtonRelease-1>
	1482	return $x
	1483	} -cleanup {
	1484	destroy .t.f
	1485	} -result {1}
	1486	test bind-15.8 {MatchPatterns procedure, ignoring type mismatches} -setup {
	1487	frame .t.f -class Test -width 150 -height 100
	1488	pack .t.f
	1489	focus -force .t.f
	1490	update
	1491	} -body {
1377	1492	bind .t.f ab {set x 1}
1378	1493	set x 0
1379		event gen .t.f <Key-a>
1380		event gen .t.f <KeyRelease-a>
1381		event gen .t.f <Key-b>
1382		event gen .t.f <KeyRelease-b>
1383		return $x
1384		} -cleanup {
1385		destroy .t.f
1386		} -result {1}
1387		test bind-15.2 {MatchPatterns procedure, ignoring type mismatches} -setup {
1388		frame .t.f -class Test -width 150 -height 100
1389		pack .t.f
1390		focus -force .t.f
1391		update
1392		} -body {
1393		bind .t.f ab {set x 1}
1394		set x 0
1395		event gen .t.f <Key-a>
1396		event gen .t.f <Enter>
1397		event gen .t.f <KeyRelease-a>
1398		event gen .t.f <Leave>
1399		event gen .t.f <Key-b>
1400		event gen .t.f <KeyRelease-b>
1401		return $x
1402		} -cleanup {
1403		destroy .t.f
1404		} -result {1}
1405		test bind-15.3 {MatchPatterns procedure, ignoring type mismatches} -setup {
1406		frame .t.f -class Test -width 150 -height 100
1407		pack .t.f
1408		focus -force .t.f
1409		update
1410		} -body {
1411		bind .t.f ab {set x 1}
1412		set x 0
1413		event gen .t.f <Key-a>
1414		event gen .t.f <Button-1>
1415		event gen .t.f <Key-b>
1416		return $x
1417		} -cleanup {
1418		destroy .t.f
1419		} -result {0}
1420		test bind-15.4 {MatchPatterns procedure, ignoring type mismatches} -setup {
1421		frame .t.f -class Test -width 150 -height 100
1422		pack .t.f
1423		focus -force .t.f
1424		update
1425		} -body {
1426		bind .t.f <Double-1> {set x 1}
1427		set x 0
1428		event gen .t.f <Button-1>
1429		event gen .t.f <ButtonRelease-1>
1430		event gen .t.f <Button-1>
1431		event gen .t.f <ButtonRelease-1>
1432		return $x
1433		} -cleanup {
1434		destroy .t.f
1435		} -result {1}
1436		test bind-15.5 {MatchPatterns procedure, ignoring type mismatches} -setup {
1437		frame .t.f -class Test -width 150 -height 100
1438		pack .t.f
1439		focus -force .t.f
1440		update
1441		} -body {
1442		bind .t.f <Double-ButtonRelease> {set x 1}
1443		set x 0
1444		event gen .t.f <Button-1>
1445		event gen .t.f <ButtonRelease-1>
1446		event gen .t.f <Button-2>
1447		event gen .t.f <ButtonRelease-2>
1448		return $x
1449		} -cleanup {
1450		destroy .t.f
1451		} -result {1}
1452		test bind-15.6 {MatchPatterns procedure, ignoring type mismatches} -setup {
1453		frame .t.f -class Test -width 150 -height 100
1454		pack .t.f
1455		focus -force .t.f
1456		update
1457		} -body {
1458		bind .t.f <Double-1> {set x 1}
1459		set x 0
1460		event gen .t.f <Button-1>
1461		event gen .t.f <Key-a>
1462		event gen .t.f <ButtonRelease-1>
1463		event gen .t.f <Button-1>
1464		event gen .t.f <ButtonRelease-1>
1465		return $x
1466		} -cleanup {
1467		destroy .t.f
1468		} -result {0}
1469		test bind-15.7 {MatchPatterns procedure, ignoring type mismatches} -setup {
1470		frame .t.f -class Test -width 150 -height 100
1471		pack .t.f
1472		focus -force .t.f
1473		update
1474		} -body {
1475		bind .t.f <Double-1> {set x 1}
1476		set x 0
1477		event gen .t.f <Button-1>
1478		event gen .t.f <Key-Shift_L>
1479		event gen .t.f <ButtonRelease-1>
1480		event gen .t.f <Button-1>
1481		event gen .t.f <ButtonRelease-1>
1482		return $x
1483		} -cleanup {
1484		destroy .t.f
1485		} -result {1}
1486		test bind-15.8 {MatchPatterns procedure, ignoring type mismatches} -setup {
1487		frame .t.f -class Test -width 150 -height 100
1488		pack .t.f
1489		focus -force .t.f
1490		update
1491		} -body {
1492		bind .t.f ab {set x 1}
1493		set x 0
1494		event gen .t.f <Key-a>
1495		event gen .t.f <Key-c>
1496		event gen .t.f <Key-b>
	1494	event generate .t.f <Key-a>
	1495	event generate .t.f <Key-c>
	1496	event generate .t.f <Key-b>
1497	1497	return $x
1498	1498	} -cleanup {
1499	1499	destroy .t.f

1506	1506	} -body {
1507	1507	bind .t.f <M1-M2-Key> {set x 1}
1508	1508	set x 0
1509		event gen .t.f <Key-a> -state 0x18
	1509	event generate .t.f <Key-a> -state 0x18
1510	1510	return $x
1511	1511	} -cleanup {
1512	1512	destroy .t.f

1519	1519	} -body {
1520	1520	bind .t.f <M1-M2-Key> {set x 1}
1521	1521	set x 0
1522		event gen .t.f <Key-a> -state 0xfc
	1522	event generate .t.f <Key-a> -state 0xfc
1523	1523	return $x
1524	1524	} -cleanup {
1525	1525	destroy .t.f

1532	1532	} -body {
1533	1533	bind .t.f <M1-M2-Key> {set x 1}
1534	1534	set x 0
1535		event gen .t.f <Key-a> -state 0x8
	1535	event generate .t.f <Key-a> -state 0x8
1536	1536	return $x
1537	1537	} -cleanup {
1538	1538	destroy .t.f

1549	1549	# differently on some platforms.
1550	1550	bind .t.f aB {set x 1}
1551	1551	set x 0
1552		event gen .t.f <Key-a>
1553		event gen .t.f <Key-Shift_L>
1554		event gen .t.f <Key-b> -state 1
	1552	event generate .t.f <Key-a>
	1553	event generate .t.f <Key-Shift_L>
	1554	event generate .t.f <Key-b> -state 1
1555	1555	return $x
1556	1556	} -cleanup {
1557	1557	destroy .t.f

1564	1564	} -body {
1565	1565	bind .t.f ab {set x 1}
1566	1566	set x 0
1567		event gen .t.f <Key-a>
1568		event gen .t.f <Key-c>
	1567	event generate .t.f <Key-a>
	1568	event generate .t.f <Key-c>
1569	1569	return $x
1570	1570	} -cleanup {
1571	1571	destroy .t.f

1578	1578	} -body {
1579	1579	bind .t.f <Double-1> {set x 1}
1580	1580	set x 0
1581		event gen .t.f <Button-2>
1582		event gen .t.f <ButtonRelease-2>
1583		event gen .t.f <Button-1> -x 30 -y 40
1584		event gen .t.f <Button-1> -x 31 -y 39
1585		event gen .t.f <ButtonRelease-1>
	1581	event generate .t.f <Button-2>
	1582	event generate .t.f <ButtonRelease-2>
	1583	event generate .t.f <Button-1> -x 30 -y 40
	1584	event generate .t.f <Button-1> -x 31 -y 39
	1585	event generate .t.f <ButtonRelease-1>
1586	1586	return $x
1587	1587	} -cleanup {
1588	1588	destroy .t.f

1595	1595	} -body {
1596	1596	bind .t.f <Double-1> {set x 1}
1597	1597	set x 0
1598		event gen .t.f <Button-2>
1599		event gen .t.f <ButtonRelease-2>
1600		event gen .t.f <Button-1> -x 30 -y 40
1601		event gen .t.f <Button-1> -x 29 -y 41
1602		event gen .t.f <ButtonRelease-1>
	1598	event generate .t.f <Button-2>
	1599	event generate .t.f <ButtonRelease-2>
	1600	event generate .t.f <Button-1> -x 30 -y 40
	1601	event generate .t.f <Button-1> -x 29 -y 41
	1602	event generate .t.f <ButtonRelease-1>
1603	1603	return $x
1604	1604	} -cleanup {
1605	1605	destroy .t.f

1612	1612	} -body {
1613	1613	bind .t.f <Double-1> {set x 1}
1614	1614	set x 0
1615		event gen .t.f <Button-2>
1616		event gen .t.f <ButtonRelease-2>
1617		event gen .t.f <Button-1> -x 30 -y 40
1618		event gen .t.f <Button-1> -x 40 -y 40
1619		event gen .t.f <ButtonRelease-2>
	1615	event generate .t.f <Button-2>
	1616	event generate .t.f <ButtonRelease-2>
	1617	event generate .t.f <Button-1> -x 30 -y 40
	1618	event generate .t.f <Button-1> -x 40 -y 40
	1619	event generate .t.f <ButtonRelease-2>
1620	1620	return $x
1621	1621	} -cleanup {
1622	1622	destroy .t.f

1629	1629	} -body {
1630	1630	bind .t.f <Double-1> {set x 1}
1631	1631	set x 0
1632		event gen .t.f <Button-2>
1633		event gen .t.f <ButtonRelease-2>
1634		event gen .t.f <Button-1> -x 30 -y 40
1635		event gen .t.f <Button-1> -x 20 -y 40
1636		event gen .t.f <ButtonRelease-1>
	1632	event generate .t.f <Button-2>
	1633	event generate .t.f <ButtonRelease-2>
	1634	event generate .t.f <Button-1> -x 30 -y 40
	1635	event generate .t.f <Button-1> -x 20 -y 40
	1636	event generate .t.f <ButtonRelease-1>
1637	1637	return $x
1638	1638	} -cleanup {
1639	1639	destroy .t.f

1646	1646	} -body {
1647	1647	bind .t.f <Double-1> {set x 1}
1648	1648	set x 0
1649		event gen .t.f <Button-2>
1650		event gen .t.f <ButtonRelease-2>
1651		event gen .t.f <Button-1> -x 30 -y 40
1652		event gen .t.f <Button-1> -x 30 -y 30
1653		event gen .t.f <ButtonRelease-1>
	1649	event generate .t.f <Button-2>
	1650	event generate .t.f <ButtonRelease-2>
	1651	event generate .t.f <Button-1> -x 30 -y 40
	1652	event generate .t.f <Button-1> -x 30 -y 30
	1653	event generate .t.f <ButtonRelease-1>
1654	1654	return $x
1655	1655	} -cleanup {
1656	1656	destroy .t.f

1663	1663	} -body {
1664	1664	bind .t.f <Double-1> {set x 1}
1665	1665	set x 0
1666		event gen .t.f <Button-2>
1667		event gen .t.f <ButtonRelease-2>
1668		event gen .t.f <Button-1> -x 30 -y 40
1669		event gen .t.f <Button-1> -x 30 -y 50
1670		event gen .t.f <ButtonRelease-1>
	1666	event generate .t.f <Button-2>
	1667	event generate .t.f <ButtonRelease-2>
	1668	event generate .t.f <Button-1> -x 30 -y 40
	1669	event generate .t.f <Button-1> -x 30 -y 50
	1670	event generate .t.f <ButtonRelease-1>
1671	1671	return $x
1672	1672	} -cleanup {
1673	1673	destroy .t.f

1680	1680	} -body {
1681	1681	bind .t.f <Double-1> {set x 1}
1682	1682	set x 0
1683		event gen .t.f <Button-2>
1684		event gen .t.f <ButtonRelease-2>
1685		event gen .t.f <Button-1> -time 300
1686		event gen .t.f <Button-1> -time 700
1687		event gen .t.f <ButtonRelease-1>
	1683	event generate .t.f <Button-2>
	1684	event generate .t.f <ButtonRelease-2>
	1685	event generate .t.f <Button-1> -time 300
	1686	event generate .t.f <Button-1> -time 700
	1687	event generate .t.f <ButtonRelease-1>
1688	1688	return $x
1689	1689	} -cleanup {
1690	1690	destroy .t.f

1697	1697	} -body {
1698	1698	bind .t.f <Double-1> {set x 1}
1699	1699	set x 0
1700		event gen .t.f <Button-2>
1701		event gen .t.f <ButtonRelease-2>
1702		event gen .t.f <Button-1> -time 300
1703		event gen .t.f <Button-1> -time 900
1704		event gen .t.f <ButtonRelease-1>
	1700	event generate .t.f <Button-2>
	1701	event generate .t.f <ButtonRelease-2>
	1702	event generate .t.f <Button-1> -time 300
	1703	event generate .t.f <Button-1> -time 900
	1704	event generate .t.f <ButtonRelease-1>
1705	1705	return $x
1706	1706	} -cleanup {
1707	1707	destroy .t.f

1714	1714	} -body {
1715	1715	bind .t.f <Double-1> {set x 1}
1716	1716	set x 0
1717		event gen .t.f <Button-1> -time [expr -100]
1718		event gen .t.f <Button-1> -time 200
1719		event gen .t.f <ButtonRelease-1>
	1717	event generate .t.f <Button-1> -time [expr -100]
	1718	event generate .t.f <Button-1> -time 200
	1719	event generate .t.f <ButtonRelease-1>
1720	1720	return $x
1721	1721	} -cleanup {
1722	1722	destroy .t.f

1729	1729	} -body {
1730	1730	bind .t.f <Double-1> {set x 1}
1731	1731	set x 0
1732		event gen .t.f <Button-1> -time -100
1733		event gen .t.f <Button-1> -time 500
1734		event gen .t.f <ButtonRelease-1>
	1732	event generate .t.f <Button-1> -time -100
	1733	event generate .t.f <Button-1> -time 500
	1734	event generate .t.f <ButtonRelease-1>
1735	1735	return $x
1736	1736	} -cleanup {
1737	1737	destroy .t.f

1746	1746	} -body {
1747	1747	event add <<Paste>> <Button-1>
1748	1748	bind .t.f <<Paste>> {lappend x paste}
1749		event gen .t.f <Button-1>
1750		event gen .t.f <ButtonRelease-1>
	1749	event generate .t.f <Button-1>
	1750	event generate .t.f <ButtonRelease-1>
1751	1751	set x
1752	1752	} -cleanup {
1753	1753	destroy .t.f

1762	1762	} -body {
1763	1763	event add <<Paste>> <Shift-Button-1>
1764	1764	bind .t.f <<Paste>> {lappend x paste}
1765		event gen .t.f <Button-1>
1766		event gen .t.f <ButtonRelease-1>
	1765	event generate .t.f <Button-1>
	1766	event generate .t.f <ButtonRelease-1>
1767	1767	set x
1768	1768	} -cleanup {
1769	1769	destroy .t.f

1780	1780	event add <<V2>> <Button-1>
1781	1781	event add <<V3>> <Shift-Button-1>
1782	1782	bind .t.f <<V2>> "lappend x V2%#"
1783		event gen .t.f <Button> -serial 101
1784		event gen .t.f <Button-1> -serial 102
1785		event gen .t.f <Shift-Button-1> -serial 103
1786		event gen .t.f <ButtonRelease-1>
	1783	event generate .t.f <Button> -serial 101
	1784	event generate .t.f <Button-1> -serial 102
	1785	event generate .t.f <Shift-Button-1> -serial 103
	1786	event generate .t.f <ButtonRelease-1>
1787	1787	bind .t.f <Shift-Button-1> "lappend x Shift-Button-1"
1788		event gen .t.f <Button> -serial 104
1789		event gen .t.f <Button-1> -serial 105
1790		event gen .t.f <Shift-Button-1> -serial 106
1791		event gen .t.f <ButtonRelease-1>
	1788	event generate .t.f <Button> -serial 104
	1789	event generate .t.f <Button-1> -serial 105
	1790	event generate .t.f <Shift-Button-1> -serial 106
	1791	event generate .t.f <ButtonRelease-1>
1792	1792	set x
1793	1793	} -cleanup {
1794	1794	destroy .t.f

1803	1803	update
1804	1804	} -body {
1805	1805	bind .t.f <KeyPress> {set x 0}
1806		bind .t.f a {set x 1}
	1806	bind .t.f 1 {set x 1}
1807	1807	set x none
1808		event gen .t.f <Key-a>
	1808	event generate .t.f <Key-1>
1809	1809	return $x
1810	1810	} -cleanup {
1811	1811	destroy .t.f

1817	1817	update
1818	1818	} -body {
1819	1819	bind .t.f <KeyPress> {set x 0}
1820		bind .t.f a {set x 1}
	1820	bind .t.f 1 {set x 1}
1821	1821	set x none
1822		event gen .t.f <Key-b>
	1822	event generate .t.f <Key-2>
1823	1823	return $x
1824	1824	} -cleanup {
1825	1825	destroy .t.f

1831	1831	update
1832	1832	} -body {
1833	1833	bind .t.f <KeyPress> {lappend x 0}
1834		bind .t.f a {lappend x 1}
1835		bind .t.f ba {lappend x 2}
	1834	bind .t.f 1 {lappend x 1}
	1835	bind .t.f 21 {lappend x 2}
1836	1836	set x none
1837		event gen .t.f <Key-b>
1838		event gen .t.f <KeyRelease-b>
1839		event gen .t.f <Key-a>
	1837	event generate .t.f <Key-2>
	1838	event generate .t.f <KeyRelease-2>
	1839	event generate .t.f <Key-1>
1840	1840	set x
1841	1841	} -cleanup {
1842	1842	destroy .t.f

1850	1850	bind .t.f <ButtonPress> {set x 0}
1851	1851	bind .t.f <1> {set x 1}
1852	1852	set x none
1853		event gen .t.f <Button-1>
1854		event gen .t.f <ButtonRelease-1>
	1853	event generate .t.f <Button-1>
	1854	event generate .t.f <ButtonRelease-1>
1855	1855	return $x
1856	1856	} -cleanup {
1857	1857	destroy .t.f

1865	1865	} -body {
1866	1866	bind .t.f <M1-Key> {set x 0}
1867	1867	bind .t.f <M2-Key> {set x 1}
1868		event gen .t.f <Key-a> -state 0x18
	1868	event generate .t.f <Key-a> -state 0x18
1869	1869	return $x
1870	1870	} -cleanup {
1871	1871	destroy .t.f

1879	1879	bind .t.f <M2-Key> {set x 0}
1880	1880	bind .t.f <M1-Key> {set x 1}
1881	1881	set x none
1882		event gen .t.f <Key-a> -state 0x18
	1882	event generate .t.f <Key-a> -state 0x18
1883	1883	return $x
1884	1884	} -cleanup {
1885	1885	destroy .t.f

1894	1894	bind .t.f <1> {lappend x single}
1895	1895	bind Test <1> {lappend x single(Test)}
1896	1896	bind Test <Double-1> {lappend x double(Test)}
1897		event gen .t.f <Button-1>
1898		event gen .t.f <Button-1>
1899		event gen .t.f <Button-1>
1900		event gen .t.f <ButtonRelease-1>
	1897	event generate .t.f <Button-1>
	1898	event generate .t.f <Button-1>
	1899	event generate .t.f <Button-1>
	1900	event generate .t.f <ButtonRelease-1>
1901	1901	set x
1902	1902	} -cleanup {
1903	1903	destroy .t.f

1914	1914	} -body {
1915	1915	bind .t.f <Enter> {set x abcd}
1916	1916	set x none
1917		event gen .t.f <Enter>
	1917	event generate .t.f <Enter>
1918	1918	set x
1919	1919	} -cleanup {
1920	1920	destroy .t.f

1927	1927	} -body {
1928	1928	bind .t.f <Enter> {set x %#}
1929	1929	set x none
1930		event gen .t.f <Enter> -serial 1234
	1930	event generate .t.f <Enter> -serial 1234
1931	1931	set x
1932	1932	} -cleanup {
1933	1933	destroy .t.f

1940	1940	} -body {
1941	1941	bind .t.f <Configure> {set x %a}
1942	1942	set x none
1943		event gen .t.f <Configure> -above .t -window .t.f
	1943	event generate .t.f <Configure> -above .t -window .t.f
1944	1944	set x
1945	1945	} -cleanup {
1946	1946	destroy .t.f

1953	1953	} -body {
1954	1954	bind .t.f <Button> {set x %b}
1955	1955	set x none
1956		event gen .t.f <Button-3>
1957		event gen .t.f <ButtonRelease-3>
	1956	event generate .t.f <Button-3>
	1957	event generate .t.f <ButtonRelease-3>
1958	1958	set x
1959	1959	} -cleanup {
1960	1960	destroy .t.f

1967	1967	} -body {
1968	1968	bind .t.f <Expose> {set x %c}
1969	1969	set x none
1970		event gen .t.f <Expose> -count 47
	1970	event generate .t.f <Expose> -count 47
1971	1971	set x
1972	1972	} -cleanup {
1973	1973	destroy .t.f

1980	1980	} -body {
1981	1981	bind .t.f <Enter> {set x %d}
1982	1982	set x none
1983		event gen .t.f <Enter> -detail NotifyAncestor
	1983	event generate .t.f <Enter> -detail NotifyAncestor
1984	1984	set x
1985	1985	} -cleanup {
1986	1986	destroy .t.f

1993	1993	} -body {
1994	1994	bind .t.f <Enter> {set x %d}
1995	1995	set x none
1996		event gen .t.f <Enter> -detail NotifyVirtual
	1996	event generate .t.f <Enter> -detail NotifyVirtual
1997	1997	set x
1998	1998	} -cleanup {
1999	1999	destroy .t.f

2006	2006	} -body {
2007	2007	bind .t.f <Enter> {set x %d}
2008	2008	set x none
2009		event gen .t.f <Enter> -detail NotifyNonlinear
	2009	event generate .t.f <Enter> -detail NotifyNonlinear
2010	2010	set x
2011	2011	} -cleanup {
2012	2012	destroy .t.f

2019	2019	} -body {
2020	2020	bind .t.f <Enter> {set x %d}
2021	2021	set x none
2022		event gen .t.f <Enter> -detail NotifyNonlinearVirtual
	2022	event generate .t.f <Enter> -detail NotifyNonlinearVirtual
2023	2023	set x
2024	2024	} -cleanup {
2025	2025	destroy .t.f

2032	2032	} -body {
2033	2033	bind .t.f <Enter> {set x %d}
2034	2034	set x none
2035		event gen .t.f <Enter> -detail NotifyPointer
	2035	event generate .t.f <Enter> -detail NotifyPointer
2036	2036	set x
2037	2037	} -cleanup {
2038	2038	destroy .t.f

2045	2045	} -body {
2046	2046	bind .t.f <Enter> {set x %d}
2047	2047	set x none
2048		event gen .t.f <Enter> -detail NotifyPointerRoot
	2048	event generate .t.f <Enter> -detail NotifyPointerRoot
2049	2049	set x
2050	2050	} -cleanup {
2051	2051	destroy .t.f

2058	2058	} -body {
2059	2059	bind .t.f <Enter> {set x %d}
2060	2060	set x none
2061		event gen .t.f <Enter> -detail NotifyDetailNone
	2061	event generate .t.f <Enter> -detail NotifyDetailNone
2062	2062	set x
2063	2063	} -cleanup {
2064	2064	destroy .t.f

2071	2071	} -body {
2072	2072	bind .t.f <Enter> {set x %f}
2073	2073	set x none
2074		event gen .t.f <Enter> -focus 1
	2074	event generate .t.f <Enter> -focus 1
2075	2075	return $x
2076	2076	} -cleanup {
2077	2077	destroy .t.f

2084	2084	} -body {
2085	2085	bind .t.f <Expose> {set x "%x %y %w %h"}
2086	2086	set x none
2087		event gen .t.f <Expose> -x 24 -y 18 -width 147 -height 61
	2087	event generate .t.f <Expose> -x 24 -y 18 -width 147 -height 61
2088	2088	set x
2089	2089	} -cleanup {
2090	2090	destroy .t.f

2097	2097	} -body {
2098	2098	bind .t.f <Configure> {set x "%x %y %w %h"}
2099	2099	set x none
2100		event gen .t.f <Configure> -x 24 -y 18 -width 147 -height 61 -window .t.f
	2100	event generate .t.f <Configure> -x 24 -y 18 -width 147 -height 61 -window .t.f
2101	2101	set x
2102	2102	} -cleanup {
2103	2103	destroy .t.f

2110	2110	} -body {
2111	2111	bind .t.f <Key> {set x "%k"}
2112	2112	set x none
2113		event gen .t.f <Key> -keycode 146
	2113	event generate .t.f <Key> -keycode 146
2114	2114	set x
2115	2115	} -cleanup {
2116	2116	destroy .t.f

2123	2123	} -body {
2124	2124	bind .t.f <Enter> {set x "%m"}
2125	2125	set x none
2126		event gen .t.f <Enter> -mode NotifyNormal
	2126	event generate .t.f <Enter> -mode NotifyNormal
2127	2127	set x
2128	2128	} -cleanup {
2129	2129	destroy .t.f

2136	2136	} -body {
2137	2137	bind .t.f <Enter> {set x "%m"}
2138	2138	set x none
2139		event gen .t.f <Enter> -mode NotifyGrab
	2139	event generate .t.f <Enter> -mode NotifyGrab
2140	2140	set x
2141	2141	} -cleanup {
2142	2142	destroy .t.f

2149	2149	} -body {
2150	2150	bind .t.f <Enter> {set x "%m"}
2151	2151	set x none
2152		event gen .t.f <Enter> -mode NotifyUngrab
	2152	event generate .t.f <Enter> -mode NotifyUngrab
2153	2153	set x
2154	2154	} -cleanup {
2155	2155	destroy .t.f

2163	2163	} -body {
2164	2164	bind .t.f <Enter> {set x "%m"}
2165	2165	set x none
2166		event gen .t.f <Enter> -mode NotifyWhileGrabbed
	2166	event generate .t.f <Enter> -mode NotifyWhileGrabbed
2167	2167	set x
2168	2168	} -cleanup {
2169	2169	destroy .t.f

2176	2176	} -body {
2177	2177	bind .t.f <Map> {set x "%o"}
2178	2178	set x none
2179		event gen .t.f <Map> -override 1 -window .t.f
	2179	event generate .t.f <Map> -override 1 -window .t.f
2180	2180	return $x
2181	2181	} -cleanup {
2182	2182	destroy .t.f

2189	2189	} -body {
2190	2190	bind .t.f <Reparent> {set x "%o"}
2191	2191	set x none
2192		event gen .t.f <Reparent> -override true -window .t.f
	2192	event generate .t.f <Reparent> -override true -window .t.f
2193	2193	return $x
2194	2194	} -cleanup {
2195	2195	destroy .t.f

2202	2202	} -body {
2203	2203	bind .t.f <Configure> {set x "%o"}
2204	2204	set x none
2205		event gen .t.f <Configure> -override 1 -window .t.f
	2205	event generate .t.f <Configure> -override 1 -window .t.f
2206	2206	return $x
2207	2207	} -cleanup {
2208	2208	destroy .t.f

2215	2215	} -body {
2216	2216	bind .t.f <Circulate> {set x "%p"}
2217	2217	set x none
2218		event gen .t.f <Circulate> -place PlaceOnTop -window .t.f
	2218	event generate .t.f <Circulate> -place PlaceOnTop -window .t.f
2219	2219	set x
2220	2220	} -cleanup {
2221	2221	destroy .t.f

2228	2228	} -body {
2229	2229	bind .t.f <Circulate> {set x "%p"}
2230	2230	set x none
2231		event gen .t.f <Circulate> -place PlaceOnBottom -window .t.f
	2231	event generate .t.f <Circulate> -place PlaceOnBottom -window .t.f
2232	2232	set x
2233	2233	} -cleanup {
2234	2234	destroy .t.f

2241	2241	} -body {
2242	2242	bind .t.f <1> {set x "%s"}
2243	2243	set x none
2244		event gen .t.f <Button-1> -state 1402
2245		event gen .t.f <ButtonRelease-1>
	2244	event generate .t.f <Button-1> -state 1402
	2245	event generate .t.f <ButtonRelease-1>
2246	2246	set x
2247	2247	} -cleanup {
2248	2248	destroy .t.f

2255	2255	} -body {
2256	2256	bind .t.f <Enter> {set x "%s"}
2257	2257	set x none
2258		event gen .t.f <Enter> -state 0x3ff
	2258	event generate .t.f <Enter> -state 0x3ff
2259	2259	set x
2260	2260	} -cleanup {
2261	2261	destroy .t.f

2268	2268	} -body {
2269	2269	bind .t.f <Visibility> {set x "%s"}
2270	2270	set x none
2271		event gen .t.f <Visibility> -state VisibilityPartiallyObscured
	2271	event generate .t.f <Visibility> -state VisibilityPartiallyObscured
2272	2272	set x
2273	2273	} -cleanup {
2274	2274	destroy .t.f

2281	2281	} -body {
2282	2282	bind .t.f <Visibility> {set x "%s"}
2283	2283	set x none
2284		event gen .t.f <Visibility> -state VisibilityUnobscured
	2284	event generate .t.f <Visibility> -state VisibilityUnobscured
2285	2285	set x
2286	2286	} -cleanup {
2287	2287	destroy .t.f

2294	2294	} -body {
2295	2295	bind .t.f <Visibility> {set x "%s"}
2296	2296	set x none
2297		event gen .t.f <Visibility> -state VisibilityFullyObscured
	2297	event generate .t.f <Visibility> -state VisibilityFullyObscured
2298	2298	set x
2299	2299	} -cleanup {
2300	2300	destroy .t.f

2307	2307	} -body {
2308	2308	bind .t.f <Button> {set x "%t"}
2309	2309	set x none
2310		event gen .t.f <Button> -time 4294
2311		event gen .t.f <ButtonRelease>
	2310	event generate .t.f <Button> -time 4294
	2311	event generate .t.f <ButtonRelease>
2312	2312	set x
2313	2313	} -cleanup {
2314	2314	destroy .t.f

2321	2321	} -body {
2322	2322	bind .t.f <Button> {set x "%x %y"}
2323	2323	set x none
2324		event gen .t.f <Button> -x 881 -y 432
2325		event gen .t.f <ButtonRelease>
	2324	event generate .t.f <Button> -x 881 -y 432
	2325	event generate .t.f <ButtonRelease>
2326	2326	set x
2327	2327	} -cleanup {
2328	2328	destroy .t.f

2335	2335	} -body {
2336	2336	bind .t.f <Reparent> {set x "%x %y"}
2337	2337	set x none
2338		event gen .t.f <Reparent> -x 882 -y 431 -window .t.f
	2338	event generate .t.f <Reparent> -x 882 -y 431 -window .t.f
2339	2339	set x
2340	2340	} -cleanup {
2341	2341	destroy .t.f

2348	2348	} -body {
2349	2349	bind .t.f <Enter> {set x "%x %y"}
2350	2350	set x none
2351		event gen .t.f <Enter> -x 781 -y 632
	2351	event generate .t.f <Enter> -x 781 -y 632
2352	2352	set x
2353	2353	} -cleanup {
2354	2354	destroy .t.f

2363	2363	set x {}
2364	2364	} -body {
2365	2365	bind .t.f <Key> {lappend x "%A"}
2366		event gen .t.f <Key-a>
2367		event gen .t.f <Key-A> -state 1
2368		event gen .t.f <Key-Tab>
2369		event gen .t.f <Key-Return>
2370		event gen .t.f <Key-F1>
2371		event gen .t.f <Key-Shift_L>
2372		event gen .t.f <Key-space>
2373		event gen .t.f <Key-dollar> -state 1
2374		event gen .t.f <Key-braceleft> -state 1
2375		event gen .t.f <Key-Multi_key>
2376		event gen .t.f <Key-e>
2377		event gen .t.f <Key-apostrophe>
	2366	event generate .t.f <Key-a>
	2367	event generate .t.f <Key-A> -state 1
	2368	event generate .t.f <Key-Tab>
	2369	event generate .t.f <Key-Return>
	2370	event generate .t.f <Key-F1>
	2371	event generate .t.f <Key-Shift_L>
	2372	event generate .t.f <Key-space>
	2373	event generate .t.f <Key-dollar> -state 1
	2374	event generate .t.f <Key-braceleft> -state 1
	2375	event generate .t.f <Key-Multi_key>
	2376	event generate .t.f <Key-e>
	2377	event generate .t.f <Key-apostrophe>
2378	2378	set x
2379	2379	} -cleanup {
2380	2380	destroy .t.f

2387	2387	} -body {
2388	2388	bind .t.f <Configure> {set x "%B"}
2389	2389	set x none
2390		event gen .t.f <Configure> -borderwidth 24 -window .t.f
	2390	event generate .t.f <Configure> -borderwidth 24 -window .t.f
2391	2391	set x
2392	2392	} -cleanup {
2393	2393	destroy .t.f

2400	2400	} -body {
2401	2401	bind .t.f <Enter> {set x "%E"}
2402	2402	set x none
2403		event gen .t.f <Enter> -sendevent 1
	2403	event generate .t.f <Enter> -sendevent 1
2404	2404	return $x
2405	2405	} -cleanup {
2406	2406	destroy .t.f

2415	2415	set x {}
2416	2416	} -body {
2417	2417	bind .t.f <Key> {lappend x %K}
2418		event gen .t.f <Key-a>
2419		event gen .t.f <Key-A> -state 1
2420		event gen .t.f <Key-Tab>
2421		event gen .t.f <Key-F1>
2422		event gen .t.f <Key-Shift_L>
2423		event gen .t.f <Key-space>
2424		event gen .t.f <Key-dollar> -state 1
2425		event gen .t.f <Key-braceleft> -state 1
	2418	event generate .t.f <Key-a>
	2419	event generate .t.f <Key-A> -state 1
	2420	event generate .t.f <Key-Tab>
	2421	event generate .t.f <Key-F1>
	2422	event generate .t.f <Key-Shift_L>
	2423	event generate .t.f <Key-space>
	2424	event generate .t.f <Key-dollar> -state 1
	2425	event generate .t.f <Key-braceleft> -state 1
2426	2426	set x
2427	2427	} -cleanup {
2428	2428	destroy .t.f

2435	2435	} -body {
2436	2436	bind .t.f <Key> {set x "%N"}
2437	2437	set x none
2438		event gen .t.f <Key-a>
2439		set x
2440		} -cleanup {
2441		destroy .t.f
2442		} -result {97}
	2438	event generate .t.f <Key-space>
	2439	set x
	2440	} -cleanup {
	2441	destroy .t.f
	2442	} -result {32}
2443	2443	test bind-16.40 {ExpandPercents procedure} -setup {
2444	2444	frame .t.f -class Test -width 150 -height 100
2445	2445	pack .t.f

2448	2448	} -body {
2449	2449	bind .t.f <Key> {set x "%S"}
2450	2450	set x none
2451		event gen .t.f <Key-a> -subwindow .t
	2451	event generate .t.f <Key-space> -subwindow .t
2452	2452	set x
2453	2453	} -cleanup {
2454	2454	destroy .t.f

2461	2461	} -body {
2462	2462	bind .t.f <Key> {set x "%T"}
2463	2463	set x none
2464		event gen .t.f <Key>
	2464	event generate .t.f <Key>
2465	2465	set x
2466	2466	} -cleanup {
2467	2467	destroy .t.f

2475	2475	} -body {
2476	2476	bind .t.f <Key> {set x "%W"}
2477	2477	set x none
2478		event gen .t.f <Key>
	2478	event generate .t.f <Key>
2479	2479	set x
2480	2480	} -cleanup {
2481	2481	destroy .t.f

2488	2488	} -body {
2489	2489	bind .t.f <Button> {set x "%X %Y"}
2490	2490	set x none
2491		event gen .t.f <Button> -rootx 422 -rooty 13
2492		event gen .t.f <ButtonRelease>
	2491	event generate .t.f <Button> -rootx 422 -rooty 13
	2492	event generate .t.f <ButtonRelease>
2493	2493	set x
2494	2494	} -cleanup {
2495	2495	destroy .t.f

2502	2502	} -body {
2503	2503	bind .t.f <Gravity> {set x "%R %S"}
2504	2504	set x none
2505		event gen .t.f <Gravity>
	2505	event generate .t.f <Gravity>
2506	2506	set x
2507	2507	} -cleanup {
2508	2508	destroy .t.f

2742	2742	} -body {
2743	2743	event add <<xyz>> <Button-2>
2744	2744	bind .t.f <<xyz>> {lappend x %#}
2745		event gen .t.f <Button-2> -serial 101
2746		event gen .t.f <ButtonRelease-2>
	2745	event generate .t.f <Button-2> -serial 101
	2746	event generate .t.f <ButtonRelease-2>
2747	2747	event delete <<xyz>>
2748		event gen .t.f <Button-2> -serial 102
2749		event gen .t.f <ButtonRelease-2>
	2748	event generate .t.f <Button-2> -serial 102
	2749	event generate .t.f <ButtonRelease-2>
2750	2750	set x
2751	2751	} -cleanup {
2752	2752	destroy .t.f

2764	2764	event add <<xyz>> <Button-2>
2765	2765	bind .t.f <<xyz>> {lappend x xyz}
2766	2766	bind .t.f <<abc>> {lappend x abc}
2767		event gen .t.f <Button-2>
2768		event gen .t.f <ButtonRelease-2>
2769		event gen .t.f <Control-Button-2>
2770		event gen .t.f <Control-ButtonRelease-2>
	2767	event generate .t.f <Button-2>
	2768	event generate .t.f <ButtonRelease-2>
	2769	event generate .t.f <Control-Button-2>
	2770	event generate .t.f <Control-ButtonRelease-2>
2771	2771	event delete <<xyz>>
2772		event gen .t.f <Button-2>
2773		event gen .t.f <ButtonRelease-2>
2774		event gen .t.f <Control-Button-2>
2775		event gen .t.f <Control-ButtonRelease-2>
	2772	event generate .t.f <Button-2>
	2773	event generate .t.f <ButtonRelease-2>
	2774	event generate .t.f <Control-Button-2>
	2775	event generate .t.f <Control-ButtonRelease-2>
2776	2776	list $x [event info <<abc>>]
2777	2777	} -cleanup {
2778	2778	destroy .t.f

2794	2794	bind .t.f <<xyz>> {lappend x xyz}
2795	2795	bind .t.f <<abc>> {lappend x abc}
2796	2796	bind .t.f <<def>> {lappend x def}
2797		event gen .t.f <Button-2>
2798		event gen .t.f <ButtonRelease-2>
2799		event gen .t.f <Control-Button-2>
2800		event gen .t.f <Control-ButtonRelease-2>
2801		event gen .t.f <Shift-Button-2>
2802		event gen .t.f <Shift-ButtonRelease-2>
	2797	event generate .t.f <Button-2>
	2798	event generate .t.f <ButtonRelease-2>
	2799	event generate .t.f <Control-Button-2>
	2800	event generate .t.f <Control-ButtonRelease-2>
	2801	event generate .t.f <Shift-Button-2>
	2802	event generate .t.f <Shift-ButtonRelease-2>
2803	2803	event delete <<xyz>>
2804		event gen .t.f <Button-2>
2805		event gen .t.f <Control-Button-2>
2806		event gen .t.f <Shift-Button-2>
2807		event gen .t.f <ButtonRelease-2>
2808		event gen .t.f <Control-ButtonRelease-2>
2809		event gen .t.f <Shift-ButtonRelease-2>
	2804	event generate .t.f <Button-2>
	2805	event generate .t.f <Control-Button-2>
	2806	event generate .t.f <Shift-Button-2>
	2807	event generate .t.f <ButtonRelease-2>
	2808	event generate .t.f <Control-ButtonRelease-2>
	2809	event generate .t.f <Shift-ButtonRelease-2>
2810	2810	list $x [event info <<def>>] [event info <<xyz>>] [event info <<abc>>]
2811	2811	} -cleanup {
2812	2812	destroy .t.f

2829	2829	bind .t.f <<xyz>> {lappend x xyz}
2830	2830	bind .t.f <<abc>> {lappend x abc}
2831	2831	bind .t.f <<def>> {lappend x def}
2832		event gen .t.f <Button-2>
2833		event gen .t.f <ButtonRelease-2>
2834		event gen .t.f <Control-Button-2>
2835		event gen .t.f <Control-ButtonRelease-2>
2836		event gen .t.f <Shift-Button-2>
2837		event gen .t.f <Shift-ButtonRelease-2>
	2832	event generate .t.f <Button-2>
	2833	event generate .t.f <ButtonRelease-2>
	2834	event generate .t.f <Control-Button-2>
	2835	event generate .t.f <Control-ButtonRelease-2>
	2836	event generate .t.f <Shift-Button-2>
	2837	event generate .t.f <Shift-ButtonRelease-2>
2838	2838	event delete <<xyz>>
2839		event gen .t.f <Button-2>
2840		event gen .t.f <ButtonRelease-2>
2841		event gen .t.f <Control-Button-2>
2842		event gen .t.f <Control-ButtonRelease-2>
2843		event gen .t.f <Shift-Button-2>
2844		event gen .t.f <Shift-ButtonRelease-2>
	2839	event generate .t.f <Button-2>
	2840	event generate .t.f <ButtonRelease-2>
	2841	event generate .t.f <Control-Button-2>
	2842	event generate .t.f <Control-ButtonRelease-2>
	2843	event generate .t.f <Shift-Button-2>
	2844	event generate .t.f <Shift-ButtonRelease-2>
2845	2845	list $x [event info <<xyz>>] [event info <<abc>>] [event info <<def>>]
2846	2846	} -cleanup {
2847	2847	destroy .t.f

2865	2865	bind .t.f <<xyz>> {lappend x xyz}
2866	2866	bind .t.g <<abc>> {lappend x abc}
2867	2867	bind .t.h <<def>> {lappend x def}
2868		event gen .t.f <Button-2>
2869		event gen .t.f <ButtonRelease-2>
2870		event gen .t.g <Button-2>
2871		event gen .t.g <ButtonRelease-2>
2872		event gen .t.h <Button-2>
2873		event gen .t.h <ButtonRelease-2>
	2868	event generate .t.f <Button-2>
	2869	event generate .t.f <ButtonRelease-2>
	2870	event generate .t.g <Button-2>
	2871	event generate .t.g <ButtonRelease-2>
	2872	event generate .t.h <Button-2>
	2873	event generate .t.h <ButtonRelease-2>
2874	2874	event delete <<xyz>>
2875		event gen .t.f <Button-2>
2876		event gen .t.f <ButtonRelease-2>
2877		event gen .t.g <Button-2>
2878		event gen .t.g <ButtonRelease-2>
2879		event gen .t.h <Button-2>
2880		event gen .t.h <ButtonRelease-2>
	2875	event generate .t.f <Button-2>
	2876	event generate .t.f <ButtonRelease-2>
	2877	event generate .t.g <Button-2>
	2878	event generate .t.g <ButtonRelease-2>
	2879	event generate .t.h <Button-2>
	2880	event generate .t.h <ButtonRelease-2>
2881	2881	list $x [event info <<xyz>>] [event info <<abc>>] [event info <<def>>]
2882	2882	} -cleanup {
2883	2883	destroy .t.f .t.g .t.h

2901	2901	bind .t.f <<xyz>> {lappend x xyz}
2902	2902	bind .t.g <<abc>> {lappend x abc}
2903	2903	bind .t.h <<def>> {lappend x def}
2904		event gen .t.f <Button-2>
2905		event gen .t.f <ButtonRelease-2>
2906		event gen .t.g <Button-2>
2907		event gen .t.g <ButtonRelease-2>
2908		event gen .t.h <Button-2>
2909		event gen .t.h <ButtonRelease-2>
	2904	event generate .t.f <Button-2>
	2905	event generate .t.f <ButtonRelease-2>
	2906	event generate .t.g <Button-2>
	2907	event generate .t.g <ButtonRelease-2>
	2908	event generate .t.h <Button-2>
	2909	event generate .t.h <ButtonRelease-2>
2910	2910	event delete <<abc>>
2911		event gen .t.f <Button-2>
2912		event gen .t.f <ButtonRelease-2>
2913		event gen .t.g <Button-2>
2914		event gen .t.g <ButtonRelease-2>
2915		event gen .t.h <Button-2>
2916		event gen .t.h <ButtonRelease-2>
	2911	event generate .t.f <Button-2>
	2912	event generate .t.f <ButtonRelease-2>
	2913	event generate .t.g <Button-2>
	2914	event generate .t.g <ButtonRelease-2>
	2915	event generate .t.h <Button-2>
	2916	event generate .t.h <ButtonRelease-2>
2917	2917	list $x [event info <<xyz>>] [event info <<abc>>] [event info <<def>>]
2918	2918	} -cleanup {
2919	2919	destroy .t.f .t.g .t.h

2937	2937	bind .t.f <<xyz>> {lappend x xyz}
2938	2938	bind .t.g <<abc>> {lappend x abc}
2939	2939	bind .t.h <<def>> {lappend x def}
2940		event gen .t.f <Button-2>
2941		event gen .t.f <ButtonRelease-2>
2942		event gen .t.g <Button-2>
2943		event gen .t.g <ButtonRelease-2>
2944		event gen .t.h <Button-2>
2945		event gen .t.h <ButtonRelease-2>
	2940	event generate .t.f <Button-2>
	2941	event generate .t.f <ButtonRelease-2>
	2942	event generate .t.g <Button-2>
	2943	event generate .t.g <ButtonRelease-2>
	2944	event generate .t.h <Button-2>
	2945	event generate .t.h <ButtonRelease-2>
2946	2946	event delete <<def>>
2947		event gen .t.f <Button-2>
2948		event gen .t.f <ButtonRelease-2>
2949		event gen .t.g <Button-2>
2950		event gen .t.g <ButtonRelease-2>
2951		event gen .t.h <Button-2>
2952		event gen .t.h <ButtonRelease-2>
	2947	event generate .t.f <Button-2>
	2948	event generate .t.f <ButtonRelease-2>
	2949	event generate .t.g <Button-2>
	2950	event generate .t.g <ButtonRelease-2>
	2951	event generate .t.h <Button-2>
	2952	event generate .t.h <ButtonRelease-2>
2953	2953	list $x [event info <<xyz>>] [event info <<abc>>] [event info <<def>>]
2954	2954	} -cleanup {
2955	2955	destroy .t.f .t.g .t.h

3010	3010	test bind-22.1 {HandleEventGenerate} -setup {
3011	3011	destroy .xyz
3012	3012	} -body {
3013		event gen .xyz <Control-v>
	3013	event generate .xyz <Control-v>
3014	3014	} -returnCodes error -result {bad window path name ".xyz"}
3015	3015	test bind-22.2 {HandleEventGenerate} -body {
3016		event gen zzz <Control-v>
	3016	event generate zzz <Control-v>
3017	3017	} -returnCodes error -result {bad window name/identifier "zzz"}
3018	3018	test bind-22.3 {HandleEventGenerate} -body {
3019		event gen 47 <Control-v>
	3019	event generate 47 <Control-v>
3020	3020	} -returnCodes error -result {bad window name/identifier "47"}
3021	3021	test bind-22.4 {HandleEventGenerate} -setup {
3022	3022	frame .t.f -class Test -width 150 -height 100

3026	3026	set x {}
3027	3027	} -body {
3028	3028	bind .t.f <Button> {set x "%s %b"}
3029		event gen [winfo id .t.f] <Control-Button-1> -state 260
	3029	event generate [winfo id .t.f] <Control-Button-1> -state 260
3030	3030	set x
3031	3031	} -cleanup {
3032	3032	destroy .t.f
3033	3033	} -result {260 1}
3034	3034	test bind-22.5 {HandleEventGenerate} -body {
3035		event gen . <xyz>
	3035	event generate . <xyz>
3036	3036	} -returnCodes error -result {bad event type or keysym "xyz"}
3037	3037	test bind-22.6 {HandleEventGenerate} -body {
3038		event gen . <Double-Button-1>
	3038	event generate . <Double-Button-1>
3039	3039	} -returnCodes error -result {Double or Triple modifier not allowed}
3040	3040	test bind-22.7 {HandleEventGenerate} -body {
3041		event gen . xyz
	3041	event generate . xyz
3042	3042	} -returnCodes error -result {only one event specification allowed}
3043	3043	test bind-22.8 {HandleEventGenerate} -body {
3044		event gen . <Button> -button
	3044	event generate . <Button> -button
3045	3045	} -returnCodes error -result {value for "-button" missing}
3046	3046	test bind-22.9 {HandleEventGenerate} -setup {
3047	3047	frame .t.f -class Test -width 150 -height 100

3051	3051	set x {}
3052	3052	} -body {
3053	3053	bind .t.f <Button> {set x "%s %b"}
3054		event gen .t.f <ButtonRelease-1>
3055		event gen .t.f <ButtonRelease-2>
3056		event gen .t.f <ButtonRelease-3>
3057		event gen .t.f <Control-Button-1>
3058		event gen .t.f <Control-ButtonRelease-1>
	3054	event generate .t.f <ButtonRelease-1>
	3055	event generate .t.f <ButtonRelease-2>
	3056	event generate .t.f <ButtonRelease-3>
	3057	event generate .t.f <Control-Button-1>
	3058	event generate .t.f <Control-ButtonRelease-1>
3059	3059	set x
3060	3060	} -cleanup {
3061	3061	destroy .t.f

3068	3068	set x {}
3069	3069	} -body {
3070	3070	bind .t.f <Key> {set x "%s %K"}
3071		event gen .t.f <Control-Key-1>
3072		set x
3073		} -cleanup {
3074		destroy .t.f
3075		} -result {4 1}
	3071	event generate .t.f <Control-Key-space>
	3072	set x
	3073	} -cleanup {
	3074	destroy .t.f
	3075	} -result {4 space}
3076	3076	test bind-22.11 {HandleEventGenerate} -setup {
3077	3077	frame .t.f -class Test -width 150 -height 100
3078	3078	pack .t.f

3081	3081	set x {}
3082	3082	} -body {
3083	3083	bind .t.f <<Paste>> {set x "%s"}
3084		event gen .t.f <<Paste>> -state 1
	3084	event generate .t.f <<Paste>> -state 1
3085	3085	set x
3086	3086	} -cleanup {
3087	3087	destroy .t.f

3094	3094	set x {}
3095	3095	} -body {
3096	3096	bind .t.f <Motion> {set x "%s"}
3097		event gen .t.f <Control-Motion>
	3097	event generate .t.f <Control-Motion>
3098	3098	set x
3099	3099	} -cleanup {
3100	3100	destroy .t.f

3107	3107	set x {}
3108	3108	} -body {
3109	3109	bind .t.f <Button> {lappend x %#}
3110		event gen .t.f <Button> -when now -serial 100
3111		event gen .t.f <ButtonRelease> -when now
	3110	event generate .t.f <Button> -when now -serial 100
	3111	event generate .t.f <ButtonRelease> -when now
3112	3112	set x
3113	3113	} -cleanup {
3114	3114	destroy .t.f

3121	3121	set x {}
3122	3122	} -body {
3123	3123	bind .t.f <Button> {lappend x %#}
3124		event gen .t.f <Button> -when head -serial 100
3125		event gen .t.f <Button> -when head -serial 101
3126		event gen .t.f <Button> -when head -serial 102
3127		event gen .t.f <ButtonRelease> -when tail
	3124	event generate .t.f <Button> -when head -serial 100
	3125	event generate .t.f <Button> -when head -serial 101
	3126	event generate .t.f <Button> -when head -serial 102
	3127	event generate .t.f <ButtonRelease> -when tail
3128	3128	lappend x foo
3129	3129	update
3130	3130	set x

3139	3139	set x {}
3140	3140	} -body {
3141	3141	bind .t.f <Button> {lappend x %#}
3142		event gen .t.f <Button> -when head -serial 99
3143		event gen .t.f <Button> -when mark -serial 100
3144		event gen .t.f <Button> -when mark -serial 101
3145		event gen .t.f <Button> -when mark -serial 102
3146		event gen .t.f <ButtonRelease> -when tail
	3142	event generate .t.f <Button> -when head -serial 99
	3143	event generate .t.f <Button> -when mark -serial 100
	3144	event generate .t.f <Button> -when mark -serial 101
	3145	event generate .t.f <Button> -when mark -serial 102
	3146	event generate .t.f <ButtonRelease> -when tail
3147	3147	lappend x foo
3148	3148	update
3149	3149	set x

3158	3158	set x {}
3159	3159	} -body {
3160	3160	bind .t.f <Button> {lappend x %#}
3161		event gen .t.f <Button> -when head -serial 99
3162		event gen .t.f <Button> -when tail -serial 100
3163		event gen .t.f <Button> -when tail -serial 101
3164		event gen .t.f <Button> -when tail -serial 102
3165		event gen .t.f <ButtonRelease> -when tail
	3161	event generate .t.f <Button> -when head -serial 99
	3162	event generate .t.f <Button> -when tail -serial 100
	3163	event generate .t.f <Button> -when tail -serial 101
	3164	event generate .t.f <Button> -when tail -serial 102
	3165	event generate .t.f <ButtonRelease> -when tail
3166	3166	lappend x foo
3167	3167	update
3168	3168	set x

3170	3170	destroy .t.f
3171	3171	} -result {foo 99 100 101 102}
3172	3172	test bind-22.17 {HandleEventGenerate} -body {
3173		event gen . <Button> -when xyz
	3173	event generate . <Button> -when xyz
3174	3174	} -returnCodes error -result {bad -when value "xyz": must be now, head, mark, or tail}
3175	3175	test bind-22.18 {HandleEventGenerate} -body {
3176	3176	# Bug 411307
3177		event gen . <a> -root 98765
	3177	event generate . <a> -root 98765
3178	3178	} -returnCodes error -result {bad window name/identifier "98765"}
3179	3179
3180	3180	test bind-22.19 {HandleEventGenerate: options <Configure> -above .xyz} -setup {

3185	3185	set x {}
3186	3186	} -body {
3187	3187	bind .t.f <Configure> "lappend x %a"
3188		event gen .t.f <Configure> -above .xyz
	3188	event generate .t.f <Configure> -above .xyz
3189	3189	} -cleanup {
3190	3190	destroy .t.f
3191	3191	} -returnCodes error -result {bad window path name ".xyz"}

3197	3197	set x {}
3198	3198	} -body {
3199	3199	bind .t.f <Configure> "lappend x %a"
3200		event gen .t.f <Configure> -above .t
	3200	event generate .t.f <Configure> -above .t
3201	3201	return $x
3202	3202	} -cleanup {
3203	3203	destroy .t.f

3210	3210	set x {}
3211	3211	} -body {
3212	3212	bind .t.f <Configure> "lappend x %a"
3213		event gen .t.f <Configure> -above xyz
	3213	event generate .t.f <Configure> -above xyz
3214	3214	} -cleanup {
3215	3215	destroy .t.f
3216	3216	} -returnCodes error -result {bad window name/identifier "xyz"}

3222	3222	set x {}
3223	3223	} -body {
3224	3224	bind .t.f <Configure> "lappend x %a"
3225		event gen .t.f <Configure> -above [winfo id .t]
	3225	event generate .t.f <Configure> -above [winfo id .t]
3226	3226	return $x
3227	3227	} -cleanup {
3228	3228	destroy .t.f

3236	3236	set x {}
3237	3237	} -body {
3238	3238	bind .t.f <Key> "lappend x %b"
3239		event gen .t.f <Key> -above .
	3239	event generate .t.f <Key> -above .
3240	3240	return $x
3241	3241	} -cleanup {
3242	3242	destroy .t.f

3250	3250	set x {}
3251	3251	} -body {
3252	3252	bind .t.f <Configure> "lappend x %B"
3253		event gen .t.f <Configure> -borderwidth xyz
	3253	event generate .t.f <Configure> -borderwidth xyz
3254	3254	return $x
3255	3255	} -cleanup {
3256	3256	destroy .t.f

3264	3264	set x {}
3265	3265	} -body {
3266	3266	bind .t.f <Configure> "lappend x %B"
3267		event gen .t.f <Configure> -borderwidth 2i
	3267	event generate .t.f <Configure> -borderwidth 2i
3268	3268	expr {[winfo pixels .t.f 2i] eq $x}
3269	3269	} -cleanup {
3270	3270	destroy .t.f

3278	3278	set x {}
3279	3279	} -body {
3280	3280	bind .t.f <Key> "lappend x %k"
3281		event gen .t.f <Key> -borderwidth 2i
	3281	event generate .t.f <Key> -borderwidth 2i
3282	3282	} -cleanup {
3283	3283	destroy .t.f
3284	3284	} -returnCodes error -result {<Key> event doesn't accept "-borderwidth" option}

3291	3291	set x {}
3292	3292	} -body {
3293	3293	bind .t.f <Button> "lappend x %b"
3294		event gen .t.f <Button> -button xyz
	3294	event generate .t.f <Button> -button xyz
3295	3295	} -cleanup {
3296	3296	destroy .t.f
3297	3297	} -returnCodes error -result {expected integer but got "xyz"}

3304	3304	set x {}
3305	3305	} -body {
3306	3306	bind .t.f <Button> "lappend x %b"
3307		event gen .t.f <Button> -button 1
	3307	event generate .t.f <Button> -button 1
3308	3308	return $x
3309	3309	} -cleanup {
3310	3310	destroy .t.f

3318	3318	set x {}
3319	3319	} -body {
3320	3320	bind .t.f <ButtonRelease> "lappend x %b"
3321		event gen .t.f <ButtonRelease> -button 1
	3321	event generate .t.f <ButtonRelease> -button 1
3322	3322	return $x
3323	3323	} -cleanup {
3324	3324	destroy .t.f

3332	3332	set x {}
3333	3333	} -body {
3334	3334	bind .t.f <Key> "lappend x %k"
3335		event gen .t.f <Key> -button 1
	3335	event generate .t.f <Key> -button 1
3336	3336	} -cleanup {
3337	3337	destroy .t.f
3338	3338	} -returnCodes error -result {<Key> event doesn't accept "-button" option}

3345	3345	set x {}
3346	3346	} -body {
3347	3347	bind .t.f <Expose> "lappend x %c"
3348		event gen .t.f <Expose> -count xyz
	3348	event generate .t.f <Expose> -count xyz
3349	3349	} -cleanup {
3350	3350	destroy .t.f
3351	3351	} -returnCodes error -result {expected integer but got "xyz"}

3358	3358	set x {}
3359	3359	} -body {
3360	3360	bind .t.f <Expose> "lappend x %c"
3361		event gen .t.f <Expose> -count 20
	3361	event generate .t.f <Expose> -count 20
3362	3362	return $x
3363	3363	} -cleanup {
3364	3364	destroy .t.f

3372	3372	set x {}
3373	3373	} -body {
3374	3374	bind .t.f <Key> "lappend x %b"
3375		event gen .t.f <Key> -count 20
	3375	event generate .t.f <Key> -count 20
3376	3376	} -cleanup {
3377	3377	destroy .t.f
3378	3378	} -returnCodes error -result {<Key> event doesn't accept "-count" option}

3385	3385	set x {}
3386	3386	} -body {
3387	3387	bind .t.f <Enter> "lappend x %d"
3388		event gen .t.f <Enter> -detail xyz
	3388	event generate .t.f <Enter> -detail xyz
3389	3389	} -cleanup {
3390	3390	destroy .t.f
3391	3391	} -returnCodes error -result {bad -detail value "xyz": must be NotifyAncestor, NotifyVirtual, NotifyInferior, NotifyNonlinear, NotifyNonlinearVirtual, NotifyPointer, NotifyPointerRoot, or NotifyDetailNone}

3397	3397	update
3398	3398	set x {}
3399	3399	} -body {
3400		bind .t.f <FocusIn> "lappend x %d"
3401		event gen .t.f <FocusIn> -detail NotifyVirtual
3402		return $x
3403		} -cleanup {
3404		destroy .t.f
3405		} -result {}
	3400	bind .t.f <FocusIn> "lappend x FocusIn %d"
	3401	event generate .t.f <FocusIn> -detail NotifyVirtual
	3402	return $x
	3403	} -cleanup {
	3404	destroy .t.f
	3405	} -result {FocusIn NotifyVirtual}
	3406
	3407	test bind-22.35.1 {HandleEventGenerate: options <FocusOut> -detail NotifyVirtual} -setup {
	3408	frame .t.f -class Test -width 150 -height 100
	3409	pack .t.f
	3410	focus -force .t.f
	3411	update
	3412	set x {}
	3413	} -body {
	3414	bind .t.f <FocusOut> "lappend x FocusOut %d"
	3415	event generate .t.f <FocusOut> -detail NotifyVirtual
	3416	return $x
	3417	} -cleanup {
	3418	destroy .t.f
	3419	} -result {FocusOut NotifyVirtual}
3406	3420
3407	3421	test bind-22.36 {HandleEventGenerate: options <Enter> -detail NotifyVirtual} -setup {
3408	3422	frame .t.f -class Test -width 150 -height 100

3412	3426	set x {}
3413	3427	} -body {
3414	3428	bind .t.f <Enter> "lappend x %d"
3415		event gen .t.f <Enter> -detail NotifyVirtual
	3429	event generate .t.f <Enter> -detail NotifyVirtual
3416	3430	return $x
3417	3431	} -cleanup {
3418	3432	destroy .t.f

3426	3440	set x {}
3427	3441	} -body {
3428	3442	bind .t.f <Key> "lappend x %k"
3429		event gen .t.f <Key> -detail NotifyVirtual
	3443	event generate .t.f <Key> -detail NotifyVirtual
3430	3444	} -cleanup {
3431	3445	destroy .t.f
3432	3446	} -returnCodes error -result {<Key> event doesn't accept "-detail" option}

3439	3453	set x {}
3440	3454	} -body {
3441	3455	bind .t.f <Enter> "lappend x %f"
3442		event gen .t.f <Enter> -focus xyz
	3456	event generate .t.f <Enter> -focus xyz
3443	3457	} -cleanup {
3444	3458	destroy .t.f
3445	3459	} -returnCodes error -result {expected boolean value but got "xyz"}

3452	3466	set x {}
3453	3467	} -body {
3454	3468	bind .t.f <Enter> "lappend x %f"
3455		event gen .t.f <Enter> -focus 1
	3469	event generate .t.f <Enter> -focus 1
3456	3470	return $x
3457	3471	} -cleanup {
3458	3472	destroy .t.f

3466	3480	set x {}
3467	3481	} -body {
3468	3482	bind .t.f <Key> "lappend x %k"
3469		event gen .t.f <Key> -focus 1
	3483	event generate .t.f <Key> -focus 1
3470	3484	} -cleanup {
3471	3485	destroy .t.f
3472	3486	} -returnCodes error -result {<Key> event doesn't accept "-focus" option}

3479	3493	set x {}
3480	3494	} -body {
3481	3495	bind .t.f <Expose> "lappend x %h"
3482		event gen .t.f <Expose> -height xyz
	3496	event generate .t.f <Expose> -height xyz
3483	3497	} -cleanup {
3484	3498	destroy .t.f
3485	3499	} -returnCodes error -result {bad screen distance "xyz"}

3492	3506	set x {}
3493	3507	} -body {
3494	3508	bind .t.f <Expose> "lappend x %h"
3495		event gen .t.f <Expose> -height 2i
	3509	event generate .t.f <Expose> -height 2i
3496	3510	expr {$x eq [winfo pixels .t.f 2i]}
3497	3511	} -cleanup {
3498	3512	destroy .t.f

3506	3520	set x {}
3507	3521	} -body {
3508	3522	bind .t.f <Configure> "lappend x %h"
3509		event gen .t.f <Configure> -height 2i
	3523	event generate .t.f <Configure> -height 2i
3510	3524	expr {$x eq [winfo pixels .t.f 2i]}
3511	3525	} -cleanup {
3512	3526	destroy .t.f

3520	3534	set x {}
3521	3535	} -body {
3522	3536	bind .t.f <Key> "lappend x %k"
3523		event gen .t.f <Key> -height 2i
	3537	event generate .t.f <Key> -height 2i
3524	3538	} -cleanup {
3525	3539	destroy .t.f
3526	3540	} -returnCodes error -result {<Key> event doesn't accept "-height" option}

3533	3547	set x {}
3534	3548	} -body {
3535	3549	bind .t.f <Key> "lappend x %k"
3536		event gen .t.f <Key> -keycode xyz
	3550	event generate .t.f <Key> -keycode xyz
3537	3551	} -cleanup {
3538	3552	destroy .t.f
3539	3553	} -returnCodes error -result {expected integer but got "xyz"}

3546	3560	set x {}
3547	3561	} -body {
3548	3562	bind .t.f <Key> "lappend x %k"
3549		event gen .t.f <Key> -keycode 20
	3563	event generate .t.f <Key> -keycode 20
3550	3564	return $x
3551	3565	} -cleanup {
3552	3566	destroy .t.f

3560	3574	set x {}
3561	3575	} -body {
3562	3576	bind .t.f <Button> "lappend x %b"
3563		event gen .t.f <Button> -keycode 20
	3577	event generate .t.f <Button> -keycode 20
3564	3578	} -cleanup {
3565	3579	destroy .t.f
3566	3580	} -returnCodes error -result {<Button> event doesn't accept "-keycode" option}

3573	3587	set x {}
3574	3588	} -body {
3575	3589	bind .t.f <Key> "lappend x %K"
3576		event gen .t.f <Key> -keysym xyz
	3590	event generate .t.f <Key> -keysym xyz
3577	3591	} -cleanup {
3578	3592	destroy .t.f
3579	3593	} -returnCodes error -result {unknown keysym "xyz"}
3580	3594
3581		test bind-22.49 {HandleEventGenerate: options <Key> -keysym a} -setup {
	3595	test bind-22.49 {HandleEventGenerate: options <Key> -keysym space} -setup {
3582	3596	frame .t.f -class Test -width 150 -height 100
3583	3597	pack .t.f
3584	3598	focus -force .t.f

3586	3600	set x {}
3587	3601	} -body {
3588	3602	bind .t.f <Key> "lappend x %K"
3589		event gen .t.f <Key> -keysym a
3590		return $x
3591		} -cleanup {
3592		destroy .t.f
3593		} -result {a}
3594
3595		test bind-22.50 {HandleEventGenerate: options <Button> -keysym a} -setup {
	3603	event generate .t.f <Key> -keysym space
	3604	return $x
	3605	} -cleanup {
	3606	destroy .t.f
	3607	} -result {space}
	3608
	3609	test bind-22.50 {HandleEventGenerate: options <Button> -keysym space} -setup {
3596	3610	frame .t.f -class Test -width 150 -height 100
3597	3611	pack .t.f
3598	3612	focus -force .t.f

3600	3614	set x {}
3601	3615	} -body {
3602	3616	bind .t.f <Button> "lappend x %b"
3603		event gen .t.f <Button> -keysym a
	3617	event generate .t.f <Button> -keysym space
3604	3618	} -cleanup {
3605	3619	destroy .t.f
3606	3620	} -returnCodes error -result {<Button> event doesn't accept "-keysym" option}

3613	3627	set x {}
3614	3628	} -body {
3615	3629	bind .t.f <Enter> "lappend x %m"
3616		event gen .t.f <Enter> -mode xyz
	3630	event generate .t.f <Enter> -mode xyz
3617	3631	} -cleanup {
3618	3632	destroy .t.f
3619	3633	} -returnCodes error -result {bad -mode value "xyz": must be NotifyNormal, NotifyGrab, NotifyUngrab, or NotifyWhileGrabbed}

3626	3640	set x {}
3627	3641	} -body {
3628	3642	bind .t.f <Enter> "lappend x %m"
3629		event gen .t.f <Enter> -mode NotifyNormal
	3643	event generate .t.f <Enter> -mode NotifyNormal
3630	3644	return $x
3631	3645	} -cleanup {
3632	3646	destroy .t.f

3640	3654	set x {}
3641	3655	} -body {
3642	3656	bind .t.f <FocusIn> "lappend x %m"
3643		event gen .t.f <FocusIn> -mode NotifyNormal
3644		return $x
3645		} -cleanup {
3646		destroy .t.f
3647		} -result {}
	3657	event generate .t.f <FocusIn> -mode NotifyNormal
	3658	return $x
	3659	} -cleanup {
	3660	destroy .t.f
	3661	} -result {NotifyNormal}
3648	3662
3649	3663	test bind-22.54 {HandleEventGenerate: options <Key> -mode NotifyNormal} -setup {
3650	3664	frame .t.f -class Test -width 150 -height 100

3654	3668	set x {}
3655	3669	} -body {
3656	3670	bind .t.f <Key> "lappend x %k"
3657		event gen .t.f <Key> -mode NotifyNormal
	3671	event generate .t.f <Key> -mode NotifyNormal
3658	3672	} -cleanup {
3659	3673	destroy .t.f
3660	3674	} -returnCodes error -result {<Key> event doesn't accept "-mode" option}

3666	3680	set x {}
3667	3681	} -body {
3668	3682	bind .t.f <Map> "lappend x %o"
3669		event gen .t.f <Map> -override xyz
	3683	event generate .t.f <Map> -override xyz
3670	3684	} -cleanup {
3671	3685	destroy .t.f
3672	3686	} -returnCodes error -result {expected boolean value but got "xyz"}

3679	3693	set x {}
3680	3694	} -body {
3681	3695	bind .t.f <Map> "lappend x %o"
3682		event gen .t.f <Map> -override 1
	3696	event generate .t.f <Map> -override 1
3683	3697	return $x
3684	3698	} -cleanup {
3685	3699	destroy .t.f

3693	3707	set x {}
3694	3708	} -body {
3695	3709	bind .t.f <Reparent> "lappend x %o"
3696		event gen .t.f <Reparent> -override 1
	3710	event generate .t.f <Reparent> -override 1
3697	3711	return $x
3698	3712	} -cleanup {
3699	3713	destroy .t.f

3707	3721	set x {}
3708	3722	} -body {
3709	3723	bind .t.f <Configure> "lappend x %o"
3710		event gen .t.f <Configure> -override 1
	3724	event generate .t.f <Configure> -override 1
3711	3725	return $x
3712	3726	} -cleanup {
3713	3727	destroy .t.f

3721	3735	set x {}
3722	3736	} -body {
3723	3737	bind .t.f <Key> "lappend x %k"
3724		event gen .t.f <Key> -override 1
	3738	event generate .t.f <Key> -override 1
3725	3739	} -cleanup {
3726	3740	destroy .t.f
3727	3741	} -returnCodes error -result {<Key> event doesn't accept "-override" option}

3734	3748	set x {}
3735	3749	} -body {
3736	3750	bind .t.f <Circulate> "lappend x %p"
3737		event gen .t.f <Circulate> -place xyz
	3751	event generate .t.f <Circulate> -place xyz
3738	3752	} -cleanup {
3739	3753	destroy .t.f
3740	3754	} -returnCodes error -result {bad -place value "xyz": must be PlaceOnTop, or PlaceOnBottom}

3747	3761	set x {}
3748	3762	} -body {
3749	3763	bind .t.f <Circulate> "lappend x %p"
3750		event gen .t.f <Circulate> -place PlaceOnTop
	3764	event generate .t.f <Circulate> -place PlaceOnTop
3751	3765	return $x
3752	3766	} -cleanup {
3753	3767	destroy .t.f

3761	3775	set x {}
3762	3776	} -body {
3763	3777	bind .t.f <Key> "lappend x %k"
3764		event gen .t.f <Key> -place PlaceOnTop
	3778	event generate .t.f <Key> -place PlaceOnTop
3765	3779	} -cleanup {
3766	3780	destroy .t.f
3767	3781	} -returnCodes error -result {<Key> event doesn't accept "-place" option}

3774	3788	set x {}
3775	3789	} -body {
3776	3790	bind .t.f <Key> "lappend x %R"
3777		event gen .t.f <Key> -root .xyz
	3791	event generate .t.f <Key> -root .xyz
3778	3792	} -cleanup {
3779	3793	destroy .t.f
3780	3794	} -returnCodes error -result {bad window path name ".xyz"}

3787	3801	set x {}
3788	3802	} -body {
3789	3803	bind .t.f <Key> "lappend x %R"
3790		event gen .t.f <Key> -root .t
	3804	event generate .t.f <Key> -root .t
3791	3805	expr {[winfo id .t] eq $x}
3792	3806	} -cleanup {
3793	3807	destroy .t.f

3801	3815	set x {}
3802	3816	} -body {
3803	3817	bind .t.f <Key> "lappend x %R"
3804		event gen .t.f <Key> -root xyz
	3818	event generate .t.f <Key> -root xyz
3805	3819	} -cleanup {
3806	3820	destroy .t.f
3807	3821	} -returnCodes error -result {bad window name/identifier "xyz"}

3814	3828	set x {}
3815	3829	} -body {
3816	3830	bind .t.f <Key> "lappend x %R"
3817		event gen .t.f <Key> -root [winfo id .t]
	3831	event generate .t.f <Key> -root [winfo id .t]
3818	3832	expr {[winfo id .t] eq $x}
3819	3833	} -cleanup {
3820	3834	destroy .t.f

3828	3842	set x {}
3829	3843	} -body {
3830	3844	bind .t.f <Button> "lappend x %R"
3831		event gen .t.f <Button> -root .t
	3845	event generate .t.f <Button> -root .t
3832	3846	expr {[winfo id .t] eq $x}
3833	3847	} -cleanup {
3834	3848	destroy .t.f

3842	3856	set x {}
3843	3857	} -body {
3844	3858	bind .t.f <ButtonRelease> "lappend x %R"
3845		event gen .t.f <ButtonRelease> -root .t
	3859	event generate .t.f <ButtonRelease> -root .t
3846	3860	expr {[winfo id .t] eq $x}
3847	3861	} -cleanup {
3848	3862	destroy .t.f

3856	3870	set x {}
3857	3871	} -body {
3858	3872	bind .t.f <Motion> "lappend x %R"
3859		event gen .t.f <Motion> -root .t
	3873	event generate .t.f <Motion> -root .t
3860	3874	expr {[winfo id .t] eq $x}
3861	3875	} -cleanup {
3862	3876	destroy .t.f

3870	3884	set x {}
3871	3885	} -body {
3872	3886	bind .t.f <<Paste>> "lappend x %R"
3873		event gen .t.f <<Paste>> -root .t
	3887	event generate .t.f <<Paste>> -root .t
3874	3888	expr {[winfo id .t] eq $x}
3875	3889	} -cleanup {
3876	3890	destroy .t.f

3884	3898	set x {}
3885	3899	} -body {
3886	3900	bind .t.f <Enter> "lappend x %R"
3887		event gen .t.f <Enter> -root .t
	3901	event generate .t.f <Enter> -root .t
3888	3902	expr {[winfo id .t] eq $x}
3889	3903	} -cleanup {
3890	3904	destroy .t.f

3898	3912	set x {}
3899	3913	} -body {
3900	3914	bind .t.f <Configure> "lappend x %R"
3901		event gen .t.f <Configure> -root .t
	3915	event generate .t.f <Configure> -root .t
3902	3916	} -cleanup {
3903	3917	destroy .t.f
3904	3918	} -returnCodes error -result {<Configure> event doesn't accept "-root" option}

3911	3925	set x {}
3912	3926	} -body {
3913	3927	bind .t.f <Key> "lappend x %X"
3914		event gen .t.f <Key> -rootx xyz
	3928	event generate .t.f <Key> -rootx xyz
3915	3929	} -cleanup {
3916	3930	destroy .t.f
3917	3931	} -returnCodes error -result {bad screen distance "xyz"}

3924	3938	set x {}
3925	3939	} -body {
3926	3940	bind .t.f <Key> "lappend x %X"
3927		event gen .t.f <Key> -rootx 2i
	3941	event generate .t.f <Key> -rootx 2i
3928	3942	expr {[winfo pixels .t.f 2i] eq $x}
3929	3943	} -cleanup {
3930	3944	destroy .t.f

3938	3952	set x {}
3939	3953	} -body {
3940	3954	bind .t.f <Button> "lappend x %X"
3941		event gen .t.f <Button> -rootx 2i
	3955	event generate .t.f <Button> -rootx 2i
3942	3956	expr {[winfo pixels .t.f 2i] eq $x}
3943	3957	} -cleanup {
3944	3958	destroy .t.f

3952	3966	set x {}
3953	3967	} -body {
3954	3968	bind .t.f <ButtonRelease> "lappend x %X"
3955		event gen .t.f <ButtonRelease> -rootx 2i
	3969	event generate .t.f <ButtonRelease> -rootx 2i
3956	3970	expr {[winfo pixels .t.f 2i] eq $x}
3957	3971	} -cleanup {
3958	3972	destroy .t.f

3966	3980	set x {}
3967	3981	} -body {
3968	3982	bind .t.f <Motion> "lappend x %X"
3969		event gen .t.f <Motion> -rootx 2i
	3983	event generate .t.f <Motion> -rootx 2i
3970	3984	expr {[winfo pixels .t.f 2i] eq $x}
3971	3985	} -cleanup {
3972	3986	destroy .t.f

3980	3994	set x {}
3981	3995	} -body {
3982	3996	bind .t.f <<Paste>> "lappend x %X"
3983		event gen .t.f <<Paste>> -rootx 2i
	3997	event generate .t.f <<Paste>> -rootx 2i
3984	3998	expr {[winfo pixels .t.f 2i] eq $x}
3985	3999	} -cleanup {
3986	4000	destroy .t.f

3994	4008	set x {}
3995	4009	} -body {
3996	4010	bind .t.f <Enter> "lappend x %X"
3997		event gen .t.f <Enter> -rootx 2i
	4011	event generate .t.f <Enter> -rootx 2i
3998	4012	expr {[winfo pixels .t.f 2i] eq $x}
3999	4013	} -cleanup {
4000	4014	destroy .t.f

4008	4022	set x {}
4009	4023	} -body {
4010	4024	bind .t.f <Configure> "lappend x %X"
4011		event gen .t.f <Configure> -rootx 2i
	4025	event generate .t.f <Configure> -rootx 2i
4012	4026	} -cleanup {
4013	4027	destroy .t.f
4014	4028	} -returnCodes error -result {<Configure> event doesn't accept "-rootx" option}

4021	4035	set x {}
4022	4036	} -body {
4023	4037	bind .t.f <Key> "lappend x %Y"
4024		event gen .t.f <Key> -rooty xyz
	4038	event generate .t.f <Key> -rooty xyz
4025	4039	} -cleanup {
4026	4040	destroy .t.f
4027	4041	} -returnCodes error -result {bad screen distance "xyz"}

4034	4048	set x {}
4035	4049	} -body {
4036	4050	bind .t.f <Key> "lappend x %Y"
4037		event gen .t.f <Key> -rooty 2i
	4051	event generate .t.f <Key> -rooty 2i
4038	4052	expr {[winfo pixels .t.f 2i] eq $x}
4039	4053	} -cleanup {
4040	4054	destroy .t.f

4048	4062	set x {}
4049	4063	} -body {
4050	4064	bind .t.f <Button> "lappend x %Y"
4051		event gen .t.f <Button> -rooty 2i
	4065	event generate .t.f <Button> -rooty 2i
4052	4066	expr {[winfo pixels .t.f 2i] eq $x}
4053	4067	} -cleanup {
4054	4068	destroy .t.f

4062	4076	set x {}
4063	4077	} -body {
4064	4078	bind .t.f <ButtonRelease> "lappend x %Y"
4065		event gen .t.f <ButtonRelease> -rooty 2i
	4079	event generate .t.f <ButtonRelease> -rooty 2i
4066	4080	expr {[winfo pixels .t.f 2i] eq $x}
4067	4081	} -cleanup {
4068	4082	destroy .t.f

4076	4090	set x {}
4077	4091	} -body {
4078	4092	bind .t.f <Motion> "lappend x %Y"
4079		event gen .t.f <Motion> -rooty 2i
	4093	event generate .t.f <Motion> -rooty 2i
4080	4094	expr {[winfo pixels .t.f 2i] eq $x}
4081	4095	} -cleanup {
4082	4096	destroy .t.f

4090	4104	set x {}
4091	4105	} -body {
4092	4106	bind .t.f <<Paste>> "lappend x %Y"
4093		event gen .t.f <<Paste>> -rooty 2i
	4107	event generate .t.f <<Paste>> -rooty 2i
4094	4108	expr {[winfo pixels .t.f 2i] eq $x}
4095	4109	} -cleanup {
4096	4110	destroy .t.f

4104	4118	set x {}
4105	4119	} -body {
4106	4120	bind .t.f <Enter> "lappend x %Y"
4107		event gen .t.f <Enter> -rooty 2i
	4121	event generate .t.f <Enter> -rooty 2i
4108	4122	expr {[winfo pixels .t.f 2i] eq $x}
4109	4123	} -cleanup {
4110	4124	destroy .t.f

4118	4132	set x {}
4119	4133	} -body {
4120	4134	bind .t.f <Configure> "lappend x %Y"
4121		event gen .t.f <Configure> -rooty 2i
	4135	event generate .t.f <Configure> -rooty 2i
4122	4136	} -cleanup {
4123	4137	destroy .t.f
4124	4138	} -returnCodes error -result {<Configure> event doesn't accept "-rooty" option}

4131	4145	set x {}
4132	4146	} -body {
4133	4147	bind .t.f <Key> "lappend x %E"
4134		event gen .t.f <Key> -sendevent xyz
	4148	event generate .t.f <Key> -sendevent xyz
4135	4149	} -cleanup {
4136	4150	destroy .t.f
4137	4151	} -returnCodes error -result {expected boolean value but got "xyz"}

4144	4158	set x {}
4145	4159	} -body {
4146	4160	bind .t.f <Key> "lappend x %E"
4147		event gen .t.f <Key> -sendevent 1
	4161	event generate .t.f <Key> -sendevent 1
4148	4162	return $x
4149	4163	} -cleanup {
4150	4164	destroy .t.f

4158	4172	set x {}
4159	4173	} -body {
4160	4174	bind .t.f <Key> "lappend x %E"
4161		event gen .t.f <Key> -sendevent yes
	4175	event generate .t.f <Key> -sendevent yes
4162	4176	return $x
4163	4177	} -cleanup {
4164	4178	destroy .t.f

4172	4186	set x {}
4173	4187	} -body {
4174	4188	bind .t.f <Key> "lappend x %E"
4175		event gen .t.f <Key> -sendevent 43
	4189	event generate .t.f <Key> -sendevent 43
4176	4190	return $x
4177	4191	} -cleanup {
4178	4192	destroy .t.f

4186	4200	set x {}
4187	4201	} -body {
4188	4202	bind .t.f <Key> "lappend x %#"
4189		event gen .t.f <Key> -serial xyz
	4203	event generate .t.f <Key> -serial xyz
4190	4204	} -cleanup {
4191	4205	destroy .t.f
4192	4206	} -returnCodes error -result {expected integer but got "xyz"}

4199	4213	set x {}
4200	4214	} -body {
4201	4215	bind .t.f <Key> "lappend x %#"
4202		event gen .t.f <Key> -serial 100
	4216	event generate .t.f <Key> -serial 100
4203	4217	return $x
4204	4218	} -cleanup {
4205	4219	destroy .t.f

4213	4227	set x {}
4214	4228	} -body {
4215	4229	bind .t.f <Key> "lappend x %s"
4216		event gen .t.f <Key> -state xyz
	4230	event generate .t.f <Key> -state xyz
4217	4231	} -cleanup {
4218	4232	destroy .t.f
4219	4233	} -returnCodes error -result {expected integer but got "xyz"}

4226	4240	set x {}
4227	4241	} -body {
4228	4242	bind .t.f <Key> "lappend x %s"
4229		event gen .t.f <Key> -state 1
	4243	event generate .t.f <Key> -state 1
4230	4244	return $x
4231	4245	} -cleanup {
4232	4246	destroy .t.f

4240	4254	set x {}
4241	4255	} -body {
4242	4256	bind .t.f <Button> "lappend x %s"
4243		event gen .t.f <Button> -state 1025
	4257	event generate .t.f <Button> -state 1025
4244	4258	return $x
4245	4259	} -cleanup {
4246	4260	destroy .t.f

4254	4268	set x {}
4255	4269	} -body {
4256	4270	bind .t.f <ButtonRelease> "lappend x %s"
4257		event gen .t.f <ButtonRelease> -state 1025
	4271	event generate .t.f <ButtonRelease> -state 1025
4258	4272	return $x
4259	4273	} -cleanup {
4260	4274	destroy .t.f

4268	4282	set x {}
4269	4283	} -body {
4270	4284	bind .t.f <Motion> "lappend x %s"
4271		event gen .t.f <Motion> -state 1
	4285	event generate .t.f <Motion> -state 1
4272	4286	return $x
4273	4287	} -cleanup {
4274	4288	destroy .t.f

4282	4296	set x {}
4283	4297	} -body {
4284	4298	bind .t.f <<Paste>> "lappend x %s"
4285		event gen .t.f <<Paste>> -state 1
	4299	event generate .t.f <<Paste>> -state 1
4286	4300	return $x
4287	4301	} -cleanup {
4288	4302	destroy .t.f

4296	4310	set x {}
4297	4311	} -body {
4298	4312	bind .t.f <Enter> "lappend x %s"
4299		event gen .t.f <Enter> -state 1
	4313	event generate .t.f <Enter> -state 1
4300	4314	return $x
4301	4315	} -cleanup {
4302	4316	destroy .t.f

4310	4324	set x {}
4311	4325	} -body {
4312	4326	bind .t.f <Visibility> "lappend x %s"
4313		event gen .t.f <Visibility> -state xyz
	4327	event generate .t.f <Visibility> -state xyz
4314	4328	} -cleanup {
4315	4329	destroy .t.f
4316	4330	} -returnCodes error -result {bad -state value "xyz": must be VisibilityUnobscured, VisibilityPartiallyObscured, or VisibilityFullyObscured}

4323	4337	set x {}
4324	4338	} -body {
4325	4339	bind .t.f <Visibility> "lappend x %s"
4326		event gen .t.f <Visibility> -state VisibilityUnobscured
	4340	event generate .t.f <Visibility> -state VisibilityUnobscured
4327	4341	return $x
4328	4342	} -cleanup {
4329	4343	destroy .t.f

4337	4351	set x {}
4338	4352	} -body {
4339	4353	bind .t.f <Configure> "lappend x %s"
4340		event gen .t.f <Configure> -state xyz
	4354	event generate .t.f <Configure> -state xyz
4341	4355	} -cleanup {
4342	4356	destroy .t.f
4343	4357	} -returnCodes error -result {<Configure> event doesn't accept "-state" option}

4350	4364	set x {}
4351	4365	} -body {
4352	4366	bind .t.f <Key> "lappend x %S"
4353		event gen .t.f <Key> -subwindow .xyz
	4367	event generate .t.f <Key> -subwindow .xyz
4354	4368	} -cleanup {
4355	4369	destroy .t.f
4356	4370	} -returnCodes error -result {bad window path name ".xyz"}

4363	4377	set x {}
4364	4378	} -body {
4365	4379	bind .t.f <Key> "lappend x %S"
4366		event gen .t.f <Key> -subwindow .t
	4380	event generate .t.f <Key> -subwindow .t
4367	4381	expr {[winfo id .t] eq $x}
4368	4382	} -cleanup {
4369	4383	destroy .t.f

4377	4391	set x {}
4378	4392	} -body {
4379	4393	bind .t.f <Key> "lappend x %S"
4380		event gen .t.f <Key> -subwindow xyz
	4394	event generate .t.f <Key> -subwindow xyz
4381	4395	} -cleanup {
4382	4396	destroy .t.f
4383	4397	} -returnCodes error -result {bad window name/identifier "xyz"}

4390	4404	set x {}
4391	4405	} -body {
4392	4406	bind .t.f <Key> "lappend x %S"
4393		event gen .t.f <Key> -subwindow [winfo id .t]
	4407	event generate .t.f <Key> -subwindow [winfo id .t]
4394	4408	expr {[winfo id .t] eq $x}
4395	4409	} -cleanup {
4396	4410	destroy .t.f

4404	4418	set x {}
4405	4419	} -body {
4406	4420	bind .t.f <Button> "lappend x %S"
4407		event gen .t.f <Button> -subwindow .t
	4421	event generate .t.f <Button> -subwindow .t
4408	4422	expr {[winfo id .t] eq $x}
4409	4423	} -cleanup {
4410	4424	destroy .t.f

4418	4432	set x {}
4419	4433	} -body {
4420	4434	bind .t.f <ButtonRelease> "lappend x %S"
4421		event gen .t.f <ButtonRelease> -subwindow .t
	4435	event generate .t.f <ButtonRelease> -subwindow .t
4422	4436	expr {[winfo id .t] eq $x}
4423	4437	} -cleanup {
4424	4438	destroy .t.f

4432	4446	set x {}
4433	4447	} -body {
4434	4448	bind .t.f <Motion> "lappend x %S"
4435		event gen .t.f <Motion> -subwindow .t
	4449	event generate .t.f <Motion> -subwindow .t
4436	4450	expr {[winfo id .t] eq $x}
4437	4451	} -cleanup {
4438	4452	destroy .t.f

4446	4460	set x {}
4447	4461	} -body {
4448	4462	bind .t.f <<Paste>> "lappend x %S"
4449		event gen .t.f <<Paste>> -subwindow .t
	4463	event generate .t.f <<Paste>> -subwindow .t
4450	4464	expr {[winfo id .t] eq $x}
4451	4465	} -cleanup {
4452	4466	destroy .t.f

4460	4474	set x {}
4461	4475	} -body {
4462	4476	bind .t.f <Enter> "lappend x %S"
4463		event gen .t.f <Enter> -subwindow .t
	4477	event generate .t.f <Enter> -subwindow .t
4464	4478	expr {[winfo id .t] eq $x}
4465	4479	} -cleanup {
4466	4480	destroy .t.f

4474	4488	set x {}
4475	4489	} -body {
4476	4490	bind .t.f <Configure> "lappend x %S"
4477		event gen .t.f <Configure> -subwindow .t
	4491	event generate .t.f <Configure> -subwindow .t
4478	4492	} -cleanup {
4479	4493	destroy .t.f
4480	4494	} -returnCodes error -result {<Configure> event doesn't accept "-subwindow" option}

4487	4501	set x {}
4488	4502	} -body {
4489	4503	bind .t.f <Key> "lappend x %t"
4490		event gen .t.f <Key> -time xyz
	4504	event generate .t.f <Key> -time xyz
4491	4505	} -cleanup {
4492	4506	destroy .t.f
4493	4507	} -returnCodes error -result {expected integer but got "xyz"}

4500	4514	set x {}
4501	4515	} -body {
4502	4516	bind .t.f <Key> "lappend x %t"
4503		event gen .t.f <Key> -time 100
	4517	event generate .t.f <Key> -time 100
4504	4518	return $x
4505	4519	} -cleanup {
4506	4520	destroy .t.f

4514	4528	set x {}
4515	4529	} -body {
4516	4530	bind .t.f <Button> "lappend x %t"
4517		event gen .t.f <Button> -time 100
	4531	event generate .t.f <Button> -time 100
4518	4532	return $x
4519	4533	} -cleanup {
4520	4534	destroy .t.f

4528	4542	set x {}
4529	4543	} -body {
4530	4544	bind .t.f <ButtonRelease> "lappend x %t"
4531		event gen .t.f <ButtonRelease> -time 100
	4545	event generate .t.f <ButtonRelease> -time 100
4532	4546	return $x
4533	4547	} -cleanup {
4534	4548	destroy .t.f

4542	4556	set x {}
4543	4557	} -body {
4544	4558	bind .t.f <Motion> "lappend x %t"
4545		event gen .t.f <Motion> -time 100
	4559	event generate .t.f <Motion> -time 100
4546	4560	return $x
4547	4561	} -cleanup {
4548	4562	destroy .t.f

4556	4570	set x {}
4557	4571	} -body {
4558	4572	bind .t.f <<Paste>> "lappend x %t"
4559		event gen .t.f <<Paste>> -time 100
	4573	event generate .t.f <<Paste>> -time 100
4560	4574	return $x
4561	4575	} -cleanup {
4562	4576	destroy .t.f

4570	4584	set x {}
4571	4585	} -body {
4572	4586	bind .t.f <Enter> "lappend x %t"
4573		event gen .t.f <Enter> -time 100
	4587	event generate .t.f <Enter> -time 100
4574	4588	return $x
4575	4589	} -cleanup {
4576	4590	destroy .t.f

4584	4598	set x {}
4585	4599	} -body {
4586	4600	bind .t.f <Property> "lappend x %t"
4587		event gen .t.f <Property> -time 100
	4601	event generate .t.f <Property> -time 100
4588	4602	return $x
4589	4603	} -cleanup {
4590	4604	destroy .t.f

4598	4612	set x {}
4599	4613	} -body {
4600	4614	bind .t.f <Configure> "lappend x %t"
4601		event gen .t.f <Configure> -time 100
	4615	event generate .t.f <Configure> -time 100
4602	4616	} -cleanup {
4603	4617	destroy .t.f
4604	4618	} -returnCodes error -result {<Configure> event doesn't accept "-time" option}

4611	4625	set x {}
4612	4626	} -body {
4613	4627	bind .t.f <Expose> "lappend x %w"
4614		event gen .t.f <Expose> -width xyz
	4628	event generate .t.f <Expose> -width xyz
4615	4629	} -cleanup {
4616	4630	destroy .t.f
4617	4631	} -returnCodes error -result {bad screen distance "xyz"}

4624	4638	set x {}
4625	4639	} -body {
4626	4640	bind .t.f <Expose> "lappend x %w"
4627		event gen .t.f <Expose> -width 2i
	4641	event generate .t.f <Expose> -width 2i
4628	4642	expr {[winfo pixels .t.f 2i] eq $x}
4629	4643	} -cleanup {
4630	4644	destroy .t.f

4638	4652	set x {}
4639	4653	} -body {
4640	4654	bind .t.f <Configure> "lappend x %w"
4641		event gen .t.f <Configure> -width 2i
	4655	event generate .t.f <Configure> -width 2i
4642	4656	expr {[winfo pixels .t.f 2i] eq $x}
4643	4657	} -cleanup {
4644	4658	destroy .t.f

4652	4666	set x {}
4653	4667	} -body {
4654	4668	bind .t.f <Key> "lappend x %k"
4655		event gen .t.f <Key> -width 2i
	4669	event generate .t.f <Key> -width 2i
4656	4670	} -cleanup {
4657	4671	destroy .t.f
4658	4672	} -returnCodes error -result {<Key> event doesn't accept "-width" option}

4665	4679	set x {}
4666	4680	} -body {
4667	4681	bind .t.f <Unmap> "lappend x %W"
4668		event gen .t.f <Unmap> -window .xyz
	4682	event generate .t.f <Unmap> -window .xyz
4669	4683	} -cleanup {
4670	4684	destroy .t.f
4671	4685	} -returnCodes error -result {bad window path name ".xyz"}

4678	4692	set x {}
4679	4693	} -body {
4680	4694	bind .t.f <Unmap> "lappend x %W"
4681		event gen .t.f <Unmap> -window .t.f
	4695	event generate .t.f <Unmap> -window .t.f
4682	4696	return $x
4683	4697	} -cleanup {
4684	4698	destroy .t.f

4692	4706	set x {}
4693	4707	} -body {
4694	4708	bind .t.f <Unmap> "lappend x %W"
4695		event gen .t.f <Unmap> -window xyz
	4709	event generate .t.f <Unmap> -window xyz
4696	4710	} -cleanup {
4697	4711	destroy .t.f
4698	4712	} -returnCodes error -result {bad window name/identifier "xyz"}

4705	4719	set x {}
4706	4720	} -body {
4707	4721	bind .t.f <Unmap> "lappend x %W"
4708		event gen .t.f <Unmap> -window [winfo id .t.f]
	4722	event generate .t.f <Unmap> -window [winfo id .t.f]
4709	4723	return $x
4710	4724	} -cleanup {
4711	4725	destroy .t.f

4719	4733	set x {}
4720	4734	} -body {
4721	4735	bind .t.f <Unmap> "lappend x %W"
4722		event gen .t.f <Unmap> -window .t.f
	4736	event generate .t.f <Unmap> -window .t.f
4723	4737	return $x
4724	4738	} -cleanup {
4725	4739	destroy .t.f

4733	4747	set x {}
4734	4748	} -body {
4735	4749	bind .t.f <Map> "lappend x %W"
4736		event gen .t.f <Map> -window .t.f
	4750	event generate .t.f <Map> -window .t.f
4737	4751	return $x
4738	4752	} -cleanup {
4739	4753	destroy .t.f

4747	4761	set x {}
4748	4762	} -body {
4749	4763	bind .t.f <Reparent> "lappend x %W"
4750		event gen .t.f <Reparent> -window .t.f
	4764	event generate .t.f <Reparent> -window .t.f
4751	4765	return $x
4752	4766	} -cleanup {
4753	4767	destroy .t.f

4761	4775	set x {}
4762	4776	} -body {
4763	4777	bind .t.f <Configure> "lappend x %W"
4764		event gen .t.f <Configure> -window .t.f
	4778	event generate .t.f <Configure> -window .t.f
4765	4779	return $x
4766	4780	} -cleanup {
4767	4781	destroy .t.f

4775	4789	set x {}
4776	4790	} -body {
4777	4791	bind .t.f <Gravity> "lappend x %W"
4778		event gen .t.f <Gravity> -window .t.f
	4792	event generate .t.f <Gravity> -window .t.f
4779	4793	return $x
4780	4794	} -cleanup {
4781	4795	destroy .t.f

4789	4803	set x {}
4790	4804	} -body {
4791	4805	bind .t.f <Circulate> "lappend x %W"
4792		event gen .t.f <Circulate> -window .t.f
	4806	event generate .t.f <Circulate> -window .t.f
4793	4807	return $x
4794	4808	} -cleanup {
4795	4809	destroy .t.f

4803	4817	set x {}
4804	4818	} -body {
4805	4819	bind .t.f <Key> "lappend x %W"
4806		event gen .t.f <Key> -window .t.f
	4820	event generate .t.f <Key> -window .t.f
4807	4821	} -cleanup {
4808	4822	destroy .t.f
4809	4823	} -returnCodes error -result {<Key> event doesn't accept "-window" option}

4816	4830	set x {}
4817	4831	} -body {
4818	4832	bind .t.f <Key> "lappend x %x"
4819		event gen .t.f <Key> -x xyz
	4833	event generate .t.f <Key> -x xyz
4820	4834	} -cleanup {
4821	4835	destroy .t.f
4822	4836	} -returnCodes error -result {bad screen distance "xyz"}

4829	4843	set x {}
4830	4844	} -body {
4831	4845	bind .t.f <Key> "lappend x %x"
4832		event gen .t.f <Key> -x 2i
	4846	event generate .t.f <Key> -x 2i
4833	4847	expr {[winfo pixels .t.f 2i] eq $x}
4834	4848	} -cleanup {
4835	4849	destroy .t.f

4843	4857	set x {}
4844	4858	} -body {
4845	4859	bind .t.f <Button> "lappend x %x"
4846		event gen .t.f <Button> -x 2i
	4860	event generate .t.f <Button> -x 2i
4847	4861	expr {[winfo pixels .t.f 2i] eq $x}
4848	4862	} -cleanup {
4849	4863	destroy .t.f

4857	4871	set x {}
4858	4872	} -body {
4859	4873	bind .t.f <ButtonRelease> "lappend x %x"
4860		event gen .t.f <ButtonRelease> -x 2i
	4874	event generate .t.f <ButtonRelease> -x 2i
4861	4875	expr {[winfo pixels .t.f 2i] eq $x}
4862	4876	} -cleanup {
4863	4877	destroy .t.f

4871	4885	set x {}
4872	4886	} -body {
4873	4887	bind .t.f <Motion> "lappend x %x"
4874		event gen .t.f <Motion> -x 2i
	4888	event generate .t.f <Motion> -x 2i
4875	4889	expr {[winfo pixels .t.f 2i] eq $x}
4876	4890	} -cleanup {
4877	4891	destroy .t.f

4885	4899	set x {}
4886	4900	} -body {
4887	4901	bind .t.f <<Paste>> "lappend x %x"
4888		event gen .t.f <<Paste>> -x 2i
	4902	event generate .t.f <<Paste>> -x 2i
4889	4903	expr {[winfo pixels .t.f 2i] eq $x}
4890	4904	} -cleanup {
4891	4905	destroy .t.f

4899	4913	set x {}
4900	4914	} -body {
4901	4915	bind .t.f <Enter> "lappend x %x"
4902		event gen .t.f <Enter> -x 2i
	4916	event generate .t.f <Enter> -x 2i
4903	4917	expr {[winfo pixels .t.f 2i] eq $x}
4904	4918	} -cleanup {
4905	4919	destroy .t.f

4913	4927	set x {}
4914	4928	} -body {
4915	4929	bind .t.f <Expose> "lappend x %x"
4916		event gen .t.f <Expose> -x 2i
	4930	event generate .t.f <Expose> -x 2i
4917	4931	expr {[winfo pixels .t.f 2i] eq $x}
4918	4932	} -cleanup {
4919	4933	destroy .t.f

4927	4941	set x {}
4928	4942	} -body {
4929	4943	bind .t.f <Configure> "lappend x %x"
4930		event gen .t.f <Configure> -x 2i
	4944	event generate .t.f <Configure> -x 2i
4931	4945	expr {[winfo pixels .t.f 2i] eq $x}
4932	4946	} -cleanup {
4933	4947	destroy .t.f

4941	4955	set x {}
4942	4956	} -body {
4943	4957	bind .t.f <Gravity> "lappend x %x"
4944		event gen .t.f <Gravity> -x 2i
	4958	event generate .t.f <Gravity> -x 2i
4945	4959	expr {[winfo pixels .t.f 2i] eq $x}
4946	4960	} -cleanup {
4947	4961	destroy .t.f

4955	4969	set x {}
4956	4970	} -body {
4957	4971	bind .t.f <Reparent> "lappend x %x"
4958		event gen .t.f <Reparent> -x 2i
	4972	event generate .t.f <Reparent> -x 2i
4959	4973	expr {[winfo pixels .t.f 2i] eq $x}
4960	4974	} -cleanup {
4961	4975	destroy .t.f

4969	4983	set x {}
4970	4984	} -body {
4971	4985	bind .t.f <Map> "lappend x %x"
4972		event gen .t.f <Map> -x 2i
	4986	event generate .t.f <Map> -x 2i
4973	4987	} -cleanup {
4974	4988	destroy .t.f
4975	4989	} -returnCodes error -result {<Map> event doesn't accept "-x" option}

4982	4996	set x {}
4983	4997	} -body {
4984	4998	bind .t.f <Key> "lappend x %y"
4985		event gen .t.f <Key> -y xyz
	4999	event generate .t.f <Key> -y xyz
4986	5000	} -cleanup {
4987	5001	destroy .t.f
4988	5002	} -returnCodes error -result {bad screen distance "xyz"}

4995	5009	set x {}
4996	5010	} -body {
4997	5011	bind .t.f <Key> "lappend x %y"
4998		event gen .t.f <Key> -y 2i
	5012	event generate .t.f <Key> -y 2i
4999	5013	expr {[winfo pixels .t.f 2i] eq $x}
5000	5014	} -cleanup {
5001	5015	destroy .t.f

5009	5023	set x {}
5010	5024	} -body {
5011	5025	bind .t.f <Button> "lappend x %y"
5012		event gen .t.f <Button> -y 2i
	5026	event generate .t.f <Button> -y 2i
5013	5027	expr {[winfo pixels .t.f 2i] eq $x}
5014	5028	} -cleanup {
5015	5029	destroy .t.f

5023	5037	set x {}
5024	5038	} -body {
5025	5039	bind .t.f <ButtonRelease> "lappend x %y"
5026		event gen .t.f <ButtonRelease> -y 2i
	5040	event generate .t.f <ButtonRelease> -y 2i
5027	5041	expr {[winfo pixels .t.f 2i] eq $x}
5028	5042	} -cleanup {
5029	5043	destroy .t.f

5037	5051	set x {}
5038	5052	} -body {
5039	5053	bind .t.f <Motion> "lappend x %y"
5040		event gen .t.f <Motion> -y 2i
	5054	event generate .t.f <Motion> -y 2i
5041	5055	expr {[winfo pixels .t.f 2i] eq $x}
5042	5056	} -cleanup {
5043	5057	destroy .t.f

5051	5065	set x {}
5052	5066	} -body {
5053	5067	bind .t.f <<Paste>> "lappend x %y"
5054		event gen .t.f <<Paste>> -y 2i
	5068	event generate .t.f <<Paste>> -y 2i
5055	5069	expr {[winfo pixels .t.f 2i] eq $x}
5056	5070	} -cleanup {
5057	5071	destroy .t.f

5065	5079	set x {}
5066	5080	} -body {
5067	5081	bind .t.f <Enter> "lappend x %y"
5068		event gen .t.f <Enter> -y 2i
	5082	event generate .t.f <Enter> -y 2i
5069	5083	expr {[winfo pixels .t.f 2i] eq $x}
5070	5084	} -cleanup {
5071	5085	destroy .t.f

5079	5093	set x {}
5080	5094	} -body {
5081	5095	bind .t.f <Expose> "lappend x %y"
5082		event gen .t.f <Expose> -y 2i
	5096	event generate .t.f <Expose> -y 2i
5083	5097	expr {[winfo pixels .t.f 2i] eq $x}
5084	5098	} -cleanup {
5085	5099	destroy .t.f

5093	5107	set x {}
5094	5108	} -body {
5095	5109	bind .t.f <Configure> "lappend x %y"
5096		event gen .t.f <Configure> -y 2i
	5110	event generate .t.f <Configure> -y 2i
5097	5111	expr {[winfo pixels .t.f 2i] eq $x}
5098	5112	} -cleanup {
5099	5113	destroy .t.f

5107	5121	set x {}
5108	5122	} -body {
5109	5123	bind .t.f <Gravity> "lappend x %y"
5110		event gen .t.f <Gravity> -y 2i
	5124	event generate .t.f <Gravity> -y 2i
5111	5125	expr {[winfo pixels .t.f 2i] eq $x}
5112	5126	} -cleanup {
5113	5127	destroy .t.f

5121	5135	set x {}
5122	5136	} -body {
5123	5137	bind .t.f <Reparent> "lappend x %y"
5124		event gen .t.f <Reparent> -y 2i
	5138	event generate .t.f <Reparent> -y 2i
5125	5139	expr {[winfo pixels .t.f 2i] eq $x}
5126	5140	} -cleanup {
5127	5141	destroy .t.f

5135	5149	set x {}
5136	5150	} -body {
5137	5151	bind .t.f <Map> "lappend x %y"
5138		event gen .t.f <Map> -y 2i
	5152	event generate .t.f <Map> -y 2i
5139	5153	} -cleanup {
5140	5154	destroy .t.f
5141	5155	} -returnCodes error -result {<Map> event doesn't accept "-y" option}

5148	5162	set x {}
5149	5163	} -body {
5150	5164	bind .t.f <Key> "lappend x %k"
5151		event gen .t.f <Key> -xyz 1
	5165	event generate .t.f <Key> -xyz 1
5152	5166	} -cleanup {
5153	5167	destroy .t.f
5154	5168	} -returnCodes error -result {bad option "-xyz": must be -when, -above, -borderwidth, -button, -count, -data, -delta, -detail, -focus, -height, -keycode, -keysym, -mode, -override, -place, -root, -rootx, -rooty, -sendevent, -serial, -state, -subwindow, -time, -warp, -width, -window, -x, or -y}

5203	5217	bind .t.f <Triple-1> {lappend x triple}
5204	5218	bind .t.f <Quadruple-1> {lappend x quadruple}
5205	5219	set x press
5206		event gen .t.f <Button-1>
5207		event gen .t.f <ButtonRelease-1>
	5220	event generate .t.f <Button-1>
	5221	event generate .t.f <ButtonRelease-1>
5208	5222	lappend x press
5209		event gen .t.f <Button-1>
5210		event gen .t.f <ButtonRelease-1>
	5223	event generate .t.f <Button-1>
	5224	event generate .t.f <ButtonRelease-1>
5211	5225	lappend x press
5212		event gen .t.f <Button-1>
5213		event gen .t.f <ButtonRelease-1>
	5226	event generate .t.f <Button-1>
	5227	event generate .t.f <ButtonRelease-1>
5214	5228	lappend x press
5215		event gen .t.f <Button-1>
5216		event gen .t.f <ButtonRelease-1>
	5229	event generate .t.f <Button-1>
	5230	event generate .t.f <ButtonRelease-1>
5217	5231	lappend x press
5218		event gen .t.f <Button-1>
5219		event gen .t.f <ButtonRelease-1>
	5232	event generate .t.f <Button-1>
	5233	event generate .t.f <ButtonRelease-1>
5220	5234	set x
5221	5235	} -cleanup {
5222	5236	destroy .t.f

5232	5246	set x {}
5233	5247	} -body {
5234	5248	bind .t.f <Button-1><Button-2> {lappend x 1-2}
5235		event gen .t.f <Button-1>
5236		event gen .t.f <ButtonRelease-1>
5237		event gen .t.f <Button-2>
5238		event gen .t.f <ButtonRelease-2>
	5249	event generate .t.f <Button-1>
	5250	event generate .t.f <ButtonRelease-1>
	5251	event generate .t.f <Button-2>
	5252	event generate .t.f <ButtonRelease-2>
5239	5253	set x
5240	5254	} -cleanup {
5241	5255	destroy .t.f

5249	5263	} -body {
5250	5264	bind .t.f <Button-1><Button-2> {lappend x 1-2}
5251	5265	bind .t.f <Button-2> {lappend x 2}
5252		event gen .t.f <Button-3>
5253		event gen .t.f <Button-2>
5254		event gen .t.f <ButtonRelease-2>
5255		event gen .t.f <Button-1>
5256		event gen .t.f <ButtonRelease-1>
5257		event gen .t.f <Button-2>
5258		event gen .t.f <ButtonRelease-2>
	5266	event generate .t.f <Button-3>
	5267	event generate .t.f <Button-2>
	5268	event generate .t.f <ButtonRelease-2>
	5269	event generate .t.f <Button-1>
	5270	event generate .t.f <ButtonRelease-1>
	5271	event generate .t.f <Button-2>
	5272	event generate .t.f <ButtonRelease-2>
5259	5273	set x
5260	5274	} -cleanup {
5261	5275	destroy .t.f

5269	5283	} -body {
5270	5284	bind .t.f <Button-1><Button-2> {lappend x 1-2}
5271	5285	bind .t.f <Button-2><Button-2> {lappend x 2-2}
5272		event gen .t.f <Button-3>
5273		event gen .t.f <Button-2>
5274		event gen .t.f <ButtonRelease-2>
5275		event gen .t.f <Button-2>
5276		event gen .t.f <ButtonRelease-2>
5277		event gen .t.f <Button-1>
5278		event gen .t.f <ButtonRelease-1>
5279		event gen .t.f <Button-2>
5280		event gen .t.f <ButtonRelease-2>
	5286	event generate .t.f <Button-3>
	5287	event generate .t.f <Button-2>
	5288	event generate .t.f <ButtonRelease-2>
	5289	event generate .t.f <Button-2>
	5290	event generate .t.f <ButtonRelease-2>
	5291	event generate .t.f <Button-1>
	5292	event generate .t.f <ButtonRelease-1>
	5293	event generate .t.f <Button-2>
	5294	event generate .t.f <ButtonRelease-2>
5281	5295	set x
5282	5296	} -cleanup {
5283	5297	destroy .t.f

5291	5305	} -body {
5292	5306	bind .t.f <Button-2><Button-2> {lappend x 2-2}
5293	5307	bind .t.f <Double-Button-2> {lappend x d-2}
5294		event gen .t.f <Button-3>
5295		event gen .t.f <Button-2>
5296		event gen .t.f <ButtonRelease-2>
5297		event gen .t.f <Button-2>
5298		event gen .t.f <ButtonRelease-2>
5299		event gen .t.f <Button-1>
5300		event gen .t.f <ButtonRelease-1>
5301		event gen .t.f <Button-2> -x 100
5302		event gen .t.f <ButtonRelease-2>
5303		event gen .t.f <Button-2> -x 200
5304		event gen .t.f <ButtonRelease-2>
	5308	event generate .t.f <Button-3>
	5309	event generate .t.f <Button-2>
	5310	event generate .t.f <ButtonRelease-2>
	5311	event generate .t.f <Button-2>
	5312	event generate .t.f <ButtonRelease-2>
	5313	event generate .t.f <Button-1>
	5314	event generate .t.f <ButtonRelease-1>
	5315	event generate .t.f <Button-2> -x 100
	5316	event generate .t.f <ButtonRelease-2>
	5317	event generate .t.f <Button-2> -x 200
	5318	event generate .t.f <ButtonRelease-2>
5305	5319	set x
5306	5320	} -cleanup {
5307	5321	destroy .t.f

5745	5759	} -body {
5746	5760	bind .t.f <Motion> "set x {event Motion}"
5747	5761	set x xyzzy
5748		event gen .t.f <Motion>
	5762	event generate .t.f <Motion>
5749	5763	list $x [bind .t.f]
5750	5764	} -cleanup {
5751	5765	destroy .t.f

5759	5773	} -body {
5760	5774	bind .t.f <Button> "set x {event Button}"
5761	5775	set x xyzzy
5762		event gen .t.f <Button>
	5776	event generate .t.f <Button>
5763	5777	list $x [bind .t.f]
5764	5778	} -cleanup {
5765	5779	destroy .t.f

5773	5787	} -body {
5774	5788	bind .t.f <ButtonPress> "set x {event ButtonPress}"
5775	5789	set x xyzzy
5776		event gen .t.f <ButtonPress>
	5790	event generate .t.f <ButtonPress>
5777	5791	list $x [bind .t.f]
5778	5792	} -cleanup {
5779	5793	destroy .t.f

5787	5801	} -body {
5788	5802	bind .t.f <ButtonRelease> "set x {event ButtonRelease}"
5789	5803	set x xyzzy
5790		event gen .t.f <ButtonRelease>
	5804	event generate .t.f <ButtonRelease>
5791	5805	list $x [bind .t.f]
5792	5806	} -cleanup {
5793	5807	destroy .t.f

5801	5815	} -body {
5802	5816	bind .t.f <Colormap> "set x {event Colormap}"
5803	5817	set x xyzzy
5804		event gen .t.f <Colormap>
	5818	event generate .t.f <Colormap>
5805	5819	list $x [bind .t.f]
5806	5820	} -cleanup {
5807	5821	destroy .t.f

5815	5829	} -body {
5816	5830	bind .t.f <Enter> "set x {event Enter}"
5817	5831	set x xyzzy
5818		event gen .t.f <Enter>
	5832	event generate .t.f <Enter>
5819	5833	list $x [bind .t.f]
5820	5834	} -cleanup {
5821	5835	destroy .t.f

5829	5843	} -body {
5830	5844	bind .t.f <Leave> "set x {event Leave}"
5831	5845	set x xyzzy
5832		event gen .t.f <Leave>
	5846	event generate .t.f <Leave>
5833	5847	list $x [bind .t.f]
5834	5848	} -cleanup {
5835	5849	destroy .t.f

5843	5857	} -body {
5844	5858	bind .t.f <Expose> "set x {event Expose}"
5845	5859	set x xyzzy
5846		event gen .t.f <Expose>
	5860	event generate .t.f <Expose>
5847	5861	list $x [bind .t.f]
5848	5862	} -cleanup {
5849	5863	destroy .t.f

5857	5871	} -body {
5858	5872	bind .t.f <Key> "set x {event Key}"
5859	5873	set x xyzzy
5860		event gen .t.f <Key>
	5874	event generate .t.f <Key>
5861	5875	list $x [bind .t.f]
5862	5876	} -cleanup {
5863	5877	destroy .t.f

5871	5885	} -body {
5872	5886	bind .t.f <KeyPress> "set x {event KeyPress}"
5873	5887	set x xyzzy
5874		event gen .t.f <KeyPress>
	5888	event generate .t.f <KeyPress>
5875	5889	list $x [bind .t.f]
5876	5890	} -cleanup {
5877	5891	destroy .t.f

5885	5899	} -body {
5886	5900	bind .t.f <KeyRelease> "set x {event KeyRelease}"
5887	5901	set x xyzzy
5888		event gen .t.f <KeyRelease>
	5902	event generate .t.f <KeyRelease>
5889	5903	list $x [bind .t.f]
5890	5904	} -cleanup {
5891	5905	destroy .t.f

5899	5913	} -body {
5900	5914	bind .t.f <Property> "set x {event Property}"
5901	5915	set x xyzzy
5902		event gen .t.f <Property>
	5916	event generate .t.f <Property>
5903	5917	list $x [bind .t.f]
5904	5918	} -cleanup {
5905	5919	destroy .t.f

5913	5927	} -body {
5914	5928	bind .t.f <Visibility> "set x {event Visibility}"
5915	5929	set x xyzzy
5916		event gen .t.f <Visibility>
	5930	event generate .t.f <Visibility>
5917	5931	list $x [bind .t.f]
5918	5932	} -cleanup {
5919	5933	destroy .t.f

5927	5941	} -body {
5928	5942	bind .t.f <Activate> "set x {event Activate}"
5929	5943	set x xyzzy
5930		event gen .t.f <Activate>
	5944	event generate .t.f <Activate>
5931	5945	list $x [bind .t.f]
5932	5946	} -cleanup {
5933	5947	destroy .t.f

5941	5955	} -body {
5942	5956	bind .t.f <Deactivate> "set x {event Deactivate}"
5943	5957	set x xyzzy
5944		event gen .t.f <Deactivate>
	5958	event generate .t.f <Deactivate>
5945	5959	list $x [bind .t.f]
5946	5960	} -cleanup {
5947	5961	destroy .t.f

5957	5971	} -body {
5958	5972	bind .t.f <Circulate> "set x {event Circulate}"
5959	5973	set x xyzzy
5960		event gen .t.f <Circulate>
	5974	event generate .t.f <Circulate>
5961	5975	list $x [bind .t.f]
5962	5976	} -cleanup {
5963	5977	destroy .t.f

5971	5985	} -body {
5972	5986	bind .t.f <Configure> "set x {event Configure}"
5973	5987	set x xyzzy
5974		event gen .t.f <Configure>
	5988	event generate .t.f <Configure>
5975	5989	list $x [bind .t.f]
5976	5990	} -cleanup {
5977	5991	destroy .t.f

5985	5999	} -body {
5986	6000	bind .t.f <Gravity> "set x {event Gravity}"
5987	6001	set x xyzzy
5988		event gen .t.f <Gravity>
	6002	event generate .t.f <Gravity>
5989	6003	list $x [bind .t.f]
5990	6004	} -cleanup {
5991	6005	destroy .t.f

5999	6013	} -body {
6000	6014	bind .t.f <Map> "set x {event Map}"
6001	6015	set x xyzzy
6002		event gen .t.f <Map>
	6016	event generate .t.f <Map>
6003	6017	list $x [bind .t.f]
6004	6018	} -cleanup {
6005	6019	destroy .t.f

6013	6027	} -body {
6014	6028	bind .t.f <Reparent> "set x {event Reparent}"
6015	6029	set x xyzzy
6016		event gen .t.f <Reparent>
	6030	event generate .t.f <Reparent>
6017	6031	list $x [bind .t.f]
6018	6032	} -cleanup {
6019	6033	destroy .t.f

6027	6041	} -body {
6028	6042	bind .t.f <Unmap> "set x {event Unmap}"
6029	6043	set x xyzzy
6030		event gen .t.f <Unmap>
	6044	event generate .t.f <Unmap>
6031	6045	list $x [bind .t.f]
6032	6046	} -cleanup {
6033	6047	destroy .t.f

6048	6062	} -body {
6049	6063	bind .t.f <Button-1> {lappend x "button 1"}
6050	6064	set x [bind .t.f]
6051		event gen .t.f <Button-1>
6052		event gen .t.f <ButtonRelease-1>
	6065	event generate .t.f <Button-1>
	6066	event generate .t.f <ButtonRelease-1>
6053	6067	set x
6054	6068	} -cleanup {
6055	6069	destroy .t.f

6062	6076	} -body {
6063	6077	bind .t.f <Button-2> {lappend x "button 2"}
6064	6078	set x [bind .t.f]
6065		event gen .t.f <Button-2>
6066		event gen .t.f <ButtonRelease-2>
	6079	event generate .t.f <Button-2>
	6080	event generate .t.f <ButtonRelease-2>
6067	6081	set x
6068	6082	} -cleanup {
6069	6083	destroy .t.f

6076	6090	} -body {
6077	6091	bind .t.f <Button-3> {lappend x "button 3"}
6078	6092	set x [bind .t.f]
6079		event gen .t.f <Button-3>
6080		event gen .t.f <ButtonRelease-3>
	6093	event generate .t.f <Button-3>
	6094	event generate .t.f <ButtonRelease-3>
6081	6095	set x
6082	6096	} -cleanup {
6083	6097	destroy .t.f

6090	6104	} -body {
6091	6105	bind .t.f <Button-4> {lappend x "button 4"}
6092	6106	set x [bind .t.f]
6093		event gen .t.f <Button-4>
6094		event gen .t.f <ButtonRelease-4>
	6107	event generate .t.f <Button-4>
	6108	event generate .t.f <ButtonRelease-4>
6095	6109	set x
6096	6110	} -cleanup {
6097	6111	destroy .t.f

6104	6118	} -body {
6105	6119	bind .t.f <Button-5> {lappend x "button 5"}
6106	6120	set x [bind .t.f]
6107		event gen .t.f <Button-5>
6108		event gen .t.f <ButtonRelease-5>
	6121	event generate .t.f <Button-5>
	6122	event generate .t.f <ButtonRelease-5>
6109	6123	set x
6110	6124	} -cleanup {
6111	6125	destroy .t.f

6135	6149	focus -force .t.f
6136	6150	update
6137	6151	} -body {
6138		bind .t.f <Key-a> "lappend x \"keysym a\""
6139		bind .t.f <Key-x> "lappend x {bad binding match}"
	6152	bind .t.f <Key-:> "lappend x \"keysym received\""
	6153	bind .t.f <Key-_> "lappend x {bad binding match}"
6140	6154	set x [lsort [bind .t.f]]
6141		event gen .t.f <Key-a> -state 0
	6155	event generate .t.f <Key-:> ;# -state 0
6142	6156	set x
6143	6157	} -cleanup {
6144	6158	destroy .t.f
6145		} -result {a x {keysym a}}
	6159	} -result {: _ {keysym received}}
6146	6160	test bind-28.6 {keysym names} -setup {
6147	6161	frame .t.f -class Test -width 150 -height 100
6148	6162	pack .t.f

6152	6166	bind .t.f <Key-Return> "lappend x \"keysym Return\""
6153	6167	bind .t.f <Key-x> "lappend x {bad binding match}"
6154	6168	set x [lsort [bind .t.f]]
6155		event gen .t.f <Key-Return> -state 0
	6169	event generate .t.f <Key-Return> -state 0
6156	6170	set x
6157	6171	} -cleanup {
6158	6172	destroy .t.f

6166	6180	bind .t.f <Key-X> "lappend x \"keysym X\""
6167	6181	bind .t.f <Key-x> "lappend x {bad binding match}"
6168	6182	set x [lsort [bind .t.f]]
6169		event gen .t.f <Key-X> -state 1
	6183	event generate .t.f <Key-X> -state 1
6170	6184	set x
6171	6185	} -cleanup {
6172	6186	destroy .t.f

6180	6194	bind .t.f <Key-X> "lappend x \"keysym X\""
6181	6195	bind .t.f <Key-x> "lappend x {bad binding match}"
6182	6196	set x [lsort [bind .t.f]]
6183		event gen .t.f <Key-X> -state 1
	6197	event generate .t.f <Key-X> -state 1
6184	6198	set x
6185	6199	} -cleanup {
6186	6200	destroy .t.f

6199	6213	} -body {
6200	6214	bind .t.f <Button> {error "This is a test"}
6201	6215	set x none
6202		event gen .t.f <Button>
6203		event gen .t.f <ButtonRelease>
	6216	event generate .t.f <Button>
	6217	event generate .t.f <ButtonRelease>
6204	6218	update
6205	6219	set x
6206	6220	} -cleanup {

6213	6227
6214	6228	test bind-29.2 {Tk_BackgroundError procedure} -setup {
6215	6229	proc do {} {
6216		event gen .t.f <Button>
6217		event gen .t.f <ButtonRelease>
	6230	event generate .t.f <Button>
	6231	event generate .t.f <ButtonRelease>
6218	6232	}
6219	6233	proc bgerror msg {
6220	6234	global x errorInfo

6248	6262	set x {}
6249	6263	} -body {
6250	6264	bind .t.f <MouseWheel> {set x Wheel}
6251		event gen .t.f <MouseWheel>
	6265	event generate .t.f <MouseWheel>
6252	6266	set x
6253	6267	} -cleanup {
6254	6268	destroy .t.f

6261	6275	set x {}
6262	6276	} -body {
6263	6277	bind .t.f <MouseWheel> {set x %D}
6264		event gen .t.f <MouseWheel> -delta 120
	6278	event generate .t.f <MouseWheel> -delta 120
6265	6279	set x
6266	6280	} -cleanup {
6267	6281	destroy .t.f

6274	6288	set x {}
6275	6289	} -body {
6276	6290	bind .t.f <MouseWheel> {set x "%D %x %y"}
6277		event gen .t.f <MouseWheel> -delta 240 -x 10 -y 30
	6291	event generate .t.f <MouseWheel> -delta 240 -x 10 -y 30
6278	6292	set x
6279	6293	} -cleanup {
6280	6294	destroy .t.f

6288	6302	update
6289	6303	} -body {
6290	6304	# Check no confusion, since Focus events use %d for something else
6291		event gen .t.f <FocusIn> -data foo
	6305	event generate .t.f <FocusIn> -data foo
6292	6306	} -cleanup {
6293	6307	destroy .t.f
6294	6308	} -returnCodes error -result {<FocusIn> event doesn't accept "-data" option}

6300	6314	set x {}
6301	6315	} -body {
6302	6316	bind .t.f <<TestUserData>> {set x "TestUserData >%d<"}
6303		event gen .t.f <<TestUserData>>
	6317	event generate .t.f <<TestUserData>>
6304	6318	set x
6305	6319	} -cleanup {
6306	6320	destroy .t.f

6313	6327	set x {}
6314	6328	} -body {
6315	6329	bind .t.f <<TestUserData>> {set x "TestUserData >%d<"}
6316		event gen .t.f <<TestUserData>> -data "foo bar"
	6330	event generate .t.f <<TestUserData>> -data "foo bar"
6317	6331	set x
6318	6332	} -cleanup {
6319	6333	destroy .t.f

6326	6340	set x {}
6327	6341	} -body {
6328	6342	bind .t.f <<TestUserData>> {set x "TestUserData >%d<"}
6329		event gen .t.f <<TestUserData>> -data [string index abc 1]
	6343	event generate .t.f <<TestUserData>> -data [string index abc 1]
6330	6344	set x
6331	6345	} -cleanup {
6332	6346	destroy .t.f

6343	6357	set x {}
6344	6358	} -body {
6345	6359	bind .t.f <<TestUserData>> {set x "TestUserData >%d<"}
6346		event gen .t.f <<TestUserData>> -when head
	6360	event generate .t.f <<TestUserData>> -when head
6347	6361	list $x [update] $x
6348	6362	} -cleanup {
6349	6363	destroy .t.f

6356	6370	set x {}
6357	6371	} -body {
6358	6372	bind .t.f <<TestUserData>> {set x "TestUserData >%d<"}
6359		event gen .t.f <<TestUserData>> -data "foo bar" -when head
	6373	event generate .t.f <<TestUserData>> -data "foo bar" -when head
6360	6374	list $x [update] $x
6361	6375	} -cleanup {
6362	6376	destroy .t.f

6369	6383	set x {}
6370	6384	} -body {
6371	6385	bind .t.f <<TestUserData>> {set x "TestUserData >%d<"}
6372		event gen .t.f <<TestUserData>> -data [string index abc 1] -when head
	6386	event generate .t.f <<TestUserData>> -data [string index abc 1] -when head
6373	6387	list $x [update] $x
6374	6388	} -cleanup {
6375	6389	destroy .t.f

6383	6397	# Local Variables:
6384	6398	# mode: tcl
6385	6399	# End:
6386
6387
6388
6389
6390
6391
6392
6393

+479

-0

tests/busy.test less more

	0	# Tests for the tk busy command.
	1	#
	2	# This file contains a collection of tests for one or more of the Tk built-in
	3	# commands. Sourcing this file runs the tests and generates output for errors.
	4	# No output means no errors were found.
	5	#
	6	# Copyright (c) 1998-2000 by Jos Decoster. All rights reserved.
	7	#
	8	# RCS: @(#) $Id: busy.test,v 1.2 2008/11/03 11:54:25 patthoyts Exp $
	9
	10	package require tcltest 2.1
	11	tcltest::configure {*}$argv
	12	tcltest::loadTestedCommands
	13	namespace import -force tcltest::test
	14
	15	# There's currently no way to test the actual grab effect, per se, in an
	16	# automated test. Therefore, this test suite only covers the interface to the
	17	# grab command (ie, error messages, etc.)
	18
	19	test busy-1.1 {Tk_BusyObjCmd} -returnCodes error -body {
	20	tk busy
	21	} -result {wrong # args: should be "tk busy options ?arg arg ...?"}
	22
	23	test busy-2.1 {tk busy hold} -returnCodes error -body {
	24	tk busy hold
	25	} -result {wrong # args: should be "tk busy hold window ?option value ...?"}
	26	test busy-2.2 {tk busy hold root window} -body {
	27	tk busy hold .
	28	update
	29	} -cleanup {
	30	tk busy forget .
	31	} -result {}
	32	test busy-2.3 {tk busy hold root window with shortcut} -body {
	33	tk busy .
	34	update
	35	} -cleanup {
	36	tk busy forget .
	37	} -result {}
	38	test busy-2.4 {tk busy hold nested window} -setup {
	39	pack [frame .f]
	40	} -body {
	41	tk busy hold .f
	42	update
	43	} -cleanup {
	44	tk busy forget .f
	45	destroy .f
	46	} -result {}
	47	test busy-2.5 {tk busy hold nested window with shortcut} -setup {
	48	pack [frame .f]
	49	} -body {
	50	tk busy .f
	51	update
	52	} -cleanup {
	53	tk busy forget .f
	54	destroy .f
	55	} -result {}
	56	test busy-2.6 {tk busy hold toplevel window} -setup {
	57	toplevel .f
	58	} -body {
	59	tk busy hold .f
	60	update
	61	} -cleanup {
	62	tk busy forget .f
	63	destroy .f
	64	} -result {}
	65	test busy-2.7 {tk busy hold toplevel window with shortcut} -setup {
	66	toplevel .f
	67	} -body {
	68	tk busy .f
	69	update
	70	} -cleanup {
	71	tk busy forget .f
	72	destroy .f
	73	} -result {}
	74	test busy-2.8 {tk busy hold non existing window} -body {
	75	tk busy hold .f
	76	update
	77	} -returnCodes error -result {bad window path name ".f"}
	78	test busy-2.9 {tk busy hold (shortcut) non existing window} -body {
	79	tk busy .f
	80	update
	81	} -returnCodes {error} -result {bad window path name ".f"}
	82	test busy-2.10 {tk busy hold root window with cursor} -body {
	83	tk busy hold . -cursor arrow
	84	update
	85	} -cleanup {
	86	tk busy forget .
	87	} -result {}
	88	test busy-2.11 {tk busy hold (shortcut) root window, cursor} -body {
	89	tk busy . -cursor arrow
	90	update
	91	} -cleanup {
	92	tk busy forget .
	93	} -result {}
	94	test busy-2.12 {tk busy hold root window, invalid cursor} -body {
	95	tk busy hold . -cursor nonExistingCursor
	96	update
	97	} -constraints tempNotMac -returnCodes error -cleanup {
	98	tk busy forget .
	99	} -result {bad cursor spec "nonExistingCursor"}
	100	test busy-2.13 {tk busy hold (shortcut) root window, invalid cursor} -body {
	101	tk busy . -cursor nonExistingCursor
	102	update
	103	} -constraints tempNotMac -returnCodes error -cleanup {
	104	tk busy forget .
	105	} -result {bad cursor spec "nonExistingCursor"}
	106	test busy-2.14 {tk busy hold root window, invalid option} -body {
	107	tk busy hold . -invalidOption 1
	108	update
	109	} -constraints tempNotMac -returnCodes error -cleanup {
	110	tk busy forget .
	111	} -result {unknown option "-invalidOption"}
	112	test busy-2.15 {tk busy hold (shortcut) root window, invalid option} -body {
	113	tk busy . -invalidOption 1
	114	update
	115	} -constraints tempNotMac -returnCodes error -cleanup {
	116	tk busy forget .
	117	} -result {unknown option "-invalidOption"}
	118
	119	test busy-3.1 {tk busy cget no window} -returnCodes error -body {
	120	tk busy cget
	121	} -result {wrong # args: should be "tk busy cget window option"}
	122	test busy-3.2 {tk busy cget no option} -returnCodes error -body {
	123	tk busy cget
	124	} -result {wrong # args: should be "tk busy cget window option"}
	125	test busy-3.3 {tk busy cget invalid window} -returnCodes error -body {
	126	tk busy cget .f -cursor
	127	} -result {bad window path name ".f"}
	128	test busy-3.4 {tk busy cget non-busy window} -setup {
	129	pack [frame .f]
	130	} -body {
	131	tk busy cget .f -cursor
	132	} -cleanup {
	133	destroy .f
	134	} -returnCodes error -result {can't find busy window ".f"}
	135	test busy-3.5 {tk busy cget invalid option} -setup {
	136	pack [frame .f]
	137	tk busy hold .f
	138	update
	139	} -body {
	140	tk busy cget .f -invalidOption
	141	} -cleanup {
	142	tk busy forget .f
	143	destroy .f
	144	} -returnCodes error -result {unknown option "-invalidOption"}
	145	test busy-3.6unix {tk busy cget unix} -setup {
	146	pack [frame .f]
	147	tk busy hold .f
	148	update
	149	} -body {
	150	tk busy cget .f -cursor
	151	} -cleanup {
	152	tk busy forget .f
	153	destroy .f
	154	} -result {watch} -constraints unix
	155	test busy-3.6win {tk busy cget win} -setup {
	156	pack [frame .f]
	157	tk busy hold .f
	158	update
	159	} -body {
	160	tk busy cget .f -cursor
	161	} -cleanup {
	162	tk busy forget .f
	163	destroy .f
	164	} -result {wait} -constraints win
	165	test busy-3.7 {tk busy cget unix} -setup {
	166	pack [frame .f]
	167	tk busy hold .f -cursor hand1
	168	update
	169	} -body {
	170	tk busy cget .f -cursor
	171	} -cleanup {
	172	tk busy forget .f
	173	destroy .f
	174	} -result {hand1} -constraints tempNotMac
	175
	176	test busy-4.1 {tk busy configure no window} -returnCodes error -body {
	177	tk busy configure
	178	} -result {wrong # args: should be "tk busy configure window ?option? ?value ...?"}
	179
	180	test busy-4.2 {tk busy configure invalid window} -body {
	181	tk busy configure .f
	182	} -returnCodes error -result {bad window path name ".f"}
	183
	184	test busy-4.3 {tk busy configure non-busy window} -setup {
	185	pack [frame .f]
	186	} -body {
	187	tk busy configure .f
	188	} -cleanup {
	189	destroy .f
	190	} -returnCodes error -result {can't find busy window ".f"}
	191
	192	test busy-4.4 {tk busy configure} -constraints {nonwin} -setup {
	193	pack [frame .f]
	194	tk busy hold .f
	195	update
	196	} -body {
	197	tk busy configure .f
	198	} -cleanup {
	199	tk busy forget .f
	200	destroy .f
	201	} -result {{-cursor cursor Cursor watch watch}}
	202
	203	test busy-4.4-win {tk busy configure} -constraints {win} -setup {
	204	pack [frame .f]
	205	tk busy hold .f
	206	update
	207	} -body {
	208	tk busy configure .f
	209	} -cleanup {
	210	tk busy forget .f
	211	destroy .f
	212	} -result {{-cursor cursor Cursor wait wait}}
	213
	214	test busy-4.5 {tk busy configure} -constraints {nonwin tempNotMac} -setup {
	215	pack [frame .f]
	216	tk busy hold .f -cursor hand2
	217	update
	218	} -body {
	219	tk busy configure .f
	220	} -cleanup {
	221	tk busy forget .f
	222	destroy .f
	223	} -result {{-cursor cursor Cursor watch hand2}}
	224
	225	test busy-4.5-win {tk busy configure} -constraints win -setup {
	226	pack [frame .f]
	227	tk busy hold .f -cursor hand2
	228	update
	229	} -body {
	230	tk busy configure .f
	231	} -cleanup {
	232	tk busy forget .f
	233	destroy .f
	234	} -result {{-cursor cursor Cursor wait hand2}}
	235
	236	test busy-4.6 {tk busy configure invalid option} -setup {
	237	pack [frame .f]
	238	tk busy hold .f
	239	update
	240	} -body {
	241	tk busy configure .f -invalidOption
	242	} -cleanup {
	243	tk busy forget .f
	244	destroy .f
	245	} -returnCodes error -result {unknown option "-invalidOption"}
	246
	247	test busy-4.7 {tk busy configure valid option} -constraints {nonwin} -setup {
	248	pack [frame .f]
	249	tk busy hold .f
	250	update
	251	} -body {
	252	tk busy configure .f -cursor
	253	} -cleanup {
	254	tk busy forget .f
	255	destroy .f
	256	} -result {-cursor cursor Cursor watch watch}
	257
	258	test busy-4.7-win {tk busy configure valid option} -constraints {win} -setup {
	259	pack [frame .f]
	260	tk busy hold .f
	261	update
	262	} -body {
	263	tk busy configure .f -cursor
	264	} -cleanup {
	265	tk busy forget .f
	266	destroy .f
	267	} -result {-cursor cursor Cursor wait wait}
	268
	269	test busy-4.8 {tk busy configure valid option} -constraints {
	270	nonwin tempNotMac
	271	} -setup {
	272	pack [frame .f]
	273	tk busy hold .f -cursor circle
	274	update
	275	} -body {
	276	tk busy configure .f -cursor
	277	} -cleanup {
	278	tk busy forget .f
	279	destroy .f
	280	} -result {-cursor cursor Cursor watch circle}
	281
	282	test busy-4.8-win {tk busy configure valid option} -constraints win -setup {
	283	pack [frame .f]
	284	tk busy hold .f -cursor circle
	285	update
	286	} -body {
	287	tk busy configure .f -cursor
	288	} -cleanup {
	289	tk busy forget .f
	290	destroy .f
	291	} -result {-cursor cursor Cursor wait circle}
	292
	293	test busy-4.9 {tk busy configure valid option with value} -setup {
	294	pack [frame .f]
	295	tk busy hold .f
	296	update
	297	} -body {
	298	tk busy configure .f -cursor pencil
	299	tk busy cget .f -cursor
	300	} -cleanup {
	301	tk busy forget .f
	302	destroy .f
	303	} -result {pencil} -constraints tempNotMac
	304
	305	test busy-4.10 {tk busy configure valid option with invalid value} -setup {
	306	pack [frame .f]
	307	tk busy hold .f
	308	update
	309	} -body {
	310	tk busy configure .f -cursor nonExistingCursor
	311	} -constraints tempNotMac -returnCodes error -cleanup {
	312	tk busy forget .f
	313	destroy .f
	314	} -result {bad cursor spec "nonExistingCursor"}
	315
	316	test busy-5.1 {tk busy forget} -returnCodes error -body {
	317	tk busy forget
	318	} -result {wrong # args: should be "tk busy forget window"}
	319	test busy-5.2 {tk busy forget non existing window} -body {
	320	tk busy forget .f
	321	} -returnCodes error -result {bad window path name ".f"}
	322	test busy-5.3 {tk busy forget non busy window} -setup {
	323	pack [frame .f]
	324	} -body {
	325	tk busy forget .f
	326	} -cleanup {
	327	destroy .f
	328	} -returnCodes error -result {can't find busy window ".f"}
	329	test busy-5.4 {tk busy forget window} -setup {
	330	pack [frame .f]
	331	tk busy hold .f
	332	update
	333	} -body {
	334	set r [tk busy status .f]
	335	tk busy forget .f
	336	lappend r [tk busy status .f]
	337	} -cleanup {
	338	destroy .f
	339	} -result {1 0}
	340
	341	test busy-6.1 {tk busy status} -returnCodes error -body {
	342	tk busy status
	343	} -result {wrong # args: should be "tk busy status window"}
	344	test busy-6.2 {tk busy status non existing window} -body {
	345	tk busy status .f
	346	} -result {0}
	347	test busy-6.3 {tk busy status non busy window} -setup {
	348	pack [frame .f]
	349	} -body {
	350	tk busy status .f
	351	} -cleanup {
	352	destroy .f
	353	} -result {0}
	354	test busy-6.4 {tk busy status busy window} -setup {
	355	pack [frame .f]
	356	tk busy hold .f
	357	update
	358	} -body {
	359	tk busy status .f
	360	} -cleanup {
	361	tk busy forget .f
	362	destroy .f
	363	} -result {1}
	364	test busy-6.5 {tk busy status forgotten busy window} -setup {
	365	pack [frame .f]
	366	tk busy hold .f
	367	update
	368	tk busy forget .f
	369	} -body {
	370	tk busy status .f
	371	} -cleanup {
	372	destroy .f
	373	} -result {0}
	374
	375	test busy-7.1 {tk busy current no busy} -body {
	376	tk busy current
	377	} -result {}
	378	test busy-7.2 {tk busy current 1 busy} -setup {
	379	pack [frame .f]
	380	tk busy hold .f
	381	update
	382	} -body {
	383	tk busy current
	384	} -cleanup {
	385	tk busy forget .f
	386	destroy .f
	387	} -result {.f}
	388	test busy-7.3 {tk busy current 2 busy} -setup {
	389	pack [frame .f1]
	390	pack [frame .f2]
	391	tk busy hold .f1
	392	tk busy hold .f2
	393	update
	394	} -body {
	395	lsort [tk busy current]
	396	} -cleanup {
	397	tk busy forget .f1
	398	tk busy forget .f2
	399	destroy .f1 .f2
	400	} -result {.f1 .f2}
	401	test busy-7.4 {tk busy current 2 busy with matching filter} -setup {
	402	pack [frame .f1]
	403	pack [frame .f2]
	404	tk busy hold .f1
	405	tk busy hold .f2
	406	update
	407	} -body {
	408	lsort [tk busy current 2]
	409	} -cleanup {
	410	tk busy forget .f1
	411	tk busy forget .f2
	412	destroy .f1 .f2
	413	} -result {.f2}
	414	test busy-7.5 {tk busy current 2 busy with non matching filter} -setup {
	415	pack [frame .f1]
	416	pack [frame .f2]
	417	tk busy hold .f1
	418	tk busy hold .f2
	419	update
	420	} -body {
	421	lsort [tk busy current 3]
	422	} -cleanup {
	423	tk busy forget .f1
	424	tk busy forget .f2
	425	destroy .f1 .f2
	426	} -result {}
	427	test busy-7.6 {tk busy current 1 busy after forget} -setup {
	428	pack [frame .f]
	429	tk busy hold .f
	430	update
	431	tk busy forget .f
	432	} -body {
	433	tk busy current
	434	} -cleanup {
	435	destroy .f
	436	} -result {}
	437	test busy-7.7 {tk busy current 2 busy after forget} -setup {
	438	pack [frame .f1]
	439	pack [frame .f2]
	440	tk busy hold .f1
	441	tk busy hold .f2
	442	update
	443	tk busy forget .f1
	444	} -body {
	445	lsort [tk busy current]
	446	} -cleanup {
	447	tk busy forget .f2
	448	destroy .f1 .f2
	449	} -result {.f2}
	450	test busy-7.8 {tk busy current 2 busy with matching filter after forget} -setup {
	451	pack [frame .f1]
	452	pack [frame .f2]
	453	tk busy hold .f1
	454	tk busy hold .f2
	455	update
	456	tk busy forget .f1
	457	} -body {
	458	lsort [tk busy current 2]
	459	} -cleanup {
	460	tk busy forget .f2
	461	destroy .f1 .f2
	462	} -result {.f2}
	463	test busy-7.9 {tk busy current 2 busy with non matching filter after forget} -setup {
	464	pack [frame .f1]
	465	pack [frame .f2]
	466	tk busy hold .f1
	467	tk busy hold .f2
	468	update
	469	tk busy forget .f1
	470	} -body {
	471	lsort [tk busy current 3]
	472	} -cleanup {
	473	tk busy forget .f2
	474	destroy .f1 .f2
	475	} -result {}
	476
	477	::tcltest::cleanupTests
	478	return

+323

-334

tests/canvText.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7	#
8		# RCS: @(#) $Id: canvText.test,v 1.20 2008/10/08 16:13:42 dgp Exp $
	8	# RCS: @(#) $Id: canvText.test,v 1.22 2008/11/22 18:08:51 dkf Exp $
9	9
10	10	package require tcltest 2.2
11	11	namespace import ::tcltest::*

26	26	test canvasText-1.2 {configuration options: bad value for "anchor"} -body {
27	27	.c itemconfigure test -anchor xyz
28	28	} -returnCodes error -result {bad anchor position "xyz": must be n, ne, e, se, s, sw, w, nw, or center}
29
30	29	test canvText-1.3 {configuration options: good value for "fill"} -body {
31	30	.c itemconfigure test -fill #ff0000
32	31	list [lindex [.c itemconfigure test -fill] 4] [.c itemcget test -fill]

38	37	.c itemconfigure test -fill {}
39	38	list [lindex [.c itemconfigure test -fill] 4] [.c itemcget test -fill]
40	39	} -result {{} {}}
41
42	40	test canvText-1.6 {configuration options: good value for "font"} -body {
43	41	.c itemconfigure test -font {Times 40}
44	42	list [lindex [.c itemconfigure test -font] 4] [.c itemcget test -font]

46	44	test canvasText-1.7 {configuration options: bad value for "font"} -body {
47	45	.c itemconfigure test -font {}
48	46	} -returnCodes error -result {font "" doesn't exist}
49
50	47	test canvText-1.8 {configuration options: good value for "justify"} -body {
51	48	.c itemconfigure test -justify left
52	49	list [lindex [.c itemconfigure test -justify] 4] [.c itemcget test -justify]

54	51	test canvasText-1.9 {configuration options: bad value for "justify"} -body {
55	52	.c itemconfigure test -justify xyz
56	53	} -returnCodes error -result {bad justification "xyz": must be left, right, or center}
57
58	54	test canvText-1.10 {configuration options: good value for "stipple"} -body {
59	55	.c itemconfigure test -stipple gray50
60	56	list [lindex [.c itemconfigure test -stipple] 4] [.c itemcget test -stipple]

62	58	test canvasText-1.11 {configuration options: bad value for "stipple"} -body {
63	59	.c itemconfigure test -stipple xyz
64	60	} -returnCodes error -result {bitmap "xyz" not defined}
65
66	61	test canvText-1.12 {configuration options: good value for "underline"} -body {
67	62	.c itemconfigure test -underline 0
68	63	list [lindex [.c itemconfigure test -underline] 4] [.c itemcget test -underline]

70	65	test canvasText-1.13 {configuration options: bad value for "underline"} -body {
71	66	.c itemconfigure test -underline xyz
72	67	} -returnCodes error -result {expected integer but got "xyz"}
73
74	68	test canvText-1.14 {configuration options: good value for "width"} -body {
75	69	.c itemconfigure test -width 6
76	70	list [lindex [.c itemconfigure test -width] 4] [.c itemcget test -width]

78	72	test canvasText-1.15 {configuration options: bad value for "width"} -body {
79	73	.c itemconfigure test -width xyz
80	74	} -returnCodes error -result {bad screen distance "xyz"}
81
82	75	test canvText-1.16 {configuration options: good value for "tags"} -body {
83	76	.c itemconfigure test -tags {test a b c}
84	77	list [lindex [.c itemconfigure test -tags] 4] [.c itemcget test -tags]
85	78	} -result {{test a b c} {test a b c}}
	79	test canvasText-1.17 {configuration options: bad value for "angle"} -body {
	80	.c itemconfigure test -angle xyz
	81	} -returnCodes error -result {expected floating-point number but got "xyz"}
	82	test canvasText-1.18 {configuration options: good value for "angle"} -body {
	83	.c itemconfigure test -angle 32.5
	84	list [lindex [.c itemconfigure test -angle] 4] [.c itemcget test -angle]
	85	} -result {32.5 32.5}
	86	test canvasText-1.19 {configuration options: bounding of "angle"} -body {
	87	.c itemconfigure test -angle 390
	88	set result [.c itemcget test -angle]
	89	.c itemconfigure test -angle -30
	90	lappend result [.c itemcget test -angle]
	91	.c itemconfigure test -angle -360
	92	lappend result [.c itemcget test -angle]
	93	} -result {30.0 330.0 0.0}
86	94	.c delete test
87	95
88	96

92	100	test canvText-2.2 {CreateText procedure: args} -body {
93	101	.c create text xyz 0
94	102	} -cleanup {
95		.c delete all
	103	.c delete all
96	104	} -returnCodes {error} -result {bad screen distance "xyz"}
97	105	test canvText-2.3 {CreateText procedure: args} -body {
98	106	.c create text 0 xyz
99	107	} -cleanup {
100		.c delete all
	108	.c delete all
101	109	} -returnCodes {error} -result {bad screen distance "xyz"}
102	110	test canvText-2.4 {CreateText procedure: args} -body {
103	111	.c create text 0 0 -xyz xyz
104	112	} -cleanup {
105		.c delete all
	113	.c delete all
106	114	} -returnCodes {error} -result {unknown option "-xyz"}
107	115	test canvText-2.5 {CreateText procedure} -body {
108	116	.c create text 0 0 -tags x

113	121
114	122
115	123	test canvText-3.1 {TextCoords procedure} -body {
116		.c create text 20 20 -tag test
117		.c coords test 0 0
118		update
	124	.c create text 20 20 -tag test
	125	.c coords test 0 0
	126	update
119	127	.c coords test
120	128	} -cleanup {
121		.c delete test
	129	.c delete test
122	130	} -result {0.0 0.0}
123	131	test canvText-3.2 {TextCoords procedure} -setup {
124		.c create text 20 20 -tag test
	132	.c create text 20 20 -tag test
125	133	} -body {
126	134	.c coords test xyz 0
127	135	} -cleanup {
128		.c delete test
	136	.c delete test
129	137	} -returnCodes {error} -result {bad screen distance "xyz"}
130	138	test canvText-3.3 {TextCoords procedure} -setup {
131		.c create text 20 20 -tag test
	139	.c create text 20 20 -tag test
132	140	} -body {
133	141	.c coords test 0 xyz
134	142	} -cleanup {
135		.c delete test
	143	.c delete test
136	144	} -returnCodes {error} -result {bad screen distance "xyz"}
137	145	test canvText-3.4 {TextCoords procedure} -setup {
138		.c create text 20 20 -tag test
	146	.c create text 20 20 -tag test
139	147	} -body {
140	148	.c coords test 10 10
141	149	set result {}

144	152	}
145	153	return $result
146	154	} -cleanup {
147		.c delete test
	155	.c delete test
148	156	} -result {10.0 10.0}
149	157	test canvText-3.5 {TextCoords procedure} -setup {
150		.c create text 20 20 -tag test
	158	.c create text 20 20 -tag test
151	159	} -body {
152	160	.c coords test 10
153	161	} -cleanup {
154		.c delete test
	162	.c delete test
155	163	} -returnCodes {error} -result {wrong # coordinates: expected 2, got 1}
156	164	test canvText-3.6 {TextCoords procedure} -setup {
157		.c create text 20 20 -tag test
	165	.c create text 20 20 -tag test
158	166	} -body {
159	167	.c coords test 10 10 10
160	168	} -cleanup {
161		.c delete test
	169	.c delete test
162	170	} -returnCodes {error} -result {wrong # coordinates: expected 0 or 2, got 3}
163	171
164	172
165	173	test canvText-4.1 {ConfigureText procedure} -setup {
166		.c create text 20 20 -tag test
	174	.c create text 20 20 -tag test
167	175	} -body {
168	176	.c itemconfig test -fill xyz
169	177	} -cleanup {
170		.c delete test
	178	.c delete test
171	179	} -returnCodes {error} -result {unknown color name "xyz"}
172	180	test canvText-4.2 {ConfigureText procedure} -setup {
173		.c create text 20 20 -tag test
	181	.c create text 20 20 -tag test
174	182	} -body {
175	183	.c itemconfig test -fill blue
176	184	.c itemcget test -fill
177	185	} -cleanup {
178		.c delete test
	186	.c delete test
179	187	} -result {blue}
180	188	test canvText-4.3 {ConfigureText procedure: construct font gcs} -setup {
181		.c create text 20 20 -tag test
	189	.c create text 20 20 -tag test
182	190	} -body {
183	191	.c itemconfig test -font "times 20" -fill black -stipple gray50
184	192	list [.c itemcget test -font] [.c itemcget test -fill] [.c itemcget test -stipple]
185	193	} -cleanup {
186		.c delete test
	194	.c delete test
187	195	} -result {{times 20} black gray50}
188	196	test canvText-4.4 {ConfigureText procedure: construct cursor gc} -setup {
189		.c create text 20 20 -tag test
190		focus .c
191		.c focus test
	197	.c create text 20 20 -tag test
	198	focus .c
	199	.c focus test
192	200	} -body {
193	201	.c itemconfig test -text "abcdefg"
194	202	.c select from test 2
195	203	.c select to test 4
196	204	.c icursor test 3
197
198	205	# Both black -> cursor becomes white.
199	206	.c config -insertbackground black
200	207	.c config -selectbackground black
201	208	.c itemconfig test -just left
202	209	update
203
204	210	# Both same color (and not black) -> cursor becomes black.
205	211	.c config -insertbackground red
206	212	.c config -selectbackground red
207	213	.c itemconfig test -just left
208	214	update
209	215	} -cleanup {
210		.c delete test
	216	.c delete test
211	217	} -result {}
212	218	test canvText-4.5 {ConfigureText procedure: adjust selection} -setup {
213		.c create text 20 20 -tag test
214		focus .c
215		.c focus test
	219	.c create text 20 20 -tag test
	220	focus .c
	221	.c focus test
216	222	set x {}
217	223	} -body {
218	224	.c itemconfig test -text "abcdefghi"

234	240	.c dchars test 4 end
235	241	lappend x [selection get]
236	242	} -cleanup {
237		.c delete test
	243	.c delete test
238	244	} -result {cdefg 1 cdefg cd cdef cd}
239	245	test canvText-4.6 {ConfigureText procedure: adjust cursor} -setup {
240		.c create text 20 20 -tag test
	246	.c create text 20 20 -tag test
241	247	} -body {
242	248	.c itemconfig test -text "abcdefghi"
243	249	.c icursor test 6

249	255
250	256
251	257	test canvText-5.1 {ConfigureText procedure: adjust cursor} -body {
252		.c create text 10 10 -tag x -fill blue -font "times 40" -stipple gray50 -text "xyz"
	258	.c create text 10 10 -tag x -fill blue -font "times 40" -stipple gray50 \
	259	-text "xyz"
253	260	.c delete x
254	261	} -result {}
255	262
256	263
257		test canvText-6.1 {ComputeTextBbox procedure} -constraints {
258		fonts
259		} -setup {
260		.c delete test
261		} -body {
262		set font "-adobe-times-medium-r-normal---200------*"
263		set ay [font metrics $font -linespace]
264		set ax [font measure $font 0]
265
266		.c create text 0 0 -tag test
	264	test canvText-6.1 {ComputeTextBbox procedure} -constraints fonts -setup {
	265	.c delete test
	266	} -body {
	267	set font "-adobe-times-medium-r-normal---200------*"
	268	set ay [font metrics $font -linespace]
	269	set ax [font measure $font 0]
	270	.c create text 0 0 -tag test
267	271	.c itemconfig test -font $font -text 0
268	272	expr {[.c itemconfig test -anchor n; .c bbox test] \
269		eq "[expr -$ax/2-1] 0 [expr $ax/2+1] $ay"}
270		} -cleanup {
271		.c delete test
272		} -result 1
273		test canvText-6.2 {ComputeTextBbox procedure} -constraints {
274		fonts
275		} -setup {
276		.c delete test
277		} -body {
278		set font "-adobe-times-medium-r-normal---200------*"
279		set ay [font metrics $font -linespace]
280		set ax [font measure $font 0]
281
282		.c create text 0 0 -tag test
	273	eq "[expr -$ax/2-1] 0 [expr $ax/2+1] $ay"}
	274	} -cleanup {
	275	.c delete test
	276	} -result 1
	277	test canvText-6.2 {ComputeTextBbox procedure} -constraints fonts -setup {
	278	.c delete test
	279	} -body {
	280	set font "-adobe-times-medium-r-normal---200------*"
	281	set ay [font metrics $font -linespace]
	282	set ax [font measure $font 0]
	283	.c create text 0 0 -tag test
283	284	.c itemconfig test -font $font -text 0
284	285	expr {[.c itemconfig test -anchor nw; .c bbox test] \
285		eq "-1 0 [expr $ax+1] $ay"}
286		} -cleanup {
287		.c delete test
288		} -result 1
289		test canvText-6.3 {ComputeTextBbox procedure} -constraints {
290		fonts
291		} -setup {
292		.c delete test
293		} -body {
294		set font "-adobe-times-medium-r-normal---200------*"
295		set ay [font metrics $font -linespace]
296		set ax [font measure $font 0]
297
298		.c create text 0 0 -tag test
	286	eq "-1 0 [expr $ax+1] $ay"}
	287	} -cleanup {
	288	.c delete test
	289	} -result 1
	290	test canvText-6.3 {ComputeTextBbox procedure} -constraints fonts -setup {
	291	.c delete test
	292	} -body {
	293	set font "-adobe-times-medium-r-normal---200------*"
	294	set ay [font metrics $font -linespace]
	295	set ax [font measure $font 0]
	296	.c create text 0 0 -tag test
299	297	.c itemconfig test -font $font -text 0
300	298	expr {[.c itemconfig test -anchor w; .c bbox test] \
301		eq "-1 [expr -$ay/2] [expr $ax+1] [expr $ay/2]"}
302		} -cleanup {
303		.c delete test
304		} -result 1
305		test canvText-6.4 {ComputeTextBbox procedure} -constraints {
306		fonts
307		} -setup {
308		.c delete test
309		} -body {
310		set font "-adobe-times-medium-r-normal---200------*"
311		set ay [font metrics $font -linespace]
312		set ax [font measure $font 0]
313
314		.c create text 0 0 -tag test
	299	eq "-1 [expr -$ay/2] [expr $ax+1] [expr $ay/2]"}
	300	} -cleanup {
	301	.c delete test
	302	} -result 1
	303	test canvText-6.4 {ComputeTextBbox procedure} -constraints fonts -setup {
	304	.c delete test
	305	} -body {
	306	set font "-adobe-times-medium-r-normal---200------*"
	307	set ay [font metrics $font -linespace]
	308	set ax [font measure $font 0]
	309	.c create text 0 0 -tag test
315	310	.c itemconfig test -font $font -text 0
316	311	expr {[.c itemconfig test -anchor sw; .c bbox test] \
317		eq "-1 -$ay [expr $ax+1] 0"}
318		} -cleanup {
319		.c delete test
320		} -result 1
321		test canvText-6.5 {ComputeTextBbox procedure} -constraints {
322		fonts
323		} -setup {
324		.c delete test
325		} -body {
326		set font "-adobe-times-medium-r-normal---200------*"
327		set ay [font metrics $font -linespace]
328		set ax [font measure $font 0]
329
330		.c create text 0 0 -tag test
	312	eq "-1 -$ay [expr $ax+1] 0"}
	313	} -cleanup {
	314	.c delete test
	315	} -result 1
	316	test canvText-6.5 {ComputeTextBbox procedure} -constraints fonts -setup {
	317	.c delete test
	318	} -body {
	319	set font "-adobe-times-medium-r-normal---200------*"
	320	set ay [font metrics $font -linespace]
	321	set ax [font measure $font 0]
	322	.c create text 0 0 -tag test
331	323	.c itemconfig test -font $font -text 0
332	324	expr {[.c itemconfig test -anchor s; .c bbox test] \
333		eq "[expr -$ax/2-1] -$ay [expr $ax/2+1] 0"}
334		} -cleanup {
335		.c delete test
336		} -result 1
337		test canvText-6.6 {ComputeTextBbox procedure} -constraints {
338		fonts
339		} -setup {
340		.c delete test
341		} -body {
342		set font "-adobe-times-medium-r-normal---200------*"
343		set ay [font metrics $font -linespace]
344		set ax [font measure $font 0]
345
346		.c create text 0 0 -tag test
	325	eq "[expr -$ax/2-1] -$ay [expr $ax/2+1] 0"}
	326	} -cleanup {
	327	.c delete test
	328	} -result 1
	329	test canvText-6.6 {ComputeTextBbox procedure} -constraints fonts -setup {
	330	.c delete test
	331	} -body {
	332	set font "-adobe-times-medium-r-normal---200------*"
	333	set ay [font metrics $font -linespace]
	334	set ax [font measure $font 0]
	335	.c create text 0 0 -tag test
347	336	.c itemconfig test -font $font -text 0
348	337	expr {[.c itemconfig test -anchor se; .c bbox test] \
349		eq "[expr -$ax-1] -$ay 1 0"}
350		} -cleanup {
351		.c delete test
352		} -result 1
353		test canvText-6.7 {ComputeTextBbox procedure} -constraints {
354		fonts
355		} -setup {
356		.c delete test
357		} -body {
358		set font "-adobe-times-medium-r-normal---200------*"
359		set ay [font metrics $font -linespace]
360		set ax [font measure $font 0]
361
362		.c create text 0 0 -tag test
	338	eq "[expr -$ax-1] -$ay 1 0"}
	339	} -cleanup {
	340	.c delete test
	341	} -result 1
	342	test canvText-6.7 {ComputeTextBbox procedure} -constraints fonts -setup {
	343	.c delete test
	344	} -body {
	345	set font "-adobe-times-medium-r-normal---200------*"
	346	set ay [font metrics $font -linespace]
	347	set ax [font measure $font 0]
	348	.c create text 0 0 -tag test
363	349	.c itemconfig test -font $font -text 0
364	350	expr {[.c itemconfig test -anchor e; .c bbox test]\
365		eq "[expr -$ax-1] [expr -$ay/2] 1 [expr $ay/2]"}
366		} -cleanup {
367		.c delete test
368		} -result 1
369		test canvText-6.8 {ComputeTextBbox procedure} -constraints {
370		fonts
371		} -setup {
372		.c delete test
373		} -body {
374		set font "-adobe-times-medium-r-normal---200------*"
375		set ay [font metrics $font -linespace]
376		set ax [font measure $font 0]
377
378		.c create text 0 0 -tag test
	351	eq "[expr -$ax-1] [expr -$ay/2] 1 [expr $ay/2]"}
	352	} -cleanup {
	353	.c delete test
	354	} -result 1
	355	test canvText-6.8 {ComputeTextBbox procedure} -constraints fonts -setup {
	356	.c delete test
	357	} -body {
	358	set font "-adobe-times-medium-r-normal---200------*"
	359	set ay [font metrics $font -linespace]
	360	set ax [font measure $font 0]
	361	.c create text 0 0 -tag test
379	362	.c itemconfig test -font $font -text 0
380	363	expr {[.c itemconfig test -anchor ne; .c bbox test] \
381		eq "[expr -$ax-1] 0 1 $ay"}
382		} -cleanup {
383		.c delete test
384		} -result 1
385		test canvText-6.9 {ComputeTextBbox procedure} -constraints {
386		fonts
387		} -setup {
388		.c delete test
389		} -body {
390		set font "-adobe-times-medium-r-normal---200------*"
391		set ay [font metrics $font -linespace]
392		set ax [font measure $font 0]
393
394		.c create text 0 0 -tag test
	364	eq "[expr -$ax-1] 0 1 $ay"}
	365	} -cleanup {
	366	.c delete test
	367	} -result 1
	368	test canvText-6.9 {ComputeTextBbox procedure} -constraints fonts -setup {
	369	.c delete test
	370	} -body {
	371	set font "-adobe-times-medium-r-normal---200------*"
	372	set ay [font metrics $font -linespace]
	373	set ax [font measure $font 0]
	374	.c create text 0 0 -tag test
395	375	.c itemconfig test -font $font -text 0
396	376	expr {[.c itemconfig test -anchor center; .c bbox test] \
397		eq "[expr -$ax/2-1] [expr -$ay/2] [expr $ax/2+1] [expr $ay/2]"}
398		} -cleanup {
399		.c delete test
	377	eq "[expr -$ax/2-1] [expr -$ay/2] [expr $ax/2+1] [expr $ay/2]"}
	378	} -cleanup {
	379	.c delete test
400	380	} -result 1
401	381
402	382

408	388	.c focus test
409	389	.c itemconfig test -text "abcd\nefghi\njklmnopq"
410	390	test canvText-7.1 {DisplayText procedure: stippling} -body {
411		.c create text 20 20 -tag test
	391	.c create text 20 20 -tag test
412	392	.c itemconfig test -stipple gray50
413	393	update
414	394	.c itemconfig test -stipple {}
415	395	update
416	396	} -cleanup {
417		.c delete test
	397	.c delete test
418	398	} -result {}
419	399	test canvText-7.2 {DisplayText procedure: draw selection} -setup {
420		.c create text 20 20 -tag test
421		focus .c
422		.c focus test
423		} -body {
424		.c itemconfig test -text "abcd\nefghi\njklmnopq"
	400	.c create text 20 20 -tag test
	401	focus .c
	402	.c focus test
	403	} -body {
	404	.c itemconfig test -text "abcd\nefghi\njklmnopq"
425	405	.c select from test 0
426	406	.c select to test end
427	407	update
428	408	selection get
429	409	} -cleanup {
430		.c delete test
	410	.c delete test
431	411	} -result "abcd\nefghi\njklmnopq"
432	412	test canvText-7.3 {DisplayText procedure: selection} -setup {
433		.c create text 20 20 -tag test
434		focus .c
435		.c focus test
436		} -body {
437		.c itemconfig test -text "abcd\nefghi\njklmnopq"
	413	.c create text 20 20 -tag test
	414	focus .c
	415	.c focus test
	416	} -body {
	417	.c itemconfig test -text "abcd\nefghi\njklmnopq"
438	418	.c select from test 0
439	419	.c select to test end
440	420	update
441	421	selection get
442	422	} -cleanup {
443		.c delete test
	423	.c delete test
444	424	} -result "abcd\nefghi\njklmnopq"
445	425	test canvText-7.4 {DisplayText procedure: one line selection} -setup {
446		.c create text 20 20 -tag test
447		focus .c
448		.c focus test
449		} -body {
450		.c itemconfig test -text "abcd\nefghi\njklmnopq"
	426	.c create text 20 20 -tag test
	427	focus .c
	428	.c focus test
	429	} -body {
	430	.c itemconfig test -text "abcd\nefghi\njklmnopq"
451	431	.c select from test 2
452	432	.c select to test 3
453	433	update
454	434	} -cleanup {
455		.c delete test
	435	.c delete test
456	436	} -result {}
457	437	test canvText-7.5 {DisplayText procedure: multi-line selection} -setup {
458		.c create text 20 20 -tag test
459		focus .c
460		.c focus test
461		} -body {
462		.c itemconfig test -text "abcd\nefghi\njklmnopq"
	438	.c create text 20 20 -tag test
	439	focus .c
	440	.c focus test
	441	} -body {
	442	.c itemconfig test -text "abcd\nefghi\njklmnopq"
463	443	.c select from test 2
464	444	.c select to test 12
465	445	update
466	446	} -cleanup {
467		.c delete test
	447	.c delete test
468	448	} -result {}
469	449	test canvText-7.6 {DisplayText procedure: draw cursor} -setup {
470		.c create text 20 20 -tag test
471		focus .c
472		.c focus test
473		} -body {
474		.c itemconfig test -text "abcd\nefghi\njklmnopq"
	450	.c create text 20 20 -tag test
	451	focus .c
	452	.c focus test
	453	} -body {
	454	.c itemconfig test -text "abcd\nefghi\njklmnopq"
475	455	.c icursor test 3
476	456	update
477	457	} -cleanup {
478		.c delete test
	458	.c delete test
479	459	} -result {}
480	460	test canvText-7.7 {DisplayText procedure: selected text different color} -setup {
481		.c create text 20 20 -tag test
482		.c itemconfig test -text "abcd\nefghi\njklmnopq"
483		focus .c
484		.c focus test
	461	.c create text 20 20 -tag test
	462	.c itemconfig test -text "abcd\nefghi\njklmnopq"
	463	focus .c
	464	.c focus test
485	465	} -body {
486	466	.c config -selectforeground blue
487	467	.c itemconfig test -anchor n
488	468	update
489	469	} -cleanup {
490		.c delete test
	470	.c delete test
491	471	} -result {}
492	472	test canvText-7.8 {DisplayText procedure: not selected} -setup {
493		.c create text 20 20 -tag test
494		.c itemconfig test -text "abcd\nefghi\njklmnopq"
495		focus .c
496		.c focus test
	473	.c create text 20 20 -tag test
	474	.c itemconfig test -text "abcd\nefghi\njklmnopq"
	475	focus .c
	476	.c focus test
497	477	} -body {
498	478	.c select clear
499	479	update
500	480	} -cleanup {
501		.c delete test
	481	.c delete test
502	482	} -result {}
503	483	test canvText-7.9 {DisplayText procedure: select end} -setup {
504		destroy .t
	484	destroy .t
505	485	} -body {
506	486	toplevel .t
507	487	wm geometry .t +0+0

515	495	#catch {destroy .t}
516	496	update
517	497	} -cleanup {
518		destroy .t
	498	destroy .t
519	499	} -result {}
520	500
521	501	test canvText-8.1 {TextInsert procedure: 0 length insert} -setup {
522		.c create text 20 20 -tag test
523		.c itemconfig test -text "abcd\nefghi\njklmnopq"
524		focus .c
525		.c focus test
	502	.c create text 20 20 -tag test
	503	.c itemconfig test -text "abcd\nefghi\njklmnopq"
	504	focus .c
	505	.c focus test
526	506	} -body {
527	507	.c insert test end {}
528	508	} -cleanup {
529		.c delete test
	509	.c delete test
530	510	} -result {}
531	511	test canvText-8.2 {TextInsert procedure: before beginning/after end} -body {
532	512	# Can't test this because GetTextIndex filters out those numbers.
533	513	} -result {}
534	514	test canvText-8.3 {TextInsert procedure: inserting in a selected item} -setup {
535		.c create text 20 20 -tag test
536		focus .c
537		.c focus test
	515	.c create text 20 20 -tag test
	516	focus .c
	517	.c focus test
538	518	} -body {
539	519	.c itemconfig test -text "abcdefg"
540	520	.c select from test 2

543	523	.c itemcget test -text
544	524	} -result {axyzbcdefg}
545	525	test canvText-8.4 {TextInsert procedure: inserting before selection} -setup {
546		.c create text 20 20 -tag test
547		focus .c
548		.c focus test
	526	.c create text 20 20 -tag test
	527	focus .c
	528	.c focus test
549	529	} -body {
550	530	.c itemconfig test -text "abcdefg"
551	531	.c select from test 2

554	534	list [.c index test sel.first] [.c index test sel.last]
555	535	} -result {5 7}
556	536	test canvText-8.5 {TextInsert procedure: inserting in selection} -setup {
557		.c create text 20 20 -tag test
558		focus .c
559		.c focus test
	537	.c create text 20 20 -tag test
	538	focus .c
	539	.c focus test
560	540	} -body {
561	541	.c itemconfig test -text "abcdefg"
562	542	.c select from test 2

565	545	list [.c index test sel.first] [.c index test sel.last]
566	546	} -result {2 7}
567	547	test canvText-8.6 {TextInsert procedure: inserting after selection} -setup {
568		.c create text 20 20 -tag test
569		focus .c
570		.c focus test
	548	.c create text 20 20 -tag test
	549	focus .c
	550	.c focus test
571	551	} -body {
572	552	.c itemconfig test -text "abcdefg"
573	553	.c select from test 2

576	556	list [.c index test sel.first] [.c index test sel.last]
577	557	} -result {2 4}
578	558	test canvText-8.7 {TextInsert procedure: inserting in unselected item} -setup {
579		.c create text 20 20 -tag test
580		focus .c
581		.c focus test
	559	.c create text 20 20 -tag test
	560	focus .c
	561	.c focus test
582	562	} -body {
583	563	.c itemconfig test -text "abcdefg"
584	564	.c select clear

586	566	.c itemcget test -text
587	567	} -result {abcdexyzfg}
588	568	test canvText-8.8 {TextInsert procedure: inserting before cursor} -setup {
589		.c create text 20 20 -tag test
590		focus .c
591		.c focus test
	569	.c create text 20 20 -tag test
	570	focus .c
	571	.c focus test
592	572	} -body {
593	573	.c itemconfig test -text "abcdefg"
594	574	.c icursor test 3

596	576	.c index test insert
597	577	} -result {6}
598	578	test canvText-8.9 {TextInsert procedure: inserting after cursor} -setup {
599		.c create text 20 20 -tag test
600		focus .c
601		.c focus test
	579	.c create text 20 20 -tag test
	580	focus .c
	581	.c focus test
602	582	} -body {
603	583	.c itemconfig test -text "abcdefg"
604	584	.c icursor test 3

711	691
712	692
713	693	test canvText-10.1 {TextToPoint procedure} -body {
714		.c create text 0 0 -tag test
	694	.c create text 0 0 -tag test
715	695	.c itemconfig test -text 0 -anchor center
716	696	.c index test @0,0
717	697	} -cleanup {

720	700
721	701
722	702	test canvText-11.1 {TextToArea procedure} -setup {
723		.c create text 0 0 -tag test
724		focus .c
725		.c focus test
726		} -body {
	703	.c create text 0 0 -tag test
	704	focus .c
	705	.c focus test
	706	} -body {
727	707	.c itemconfig test -text 0 -anchor center
728		set res1 [.c find overlapping 0 0 1 1]
729		set res2 [.c find withtag test]
730		expr {$res1 eq $res2}
731		} -cleanup {
732		.c delete test
	708	set res1 [.c find overlapping 0 0 1 1]
	709	set res2 [.c find withtag test]
	710	expr {$res1 eq $res2}
	711	} -cleanup {
	712	.c delete test
733	713	} -result 1
734	714	test canvText-11.2 {TextToArea procedure} -setup {
735		.c create text 0 0 -tag test
736		focus .c
737		.c focus test
738		} -body {
	715	.c create text 0 0 -tag test
	716	focus .c
	717	.c focus test
	718	} -body {
739	719	.c itemconfig test -text 0 -anchor center
740	720	.c find overlapping 1000 1000 1001 1001
741	721	} -cleanup {

744	724
745	725
746	726	test canvText-12.1 {ScaleText procedure} -body {
747		.c create text 100 100 -tag test
	727	.c create text 100 100 -tag test
748	728	.c scale all 50 50 2 2
749	729	format {%.6g %.6g} {*}[.c coords test]
750	730	} -cleanup {

762	742
763	743
764	744	test canvText-14.1 {GetTextIndex procedure} -setup {
765		.c create text 0 0 -tag test
766		focus .c
767		.c focus test
768		} -body {
769		.c itemconfig test -text "abcdefghijklmno" -anchor nw
770		.c select from test 5
771		.c select to test 8
772		.c icursor test 12
773		.c coords test 0 0
774
	745	.c create text 0 0 -tag test
	746	focus .c
	747	.c focus test
	748	} -body {
	749	.c itemconfig test -text "abcdefghijklmno" -anchor nw
	750	.c select from test 5
	751	.c select to test 8
	752	.c icursor test 12
	753	.c coords test 0 0
775	754	list [.c index test end] [.c index test insert] \
776	755	[.c index test sel.first] [.c index test sel.last] \
777	756	[.c index test @0,0] \
778	757	[.c index test -1] [.c index test 10] [.c index test 100]
779	758	} -cleanup {
780		.c delete test
	759	.c delete test
781	760	} -result {15 12 5 8 0 0 10 15}
782	761	test canvText-14.2 {GetTextIndex procedure: select error} -setup {
783		.c create text 0 0 -tag test
784		focus .c
785		.c focus test
786		} -body {
	762	.c create text 0 0 -tag test
	763	focus .c
	764	.c focus test
	765	} -body {
787	766	.c select clear
788	767	.c index test sel.first
789	768	} -cleanup {
790		.c delete test
	769	.c delete test
791	770	} -returnCodes {error} -result {selection isn't in item}
792	771	test canvText-14.3 {GetTextIndex procedure: select error} -setup {
793		.c create text 0 0 -tag test
794		focus .c
795		.c focus test
796		} -body {
	772	.c create text 0 0 -tag test
	773	focus .c
	774	.c focus test
	775	} -body {
797	776	.c select clear
798	777	.c index test sel.last
799	778	} -cleanup {
800		.c delete test
	779	.c delete test
801	780	} -returnCodes {error} -result {selection isn't in item}
802	781	test canvText-14.4 {GetTextIndex procedure: select error} -setup {
803		.c create text 0 0 -tag test
804		focus .c
805		.c focus test
806		} -body {
	782	.c create text 0 0 -tag test
	783	focus .c
	784	.c focus test
	785	} -body {
807	786	.c select clear
808	787	.c index test sel.
809	788	} -cleanup {
810		.c delete test
	789	.c delete test
811	790	} -returnCodes {error} -result {bad index "sel."}
812	791	test canvText-14.5 {GetTextIndex procedure: bad int or unknown index} -setup {
813		.c create text 0 0 -tag test
814		focus .c
815		.c focus test
816		} -body {
	792	.c create text 0 0 -tag test
	793	focus .c
	794	.c focus test
	795	} -body {
817	796	.c index test xyz
818	797	} -cleanup {
819		.c delete test
	798	.c delete test
820	799	} -returnCodes {error} -result {bad index "xyz"}
821
	800	test canvText-14.6 {select clear errors} -setup {
	801	.c create text 0 0 -tag test
	802	} -body {
	803	.c select clear test
	804	} -cleanup {
	805	.c delete test
	806	} -returnCodes error -result "wrong \# args: should be \".c select clear\""
822	807
823	808	test canvText-15.1 {SetTextCursor procedure} -setup {
824		.c create text 0 0 -tag test
825		focus .c
826		.c focus test
827		} -body {
828		.c itemconfig test -text "abcdefghijklmno" -anchor nw
	809	.c create text 0 0 -tag test
	810	focus .c
	811	.c focus test
	812	} -body {
	813	.c itemconfig test -text "abcdefghijklmno" -anchor nw
829	814	.c itemconfig -text "abcdefg"
830	815	.c icursor test 3
831	816	.c index test insert
832	817	} -cleanup {
833		.c delete test
	818	.c delete test
834	819	} -result {3}
835	820
836
837	821	test canvText-16.1 {GetSelText procedure} -setup {
838		.c create text 0 0 -tag test
839		focus .c
840		.c focus test
841		} -body {
	822	.c create text 0 0 -tag test
	823	focus .c
	824	.c focus test
	825	} -body {
842	826	.c itemconfig test -text "abcdefghijklmno" -anchor nw
843	827	.c select from test 5
844	828	.c select to test 8
845	829	selection get
846	830	} -cleanup {
847		.c delete test
	831	.c delete test
848	832	} -result {fghi}
849
850	833
851	834	test canvText-17.1 {TextToPostscript procedure} -setup {
852	835	.c delete all
853		} -body {
854		set font {Courier 12 italic}
855		set ax [font measure $font 0]
856		set ay [font metrics $font -linespace]
857
858		set result "/Courier-Oblique findfont [font actual $font -size] scalefont ISOEncode setfont
	836	set result {/Courier-Oblique findfont [font actual $font -size] scalefont ISOEncode setfont
859	837	0.000 0.000 0.000 setrgbcolor AdjustColor
860		100 200 \[
	838	0 100 200 \[
861	839	\[(000)\]
862	840	\[(000)\]
863	841	\[(00)\]
864		] $ay -0.5 0.0 0 false DrawText
	842	\] $ay -0.5 0 0 false DrawText
865	843	grestore
866	844	restore showpage
867	845
868	846	%%Trailer
869	847	end
870	848	%%EOF
871		"
	849	}
	850	} -body {
	851	set font {Courier 12 italic}
	852	set ax [font measure $font 0]
	853	set ay [font metrics $font -linespace]
872	854	.c config -height 300 -highlightthickness 0 -bd 0
873	855	update
874	856	.c create text 100 100 -tags test

876	858	.c itemconfig test -anchor n -fill black
877	859	set x [.c postscript]
878	860	set x [string range $x [string first "/Courier-Oblique" $x] end]
879		expr {$x eq $result}
880		} -result 1
	861	expr {$x eq [subst $result] ? "ok" : $x}
	862	} -result ok
881	863
882	864	test canvText-18.1 {bug fix 2525, find enclosed on text with newlines} -setup {
883	865	destroy .c

891	873	update
892	874	.c find enclosed 99 99 [expr $x2 + 1] [expr $y2 + 1]
893	875	} -cleanup {
894		destroy .c
895		} -result 1
896
	876	destroy .c
	877	} -result 1
897	878
898	879	test canvText-19.1 {patch 1006286, leading space caused wrap under Win32} -setup {
899	880	destroy .c
900		} -body {
901	881	set c [canvas .c -bg black -width 964]
902	882	pack $c
903	883	$c delete all
904		after 1000 "set done 1" ; vwait done
905
	884	after 100 "set done 1"; vwait done
	885	} -body {
906	886	set f {Arial 28 bold}
907
908	887	set s1 { Yeah-ah-ah-ah-oh-oh-oh-oh-oh-oh-oh-oh-oh-oh-oh-oh-oh-oh-oh-oh-Yow}
909	888	set s2 { Yeah ah ah ah oh oh oh oh oh oh oh oh oh oh oh oh oh oh oh oh Yow}
910
911	889	$c create text 21 18 \
912	890	-font $f \
913	891	-text $s1 \

915	893	-width 922 \
916	894	-anchor nw \
917	895	-tags tbox1
918		eval {$c create rect} [$c bbox tbox1] -outline red
919
	896	$c create rect {*}[$c bbox tbox1] -outline red
920	897	$c create text 21 160 \
921	898	-font $f \
922	899	-text $s2 \

924	901	-width 922 \
925	902	-anchor nw \
926	903	-tags tbox2
927		eval {$c create rect} [$c bbox tbox2] -outline red
928
929		after 1000 "set done 1" ; vwait done
930
	904	$c create rect {*}[$c bbox tbox2] -outline red
	905	after 500 "set done 1" ; vwait done
931	906	set results [list]
932
933	907	$c select from tbox2 4
934	908	$c select to tbox2 8
935	909	lappend results [selection get]
936
937	910	$c select from tbox1 4
938	911	$c select to tbox1 8
939	912	lappend results [selection get]
940
941	913	array set metrics [font metrics $f]
942	914	set x [expr {21 + [font measure $f " "] \
943	915	+ ([font measure {Arial 28 bold} "Y"] / 2)}]
944	916	set y1 [expr {18 + ($metrics(-linespace) / 2)}]
945	917	set y2 [expr {160 + ($metrics(-linespace) / 2)}]
946
947	918	lappend results [$c index tbox1 @$x,$y1]
948	919	lappend results [$c index tbox2 @$x,$y2]
949
950		return $results
951		} -cleanup {
952		destroy .c
	920	} -cleanup {
	921	destroy .c
953	922	} -result {{Yeah } Yeah- 4 4}
954	923
	924	test canvText-20.1 {angled text bounding box} -setup {
	925	destroy .c
	926	canvas .c
	927	proc transpose {bbox} {
	928	lassign $bbox a b c d
	929	list $b $a $d $c
	930	}
	931	} -body {
	932	.c create text 2 2 -tag t -anchor center -text 0 -font {Helvetica 24}
	933	set bb0 [.c bbox t]
	934	.c itemconf t -angle 90
	935	set bb1 [.c bbox t]
	936	.c itemconf t -angle 180
	937	set bb2 [.c bbox t]
	938	.c itemconf t -angle 270
	939	set bb3 [.c bbox t]
	940	list [expr {$bb0 eq $bb2 ? "ok" : "$bb0,$bb2"}] \
	941	[expr {$bb1 eq $bb3 ? "ok" : "$bb1,$bb3"}] \
	942	[expr {$bb0 eq [transpose $bb1] ? "ok" : "$bb0,$bb1"}] \
	943	} -cleanup {
	944	destroy .c
	945	rename transpose {}
	946	} -result {ok ok ok}
955	947
956	948	# cleanup
957	949	cleanupTests
958	950	return
959
960
961

+361

-205

tests/canvas.test less more

0		# This file is a Tcl script to test out the procedures in tkCanvas.c,
1		# which implements generic code for canvases. It is organized in the
2		# standard fashion for Tcl tests.
	0	# This file is a Tcl script to test out the procedures in tkCanvas.c, which
	1	# implements generic code for canvases. It is organized in the standard
	2	# fashion for Tcl tests.
3	3	#
4	4	# Copyright (c) 1995-1996 Sun Microsystems, Inc.
5	5	# Copyright (c) 1998-2000 Ajuba Solutions.
	6	# Copyright (c) 2008 Donal K. Fellows
6	7	# All rights reserved.
7	8	#
8		# RCS: @(#) $Id: canvas.test,v 1.25 2008/08/08 17:46:38 aniap Exp $
	9	# RCS: @(#) $Id: canvas.test,v 1.28 2008/12/12 00:09:38 nijtmans Exp $
9	10
10	11	package require tcltest 2.1
11	12	eval tcltest::configure $argv
12	13	tcltest::loadTestedCommands
13	14
14		# XXX - This test file is woefully incomplete. At present, only a
15		# few of the features are tested.
	15	# XXX - This test file is woefully incomplete. At present, only a few of the
	16	# features are tested.
16	17
17	18	# Canvas used in 1.* test cases
18	19	canvas .c
19	20	pack .c
20	21	update
	22
21	23	test canvas-1.1 {configuration options: good value for "background"} -body {
22	24	.c configure -background #ff0000
23	25	.c cget -background

25	27	test canvas-1.2 {configuration options: bad value for "background"} -body {
26	28	.c configure -background non-existent
27	29	} -returnCodes error -result {unknown color name "non-existent"}
28
29	30	test canvas-1.3 {configuration options: good value for "bg"} -body {
30	31	.c configure -bg #ff0000
31	32	.c cget -bg

33	34	test canvas-1.4 {configuration options: bad value for "bg"} -body {
34	35	.c configure -bg non-existent
35	36	} -returnCodes error -result {unknown color name "non-existent"}
36
37	37	test canvas-1.5 {configuration options: good value for "bd"} -body {
38	38	.c configure -bd 4
39	39	.c cget -bd

41	41	test canvas-1.6 {configuration options: bad value for "bd"} -body {
42	42	.c configure -bd badValue
43	43	} -returnCodes error -result {bad screen distance "badValue"}
44
45	44	test canvas-1.7 {configuration options: good value for "borderwidth"} -body {
46	45	.c configure -borderwidth 1.3
47	46	.c cget -borderwidth

49	48	test canvas-1.8 {configuration options: bad value for "borderwidth"} -body {
50	49	.c configure -borderwidth badValue
51	50	} -returnCodes error -result {bad screen distance "badValue"}
52
53	51	test canvas-1.9 {configuration options: good value for "closeenough"} -body {
54	52	.c configure -closeenough 24
55	53	.c cget -closeenough

57	55	test canvas-1.10 {configuration options: bad value for "closeenough"} -body {
58	56	.c configure -closeenough bogus
59	57	} -returnCodes error -result {expected floating-point number but got "bogus"}
60
61	58	test canvas-1.11 {configuration options: good value for "confine"} -body {
62	59	.c configure -confine true
63	60	.c cget -confine

65	62	test canvas-1.12 {configuration options: bad value for "confine"} -body {
66	63	.c configure -confine silly
67	64	} -returnCodes error -result {expected boolean value but got "silly"}
68
69	65	test canvas-1.13 {configuration options: good value for "cursor"} -body {
70	66	.c configure -cursor arrow
71	67	.c cget -cursor

73	69	test canvas-1.14 {configuration options: bad value for "cursor"} -body {
74	70	.c configure -cursor badValue
75	71	} -returnCodes error -result {bad cursor spec "badValue"}
76
77	72	test canvas-1.15 {configuration options: good value for "height"} -body {
78	73	.c configure -height 2.1
79	74	.c cget -height

81	76	test canvas-1.16 {configuration options: bad value for "height"} -body {
82	77	.c configure -height x42
83	78	} -returnCodes error -result {bad screen distance "x42"}
84
85	79	test canvas-1.17 {configuration options: good value for "highlightbackground"} -body {
86	80	.c configure -highlightbackground #112233
87	81	.c cget -highlightbackground

89	83	test canvas-1.18 {configuration options: bad value for "highlightbackground"} -body {
90	84	.c configure -highlightbackground ugly
91	85	} -returnCodes error -result {unknown color name "ugly"}
92
93	86	test canvas-1.19 {configuration options: good value for "highlightcolor"} -body {
94	87	.c configure -highlightcolor #110022
95	88	.c cget -highlightcolor

97	90	test canvas-1.20 {configuration options: bad value for "highlightcolor"} -body {
98	91	.c configure -highlightcolor bogus
99	92	} -returnCodes error -result {unknown color name "bogus"}
100
101	93	test canvas-1.21 {configuration options: good value for "highlightthickness"} -body {
102	94	.c configure -highlightthickness 18
103	95	.c cget -highlightthickness

105	97	test canvas-1.22 {configuration options: bad value for "highlightthickness"} -body {
106	98	.c configure -highlightthickness badValue
107	99	} -returnCodes error -result {bad screen distance "badValue"}
108
109	100	test canvas-1.23 {configuration options: good value for "insertbackground"} -body {
110	101	.c configure -insertbackground #110022
111	102	.c cget -insertbackground

113	104	test canvas-1.24 {configuration options: bad value for "insertbackground"} -body {
114	105	.c configure -insertbackground bogus
115	106	} -returnCodes error -result {unknown color name "bogus"}
116
117	107	test canvas-1.25 {configuration options: good value for "insertborderwidth"} -body {
118	108	.c configure -insertborderwidth 1.3
119	109	.c cget -insertborderwidth

121	111	test canvas-1.26 {configuration options: bad value for "insertborderwidth"} -body {
122	112	.c configure -insertborderwidth 2.6x
123	113	} -returnCodes error -result {bad screen distance "2.6x"}
124
125	114	test canvas-1.27 {configuration options: good value for "insertofftime"} -body {
126	115	.c configure -insertofftime 100
127	116	.c cget -insertofftime

129	118	test canvas-1.28 {configuration options: bad value for "insertofftime"} -body {
130	119	.c configure -insertofftime 3.2
131	120	} -returnCodes error -result {expected integer but got "3.2"}
132
133	121	test canvas-1.29 {configuration options: good value for "insertontime"} -body {
134	122	.c configure -insertontime 100
135	123	.c cget -insertontime

137	125	test canvas-1.30 {configuration options: bad value for "insertontime"} -body {
138	126	.c configure -insertontime 3.2
139	127	} -returnCodes error -result {expected integer but got "3.2"}
140
141	128	test canvas-1.31 {configuration options: good value for "insertwidth"} -body {
142	129	.c configure -insertwidth 1.3
143	130	.c cget -insertwidth

145	132	test canvas-1.32 {configuration options: bad value for "insertwidth"} -body {
146	133	.c configure -insertwidth 6x
147	134	} -returnCodes error -result {bad screen distance "6x"}
148
149	135	test canvas-1.33 {configuration options: good value for "relief"} -body {
150	136	.c configure -relief groove
151	137	.c cget -relief
152	138	} -result {groove}
153	139	test canvas-1.34 {configuration options: bad value for "relief"} -body {
154	140	.c configure -relief 1.5
155		} -returnCodes error -result {bad relief type "1.5": must be flat, groove, raised, ridge, solid, or sunken}
156
	141	} -returnCodes error -result {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}
157	142	test canvas-1.35 {configuration options: good value for "selectbackground"} -body {
158	143	.c configure -selectbackground #110022
159	144	.c cget -selectbackground

161	146	test canvas-1.36 {configuration options: bad value for "selectbackground"} -body {
162	147	.c configure -selectbackground bogus
163	148	} -returnCodes error -result {unknown color name "bogus"}
164
165	149	test canvas-1.37 {configuration options: good value for "selectborderwidth"} -body {
166	150	.c configure -selectborderwidth 1.3
167	151	.c cget -selectborderwidth

169	153	test canvas-1.38 {configuration options: bad value for "selectborderwidth"} -body {
170	154	.c configure -selectborderwidth badValue
171	155	} -returnCodes error -result {bad screen distance "badValue"}
172
173	156	test canvas-1.39 {configuration options: good value for "selectforeground"} -body {
174	157	.c configure -selectforeground #654321
175	158	.c cget -selectforeground

177	160	test canvas-1.40 {configuration options: bad value for "selectforeground"} -body {
178	161	.c configure -selectforeground bogus
179	162	} -returnCodes error -result {unknown color name "bogus"}
180
181	163	test canvas-1.41 {configuration options: good value for "takefocus"} -body {
182	164	.c configure -takefocus "any string"
183	165	.c cget -takefocus
184	166	} -result {any string}
185
186	167	test canvas-1.42 {configuration options: good value for "width"} -body {
187	168	.c configure -width 402
188	169	.c cget -width

190	171	test canvas-1.43 {configuration options: bad value for "width"} -body {
191	172	.c configure -width xyz
192	173	} -returnCodes error -result {bad screen distance "xyz"}
193
194	174	test canvas-1.44 {configuration options: good value for "xscrollcommand"} -body {
195	175	.c configure -xscrollcommand {Some command}
196	176	.c cget -xscrollcommand
197	177	} -result {Some command}
198
199	178	test canvas-1.45 {configuration options: good value for "yscrollcommand"} -body {
200	179	.c configure -yscrollcommand {Another command}
201	180	.c cget -yscrollcommand
202	181	} -result {Another command}
203
204	182	test canvas-1.46 {configure throws error on bad option} -body {
205	183	.c configure -gorp foo
206	184	} -returnCodes error -match glob -result {*}

211	189	} -returnCodes error -match glob -result {*}
212	190	catch {destroy .c}
213	191
214
215	192	# Canvas used in 2.* test cases
216	193	canvas .c -width 60 -height 40 -scrollregion {0 0 200 150} -bd 0 \
217	194	-highlightthickness 0
218	195	pack .c
219	196	update
	197
220	198	test canvas-2.1 {CanvasWidgetCmd, bind option} -body {
221	199	set i [.c create rect 10 10 100 100]
222	200	.c bind $i <a>
223	201	} -cleanup {
224		.c delete $i
	202	.c delete $i
225	203	} -returnCodes ok
226	204	test canvas-2.2 {CanvasWidgetCmd, bind option} -body {
227	205	set i [.c create rect 10 10 100 100]
228	206	.c bind $i <
229	207	} -cleanup {
230		.c delete $i
	208	.c delete $i
231	209	} -returnCodes error -result {no event type or button # or keysym}
232	210	test canvas-2.3 {CanvasWidgetCmd, xview option} -body {
233	211	.c configure -xscrollincrement 40 -yscrollincrement 5

239	217	lappend x [.c xview]
240	218	} -result {{0.0 0.3} {0.4 0.7}}
241	219	test canvas-2.4 {CanvasWidgetCmd, xview option} -constraints nonPortable -body {
242		# This test gives slightly different results on platforms such
243		# as NetBSD. I don't know why...
	220	# This test gives slightly different results on platforms such as NetBSD.
	221	# I don't know why...
244	222	.c configure -xscrollincrement 0 -yscrollincrement 5
245	223	.c xview moveto 0.6
246	224	update

251	229	} -result {{0.6 0.9} {0.66 0.96}}
252	230	catch {destroy .c}
253	231
254
255	232	# Canvas used in 3.* test cases
256	233	canvas .c -width 60 -height 40 -scrollregion {0 0 200 80} \
257	234	-borderwidth 0 -highlightthickness 0
258	235	pack .c
259	236	update
	237
260	238	test canvas-3.1 {CanvasWidgetCmd, yview option} -body {
261	239	.c configure -xscrollincrement 40 -yscrollincrement 5
262	240	.c yview moveto 0

277	255	} -result {{0.0 0.5} {0.1 0.6}}
278	256	destroy .c
279	257
280
281	258	test canvas-4.1 {ButtonEventProc procedure} -setup {
282	259	deleteWindows
283		set x {}
	260	set x {}
284	261	} -body {
285	262	canvas .c1 -bg #543210
286	263	rename .c1 .c2

295	272	rename .c1 {}
296	273	list [info command .c*] [winfo children .]
297	274	} -cleanup {
298		destroy .c1
	275	destroy .c1
299	276	} -result {{} {}}
300
301	277
302	278	# Canvas used in 6.* test cases
303	279	canvas .c -width 100 -height 50 -scrollregion {-200 -100 305 102} \
304	280	-borderwidth 2 -highlightthickness 3
305	281	pack .c
306	282	update
	283
307	284	test canvas-6.1 {CanvasSetOrigin procedure} -body {
308	285	.c configure -xscrollincrement 0 -yscrollincrement 0
309	286	.c xview moveto 0

315	292	.c configure -xscrollincrement 20 -yscrollincrement 10
316	293	set x ""
317	294	foreach i {.08 .10 .48 .50} {
318		.c xview moveto $i
319		update
320		lappend x [.c canvasx 0]
	295	.c xview moveto $i
	296	update
	297	lappend x [.c canvasx 0]
321	298	}
322	299	return $x
323	300	} -result {-165.0 -145.0 35.0 55.0}

343	320	} -result {55.0}
344	321	deleteWindows
345	322
346
347	323	test canvas-7.1 {canvas widget vs hidden commands} -setup {
348	324	canvas .c
349	325	} -body {
350		set l [lsort [interp hidden]]
351	326	interp hide {} .c
352	327	destroy .c
353		set result [list [winfo children .] [lsort [interp hidden]]]
354		expr {$result eq [list {} $l]}
355		} -cleanup {
356		destroy .c
357		} -result {1}
358
	328	list [winfo children .] [lsort [interp hidden]]
	329	} -cleanup {
	330	destroy .c
	331	} -result [list {} [lsort [interp hidden]]]
359	332
360	333	test canvas-8.1 {canvas arc bbox} -setup {
361	334	catch {destroy .c}

370	343	list $arcBox $coordBox $pieBox
371	344	} -result {{48 21 100 94} {248 21 300 94} {398 21 500 112}}
372	345
373
374	346	test canvas-9.1 {canvas id creation and deletion} -setup {
375	347	catch {destroy .c}
376	348	canvas .c
377	349	} -body {
378		# With Tk 8.0.4 the ids are now stored in a hash table. You
379		# can use this test as a performance test with older versions
380		# by changing the value of size.
	350	# With Tk 8.0.4 the ids are now stored in a hash table. You can use this
	351	# test as a performance test with older versions by changing the value of
	352	# size.
381	353	set size 15
382
383	354	for {set i 0} {$i < $size} {incr i} {
384		set x [expr {-10 + 3*$i}]
385		for {set j 0; set y -10} {$j < 10} {incr j; incr y 3} {
386		.c create rect ${x}c ${y}c [expr $x+2]c [expr $y+2]c \
387		-outline black -fill blue -tags rect
388		.c create text [expr $x+1]c [expr $y+1]c -text "$i,$j" \
389		-anchor center -tags text
390		}
	355	set x [expr {-10 + 3*$i}]
	356	for {set j 0; set y -10} {$j < 10} {incr j; incr y 3} {
	357	.c create rect ${x}c ${y}c [expr $x+2]c [expr $y+2]c \
	358	-outline black -fill blue -tags rect
	359	.c create text [expr $x+1]c [expr $y+1]c -text "$i,$j" \
	360	-anchor center -tags text
	361	}
391	362	}
392
393		# The actual bench mark - this code also exercises all the hash
394		# table changes.
395
	363	# The actual bench mark - this code also exercises all the hash table
	364	# changes.
396	365	set time [lindex [time {
397	366	foreach id [.c find withtag all] {
398	367	.c lower $id

402	371	.c delete $id
403	372	}
404	373	}] 0]
405
406	374	set x ""
407	375	} -result {}
408	376
409
410	377	test canvas-10.1 {find items using tag expressions} -setup {
411	378	catch {destroy .c}
412	379	canvas .c
	380	set res {}
413	381	} -body {
414	382	.c create oval 20 20 40 40 -fill red -tag [list a b c d]
415	383	.c create oval 20 60 40 80 -fill yellow -tag [list b a]

418	386	.c create oval 20 180 40 200 -fill bisque -tag [list a d e]
419	387	.c create oval 20 220 40 240 -fill bisque -tag b
420	388	.c create oval 20 260 40 280 -fill bisque -tag [list d "tag with spaces"]
421		set res {}
422	389	lappend res [.c find withtag {!a}]
423	390	lappend res [.c find withtag {b&&c}]
424	391	lappend res [.c find withtag {b\|\|c}]

485	452	canvas .c
486	453	.c create oval 20 20 40 40 -fill red -tag [list a b c d]
487	454	.c create oval 20 260 40 280 -fill bisque -tag [list d "tag with spaces"]
488		} -body {
	455	} -returnCodes error -body {
489	456	.c find withtag {a&&"tag with spaces"z}
490		} -returnCodes error -result {Invalid boolean operator in tag search expression}
	457	} -result {Invalid boolean operator in tag search expression}
491	458	test canvas-10.9 {check errors from tag expressions} -setup {
492	459	catch {destroy .c}
493	460	canvas .c

507	474	test canvas-10.11 {backward compatility - strange tags that are not expressions} -setup {
508	475	catch {destroy .c}
509	476	canvas .c
510		.c create oval 20 20 40 40 -fill red -tag [list { strange tag(xxx&yyy\|zzz) " && \" \|\| ! ^ " }]
	477	.c create oval 20 20 40 40 -fill red \
	478	-tag [list { strange tag(xxx&yyy\|zzz) " && \" \|\| ! ^ " }]
511	479	} -body {
512	480	.c find withtag { strange tag(xxx&yyy\|zzz) " && \" \|\| ! ^ " }
513	481	} -result 1

518	486	.c bind {a && b} <Enter> {puts Enter}
519	487	.c bind {a && b} <Leave> {puts Leave}
520	488	} -result {}
521
522	489
523	490	test canvas-11.1 {canvas poly fill check, bug 5783} -setup {
524	491	destroy .c

534	501	set result {}
535	502	} -body {
536	503	.c create poly 30 30 90 90 30 90 90 30
537		lappend result [.c find over 40 40 45 45]; # rect region inc. edge
538		lappend result [.c find over 60 40 60 40]; # top-center point
539		lappend result [.c find over 0 0 0 0]; # not on poly
540		lappend result [.c find over 60 60 60 60]; # center-point
541		lappend result [.c find over 45 50 45 50]; # outside poly
	504	lappend result [.c find over 40 40 45 45]; # rect region inc. edge
	505	lappend result [.c find over 60 40 60 40]; # top-center point
	506	lappend result [.c find over 0 0 0 0]; # not on poly
	507	lappend result [.c find over 60 60 60 60]; # center-point
	508	lappend result [.c find over 45 50 45 50]; # outside poly
542	509	.c itemconfig 1 -fill "" -outline black
543		lappend result [.c find over 40 40 45 45]; # rect region inc. edge
544		lappend result [.c find over 60 40 60 40]; # top-center point
545		lappend result [.c find over 0 0 0 0]; # not on poly
546		lappend result [.c find over 60 60 60 60]; # center-point
547		lappend result [.c find over 45 50 45 50]; # outside poly
	510	lappend result [.c find over 40 40 45 45]; # rect region inc. edge
	511	lappend result [.c find over 60 40 60 40]; # top-center point
	512	lappend result [.c find over 0 0 0 0]; # not on poly
	513	lappend result [.c find over 60 60 60 60]; # center-point
	514	lappend result [.c find over 45 50 45 50]; # outside poly
548	515	.c itemconfig 1 -width 8
549		lappend result [.c find over 45 50 45 50]; # outside poly
	516	lappend result [.c find over 45 50 45 50]; # outside poly
550	517	} -result {1 1 {} 1 {} 1 1 {} 1 {} 1}
551
552	518
553	519	test canvas-12.1 {canvas mm obj, patch SF-403327, 102471} -setup {
554	520	destroy .c

580	546	$w create rectangle 80 80 120 120 -fill blue -tags blue
581	547	# bind a button press to re-build the canvas
582	548	$w bind blue <ButtonRelease-1> [subst {
583		[lindex [info level 0] 0] $w
584		append ::x ok
585		}
586		]
	549	[lindex [info level 0] 0] $w
	550	append ::x ok
	551	}]
587	552	}
588	553	test canvas-13.1 {canvas delete during event, SF bug-228024} -body {
589	554	kill_canvas .c
590	555	set ::x {}
591	556	# do this many times to improve chances of triggering the crash
592	557	for {set i 0} {$i < 30} {incr i} {
593		event generate .c <1> -x 100 -y 100
594		event generate .c <ButtonRelease-1> -x 100 -y 100
	558	event generate .c <1> -x 100 -y 100
	559	event generate .c <ButtonRelease-1> -x 100 -y 100
595	560	}
596	561	return $::x
597	562	} -result {okokokokokokokokokokokokokokokokokokokokokokokokokokokokokok}
598	563
599
600	564	test canvas-14.1 {canvas scan SF bug 581560} -setup {
601	565	destroy .c
602	566	canvas .c
603		} -body {
	567	} -returnCodes error -body {
604	568	.c scan
605		} -returnCodes error -result {wrong # args: should be ".c scan mark\|dragto x y ?dragGain?"}
	569	} -result {wrong # args: should be ".c scan mark\|dragto x y ?dragGain?"}
606	570	test canvas-14.2 {canvas scan} -setup {
607	571	destroy .c
608	572	canvas .c
609		} -body {
	573	} -returnCodes error -body {
610	574	.c scan bogus
611		} -returnCodes error -result {wrong # args: should be ".c scan mark\|dragto x y ?dragGain?"}
	575	} -result {wrong # args: should be ".c scan mark\|dragto x y ?dragGain?"}
612	576	test canvas-14.3 {canvas scan} -setup {
613	577	destroy .c
614	578	canvas .c
615		} -body {
	579	} -returnCodes error -body {
616	580	.c scan mark
617		} -returnCodes error -result {wrong # args: should be ".c scan mark\|dragto x y ?dragGain?"}
	581	} -result {wrong # args: should be ".c scan mark\|dragto x y ?dragGain?"}
618	582	test canvas-14.4 {canvas scan} -setup {
619	583	destroy .c
620	584	canvas .c

634	598	.c scan dragto 10 10 5
635	599	} -result {}
636	600
637
638	601	test canvas-15.1 {basic types check: arc requires coords} -setup {
639		destroy .c
640		canvas .c
641		} -body {
642		.c create arc
643		} -returnCodes error -result {wrong # args: should be ".c create arc coords ?arg ...?"}
	602	destroy .c
	603	canvas .c
	604	} -returnCodes error -body {
	605	.c create arc
	606	} -result {wrong # args: should be ".c create arc coords ?arg ...?"}
644	607	test canvas-15.2 "basic coords check: arc coords are paired" -setup {
645		destroy .c
646		canvas .c
647		} -body {
648		.c create arc 0
	608	destroy .c
	609	canvas .c
	610	} -body {
	611	.c create arc 0
649	612	} -returnCodes error -result {wrong # coordinates: expected 4, got 1}
650
651	613	test canvas-15.3 {basic types check: bitmap requires coords} -setup {
652		destroy .c
653		canvas .c
654		} -body {
655		.c create bitmap
656		} -returnCodes error -result {wrong # args: should be ".c create bitmap coords ?arg ...?"}
	614	destroy .c
	615	canvas .c
	616	} -returnCodes error -body {
	617	.c create bitmap
	618	} -result {wrong # args: should be ".c create bitmap coords ?arg ...?"}
657	619	test canvas-15.4 "basic coords check: bitmap coords are paired" -setup {
658		destroy .c
659		canvas .c
660		} -body {
661		.c create bitmap 0
	620	destroy .c
	621	canvas .c
	622	} -body {
	623	.c create bitmap 0
662	624	} -returnCodes error -result {wrong # coordinates: expected 2, got 1}
663
664	625	test canvas-15.5 {basic types check: image requires coords} -setup {
665		destroy .c
666		canvas .c
667		} -body {
668		.c create image
669		} -returnCodes error -result {wrong # args: should be ".c create image coords ?arg ...?"}
	626	destroy .c
	627	canvas .c
	628	} -returnCodes error -body {
	629	.c create image
	630	} -result {wrong # args: should be ".c create image coords ?arg ...?"}
670	631	test canvas-15.6 "basic coords check: image coords are paired" -setup {
671		destroy .c
672		canvas .c
673		} -body {
674		.c create image 0
675		} -returnCodes error -result {wrong # coordinates: expected 2, got 1}
676
	632	destroy .c
	633	canvas .c
	634	} -returnCodes error -body {
	635	.c create image 0
	636	} -result {wrong # coordinates: expected 2, got 1}
677	637	test canvas-15.7 {basic types check: line requires coords} -setup {
678		destroy .c
679		canvas .c
680		} -body {
681		.c create line
682		} -returnCodes error -result {wrong # args: should be ".c create line coords ?arg ...?"}
	638	destroy .c
	639	canvas .c
	640	} -returnCodes error -body {
	641	.c create line
	642	} -result {wrong # args: should be ".c create line coords ?arg ...?"}
683	643	test canvas-15.8 "basic coords check: line coords are paired" -setup {
684		destroy .c
685		canvas .c
686		} -body {
687		.c create line 0
688		} -returnCodes error -result {wrong # coordinates: expected an even number, got 1}
689
	644	destroy .c
	645	canvas .c
	646	} -returnCodes error -body {
	647	.c create line 0
	648	} -result {wrong # coordinates: expected an even number, got 1}
690	649	test canvas-15.9 {basic types check: oval requires coords} -setup {
691		destroy .c
692		canvas .c
693		} -body {
694		.c create oval
695		} -returnCodes error -result {wrong # args: should be ".c create oval coords ?arg ...?"}
	650	destroy .c
	651	canvas .c
	652	} -returnCodes error -body {
	653	.c create oval
	654	} -result {wrong # args: should be ".c create oval coords ?arg ...?"}
696	655	test canvas-15.10 "basic coords check: oval coords are paired" -setup {
697		destroy .c
698		canvas .c
699		} -body {
700		.c create oval 0
701		} -returnCodes error -result {wrong # coordinates: expected 0 or 4, got 1}
702
	656	destroy .c
	657	canvas .c
	658	} -returnCodes error -body {
	659	.c create oval 0
	660	} -result {wrong # coordinates: expected 0 or 4, got 1}
703	661	test canvas-15.11 {basic types check: polygon requires coords} -setup {
704		destroy .c
705		canvas .c
706		} -body {
707		.c create polygon
708		} -returnCodes error -result {wrong # args: should be ".c create polygon coords ?arg ...?"}
	662	destroy .c
	663	canvas .c
	664	} -returnCodes error -body {
	665	.c create polygon
	666	} -result {wrong # args: should be ".c create polygon coords ?arg ...?"}
709	667	test canvas-15.12 "basic coords check: polygon coords are paired" -setup {
710		destroy .c
711		canvas .c
712		} -body {
713		.c create polygon 0
714		} -returnCodes error -result {wrong # coordinates: expected an even number, got 1}
715
	668	destroy .c
	669	canvas .c
	670	} -returnCodes error -body {
	671	.c create polygon 0
	672	} -result {wrong # coordinates: expected an even number, got 1}
716	673	test canvas-15.13 {basic types check: rect requires coords} -setup {
717		destroy .c
718		canvas .c
719		} -body {
720		.c create rect
721		} -returnCodes error -result {wrong # args: should be ".c create rect coords ?arg ...?"}
	674	destroy .c
	675	canvas .c
	676	} -returnCodes error -body {
	677	.c create rect
	678	} -result {wrong # args: should be ".c create rect coords ?arg ...?"}
722	679	test canvas-15.14 "basic coords check: rect coords are paired" -setup {
723		destroy .c
724		canvas .c
725		} -body {
726		.c create rect 0
727		} -returnCodes error -result {wrong # coordinates: expected 0 or 4, got 1}
728
	680	destroy .c
	681	canvas .c
	682	} -returnCodes error -body {
	683	.c create rect 0
	684	} -result {wrong # coordinates: expected 0 or 4, got 1}
729	685	test canvas-15.15 {basic types check: text requires coords} -setup {
730		destroy .c
731		canvas .c
732		} -body {
733		.c create text
734		} -returnCodes error -result {wrong # args: should be ".c create text coords ?arg ...?"}
	686	destroy .c
	687	canvas .c
	688	} -returnCodes error -body {
	689	.c create text
	690	} -result {wrong # args: should be ".c create text coords ?arg ...?"}
735	691	test canvas-15.16 "basic coords check: text coords are paired" -setup {
736		destroy .c
737		canvas .c
738		} -body {
739		.c create text 0
740		} -returnCodes error -result {wrong # coordinates: expected 2, got 1}
741
	692	destroy .c
	693	canvas .c
	694	} -returnCodes error -body {
	695	.c create text 0
	696	} -result {wrong # coordinates: expected 2, got 1}
742	697	test canvas-15.17 {basic types check: window requires coords} -setup {
743		destroy .c
744		canvas .c
745		} -body {
746		.c create window
747		} -returnCodes error -result {wrong # args: should be ".c create window coords ?arg ...?"}
	698	destroy .c
	699	canvas .c
	700	} -returnCodes error -body {
	701	.c create window
	702	} -result {wrong # args: should be ".c create window coords ?arg ...?"}
748	703	test canvas-15.18 "basic coords check: window coords are paired" -setup {
749		destroy .c
750		canvas .c
751		} -body {
752		.c create window 0
753		} -returnCodes error -result {wrong # coordinates: expected 2, got 1}
754
	704	destroy .c
	705	canvas .c
	706	} -returnCodes error -body {
	707	.c create window 0
	708	} -result {wrong # coordinates: expected 2, got 1}
	709	test canvas-15.19 "basic coords check: centimeters are larger than pixels" -setup {
	710	destroy .c
	711	canvas .c
	712	} -body {
	713	set id [.c create rect 0 0 1cm 1cm]
	714	expr {[lindex [.c coords $id] 2]>1}
	715	} -result {1}
	716	destroy .c
755	717
756	718	test canvas-16.1 {arc coords check} -setup {
757		destroy .c
758	719	canvas .c
759	720	} -body {
760	721	set id [.c create arc {0 10 20 30} -start 33]
761	722	.c itemcget $id -start
	723	} -cleanup {
	724	destroy .c
762	725	} -result {33.0}
763	726
764
765	727	test canvas-17.1 {default smooth method handling} -setup {
766		destroy .c
767	728	canvas .c
768	729	} -body {
769	730	set id [.c create line {0 0 1 1 2 2 3 3 4 4 5 5 6 6}]

773	734	lappend result [.c itemcget $id -smooth]
774	735	}
775	736	return $result
	737	} -cleanup {
	738	destroy .c
776	739	} -result {0 true true true raw raw true}
777	740
778		destroy .c
	741	test canvas-18.1 {imove method - lines} -setup {
	742	canvas .c
	743	} -body {
	744	set id [.c create line 0 0 1 1 2 2 3 3]
	745	.c imove $id 0 4 4
	746	.c coords $id
	747	} -cleanup {
	748	destroy .c
	749	} -result {4.0 4.0 1.0 1.0 2.0 2.0 3.0 3.0}
	750	test canvas-18.2 {imove method - lines} -setup {
	751	canvas .c
	752	} -body {
	753	set id [.c create line 0 0 1 1]
	754	.c imove $id 0 4 4
	755	.c coords $id
	756	} -cleanup {
	757	destroy .c
	758	} -result {4.0 4.0 1.0 1.0}
	759	test canvas-18.3 {imove method - lines} -setup {
	760	canvas .c
	761	} -body {
	762	set id [.c create line 0 0 1 1 2 2 3 3]
	763	.c imove $id @1,1 4 4
	764	.c coords $id
	765	} -cleanup {
	766	destroy .c
	767	} -result {0.0 0.0 4.0 4.0 2.0 2.0 3.0 3.0}
	768	test canvas-18.4 {imove method - lines} -constraints knownBug -setup {
	769	canvas .c
	770	} -body {
	771	set id [.c create line 0 0 1 1 2 2 3 3]
	772	.c imove $id end 4 4
	773	.c coords $id
	774	} -cleanup {
	775	destroy .c
	776	} -result {0.0 0.0 1.0 1.0 2.0 2.0 4.0 4.0}
	777	test canvas-18.5 {imove method - polygon} -setup {
	778	canvas .c
	779	} -body {
	780	set id [.c create polygon 0 0 1 1 2 2 3 3]
	781	.c imove $id 0 4 4
	782	.c coords $id
	783	} -cleanup {
	784	destroy .c
	785	} -result {4.0 4.0 1.0 1.0 2.0 2.0 3.0 3.0}
	786	test canvas-18.6 {imove method - polygon} -setup {
	787	canvas .c
	788	} -body {
	789	set id [.c create polygon 0 0 1 1]
	790	.c imove $id 0 4 4
	791	.c coords $id
	792	} -cleanup {
	793	destroy .c
	794	} -result {4.0 4.0 1.0 1.0}
	795	test canvas-18.7 {imove method - polygon} -setup {
	796	canvas .c
	797	} -body {
	798	set id [.c create polygon 0 0 1 1 2 2 3 3]
	799	.c imove $id @1,1 4 4
	800	.c coords $id
	801	} -cleanup {
	802	destroy .c
	803	} -result {0.0 0.0 4.0 4.0 2.0 2.0 3.0 3.0}
	804	test canvas-18.8 {imove method - polygon} -constraints knownBug -setup {
	805	canvas .c
	806	} -body {
	807	set id [.c create polygon 0 0 1 1 2 2 3 3]
	808	.c imove $id end 4 4
	809	.c coords $id
	810	} -cleanup {
	811	destroy .c
	812	} -result {0.0 0.0 1.0 1.0 2.0 2.0 4.0 4.0}
	813	test canvas-18.9 {imove method - errors} -setup {
	814	canvas .c
	815	} -body {
	816	set id [.c create line 0 0 1 1 2 2 3 3]
	817	.c imove $id foobar 4 4
	818	} -cleanup {
	819	destroy .c
	820	} -returnCodes error -result {bad index "foobar"}
	821	test canvas-18.10 {imove method - errors} -setup {
	822	canvas .c
	823	} -body {
	824	set id [.c create line 0 0 1 1 2 2 3 3]
	825	.c imove $id 0 foobar 4
	826	} -cleanup {
	827	destroy .c
	828	} -returnCodes error -result {bad screen distance "foobar"}
	829	test canvas-18.11 {imove method - errors} -setup {
	830	canvas .c
	831	} -body {
	832	set id [.c create line 0 0 1 1 2 2 3 3]
	833	.c imove $id 0 4 foobar
	834	} -cleanup {
	835	destroy .c
	836	} -returnCodes error -result {bad screen distance "foobar"}
	837
	838	test canvas-19.1 {rchars method - lines} -setup {
	839	canvas .c
	840	} -body {
	841	set id [.c create line 0 0 1 1 2 2 3 3]
	842	.c rchars $id 2 4 {4 4}
	843	.c coords $id
	844	} -cleanup {
	845	destroy .c
	846	} -result {0.0 0.0 4.0 4.0 3.0 3.0}
	847	test canvas-19.2 {rchars method - lines} -setup {
	848	canvas .c
	849	} -body {
	850	set id [.c create line 0 0 1 1 2 2 3 3]
	851	.c rchars $id 2 4 {}
	852	.c coords $id
	853	} -cleanup {
	854	destroy .c
	855	} -result {0.0 0.0 3.0 3.0}
	856	test canvas-19.3 {rchars method - lines} -setup {
	857	canvas .c
	858	} -body {
	859	set id [.c create line 0 0 1 1 2 2 3 3]
	860	.c rchars $id 2 4 {10 11 12 13 14 15}
	861	.c coords $id
	862	} -cleanup {
	863	destroy .c
	864	} -result {0.0 0.0 10.0 11.0 12.0 13.0 14.0 15.0 3.0 3.0}
	865	test canvas-19.4 {rchars method - polygon} -setup {
	866	canvas .c
	867	} -body {
	868	set id [.c create polygon 0 0 1 1 2 2 3 3]
	869	.c rchars $id 2 4 {4 4}
	870	.c coords $id
	871	} -cleanup {
	872	destroy .c
	873	} -result {0.0 0.0 4.0 4.0 3.0 3.0}
	874	test canvas-19.5 {rchars method - polygon} -setup {
	875	canvas .c
	876	} -body {
	877	set id [.c create polygon 0 0 1 1 2 2 3 3]
	878	.c rchars $id 2 4 {}
	879	.c coords $id
	880	} -cleanup {
	881	destroy .c
	882	} -result {0.0 0.0 3.0 3.0}
	883	test canvas-19.6 {rchars method - polygon} -setup {
	884	canvas .c
	885	} -body {
	886	set id [.c create polygon 0 0 1 1 2 2 3 3]
	887	.c rchars $id 2 4 {10 11 12 13 14 15}
	888	.c coords $id
	889	} -cleanup {
	890	destroy .c
	891	} -result {0.0 0.0 10.0 11.0 12.0 13.0 14.0 15.0 3.0 3.0}
	892	test canvas-19.7 {rchars method - text} -setup {
	893	canvas .c
	894	} -body {
	895	set id [.c create text 0 0 -text abcde]
	896	.c rchars $id 1 3 XYZ
	897	.c itemcget $id -text
	898	} -cleanup {
	899	destroy .c
	900	} -result aXYZe
	901	test canvas-19.8 {rchars method - text} -setup {
	902	canvas .c
	903	} -body {
	904	set id [.c create text 0 0 -text abcde]
	905	.c rchars $id 1 3 {}
	906	.c itemcget $id -text
	907	} -cleanup {
	908	destroy .c
	909	} -result ae
	910	test canvas-19.9 {rchars method - text} -setup {
	911	canvas .c
	912	} -body {
	913	set id [.c create text 0 0 -text abcde]
	914	.c rchars $id 1 3 FOOBAR
	915	.c itemcget $id -text
	916	} -cleanup {
	917	destroy .c
	918	} -result aFOOBARe
	919	test canvas-19.10 {rchars method - errors} -setup {
	920	canvas .c
	921	} -body {
	922	set id [.c create line 0 0 1 1]
	923	.c rchars $id foo 1 {2 2}
	924	} -cleanup {
	925	destroy .c
	926	} -returnCodes error -result {bad index "foo"}
	927	test canvas-19.11 {rchars method - errors} -setup {
	928	canvas .c
	929	} -body {
	930	set id [.c create line 0 0 1 1]
	931	.c rchars $id 1 foo {2 2}
	932	} -cleanup {
	933	destroy .c
	934	} -returnCodes error -result {bad index "foo"}
779	935
780	936	# cleanup
781	937	cleanupTests
782	938	return
783	939
784
785
786
	940	# Local Variables:
	941	# mode: tcl
	942	# End:

+3

-3

tests/clrpick.test less more

4	4	# Copyright (c) 1998-1999 by Scriptics Corporation.
5	5	# All rights reserved.
6	6	#
7		# RCS: @(#) $Id: clrpick.test,v 1.14 2008/08/15 01:10:03 aniap Exp $
	7	# RCS: @(#) $Id: clrpick.test,v 1.15 2008/12/19 15:33:40 dgp Exp $
8	8	#
9	9
10	10	package require tcltest 2.2

53	53	test clrpick-1.2 {tk_chooseColor command } -body {
54	54	tk_chooseColor -initialcolor
55	55	} -returnCodes error -result {value for "-initialcolor" missing}
56		test clrpick-1.2 {tk_chooseColor command } -body {
	56	test clrpick-1.2.1 {tk_chooseColor command } -body {
57	57	tk_chooseColor -parent
58	58	} -returnCodes error -result {value for "-parent" missing}
59		test clrpick-1.2 {tk_chooseColor command } -body {
	59	test clrpick-1.2.2 {tk_chooseColor command } -body {
60	60	tk_chooseColor -title
61	61	} -returnCodes error -result {value for "-title" missing}
62	62

+0

-1

tests/constraints.tcl less more

241	241	namespace import -force tcltest::interpreter
242	242	namespace import -force tcltest::testsDirectory
243	243	namespace import -force tcltest::cleanupTests
244		namespace import -force tcltest::bytestring
245	244
246	245	deleteWindows
247	246	wm geometry . {}

+5

-5

tests/embed.test less more

3	3	# Copyright (c) 1998-1999 by Scriptics Corporation.
4	4	# All rights reserved.
5	5	#
6		# RCS: @(#) $Id: embed.test,v 1.5 2008/08/12 22:52:23 aniap Exp $
	6	# RCS: @(#) $Id: embed.test,v 1.6 2008/12/19 15:33:40 dgp Exp $
7	7
8	8	package require tcltest 2.2
9	9	namespace import ::tcltest::*

37	37	} -returnCodes error -result {A window cannot have both the -use and the -container option set.}
38	38
39	39	# testing window embedding for win platforms
40		test embed-1.4 {TkpUseWindow procedure, -container must be set} -constraints {
	40	test embed-1.4.win {TkpUseWindow procedure, -container must be set} -constraints {
41	41	win
42	42	} -setup {
43	43	deleteWindows

48	48	deleteWindows
49	49	} -returnCodes error -result {the window to use is not a Tk container}
50	50	# testing window embedding for win platforms
51		test embed-1.5 {TkpUseWindow procedure, -container must be set} -constraints {
	51	test embed-1.5.win {TkpUseWindow procedure, -container must be set} -constraints {
52	52	win
53	53	} -setup {
54	54	deleteWindows

60	60	} -returnCodes error -result {the window to use is not a Tk container}
61	61
62	62	# testing window embedding for other than win platforms
63		test embed-1.5 {TkpUseWindow procedure, -container must be set} -constraints {
	63	test embed-1.4.nonwin {TkpUseWindow procedure, -container must be set} -constraints {
64	64	nonwin
65	65	} -setup {
66	66	deleteWindows

71	71	deleteWindows
72	72	} -returnCodes error -result {window ".container" doesn't have -container option set}
73	73	# testing window embedding for other than win platforms
74		test embed-1.6 {TkpUseWindow procedure, -container must be set} -constraints {
	74	test embed-1.5.nonwin {TkpUseWindow procedure, -container must be set} -constraints {
75	75	nonwin
76	76	} -setup {
77	77	deleteWindows

+204

-0

tests/fontchooser.test less more

	0	# Test the "tk::fontchooser" command
	1	#
	2	# Copyright (c) 2008 Pat Thoyts
	3	#
	4	# RCS: @(#) $Id: fontchooser.test,v 1.2 2008/12/10 13:41:19 patthoyts Exp $
	5	#
	6
	7	package require tcltest 2.1
	8	eval tcltest::configure $argv
	9	tcltest::loadTestedCommands
	10
	11	# the following helper functions are related to the functions used
	12	# in winDialog.test where they are used to send messages to the win32
	13	# dialog (hence the wierdness).
	14
	15	proc start {cmd} {
	16	set ::tk_dialog {}
	17	set ::iter_after 0
	18	after 1 $cmd
	19	}
	20	proc then {cmd} {
	21	set ::command $cmd
	22	set ::dialogresult {}
	23	set ::testfont {}
	24	afterbody
	25	vwait ::dialogresult
	26	return $::dialogresult
	27	}
	28	proc afterbody {} {
	29	if {$::tk_dialog == {}} {
	30	if {[incr ::iter_after] > 30} {
	31	set ::dialogresult ">30 iterations waiting for tk_dialog"
	32	return
	33	}
	34	after 150 {afterbody}
	35	return
	36	}
	37	uplevel #0 {set dialogresult [eval $command]}
	38	}
	39	proc Click {button} {
	40	switch -exact -- $button {
	41	ok { $::tk_dialog.ok invoke }
	42	cancel { $::tk_dialog.cancel invoke }
	43	apply { $::tk_dialog.apply invoke }
	44	default { return -code error "invalid button name \"$button\"" }
	45	}
	46	}
	47	proc ApplyFont {font} {
	48	# puts stderr "apply: $font"
	49	set ::testfont $font
	50	}
	51
	52	# -------------------------------------------------------------------------
	53
	54	test fontchooser-1.1 {tk fontchooser: usage} -returnCodes error -body {
	55	tk fontchooser -z
	56	} -result {unknown or ambiguous subcommand "-z": must be configure, hide, or show}
	57
	58	test fontchooser-1.2 {tk fontchooser: usage} -returnCodes error -body {
	59	tk fontchooser configure -z
	60	} -match glob -result {bad option "-z":*}
	61
	62	test fontchooser-1.3 {tk fontchooser: usage} -returnCodes error -body {
	63	tk fontchooser configure -parent . -font
	64	} -result {value for "-font" missing}
	65
	66	test fontchooser-1.4 {tk fontchooser: usage} -returnCodes error -body {
	67	tk fontchooser configure -parent . -title
	68	} -result {value for "-title" missing}
	69
	70	test fontchooser-1.5 {tk fontchooser: usage} -returnCodes error -body {
	71	tk fontchooser configure -parent . -command
	72	} -result {value for "-command" missing}
	73
	74	test fontchooser-1.6 {tk fontchooser: usage} -returnCodes error -body {
	75	tk fontchooser configure -title . -parent
	76	} -result {value for "-parent" missing}
	77
	78	test fontchooser-1.7 {tk fontchooser: usage} -returnCodes error -body {
	79	tk fontchooser configure -parent abc
	80	} -result {bad window path name "abc"}
	81
	82	test fontchooser-1.8 {tk fontchooser: usage} -returnCodes ok -body {
	83	tk fontchooser configure -visible
	84	} -result {0}
	85
	86	test fontchooser-1.9 {tk fontchooser: usage} -returnCodes error -body {
	87	tk fontchooser configure -visible 1
	88	} -match glob -result {*}
	89
	90	# -------------------------------------------------------------------------
	91	#
	92	# The remaining tests in this file are only relevant for the script
	93	# implementation. They can be tested by sourcing the script file but
	94	# the Tk tests are run with -singleproc 1 and doing this affects the
	95	# result of later attempts to test the native implementations.
	96	#
	97	testConstraint scriptImpl [llength [info proc ::tk::fontchooser::Configure]]
	98
	99	test fontchooser-2.0 {fontchooser -title} -constraints scriptImpl -body {
	100	start {
	101	tk::fontchooser::Configure -title "Hello"
	102	tk::fontchooser::Show
	103	}
	104	then {
	105	set x [wm title $::tk_dialog]
	106	Click cancel
	107	}
	108	set x
	109	} -result {Hello}
	110
	111	test fontchooser-2.1 {fontchooser -title (cyrillic)} -constraints scriptImpl -body {
	112	start {
	113	tk::fontchooser::Configure \
	114	-title "\u041f\u0440\u0438\u0432\u0435\u0442"
	115	tk::fontchooser::Show
	116	}
	117	then {
	118	set x [wm title $::tk_dialog]
	119	Click cancel
	120	}
	121	set x
	122	} -result "\u041f\u0440\u0438\u0432\u0435\u0442"
	123
	124	test fontchooser-3.0 {fontchooser -parent} -constraints scriptImpl -body {
	125	start {
	126	tk::fontchooser::Configure -parent .
	127	tk::fontchooser::Show
	128	}
	129	then {
	130	set x [winfo parent $::tk_dialog]
	131	Click cancel
	132	}
	133	set x
	134	} -result {.}
	135
	136	test fontchooser-3.1 {fontchooser -parent (invalid)} -constraints scriptImpl -body {
	137	tk::fontchooser::Configure -parent junk
	138	} -returnCodes error -match glob -result {bad window path *}
	139
	140	test fontchooser-4.0 {fontchooser -font} -constraints scriptImpl -body {
	141	start {
	142	tk::fontchooser::Configure -command ApplyFont -font courier
	143	tk::fontchooser::Show
	144	}
	145	then {
	146	Click cancel
	147	}
	148	set ::testfont
	149	} -result {}
	150
	151	test fontchooser-4.1 {fontchooser -font} -constraints scriptImpl -body {
	152	start {
	153	tk::fontchooser::Configure -command ApplyFont -font courier
	154	tk::fontchooser::Show
	155	}
	156	then {
	157	Click ok
	158	}
	159	expr {$::testfont ne {}}
	160	} -result {1}
	161
	162	test fontchooser-4.2 {fontchooser -font} -constraints scriptImpl -body {
	163	start {
	164	tk::fontchooser::Configure -command ApplyFont -font TkDefaultFont
	165	tk::fontchooser::Show
	166	}
	167	then {
	168	Click ok
	169	}
	170	expr {$::testfont ne {}}
	171	} -result {1}
	172
	173	test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
	174	start {
	175	tk::fontchooser::Configure -command ApplyFont -font {times 14 bold}
	176	tk::fontchooser::Show
	177	}
	178	then {
	179	Click ok
	180	}
	181	expr {$::testfont ne {}}
	182	} -result {1}
	183
	184	test fontchooser-4.4 {fontchooser -font} -constraints scriptImpl -body {
	185	start {
	186	tk::fontchooser::Configure -command ApplyFont -font {times 14 bold}
	187	tk::fontchooser::Show
	188	}
	189	then {
	190	Click ok
	191	}
	192	lrange $::testfont 1 end
	193	} -result {14 bold}
	194
	195	# -------------------------------------------------------------------------
	196
	197	cleanupTests
	198	return
	199
	200	# Local Variables:
	201	# mode: tcl
	202	# indent-tabs-mode: nil
	203	# End:

+3

-3

tests/scrollbar.test less more

6	6	# Copyright (c) 1998-1999 by Scriptics Corporation.
7	7	# All rights reserved.
8	8	#
9		# RCS: @(#) $Id: scrollbar.test,v 1.23 2008/10/08 18:57:47 dgp Exp $
	9	# RCS: @(#) $Id: scrollbar.test,v 1.24 2008/12/12 00:09:38 nijtmans Exp $
10	10
11	11	package require tcltest 2.1
12	12	eval tcltest::configure $argv

58	58	{-activebackground #ff0000 #ff0000 non-existent
59	59	{unknown color name "non-existent"}}
60	60	{-activerelief sunken sunken non-existent
61		{bad relief type "non-existent": must be flat, groove, raised, ridge, solid, or sunken}}
	61	{bad relief "non-existent": must be flat, groove, raised, ridge, solid, or sunken}}
62	62	{-background #ff0000 #ff0000 non-existent
63	63	{unknown color name "non-existent"}}
64	64	{-bd 4 4 badValue {bad screen distance "badValue"}}

76	76	{-orient horizontal horizontal badValue
77	77	{bad orientation "badValue": must be vertical or horizontal}}
78	78	{-orient horizontal horizontal bogus {bad orientation "bogus": must be vertical or horizontal}}
79		{-relief ridge ridge badValue {bad relief type "badValue": must be flat, groove, raised, ridge, solid, or sunken}}
	79	{-relief ridge ridge badValue {bad relief "badValue": must be flat, groove, raised, ridge, solid, or sunken}}
80	80	{-repeatdelay 140 140 129.3 {expected integer but got "129.3"}}
81	81	{-repeatinterval 140 140 129.3 {expected integer but got "129.3"}}
82	82	{-takefocus "any string" "any string" {} {}}

+95

-48

tests/text.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7	#
8		# RCS: @(#) $Id: text.test,v 1.51 2008/08/03 15:30:26 aniap Exp $
	8	# RCS: @(#) $Id: text.test,v 1.54 2008/12/19 15:33:40 dgp Exp $
9	9
10	10	package require tcltest 2.2
11	11	eval tcltest::configure $argv

19	19	wm minsize . 1 1
20	20	wm positionfrom . user
21	21	wm deiconify .
22
23
	22
24	23	test text-1.1 {configuration option: "autoseparators"} -setup {
25	24	text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
26	25	pack .t

781	780	} -cleanup {
782	781	destroy .t
783	782	} -match glob -returnCodes {error} -result {*}
784
785	783	test text-1.81 {text options} -setup {
786	784	text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
787	785	pack .t

812	810	} -cleanup {
813	811	destroy .t
814	812	} -result {-yscrollcommand yScrollCommand ScrollCommand {} {test command}}
	813	test text-1.83.1 {configuration option: "insertunfocussed"} -setup {
	814	text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
	815	pack .t
	816	update
	817	} -body {
	818	.t configure -insertunfocussed none
	819	.t cget -insertunfocussed
	820	} -cleanup {
	821	destroy .t
	822	} -result none
	823	test text-1.84 {configuration option: "insertunfocussed"} -setup {
	824	text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
	825	pack .t
	826	update
	827	} -body {
	828	.t configure -insertunfocussed hollow
	829	.t cget -insertunfocussed
	830	} -cleanup {
	831	destroy .t
	832	} -result hollow
	833	test text-1.85 {configuration option: "insertunfocussed"} -setup {
	834	text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
	835	pack .t
	836	update
	837	} -body {
	838	.t configure -insertunfocussed solid
	839	.t cget -insertunfocussed
	840	} -cleanup {
	841	destroy .t
	842	} -result solid
	843	test text-1.86 {configuration option: "insertunfocussed"} -setup {
	844	text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
	845	pack .t
	846	update
	847	} -returnCodes error -body {
	848	.t configure -insertunfocussed gorp
	849	} -cleanup {
	850	destroy .t
	851	} -result {bad insertunfocussed "gorp": must be hollow, none, or solid}
815	852
816	853
817	854	test text-2.1 {Tk_TextCmd procedure} -body {

842	879	} -cleanup {
843	880	destroy .t
844	881	} -result {2 red}
845
846	882	test text-2.7 {Tk_TextCmd procedure} -constraints {
847	883	win
848	884	} -body {

870	906	} -cleanup {
871	907	destroy .t
872	908	} -result {raised}
873
874	909	test text-2.10 {Tk_TextCmd procedure} -body {
875	910	list [text .t] [winfo class .t]
876	911	} -cleanup {

1248	1283	} -cleanup {
1249	1284	destroy .t
1250	1285	} -result {abcdefghijklm}
1251
1252	1286	test text-8.10 {TextWidgetCmd procedure, "delete" option} -setup {
1253	1287	text .t
1254	1288	} -body {

1345	1379	destroy .t
1346	1380	} -result {foo
1347	1381	ghijklm}
1348
1349	1382	test text-8.18 {TextWidgetCmd procedure, "replace" option} -setup {
1350	1383	text .t
1351	1384	} -body {

1380	1413	} -cleanup {
1381	1414	destroy .t
1382	1415	} -returnCodes ok -result {}
1383
1384	1416	test text-8.21 {TextWidgetCmd procedure, "replace" option with undo} -setup {
1385	1417	text .t
1386	1418	} -body {

1452	1484	} -cleanup {
1453	1485	destroy .t
1454	1486	} -result {1}
1455
1456	1487	test text-8.24 {TextWidgetCmd procedure, "replace" option with peers, undo} -setup {
1457	1488	text .t
1458	1489	} -body {

1595	1626	!@#$%
1596	1627	Line 7
1597	1628	}
1598
1599	1629	test text-9.8 {TextWidgetCmd procedure, "get" option} -setup {
1600	1630	text .t
1601	1631	} -body {

1765	1795	} -cleanup {
1766	1796	destroy .t
1767	1797	} -result {5.5}
1768
1769	1798	test text-9.20 {TextWidgetCmd procedure, "get" option} -setup {
1770	1799	text .t
1771	1800	} -body {

1880	1909	} -cleanup {
1881	1910	destroy .t
1882	1911	} -result {5.1 5.1}
1883
1884	1912	test text-9.27 {TextWidgetCmd procedure, "get" option} -setup {
1885	1913	text .t
1886	1914	} -body {

2047	2075	} -cleanup {
2048	2076	destroy .t
2049	2077	} -result {29}
2050
2051	2078	test text-10.9 {TextWidgetCmd procedure, "count" option} -setup {
2052	2079	text .t
2053	2080	.t insert 1.0 "Line 1

2104	2131	} -cleanup {
2105	2132	destroy .t
2106	2133	} -returnCodes {error} -result {bad text index "foo"}
2107
2108	2134	test text-10.13 {TextWidgetCmd procedure, "count" option} -setup {
2109	2135	text .t
2110	2136	} -body {

2154	2180	} -cleanup {
2155	2181	destroy .t
2156	2182	} -result {5}
2157
2158	2183	test text-10.16 {TextWidgetCmd procedure, "count" option} -setup {
2159	2184	text .t
2160	2185	} -body {

2497	2522	} -cleanup {
2498	2523	destroy .t
2499	2524	} -result {19}
2500
2501	2525	test text-10.30 {TextWidgetCmd procedure, "count" option} -setup {
2502	2526	text .t
2503	2527	} -body {

2985	3009	(while processing -tabs option)
2986	3010	invoked from within
2987	3011	".t configure -tabs {30 foo}"}
2988
2989	3012	test text-14.7 {ConfigureText procedure} -setup {
2990	3013	text .t
2991	3014	} -body {

3108	3131	} -cleanup {
3109	3132	destroy .t .t2
3110	3133	} -result {1234}
3111
3112	3134	test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
3113	3135	toplevel .top
3114	3136	text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2

3121	3143	} -cleanup {
3122	3144	destroy .top
3123	3145	} -result {150x140+}
	3146	# This test was failing Windows because the title bar on .t was a certain
	3147	# minimum size and it was interfering with the size requested by the -setgrid.
	3148	# The "overrideredirect" gets rid of the titlebar so the toplevel can shrink
	3149	# to the appropriate size.
3124	3150	test text-14.19 {ConfigureText procedure} -setup {
3125		# This test was failing Windows because the title bar on .t
3126		# was a certain minimum size and it was interfering with the size
3127		# requested by the -setgrid. The "overrideredirect" gets rid of the
3128		# titlebar so the toplevel can shrink to the appropriate size.
3129	3151	toplevel .top
3130	3152	text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
3131	3153	} -body {

3138	3160	} -cleanup {
3139	3161	destroy .top
3140	3162	} -result {20x10+0+0}
3141
	3163	# This test was failing on Windows because the title bar on .t was a certain
	3164	# minimum size and it was interfering with the size requested by the -setgrid.
	3165	# The "overrideredirect" gets rid of the titlebar so the toplevel can shrink
	3166	# to the appropriate size.
3142	3167	test text-14.20 {ConfigureText procedure} -setup {
3143		# This test was failing on Windows because the title bar on .t
3144		# was a certain minimum size and it was interfering with the size
3145		# requested by the -setgrid. The "overrideredirect" gets rid of the
3146		# titlebar so the toplevel can shrink to the appropriate size.
3147	3168	toplevel .top
3148	3169	text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
3149	3170	} -body {

3210	3231	update
3211	3232	set geom [wm geometry .top]
3212	3233	set x [string range $geom 0 [string first + $geom]]
3213
3214	3234	rename .top.t {}
3215	3235	update
3216	3236	set geom [wm geometry .top]

3462	3482	} -cleanup {
3463	3483	destroy .top
3464	3484	} -result {2.0 y}
3465
3466	3485	test text-19.13 {DeleteChars procedure, updates affecting topIndex} -setup {
3467	3486	toplevel .top
3468	3487	text .top.t -width 1 -height 10 -wrap char

3593	3612	destroy .t
3594	3613	} -result {0a..1b.2b.3b.4
3595	3614	cj.0j.1j.2j.3j.4m}
3596
3597	3615	test text-20.5 {TextFetchSelection procedure, long selections} -setup {
3598	3616	text .t -width 20 -height 10
3599	3617	pack append . .t {top expand fill}

3641	3659	} -cleanup {
3642	3660	destroy .t .t2
3643	3661	} -result {1.2 3.3}
3644
3645	3662	test text-21.3 {TkTextLostSelection procedure} -body {
3646	3663	text .t
3647	3664	.t insert 1.0 "abcdef\nghijk\n1234"

3952	3969	} -cleanup {
3953	3970	destroy .t
3954	3971	} -result {4.0}
3955
3956	3972	test text-22.41 {TextSearchCmd procedure, firstChar and lastChar} -setup {
3957	3973	toplevel .top
3958	3974	text .top.t -width 30 -height 10 -font {Courier -12} -borderwidth 2 -highlightthickness 2

4031	4047	} -cleanup {
4032	4048	destroy .top
4033	4049	} -result {1.1}
4034
4035	4050	test text-22.47 {TextSearchCmd procedure, firstChar and lastChar} -body {
4036	4051	text .t
4037	4052	.t insert end "xxyz xyz x. the\nfoo -forward bar xxxxx BaR foo\nxyz xxyzx"

5678	5693	} -cleanup {
5679	5694	destroy .t
5680	5695	} -result {}
5681
5682	5696	test text-24.11 {TextDumpCmd procedure, stop at begin-line} -body {
5683	5697	pack [text .t]
5684	5698	.t insert end "Line One\nLine Two\nLine Three\nLine Four"

5696	5710	} -result {text {One
5697	5711	} 1.5 text {Line Two
5698	5712	} 2.0 text {Line Three} 3.0}
5699
5700	5713	test text-24.13 {TextDumpCmd procedure, tags only} -body {
5701	5714	pack [text .t]
5702	5715	.t insert end "Line One\nLine Two\nLine Three\nLine Four"

5715	5728	} -cleanup {
5716	5729	destroy .t
5717	5730	} -result {tagon x 2.0}
5718
5719	5731	test text-24.15 {TextDumpCmd procedure, tags only} -body {
5720	5732	pack [text .t]
5721	5733	.t insert end "Line One\nLine Two\nLine Three\nLine Four"

5734	5746	} -cleanup {
5735	5747	destroy .t
5736	5748	} -result {tagon y 1.0 tagon x 2.0 tagoff x 2.8 tagoff y 5.0}
5737
5738	5749	test text-24.17 {TextDumpCmd procedure, marks only} -body {
5739	5750	pack [text .t]
5740	5751	.t insert end "Line One\nLine Two\nLine Three\nLine Four"

5783	5794	} -cleanup {
5784	5795	destroy .t
5785	5796	} -result {mark current 1.0 mark insert 1.0 mark m 2.4 mark n 4.0 mark END 5.0}
5786
5787	5797	test text-24.21 {TextDumpCmd procedure, windows only} -setup {
5788	5798	pack [text .t]
5789	5799	.t insert end "Line One\nLine Two\nLine Three\nLine Four"

5808	5818	} -cleanup {
5809	5819	destroy .t
5810	5820	} -result {window {} 100.0}
5811
5812	5821	test text-24.23 {TextDumpCmd procedure, command script} -setup {
5813	5822	set x {}
5814	5823	pack [text .t]

5850	5859	destroy .t
5851	5860	rename Append {}
5852	5861	} -result {mark 1.0 current mark 1.0 insert mark 2.4 m}
5853
5854	5862	test text-24.25 {TextDumpCmd procedure, unicode characters} -body {
5855	5863	text .t
5856	5864	.t insert 1.0 \xb1\xb1\xb1

6441	6449
6442	6450	test text-32.1 {line heights on creation} -setup {
6443	6451	text .t
6444
6445	6452	proc makeText {} {
6446	6453	set w .g
6447	6454	set font "Times 11"

6449	6456	toplevel .g
6450	6457	frame $w.f -highlightthickness 2 -borderwidth 2 -relief sunken
6451	6458	set t $w.f.text
6452		text $t -yscrollcommand "$w.scroll set" -setgrid true -font $font -width 70 \
6453		-height 35 -wrap word -highlightthickness 0 -borderwidth 0
	6459	text $t -yscrollcommand "$w.scroll set" -setgrid true -font $font \
	6460	-width 70 -height 35 -wrap word -highlightthickness 0 \
	6461	-borderwidth 0
6454	6462	pack $t -expand yes -fill both
6455	6463	scrollbar $w.scroll -command "$t yview"
6456	6464	pack $w.scroll -side right -fill y

6652	6660	} -result {ok}
6653	6661
6654	6662
	6663	test text-36.1 "bug #1777362: event handling with hyphenated windows" -setup {
	6664	proc bgerror {m} {set ::my_error $m}
	6665	set ::my_error {}
	6666	pack [set w [text .t-1]]
	6667	} -body {
	6668	tkwait visibility $w
	6669	event generate $w <1>
	6670	event generate $w <1>
	6671	update
	6672	set ::my_error
	6673	} -cleanup {
	6674	destroy .t-1
	6675	} -result {}
	6676	test text-36.2 "bug #1777362: event handling with hyphenated windows" -setup {
	6677	proc bgerror {m} {set ::my_error $m}
	6678	set ::my_error {}
	6679	pack [set w [text .t+1]]
	6680	} -body {
	6681	tkwait visibility $w
	6682	event generate $w <1>
	6683	event generate $w <1>
	6684	update
	6685	set ::my_error
	6686	} -cleanup {
	6687	destroy $w
	6688	} -result {}
	6689	test text-36.3 "bug #1777362: event handling with hyphenated windows" -setup {
	6690	proc bgerror {m} {set ::my_error $m}
	6691	set ::my_error {}
	6692	pack [set w [text .t*1]]
	6693	} -body {
	6694	tkwait visibility $w
	6695	event generate $w <1>
	6696	event generate $w <1>
	6697	update
	6698	set ::my_error
	6699	} -cleanup {
	6700	destroy $w
	6701	} -result {}
	6702
6655	6703	# cleanup
6656	6704	cleanupTests
6657	6705	return
6658	6706
6659
6660
6661
6662
	6707	# Local Variables:
	6708	# mode: tcl
	6709	# End:

+60

-146

tests/textMark.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7	#
8		# RCS: @(#) $Id: textMark.test,v 1.11 2008/08/28 08:52:06 aniap Exp $
	8	# RCS: @(#) $Id: textMark.test,v 1.13 2008/12/19 15:33:40 dgp Exp $
9	9
10	10	package require tcltest 2.2
11	11	namespace import ::tcltest::*
12		eval tcltest::configure $argv
	12	tcltest::configure {*}$argv
13	13	tcltest::loadTestedCommands
14
15	14
16	15	destroy .t
17	16	text .t -width 20 -height 10

29	28	!@#$%
30	29	Line 7"
31	30
32		testConstraint haveCourier12 [expr {[catch {
33		.t configure -font {Courier 12}
34		}] == 0}]
35
36		# The statements below reset the main window; it's needed if the window
	31	# The statements below reset the main window; it's needed if the window
37	32	# manager is mwm to make mwm forget about a previous minimum size setting.
38	33
39	34	wm withdraw .
40	35	wm minsize . 1 1
41	36	wm positionfrom . user
42	37	wm deiconify .
43
44
45		test textMark-1.1 {TkTextMarkCmd - missing option} -constraints {
46		haveCourier12
47		} -body {
	38
	39	test textMark-1.1 {TkTextMarkCmd - missing option} -returnCodes error -body {
48	40	.t mark
49		} -returnCodes error -result {wrong # args: should be ".t mark option ?arg ...?"}
50		test textMark-1.2 {TkTextMarkCmd - bogus option} -constraints {
51		haveCourier12
52		} -body {
	41	} -result {wrong # args: should be ".t mark option ?arg ...?"}
	42	test textMark-1.2 {TkTextMarkCmd - bogus option} -returnCodes error -body {
53	43	.t mark gorp
54		} -returnCodes error -result {bad mark option "gorp": must be gravity, names, next, previous, set, or unset}
55		test textMark-1.3 {TkTextMarkCmd - "gravity" option} -constraints {
56		haveCourier12
57		} -body {
	44	} -match glob -result {bad mark option "gorp": must be *}
	45	test textMark-1.3 {TkTextMarkCmd - "gravity" option} -returnCodes error -body {
58	46	.t mark gravity foo
59		} -returnCodes error -result {there is no mark named "foo"}
60		test textMark-1.4 {TkTextMarkCmd - "gravity" option} -constraints {
61		haveCourier12
62		} -body {
	47	} -result {there is no mark named "foo"}
	48	test textMark-1.4 {TkTextMarkCmd - "gravity" option} -body {
63	49	.t mark set x 1.3
64	50	.t insert 1.3 x
65	51	list [.t mark gravity x] [.t index x]
66	52	} -result {right 1.4}
67		test textMark-1.5 {TkTextMarkCmd - "gravity" option} -constraints {
68		haveCourier12
69		} -body {
	53	test textMark-1.5 {TkTextMarkCmd - "gravity" option} -body {
70	54	.t mark set x 1.3
71	55	.t mark g x left
72	56	.t insert 1.3 x
73	57	list [.t mark gravity x] [.t index x]
74	58	} -result {left 1.3}
75		test textMark-1.6 {TkTextMarkCmd - "gravity" option} -constraints {
76		haveCourier12
77		} -body {
	59	test textMark-1.6 {TkTextMarkCmd - "gravity" option} -body {
78	60	.t mark set x 1.3
79	61	.t mark gravity x right
80	62	.t insert 1.3 x
81	63	list [.t mark gravity x] [.t index x]
82	64	} -result {right 1.4}
83		test textMark-1.7 {TkTextMarkCmd - "gravity" option} -constraints {
84		haveCourier12
85		} -body {
	65	test textMark-1.7 {TkTextMarkCmd - "gravity" option} -returnCodes error -body {
86	66	.t mark set x 1.3
87	67	.t mark gravity x gorp
88		} -returnCodes error -result {bad mark gravity "gorp": must be left or right}
89		test textMark-1.8 {TkTextMarkCmd - "gravity" option} -constraints {
90		haveCourier12
91		} -body {
	68	} -result {bad mark gravity "gorp": must be left or right}
	69	test textMark-1.8 {TkTextMarkCmd - "gravity" option} -returnCodes error -body {
92	70	.t mark gravity
93		} -returnCodes error -result {wrong # args: should be ".t mark gravity markName ?gravity?"}
94
95
96		test textMark-2.1 {TkTextMarkCmd - "names" option} -constraints {
97		haveCourier12
98		} -body {
	71	} -result {wrong # args: should be ".t mark gravity markName ?gravity?"}
	72
	73	test textMark-2.1 {TkTextMarkCmd - "names" option} -body {
99	74	.t mark names 2
100	75	} -returnCodes error -result {wrong # args: should be ".t mark names"}
101		test textMark-2.2 {TkTextMarkCmd - "names" option} -constraints {
102		haveCourier12
103		} -setup {
	76	test textMark-2.2 {TkTextMarkCmd - "names" option} -setup {
104	77	.t mark unset {*}[.t mark names]
105	78	} -body {
106	79	lsort [.t mark na]
107	80	} -result {current insert}
108		test textMark-2.3 {TkTextMarkCmd - "names" option} -constraints {
109		haveCourier12
110		} -setup {
	81	test textMark-2.3 {TkTextMarkCmd - "names" option} -setup {
111	82	.t mark unset {*}[.t mark names]
112	83	} -body {
113	84	.t mark set a 1.1

115	86	lsort [.t mark names]
116	87	} -result {a {b c} current insert}
117	88
118
119		test textMark-3.1 {TkTextMarkCmd - "set" option} -constraints {
120		haveCourier12
121		} -body {
	89	test textMark-3.1 {TkTextMarkCmd - "set" option} -returnCodes error -body {
122	90	.t mark set a
123		} -returnCodes error -result {wrong # args: should be ".t mark set markName index"}
124		test textMark-3.2 {TkTextMarkCmd - "set" option} -constraints {
125		haveCourier12
126		} -body {
	91	} -result {wrong # args: should be ".t mark set markName index"}
	92	test textMark-3.2 {TkTextMarkCmd - "set" option} -returnCodes error -body {
127	93	.t mark s a b c
128		} -returnCodes error -result {wrong # args: should be ".t mark set markName index"}
129		test textMark-3.3 {TkTextMarkCmd - "set" option} -constraints {
130		haveCourier12
131		} -body {
	94	} -result {wrong # args: should be ".t mark set markName index"}
	95	test textMark-3.3 {TkTextMarkCmd - "set" option} -body {
132	96	.t mark set a @x
133	97	} -returnCodes error -result {bad text index "@x"}
134		test textMark-3.4 {TkTextMarkCmd - "set" option} -constraints {
135		haveCourier12
136		} -body {
	98	test textMark-3.4 {TkTextMarkCmd - "set" option} -body {
137	99	.t mark set a 1.2
138	100	.t index a
139	101	} -result 1.2
140		test textMark-3.5 {TkTextMarkCmd - "set" option} -constraints {
141		haveCourier12
142		} -body {
	102	test textMark-3.5 {TkTextMarkCmd - "set" option} -body {
143	103	.t mark set a end
144	104	.t index a
145	105	} -result {8.0}
146	106
147
148		test textMark-4.1 {TkTextMarkCmd - "unset" option} -constraints {
149		haveCourier12
150		} -body {
	107	test textMark-4.1 {TkTextMarkCmd - "unset" option} -body {
151	108	.t mark unset
152		} -returnCodes ok -result {}
153		test textMark-4.2 {TkTextMarkCmd - "unset" option} -constraints {
154		haveCourier12
155		} -body {
	109	} -result {}
	110	test textMark-4.2 {TkTextMarkCmd - "unset" option} -body {
156	111	.t mark set a 1.2
157	112	.t mark set b 2.3
158	113	.t mark unset a b
159	114	.t index a
160	115	} -returnCodes error -result {bad text index "a"}
161		test textMark-4.2 {TkTextMarkCmd - "unset" option} -constraints {
162		haveCourier12
163		} -body {
	116	test textMark-4.2.1 {TkTextMarkCmd - "unset" option} -body {
164	117	.t mark set a 1.2
165	118	.t mark set b 2.3
166	119	.t mark unset a b
167	120	.t index b
168	121	} -returnCodes error -result {bad text index "b"}
169		test textMark-4.3 {TkTextMarkCmd - "unset" option} -constraints {
170		haveCourier12
171		} -body {
	122	test textMark-4.3 {TkTextMarkCmd - "unset" option} -body {
172	123	.t mark set a 1.2
173	124	.t mark set b 2.3
174	125	.t mark set 49ers 3.1
175		eval .t mark unset [.t mark names]
	126	.t mark unset {*}[.t mark names]
176	127	lsort [.t mark names]
177	128	} -result {current insert}
178	129
179
180		test textMark-5.1 {TkTextMarkCmd - miscellaneous} -constraints {
181		haveCourier12
182		} -body {
	130	test textMark-5.1 {TkTextMarkCmd - miscellaneous} -returnCodes error -body {
183	131	.t mark
184		} -returnCodes error -result {wrong # args: should be ".t mark option ?arg ...?"}
185		test textMark-5.2 {TkTextMarkCmd - miscellaneous} -constraints {
186		haveCourier12
187		} -body {
	132	} -result {wrong # args: should be ".t mark option ?arg ...?"}
	133	test textMark-5.2 {TkTextMarkCmd - miscellaneous} -returnCodes error -body {
188	134	.t mark foo
189		} -returnCodes error -result {bad mark option "foo": must be gravity, names, next, previous, set, or unset}
190
191
192		test textMark-6.1 {TkTextMarkSegToIndex} -constraints haveCourier12 -body {
	135	} -result {bad mark option "foo": must be gravity, names, next, previous, set, or unset}
	136
	137	test textMark-6.1 {TkTextMarkSegToIndex} -body {
193	138	.t mark set a 1.2
194	139	.t mark set b 1.2
195	140	.t mark set c 1.2

197	142	list [.t index a] [.t index b] [.t index c ] [.t index d]
198	143	} -result {1.2 1.2 1.2 1.4}
199	144
200
201		test textMark-7.1 {MarkFindNext - invalid mark name} -constraints {
202		haveCourier12
203		} -body {
	145	test textMark-7.1 {MarkFindNext - invalid mark name} -body {
204	146	.t mark next bogus
205	147	} -returnCodes error -result {bad text index "bogus"}
206		test textMark-7.2 {MarkFindNext - marks at same location} -constraints {
207		haveCourier12
208		} -body {
	148	test textMark-7.2 {MarkFindNext - marks at same location} -body {
209	149	.t mark set insert 2.0
210	150	.t mark set current 2.0
211	151	.t mark next current
212	152	} -result {insert}
213		test textMark-7.3 {MarkFindNext - numerical starting mark} -constraints {
214		haveCourier12
215		} -body {
	153	test textMark-7.3 {MarkFindNext - numerical starting mark} -body {
216	154	.t mark set current 1.0
217	155	.t mark set insert 1.0
218	156	.t mark next 1.0
219	157	} -result {insert}
220		test textMark-7.4 {MarkFindNext - mark on the same line} -constraints {
221		haveCourier12
222		} -setup {
	158	test textMark-7.4 {MarkFindNext - mark on the same line} -setup {
223	159	.t mark unset {*}[.t mark names]
224	160	} -body {
225	161	.t mark set current 1.0
226	162	.t mark set insert 1.1
227	163	.t mark next current
228	164	} -result {insert}
229		test textMark-7.5 {MarkFindNext - mark on the next line} -constraints {
230		haveCourier12
231		} -setup {
	165	test textMark-7.5 {MarkFindNext - mark on the next line} -setup {
232	166	.t mark unset {*}[.t mark names]
233	167	} -body {
234	168	.t mark set current 1.end
235	169	.t mark set insert 2.0
236	170	.t mark next current
237	171	} -result {insert}
238		test textMark-7.6 {MarkFindNext - mark far away} -constraints {
239		haveCourier12
240		} -setup {
	172	test textMark-7.6 {MarkFindNext - mark far away} -setup {
241	173	.t mark unset {*}[.t mark names]
242	174	} -body {
243	175	.t mark set current 1.2
244	176	.t mark set insert 7.0
245	177	.t mark next current
246	178	} -result {insert}
247		test textMark-7.7 {MarkFindNext - mark on top of end} -constraints {
248		haveCourier12
249		} -setup {
	179	test textMark-7.7 {MarkFindNext - mark on top of end} -setup {
250	180	.t mark unset {*}[.t mark names]
251	181	} -body {
252	182	.t mark set current end
253	183	.t mark next end
254	184	} -result {current}
255		test textMark-7.8 {MarkFindNext - no next mark} -constraints {
256		haveCourier12
257		} -setup {
	185	test textMark-7.8 {MarkFindNext - no next mark} -setup {
258	186	.t mark unset {*}[.t mark names]
259	187	} -body {
260	188	.t mark set current 1.0

262	190	.t mark next insert
263	191	} -result {}
264	192
265
266		test textMark-8.1 {MarkFindPrev - invalid mark name} -constraints {
267		haveCourier12
268		} -body {
	193	test textMark-8.1 {MarkFindPrev - invalid mark name} -body {
269	194	.t mark prev bogus
270	195	} -returnCodes error -result {bad text index "bogus"}
271		test textMark-8.2 {MarkFindPrev - marks at same location} -constraints {
272		haveCourier12
273		} -body {
	196	test textMark-8.2 {MarkFindPrev - marks at same location} -body {
274	197	.t mark set insert 2.0
275	198	.t mark set current 2.0
276	199	.t mark prev insert
277	200	} -result {current}
278		test textMark-8.3 {MarkFindPrev - numerical starting mark} -constraints {
279		haveCourier12
280		} -setup {
	201	test textMark-8.3 {MarkFindPrev - numerical starting mark} -setup {
281	202	.t mark unset {*}[.t mark names]
282	203	} -body {
283	204	.t mark set current 1.0
284	205	.t mark set insert 1.0
285	206	.t mark prev 1.1
286	207	} -result {current}
287		test textMark-8.4 {MarkFindPrev - mark on the same line} -constraints {
288		haveCourier12
289		} -setup {
	208	test textMark-8.4 {MarkFindPrev - mark on the same line} -setup {
290	209	.t mark unset {*}[.t mark names]
291	210	} -body {
292	211	.t mark set current 1.0
293	212	.t mark set insert 1.1
294	213	.t mark prev insert
295	214	} -result {current}
296		test textMark-8.5 {MarkFindPrev - mark on the previous line} -constraints {
297		haveCourier12
298		} -setup {
	215	test textMark-8.5 {MarkFindPrev - mark on the previous line} -setup {
299	216	.t mark unset {*}[.t mark names]
300	217	} -body {
301	218	.t mark set current 1.end
302	219	.t mark set insert 2.0
303	220	.t mark prev insert
304	221	} -result {current}
305		test textMark-8.6 {MarkFindPrev - mark far away} -constraints {
306		haveCourier12
307		} -setup {
	222	test textMark-8.6 {MarkFindPrev - mark far away} -setup {
308	223	.t mark unset {*}[.t mark names]
309	224	} -body {
310	225	.t mark set current 1.2
311	226	.t mark set insert 7.0
312	227	.t mark prev insert
313	228	} -result {current}
314		test textMark-8.7 {MarkFindPrev - mark on top of end} -constraints {
315		haveCourier12
316		} -setup {
	229	test textMark-8.7 {MarkFindPrev - mark on top of end} -setup {
317	230	.t mark unset {*}[.t mark names]
318	231	} -body {
319	232	.t mark set insert 3.0
320	233	.t mark set current end
321	234	.t mark prev end
322	235	} -result {insert}
323		test textMark-8.8 {MarkFindPrev - no previous mark} -constraints {
324		haveCourier12
325		} -setup {
	236	test textMark-8.8 {MarkFindPrev - no previous mark} -setup {
326	237	.t mark unset {*}[.t mark names]
327	238	} -body {
328	239	.t mark set current 1.0
329	240	.t mark set insert 3.0
330	241	.t mark prev current
331	242	} -result {}
332
	243
333	244	destroy .t
334	245
335	246	# cleanup
336	247	cleanupTests
337	248	return
338	249
	250	# Local Variables:
	251	# mode: tcl
	252	# End:

+2

-2

tests/textTag.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7	#
8		# RCS: @(#) $Id: textTag.test,v 1.14 2008/08/28 08:52:06 aniap Exp $
	8	# RCS: @(#) $Id: textTag.test,v 1.15 2008/12/12 00:09:38 nijtmans Exp $
9	9
10	10	package require tcltest 2.2
11	11	namespace import ::tcltest::*

214	214	.t tag configure x -relief stupid
215	215	} -cleanup {
216	216	.t tag configure x -relief [lindex [.t tag configure x -relief] 3]
217		} -returnCodes error -result {bad relief type "stupid": must be flat, groove, raised, ridge, solid, or sunken}
	217	} -returnCodes error -result {bad relief "stupid": must be flat, groove, raised, ridge, solid, or sunken}
218	218	test textTag-1.24 {tag configuration options} -constraints {
219	219	haveCourier12
220	220	} -body {

+11

-17

tests/tk.test less more

4	4	# Copyright (c) 1998-1999 by Scriptics Corporation.
5	5	# Copyright (c) 2002 ActiveState Corporation.
6	6	#
7		# RCS: @(#) $Id: tk.test,v 1.15 2008/08/16 23:52:34 aniap Exp $
	7	# RCS: @(#) $Id: tk.test,v 1.17 2008/12/10 10:54:56 patthoyts Exp $
8	8
9	9	package require tcltest 2.2
10	10	eval tcltest::configure $argv

13	13
14	14	test tk-1.1 {tk command: general} -body {
15	15	tk
16		} -returnCodes error -result {wrong # args: should be "tk option ?arg?"}
	16	} -returnCodes error -result {wrong # args: should be "tk subcommand ?arg ...?"}
17	17	test tk-1.2 {tk command: general} -body {
18	18	tk xyz
19		} -returnCodes error -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
20
	19	} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, scaling, useinputmethods, or windowingsystem}
21	20
22	21	# Value stored to restore default settings after 2.* tests
23	22	set appname [tk appname]

35	34	tk appname [tk appname]
36	35	} -result [tk appname]
37	36	tk appname $appname
38
39	37
40	38	# Value stored to restore default settings after 3.* tests
41	39	set scaling [tk scaling]

71	69	test tk-3.9 {tk command: scaling: too big} -body {
72	70	tk scaling 1000000
73	71	expr {[tk scaling] < 10000}
74		} -result {1}
	72	} -result {1}
75	73	test tk-3.10 {tk command: scaling: widthmm} -body {
76	74	tk scaling 1.25
77	75	expr {int((25.4[winfo screenwidth .])/(721.25) + 0.5) \

83	81	- [winfo screenmmheight .]}
84	82	} -result {0}
85	83	tk scaling $scaling
86
87	84
88	85	# Value stored to restore default settings after 4.* tests
89	86	set useim [tk useinputmethods]

108	105	tk useinputmethods -displayof . xyz
109	106	} -returnCodes error -result {expected boolean value but got "xyz"}
110	107	test tk-4.6 {tk command: useinputmethods: set new} -body {
111		# This isn't really a test, but more of a check...
112		# The answer is what was given, because we may be on a Unix
113		# system that doesn't have the XIM stuff
	108	# This isn't really a test, but more of a check... The answer is what was
	109	# given, because we may be on a Unix system that doesn't have the XIM
	110	# stuff
114	111	if {[tk useinputmethods 1] == 0} {
115		puts "this wish doesn't have XIM (X Input Methods) support"
	112	puts "this wish doesn't have XIM (X Input Methods) support"
116	113	}
117
118	114	return $useim
119	115	} -result $useim
120	116	test tk-4.7 {tk command: useinputmethods: set new} -constraints win -body {
121		# Mac and Windows don't have X Input Methods, so this should
122		# always return 0
	117	# Mac and Windows don't have X Input Methods, so this should always return
	118	# 0
123	119	tk useinputmethods 1
124	120	} -cleanup {
125	121	tk useinputmethods $useim
126	122	} -result 0
127
128	123
129	124	test tk-5.1 {tk caret} -body {
130	125	tk caret

144	139	test tk-5.6 {tk caret} -body {
145	140	tk caret . -x 20 -y 25 -h 30; tk caret . -hei
146	141	} -result {30}
147
148	142
149	143	# tk inactive
150	144	test tk-6.1 {tk inactive} -body {

167	161	expr {$i == -1 \|\| ( $i > 90 && $i < 200 )}
168	162	} -result 1
169	163
170
171	164	test tk-7.1 {tk inactive in a safe interpreter} -body {
172	165	# tk inactive in safe interpreters
173	166	safe::interpCreate foo

185	178	::safe::interpDelete foo
186	179	} -returnCodes 1 -result {resetting the user inactivity timer is not allowed in a safe interpreter}
187	180
	181	# tests of [tk busy] in busy.test
188	182
189	183	# cleanup
190	184	cleanupTests

+2

-2

tests/ttk/combobox.test less more

55	55	lappend result Start 0 [.cb get]
56	56	ttk::combobox::Post .cb
57	57	lappend result Post [winfo ismapped .cb.popdown] [.cb get]
58		.cb.popdown.l selection clear 0 end; .cb.popdown.l selection set 1
59		ttk::combobox::LBSelected .cb.popdown.l
	58	.cb.popdown.f.l selection clear 0 end; .cb.popdown.f.l selection set 1
	59	ttk::combobox::LBSelected .cb.popdown.f.l
60	60	lappend result Select [winfo ismapped .cb.popdown] [.cb get]
61	61	update
62	62	set result

+280

-0

tests/ttk/spinbox.test less more

	0	#
	1	# ttk::spinbox widget tests
	2	#
	3
	4	package require Tk
	5	package require tcltest ; namespace import -force tcltest::*
	6	loadTestedCommands
	7
	8	test spinbox-1.0 "Spinbox tests -- setup" -body {
	9	ttk::spinbox .sb
	10	} -cleanup { destroy .sb } -result .sb
	11
	12	test spinbox-1.1 "Bad -values list" -setup {
	13	ttk::spinbox .sb
	14	} -body {
	15	.sb configure -values "bad \{list"
	16	} -cleanup {
	17	destroy .sb
	18	} -returnCodes error -result "unmatched open brace in list"
	19
	20	test spinbox-1.3.1 "get retrieves value" -setup {
	21	ttk::spinbox .sb -from 0 -to 100
	22	} -body {
	23	.sb set 50
	24	.sb get
	25	} -cleanup {
	26	destroy .sb
	27	} -result 50
	28
	29	test spinbox-1.3.2 "get retrieves value" -setup {
	30	ttk::spinbox .sb -from 0 -to 100 -values 55
	31	} -body {
	32	.sb set 55
	33	.sb get
	34	} -cleanup {
	35	destroy .sb
	36	} -result 55
	37
	38	test spinbox-1.4.1 "set changes value" -setup {
	39	ttk::spinbox .sb -from 0 -to 100
	40	} -body {
	41	.sb set 33
	42	.sb get
	43	} -cleanup {
	44	destroy .sb
	45	} -result 33
	46
	47	test spinbox-1.4.2 "set changes value" -setup {
	48	ttk::spinbox .sb -from 0 -to 100 -values 55
	49	} -body {
	50	.sb set 33
	51	.sb get
	52	} -cleanup {
	53	destroy .sb
	54	} -result 33
	55
	56
	57	test spinbox-1.6.1 "insert start" -setup {
	58	ttk::spinbox .sb -from 0 -to 100
	59	} -body {
	60	.sb set 5
	61	.sb insert 0 4
	62	.sb get
	63	} -cleanup {
	64	destroy .sb
	65	} -result 45
	66
	67	test spinbox-1.6.2 "insert end" -setup {
	68	ttk::spinbox .sb -from 0 -to 100
	69	} -body {
	70	.sb set 5
	71	.sb insert end 4
	72	.sb get
	73	} -cleanup {
	74	destroy .sb
	75	} -result 54
	76
	77	test spinbox-1.6.3 "insert invalid index" -setup {
	78	ttk::spinbox .sb -from 0 -to 100
	79	} -body {
	80	.sb set 5
	81	.sb insert 100 4
	82	.sb get
	83	} -cleanup {
	84	destroy .sb
	85	} -result 54
	86
	87	test spinbox-1.7.1 "-command option: set doesnt fire" -setup {
	88	ttk::spinbox .sb -from 0 -to 100 -command {set ::spinbox_test 1}
	89	} -body {
	90	set ::spinbox_test 0
	91	.sb set 50
	92	set ::spinbox_test
	93	} -cleanup {
	94	destroy .sb
	95	} -result 0
	96
	97	test spinbox-1.7.2 "-command option: button handler will fire" -setup {
	98	ttk::spinbox .sb -from 0 -to 100 -command {set ::spinbox_test 1}
	99	} -body {
	100	set ::spinbox_test 0
	101	.sb set 50
	102	event generate .sb <<Increment>>
	103	set ::spinbox_test
	104	} -cleanup {
	105	destroy .sb
	106	} -result 1
	107
	108	test spinbox-1.8.1 "option -validate" -setup {
	109	ttk::spinbox .sb -from 0 -to 100
	110	} -body {
	111	.sb configure -validate all
	112	.sb cget -validate
	113	} -cleanup {
	114	destroy .sb
	115	} -result {all}
	116
	117	test spinbox-1.8.2 "option -validate" -setup {
	118	ttk::spinbox .sb -from 0 -to 100
	119	} -body {
	120	.sb configure -validate key
	121	.sb configure -validate focus
	122	.sb configure -validate focusin
	123	.sb configure -validate focusout
	124	.sb configure -validate none
	125	.sb cget -validate
	126	} -cleanup {
	127	destroy .sb
	128	} -result {none}
	129
	130	test spinbox-1.8.3 "option -validate" -setup {
	131	ttk::spinbox .sb -from 0 -to 100
	132	} -body {
	133	.sb configure -validate bogus
	134	} -cleanup {
	135	destroy .sb
	136	} -returnCodes error -result {bad validate "bogus": must be all, key, focus, focusin, focusout, or none}
	137
	138	test spinbox-1.8.4 "-validate option: " -setup {
	139	set ::spinbox_test {}
	140	ttk::spinbox .sb -from 0 -to 100
	141	} -body {
	142	.sb configure -validate all -validatecommand {lappend ::spinbox_test %P}
	143	pack .sb
	144	.sb set 50
	145	focus .sb
	146	after 100 {set ::spinbox_wait 1} ; vwait ::spinbox_wait
	147	set ::spinbox_test
	148	} -cleanup {
	149	destroy .sb
	150	} -result {50}
	151
	152
	153	test spinbox-2.0 "current command -- unset should be 0" -constraints nyi -setup {
	154	ttk::spinbox .sb -values [list a b c d e a]
	155	} -body {
	156	.sb current
	157	} -cleanup {
	158	destroy .sb
	159	} -result 0
	160	# @@@ for combobox, this is -1.
	161
	162	test spinbox-2.1 "current command -- set index" -constraints nyi -setup {
	163	ttk::spinbox .sb -values [list a b c d e a]
	164	} -body {
	165	.sb current 5
	166	.sb get
	167	} -cleanup {
	168	destroy .sb
	169	} -result a
	170
	171	test spinbox-2.2 "current command -- change -values" -constraints nyi -setup {
	172	ttk::spinbox .sb -values [list a b c d e a]
	173	} -body {
	174	.sb current 5
	175	.sb configure -values [list c b a d e]
	176	.sb current
	177	} -cleanup {
	178	destroy .sb
	179	} -result 2
	180
	181	test spinbox-2.3 "current command -- change value" -constraints nyi -setup {
	182	ttk::spinbox .sb -values [list c b a d e]
	183	} -body {
	184	.sb current 2
	185	.sb set "b"
	186	.sb current
	187	} -cleanup {
	188	destroy .sb
	189	} -result 1
	190
	191	test spinbox-2.4 "current command -- value not in list" -constraints nyi -setup {
	192	ttk::spinbox .sb -values [list c b a d e]
	193	} -body {
	194	.sb current 2
	195	.sb set "z"
	196	.sb current
	197	} -cleanup {
	198	destroy .sb
	199	} -result -1
	200
	201	# nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
	202	# see also #1439266
	203	#
	204	test spinbox-nostomp-1 "don't stomp on -variable (init; -from/to)" -body {
	205	set SBV 55
	206	ttk::spinbox .sb -textvariable SBV -from 0 -to 100 -increment 5
	207	list $SBV [.sb get]
	208	} -cleanup {
	209	unset SBV
	210	destroy .sb
	211	} -result [list 55 55]
	212
	213	test spinbox-nostomp-2 "don't stomp on -variable (init; -values)" -body {
	214	set SBV Apr
	215	ttk::spinbox .sb -textvariable SBV -values {Jan Feb Mar Apr May Jun Jul Aug}
	216	list $SBV [.sb get]
	217	} -cleanup {
	218	unset SBV
	219	destroy .sb
	220	} -result [list Apr Apr]
	221
	222	test spinbox-nostomp-3 "don't stomp on -variable (configure; -from/to)" -body {
	223	set SBV 55
	224	ttk::spinbox .sb
	225	.sb configure -textvariable SBV -from 0 -to 100 -increment 5
	226	list $SBV [.sb get]
	227	} -cleanup {
	228	unset SBV
	229	destroy .sb
	230	} -result [list 55 55]
	231
	232	test spinbox-nostomp-4 "don't stomp on -variable (configure; -values)" -body {
	233	set SBV Apr
	234	ttk::spinbox .sb
	235	.sb configure -textvariable SBV -values {Jan Feb Mar Apr May Jun Jul Aug}
	236	list $SBV [.sb get]
	237	} -cleanup {
	238	unset SBV
	239	destroy .sb
	240	} -result [list Apr Apr]
	241
	242	test spinbox-dieoctaldie-1 "Cope with leading zeros" -body {
	243	# See SF#2358545 -- ttk::spinbox also affected
	244	set secs 07
	245	ttk::spinbox .sb -from 0 -to 59 -format %02.0f -textvariable secs
	246
	247	set result [list $secs]
	248	event generate .sb <<Increment>>; lappend result $secs
	249	event generate .sb <<Increment>>; lappend result $secs
	250	event generate .sb <<Increment>>; lappend result $secs
	251	event generate .sb <<Increment>>; lappend result $secs
	252
	253	event generate .sb <<Decrement>>; lappend result $secs
	254	event generate .sb <<Decrement>>; lappend result $secs
	255	event generate .sb <<Decrement>>; lappend result $secs
	256	event generate .sb <<Decrement>>; lappend result $secs
	257
	258	set result
	259	} -result [list 07 08 09 10 11 10 09 08 07] -cleanup {
	260	destroy .sb
	261	unset secs
	262	}
	263
	264	test spinbox-dieoctaldie-2 "Cope with general bad input" -body {
	265	set result [list]
	266	ttk::spinbox .sb -from 0 -to 100 -format %03.0f
	267	.sb set asdfasdf ; lappend result [.sb get]
	268	event generate .sb <<Increment>> ; lappend result [.sb get]
	269	.sb set asdfasdf ; lappend result [.sb get]
	270	event generate .sb <<Decrement>> ; lappend result [.sb get]
	271	} -result [list asdfasdf 000 asdfasdf 000] -cleanup {
	272	destroy .sb
	273	}
	274
	275	tcltest::cleanupTests
	276
	277	# Local variables:
	278	# mode: tcl
	279	# End:

+47

-24

tests/ttk/ttk.test less more

27	27	winfo exists .sd
28	28	} -result 0
29	29
30		test ttk-6.3 "Test package cleanup" -body {
31		interp create foo
32		foo eval { if {[catch {package require Tk}]} { load {} Tk } }
33		foo eval { destroy . }
34		interp delete foo
35		}
36
37		test ttk-6.4 "Defeat evil intentions" -body {
	30	# test ttk-6.3 not applicable [see #2175411]
	31
	32	test ttk-6.4 "Destroy widget in configure" -setup {
	33	set OUCH ouch
38	34	trace variable OUCH r { kill.b }
39	35	proc kill.b {args} { destroy .b }
	36	} -cleanup {
	37	unset OUCH
	38	} -body {
40	39	pack [ttk::checkbutton .b]
41		.b configure -variable OUCH
42		# At this point, .b should be gone.
43		.b invoke
44		list [set OUCH] [winfo exists .b]
45		# Mostly we just care that we haven't crashed the interpreter.
46		#
47		} -returnCodes error -match glob -result "*"
	40	set rc [catch { .b configure -variable OUCH } msg]
	41	list $rc $msg [winfo exists .b] [info commands .b]
	42	} -result [list 1 "Widget has been destroyed" 0 {}]
48	43
49	44	test ttk-6.5 "Clean up -textvariable traces" -body {
50	45	foreach class {ttk::button ttk::checkbutton ttk::radiobutton} {

65	60	set ::bgerror
66	61	} -result {unknown color name "badColor"}
67	62
68		# This should move to be a standard test per widget test file
69	63	test ttk-6.7 "Basic destruction test" -body {
70	64	foreach widget {
71	65	button checkbutton radiobutton sizegrip separator notebook

84	78	set ::A
85	79	} -result {it worked}
86	80
87		#
88		#
89
90	81	test ttk-6.9 "Bad font spec in styles" -setup {
91	82	ttk::style theme create badfont -settings {
92	83	ttk::style configure . -font {Helvetica 12 Bogus}

102	93	set ::bgerror
103	94	} -result {unknown font style "Bogus"}
104	95
	96	test ttk-construction-failure-1 "Excercise construction failure path" -setup {
	97	option add *TLabel.cursor badCursor 1
	98	} -cleanup {
	99	option add *TLabel.cursor {} 1
	100	} -body {
	101	catch {ttk::label .l} errmsg
	102	list $errmsg [info commands .l] [winfo exists .l]
	103	} -result [list {bad cursor spec "badCursor"} {} 0]
	104
	105	test ttk-construction-failure-2 "Destroy widget in constructor" -setup {
	106	set OUCH ouch
	107	trace variable OUCH r { kill.b }
	108	proc kill.b {args} { destroy .b }
	109	} -cleanup {
	110	unset OUCH
	111	} -body {
	112	list \
	113	[catch { ttk::checkbutton .b -variable OUCH } msg] \
	114	$msg \
	115	[winfo exists .b] \
	116	[info commands .b] \
	117	;
	118	} -result [list 1 "Widget has been destroyed" 0 {}]
	119
	120	test ttk-selfdestruct-ok-1 "Intentional self-destruction" -body {
	121	# see #2298720
	122	toplevel .t
	123	ttk::button .t.b -command [list destroy .t]
	124	.t.b invoke
	125	list [winfo exists .t] [winfo exists .t.b]
	126	} -result [list 0 0]
	127
105	128	#
106	129	# Basic tests.
107	130	#

114	137	test ttk-1.2 "Check style" -body {
115	138	.t cget -style
116	139	} -result {}
117
118	140
119	141	test ttk-1.4 "Restore default style" -body {
120	142	.t cget -style

171	193	set x
172	194	} -result 1
173	195
174
175	196	# misc. error detection
176	197	test ttk-3.0 "Bad option" -body {
177	198	ttk::button .bad -badoption foo

189	210	} -cleanup {
190	211	unset ::A ; destroy .cb
191	212	} -returnCodes error -result {can't set "A": failure}
	213
	214	test ttk-3.3 "Constructor failure with cursor" -body {
	215	ttk::button .b -cursor bottom_right_corner -style BadStyle
	216	} -returnCodes 1 -result "Layout BadStyle not found"
192	217
193	218	test ttk-3.4 "SF#2009213" -body {
194	219	ttk::style configure TScale -sliderrelief {}

443	468
444	469	test ttk-9.7 "Unset textvariable, comparison" -body {
445	470	#
446		# NB: the ttk label behaves differently from the standard label here;
	471	# NB: ttk::label behaves differently from the standard label here;
447	472	# NB: this is on purpose: I believe the standard behaviour is the Wrong Thing
448	473	#
449	474	unset -nocomplain V1 V2

553	578	update
554	579	}
555	580
556
557	581	test ttk-13.1 "Custom styles -- bad -style option" -body {
558	582	ttk::button .tb1 -style badstyle
559	583	} -returnCodes 1 -result "badstyle not found" -match glob

593	617	ttk::entry .tw -textvariable ::nsn::foo
594	618	} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
595	619	-match glob -cleanup { destroy .tw }
596
597	620
598	621	test ttk-15.1 "style element create: insufficient args" -body {
599	622	ttk::style element create

+67

-93

tests/unixSelect.test less more

8	8	# See the file "license.terms" for information on usage and redistribution
9	9	# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	#
11		# RCS: @(#) $Id: unixSelect.test,v 1.11 2008/08/30 21:52:26 aniap Exp $
	11	# RCS: @(#) $Id: unixSelect.test,v 1.12 2008/10/30 21:50:08 dgp Exp $
12	12
13	13	package require tcltest 2.2
14	14	namespace import ::tcltest::*

116	116	} -body {
117	117	pack [entry .e]
118	118	update
119		.e insert 0 [encoding convertfrom identity \u00fcber]
	119	.e insert 0 \u00fcber
120	120	.e selection range 0 end
121		dobg {string bytelength [selection get]}
	121	dobg {string length [selection get]}
122	122	} -cleanup {
123	123	cleanupbg
124	124	destroy .e
125		} -result {5}
	125	} -result {4}
126	126
127	127	test unixSelect-1.2 {TkSelGetSelection procedure: simple i18n text, iso8859-1} -constraints {
128	128	unix

135	135	.e insert 0 \u00fc\u0444
136	136	.e selection range 0 end
137	137	}
138		set x [selection get]
139		list [string equal \u00fc? $x] \
140		[string length $x] [string bytelength $x]
141		} -cleanup {
142		cleanupbg
143		} -result {1 2 3}
	138	selection get
	139	} -cleanup {
	140	cleanupbg
	141	} -result \u00fc?
144	142
145	143	test unixSelect-1.3 {TkSelGetSelection procedure: simple i18n text, iso2022} -constraints {
146	144	unix

155	153	set selInfo {}
156	154	set result [dobg {
157	155	set x [selection get -type COMPOUND_TEXT]
158		list [string equal \u00fc\u0444 $x] \
159		[string length $x] [string bytelength $x]
	156	list [string equal \u00fc\u0444 $x] [string length $x]
160	157	}]
161	158	lappend result $selInfo
162	159	} -cleanup {
163	160	cleanupbg
164		} -result {1 2 4 {COMPOUND_TEXT 0 4000}}
	161	} -result {1 2 {COMPOUND_TEXT 0 4000}}
165	162
166	163	test unixSelect-1.4 {TkSelGetSelection procedure: INCR i18n text, iso2022} -constraints {
167	164	unix

182	179	set x [selection get -type COMPOUND_TEXT]
183	180	list [string equal \
184	181	[string repeat x 3999]\u00fc\u0444[string repeat x 3999] $x] \
185		[string length $x] [string bytelength $x]
	182	[string length $x]
186	183	}]
187	184	lappend result $selInfo
188	185	} -cleanup {
189	186	cleanupbg
190		} -result {1 8000 8002 {COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3999 COMPOUND_TEXT 7998 4000 COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3998 COMPOUND_TEXT 7997 4000}}
	187	} -result {1 8000 {COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3999 COMPOUND_TEXT 7998 4000 COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3998 COMPOUND_TEXT 7997 4000}}
191	188
192	189	test unixSelect-1.5 {TkSelGetSelection procedure: simple i18n text, iso2022} -constraints {
193	190	unix

202	199	set selInfo {}
203	200	set result [dobg {
204	201	set x [selection get -type COMPOUND_TEXT]
205		list [string equal \u00fc\u0444 $x] \
206		[string length $x] [string bytelength $x]
	202	list [string equal \u00fc\u0444 $x] [string length $x]
207	203	}]
208	204	lappend result $selInfo
209	205	} -cleanup {
210	206	cleanupbg
211		} -result {1 2 4 {COMPOUND_TEXT 0 4000}}
	207	} -result {1 2 {COMPOUND_TEXT 0 4000}}
212	208
213	209	test unixSelect-1.6 {TkSelGetSelection procedure: INCR i18n text} -constraints {
214	210	unix
215	211	} -setup {
216	212	setupbg
217	213	} -body {
218		dobg "entry .e; pack .e; update
219		.e insert 0 \[encoding convertfrom identity \\u00fcber\]$longValue
220		.e selection range 0 end"
221		string bytelength [selection get]
222		} -cleanup {
223		cleanupbg
224		} -result [expr {5 + [string bytelength $longValue]}]
	214	dobg [subst -nobackslashes {entry .e; pack .e; update
	215	.e insert 0 \u00fcber$longValue
	216	.e selection range 0 end}]
	217	string length [selection get]
	218	} -cleanup {
	219	cleanupbg
	220	} -result [expr {4 + [string length $longValue]}]
225	221
226	222	test unixSelect-1.7 {TkSelGetSelection procedure: INCR i18n text} -constraints {
227	223	unix

234	230	.e insert 0 [string repeat x 3999]\u00fc
235	231	.e selection range 0 end
236	232	}
237		set x [selection get]
238		list [string equal [string repeat x 3999]\u00fc $x] \
239		[string length $x] [string bytelength $x]
240		} -cleanup {
241		cleanupbg
242		} -result {1 4000 4001}
	233	selection get
	234	} -cleanup {
	235	cleanupbg
	236	} -result [string repeat x 3999]\u00fc
243	237
244	238	test unixSelect-1.8 {TkSelGetSelection procedure: INCR i18n text} -constraints {
245	239	unix

252	246	.e insert 0 \u00fc[string repeat x 3999]
253	247	.e selection range 0 end
254	248	}
255		set x [selection get]
256		list [string equal \u00fc[string repeat x 3999] $x] \
257		[string length $x] [string bytelength $x]
258		} -cleanup {
259		cleanupbg
260		} -result {1 4000 4001}
	249	selection get
	250	} -cleanup {
	251	cleanupbg
	252	} -result \u00fc[string repeat x 3999]
261	253
262	254	test unixSelect-1.9 {TkSelGetSelection procedure: INCR i18n text} -constraints {
263	255	unix

270	262	.e insert 0 [string repeat x 3999]\u00fc[string repeat x 4000]
271	263	.e selection range 0 end
272	264	}
273		set x [selection get]
274		list [string equal [string repeat x 3999]\u00fc[string repeat x 4000] $x] \
275		[string length $x] [string bytelength $x]
276		} -cleanup {
277		cleanupbg
278		} -result {1 8000 8001}
	265	selection get
	266	} -cleanup {
	267	cleanupbg
	268	} -result [string repeat x 3999]\u00fc[string repeat x 4000]
279	269	# Now some tests to make sure that the right thing is done when
280	270	# transferring UTF8 selections, to prevent [Bug 614650] and its ilk
281	271	# from rearing its ugly head again.

291	281	.e insert 0 [string repeat x 3999]\u00fc
292	282	.e selection range 0 end
293	283	}
294		set x [selection get -type UTF8_STRING]
295		list [string equal [string repeat x 3999]\u00fc $x] \
296		[string length $x] [string bytelength $x]
297		} -cleanup {
298		cleanupbg
299		} -result {1 4000 4001}
	284	selection get -type UTF8_STRING
	285	} -cleanup {
	286	cleanupbg
	287	} -result [string repeat x 3999]\u00fc
300	288
301	289	test unixSelect-1.11 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
302	290	unix

309	297	.e insert 0 \u00fc[string repeat x 3999]
310	298	.e selection range 0 end
311	299	}
312		set x [selection get -type UTF8_STRING]
313		list [string equal \u00fc[string repeat x 3999] $x] \
314		[string length $x] [string bytelength $x]
315		} -cleanup {
316		cleanupbg
317		} -result {1 4000 4001}
	300	selection get -type UTF8_STRING
	301	} -cleanup {
	302	cleanupbg
	303	} -result \u00fc[string repeat x 3999]
318	304
319	305	test unixSelect-1.12 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
320	306	unix

327	313	.e insert 0 [string repeat x 3999]\u00fc[string repeat x 4000]
328	314	.e selection range 0 end
329	315	}
330		set x [selection get -type UTF8_STRING]
331		list [string equal [string repeat x 3999]\u00fc[string repeat x 4000] $x] \
332		[string length $x] [string bytelength $x]
333		} -cleanup {
334		cleanupbg
335		} -result {1 8000 8001}
	316	selection get -type UTF8_STRING
	317	} -cleanup {
	318	cleanupbg
	319	} -result [string repeat x 3999]\u00fc[string repeat x 4000]
336	320
337	321	test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
338	322	unix

342	326	} -body {
343	327	pack [entry .e]
344	328	update
345		.e insert 0 [encoding convertfrom identity \u00fcber\u0444]
	329	.e insert 0 \u00fcber\u0444
346	330	.e selection range 0 end
347		dobg {string bytelength [selection get -type UTF8_STRING]}
	331	dobg {string length [selection get -type UTF8_STRING]}
348	332	} -cleanup {
349	333	destroy .e
350	334	cleanupbg

361	345	.e insert 0 \u00fc\u0444
362	346	.e selection range 0 end
363	347	}
364		set x [selection get -type UTF8_STRING]
365		list [string equal \u00fc\u0444 $x] \
366		[string length $x] [string bytelength $x]
367		} -cleanup {
368		cleanupbg
369		} -result {1 2 4}
	348	selection get -type UTF8_STRING
	349	} -cleanup {
	350	cleanupbg
	351	} -result \u00fc\u0444
370	352
371	353	test unixSelect-1.15 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
372	354	unix

379	361	.e insert 0 [string repeat [string repeat \u00c4\u00e4 50]\n 21]
380	362	.e selection range 0 end
381	363	}
382		set x [selection get -type UTF8_STRING]
383		list [string equal [string repeat [string repeat \u00c4\u00e4 50]\n 21] $x] \
384		[string length $x] [string bytelength $x]
385		} -cleanup {
386		cleanupbg
387		} -result {1 2121 4221}
	364	selection get -type UTF8_STRING
	365	} -cleanup {
	366	cleanupbg
	367	} -result [string repeat [string repeat \u00c4\u00e4 50]\n 21]
388	368
389	369	test unixSelect-1.16 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
390	370	unix

397	377	.e insert 0 i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
398	378	.e selection range 0 end
399	379	}
400		set x [selection get -type UTF8_STRING]
401		list [string equal i[string repeat [string repeat \u00c4\u00e4 50]\n 21] $x] \
402		[string length $x] [string bytelength $x]
403		} -cleanup {
404		cleanupbg
405		} -result {1 2122 4222}
	380	selection get -type UTF8_STRING
	381	} -cleanup {
	382	cleanupbg
	383	} -result i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
406	384
407	385	test unixSelect-1.17 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
408	386	unix

417	395	.t tag add sel 1.0 21.end+1c
418	396	}
419	397	after 10
420		set x [selection get -type UTF8_STRING]
421		list [string equal [string repeat [string repeat \u00c4\u00e4 50]\n 21] $x] \
422		[string length $x] [string bytelength $x]
423		} -cleanup {
424		cleanupbg
425		} -result {1 2121 4221}
	398	selection get -type UTF8_STRING
	399	} -cleanup {
	400	cleanupbg
	401	} -result [string repeat [string repeat \u00c4\u00e4 50]\n 21]
426	402
427	403	test unixSelect-1.18 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
428	404	unix

437	413	.t tag add sel 1.0 21.end+1c
438	414	}
439	415	after 10
440		set x [selection get -type UTF8_STRING]
441		list [string equal i[string repeat [string repeat \u00c4\u00e4 50]\n 21] $x] \
442		[string length $x] [string bytelength $x]
443		} -cleanup {
444		cleanupbg
445		} -result {1 2122 4222}
	416	selection get -type UTF8_STRING
	417	} -cleanup {
	418	cleanupbg
	419	} -result i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
446	420
447	421	test unixSelect-1.19 {Automatic UTF8_STRING support for selection handle} -constraints {
448	422	unix

+23

-5

tests/winClipboard.test less more

9	9	# Copyright (c) 1998-2000 by Scriptics Corporation.
10	10	# All rights reserved.
11	11	#
12		# RCS: @(#) $Id: winClipboard.test,v 1.15 2008/08/18 16:09:10 aniap Exp $
	12	# RCS: @(#) $Id: winClipboard.test,v 1.17 2008/11/03 22:02:12 patthoyts Exp $
13	13
14	14	package require tcltest 2.2
15	15	eval tcltest::configure $argv

55	55	} -setup {
56	56	clipboard clear
57	57	} -body {
	58	set map [list "\r" "\\r" "\n" "\\n"]
58	59	clipboard append "line 1\nline 2"
59		list [selection get -selection CLIPBOARD] [testclipboard]
	60	list [string map $map [selection get -selection CLIPBOARD]]\
	61	[string map $map [testclipboard]]
60	62	} -cleanup {
61	63	clipboard clear
62		} -result [list "line 1\nline 2" "line 1\r\nline 2"]
	64	} -result [list "line 1\\nline 2" "line 1\\nline 2"]
63	65
64	66	test winClipboard-1.5 {TkSelGetSelection & TkWinClipboardRender} -constraints {
65	67	win testclipboard
66	68	} -setup {
67	69	clipboard clear
68	70	} -body {
	71	set map [list "\r" "\\r" "\n" "\\n"]
69	72	clipboard append "line 1\u00c7\nline 2"
	73	list [string map $map [selection get -selection CLIPBOARD]]\
	74	[string map $map [testclipboard]]
	75	} -cleanup {
	76	clipboard clear
	77	} -result [list "line 1\u00c7\\nline 2" "line 1\u00c7\\nline 2"]
	78
	79	test winClipboard-1.6 {TkSelGetSelection & TkWinClipboardRender} -constraints {
	80	win testclipboard
	81	} -setup {
	82	clipboard clear
	83	} -body {
	84	clipboard append "\u043f\u0440\u0438\u0432\u0435\u0442 \u043c\u0438\u0444"
70	85	list [selection get -selection CLIPBOARD] [testclipboard]
71	86	} -cleanup {
72	87	clipboard clear
73		} -result [list "line 1\u00c7\nline 2" [bytestring "line 1\u00c7\r\nline 2"]]
74
	88	} -result [list "\u043f\u0440\u0438\u0432\u0435\u0442 \u043c\u0438\u0444"\
	89	"\u043f\u0440\u0438\u0432\u0435\u0442 \u043c\u0438\u0444"]
75	90
76	91	test winClipboard-2.1 {TkSelUpdateClipboard reentrancy problem} -constraints {
77	92	win testclipboard

103	118	cleanupTests
104	119	return
105	120
	121	# Local variables:
	122	# mode: tcl
	123	# End:⏎

+172

-40

tests/winDialog.test less more

6	6	# Copyright (c) 1998-1999 by Scriptics Corporation.
7	7	# Copyright (c) 1998-1999 ActiveState Corporation.
8	8	#
9		# RCS: @(#) $Id: winDialog.test,v 1.21 2008/10/07 18:33:47 dgp Exp $
	9	# RCS: @(#) $Id: winDialog.test,v 1.25 2008/12/10 13:41:19 patthoyts Exp $
10	10
11	11	package require tcltest 2.2
12	12	namespace import ::tcltest::*

17	17	catch {testwinevent debug 1}
18	18	}
19	19
	20	# Locale identifier LANG_ENGLISH is 0x09
	21	testConstraint english [expr {
	22	[llength [info commands testwinlocale]]
	23	&& (([testwinlocale] & 0xff) == 9)
	24	}]
	25
20	26	proc start {arg} {
21	27	set ::tk_dialog 0
22	28	set ::iter_after 0

27	33	proc then {cmd} {
28	34	set ::command $cmd
29	35	set ::dialogresult {}
	36	set ::testfont {}
30	37
31	38	afterbody
32	39	vwait ::dialogresult

35	42
36	43	proc afterbody {} {
37	44	if {$::tk_dialog == 0} {
38		if {[incr ::iter_after] > 30} {
39		set ::dialogresult ">30 iterations waiting on tk_dialog"
	45	if {[incr ::iter_after] > 30} {
	46	set ::dialogresult ">30 iterations waiting on tk_dialog"
	47	return
	48	}
	49	after 150 {afterbody}
40	50	return
41	51	}
42		after 150 {afterbody}
43		return
44		}
45	52	uplevel #0 {set dialogresult [eval $command]}
46	53	}
47	54
48	55	proc Click {button} {
	56	switch -exact -- $button {
	57	ok { set button 1 }
	58	cancel { set button 2 }
	59	}
49	60	testwinevent $::tk_dialog $button WM_LBUTTONDOWN 1 0x000a000b
50	61	testwinevent $::tk_dialog $button WM_LBUTTONUP 0 0x000a000b
51	62	}
52	63
53		proc GetText {button} {
54		return [testwinevent $::tk_dialog $button WM_GETTEXT]
55		}
56
57		proc SetText {button text} {
58		return [testwinevent $::tk_dialog $button WM_SETTEXT $text]
	64	proc GetText {id} {
	65	switch -exact -- $id {
	66	ok { set id 1 }
	67	cancel { set id 2 }
	68	}
	69	return [testwinevent $::tk_dialog $id WM_GETTEXT]
	70	}
	71
	72	proc SetText {id text} {
	73	return [testwinevent $::tk_dialog $id WM_SETTEXT $text]
	74	}
	75
	76	proc ApplyFont {font} {
	77	set ::testfont $font
59	78	}
60	79
61	80	# ----------------------------------------------------------------------

82	101	} -body {
83	102	start {set clr [tk_chooseColor -initialcolor "#ff9933"]}
84	103	then {
85		set x [Click 1]
	104	set x [Click ok]
86	105	}
87	106	list $x $clr
88	107	} -result [list 0 "#ff9933"]

98	117	array set a [testgetwindowinfo $::tk_dialog]
99	118	if {[info exists a(text)]} {lappend x $a(text)}
100	119	} err]} { lappend x $err }
101		lappend x [Click 1]
	120	lappend x [Click ok]
102	121	}
103	122	lappend x $clr
104	123	} -result [list Hello 0 "#ff9933"]

117	136	array set a [testgetwindowinfo $::tk_dialog]
118	137	if {[info exists a(text)]} {lappend x $a(text)}
119	138	} err]} { lappend x $err }
120		lappend x [Click 1]
	139	lappend x [Click ok]
121	140	}
122	141	lappend x $clr
123	142	} -result [list "\u041f\u0440\u0438\u0432\u0435\u0442" 0 "#ff9933"]

135	154	append x [expr {$a(parent) == [wm frame .]}]
136	155	}
137	156	} err]} {lappend x $err}
138		Click 1
	157	Click ok
139	158	}
140	159	list $x $clr
141	160	} -result [list 1 "#ff9933"]

150	169
151	170
152	171	test winDialog-3.1 {Tk_GetOpenFileObjCmd} -constraints {
153		nt testwinevent
	172	nt testwinevent english
154	173	} -body {
155	174	start {tk_getOpenFile}
156	175	then {
157		set x [GetText 2]
158		Click 2
	176	set x [GetText cancel]
	177	Click cancel
159	178	}
160	179	return $x
161	180	} -result {Cancel}
162	181
163	182
164	183	test winDialog-4.1 {Tk_GetSaveFileObjCmd} -constraints {
165		nt testwinevent
	184	nt testwinevent english
166	185	} -body {
167	186	start {tk_getSaveFile}
168	187	then {
169		set x [GetText 2]
170		Click 2
	188	set x [GetText cancel]
	189	Click cancel
171	190	}
172	191	return $x
173	192	} -result {Cancel}

221	240	start {set x [tk_getSaveFile -defaultextension .foo -title Save]}
222	241	then {
223	242	SetText 0x480 bar
224		Click 1
	243	Click ok
225	244	}
226	245	string totitle $x
227	246	} -result [string totitle [file join [pwd] bar.foo]]

231	250	start {set x [tk_getSaveFile -defaultextension foo -title Save]}
232	251	then {
233	252	SetText 0x480 bar
234		Click 1
	253	Click ok
235	254	}
236	255	string totitle $x
237	256	} -result [string totitle [file join [pwd] bar.foo]]

264	283	-initialdir [file normalize $::env(TEMP)] \
265	284	-initialfile "12x 455" -title Foo]}
266	285	then {
267		Click 1
	286	Click ok
268	287	}
269	288	return $x
270	289	} -result [file join [file normalize $::env(TEMP)] "12x 455"]

283	302
284	303	start {set x [tk_getSaveFile -initialfile "12x 456" -title Foo]}
285	304	then {
286		Click 1
	305	Click ok
287	306	}
288	307	string totitle $x
289	308	} -result [string totitle [file join [pwd] "12x 456"]]

302	321	} x]
303	322	}
304	323	then {
305		Click 1
	324	Click ok
306	325	}
307	326	list $dialogresult [string match "invalid filename *" $x]
308	327	} -result {1 1}

326	345
327	346	start {tk_getOpenFile -title Narf}
328	347	then {
329		Click 2
	348	Click cancel
330	349	}
331	350	} -result {0}
332	351	test winDialog-5.18 {GetFileName: no filter specified} -constraints {

337	356	start {tk_getOpenFile -title Filter}
338	357	then {
339	358	set x [GetText 0x470]
340		Click 2
	359	Click cancel
341	360	}
342	361	return $x
343	362	} -result {All Files (.)}

367	386	}
368	387	} -result {}
369	388	test winDialog-5.21 {GetFileName: call GetOpenFileName} -constraints {
370		nt testwinevent
	389	nt testwinevent english
371	390	} -body {
372	391	# winCode = GetOpenFileName(&ofn);
373	392
374	393	start {tk_getOpenFile -title Open}
375	394	then {
376		set x [GetText 1]
377		Click 2
	395	set x [GetText ok]
	396	Click cancel
378	397	}
379	398	return $x
380	399	} -result {&Open}
381	400	test winDialog-5.22 {GetFileName: call GetSaveFileName} -constraints {
382		nt testwinevent
	401	nt testwinevent english
383	402	} -body {
384	403	# winCode = GetSaveFileName(&ofn);
385	404
386	405	start {tk_getSaveFile -title Save}
387	406	then {
388		set x [GetText 1]
389		Click 2
	407	set x [GetText ok]
	408	Click cancel
390	409	}
391	410	return $x
392	411	} -result {&Save}

396	415	} -body {
397	416	start {set x [tk_getSaveFile -title Back]}
398	417	then {
399		SetText 0x480 "$::env(TEMP)\\12x 457"
400		Click 1
	418	SetText 0x480 [file nativename \
	419	[file join [file normalize $::env(TEMP)] "12x 457"]]
	420	Click ok
401	421	}
402	422	return $x
403	423	} -result [file join [file normalize $::env(TEMP)] "12x 457"]

409	429
410	430	start {set x [catch {tk_getSaveFile -filetypes {{"foo" .foo {\0\0\0\0}}}}]}
411	431	then {
412		Click 2
	432	Click cancel
413	433	}
414	434	return $x
415	435	} -result {0}

420	440
421	441	start {set x [catch {tk_getSaveFile -filetypes {{"foo" .foo {\u2022\u2022\u2022\u2022}}}}]}
422	442	then {
423		Click 2
	443	Click cancel
424	444	}
425	445	return $x
426	446	} -result {0}

487	507
488	508	start {set x [tk_chooseDirectory -initialdir c:/ -title Foo]}
489	509	then {
490		Click 1
	510	Click ok
491	511	}
492	512	string tolower [set x]
493	513	} -result {c:/}

500	520	tk_chooseDirectory -initialdir ~12x/455
501	521	} -returnCodes error -result {user "12x" doesn't exist}
502	522
	523
	524	test winDialog-10.1 {Tk_FontchooserObjCmd: no arguments} -constraints {
	525	nt testwinevent
	526	} -body {
	527	start {tk fontchooser show}
	528	list [then {
	529	Click cancel
	530	}] $::testfont
	531	} -result {0 {}}
	532	test winDialog-10.2 {Tk_FontchooserObjCmd: -initialfont} -constraints {
	533	nt testwinevent
	534	} -body {
	535	start {
	536	tk fontchooser configure -command ApplyFont -font system
	537	tk fontchooser show
	538	}
	539	list [then {
	540	Click cancel
	541	}] $::testfont
	542	} -result {0 {}}
	543	test winDialog-10.3 {Tk_FontchooserObjCmd: -initialfont} -constraints {
	544	nt testwinevent
	545	} -body {
	546	start {
	547	tk fontchooser configure -command ApplyFont -font system
	548	tk fontchooser show
	549	}
	550	list [then {
	551	Click 1
	552	}] [expr {[llength $::testfont] ne {}}]
	553	} -result {0 1}
	554	test winDialog-10.4 {Tk_FontchooserObjCmd: -title} -constraints {
	555	nt testwinevent
	556	} -body {
	557	start {
	558	tk fontchooser configure -command ApplyFont -title "tk test"
	559	tk fontchooser show
	560	}
	561	list [then {
	562	Click cancel
	563	}] $::testfont
	564	} -result {0 {}}
	565	test winDialog-10.5 {Tk_FontchooserObjCmd: -parent} -constraints {
	566	nt testwinevent
	567	} -setup {
	568	array set a {parent {}}
	569	} -body {
	570	start {
	571	tk fontchooser configure -command ApplyFont -parent .
	572	tk fontchooser show
	573	}
	574	then {
	575	array set a [testgetwindowinfo $::tk_dialog]
	576	Click cancel
	577	}
	578	list [expr {$a(parent) == [wm frame .]}] $::testfont
	579	} -result {1 {}}
	580	test winDialog-10.6 {Tk_FontchooserObjCmd: -apply} -constraints {
	581	nt testwinevent
	582	} -body {
	583	start {
	584	tk fontchooser configure -command FooBarBaz
	585	tk fontchooser show
	586	}
	587	then {
	588	Click cancel
	589	}
	590	} -result 0
	591	test winDialog-10.7 {Tk_FontchooserObjCmd: -apply} -constraints {
	592	nt testwinevent
	593	} -body {
	594	start {
	595	tk fontchooser configure -command ApplyFont -parent .
	596	tk fontchooser show
	597	}
	598	list [then {
	599	Click [expr {0x0402}] ;# value from XP
	600	Click cancel
	601	}] [expr {[llength $::testfont] > 0}]
	602	} -result {0 1}
	603	test winDialog-10.8 {Tk_FontchooserObjCmd: -title} -constraints {
	604	nt testwinevent
	605	} -setup {
	606	array set a {text failed}
	607	} -body {
	608	start {
	609	tk fontchooser configure -command ApplyFont -title "Hello"
	610	tk fontchooser show
	611	}
	612	then {
	613	array set a [testgetwindowinfo $::tk_dialog]
	614	Click cancel
	615	}
	616	set a(text)
	617	} -result "Hello"
	618	test winDialog-10.9 {Tk_FontchooserObjCmd: -title} -constraints {
	619	nt testwinevent
	620	} -setup {
	621	array set a {text failed}
	622	} -body {
	623	start {
	624	tk fontchooser configure -command ApplyFont \
	625	-title "\u041f\u0440\u0438\u0432\u0435\u0442"
	626	tk fontchooser show
	627	}
	628	then {
	629	array set a [testgetwindowinfo $::tk_dialog]
	630	Click cancel
	631	}
	632	set a(text)
	633	} -result "\u041f\u0440\u0438\u0432\u0435\u0442"
	634
503	635	if {[testConstraint testwinevent]} {
504	636	catch {testwinevent debug 0}
505	637	}

+15

-14

tests/winfo.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7	#
8		# RCS: @(#) $Id: winfo.test,v 1.16 2008/08/30 21:52:26 aniap Exp $
	8	# RCS: @(#) $Id: winfo.test,v 1.17 2008/11/03 14:36:20 patthoyts Exp $
9	9
10	10	package require tcltest 2.2
11	11	namespace import ::tcltest::*

389	389	pack .emb.b -expand yes -fill both
390	390	update
391	391
392		expr {[winfo rootx .emb] == [winfo rootx .con] \
393		&& [winfo rooty .emb] == [winfo rooty .con]}
394		} -cleanup {
395		deleteWindows
396		} -result {1}
	392	list rootx [expr {[winfo rootx .emb] == [winfo rootx .con]}] \
	393	rooty [expr {[winfo rooty .emb] == [winfo rooty .con]}]
	394	} -cleanup {
	395	deleteWindows
	396	} -result {rootx 1 rooty 1}
	397
397	398	test winfo-13.2 {destroying embedded toplevel} -setup {
398	399	deleteWindows
399	400	} -body {

406	407
407	408	destroy .emb
408	409	update
409		expr {[winfo exists .emb.b] \|\| [winfo exists .con]}
410		} -cleanup {
411		deleteWindows
412		} -result 0
	410	list embedded [winfo exists .emb.b] container [winfo exists .con]
	411	} -cleanup {
	412	deleteWindows
	413	} -result {embedded 0 container 1}
413	414
414	415	test winfo-13.3 {destroying container window} -setup {
415	416	deleteWindows

423	424
424	425	destroy .con
425	426	update
426		expr {[winfo exists .emb.b] \|\| [winfo exists .emb]}
427		} -cleanup {
428		deleteWindows
429		} -result 0
	427	list child [winfo exists .emb.b] parent [winfo exists .emb]
	428	} -cleanup {
	429	deleteWindows
	430	} -result {child 0 parent 0}
430	431
431	432	test winfo-13.4 {[winfo containing] with embedded windows} -setup {
432	433	deleteWindows

+108

-20

tests/wm.test less more

6	6	# Copyright (c) 1998-1999 by Scriptics Corporation.
7	7	# All rights reserved.
8	8	#
9		# RCS: @(#) $Id: wm.test,v 1.45 2008/10/08 15:39:13 dgp Exp $
	9	# RCS: @(#) $Id: wm.test,v 1.46 2008/11/15 00:00:27 patthoyts Exp $
10	10
11	11	# This file tests window manager interactions that work across platforms.
12	12	# Window manager tests that only work on a specific platform should be placed

2090	2090	}
2091	2091
2092	2092	### Docking test (manage, forget) ###
2093		test wm-manage-1.1 {managing a button} -setup {
	2093	test wm-manage-1.1 {managing a frame} -setup {
2094	2094	set result [list]
2095	2095	} -body {
2096	2096	toplevel .t
2097		button .t.b -text "Manage This"
2098		pack .t.b
2099		update
2100		lappend result [winfo manage .t.b]
2101		lappend result [winfo toplevel .t.b]
2102		wm manage .t.b
2103		update
2104		lappend result [winfo manage .t.b]
2105		lappend result [winfo toplevel .t.b]
2106		wm forget .t.b
2107		pack .t.b
2108		update
2109		lappend result [winfo manage .t.b]
2110		lappend result [winfo toplevel .t.b]
2111		} -cleanup {
2112		deleteWindows
2113		} -result {pack .t wm .t.b pack .t}
2114		test wm-manage-1.2 {unmanaging a toplevel} -setup {
	2097	frame .t.f
	2098	pack [label .t.f.l -text hello]
	2099	wm manage .t.f
	2100	raise .t.f
	2101	update
	2102	lappend result [winfo manage .t.f]
	2103	lappend result [winfo toplevel .t.f]
	2104	} -cleanup {
	2105	deleteWindows
	2106	} -result {wm .t.f}
	2107	test wm-manage-1.2 {managing a toplevel} -setup {
	2108	set result [list]
	2109	} -body {
	2110	toplevel .t
	2111	pack [label .t.l -text hello]
	2112	wm manage .t
	2113	raise .t
	2114	update
	2115	lappend result [winfo manage .t]
	2116	lappend result [winfo toplevel .t]
	2117	} -cleanup {
	2118	deleteWindows
	2119	} -result {wm .t}
	2120	test wm-manage-1.3 {managing a labelframe} -setup {
	2121	set result [list]
	2122	} -body {
	2123	toplevel .t
	2124	labelframe .t.f -text Labelframe
	2125	pack [label .t.f.l -text hello]
	2126	wm manage .t.f
	2127	raise .t.f
	2128	update
	2129	lappend result [winfo manage .t.f]
	2130	lappend result [winfo toplevel .t.f]
	2131	} -cleanup {
	2132	deleteWindows
	2133	} -result {wm .t.f}
	2134	test wm-manage-1.4 {managing a ttk::frame} -setup {
	2135	set result [list]
	2136	} -body {
	2137	toplevel .t
	2138	ttk::frame .t.f
	2139	pack [label .t.f.l -text hello]
	2140	wm manage .t.f
	2141	raise .t.f
	2142	update
	2143	lappend result [winfo manage .t.f]
	2144	lappend result [winfo toplevel .t.f]
	2145	} -cleanup {
	2146	deleteWindows
	2147	} -returnCodes error -result "window \".t.f\" is not manageable: must be a frame, labelframe or toplevel"
	2148	test wm-manage-1.5 {managing a text widget} -setup {
	2149	set result [list]
	2150	} -body {
	2151	toplevel .t
	2152	text .t.f
	2153	.t.f insert end "Manage text\n" {}
	2154	wm manage .t.f
	2155	raise .t.f
	2156	update
	2157	lappend result [winfo manage .t.f]
	2158	lappend result [winfo toplevel .t.f]
	2159	} -cleanup {
	2160	deleteWindows
	2161	} -returnCodes error -result "window \".t.f\" is not manageable: must be a frame, labelframe or toplevel"
	2162	test wm-manage-1.6 {managing a button} -setup {
	2163	set result [list]
	2164	} -body {
	2165	toplevel .t
	2166	button .t.f -text Button
	2167	wm manage .t.f
	2168	raise .t.f
	2169	update
	2170	lappend result [winfo manage .t.f]
	2171	lappend result [winfo toplevel .t.f]
	2172	} -cleanup {
	2173	deleteWindows
	2174	} -returnCodes error -result "window \".t.f\" is not manageable: must be a frame, labelframe or toplevel"
	2175	test wm-manage-1.7 {managing a frame} -setup {
	2176	set result [list]
	2177	} -body {
	2178	toplevel .t
	2179	frame .t.f
	2180	pack [label .t.f.l -text Label]
	2181	pack .t.f
	2182	update
	2183	lappend result [winfo manage .t.f]
	2184	lappend result [winfo toplevel .t.f]
	2185	wm manage .t.f
	2186	raise .t.f
	2187	update
	2188	lappend result [winfo manage .t.f]
	2189	lappend result [winfo toplevel .t.f]
	2190	wm forget .t.f
	2191	pack .t.f
	2192	update
	2193	lappend result [winfo manage .t.f]
	2194	lappend result [winfo toplevel .t.f]
	2195	} -cleanup {
	2196	deleteWindows
	2197	} -result {pack .t wm .t.f pack .t}
	2198	test wm-manage-1.8 {unmanaging a toplevel} -setup {
2115	2199	set result [list]
2116	2200	} -body {
2117	2201	toplevel .t

2187	2271	catch {unset results}
2188	2272	catch {unset focusin}
2189	2273	return
	2274
	2275	# Local variables:
	2276	# mode: tcl
	2277	# End:

+11

-6

unix/Makefile.in less more

4	4	# "autoconf" program (constructs like "@foo@" will get replaced in the
5	5	# actual Makefile.
6	6	#
7		# RCS: @(#) $Id: Makefile.in,v 1.145 2008/08/25 11:44:03 dkf Exp $
	7	# RCS: @(#) $Id: Makefile.in,v 1.147 2008/12/05 10:48:52 dkf Exp $
8	8
9	9	# Current Tk version; used in various names.
10	10

357	357	#
358	358	FONT_OBJS = @UNIX_FONT_OBJS@
359	359
360		GENERIC_OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkClipboard.o \
	360	GENERIC_OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkBusy.o \
	361	tkClipboard.o \
361	362	tkCmds.o tkColor.o tkConfig.o tkConsole.o tkCursor.o tkError.o \
362	363	tkEvent.o tkFocus.o tkFont.o tkGet.o tkGC.o tkGeometry.o tkGrab.o \
363	364	tkGrid.o tkMain.o tkObj.o tkOldConfig.o tkOption.o tkPack.o tkPlace.o \

411	412	GENERIC_SRCS = \
412	413	$(GENERIC_DIR)/tk3d.c $(GENERIC_DIR)/tkArgv.c \
413	414	$(GENERIC_DIR)/tkAtom.c $(GENERIC_DIR)/tkBind.c \
414		$(GENERIC_DIR)/tkBitmap.c $(GENERIC_DIR)/tkClipboard.c \
	415	$(GENERIC_DIR)/tkBitmap.c $(GENERIC_DIR)/tkBusy.c \
	416	$(GENERIC_DIR)/tkClipboard.c \
415	417	$(GENERIC_DIR)/tkCmds.c $(GENERIC_DIR)/tkColor.c \
416	418	$(GENERIC_DIR)/tkConfig.c $(GENERIC_DIR)/tkCursor.c \
417	419	$(GENERIC_DIR)/tkError.c $(GENERIC_DIR)/tkEvent.c \

757	759	$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
758	760	done;
759	761	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
760		@for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
761		$(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
	762	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
	763	$(UNIX_DIR)/tkAppInit.c; \
762	764	do \
763	765	$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
764	766	done;

921	923	tkBitmap.o: $(GENERIC_DIR)/tkBitmap.c
922	924	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBitmap.c
923	925
	926	tkBusy.o: $(GENERIC_DIR)/tkBusy.c
	927	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBusy.c
	928
924	929	tkClipboard.o: $(GENERIC_DIR)/tkClipboard.c
925	930	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkClipboard.c
926	931

1529	1534	fi; \
1530	1535	done;)
1531	1536	mkdir $(DISTDIR)/generic
1532		cp -p $(GENERIC_DIR)/*.[ch] $(GENERIC_DIR)/prolog.ps $(DISTDIR)/generic
	1537	cp -p $(GENERIC_DIR)/*.[ch] $(DISTDIR)/generic
1533	1538	cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
1534	1539	cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
1535	1540	cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog \

+88

-14

unix/configure less more

1336	1336	TK_VERSION=8.6
1337	1337	TK_MAJOR_VERSION=8
1338	1338	TK_MINOR_VERSION=6
1339		TK_PATCH_LEVEL="a3"
	1339	TK_PATCH_LEVEL="b1"
1340	1340	VERSION=${TK_VERSION}
1341	1341	LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
1342	1342

2602	2602	ac_compiler_gnu=$ac_cv_c_compiler_gnu
2603	2603
2604	2604
	2605	echo "$as_me:$LINENO: checking for inline" >&5
	2606	echo $ECHO_N "checking for inline... $ECHO_C" >&6
	2607	if test "${ac_cv_c_inline+set}" = set; then
	2608	echo $ECHO_N "(cached) $ECHO_C" >&6
	2609	else
	2610	ac_cv_c_inline=no
	2611	for ac_kw in inline __inline__ __inline; do
	2612	cat >conftest.$ac_ext <<_ACEOF
	2613	/* confdefs.h. */
	2614	_ACEOF
	2615	cat confdefs.h >>conftest.$ac_ext
	2616	cat >>conftest.$ac_ext <<_ACEOF
	2617	/* end confdefs.h. */
	2618	#ifndef __cplusplus
	2619	typedef int foo_t;
	2620	static $ac_kw foo_t static_foo () {return 0; }
	2621	$ac_kw foo_t foo () {return 0; }
	2622	#endif
	2623
	2624	_ACEOF
	2625	rm -f conftest.$ac_objext
	2626	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
	2627	(eval $ac_compile) 2>conftest.er1
	2628	ac_status=$?
	2629	grep -v '^ *+' conftest.er1 >conftest.err
	2630	rm -f conftest.er1
	2631	cat conftest.err >&5
	2632	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	2633	(exit $ac_status); } &&
	2634	{ ac_try='test -z "$ac_c_werror_flag"
	2635	\|\| test ! -s conftest.err'
	2636	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
	2637	(eval $ac_try) 2>&5
	2638	ac_status=$?
	2639	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	2640	(exit $ac_status); }; } &&
	2641	{ ac_try='test -s conftest.$ac_objext'
	2642	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
	2643	(eval $ac_try) 2>&5
	2644	ac_status=$?
	2645	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	2646	(exit $ac_status); }; }; then
	2647	ac_cv_c_inline=$ac_kw; break
	2648	else
	2649	echo "$as_me: failed program was:" >&5
	2650	sed 's/^/\| /' conftest.$ac_ext >&5
	2651
	2652	fi
	2653	rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
	2654	done
	2655
	2656	fi
	2657	echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
	2658	echo "${ECHO_T}$ac_cv_c_inline" >&6
	2659
	2660
	2661	case $ac_cv_c_inline in
	2662	inline \| yes) ;;
	2663	*)
	2664	case $ac_cv_c_inline in
	2665	no) ac_val=;;
	2666	*) ac_val=$ac_cv_c_inline;;
	2667	esac
	2668	cat >>confdefs.h <<_ACEOF
	2669	#ifndef __cplusplus
	2670	#define inline $ac_val
	2671	#endif
	2672	_ACEOF
	2673	;;
	2674	esac
	2675
	2676
2605	2677	# limits header checks must come early to prevent
2606	2678	# an autoconf bug that throws errors on configure
2607
2608	2679	ac_ext=c
2609	2680	ac_cpp='$CPP $CPPFLAGS'
2610	2681	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4448	4519	ECHO_VERSION='`echo ${VERSION}`'
4449	4520	TCL_LIB_VERSIONS_OK=ok
4450	4521	CFLAGS_DEBUG=-g
4451		CFLAGS_OPTIMIZE=-O
4452	4522	if test "$GCC" = yes; then
4453	4523
4454		CFLAGS_WARNING="-Wall -Wno-implicit-int"
4455
4456		else
4457		CFLAGS_WARNING=""
	4524	CFLAGS_OPTIMIZE="-O2"
	4525	CFLAGS_WARNING="-Wall"
	4526
	4527	else
	4528
	4529	CFLAGS_OPTIMIZE=-O
	4530	CFLAGS_WARNING=""
	4531
4458	4532	fi
4459	4533
4460	4534	TCL_NEEDS_EXP_FILE=0

4920	4994	DL_LIBS="-ldld"
4921	4995	LDFLAGS="$LDFLAGS -Wl,-E"
4922	4996	CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
4923		LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.'
	4997	LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
4924	4998	LD_LIBRARY_PATH_VAR="SHLIB_PATH"
4925	4999
4926	5000	fi

9206	9280	/usr/openwin/share/include'
9207	9281
9208	9282	if test "$ac_x_includes" = no; then
9209		# Guess where to find include files, by looking for Intrinsic.h.
	9283	# Guess where to find include files, by looking for Xlib.h.
9210	9284	# First, try using that file with no special directory specified.
9211	9285	cat >conftest.$ac_ext <<_ACEOF
9212	9286	/* confdefs.h. */

9214	9288	cat confdefs.h >>conftest.$ac_ext
9215	9289	cat >>conftest.$ac_ext <<_ACEOF
9216	9290	/* end confdefs.h. */
9217		#include <X11/Intrinsic.h>
	9291	#include <X11/Xlib.h>
9218	9292	_ACEOF
9219	9293	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
9220	9294	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

9241	9315	sed 's/^/\| /' conftest.$ac_ext >&5
9242	9316
9243	9317	for ac_dir in $ac_x_header_dirs; do
9244		if test -r "$ac_dir/X11/Intrinsic.h"; then
	9318	if test -r "$ac_dir/X11/Xlib.h"; then
9245	9319	ac_x_includes=$ac_dir
9246	9320	break
9247	9321	fi

9255	9329	# See if we find them without any special options.
9256	9330	# Don't add to $LIBS permanently.
9257	9331	ac_save_LIBS=$LIBS
9258		LIBS="-lXt $LIBS"
	9332	LIBS="-lX11 $LIBS"
9259	9333	cat >conftest.$ac_ext <<_ACEOF
9260	9334	/* confdefs.h. */
9261	9335	_ACEOF
9262	9336	cat confdefs.h >>conftest.$ac_ext
9263	9337	cat >>conftest.$ac_ext <<_ACEOF
9264	9338	/* end confdefs.h. */
9265		#include <X11/Intrinsic.h>
	9339	#include <X11/Xlib.h>
9266	9340	int
9267	9341	main ()
9268	9342	{
9269		XtMalloc (0)
	9343	XrmInitialize ()
9270	9344	;
9271	9345	return 0;
9272	9346	}

+3

-2

unix/configure.in less more

2	2	dnl generate the file "configure", which is run during Tk installation
3	3	dnl to configure the system for the local environment.
4	4	#
5		# RCS: @(#) $Id: configure.in,v 1.158 2008/08/28 16:29:37 dgp Exp $
	5	# RCS: @(#) $Id: configure.in,v 1.161 2008/12/19 14:32:25 dgp Exp $
6	6
7	7	AC_INIT([tk],[8.6])
8	8	AC_PREREQ(2.59)

26	26	TK_VERSION=8.6
27	27	TK_MAJOR_VERSION=8
28	28	TK_MINOR_VERSION=6
29		TK_PATCH_LEVEL="a3"
	29	TK_PATCH_LEVEL="b1"
30	30	VERSION=${TK_VERSION}
31	31	LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
32	32

71	71	fi
72	72
73	73	AC_PROG_CC
	74	AC_C_INLINE
74	75
75	76	# limits header checks must come early to prevent
76	77	# an autoconf bug that throws errors on configure

+7

-4

unix/tcl.m4 less more

1100	1100	ECHO_VERSION='`echo ${VERSION}`'
1101	1101	TCL_LIB_VERSIONS_OK=ok
1102	1102	CFLAGS_DEBUG=-g
1103		CFLAGS_OPTIMIZE=-O
1104	1103	AS_IF([test "$GCC" = yes], [
1105		CFLAGS_WARNING="-Wall -Wno-implicit-int"
1106		], [CFLAGS_WARNING=""])
	1104	CFLAGS_OPTIMIZE="-O2"
	1105	CFLAGS_WARNING="-Wall"
	1106	], [
	1107	CFLAGS_OPTIMIZE=-O
	1108	CFLAGS_WARNING=""
	1109	])
1107	1110	TCL_NEEDS_EXP_FILE=0
1108	1111	TCL_BUILD_EXP_FILE=""
1109	1112	TCL_EXP_FILE=""

1266	1269	DL_LIBS="-ldld"
1267	1270	LDFLAGS="$LDFLAGS -Wl,-E"
1268	1271	CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
1269		LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.'
	1272	LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
1270	1273	LD_LIBRARY_PATH_VAR="SHLIB_PATH"
1271	1274	])
1272	1275	AS_IF([test "$GCC" = yes], [

+2

-2

unix/tk.spec less more

0		# $Id: tk.spec,v 1.39 2008/08/28 16:29:37 dgp Exp $
	0	# $Id: tk.spec,v 1.41 2008/12/19 14:32:25 dgp Exp $
1	1	# This file is the basis for a binary Tk Linux RPM.
2	2
3	3	%{!?directory:%define directory /usr/local}
4	4
5	5	Name: tk
6	6	Summary: Tk graphical toolkit for the Tcl scripting language.
7		Version: 8.6a3
	7	Version: 8.6b1
8	8	Release: 2
9	9	License: BSD
10	10	Group: Development/Languages

+6

-0

unix/tkConfig.h.in less more

203	203
204	204	/* Define to `int' if <sys/types.h> doesn't define. */
205	205	#undef gid_t
	206
	207	/* Define to `__inline__' or `__inline' if that's what the C compiler
	208	calls it, or to nothing if 'inline' is not supported under any name. */
	209	#ifndef __cplusplus
	210	#undef inline
	211	#endif
206	212
207	213	/* Signed integer type wide enough to hold a pointer. */
208	214	#undef intptr_t

+7

-7

unix/tkUnix3d.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkUnix3d.c,v 1.12 2007/12/13 15:28:50 dgp Exp $
	11	* RCS: @(#) $Id: tkUnix3d.c,v 1.13 2008/12/09 22:58:30 dkf Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

378	378	*/
379	379
380	380	/*
381		* Compute the dark shadow color
	381	* Compute the dark shadow color.
382	382	*/
383	383
384	384	r = (int) borderPtr->bgColorPtr->red;

396	396	}
397	397
398	398	/*
399		* Allocate the dark shadow color and its GC
	399	* Allocate the dark shadow color and its GC.
400	400	*/
401	401
402	402	borderPtr->darkColorPtr = Tk_GetColorByValue(tkwin, &darkColor);

404	404	borderPtr->darkGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
405	405
406	406	/*
407		* Compute the light shadow color
	407	* Compute the light shadow color.
408	408	*/
409	409
410	410	if (g > MAX_INTENSITY*0.95) {

432	432	lightColor.blue = (tmp1 > tmp2) ? tmp1 : tmp2;
433	433	}
434	434
435		/*
436		* Allocate the light shadow color and its GC
437		*/
	435	/*
	436	* Allocate the light shadow color and its GC.
	437	*/
438	438
439	439	borderPtr->lightColorPtr = Tk_GetColorByValue(tkwin, &lightColor);
440	440	gcValues.foreground = borderPtr->lightColorPtr->pixel;

+2

-2

unix/tkUnixButton.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkUnixButton.c,v 1.25 2007/12/13 15:28:50 dgp Exp $
	10	* RCS: @(#) $Id: tkUnixButton.c,v 1.26 2008/11/05 22:20:59 nijtmans Exp $
11	11	*/
12	12
13	13	#include "tkInt.h"

56	56	*/
57	57
58	58	/* XPM */
59		static char *button_images[] = {
	59	static const char *button_images[] = {
60	60	/* width height ncolors chars_per_pixel */
61	61	"52 26 7 1",
62	62	/* colors */

+6

-6

unix/tkUnixCursor.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkUnixCursor.c,v 1.14 2008/04/27 22:39:13 dkf Exp $
	10	* RCS: @(#) $Id: tkUnixCursor.c,v 1.15 2008/11/05 22:48:58 nijtmans Exp $
11	11	*/
12	12
13	13	#include "tkInt.h"

162	162
163	163	static const struct TkCursorName {
164	164	const char *name;
165		char *data;
	165	const char *data;
166	166	char *mask;
167	167	} tkCursorNames[] = {
168	168	{"none", CURSOR_NONE_DATA, NULL},

183	183	static Cursor CreateCursorFromTableOrFile(Tcl_Interp *interp,
184	184	Tk_Window tkwin, int argc, const char **argv,
185	185	const struct TkCursorName *tkCursorPtr);
186
	186
187	187	/*
188	188	*----------------------------------------------------------------------
189	189	*

549	549	}
550	550	return cursor;
551	551	}
552
	552
553	553	/*
554	554	*----------------------------------------------------------------------
555	555	*

599	599	}
600	600	return (TkCursor *) cursorPtr;
601	601	}
602
	602
603	603	/*
604	604	*----------------------------------------------------------------------
605	605	*

626	626	XFreeCursor(unixCursorPtr->display, (Cursor) unixCursorPtr->info.cursor);
627	627	Tk_FreeXId(unixCursorPtr->display, (XID) unixCursorPtr->info.cursor);
628	628	}
629
	629
630	630	/*
631	631	* Local Variables:
632	632	* mode: c

+37

-30

unix/tkUnixDefault.h less more

9	9	* See the file "license.terms" for information on usage and redistribution
10	10	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkUnixDefault.h,v 1.26 2007/12/13 15:28:50 dgp Exp $
	12	* RCS: @(#) $Id: tkUnixDefault.h,v 1.28 2008/12/06 10:48:29 dkf Exp $
13	13	*/
14	14
15	15	#ifndef _TKUNIXDEFAULT

65	65	#define DEF_BUTTON_HIGHLIGHT BLACK
66	66	#define DEF_LABEL_HIGHLIGHT_WIDTH "0"
67	67	#define DEF_BUTTON_HIGHLIGHT_WIDTH "1"
68		#define DEF_BUTTON_IMAGE (char *) NULL
	68	#define DEF_BUTTON_IMAGE ((char *) NULL)
69	69	#define DEF_BUTTON_INDICATOR "1"
70	70	#define DEF_BUTTON_JUSTIFY "center"
71	71	#define DEF_BUTTON_OFF_VALUE "0"

82	82	#define DEF_BUTTON_REPEAT_INTERVAL "0"
83	83	#define DEF_BUTTON_SELECT_COLOR CHECK_INDICATOR
84	84	#define DEF_BUTTON_SELECT_MONO BLACK
85		#define DEF_BUTTON_SELECT_IMAGE (char *) NULL
	85	#define DEF_BUTTON_SELECT_IMAGE ((char *) NULL)
86	86	#define DEF_BUTTON_STATE "normal"
87	87	#define DEF_LABEL_TAKE_FOCUS "0"
88		#define DEF_BUTTON_TAKE_FOCUS (char *) NULL
	88	#define DEF_BUTTON_TAKE_FOCUS ((char *) NULL)
89	89	#define DEF_BUTTON_TEXT ""
90	90	#define DEF_BUTTON_TEXT_VARIABLE ""
91	91	#define DEF_BUTTON_UNDERLINE "-1"

123	123	#define DEF_CANVAS_SELECT_BD_MONO "0"
124	124	#define DEF_CANVAS_SELECT_FG_COLOR BLACK
125	125	#define DEF_CANVAS_SELECT_FG_MONO WHITE
126		#define DEF_CANVAS_TAKE_FOCUS (char *) NULL
	126	#define DEF_CANVAS_TAKE_FOCUS ((char *) NULL)
127	127	#define DEF_CANVAS_WIDTH "10c"
128	128	#define DEF_CANVAS_X_SCROLL_CMD ""
129	129	#define DEF_CANVAS_X_SCROLL_INCREMENT "0"

164	164	#define DEF_ENTRY_SELECT_BD_MONO "0"
165	165	#define DEF_ENTRY_SELECT_FG_COLOR BLACK
166	166	#define DEF_ENTRY_SELECT_FG_MONO WHITE
167		#define DEF_ENTRY_SHOW (char *) NULL
	167	#define DEF_ENTRY_SHOW ((char *) NULL)
168	168	#define DEF_ENTRY_STATE "normal"
169		#define DEF_ENTRY_TAKE_FOCUS (char *) NULL
	169	#define DEF_ENTRY_TAKE_FOCUS ((char *) NULL)
170	170	#define DEF_ENTRY_TEXT_VARIABLE ""
171	171	#define DEF_ENTRY_WIDTH "20"
172	172

233	233	#define DEF_LISTBOX_SELECT_MODE "browse"
234	234	#define DEF_LISTBOX_SET_GRID "0"
235	235	#define DEF_LISTBOX_STATE "normal"
236		#define DEF_LISTBOX_TAKE_FOCUS (char *) NULL
	236	#define DEF_LISTBOX_TAKE_FOCUS ((char *) NULL)
237	237	#define DEF_LISTBOX_WIDTH "20"
238	238
239	239	/*
240	240	* Defaults for individual entries of menus:
241	241	*/
242	242
243		#define DEF_MENU_ENTRY_ACTIVE_BG (char *) NULL
244		#define DEF_MENU_ENTRY_ACTIVE_FG (char *) NULL
245		#define DEF_MENU_ENTRY_ACCELERATOR (char *) NULL
246		#define DEF_MENU_ENTRY_BG (char *) NULL
	243	#define DEF_MENU_ENTRY_ACTIVE_BG ((char *) NULL)
	244	#define DEF_MENU_ENTRY_ACTIVE_FG ((char *) NULL)
	245	#define DEF_MENU_ENTRY_ACCELERATOR ((char *) NULL)
	246	#define DEF_MENU_ENTRY_BG ((char *) NULL)
247	247	#define DEF_MENU_ENTRY_BITMAP None
248	248	#define DEF_MENU_ENTRY_COLUMN_BREAK "0"
249		#define DEF_MENU_ENTRY_COMMAND (char *) NULL
	249	#define DEF_MENU_ENTRY_COMMAND ((char *) NULL)
250	250	#define DEF_MENU_ENTRY_COMPOUND "none"
251		#define DEF_MENU_ENTRY_FG (char *) NULL
252		#define DEF_MENU_ENTRY_FONT (char *) NULL
	251	#define DEF_MENU_ENTRY_FG ((char *) NULL)
	252	#define DEF_MENU_ENTRY_FONT ((char *) NULL)
253	253	#define DEF_MENU_ENTRY_HIDE_MARGIN "0"
254		#define DEF_MENU_ENTRY_IMAGE (char *) NULL
	254	#define DEF_MENU_ENTRY_IMAGE ((char *) NULL)
255	255	#define DEF_MENU_ENTRY_INDICATOR "1"
256		#define DEF_MENU_ENTRY_LABEL (char *) NULL
257		#define DEF_MENU_ENTRY_MENU (char *) NULL
	256	#define DEF_MENU_ENTRY_LABEL ((char *) NULL)
	257	#define DEF_MENU_ENTRY_MENU ((char *) NULL)
258	258	#define DEF_MENU_ENTRY_OFF_VALUE "0"
259	259	#define DEF_MENU_ENTRY_ON_VALUE "1"
260		#define DEF_MENU_ENTRY_SELECT_IMAGE (char *) NULL
	260	#define DEF_MENU_ENTRY_SELECT_IMAGE ((char *) NULL)
261	261	#define DEF_MENU_ENTRY_STATE "normal"
262		#define DEF_MENU_ENTRY_VALUE (char *) NULL
263		#define DEF_MENU_ENTRY_CHECK_VARIABLE (char *) NULL
	262	#define DEF_MENU_ENTRY_VALUE ((char *) NULL)
	263	#define DEF_MENU_ENTRY_CHECK_VARIABLE ((char *) NULL)
264	264	#define DEF_MENU_ENTRY_RADIO_VARIABLE "selectedButton"
265		#define DEF_MENU_ENTRY_SELECT (char *) NULL
	265	#define DEF_MENU_ENTRY_SELECT ((char *) NULL)
266	266	#define DEF_MENU_ENTRY_UNDERLINE "-1"
267	267
268	268	/*

288	288	#define DEF_MENU_SELECT_MONO BLACK
289	289	#define DEF_MENU_TAKE_FOCUS "0"
290	290	#define DEF_MENU_TEAROFF "1"
291		#define DEF_MENU_TEAROFF_CMD (char *) NULL
	291	#define DEF_MENU_TEAROFF_CMD ((char *) NULL)
292	292	#define DEF_MENU_TITLE ""
293	293	#define DEF_MENU_TYPE "normal"
294	294

316	316	#define DEF_MENUBUTTON_HIGHLIGHT_BG_MONO DEF_MENUBUTTON_BG_MONO
317	317	#define DEF_MENUBUTTON_HIGHLIGHT BLACK
318	318	#define DEF_MENUBUTTON_HIGHLIGHT_WIDTH "0"
319		#define DEF_MENUBUTTON_IMAGE (char *) NULL
	319	#define DEF_MENUBUTTON_IMAGE ((char *) NULL)
320	320	#define DEF_MENUBUTTON_INDICATOR "0"
321	321	#define DEF_MENUBUTTON_JUSTIFY "center"
322	322	#define DEF_MENUBUTTON_MENU ""

416	416	#define DEF_SCALE_LENGTH "100"
417	417	#define DEF_SCALE_ORIENT "vertical"
418	418	#define DEF_SCALE_RELIEF "flat"
419		#define DEF_SCALE_REPEAT_DELAY "300"
	419	#define DEF_SCALE_REPEAT_DELAY "300"
420	420	#define DEF_SCALE_REPEAT_INTERVAL "100"
421	421	#define DEF_SCALE_RESOLUTION "1"
422	422	#define DEF_SCALE_TROUGH_COLOR TROUGH

425	425	#define DEF_SCALE_SLIDER_LENGTH "30"
426	426	#define DEF_SCALE_SLIDER_RELIEF "raised"
427	427	#define DEF_SCALE_STATE "normal"
428		#define DEF_SCALE_TAKE_FOCUS (char *) NULL
	428	#define DEF_SCALE_TAKE_FOCUS ((char *) NULL)
429	429	#define DEF_SCALE_TICK_INTERVAL "0"
430	430	#define DEF_SCALE_TO "100"
431	431	#define DEF_SCALE_VARIABLE ""

452	452	#define DEF_SCROLLBAR_RELIEF "sunken"
453	453	#define DEF_SCROLLBAR_REPEAT_DELAY "300"
454	454	#define DEF_SCROLLBAR_REPEAT_INTERVAL "100"
455		#define DEF_SCROLLBAR_TAKE_FOCUS (char *) NULL
	455	#define DEF_SCROLLBAR_TAKE_FOCUS ((char *) NULL)
456	456	#define DEF_SCROLLBAR_TROUGH_COLOR TROUGH
457	457	#define DEF_SCROLLBAR_TROUGH_MONO WHITE
458	458	#define DEF_SCROLLBAR_WIDTH "11"

479	479	#define DEF_TEXT_INSERT_BD_MONO "0"
480	480	#define DEF_TEXT_INSERT_OFF_TIME "300"
481	481	#define DEF_TEXT_INSERT_ON_TIME "600"
	482	#define DEF_TEXT_INSERT_UNFOCUSSED "none"
482	483	#define DEF_TEXT_INSERT_WIDTH "2"
483		#define DEF_TEXT_MAX_UNDO "0"
	484	#define DEF_TEXT_MAX_UNDO "0"
484	485	#define DEF_TEXT_PADX "1"
485	486	#define DEF_TEXT_PADY "1"
486	487	#define DEF_TEXT_RELIEF "sunken"

499	500	#define DEF_TEXT_STATE "normal"
500	501	#define DEF_TEXT_TABS ""
501	502	#define DEF_TEXT_TABSTYLE "tabular"
502		#define DEF_TEXT_TAKE_FOCUS (char *) NULL
503		#define DEF_TEXT_UNDO "0"
	503	#define DEF_TEXT_TAKE_FOCUS ((char *) NULL)
	504	#define DEF_TEXT_UNDO "0"
504	505	#define DEF_TEXT_WIDTH "80"
505	506	#define DEF_TEXT_WRAP "char"
506	507	#define DEF_TEXT_XSCROLL_COMMAND ""

522	523	#define DEF_TOPLEVEL_SCREEN ""
523	524	#define DEF_TOPLEVEL_USE ""
524	525
	526	/*
	527	* Defaults for busy windows:
	528	*/
	529
	530	#define DEF_BUSY_CURSOR "watch"
	531
525	532	#endif /* _TKUNIXDEFAULT */

+173

-2

unix/tkUnixEmbed.c less more

3	3	* This file contains platform-specific functions for UNIX to provide
4	4	* basic operations needed for application embedding (where one
5	5	* application can use as its main window an internal window from some
6		* other application).
	6	* other application). Also includes code to support busy windows.
7	7	*
8	8	* Copyright (c) 1996-1997 Sun Microsystems, Inc.
9	9	*
10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkUnixEmbed.c,v 1.13 2008/04/27 22:39:13 dkf Exp $
	13	* RCS: @(#) $Id: tkUnixEmbed.c,v 1.14 2008/10/20 10:50:20 dkf Exp $
14	14	*/
15	15
16	16	#include "tkUnixInt.h"
	17	#include "tkBusy.h"
17	18
18	19	/*
19	20	* One of the following structures exists for each container in this

1014	1015	}
1015	1016
1016	1017	/*
	1018	*----------------------------------------------------------------------
	1019	*
	1020	* TkpShowBusyWindow --
	1021	*
	1022	* Makes a busy window "appear".
	1023	*
	1024	* Results:
	1025	* None.
	1026	*
	1027	* Side effects:
	1028	* Arranges for the busy window to start intercepting events and the
	1029	* cursor to change to the configured "hey, I'm busy!" setting.
	1030	*
	1031	*----------------------------------------------------------------------
	1032	*/
	1033
	1034	void
	1035	TkpShowBusyWindow(
	1036	TkBusy busy)
	1037	{
	1038	Busy busyPtr = (Busy ) busy;
	1039
	1040	if (busyPtr->tkBusy != NULL) {
	1041	Tk_MapWindow(busyPtr->tkBusy);
	1042
	1043	/*
	1044	* Always raise the busy window just in case new sibling windows have
	1045	* been created in the meantime. Can't use Tk_RestackWindow because it
	1046	* doesn't work under Win32.
	1047	*/
	1048
	1049	XRaiseWindow(Tk_Display(busyPtr->tkBusy),
	1050	Tk_WindowId(busyPtr->tkBusy));
	1051	}
	1052	}
	1053
	1054	/*
	1055	*----------------------------------------------------------------------
	1056	*
	1057	* TkpHideBusyWindow --
	1058	*
	1059	* Makes a busy window "disappear".
	1060	*
	1061	* Results:
	1062	* None.
	1063	*
	1064	* Side effects:
	1065	* Arranges for the busy window to stop intercepting events, and the
	1066	* cursor to change back to its normal setting.
	1067	*
	1068	*----------------------------------------------------------------------
	1069	*/
	1070
	1071	void
	1072	TkpHideBusyWindow(
	1073	TkBusy busy)
	1074	{
	1075	Busy busyPtr = (Busy ) busy;
	1076
	1077	if (busyPtr->tkBusy != NULL) {
	1078	Tk_UnmapWindow(busyPtr->tkBusy);
	1079	}
	1080	}
	1081
	1082	/*
	1083	*----------------------------------------------------------------------
	1084	*
	1085	* TkpMakeTransparentWindowExist --
	1086	*
	1087	* Construct the platform-specific resources for a transparent window.
	1088	*
	1089	* Results:
	1090	* None.
	1091	*
	1092	* Side effects:
	1093	* Moves the specified window in the stacking order.
	1094	*
	1095	*----------------------------------------------------------------------
	1096	*/
	1097
	1098	void
	1099	TkpMakeTransparentWindowExist(
	1100	Tk_Window tkwin, /* Token for window. */
	1101	Window parent) /* Parent window. */
	1102	{
	1103	TkWindow winPtr = (TkWindow ) tkwin;
	1104	long int mask = CWDontPropagate \| CWEventMask;
	1105
	1106	/*
	1107	* Ignore the important events while the window is mapped.
	1108	*/
	1109
	1110	#define USER_EVENTS \
	1111	(EnterWindowMask \| LeaveWindowMask \| KeyPressMask \| KeyReleaseMask \| \
	1112	ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask)
	1113	#define PROP_EVENTS \
	1114	(KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| \
	1115	ButtonReleaseMask \| PointerMotionMask)
	1116
	1117	winPtr->atts.do_not_propagate_mask = PROP_EVENTS;
	1118	winPtr->atts.event_mask = USER_EVENTS;
	1119	winPtr->changes.border_width = 0;
	1120	winPtr->depth = 0;
	1121
	1122	winPtr->window = XCreateWindow(winPtr->display, parent,
	1123	winPtr->changes.x, winPtr->changes.y,
	1124	(unsigned) winPtr->changes.width, /* width */
	1125	(unsigned) winPtr->changes.height, /* height */
	1126	(unsigned) winPtr->changes.border_width, /* border_width */
	1127	winPtr->depth, InputOnly, winPtr->visual, mask, &winPtr->atts);
	1128	}
	1129
	1130	/*
	1131	*----------------------------------------------------------------------
	1132	*
	1133	* TkpCreateBusy --
	1134	*
	1135	* Construct the platform-specific parts of a busy window. Note that this
	1136	* postpones the actual creation of the window resource until later. The
	1137	* GetParent() function is a helper for this.
	1138	*
	1139	* Results:
	1140	* None.
	1141	*
	1142	* Side effects:
	1143	* Sets up part of the busy window structure.
	1144	*
	1145	*----------------------------------------------------------------------
	1146	*/
	1147
	1148	static inline Window
	1149	GetParent(
	1150	Display *display,
	1151	Window window)
	1152	{
	1153	Window root, parent;
	1154	Window *dummy;
	1155	unsigned int count;
	1156
	1157	if (XQueryTree(display, window, &root, &parent, &dummy, &count) > 0) {
	1158	XFree(dummy);
	1159	return parent;
	1160	}
	1161	return None;
	1162	}
	1163
	1164	void
	1165	TkpCreateBusy(
	1166	Tk_FakeWin *winPtr,
	1167	Tk_Window tkRef,
	1168	Window *parentPtr,
	1169	Tk_Window tkParent,
	1170	TkBusy busy)
	1171	{
	1172	if (winPtr->flags & TK_REPARENTED) {
	1173	/*
	1174	* This works around a bug in the implementation of menubars for
	1175	* non-MacIntosh window systems (Win32 and X11). Tk doesn't reset the
	1176	* pointers to the parent window when the menu is reparented (since
	1177	* winPtr->parentPtr points to the wrong window). We get around this
	1178	* by determining the parent via the native API calls.
	1179	*/
	1180
	1181	*parentPtr = GetParent(Tk_Display(tkRef), Tk_WindowId(tkRef));
	1182	} else {
	1183	*parentPtr = Tk_WindowId(tkParent);
	1184	}
	1185	}
	1186
	1187	/*
1017	1188	* Local Variables:
1018	1189	* mode: c
1019	1190	* c-basic-offset: 4

+2

-2

unix/tkUnixEvent.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkUnixEvent.c,v 1.30 2008/10/05 18:22:21 dkf Exp $
	11	* RCS: @(#) $Id: tkUnixEvent.c,v 1.31 2008/10/22 16:30:16 das Exp $
12	12	*/
13	13
14	14	#include "tkUnixInt.h"

290	290	if (event.type == GenericEvent) {
291	291	xGenericEvent xgePtr = (xGenericEvent ) &event;
292	292
293		Tcl_Panic("Wild GenericEvent; panic! (extension=%d,evtype=%d)"
	293	Tcl_Panic("Wild GenericEvent; panic! (extension=%d,evtype=%d)",
294	294	xgePtr->extension, xgePtr->evtype);
295	295	}
296	296	#endif

+298

-13

unix/tkUnixFont.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkUnixFont.c,v 1.35 2008/10/05 18:22:21 dkf Exp $
	11	* RCS: @(#) $Id: tkUnixFont.c,v 1.39 2008/11/22 18:08:51 dkf Exp $
12	12	*/
13	13
14	14	#include "tkUnixInt.h"

20	20	* The preferred font encodings.
21	21	*/
22	22
23		static const char *encodingList[] = {
	23	static const char *const encodingList[] = {
24	24	"iso8859-1", "jis0208", "jis0212", NULL
25	25	};
26	26

138	138	*/
139	139
140	140	typedef struct EncodingAlias {
141		char realName; / The real name of the encoding to load if
	141	const char realName; / The real name of the encoding to load if
142	142	* the provided name matched the pattern. */
143		char aliasPattern; / Pattern for encoding name, of the form that
	143	const char aliasPattern; / Pattern for encoding name, of the form that
144	144	* is acceptable to Tcl_StringMatch. */
145	145	} EncodingAlias;
146	146

209	209	const char *fallbackName, int ch,
210	210	SubFont **fixSubFontPtrPtr);
211	211	static SubFont * CanUseFallbackWithAliases(UnixFont *fontPtr,
212		char *fallbackName, int ch,
	212	const char *fallbackName, int ch,
213	213	Tcl_DString *nameTriedPtr,
214	214	SubFont **fixSubFontPtrPtr);
215	215	static int ControlUtfProc(ClientData clientData, const char *src,

1482	1482
1483	1483	nameList = ListFontOrAlias(display, want.fa.family, &numNames);
1484	1484	if (numNames == 0) {
1485		char ***fontFallbacks;
	1485	const char const const *fontFallbacks;
1486	1486	int i, j;
1487		char *fallback;
	1487	const char *fallback;
1488	1488
1489	1489	fontFallbacks = TkFontGetFallbacks();
1490	1490	for (i = 0; fontFallbacks[i] != NULL; i++) {

1968	1968	{
1969	1969	int i, j, k, numNames;
1970	1970	Tk_Uid faceName;
1971		char fallback, aliases, nameList, anyFallbacks, **fontFallbacks;
	1971	const char *fallback;
	1972	const char const aliases;
	1973	char **nameList;
	1974	const char const anyFallbacks;
	1975	const char const const *fontFallbacks;
1972	1976	SubFont *subFontPtr;
1973	1977	Tcl_DString ds;
1974	1978

2286	2290	CanUseFallbackWithAliases(
2287	2291	UnixFont fontPtr, / The font object that will own the new
2288	2292	* screen font. */
2289		char faceName, / Desired face name for new screen font. */
	2293	const char faceName, / Desired face name for new screen font. */
2290	2294	int ch, /* The Unicode character that the new screen
2291	2295	* font must be able to display. */
2292	2296	Tcl_DString nameTriedPtr, / Records face names that have already been

2297	2301	* reallocate our subfont table. */
2298	2302	{
2299	2303	SubFont *subFontPtr;
2300		char **aliases;
	2304	const char const aliases;
2301	2305	int i;
2302	2306
2303	2307	if (SeenName(faceName, nameTriedPtr) == 0) {

2401	2405	Tk_Uid hateFoundry;
2402	2406	const char charset, hateCharset;
2403	2407	unsigned bestScore[2];
2404		char nameList, nameListOrig, src[TCL_UTF_MAX];
	2408	char **nameList;
	2409	char **nameListOrig;
	2410	char src[TCL_UTF_MAX];
2405	2411	FontAttributes want, got;
2406	2412	Display *display;
2407	2413	SubFont subFont;

2906	2912	int numNamesPtr) / Filled with length of returned array, or 0
2907	2913	* if no names were found. */
2908	2914	{
2909		char nameList, aliases;
	2915	char **nameList;
	2916	const char const aliases;
2910	2917	int i;
2911	2918
2912	2919	nameList = ListFonts(display, faceName, numNamesPtr);

2955	2962	FontAttributes *faPtr)
2956	2963	{
2957	2964	int i, j;
2958		char aliases, symbolClass;
	2965	const char const aliases;
	2966	const char const symbolClass;
2959	2967
2960	2968	symbolClass = TkFontGetSymbolClass();
2961	2969	for (i = 0; symbolClass[i] != NULL; i++) {

3009	3017	return name;
3010	3018	}
3011	3019
	3020	static inline XImage *
	3021	GetImageOfText(
	3022	Display display, / Display on which to draw. */
	3023	Drawable drawable, /* Window or pixmap in which to draw. */
	3024	Tk_Font tkfont, /* Font in which characters will be drawn. */
	3025	const char source, / UTF-8 string to be displayed. Need not be
	3026	* '\0' terminated. All Tk meta-characters
	3027	* (tabs, control characters, and newlines)
	3028	* should be stripped out of the string that
	3029	* is passed to this function. If they are not
	3030	* stripped out, they will be displayed as
	3031	* regular printing characters. */
	3032	int numBytes, /* Number of bytes in string. */
	3033	int realWidthPtr, int realHeightPtr)
	3034	{
	3035	int width, height;
	3036	TkFont fontPtr = (TkFont ) tkfont;
	3037	Pixmap bitmap;
	3038	GC bitmapGC;
	3039	XGCValues values;
	3040	XImage *image;
	3041
	3042	(void) Tk_MeasureChars(tkfont, source, numBytes, -1, 0, &width);
	3043	height = fontPtr->fm.ascent + fontPtr->fm.descent;
	3044
	3045	bitmap = Tk_GetPixmap(display, drawable, width, height, 1);
	3046	values.graphics_exposures = False;
	3047	values.foreground = BlackPixel(display, DefaultScreen(display));
	3048	bitmapGC = XCreateGC(display, bitmap, GCGraphicsExposures\|GCForeground,
	3049	&values);
	3050	XFillRectangle(display, bitmap, bitmapGC, 0, 0, width, height);
	3051
	3052	values.font = Tk_FontId(tkfont);
	3053	values.foreground = WhitePixel(display, DefaultScreen(display));
	3054	values.background = BlackPixel(display, DefaultScreen(display));
	3055	XChangeGC(display, bitmapGC, GCFont\|GCForeground\|GCBackground, &values);
	3056	Tk_DrawChars(display, bitmap, bitmapGC, tkfont, source, numBytes, 0,
	3057	fontPtr->fm.ascent);
	3058	XFreeGC(display, bitmapGC);
	3059
	3060	image = XGetImage(display, bitmap, 0, 0, width, height, AllPlanes,
	3061	ZPixmap);
	3062	Tk_FreePixmap(display, bitmap);
	3063
	3064	*realWidthPtr = width;
	3065	*realHeightPtr = height;
	3066	return image;
	3067	}
	3068
	3069	static inline XImage *
	3070	InitDestImage(
	3071	Display *display,
	3072	Drawable drawable,
	3073	int width,
	3074	int height,
	3075	Pixmap *bitmapPtr)
	3076	{
	3077	Pixmap bitmap;
	3078	XImage *image;
	3079	GC bitmapGC;
	3080	XGCValues values;
	3081
	3082	bitmap = Tk_GetPixmap(display, drawable, width, height, 1);
	3083	values.graphics_exposures = False;
	3084	values.foreground = BlackPixel(display, DefaultScreen(display));
	3085	bitmapGC = XCreateGC(display, bitmap, GCGraphicsExposures\|GCForeground,
	3086	&values);
	3087	XFillRectangle(display, bitmap, bitmapGC, 0, 0, width, height);
	3088	XFreeGC(display, bitmapGC);
	3089
	3090	image = XGetImage(display, bitmap, 0, 0, width, height, AllPlanes,
	3091	ZPixmap);
	3092	*bitmapPtr = bitmap;
	3093	return image;
	3094	}
	3095
	3096	void
	3097	TkpDrawAngledChars(
	3098	Display display, / Display on which to draw. */
	3099	Drawable drawable, /* Window or pixmap in which to draw. */
	3100	GC gc, /* Graphics context for drawing characters. */
	3101	Tk_Font tkfont, /* Font in which characters will be drawn;
	3102	* must be the same as font used in GC. */
	3103	const char source, / UTF-8 string to be displayed. Need not be
	3104	* '\0' terminated. All Tk meta-characters
	3105	* (tabs, control characters, and newlines)
	3106	* should be stripped out of the string that
	3107	* is passed to this function. If they are not
	3108	* stripped out, they will be displayed as
	3109	* regular printing characters. */
	3110	int numBytes, /* Number of bytes in string. */
	3111	double x, double y,
	3112	double angle)
	3113	{
	3114	if (angle == 0.0) {
	3115	Tk_DrawChars(display, drawable, gc, tkfont, source, numBytes, x, y);
	3116	} else {
	3117	double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
	3118	int bufHeight, bufWidth, srcWidth, srcHeight, i, j, dx, dy;
	3119	Pixmap buf;
	3120	XImage *srcImage = GetImageOfText(display, drawable, tkfont, source,
	3121	numBytes, &srcWidth, &srcHeight);
	3122	XImage *dstImage;
	3123	enum {Q0=1,R1,Q1,R2,Q2,R3,Q3} quadrant;
	3124	GC bwgc, cpgc;
	3125	XGCValues values;
	3126	int ascent = ((TkFont *) tkfont)->fm.ascent;
	3127
	3128	/*
	3129	* First, work out what quadrant we are operating in. We also handle
	3130	* the rectilinear rotations as special cases. Conceptually, there's
	3131	* also R0 (angle == 0.0) but that has been already handled as a
	3132	* special case above.
	3133	*
	3134	* R1
	3135	* Q1 \| Q0
	3136	* \|
	3137	* R2 ----+---- R0
	3138	* \|
	3139	* Q2 \| Q3
	3140	* R3
	3141	*/
	3142
	3143	if (angle < 90.0) {
	3144	quadrant = Q0;
	3145	} else if (angle == 90.0) {
	3146	quadrant = R1;
	3147	} else if (angle < 180.0) {
	3148	quadrant = Q1;
	3149	} else if (angle == 180.0) {
	3150	quadrant = R2;
	3151	} else if (angle < 270.0) {
	3152	quadrant = Q2;
	3153	} else if (angle == 270.0) {
	3154	quadrant = R3;
	3155	} else {
	3156	quadrant = Q3;
	3157	}
	3158
	3159	if (srcImage == NULL) {
	3160	return;
	3161	}
	3162	bufWidth = srcWidthfabs(cosA) + srcHeightfabs(sinA);
	3163	bufHeight = srcHeightfabs(cosA) + srcWidthfabs(sinA);
	3164	dstImage = InitDestImage(display, drawable, bufWidth,bufHeight, &buf);
	3165	if (dstImage == NULL) {
	3166	Tk_FreePixmap(display, buf);
	3167	XDestroyImage(srcImage);
	3168	return;
	3169	}
	3170
	3171	/*
	3172	* Do the rotation, setting or resetting pixels in the destination
	3173	* image dependent on whether the corresponding pixel (after rotation
	3174	* to source image space) is set.
	3175	*/
	3176
	3177	for (i=0 ; i<srcWidth ; i++) {
	3178	for (j=0 ; j<srcHeight ; j++) {
	3179	switch (quadrant) {
	3180	case Q0:
	3181	dx = floor(icosA + jsinA + 0.5);
	3182	dy = floor(jcosA + (srcWidth - i)sinA + 0.5);
	3183	break;
	3184	case R1:
	3185	dx = j;
	3186	dy = srcWidth - i;
	3187	break;
	3188	case Q1:
	3189	dx = floor((i - srcWidth)cosA + jsinA + 0.5);
	3190	dy = floor((srcWidth-i)sinA + (j-srcHeight)cosA + 0.5);
	3191	break;
	3192	case R2:
	3193	dx = srcWidth - i;
	3194	dy = srcHeight - j;
	3195	break;
	3196	case Q2:
	3197	dx = floor((i-srcWidth)cosA + (j-srcHeight)sinA + 0.5);
	3198	dy = floor((j - srcHeight)cosA - isinA + 0.5);
	3199	break;
	3200	case R3:
	3201	dx = srcHeight - j;
	3202	dy = i;
	3203	break;
	3204	default:
	3205	dx = floor(icosA + (j - srcHeight)sinA + 0.5);
	3206	dy = floor(jcosA - isinA + 0.5);
	3207	}
	3208
	3209	if (dx < 0 \|\| dy < 0 \|\| dx >= bufWidth \|\| dy >= bufHeight) {
	3210	continue;
	3211	}
	3212	XPutPixel(dstImage, dx, dy,
	3213	XGetPixel(dstImage,dx,dy) \| XGetPixel(srcImage,i,j));
	3214	}
	3215	}
	3216	XDestroyImage(srcImage);
	3217
	3218	/*
	3219	* Schlep the data back to the Xserver.
	3220	*/
	3221
	3222	values.function = GXcopy;
	3223	values.foreground = WhitePixel(display, DefaultScreen(display));
	3224	values.background = BlackPixel(display, DefaultScreen(display));
	3225	bwgc = XCreateGC(display, buf, GCFunction\|GCForeground\|GCBackground,
	3226	&values);
	3227	XPutImage(display, buf, bwgc, dstImage, 0,0, 0,0, bufWidth,bufHeight);
	3228	XFreeGC(display, bwgc);
	3229	XDestroyImage(dstImage);
	3230
	3231	/*
	3232	* Calculate where we want to draw the text.
	3233	*/
	3234
	3235	switch (quadrant) {
	3236	case Q0:
	3237	dx = x;
	3238	dy = y - srcWidth*sinA;
	3239	break;
	3240	case R1:
	3241	dx = x;
	3242	dy = y - srcWidth;
	3243	break;
	3244	case Q1:
	3245	dx = x + srcWidth*cosA;
	3246	dy = y + srcHeightcosA - srcWidthsinA;
	3247	break;
	3248	case R2:
	3249	dx = x - srcWidth;
	3250	dy = y - srcHeight;
	3251	break;
	3252	case Q2:
	3253	dx = x + srcWidthcosA + srcHeightsinA;
	3254	dy = y + srcHeight*cosA;
	3255	break;
	3256	case R3:
	3257	dx = x - srcHeight;
	3258	dy = y;
	3259	break;
	3260	default:
	3261	dx = x + srcHeight*sinA;
	3262	dy = y;
	3263	}
	3264
	3265	/*
	3266	* Apply a correction to deal with the fact that we aren't told to
	3267	* draw from our top-left corner but rather from the left-end of our
	3268	* baseline.
	3269	*/
	3270
	3271	dx -= ascent*sinA;
	3272	dy -= ascent*cosA;
	3273
	3274	/*
	3275	* Transfer the text to the screen. This is done by using it as a mask
	3276	* and then drawing through that mask with the original drawing color.
	3277	*/
	3278
	3279	values.function = GXcopy;
	3280	values.fill_style = FillSolid;
	3281	values.clip_mask = buf;
	3282	values.clip_x_origin = dx;
	3283	values.clip_y_origin = dy;
	3284	cpgc = XCreateGC(display, drawable,
	3285	GCFunction\|GCFillStyle\|GCClipMask\|GCClipXOrigin\|GCClipYOrigin,
	3286	&values);
	3287	XCopyGC(display, gc, GCForeground, cpgc);
	3288	XFillRectangle(display, drawable, cpgc, dx, dy, bufWidth,
	3289	bufHeight);
	3290	XFreeGC(display, cpgc);
	3291
	3292	Tk_FreePixmap(display, buf);
	3293	return;
	3294	}
	3295	}
	3296
3012	3297	/*
3013	3298	* Local Variables:
3014	3299	* mode: c

+68

-86

unix/tkUnixKey.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkUnixKey.c,v 1.14 2008/06/11 00:41:43 jenglish Exp $
	11	* RCS: @(#) $Id: tkUnixKey.c,v 1.15 2008/11/26 15:56:37 dkf Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

23	23	* Tk_SetCaretPos --
24	24	*
25	25	* This enables correct placement of the XIM caret. This is called by
26		* widgets to indicate their cursor placement. This is currently only
	26	* widgets to indicate their cursor placement. This is currently only
27	27	* used for over-the-spot XIM.
28	28	*
29	29	*----------------------------------------------------------------------

39	39	TkWindow winPtr = (TkWindow ) tkwin;
40	40	TkDisplay *dispPtr = winPtr->dispPtr;
41	41
42		if ( dispPtr->caret.winPtr == winPtr
43		&& dispPtr->caret.x == x
44		&& dispPtr->caret.y == y
45		&& dispPtr->caret.height == height)
46		{
	42	if ((dispPtr->caret.winPtr == winPtr)
	43	&& (dispPtr->caret.x == x)
	44	&& (dispPtr->caret.y == y)
	45	&& (dispPtr->caret.height == height)) {
47	46	return;
48	47	}
49	48

52	51	dispPtr->caret.y = y;
53	52	dispPtr->caret.height = height;
54	53
	54	/*
	55	* Adjust the XIM caret position.
	56	*/
	57
55	58	#ifdef TK_USE_INPUT_METHODS
56		/*
57		* Adjust the XIM caret position.
58		*/
59		if ( (dispPtr->flags & TK_DISPLAY_USE_IM)
60		&& (dispPtr->inputStyle & XIMPreeditPosition)
61		&& (winPtr->inputContext != NULL) )
62		{
	59	if ((dispPtr->flags & TK_DISPLAY_USE_IM)
	60	&& (dispPtr->inputStyle & XIMPreeditPosition)
	61	&& (winPtr->inputContext != NULL)) {
63	62	XVaNestedList preedit_attr;
64	63	XPoint spot;
65	64
66	65	spot.x = dispPtr->caret.x;
67	66	spot.y = dispPtr->caret.y + dispPtr->caret.height;
68	67	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
69		XSetICValues(winPtr->inputContext,
70		XNPreeditAttributes, preedit_attr,
	68	XSetICValues(winPtr->inputContext, XNPreeditAttributes, preedit_attr,
71	69	NULL);
72	70	XFree(preedit_attr);
73	71	}

81	79	*
82	80	* Convert a keyboard event to a UTF-8 string using XLookupString.
83	81	*
84		* This is used as a fallback instead of Xutf8LookupString
85		* or XmbLookupString if input methods are turned off
86		* and for KeyRelease events.
	82	* This is used as a fallback instead of Xutf8LookupString or
	83	* XmbLookupString if input methods are turned off and for KeyRelease
	84	* events.
87	85	*
88	86	* Notes:
89		* XLookupString() normally returns a single ISO Latin 1
90		* or ASCII control character.
	87	* XLookupString() normally returns a single ISO Latin 1 or ASCII control
	88	* character.
91	89	*
92	90	*----------------------------------------------------------------------
93	91	*/

103	101	buf[len] = '\0';
104	102
105	103	if (len == 1) {
106		len = Tcl_UniCharToUtf((unsigned char)buf[0], Tcl_DStringValue(dsPtr));
	104	len = Tcl_UniCharToUtf((unsigned char) buf[0],
	105	Tcl_DStringValue(dsPtr));
107	106	Tcl_DStringSetLength(dsPtr, len);
108	107	} else {
109	108	/*
110	109	* len > 1 should only happen if someone has called XRebindKeysym().
111	110	* Assume UTF-8.
112	111	*/
	112
113	113	Tcl_DStringSetLength(dsPtr, len);
114	114	strncpy(Tcl_DStringValue(dsPtr), buf, len);
115	115	}

139	139	TkWindow winPtr, / Window where event occurred */
140	140	XEvent eventPtr, / X keyboard event. */
141	141	Tcl_DString dsPtr) / Initialized, empty string to hold result. */
	142	{
142	143	#ifdef TK_USE_INPUT_METHODS
143		#if X_HAVE_UTF8_STRING
144		{
145	144	if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM)
146	145	&& (winPtr->inputContext != NULL)
147		&& (eventPtr->type == KeyPress))
148		{
	146	&& (eventPtr->type == KeyPress)) {
149	147	int len;
150	148	Status status;
151	149
	150	#if X_HAVE_UTF8_STRING
152	151	Tcl_DStringSetLength(dsPtr, TCL_DSTRING_STATIC_SIZE-1);
153	152	len = Xutf8LookupString(winPtr->inputContext, &eventPtr->xkey,
154	153	Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr),
155	154	NULL, &status);
156	155
157		if (status == XBufferOverflow) { /* Expand buffer and try again */
	156	if (status == XBufferOverflow) {
	157	/*
	158	* Expand buffer and try again.
	159	*/
	160
158	161	Tcl_DStringSetLength(dsPtr, len);
159	162	len = Xutf8LookupString(winPtr->inputContext, &eventPtr->xkey,
160	163	Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr),

165	168	len = 0;
166	169	}
167	170	Tcl_DStringSetLength(dsPtr, len);
168
169		return Tcl_DStringValue(dsPtr);
170		} else {
171		return TkpGetChar(eventPtr, dsPtr);
172		}
173		}
174	171	#else /* !X_HAVE_UTF8_STRING */
175		{
176		int len;
177		Tcl_DString buf;
178		Status status;
179
180		/*
181		* Overallocate the dstring to the maximum stack amount.
182		*/
183
184		Tcl_DStringInit(&buf);
185		Tcl_DStringSetLength(&buf, TCL_DSTRING_STATIC_SIZE-1);
186
187		if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM)
188		&& (winPtr->inputContext != NULL)
189		&& (eventPtr->type == KeyPress)) {
190
	172	Tcl_DString buf; /* Holds string in system encoding. */
	173
	174	/*
	175	* Overallocate the dstring to the maximum stack amount.
	176	*/
	177
	178	Tcl_DStringInit(&buf);
	179	Tcl_DStringSetLength(&buf, TCL_DSTRING_STATIC_SIZE-1);
191	180	len = XmbLookupString(winPtr->inputContext, &eventPtr->xkey,
192	181	Tcl_DStringValue(&buf), Tcl_DStringLength(&buf), NULL,
193	182	&status);

204	193	if ((status != XLookupChars) && (status != XLookupBoth)) {
205	194	len = 0;
206	195	}
207		} else {
208		return TkpGetChar(eventPtr, dsPtr);
209		}
210
211		Tcl_DStringSetLength(&buf, len);
212		Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&buf), len, dsPtr);
213		Tcl_DStringFree(&buf);
214
215		return Tcl_DStringValue(dsPtr);
216		}
217
	196	Tcl_DStringSetLength(&buf, len);
	197	Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&buf), len, dsPtr);
	198	Tcl_DStringFree(&buf);
218	199	#endif /* X_HAVE_UTF8_STRING */
219		#else /* !TK_USE_INPUT_METHODS */
220		{
	200
	201	return Tcl_DStringValue(dsPtr);
	202	}
	203	#endif /* TK_USE_INPUT_METHODS */
221	204	return TkpGetChar(eventPtr, dsPtr);
222	205	}
223		#endif
224
225	206
226	207	/*
227	208	* When mapping from a keysym to a keycode, need information about the

235	216	KeySym keySym,
236	217	XEvent *eventPtr)
237	218	{
238		Display *display;
	219	Display *display = Tk_Display(tkwin);
239	220	int state;
240	221	KeyCode keycode;
241
242		display = Tk_Display(tkwin);
243	222
244	223	if (keySym == NoSymbol) {
245	224	keycode = 0;
246	225	} else {
247	226	keycode = XKeysymToKeycode(display, keySym);
248		}
249		if (keycode != 0) {
250		for (state = 0; state < 4; state++) {
251		if (XKeycodeToKeysym(display, keycode, state) == keySym) {
252		if (state & 1) {
253		eventPtr->xkey.state \|= ShiftMask;
	227	if (keycode != 0) {
	228	for (state = 0; state < 4; state++) {
	229	if (XKeycodeToKeysym(display, keycode, state) == keySym) {
	230	if (state & 1) {
	231	eventPtr->xkey.state \|= ShiftMask;
	232	}
	233	if (state & 2) {
	234	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
	235
	236	eventPtr->xkey.state \|= dispPtr->modeModMask;
	237	}
	238	break;
254	239	}
255		if (state & 2) {
256		TkDisplay *dispPtr;
257
258		dispPtr = ((TkWindow *) tkwin)->dispPtr;
259		eventPtr->xkey.state \|= dispPtr->modeModMask;
260		}
261		break;
262	240	}
263	241	}
264	242	}

411	389	dispPtr->metaModMask = 0;
412	390	dispPtr->altModMask = 0;
413	391	codePtr = modMapPtr->modifiermap;
414		max = 8*modMapPtr->max_keypermod;
	392	max = 8 * modMapPtr->max_keypermod;
415	393	for (i = 0; i < max; i++, codePtr++) {
416	394	if (*codePtr == 0) {
417	395	continue;

450	428
451	429	for (j = 0; j < dispPtr->numModKeyCodes; j++) {
452	430	if (dispPtr->modKeyCodes[j] == *codePtr) {
	431	/*
	432	* 'continue' the outer loop.
	433	*/
	434
453	435	goto nextModCode;
454	436	}
455	437	}
456	438	if (dispPtr->numModKeyCodes >= arraySize) {
457		KeyCode *new;
	439	KeyCode *newCodes;
458	440
459	441	/*
460	442	* Ran out of space in the array; grow it.
461	443	*/
462	444
463	445	arraySize *= 2;
464		new = (KeyCode *)
	446	newCodes = (KeyCode *)
465	447	ckalloc((unsigned) (arraySize * sizeof(KeyCode)));
466		memcpy(new, dispPtr->modKeyCodes,
467		(dispPtr->numModKeyCodes * sizeof(KeyCode)));
	448	memcpy(newCodes, dispPtr->modKeyCodes,
	449	dispPtr->numModKeyCodes * sizeof(KeyCode));
468	450	ckfree((char *) dispPtr->modKeyCodes);
469		dispPtr->modKeyCodes = new;
	451	dispPtr->modKeyCodes = newCodes;
470	452	}
471	453	dispPtr->modKeyCodes[dispPtr->numModKeyCodes] = *codePtr;
472	454	dispPtr->numModKeyCodes++;

+40

-41

unix/tkUnixMenu.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkUnixMenu.c,v 1.20 2008/04/27 22:39:13 dkf Exp $
	10	* RCS: @(#) $Id: tkUnixMenu.c,v 1.22 2008/12/09 23:02:17 dkf Exp $
11	11	*/
12	12
13	13	#include "default.h"

329	329	int widthPtr, / The resulting width */
330	330	int heightPtr) / The resulting height */
331	331	{
	332	int borderWidth;
	333
332	334	if ((mePtr->type == CHECK_BUTTON_ENTRY)
333	335	\|\| (mePtr->type == RADIO_BUTTON_ENTRY)) {
334	336	if (!mePtr->hideMargin && mePtr->indicatorOn) {

353	355	}
354	356	}
355	357	} else {
356		int borderWidth;
357
358		Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
359		menuPtr->borderWidthPtr, &borderWidth);
	358	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr,
	359	&borderWidth);
360	360	*heightPtr = 0;
361	361	*widthPtr = borderWidth;
362	362	}
363	363	} else {
364		int borderWidth;
365
366	364	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr,
367	365	&borderWidth);
368		*heightPtr = 0;
369		*widthPtr = borderWidth;
370		}
371		}
372
	366	*heightPtr = 0;
	367	*widthPtr = borderWidth;
	368	}
	369	}
373	370
374	371	/*
375	372	*----------------------------------------------------------------------

399	396	*heightPtr = fmPtr->linespace;
400	397	if (mePtr->type == CASCADE_ENTRY) {
401	398	widthPtr = 2 CASCADE_ARROW_WIDTH;
402		} else if ((menuPtr->menuType != MENUBAR)
403		&& (mePtr->accelPtr != NULL)) {
404		char *accel = Tcl_GetStringFromObj(mePtr->accelPtr, NULL);
	399	} else if ((menuPtr->menuType != MENUBAR) && (mePtr->accelPtr != NULL)) {
	400	char *accel = Tcl_GetString(mePtr->accelPtr);
405	401
406	402	*widthPtr = Tk_TextWidth(tkfont, accel, mePtr->accelLength);
407	403	} else {

509	505	&activeBorderWidth);
510	506	if ((mePtr->type == CASCADE_ENTRY) && drawArrow) {
511	507	points[0].x = x + width - borderWidth - activeBorderWidth
512		- CASCADE_ARROW_WIDTH;
	508	- CASCADE_ARROW_WIDTH;
513	509	points[0].y = y + (height - CASCADE_ARROW_HEIGHT)/2;
514	510	points[1].x = points[0].x;
515	511	points[1].y = points[0].y + CASCADE_ARROW_HEIGHT;

520	516	(menuPtr->postedCascade == mePtr)
521	517	? TK_RELIEF_SUNKEN : TK_RELIEF_RAISED);
522	518	} else if (mePtr->accelPtr != NULL) {
523		char *accel = Tcl_GetStringFromObj(mePtr->accelPtr, NULL);
	519	char *accel = Tcl_GetString(mePtr->accelPtr);
524	520	int left = x + mePtr->labelWidth + activeBorderWidth
525		+ mePtr->indicatorSpace;
	521	+ mePtr->indicatorSpace;
526	522
527	523	if (menuPtr->menuType == MENUBAR) {
528	524	left += 5;

702	698	haveImage = 1;
703	699	} else if (mePtr->bitmapPtr != NULL) {
704	700	Pixmap bitmap = Tk_GetBitmapFromObj(menuPtr->tkwin, mePtr->bitmapPtr);
	701
705	702	Tk_SizeOfBitmap(menuPtr->display, bitmap, &imageWidth, &imageHeight);
706	703	haveImage = 1;
707	704	}
708	705	if (!haveImage \|\| (mePtr->compound != COMPOUND_NONE)) {
709	706	if (mePtr->labelLength > 0) {
710		char *label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
	707	char *label = Tcl_GetString(mePtr->labelPtr);
	708
711	709	textWidth = Tk_TextWidth(tkfont, label, mePtr->labelLength);
712	710	textHeight = fmPtr->linespace;
713	711	haveText = 1;

720	718
721	719	if (haveImage && haveText) {
722	720	int fullWidth = (imageWidth > textWidth ? imageWidth : textWidth);
	721
723	722	switch ((enum compound) mePtr->compound) {
724	723	case COMPOUND_TOP:
725	724	textXOffset = (fullWidth - textWidth)/2;

802	801	int baseline = y + (height + fmPtr->ascent - fmPtr->descent) / 2;
803	802
804	803	if (mePtr->labelLength > 0) {
805		char *label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
	804	char *label = Tcl_GetString(mePtr->labelPtr);
806	805
807	806	Tk_DrawChars(menuPtr->display, d, gc, tkfont, label,
808	807	mePtr->labelLength, leftEdge + textXOffset,

866	865	int activeBorderWidth, leftEdge;
867	866	const char label, start, *end;
868	867
869		label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
	868	label = Tcl_GetString(mePtr->labelPtr);
870	869	start = Tcl_UtfAtIndex(label, mePtr->underline);
871	870	end = Tcl_UtfNext(start);
872	871

1075	1074	if (mePtr->entryFlags & ENTRY_HELP_MENU) {
1076	1075	helpMenuIndex = i;
1077	1076	} else if (x + mePtr->width + borderWidth > maxWindowWidth) {
1078
1079	1077	if (i == lastRowBreak) {
1080	1078	mePtr->y = y;
1081	1079	mePtr->x = x;

1086	1084	x = borderWidth;
1087	1085	for (j = lastRowBreak; j < i; j++) {
1088	1086	menuPtr->entries[j]->y = y + currentRowHeight
1089		- menuPtr->entries[j]->height;
	1087	- menuPtr->entries[j]->height;
1090	1088	menuPtr->entries[j]->x = x;
1091	1089	x += menuPtr->entries[j]->width;
1092	1090	}

1260	1258
1261	1259	static void
1262	1260	SetHelpMenu(
1263		TkMenu menuPtr) / The menu we are checking */
	1261	TkMenu menuPtr) / The menu we are checking */
1264	1262	{
1265	1263	TkMenuEntry *cascadeEntryPtr;
1266	1264

1306	1304
1307	1305	void
1308	1306	TkpDrawMenuEntry(
1309		TkMenuEntry mePtr, / The entry to draw */
1310		Drawable d, /* What to draw into */
1311		Tk_Font tkfont, /* Precalculated font for menu */
	1307	TkMenuEntry mePtr, / The entry to draw */
	1308	Drawable d, /* What to draw into */
	1309	Tk_Font tkfont, /* Precalculated font for menu */
1312	1310	const Tk_FontMetrics *menuMetricsPtr,
1313		/* Precalculated metrics for menu */
1314		int x, /* X-coordinate of topleft of entry */
1315		int y, /* Y-coordinate of topleft of entry */
1316		int width, /* Width of the entry rectangle */
1317		int height, /* Height of the current rectangle */
1318		int strictMotif, /* Boolean flag */
1319		int drawArrow) /* Whether or not to draw the cascade
1320		* arrow for cascade items. Only applies
1321		* to Windows. */
	1311	/* Precalculated metrics for menu */
	1312	int x, /* X-coordinate of topleft of entry */
	1313	int y, /* Y-coordinate of topleft of entry */
	1314	int width, /* Width of the entry rectangle */
	1315	int height, /* Height of the current rectangle */
	1316	int strictMotif, /* Boolean flag */
	1317	int drawArrow) /* Whether or not to draw the cascade arrow
	1318	* for cascade items. Only applies to
	1319	* Windows. */
1322	1320	{
1323	1321	GC gc, indicatorGC;
1324	1322	XColor indicatorColor, disableColor = NULL;

1472	1470	haveImage = 1;
1473	1471	} else if (mePtr->bitmapPtr != NULL) {
1474	1472	Pixmap bitmap = Tk_GetBitmapFromObj(menuPtr->tkwin, mePtr->bitmapPtr);
	1473
1475	1474	Tk_SizeOfBitmap(menuPtr->display, bitmap, widthPtr, heightPtr);
1476	1475	haveImage = 1;
1477	1476	} else {

1490	1489
1491	1490	if (mePtr->labelPtr != NULL) {
1492	1491	int textWidth;
1493		char *label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
	1492	char *label = Tcl_GetString(mePtr->labelPtr);
	1493
1494	1494	textWidth = Tk_TextWidth(tkfont, label, mePtr->labelLength);
1495
1496	1495	if ((mePtr->compound != COMPOUND_NONE) && haveImage) {
1497	1496	switch ((enum compound) mePtr->compound) {
1498	1497	case COMPOUND_TOP:

1675	1674	accelWidth = width;
1676	1675	}
1677	1676
1678		GetMenuIndicatorGeometry(menuPtr, mePtr, tkfont,
1679		fmPtr, &width, &height);
	1677	GetMenuIndicatorGeometry(menuPtr, mePtr, tkfont, fmPtr,
	1678	&width, &height);
1680	1679	if (height > mePtr->height) {
1681	1680	mePtr->height = height;
1682	1681	}

1689	1688
1690	1689	mePtr->height += 2 * activeBorderWidth + MENU_DIVIDER_HEIGHT;
1691	1690	}
1692		mePtr->y = y;
	1691	mePtr->y = y;
1693	1692	y += mePtr->height;
1694	1693	if (y > windowHeight) {
1695	1694	windowHeight = y;

+1

-16

unix/tkUnixPort.h less more

10	10	* See the file "license.terms" for information on usage and redistribution
11	11	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkUnixPort.h,v 1.15 2008/08/28 18:13:36 dgp Exp $
	13	* RCS: @(#) $Id: tkUnixPort.h,v 1.16 2008/12/17 22:51:25 nijtmans Exp $
14	14	*/
15	15
16	16	#ifndef _UNIXPORT
17	17	#define _UNIXPORT
18	18
19	19	#define __UNIX__ 1
20
21		/*
22		* Macro to use instead of "void" for arguments that must have
23		* type "void " in ANSI C; maps them to type "char " in
24		* non-ANSI systems. This macro may be used in some of the include
25		* files below, which is why it is defined here.
26		*/
27
28		#ifndef VOID
29		# ifdef __STDC__
30		# define VOID void
31		# else
32		# define VOID char
33		# endif
34		#endif
35	20
36	21	#include <stdio.h>
37	22	#include <ctype.h>

+267

-41

unix/tkUnixRFont.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkUnixRFont.c,v 1.25 2008/04/27 22:39:13 dkf Exp $
	10	* RCS: @(#) $Id: tkUnixRFont.c,v 1.27 2008/11/22 18:08:51 dkf Exp $
11	11	*/
12	12
13	13	#include "tkUnixInt.h"

17	17
18	18	typedef struct {
19	19	XftFont *ftFont;
	20	XftFont *ft0Font;
20	21	FcPattern *source;
21	22	FcCharSet *charset;
	23	double angle;
22	24	} UnixFtFace;
23	25
24	26	typedef struct {

61	63	static XftFont *
62	64	GetFont(
63	65	UnixFtFont *fontPtr,
64		FcChar32 ucs4)
	66	FcChar32 ucs4,
	67	double angle)
65	68	{
66	69	int i;
67	70
68	71	if (ucs4) {
69	72	for (i = 0; i < fontPtr->nfaces; i++) {
70	73	FcCharSet *charset = fontPtr->faces[i].charset;
	74
71	75	if (charset && FcCharSetHasChar(charset, ucs4)) {
72	76	break;
73	77	}

78	82	} else {
79	83	i = 0;
80	84	}
81		if (!fontPtr->faces[i].ftFont) {
82		FcPattern *pat = FcFontRenderPrepare(0,
83		fontPtr->pattern, fontPtr->faces[i].source);
84		XftFont *ftFont = XftFontOpenPattern(fontPtr->display, pat);
85
	85	if ((angle == 0.0 && !fontPtr->faces[i].ft0Font) \|\| (angle != 0.0 &&
	86	(!fontPtr->faces[i].ftFont \|\| fontPtr->faces[i].angle != angle))){
	87	FcPattern *pat = FcFontRenderPrepare(0, fontPtr->pattern,
	88	fontPtr->faces[i].source);
	89	double s = sin(anglePI/180.0), c = cos(anglePI/180.0);
	90	FcMatrix mat = {c, -s, s, c};
	91	XftFont *ftFont;
	92
	93	if (angle != 0.0) {
	94	FcPatternAddMatrix(pat, FC_MATRIX, &mat);
	95	}
	96	ftFont = XftFontOpenPattern(fontPtr->display, pat);
86	97	if (!ftFont) {
87	98	/*
88		* The previous call to XftFontOpenPattern() should not fail,
89		* but sometimes does anyway. Usual cause appears to be
90		* a misconfigured fontconfig installation; see [Bug 1090382].
91		* Try a fallback:
	99	* The previous call to XftFontOpenPattern() should not fail, but
	100	* sometimes does anyway. Usual cause appears to be a
	101	* misconfigured fontconfig installation; see [Bug 1090382]. Try a
	102	* fallback:
92	103	*/
	104
93	105	ftFont = XftFontOpen(fontPtr->display, fontPtr->screen,
94		FC_FAMILY, FcTypeString, "sans",
95		FC_SIZE, FcTypeDouble, 12.0,
96		NULL);
	106	FC_FAMILY, FcTypeString, "sans",
	107	FC_SIZE, FcTypeDouble, 12.0,
	108	FC_MATRIX, FcTypeMatrix, &mat,
	109	NULL);
97	110	}
98	111	if (!ftFont) {
99	112	/*
100		* The previous call should definitely not fail.
101		* Impossible to proceed at this point.
	113	* The previous call should definitely not fail. Impossible to
	114	* proceed at this point.
102	115	*/
	116
103	117	Tcl_Panic("Cannot find a usable font.");
104	118	}
105	119
106		fontPtr->faces[i].ftFont = ftFont;
107		}
108		return fontPtr->faces[i].ftFont;
	120	if (angle == 0.0) {
	121	fontPtr->faces[i].ft0Font = ftFont;
	122	} else {
	123	if (fontPtr->faces[i].ftFont) {
	124	XftFontClose(fontPtr->display, fontPtr->faces[i].ftFont);
	125	}
	126	fontPtr->faces[i].ftFont = ftFont;
	127	fontPtr->faces[i].angle = angle;
	128	}
	129	}
	130	return (angle==0.0? fontPtr->faces[i].ft0Font : fontPtr->faces[i].ftFont);
109	131	}
110	132
111	133	/*

120	142	XftFont *ftFont,
121	143	TkFontAttributes *faPtr)
122	144	{
123		char family = "Unknown", *familyPtr = &family;
	145	const char *family = "Unknown";
	146	const char const familyPtr = &family;
124	147	int weight, slant, size, pxsize;
125	148	double ptsize;
126	149
127		(void)XftPatternGetString(ftFont->pattern, XFT_FAMILY, 0, familyPtr);
	150	(void) XftPatternGetString(ftFont->pattern, XFT_FAMILY, 0, familyPtr);
128	151	if (XftPatternGetDouble(ftFont->pattern, XFT_SIZE, 0,
129	152	&ptsize) == XftResultMatch) {
130		size = (int)ptsize;
	153	size = (int) ptsize;
131	154	} else if (XftPatternGetInteger(ftFont->pattern, XFT_PIXEL_SIZE, 0,
132	155	&pxsize) == XftResultMatch) {
133	156	size = -pxsize;

163	186	* Fill in TkFontMetrics from an XftFont.
164	187	*/
165	188
166		static void GetTkFontMetrics(
	189	static void
	190	GetTkFontMetrics(
167	191	XftFont *ftFont,
168	192	TkFontMetrics *fmPtr)
169	193	{

220	244	set = FcFontSort(0, pattern, FcTrue, NULL, &result);
221	245	if (!set) {
222	246	FcPatternDestroy(pattern);
223		ckfree((char *)fontPtr);
	247	ckfree((char *) fontPtr);
224	248	return NULL;
225	249	}
226	250

235	259
236	260	for (i = 0; i < set->nfont; i++) {
237	261	fontPtr->faces[i].ftFont = 0;
	262	fontPtr->faces[i].ft0Font = 0;
238	263	fontPtr->faces[i].source = set->fonts[i];
239	264	if (FcPatternGetCharSet(set->fonts[i], FC_CHARSET, 0,
240	265	&charset) == FcResultMatch) {

242	267	} else {
243	268	fontPtr->faces[i].charset = 0;
244	269	}
	270	fontPtr->faces[i].angle = 0.0;
245	271	}
246	272
247	273	fontPtr->display = Tk_Display(tkwin);

256	282	/*
257	283	* Fill in platform-specific fields of TkFont.
258	284	*/
259		ftFont = GetFont(fontPtr, 0);
	285
	286	ftFont = GetFont(fontPtr, 0, 0.0);
260	287	fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
261	288	GetTkFontAttributes(ftFont, &fontPtr->font.fa);
262	289	GetTkFontMetrics(ftFont, &fontPtr->font.fm);

270	297	{
271	298	Display *display = fontPtr->display;
272	299	int i;
273		Tk_ErrorHandler handler = Tk_CreateErrorHandler(display, -1, -1, -1, NULL,
274		(ClientData) NULL);
	300	Tk_ErrorHandler handler =
	301	Tk_CreateErrorHandler(display, -1, -1, -1, NULL, NULL);
275	302
276	303	for (i = 0; i < fontPtr->nfaces; i++) {
277	304	if (fontPtr->faces[i].ftFont) {
278	305	XftFontClose(fontPtr->display, fontPtr->faces[i].ftFont);
279	306	}
	307	if (fontPtr->faces[i].ft0Font) {
	308	XftFontClose(fontPtr->display, fontPtr->faces[i].ft0Font);
	309	}
280	310	if (fontPtr->faces[i].charset) {
281	311	FcCharSetDestroy(fontPtr->faces[i].charset);
282	312	}
283	313	}
284	314	if (fontPtr->faces) {
285		ckfree((char *)fontPtr->faces);
	315	ckfree((char *) fontPtr->faces);
286	316	}
287	317	if (fontPtr->pattern) {
288	318	FcPatternDestroy(fontPtr->pattern);

430	460	resultPtr = Tcl_NewListObj(0, NULL);
431	461
432	462	list = XftListFonts(Tk_Display(tkwin), Tk_ScreenNumber(tkwin),
433		(char)0, / pattern elements */
434		XFT_FAMILY, (char)0); / fields */
	463	(char ) 0, / pattern elements */
	464	XFT_FAMILY, (char) 0); / fields */
435	465	for (i = 0; i < list->nfont; i++) {
436	466	char family, *familyPtr = &family;
	467
437	468	if (XftPatternGetString(list->fonts[i], XFT_FAMILY, 0, familyPtr)
438		== XftResultMatch)
439		{
	469	== XftResultMatch) {
440	470	Tcl_Obj *strPtr = Tcl_NewStringObj(family, -1);
	471
441	472	Tcl_ListObjAppendElement(NULL, resultPtr, strPtr);
442	473	}
443	474	}

467	498	Tcl_Obj objv[3], listPtr, *resultPtr;
468	499	UnixFtFont fontPtr = (UnixFtFont ) tkfont;
469	500	FcPattern *pattern;
470		char family = "Unknown", *familyPtr = &family;
471		char foundry = "Unknown", *foundryPtr = &foundry;
472		char encoding = "Unknown", *encodingPtr = &encoding;
	501	const char *family = "Unknown";
	502	const char const familyPtr = &family;
	503	const char *foundry = "Unknown";
	504	const char const foundryPtr = &foundry;
	505	const char *encoding = "Unknown";
	506	const char const encodingPtr = &encoding;
473	507	int i;
474	508
475	509	resultPtr = Tcl_NewListObj(0, NULL);

512	546	/* Structure describing the logical font */
513	547	FcChar32 ucs4 = (FcChar32) c;
514	548	/* UCS-4 character to map */
515		XftFont *ftFont = GetFont(fontPtr, ucs4);
	549	XftFont *ftFont = GetFont(fontPtr, ucs4, 0.0);
516	550	/* Actual font used to render the character */
517	551
518	552	GetTkFontAttributes(ftFont, faPtr);

561	595	Tcl_UniChar unichar;
562	596
563	597	clen = Tcl_UtfToUniChar(source, &unichar);
564		c = (FcChar32)unichar;
	598	c = (FcChar32) unichar;
565	599
566	600	if (clen <= 0) {
567	601	/*

587	621	#if DEBUG_FONTSEL
588	622	string[len++] = (char) c;
589	623	#endif /* DEBUG_FONTSEL */
590		ftFont = GetFont(fontPtr, c);
	624	ftFont = GetFont(fontPtr, c, 0.0);
591	625
592	626	XftTextExtents32(fontPtr->display, ftFont, &c, 1, &extents);
593	627

669	703	DefaultVisual(display, fontPtr->screen),
670	704	DefaultColormap(display, fontPtr->screen));
671	705	} else {
672		Tk_ErrorHandler handler = Tk_CreateErrorHandler(display, -1, -1, -1,
673		NULL, (ClientData) NULL);
	706	Tk_ErrorHandler handler =
	707	Tk_CreateErrorHandler(display, -1, -1, -1, NULL, NULL);
674	708
675	709	XftDrawChange(fontPtr->ftDraw, drawable);
676	710	Tk_DeleteErrorHandler(handler);

702	736	source += clen;
703	737	numBytes -= clen;
704	738
705		ftFont = GetFont(fontPtr, c);
	739	ftFont = GetFont(fontPtr, c, 0.0);
706	740	if (ftFont) {
707	741	specs[nspec].font = ftFont;
708	742	specs[nspec].glyph = XftCharIndex(fontPtr->display, ftFont, c);

724	758	XftDrawGlyphFontSpec(fontPtr->ftDraw, &fontPtr->color, specs, nspec);
725	759	}
726	760	}
	761
	762	void
	763	TkpDrawAngledChars(
	764	Display display, / Display on which to draw. */
	765	Drawable drawable, /* Window or pixmap in which to draw. */
	766	GC gc, /* Graphics context for drawing characters. */
	767	Tk_Font tkfont, /* Font in which characters will be drawn;
	768	* must be the same as font used in GC. */
	769	const char source, / UTF-8 string to be displayed. Need not be
	770	* '\0' terminated. All Tk meta-characters
	771	* (tabs, control characters, and newlines)
	772	* should be stripped out of the string that
	773	* is passed to this function. If they are not
	774	* stripped out, they will be displayed as
	775	* regular printing characters. */
	776	int numBytes, /* Number of bytes in string. */
	777	double x, double y, /* Coordinates at which to place origin of
	778	* string when drawing. */
	779	double angle) /* What angle to put text at, in degrees. */
	780	{
	781	const int maxCoord = 0x7FFF;/* Xft coordinates are 16 bit values */
	782	const int minCoord = -1000; /* Should be good enough... */
	783	UnixFtFont fontPtr = (UnixFtFont ) tkfont;
	784	XGCValues values;
	785	XColor xcolor;
	786	#ifdef XFT_HAS_FIXED_ROTATED_PLACEMENT
	787	int clen, nglyph;
	788	FT_UInt glyphs[NUM_SPEC];
	789	XGlyphInfo metrics;
	790	XftFont *currentFtFont;
	791	int originX, originY;
	792
	793	if (fontPtr->ftDraw == 0) {
	794	#if DEBUG_FONTSEL
	795	printf("Switch to drawable 0x%x\n", drawable);
	796	#endif /* DEBUG_FONTSEL */
	797	fontPtr->ftDraw = XftDrawCreate(display, drawable,
	798	DefaultVisual(display, fontPtr->screen),
	799	DefaultColormap(display, fontPtr->screen));
	800	} else {
	801	Tk_ErrorHandler handler =
	802	Tk_CreateErrorHandler(display, -1, -1, -1, NULL, NULL);
	803
	804	XftDrawChange(fontPtr->ftDraw, drawable);
	805	Tk_DeleteErrorHandler(handler);
	806	}
	807
	808	XGetGCValues(display, gc, GCForeground, &values);
	809	if (values.foreground != fontPtr->color.pixel) {
	810	xcolor.pixel = values.foreground;
	811	XQueryColor(display, DefaultColormap(display, fontPtr->screen),
	812	&xcolor);
	813	fontPtr->color.color.red = xcolor.red;
	814	fontPtr->color.color.green = xcolor.green;
	815	fontPtr->color.color.blue = xcolor.blue;
	816	fontPtr->color.color.alpha = 0xffff;
	817	fontPtr->color.pixel = values.foreground;
	818	}
	819
	820	nglyph = 0;
	821	currentFtFont = NULL;
	822	originX = originY = 0; /* lint */
	823
	824	while (numBytes > 0 && x <= maxCoord && x >= minCoord && y <= maxCoord
	825	&& y >= minCoord) {
	826	XftFont *ftFont;
	827	FcChar32 c;
	828
	829	clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
	830	if (clen <= 0) {
	831	/*
	832	* This should not happen, but it can.
	833	*/
	834
	835	return;
	836	}
	837	source += clen;
	838	numBytes -= clen;
	839
	840	ftFont = GetFont(fontPtr, c, angle);
	841	if (!ftFont) {
	842	continue;
	843	}
	844
	845	if (ftFont != currentFtFont \|\| nglyph == NUM_SPEC) {
	846	if (nglyph) {
	847	/*
	848	* We pass multiple glyphs at once to enable the code to
	849	* perform better rendering of sub-pixel inter-glyph spacing.
	850	* If only the current Xft implementation could make use of
	851	* this information... but we'll be ready when it does!
	852	*/
	853
	854	XftDrawGlyphs(fontPtr->ftDraw, &fontPtr->color, currentFtFont,
	855	originX, originY, glyphs, nglyph);
	856	}
	857	originX = (int) floor(x + 0.5);
	858	originY = (int) floor(y + 0.5);
	859	if (nglyph) {
	860	XftGlyphExtents(fontPtr->display, currentFtFont, glyphs,
	861	nglyph, &metrics);
	862	nglyph = 0;
	863	x += metrics.xOff;
	864	y += metrics.yOff;
	865	}
	866	currentFtFont = ftFont;
	867	}
	868	glyphs[nglyph++] = XftCharIndex(fontPtr->display, ftFont, c);
	869	}
	870	if (nglyph) {
	871	XftDrawGlyphs(fontPtr->ftDraw, &fontPtr->color, currentFtFont,
	872	originX, originY, glyphs, nglyph);
	873	}
	874	#else /* !XFT_HAS_FIXED_ROTATED_PLACEMENT */
	875	int clen, nspec;
	876	XftGlyphFontSpec specs[NUM_SPEC];
	877	XGlyphInfo metrics;
	878	double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
	879
	880	if (fontPtr->ftDraw == 0) {
	881	#if DEBUG_FONTSEL
	882	printf("Switch to drawable 0x%x\n", drawable);
	883	#endif /* DEBUG_FONTSEL */
	884	fontPtr->ftDraw = XftDrawCreate(display, drawable,
	885	DefaultVisual(display, fontPtr->screen),
	886	DefaultColormap(display, fontPtr->screen));
	887	} else {
	888	Tk_ErrorHandler handler =
	889	Tk_CreateErrorHandler(display, -1, -1, -1, NULL, NULL);
	890
	891	XftDrawChange(fontPtr->ftDraw, drawable);
	892	Tk_DeleteErrorHandler(handler);
	893	}
	894	XGetGCValues(display, gc, GCForeground, &values);
	895	if (values.foreground != fontPtr->color.pixel) {
	896	xcolor.pixel = values.foreground;
	897	XQueryColor(display, DefaultColormap(display, fontPtr->screen),
	898	&xcolor);
	899	fontPtr->color.color.red = xcolor.red;
	900	fontPtr->color.color.green = xcolor.green;
	901	fontPtr->color.color.blue = xcolor.blue;
	902	fontPtr->color.color.alpha = 0xffff;
	903	fontPtr->color.pixel = values.foreground;
	904	}
	905	nspec = 0;
	906	while (numBytes > 0 && x <= maxCoord && x >= minCoord
	907	&& y <= maxCoord && y >= minCoord) {
	908	XftFont ftFont, ft0Font;
	909	FcChar32 c;
	910
	911	clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
	912	if (clen <= 0) {
	913	/*
	914	* This should not happen, but it can.
	915	*/
	916
	917	return;
	918	}
	919	source += clen;
	920	numBytes -= clen;
	921
	922	ftFont = GetFont(fontPtr, c, angle);
	923	ft0Font = GetFont(fontPtr, c, 0.0);
	924	if (ftFont && ft0Font) {
	925	specs[nspec].font = ftFont;
	926	specs[nspec].glyph = XftCharIndex(fontPtr->display, ftFont, c);
	927	specs[nspec].x = (int) floor(x + 0.5);
	928	specs[nspec].y = (int) floor(y + 0.5);
	929	XftGlyphExtents(fontPtr->display, ft0Font, &specs[nspec].glyph, 1,
	930	&metrics);
	931	x += metrics.xOffcosA + metrics.yOffsinA;
	932	y += metrics.yOffcosA - metrics.xOffsinA;
	933	nspec++;
	934	if (nspec == NUM_SPEC) {
	935	XftDrawGlyphFontSpec(fontPtr->ftDraw, &fontPtr->color,
	936	specs, nspec);
	937	nspec = 0;
	938	}
	939	}
	940	}
	941	if (nspec) {
	942	XftDrawGlyphFontSpec(fontPtr->ftDraw, &fontPtr->color, specs, nspec);
	943	}
	944	#endif /* XFT_HAS_FIXED_ROTATED_PLACEMENT */
	945	}
	946
	947	/*
	948	* Local Variables:
	949	* c-basic-offset: 4
	950	* fill-column: 78
	951	* End:
	952	*/

+2

-2

unix/tkUnixScale.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkUnixScale.c,v 1.13 2007/12/13 15:28:51 dgp Exp $
	11	* RCS: @(#) $Id: tkUnixScale.c,v 1.14 2008/12/09 21:22:56 dgp Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

556	556	(char *) NULL);
557	557	if (result != TCL_OK) {
558	558	Tcl_AddErrorInfo(interp, "\n (command executed by scale)");
559		Tcl_BackgroundError(interp);
	559	Tcl_BackgroundException(interp, result);
560	560	}
561	561	Tcl_Release((ClientData) interp);
562	562	}

+10

-8

unix/tkUnixScrlbr.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkUnixScrlbr.c,v 1.6 2007/12/13 15:28:51 dgp Exp $
	11	* RCS: @(#) $Id: tkUnixScrlbr.c,v 1.7 2008/12/09 23:21:48 dkf Exp $
12	12	*/
13	13
14	14	#include "tkInt.h"

61	61	TkpCreateScrollbar(
62	62	Tk_Window tkwin)
63	63	{
64		UnixScrollbar scrollPtr = (UnixScrollbar )ckalloc(sizeof(UnixScrollbar));
	64	UnixScrollbar scrollPtr = (UnixScrollbar )
	65	ckalloc(sizeof(UnixScrollbar));
	66
65	67	scrollPtr->troughGC = None;
66	68	scrollPtr->copyGC = None;
67	69

405	407	unixScrollPtr->troughGC = new;
406	408	if (unixScrollPtr->copyGC == None) {
407	409	gcValues.graphics_exposures = False;
408		unixScrollPtr->copyGC = Tk_GetGC(scrollPtr->tkwin, GCGraphicsExposures,
409		&gcValues);
	410	unixScrollPtr->copyGC = Tk_GetGC(scrollPtr->tkwin,
	411	GCGraphicsExposures, &gcValues);
410	412	}
411	413	}
412	414

435	437	int x, int y) /* Coordinates within scrollPtr's window. */
436	438	{
437	439	int length, width, tmp;
	440	register const int inset = scrollPtr->inset;
438	441
439	442	if (scrollPtr->vertical) {
440	443	length = Tk_Height(scrollPtr->tkwin);

447	450	width = Tk_Height(scrollPtr->tkwin);
448	451	}
449	452
450		if ((x < scrollPtr->inset) \|\| (x >= (width - scrollPtr->inset))
451		\|\| (y < scrollPtr->inset) \|\| (y >= (length - scrollPtr->inset))) {
	453	if (x<inset \|\| x>=width-inset \|\| y<inset \|\| y>=length-inset) {
452	454	return OUTSIDE;
453	455	}
454	456

457	459	* TkpDisplayScrollbar. Be sure to keep the two consistent.
458	460	*/
459	461
460		if (y < (scrollPtr->inset + scrollPtr->arrowLength)) {
	462	if (y < inset + scrollPtr->arrowLength) {
461	463	return TOP_ARROW;
462	464	}
463	465	if (y < scrollPtr->sliderFirst) {

466	468	if (y < scrollPtr->sliderLast) {
467	469	return SLIDER;
468	470	}
469		if (y >= (length - (scrollPtr->arrowLength + scrollPtr->inset))) {
	471	if (y >= length - (scrollPtr->arrowLength + inset)) {
470	472	return BOTTOM_ARROW;
471	473	}
472	474	return BOTTOM_GAP;

+17

-17

unix/tkUnixSelect.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkUnixSelect.c,v 1.21 2007/05/03 22:16:00 dkf Exp $
	10	* RCS: @(#) $Id: tkUnixSelect.c,v 1.22 2008/11/08 18:44:40 dkf Exp $
11	11	*/
12	12
13	13	#include "tkInt.h"

325	325	length = strlen(incrPtr->converts[i].buffer);
326	326	strcpy((char *)buffer, incrPtr->converts[i].buffer);
327	327
328		numItems = (*selPtr->proc)(selPtr->clientData,
	328	numItems = selPtr->proc(selPtr->clientData,
329	329	incrPtr->converts[i].offset,
330	330	((char *) buffer) + length,
331	331	TK_SEL_BYTES_AT_ONCE - length);

593	593	return;
594	594	}
595	595	interp = retrPtr->interp;
596		Tcl_Preserve((ClientData) interp);
	596	Tcl_Preserve(interp);
597	597
598	598	/*
599	599	* Convert the X selection data into UTF before passing it to the

616	616	Tcl_FreeEncoding(encoding);
617	617	}
618	618
619		retrPtr->result = (*retrPtr->proc)(retrPtr->clientData,
620		interp, Tcl_DStringValue(&ds));
	619	retrPtr->result = retrPtr->proc(retrPtr->clientData, interp,
	620	Tcl_DStringValue(&ds));
621	621	Tcl_DStringFree(&ds);
622		Tcl_Release((ClientData) interp);
	622	Tcl_Release(interp);
623	623	} else if (type == dispPtr->utf8Atom) {
624	624	/*
625	625	* The X selection data is in UTF-8 format already. We can't

645	645	strcpy(propData, propInfo);
646	646	propData[numItems] = '\0';
647	647	}
648		retrPtr->result = (*retrPtr->proc)(retrPtr->clientData,
	648	retrPtr->result = retrPtr->proc(retrPtr->clientData,
649	649	retrPtr->interp, propData);
650	650	if (propData != propInfo) {
651	651	ckfree((char *) propData);

685	685	SelCvtFromX((long *) propInfo, (int) numItems, type,
686	686	(Tk_Window) winPtr, &ds);
687	687	interp = retrPtr->interp;
688		Tcl_Preserve((ClientData) interp);
689		retrPtr->result = (*retrPtr->proc)(retrPtr->clientData,
	688	Tcl_Preserve(interp);
	689	retrPtr->result = retrPtr->proc(retrPtr->clientData,
690	690	interp, Tcl_DStringValue(&ds));
691		Tcl_Release((ClientData) interp);
	691	Tcl_Release(interp);
692	692	Tcl_DStringFree(&ds);
693	693	}
694	694	XFree(propInfo);

917	917	ip.nextPtr = TkSelGetInProgress();
918	918	TkSelSetInProgress(&ip);
919	919	type = selPtr->format;
920		numItems = (*selPtr->proc)(selPtr->clientData, 0,
921		(char *) buffer, TK_SEL_BYTES_AT_ONCE);
	920	numItems = selPtr->proc(selPtr->clientData, 0, (char *) buffer,
	921	TK_SEL_BYTES_AT_ONCE);
922	922	TkSelSetInProgress(ip.nextPtr);
923	923	if ((ip.selPtr == NULL) \|\| (numItems < 0)) {
924	924	incr.multAtoms[2*i + 1] = None;

1226	1226	}
1227	1227	Tcl_DStringSetLength(dstPtr, soFar);
1228	1228
1229		result = (*retrPtr->proc)(retrPtr->clientData, interp,
	1229	result = retrPtr->proc(retrPtr->clientData, interp,
1230	1230	Tcl_DStringValue(dstPtr));
1231	1231	Tcl_Release((ClientData) interp);
1232	1232

1264	1264	SelCvtFromX((long *) propInfo, (int) numItems, type,
1265	1265	(Tk_Window) retrPtr->winPtr, &ds);
1266	1266	interp = retrPtr->interp;
1267		Tcl_Preserve((ClientData) interp);
1268		result = (*retrPtr->proc)(retrPtr->clientData, interp,
	1267	Tcl_Preserve(interp);
	1268	result = retrPtr->proc(retrPtr->clientData, interp,
1269	1269	Tcl_DStringValue(&ds));
1270		Tcl_Release((ClientData) interp);
	1270	Tcl_Release(interp);
1271	1271	Tcl_DStringFree(&ds);
1272	1272	if (result != TCL_OK) {
1273	1273	retrPtr->result = result;

1313	1313	TkSelSetInProgress(&ip);
1314	1314
1315	1315	do {
1316		chunkSize = (selPtr->proc)(selPtr->clientData, size, (char ) buffer,
	1316	chunkSize = selPtr->proc(selPtr->clientData, size, (char *) buffer,
1317	1317	TK_SEL_BYTES_AT_ONCE);
1318	1318	if (ip.selPtr == NULL) {
1319	1319	size = 0;

+27

-25

unix/tkUnixSend.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkUnixSend.c,v 1.22 2008/07/23 23:24:46 nijtmans Exp $
	13	* RCS: @(#) $Id: tkUnixSend.c,v 1.24 2008/11/18 23:49:43 nijtmans Exp $
14	14	*/
15	15
16	16	#include "tkUnixInt.h"

225	225	static void UpdateCommWindow(TkDisplay *dispPtr);
226	226	static int ValidateName(TkDisplay dispPtr, const char name,
227	227	Window commWindow, int oldOK);
228
	228
229	229	/*
230	230	*----------------------------------------------------------------------
231	231	*

324	324	}
325	325	return regPtr;
326	326	}
327
	327
328	328	/*
329	329	*----------------------------------------------------------------------
330	330	*

377	377	}
378	378	return None;
379	379	}
380
	380
381	381	/*
382	382	*----------------------------------------------------------------------
383	383	*

441	441	}
442	442	}
443	443	}
444
	444
445	445	/*
446	446	*----------------------------------------------------------------------
447	447	*

491	491	regPtr->property = newProp;
492	492	regPtr->allocedByX = 0;
493	493	}
494
	494
495	495	/*
496	496	*----------------------------------------------------------------------
497	497	*

551	551	}
552	552	ckfree((char *) regPtr);
553	553	}
554
	554
555	555	/*
556	556	*----------------------------------------------------------------------
557	557	*

646	646	}
647	647	return result;
648	648	}
649
	649
650	650	/*
651	651	*----------------------------------------------------------------------
652	652	*

689	689	return secure;
690	690	#endif /* TK_NO_SECURITY */
691	691	}
692
	692
693	693	/*
694	694	*--------------------------------------------------------------
695	695	*

848	848
849	849	return riPtr->name;
850	850	}
851
	851
852	852	/*
853	853	*--------------------------------------------------------------
854	854	*

1086	1086
1087	1087	if (!ValidateName(pending.dispPtr, pending.target,
1088	1088	pending.commWindow, 0)) {
1089		char *msg;
	1089	const char *msg;
1090	1090
1091	1091	if (ValidateName(pending.dispPtr, pending.target,
1092	1092	pending.commWindow, 1)) {

1133	1133	Tcl_SetObjErrorCode(interp, errorObjPtr);
1134	1134	ckfree(pending.errorCode);
1135	1135	}
1136		Tcl_SetResult(interp, pending.result, TCL_DYNAMIC);
	1136	Tcl_SetResult(interp, pending.result, TCL_VOLATILE);
	1137	ckfree(pending.result);
1137	1138	return pending.code;
1138	1139	}
1139
	1140
1140	1141	/*
1141	1142	*----------------------------------------------------------------------
1142	1143	*

1224	1225	RegClose(regPtr);
1225	1226	return TCL_OK;
1226	1227	}
1227
	1228
1228	1229	/*
1229	1230	*--------------------------------------------------------------
1230	1231	*

1254	1255	dispPtr->commTkwin = NULL;
1255	1256	}
1256	1257	}
1257
	1258
1258	1259	/*
1259	1260	*--------------------------------------------------------------
1260	1261	*

1311	1312
1312	1313	return TCL_OK;
1313	1314	}
1314
	1315
1315	1316	/*
1316	1317	*--------------------------------------------------------------
1317	1318	*

1339	1340	{
1340	1341	TkDisplay *dispPtr = clientData;
1341	1342	char propInfo, *propInfoPtr = &propInfo;
1342		register char *p;
	1343	const char *p;
1343	1344	int result, actualFormat;
1344	1345	unsigned long numItems, bytesAfter;
1345	1346	Atom actualType;

1394	1395
1395	1396	if ((*p == 'c') && (p[1] == 0)) {
1396	1397	Window commWindow;
1397		char interpName, script, serial, end;
	1398	const char interpName, script, *serial;
	1399	char *end;
1398	1400	Tcl_DString reply;
1399	1401	RegisteredInterp *riPtr;
1400	1402

1549	1551	}
1550	1552	} else if ((*p == 'r') && (p[1] == 0)) {
1551	1553	int serial, code, gotSerial;
1552		char errorInfo, errorCode, *resultString;
	1554	const char errorInfo, errorCode, *resultString;
1553	1555	PendingCommand *pcPtr;
1554	1556
1555	1557	/*

1648	1650	}
1649	1651	XFree(propInfo);
1650	1652	}
1651
	1653
1652	1654	/*
1653	1655	*--------------------------------------------------------------
1654	1656	*

1727	1729	}
1728	1730	return 0;
1729	1731	}
1730
	1732
1731	1733	/*
1732	1734	*--------------------------------------------------------------
1733	1735	*

1776	1778	UpdateCommWindow(riPtr->dispPtr);
1777	1779	Tcl_EventuallyFree(riPtr, TCL_DYNAMIC);
1778	1780	}
1779
	1781
1780	1782	/*
1781	1783	*----------------------------------------------------------------------
1782	1784	*

1816	1818	}
1817	1819	return TK_DEFER_EVENT;
1818	1820	}
1819
	1821
1820	1822	/*
1821	1823	*----------------------------------------------------------------------
1822	1824	*

1856	1858	Tcl_DStringLength(&names));
1857	1859	Tcl_DStringFree(&names);
1858	1860	}
1859
	1861
1860	1862	/*
1861	1863	*----------------------------------------------------------------------
1862	1864	*

1964	1966	}
1965	1967	return TCL_OK;
1966	1968	}
1967
	1969
1968	1970	/*
1969	1971	* Local Variables:
1970	1972	* mode: c

+39

-34

unix/tkUnixWm.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkUnixWm.c,v 1.62 2008/10/08 15:39:13 dgp Exp $
	14	* RCS: @(#) $Id: tkUnixWm.c,v 1.69 2008/12/10 04:13:01 das Exp $
15	15	*/
16	16
17	17	#include "tkUnixInt.h"

43	43	* Data for [wm attributes] command:
44	44	*/
45	45	typedef struct {
46		double alpha; /* Transparency; 0.0=transparent, 1.0=opaque */
47		int topmost; /* Flag: true=>stay-on-top */
48		int zoomed; /* Flag: true=>maximized */
49		int fullscreen; /* Flag: true=>fullscreen */
	46	double alpha; /* Transparency; 0.0=transparent, 1.0=opaque */
	47	int topmost; /* Flag: true=>stay-on-top */
	48	int zoomed; /* Flag: true=>maximized */
	49	int fullscreen; /* Flag: true=>fullscreen */
50	50	} WmAttributes;
51	51
52	52	typedef enum {

54	54	_WMATT_LAST_ATTRIBUTE
55	55	} WmAttribute;
56	56
57		static const char *WmAttributeNames[] = {
	57	static const char *const WmAttributeNames[] = {
58	58	"-alpha", "-topmost", "-zoomed", "-fullscreen",
59	59	NULL
60	60	};

1243	1243	Tcl_Obj value) / New value */
1244	1244	{
1245	1245	WmInfo *wmPtr = winPtr->wmInfoPtr;
	1246
1246	1247	switch (attribute) {
1247	1248	case WMATT_ALPHA: {
1248	1249	unsigned long opacity; /* 0=transparent, 0xFFFFFFFF=opaque */

1272	1273	break;
1273	1274	}
1274	1275	case WMATT_TOPMOST:
1275		if (TCL_OK != Tcl_GetBooleanFromObj(interp, value,
1276		&wmPtr->reqState.topmost)) {
	1276	if (Tcl_GetBooleanFromObj(interp, value,
	1277	&wmPtr->reqState.topmost) != TCL_OK) {
1277	1278	return TCL_ERROR;
1278	1279	}
1279		SetNetWmState(winPtr, "_NET_WM_STATE_ABOVE",
1280		wmPtr->reqState.topmost);
	1280	SetNetWmState(winPtr, "_NET_WM_STATE_ABOVE", wmPtr->reqState.topmost);
1281	1281	break;
1282	1282	case WMATT_ZOOMED:
1283		if (TCL_OK != Tcl_GetBooleanFromObj(interp, value,
1284		&wmPtr->reqState.zoomed)) {
	1283	if (Tcl_GetBooleanFromObj(interp, value,
	1284	&wmPtr->reqState.zoomed) != TCL_OK) {
1285	1285	return TCL_ERROR;
1286	1286	}
1287	1287	SetNetWmState(winPtr, "_NET_WM_STATE_MAXIMIZED_VERT",

1290	1290	wmPtr->reqState.zoomed);
1291	1291	break;
1292	1292	case WMATT_FULLSCREEN:
1293		if (TCL_OK != Tcl_GetBooleanFromObj(interp, value,
1294		&wmPtr->reqState.fullscreen)) {
	1293	if (Tcl_GetBooleanFromObj(interp, value,
	1294	&wmPtr->reqState.fullscreen) != TCL_OK) {
1295	1295	return TCL_ERROR;
1296	1296	}
1297	1297	SetNetWmState(winPtr, "_NET_WM_STATE_FULLSCREEN",

1386	1386	return TCL_OK;
1387	1387	} else if (objc == 4) { /* wm attributes $win -attribute */
1388	1388	if (Tcl_GetIndexFromObj(interp, objv[3], WmAttributeNames,
1389		"attribute", 0, &attribute) != TCL_OK) {
	1389	"attribute", 0, &attribute) != TCL_OK) {
1390	1390	return TCL_ERROR;
1391	1391	}
1392	1392	Tcl_SetObjResult(interp, WmGetAttribute(winPtr, attribute));

1631	1631	}
1632	1632	if (objc == 3) {
1633	1633	if (wmPtr->cmdArgv != NULL) {
1634		Tcl_SetResult(interp,
1635		Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv),
1636		TCL_DYNAMIC);
	1634	argv3 = Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv);
	1635	Tcl_SetResult(interp, argv3, TCL_VOLATILE);
	1636	ckfree(argv3);
1637	1637	}
1638	1638	return TCL_OK;
1639	1639	}

1735	1735	Tcl_Obj const objv[]) / Argument objects. */
1736	1736	{
1737	1737	register WmInfo *wmPtr = winPtr->wmInfoPtr;
1738		static const char *optionStrings[] = {
	1738	static const char *const optionStrings[] = {
1739	1739	"active", "passive", NULL };
1740	1740	enum options {
1741	1741	OPT_ACTIVE, OPT_PASSIVE };

2551	2551	}
2552	2552	if (objc == 3) {
2553	2553	if (wmPtr->icon != NULL) {
2554		Tcl_SetResult(interp, Tk_PathName(wmPtr->icon), TCL_STATIC);
	2554	Tcl_SetObjResult(interp, TkNewWindowObj(wmPtr->icon));
2555	2555	}
2556	2556	return TCL_OK;
2557	2557	}

2659	2659	register WmInfo *wmPtr = winPtr->wmInfoPtr;
2660	2660
2661	2661	if (!Tk_IsTopLevel(frameWin)) {
	2662	if (!Tk_IsManageable(frameWin)) {
	2663	Tcl_AppendResult(interp, "window \"",
	2664	Tk_PathName(frameWin), "\" is not manageable: must be "
	2665	"a frame, labelframe or toplevel", NULL);
	2666	return TCL_ERROR;
	2667	}
2662	2668	TkFocusSplit(winPtr);
2663	2669	Tk_UnmapWindow(frameWin);
2664	2670	winPtr->flags \|= TK_TOP_HIERARCHY\|TK_TOP_LEVEL\|TK_HAS_WRAPPER\|TK_WIN_MANAGED;

2871	2877	Tcl_Obj const objv[]) / Argument objects. */
2872	2878	{
2873	2879	register WmInfo *wmPtr = winPtr->wmInfoPtr;
2874		static const char *optionStrings[] = {
	2880	static const char *const optionStrings[] = {
2875	2881	"program", "user", NULL };
2876	2882	enum options {
2877	2883	OPT_PROGRAM, OPT_USER };

3100	3106	Tcl_Obj const objv[]) / Argument objects. */
3101	3107	{
3102	3108	register WmInfo *wmPtr = winPtr->wmInfoPtr;
3103		static const char *optionStrings[] = {
	3109	static const char *const optionStrings[] = {
3104	3110	"program", "user", NULL };
3105	3111	enum options {
3106	3112	OPT_PROGRAM, OPT_USER };

3165	3171	Tcl_Obj const objv[]) / Argument objects. */
3166	3172	{
3167	3173	TkWindow windows, window_ptr;
3168		static const char *optionStrings[] = {
	3174	static const char *const optionStrings[] = {
3169	3175	"isabove", "isbelow", NULL };
3170	3176	enum options {
3171	3177	OPT_ISABOVE, OPT_ISBELOW };

3285	3291	Tcl_Obj const objv[]) / Argument objects. */
3286	3292	{
3287	3293	register WmInfo *wmPtr = winPtr->wmInfoPtr;
3288		static const char *optionStrings[] = {
	3294	static const char *const optionStrings[] = {
3289	3295	"normal", "iconic", "withdrawn", NULL };
3290	3296	enum options {
3291	3297	OPT_NORMAL, OPT_ICONIC, OPT_WITHDRAWN };

3441	3447	}
3442	3448	if (objc == 3) {
3443	3449	if (masterPtr != NULL) {
3444		Tcl_SetResult(interp, Tk_PathName(masterPtr), TCL_STATIC);
	3450	Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
3445	3451	}
3446	3452	return TCL_OK;
3447	3453	}

4589	4595	* Reconfigure the wrapper if it isn't already configured correctly. A few
4590	4596	* tricky points:
4591	4597	*
4592		* 1. If the window is embeddedand the container is also in this process,
	4598	* 1. If the window is embedded and the container is also in this process,
4593	4599	* don't actually reconfigure the window; just pass the desired size on
4594	4600	* to the container. Also, zero out any position information, since
4595	4601	* embedded windows are not allowed to move.

6079	6085	Tcl_Preserve((ClientData) interp);
6080	6086	result = Tcl_GlobalEval(interp, protPtr->command);
6081	6087	if (result != TCL_OK) {
6082		Tcl_AddErrorInfo(interp, "\n (command for \"");
6083		Tcl_AddErrorInfo(interp, protocolName);
6084		Tcl_AddErrorInfo(interp,
6085		"\" window manager protocol)");
6086		Tcl_BackgroundError(interp);
	6088	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
	6089	"\n (command for \"%s\" window manager protocol)",
	6090	protocolName));
	6091	Tcl_BackgroundException(interp, result);
6087	6092	}
6088	6093	Tcl_Release((ClientData) interp);
6089	6094	Tcl_Release((ClientData) protPtr);

7142	7147	*/
7143	7148
7144	7149	static void
7145		RemapWindows(winPtr, parentPtr)
7146		TkWindow *winPtr;
7147		TkWindow *parentPtr;
	7150	RemapWindows(
	7151	TkWindow *winPtr,
	7152	TkWindow *parentPtr)
7148	7153	{
7149	7154	XWindowAttributes win_attr;
7150	7155

+4

-3

win/Makefile.in less more

3	3	# "autoconf" program (constructs like "@foo@" will get replaced in the
4	4	# actual Makefile.
5	5	#
6		# RCS: @(#) $Id: Makefile.in,v 1.80 2008/08/25 11:44:04 dkf Exp $
	6	# RCS: @(#) $Id: Makefile.in,v 1.82 2008/12/05 10:48:52 dkf Exp $
7	7
8	8	TCLVERSION = @TCL_VERSION@
9	9	TCLPATCHL = @TCL_PATCH_LEVEL@

281	281	tkAtom.$(OBJEXT) \
282	282	tkBind.$(OBJEXT) \
283	283	tkBitmap.$(OBJEXT) \
	284	tkBusy.$(OBJEXT) \
284	285	tkButton.$(OBJEXT) \
285	286	tkCanvArc.$(OBJEXT) \
286	287	tkCanvBmap.$(OBJEXT) \

515	516	$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
516	517	done;
517	518	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
518		@for i in $(ROOT_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
519		$(ROOT_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
	519	@for i in $(ROOT_DIR)/library/*.tcl $(ROOT_DIR)/library/tclIndex \
	520	$(UNIX_DIR)/tkAppInit.c; \
520	521	do \
521	522	$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
522	523	done;

+1

-1

win/configure less more

1308	1308	TK_VERSION=8.6
1309	1309	TK_MAJOR_VERSION=8
1310	1310	TK_MINOR_VERSION=6
1311		TK_PATCH_LEVEL="a3"
	1311	TK_PATCH_LEVEL="b1"
1312	1312	VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
1313	1313
1314	1314	#------------------------------------------------------------------------

+2

-2

win/configure.in less more

2	2	# generate the file "configure", which is run during Tk installation
3	3	# to configure the system for the local environment.
4	4	#
5		# RCS: @(#) $Id: configure.in,v 1.82 2008/08/28 16:29:38 dgp Exp $
	5	# RCS: @(#) $Id: configure.in,v 1.84 2008/12/19 14:32:25 dgp Exp $
6	6
7	7	AC_INIT(../generic/tk.h)
8	8	AC_PREREQ(2.59)

15	15	TK_VERSION=8.6
16	16	TK_MAJOR_VERSION=8
17	17	TK_MINOR_VERSION=6
18		TK_PATCH_LEVEL="a3"
	18	TK_PATCH_LEVEL="b1"
19	19	VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
20	20
21	21	#------------------------------------------------------------------------

+2

-1

win/makefile.bc less more

12	12	# Copyright (c) 1995-1997 Sun Microsystems, Inc.
13	13	# Copyright (c) 1998-2000 Ajuba Solutions.
14	14	#
15		# RCS: @(#) $Id: makefile.bc,v 1.16 2008/08/25 11:44:04 dkf Exp $
	15	# RCS: @(#) $Id: makefile.bc,v 1.17 2008/10/18 14:22:22 dkf Exp $
16	16
17	17	# Does not depend on the presence of any environment variables in
18	18	# order to compile tcl; all needed information is derived from

162	162	$(TMPDIR)\tkAtom.obj \
163	163	$(TMPDIR)\tkBind.obj \
164	164	$(TMPDIR)\tkBitmap.obj \
	165	$(TMPDIR)\tkBusy.obj \
165	166	$(TMPDIR)\tkButton.obj \
166	167	$(TMPDIR)\tkCanvArc.obj \
167	168	$(TMPDIR)\tkCanvBmap.obj \

+5

-3

win/makefile.vc less more

12	12	# Copyright (c) 2003-2008 Pat Thoyts.
13	13	#
14	14	#------------------------------------------------------------------------------
15		# RCS: @(#) $Id: makefile.vc,v 1.124 2008/08/25 11:44:04 dkf Exp $
	15	# RCS: @(#) $Id: makefile.vc,v 1.126 2008/10/19 21:22:36 patthoyts Exp $
16	16	#------------------------------------------------------------------------------
17	17
18	18	# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)

289	289	$(TMP_DIR)\tkAtom.obj \
290	290	$(TMP_DIR)\tkBind.obj \
291	291	$(TMP_DIR)\tkBitmap.obj \
	292	$(TMP_DIR)\tkBusy.obj \
292	293	$(TMP_DIR)\tkButton.obj \
293	294	$(TMP_DIR)\tkCanvArc.obj \
294	295	$(TMP_DIR)\tkCanvBmap.obj \

423	424	-DTTK_SQUARE_WIDGET=1 \
424	425	!endif
425	426
426		TK_DEFINES =-DBUILD_ttk $(OPTDEFINES) $(CONFIG_DEFS)
	427	TK_DEFINES =-DBUILD_ttk $(OPTDEFINES) $(CONFIG_DEFS) -Dinline=__inline
427	428
428	429	#---------------------------------------------------------------------
429	430	# Compile flags

469	470	TK_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES)
470	471	CON_CFLAGS = $(cdebug) $(cflags) $(crt) -DCONSOLE
471	472	WISH_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES)
472		STUB_CFLAGS = $(cflags) $(cdebug) $(TK_DEFINES)
	473	### Stubs files should not be compiled with -GL
	474	STUB_CFLAGS = $(cflags) $(cdebug:-GL=) $(TK_DEFINES)
473	475
474	476	!if !$(STATIC_BUILD)
475	477	TK_CFLAGS = $(TK_CFLAGS) -DUSE_TCL_STUBS

+7

-3

win/nmakehlp.c less more

10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12	12	* ----------------------------------------------------------------------------
13		* RCS: @(#) $Id: nmakehlp.c,v 1.11 2007/12/14 02:19:43 patthoyts Exp $
	13	* RCS: @(#) $Id: nmakehlp.c,v 1.12 2008/11/08 18:44:40 dkf Exp $
14	14	* ----------------------------------------------------------------------------
15	15	*/
16	16

591	591
592	592	/* insert a list item into the list (list may be null) */
593	593	static list_item_t *
594		list_insert(list_item_t *listPtrPtr, const char key, const char *value)
	594	list_insert(
	595	list_item_t **listPtrPtr,
	596	const char *key,
	597	const char *value)
595	598	{
596	599	list_item_t *itemPtr = malloc(sizeof(list_item_t));
597	600	if (itemPtr) {

608	611	}
609	612
610	613	static void
611		list_free(list_item_t **listPtrPtr)
	614	list_free(
	615	list_item_t **listPtrPtr)
612	616	{
613	617	list_item_t tmpPtr, listPtr = *listPtrPtr;
614	618	while (listPtr) {

+3

-3

win/tkWinButton.c less more

8	8	* See the file "license.terms" for information on usage and redistribution
9	9	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkWinButton.c,v 1.34 2007/12/14 15:56:09 patthoyts Exp $
	11	* RCS: @(#) $Id: tkWinButton.c,v 1.36 2008/12/09 21:22:56 dgp Exp $
12	12	*/
13	13
14	14	#define OEMRESOURCE

257	257	{
258	258	Window window;
259	259	HWND parent;
260		char *class;
	260	const char *class;
261	261	WinButton butPtr = (WinButton )instanceData;
262	262
263	263	parent = Tk_GetHWND(parentWin);

1286	1286	if (code != TCL_OK && code != TCL_CONTINUE
1287	1287	&& code != TCL_BREAK) {
1288	1288	Tcl_AddErrorInfo(interp, "\n (button invoke)");
1289		Tcl_BackgroundError(interp);
	1289	Tcl_BackgroundException(interp, code);
1290	1290	}
1291	1291	Tcl_Release((ClientData)interp);
1292	1292	}

+2

-2

win/tkWinClipboard.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkWinClipboard.c,v 1.9 2007/01/11 15:35:40 dkf Exp $
	11	* RCS: @(#) $Id: tkWinClipboard.c,v 1.10 2008/11/08 18:44:40 dkf Exp $
12	12	*/
13	13
14	14	#include "tkWinInt.h"

157	157	* Pass the data off to the selection procedure.
158	158	*/
159	159
160		result = (*proc)(clientData, interp, Tcl_DStringValue(&ds));
	160	result = proc(clientData, interp, Tcl_DStringValue(&ds));
161	161	Tcl_DStringFree(&ds);
162	162	CloseClipboard();
163	163	return result;

+2

-2

win/tkWinColor.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkWinColor.c,v 1.11 2007/01/11 15:35:40 dkf Exp $
	11	* RCS: @(#) $Id: tkWinColor.c,v 1.12 2008/10/17 23:18:38 nijtmans Exp $
12	12	*/
13	13
14	14	#include "tkWinInt.h"

32	32	*/
33	33
34	34	typedef struct {
35		char *name;
	35	const char *name;
36	36	int index;
37	37	} SystemColorEntry;
38	38

+7

-7

win/tkWinCursor.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkWinCursor.c,v 1.16 2008/04/27 22:39:14 dkf Exp $
	10	* RCS: @(#) $Id: tkWinCursor.c,v 1.17 2008/10/17 23:18:38 nijtmans Exp $
11	11	*/
12	12
13	13	#include "tkWinInt.h"

38	38	*/
39	39
40	40	static struct CursorName {
41		char *name;
	41	const char *name;
42	42	LPCTSTR id;
43	43	} cursorNames[] = {
44	44	{"starting", IDC_APPSTARTING},

70	70
71	71	#define TK_DEFAULT_CURSOR IDC_ARROW
72	72
73
	73
74	74	/*
75	75	*----------------------------------------------------------------------
76	76	*

170	170	return (TkCursor *) cursorPtr;
171	171	}
172	172	}
173
	173
174	174	/*
175	175	*----------------------------------------------------------------------
176	176	*

199	199	{
200	200	return NULL;
201	201	}
202
	202
203	203	/*
204	204	*----------------------------------------------------------------------
205	205	*

223	223	{
224	224	/* TkWinCursor winCursorPtr = (TkWinCursor ) cursorPtr; */
225	225	}
226
	226
227	227	/*
228	228	*----------------------------------------------------------------------
229	229	*

258	258	SetCursor(hcursor);
259	259	}
260	260	}
261
	261
262	262	/*
263	263	* Local Variables:
264	264	* mode: c

+37

-30

win/tkWinDefault.h less more

8	8	* See the file "license.terms" for information on usage and redistribution
9	9	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkWinDefault.h,v 1.24 2007/12/13 15:28:55 dgp Exp $
	11	* RCS: @(#) $Id: tkWinDefault.h,v 1.26 2008/12/06 10:48:29 dkf Exp $
12	12	*/
13	13
14	14	#ifndef _TKWINDEFAULT

69	69	#define DEF_BUTTON_HIGHLIGHT HIGHLIGHT
70	70	#define DEF_LABEL_HIGHLIGHT_WIDTH "0"
71	71	#define DEF_BUTTON_HIGHLIGHT_WIDTH "1"
72		#define DEF_BUTTON_IMAGE (char *) NULL
	72	#define DEF_BUTTON_IMAGE ((char *) NULL)
73	73	#define DEF_BUTTON_INDICATOR "1"
74	74	#define DEF_BUTTON_JUSTIFY "center"
75	75	#define DEF_BUTTON_OFF_VALUE "0"

85	85	#define DEF_BUTTON_REPEAT_INTERVAL "0"
86	86	#define DEF_BUTTON_SELECT_COLOR INDICATOR
87	87	#define DEF_BUTTON_SELECT_MONO BLACK
88		#define DEF_BUTTON_SELECT_IMAGE (char *) NULL
	88	#define DEF_BUTTON_SELECT_IMAGE ((char *) NULL)
89	89	#define DEF_BUTTON_STATE "normal"
90	90	#define DEF_LABEL_TAKE_FOCUS "0"
91		#define DEF_BUTTON_TAKE_FOCUS (char *) NULL
	91	#define DEF_BUTTON_TAKE_FOCUS ((char *) NULL)
92	92	#define DEF_BUTTON_TEXT ""
93	93	#define DEF_BUTTON_TEXT_VARIABLE ""
94	94	#define DEF_BUTTON_TRISTATE_VALUE ""

127	127	#define DEF_CANVAS_SELECT_BD_MONO "0"
128	128	#define DEF_CANVAS_SELECT_FG_COLOR SELECT_FG
129	129	#define DEF_CANVAS_SELECT_FG_MONO WHITE
130		#define DEF_CANVAS_TAKE_FOCUS (char *) NULL
	130	#define DEF_CANVAS_TAKE_FOCUS ((char *) NULL)
131	131	#define DEF_CANVAS_WIDTH "10c"
132	132	#define DEF_CANVAS_X_SCROLL_CMD ""
133	133	#define DEF_CANVAS_X_SCROLL_INCREMENT "0"

168	168	#define DEF_ENTRY_SELECT_BD_MONO "0"
169	169	#define DEF_ENTRY_SELECT_FG_COLOR SELECT_FG
170	170	#define DEF_ENTRY_SELECT_FG_MONO WHITE
171		#define DEF_ENTRY_SHOW (char *) NULL
	171	#define DEF_ENTRY_SHOW ((char *) NULL)
172	172	#define DEF_ENTRY_STATE "normal"
173		#define DEF_ENTRY_TAKE_FOCUS (char *) NULL
	173	#define DEF_ENTRY_TAKE_FOCUS ((char *) NULL)
174	174	#define DEF_ENTRY_TEXT_VARIABLE ""
175	175	#define DEF_ENTRY_WIDTH "20"
176	176

236	236	#define DEF_LISTBOX_SELECT_MODE "browse"
237	237	#define DEF_LISTBOX_SET_GRID "0"
238	238	#define DEF_LISTBOX_STATE "normal"
239		#define DEF_LISTBOX_TAKE_FOCUS (char *) NULL
	239	#define DEF_LISTBOX_TAKE_FOCUS ((char *) NULL)
240	240	#define DEF_LISTBOX_WIDTH "20"
241	241
242	242	/*
243	243	* Defaults for individual entries of menus:
244	244	*/
245	245
246		#define DEF_MENU_ENTRY_ACTIVE_BG (char *) NULL
247		#define DEF_MENU_ENTRY_ACTIVE_FG (char *) NULL
248		#define DEF_MENU_ENTRY_ACCELERATOR (char *) NULL
249		#define DEF_MENU_ENTRY_BG (char *) NULL
	246	#define DEF_MENU_ENTRY_ACTIVE_BG ((char *) NULL)
	247	#define DEF_MENU_ENTRY_ACTIVE_FG ((char *) NULL)
	248	#define DEF_MENU_ENTRY_ACCELERATOR ((char *) NULL)
	249	#define DEF_MENU_ENTRY_BG ((char *) NULL)
250	250	#define DEF_MENU_ENTRY_BITMAP None
251	251	#define DEF_MENU_ENTRY_COLUMN_BREAK "0"
252		#define DEF_MENU_ENTRY_COMMAND (char *) NULL
	252	#define DEF_MENU_ENTRY_COMMAND ((char *) NULL)
253	253	#define DEF_MENU_ENTRY_COMPOUND "none"
254		#define DEF_MENU_ENTRY_FG (char *) NULL
255		#define DEF_MENU_ENTRY_FONT (char *) NULL
	254	#define DEF_MENU_ENTRY_FG ((char *) NULL)
	255	#define DEF_MENU_ENTRY_FONT ((char *) NULL)
256	256	#define DEF_MENU_ENTRY_HIDE_MARGIN "0"
257		#define DEF_MENU_ENTRY_IMAGE (char *) NULL
	257	#define DEF_MENU_ENTRY_IMAGE ((char *) NULL)
258	258	#define DEF_MENU_ENTRY_INDICATOR "1"
259		#define DEF_MENU_ENTRY_LABEL (char *) NULL
260		#define DEF_MENU_ENTRY_MENU (char *) NULL
	259	#define DEF_MENU_ENTRY_LABEL ((char *) NULL)
	260	#define DEF_MENU_ENTRY_MENU ((char *) NULL)
261	261	#define DEF_MENU_ENTRY_OFF_VALUE "0"
262	262	#define DEF_MENU_ENTRY_ON_VALUE "1"
263		#define DEF_MENU_ENTRY_SELECT_IMAGE (char *) NULL
	263	#define DEF_MENU_ENTRY_SELECT_IMAGE ((char *) NULL)
264	264	#define DEF_MENU_ENTRY_STATE "normal"
265		#define DEF_MENU_ENTRY_VALUE (char *) NULL
266		#define DEF_MENU_ENTRY_CHECK_VARIABLE (char *) NULL
	265	#define DEF_MENU_ENTRY_VALUE ((char *) NULL)
	266	#define DEF_MENU_ENTRY_CHECK_VARIABLE ((char *) NULL)
267	267	#define DEF_MENU_ENTRY_RADIO_VARIABLE "selectedButton"
268		#define DEF_MENU_ENTRY_SELECT (char *) NULL
	268	#define DEF_MENU_ENTRY_SELECT ((char *) NULL)
269	269	#define DEF_MENU_ENTRY_UNDERLINE "-1"
270	270
271	271	/*

291	291	#define DEF_MENU_SELECT_MONO BLACK
292	292	#define DEF_MENU_TAKE_FOCUS "0"
293	293	#define DEF_MENU_TEAROFF "1"
294		#define DEF_MENU_TEAROFF_CMD (char *) NULL
	294	#define DEF_MENU_TEAROFF_CMD ((char *) NULL)
295	295	#define DEF_MENU_TITLE ""
296	296	#define DEF_MENU_TYPE "normal"
297	297

319	319	#define DEF_MENUBUTTON_HIGHLIGHT_BG_MONO DEF_MENUBUTTON_BG_MONO
320	320	#define DEF_MENUBUTTON_HIGHLIGHT HIGHLIGHT
321	321	#define DEF_MENUBUTTON_HIGHLIGHT_WIDTH "0"
322		#define DEF_MENUBUTTON_IMAGE (char *) NULL
	322	#define DEF_MENUBUTTON_IMAGE ((char *) NULL)
323	323	#define DEF_MENUBUTTON_INDICATOR "0"
324	324	#define DEF_MENUBUTTON_JUSTIFY "center"
325	325	#define DEF_MENUBUTTON_MENU ""

419	419	#define DEF_SCALE_LENGTH "100"
420	420	#define DEF_SCALE_ORIENT "vertical"
421	421	#define DEF_SCALE_RELIEF "flat"
422		#define DEF_SCALE_REPEAT_DELAY "300"
	422	#define DEF_SCALE_REPEAT_DELAY "300"
423	423	#define DEF_SCALE_REPEAT_INTERVAL "100"
424	424	#define DEF_SCALE_RESOLUTION "1"
425	425	#define DEF_SCALE_TROUGH_COLOR TROUGH

428	428	#define DEF_SCALE_SLIDER_LENGTH "30"
429	429	#define DEF_SCALE_SLIDER_RELIEF "raised"
430	430	#define DEF_SCALE_STATE "normal"
431		#define DEF_SCALE_TAKE_FOCUS (char *) NULL
	431	#define DEF_SCALE_TAKE_FOCUS ((char *) NULL)
432	432	#define DEF_SCALE_TICK_INTERVAL "0"
433	433	#define DEF_SCALE_TO "100"
434	434	#define DEF_SCALE_VARIABLE ""

455	455	#define DEF_SCROLLBAR_RELIEF "sunken"
456	456	#define DEF_SCROLLBAR_REPEAT_DELAY "300"
457	457	#define DEF_SCROLLBAR_REPEAT_INTERVAL "100"
458		#define DEF_SCROLLBAR_TAKE_FOCUS (char *) NULL
	458	#define DEF_SCROLLBAR_TAKE_FOCUS ((char *) NULL)
459	459	#define DEF_SCROLLBAR_TROUGH_COLOR TROUGH
460	460	#define DEF_SCROLLBAR_TROUGH_MONO WHITE
461	461	#define DEF_SCROLLBAR_WIDTH "10"

482	482	#define DEF_TEXT_INSERT_BD_MONO "0"
483	483	#define DEF_TEXT_INSERT_OFF_TIME "300"
484	484	#define DEF_TEXT_INSERT_ON_TIME "600"
	485	#define DEF_TEXT_INSERT_UNFOCUSSED "none"
485	486	#define DEF_TEXT_INSERT_WIDTH "2"
486		#define DEF_TEXT_MAX_UNDO "0"
	487	#define DEF_TEXT_MAX_UNDO "0"
487	488	#define DEF_TEXT_PADX "1"
488	489	#define DEF_TEXT_PADY "1"
489	490	#define DEF_TEXT_RELIEF "sunken"

502	503	#define DEF_TEXT_STATE "normal"
503	504	#define DEF_TEXT_TABS ""
504	505	#define DEF_TEXT_TABSTYLE "tabular"
505		#define DEF_TEXT_TAKE_FOCUS (char *) NULL
506		#define DEF_TEXT_UNDO "0"
	506	#define DEF_TEXT_TAKE_FOCUS ((char *) NULL)
	507	#define DEF_TEXT_UNDO "0"
507	508	#define DEF_TEXT_WIDTH "80"
508	509	#define DEF_TEXT_WRAP "char"
509	510	#define DEF_TEXT_XSCROLL_COMMAND ""

525	526	#define DEF_TOPLEVEL_SCREEN ""
526	527	#define DEF_TOPLEVEL_USE ""
527	528
	529	/*
	530	* Defaults for busy windows:
	531	*/
	532
	533	#define DEF_BUSY_CURSOR "wait"
	534
528	535	#endif /* _TKWINDEFAULT */

+551

-14

win/tkWinDialog.c less more

7	7	* See the file "license.terms" for information on usage and redistribution of
8	8	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkWinDialog.c,v 1.53 2008/10/05 18:22:22 dkf Exp $
	10	* RCS: @(#) $Id: tkWinDialog.c,v 1.59 2008/12/16 23:53:14 nijtmans Exp $
11	11	*
12	12	*/
13	13
14	14	#include "tkWinInt.h"
15	15	#include "tkFileFilter.h"
	16	#include "tkFont.h"
16	17
17	18	#include <commdlg.h> /* includes common dialog functionality */
18	19	#ifdef _MSC_VER

298	299	static int inited = 0;
299	300	static COLORREF dwCustColors[16];
300	301	static long oldColor; /* the color selected last time */
301		static const char *optionStrings[] = {
	302	static const char *const optionStrings[] = {
302	303	"-initialcolor", "-parent", "-title", NULL
303	304	};
304	305	enum options {

466	467	if ((title != NULL) && (title[0] != '\0')) {
467	468	Tcl_DString ds;
468	469
469		(*tkWinProcs->setWindowText)(hDlg,
470		Tcl_WinUtfToTChar(title, -1, &ds));
	470	tkWinProcs->setWindowText(hDlg, Tcl_WinUtfToTChar(title,-1,&ds));
471	471	Tcl_DStringFree(&ds);
472	472	}
473	473	if (tsdPtr->debugFlag) {

578	578	Tcl_Encoding unicodeEncoding = TkWinGetUnicodeEncoding();
579	579	ThreadSpecificData tsdPtr = (ThreadSpecificData )
580	580	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
581		static const char *saveOptionStrings[] = {
	581	static const char *const saveOptionStrings[] = {
582	582	"-defaultextension", "-filetypes", "-initialdir", "-initialfile",
583	583	"-parent", "-title", "-typevariable", NULL
584	584	};
585		static const char *openOptionStrings[] = {
	585	static const char *const openOptionStrings[] = {
586	586	"-defaultextension", "-filetypes", "-initialdir", "-initialfile",
587	587	"-multiple", "-parent", "-title", "-typevariable", NULL
588	588	};
589		const char **optionStrings;
	589	const char const optionStrings;
590	590
591	591	enum options {
592	592	FILE_DEFAULT, FILE_TYPES, FILE_INITDIR, FILE_INITFILE,

1022	1022	Tcl_DString extString, filterString, dirString, titleString;
1023	1023	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1024	1024	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1025		static const char *saveOptionStrings[] = {
	1025	static const char *const saveOptionStrings[] = {
1026	1026	"-defaultextension", "-filetypes", "-initialdir", "-initialfile",
1027	1027	"-parent", "-title", "-typevariable", NULL
1028	1028	};
1029		static const char *openOptionStrings[] = {
	1029	static const char *const openOptionStrings[] = {
1030	1030	"-defaultextension", "-filetypes", "-initialdir", "-initialfile",
1031	1031	"-multiple", "-parent", "-title", "-typevariable", NULL
1032	1032	};
1033		const char **optionStrings;
	1033	const char const optionStrings;
1034	1034
1035	1035	enum options {
1036	1036	FILE_DEFAULT, FILE_TYPES, FILE_INITDIR, FILE_INITFILE,

1484	1484	/*
1485	1485	* Use "All Files (.) as the default filter if none is specified
1486	1486	*/
1487		char defaultFilter = "All Files (.*)";
	1487	const char defaultFilter = "All Files (.*)";
1488	1488
1489	1489	p = filterStr = (char)ckalloc(30 sizeof(char));
1490	1490

1526	1526
1527	1527	for (filterPtr = flist.filters, p = filterStr; filterPtr;
1528	1528	filterPtr = filterPtr->next) {
1529		char *sep;
	1529	const char *sep;
1530	1530	FileFilterClause *clausePtr;
1531	1531
1532	1532	/*

1690	1690	TCHAR saveDir[MAX_PATH];
1691	1691	Tcl_DString titleString; /* UTF Title */
1692	1692	Tcl_DString initDirString; /* Initial directory */
1693		static const char *optionStrings[] = {
	1693	static const char *const optionStrings[] = {
1694	1694	"-initialdir", "-mustexist", "-parent", "-title", NULL
1695	1695	};
1696	1696	enum options {

2065	2065	int defaultBtn, icon, type;
2066	2066	int i, oldMode, winCode;
2067	2067	UINT flags;
2068		static const char *optionStrings[] = {
	2068	static const char *const optionStrings[] = {
2069	2069	"-default", "-detail", "-icon", "-message",
2070	2070	"-parent", "-title", "-type", NULL
2071	2071	};

2258	2258	return CallNextHookEx(tsdPtr->hMsgBoxHook, nCode, wParam, lParam);
2259	2259	}
2260	2260
	2261	/*
	2262	* ----------------------------------------------------------------------
	2263	*
	2264	* SetTkDialog --
	2265	*
	2266	* Records the HWND for a native dialog in the 'tk_dialog' variable
	2267	* so that the test-suite can operate on the correct dialog window.
	2268	* Use of this is enabled when a test program calls TkWinDialogDebug
	2269	* by calling the test command 'tkwinevent debug 1'
	2270	*
	2271	* ----------------------------------------------------------------------
	2272	*/
	2273
2261	2274	static void
2262	2275	SetTkDialog(
2263	2276	ClientData clientData)

2296	2309	}
2297	2310
2298	2311	/*
	2312	* ----------------------------------------------------------------------
	2313	*
	2314	* GetFontObj --
	2315	*
	2316	* Convert a windows LOGFONT into a Tk font description.
	2317	*
	2318	* Result:
	2319	* A list containing a Tk font description.
	2320	*
	2321	* ----------------------------------------------------------------------
	2322	*/
	2323
	2324	static Tcl_Obj *
	2325	GetFontObj(HDC hdc, LOGFONT *plf)
	2326	{
	2327	Tcl_Obj *resObj;
	2328	int pt = 0;
	2329
	2330	resObj = Tcl_NewListObj(0, NULL);
	2331	Tcl_ListObjAppendElement(NULL, resObj,
	2332	Tcl_NewStringObj(plf->lfFaceName, -1));
	2333	pt = -MulDiv(plf->lfHeight, 72, GetDeviceCaps(hdc, LOGPIXELSY));
	2334	Tcl_ListObjAppendElement(NULL, resObj, Tcl_NewIntObj(pt));
	2335	if (plf->lfWeight >= 700) {
	2336	Tcl_ListObjAppendElement(NULL, resObj,
	2337	Tcl_NewStringObj("bold", -1));
	2338	}
	2339	if (plf->lfItalic) {
	2340	Tcl_ListObjAppendElement(NULL, resObj,
	2341	Tcl_NewStringObj("italic", -1));
	2342	}
	2343	if (plf->lfUnderline) {
	2344	Tcl_ListObjAppendElement(NULL, resObj,
	2345	Tcl_NewStringObj("underline", -1));
	2346	}
	2347	if (plf->lfStrikeOut) {
	2348	Tcl_ListObjAppendElement(NULL, resObj,
	2349	Tcl_NewStringObj("overstrike", -1));
	2350	}
	2351	return resObj;
	2352	}
	2353
	2354	static void
	2355	ApplyLogfont(Tcl_Interp interp, Tcl_Obj cmdObj, HDC hdc, LOGFONT *logfontPtr)
	2356	{
	2357	int objc;
	2358	Tcl_Obj objv, tmpv;
	2359	Tcl_ListObjGetElements(NULL, cmdObj, &objc, &objv);
	2360	tmpv = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj ) * (objc + 2));
	2361	memcpy(tmpv, objv, sizeof(Tcl_Obj ) objc);
	2362	tmpv[objc] = GetFontObj(hdc, logfontPtr);
	2363	TkBackgroundEvalObjv(interp, objc+1, tmpv, TCL_EVAL_GLOBAL);
	2364	ckfree((char *)tmpv);
	2365	}
	2366
	2367	/*
	2368	* ----------------------------------------------------------------------
	2369	*
	2370	* HookProc --
	2371	*
	2372	* Font selection hook. If the user selects Apply on the dialog, we
	2373	* call the applyProc script with the currently selected font as
	2374	* arguments.
	2375	*
	2376	* ----------------------------------------------------------------------
	2377	*/
	2378
	2379	typedef struct HookData {
	2380	Tcl_Interp *interp;
	2381	Tcl_Obj *titleObj;
	2382	Tcl_Obj *cmdObj;
	2383	Tcl_Obj *parentObj;
	2384	Tcl_Obj *fontObj;
	2385	HWND hwnd;
	2386	Tk_Window parent;
	2387	} HookData;
	2388
	2389	static UINT_PTR CALLBACK
	2390	HookProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
	2391	{
	2392	CHOOSEFONT pcf = (CHOOSEFONT )lParam;
	2393	HWND hwndCtrl;
	2394	static HookData *phd = NULL;
	2395	ThreadSpecificData tsdPtr = (ThreadSpecificData )
	2396	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	2397
	2398	if (WM_INITDIALOG == msg && lParam != 0) {
	2399	phd = (HookData *)pcf->lCustData;
	2400	phd->hwnd = hwndDlg;
	2401	if (tsdPtr->debugFlag) {
	2402	tsdPtr->debugInterp = (Tcl_Interp *) phd->interp;
	2403	Tcl_DoWhenIdle(SetTkDialog, (ClientData) hwndDlg);
	2404	}
	2405	if (phd->titleObj != NULL) {
	2406	Tcl_DString title;
	2407	Tcl_WinUtfToTChar(Tcl_GetString(phd->titleObj), -1, &title);
	2408	if (Tcl_DStringLength(&title) > 0) {
	2409	tkWinProcs->setWindowText(hwndDlg,
	2410	(LPCTSTR)Tcl_DStringValue(&title));
	2411	}
	2412	Tcl_DStringFree(&title);
	2413	}
	2414
	2415	/*
	2416	* Disable the colour combobox (0x473) and its label (0x443).
	2417	*/
	2418
	2419	hwndCtrl = GetDlgItem(hwndDlg, 0x443);
	2420	if (IsWindow(hwndCtrl)) {
	2421	EnableWindow(hwndCtrl, FALSE);
	2422	}
	2423	hwndCtrl = GetDlgItem(hwndDlg, 0x473);
	2424	if (IsWindow(hwndCtrl)) {
	2425	EnableWindow(hwndCtrl, FALSE);
	2426	}
	2427	TkSendVirtualEvent(phd->parent, "TkFontchooserVisibility");
	2428	return 1; /* we handled the message */
	2429	}
	2430
	2431	if (WM_DESTROY == msg) {
	2432	phd->hwnd = NULL;
	2433	TkSendVirtualEvent(phd->parent, "TkFontchooserVisibility");
	2434	return 0;
	2435	}
	2436
	2437	/*
	2438	* Handle apply button by calling the provided command script as
	2439	* a background evaluation (ie: errors dont come back here).
	2440	*/
	2441	if (WM_COMMAND == msg && LOWORD(wParam) == 1026) {
	2442	LOGFONT lf = {0};
	2443	HDC hdc = GetDC(hwndDlg);
	2444	SendMessage(hwndDlg, WM_CHOOSEFONT_GETLOGFONT, 0, (LPARAM)&lf);
	2445	if (phd && phd->cmdObj) {
	2446	ApplyLogfont(phd->interp, phd->cmdObj, hdc, &lf);
	2447	}
	2448	if (phd && phd->parent) {
	2449	TkSendVirtualEvent(phd->parent, "TkFontchooserFontChanged");
	2450	}
	2451	return 1;
	2452	}
	2453	return 0; /* pass on for default processing */
	2454	}
	2455
	2456	/*
	2457	* Helper for the FontchooserConfigure command to return the
	2458	* current value of any of the options (which may be NULL in
	2459	* the structure)
	2460	*/
	2461
	2462	enum FontchooserOption {
	2463	FontchooserParent, FontchooserTitle, FontchooserFont, FontchooserCmd,
	2464	FontchooserVisible
	2465	};
	2466
	2467	static Tcl_Obj *
	2468	FontchooserCget(HookData *hdPtr, int optionIndex)
	2469	{
	2470	Tcl_Obj *resObj = NULL;
	2471	switch(optionIndex) {
	2472	case FontchooserParent: {
	2473	if (hdPtr->parentObj) {
	2474	resObj = hdPtr->parentObj;
	2475	} else {
	2476	resObj = Tcl_NewStringObj(".", 1);
	2477	}
	2478	break;
	2479	}
	2480	case FontchooserTitle: {
	2481	if (hdPtr->titleObj) {
	2482	resObj = hdPtr->titleObj;
	2483	} else {
	2484	resObj = Tcl_NewStringObj("", 0);
	2485	}
	2486	break;
	2487	}
	2488	case FontchooserFont: {
	2489	if (hdPtr->fontObj) {
	2490	resObj = hdPtr->fontObj;
	2491	} else {
	2492	resObj = Tcl_NewStringObj("", 0);
	2493	}
	2494	break;
	2495	}
	2496	case FontchooserCmd: {
	2497	if (hdPtr->cmdObj) {
	2498	resObj = hdPtr->cmdObj;
	2499	} else {
	2500	resObj = Tcl_NewStringObj("", 0);
	2501	}
	2502	break;
	2503	}
	2504	case FontchooserVisible: {
	2505	resObj = Tcl_NewBooleanObj(hdPtr->hwnd && IsWindow(hdPtr->hwnd));
	2506	break;
	2507	}
	2508	default: {
	2509	resObj = Tcl_NewStringObj("", 0);
	2510	}
	2511	}
	2512	return resObj;
	2513	}
	2514
	2515	/*
	2516	* ----------------------------------------------------------------------
	2517	*
	2518	* FontchooserConfigureCmd --
	2519	*
	2520	* Implementation of the 'tk fontchooser configure' ensemble command.
	2521	* See the user documentation for what it does.
	2522	*
	2523	* Results:
	2524	* See the user documentation.
	2525	*
	2526	* Side effects:
	2527	* Per-interp data structure may be modified
	2528	*
	2529	* ----------------------------------------------------------------------
	2530	*/
	2531
	2532	static int
	2533	FontchooserConfigureCmd(
	2534	ClientData clientData, /* Main window */
	2535	Tcl_Interp *interp,
	2536	int objc,
	2537	Tcl_Obj *const objv[])
	2538	{
	2539	Tk_Window tkwin = (Tk_Window)clientData;
	2540	HookData *hdPtr = NULL;
	2541	int i, r = TCL_OK;
	2542	static const char *optionStrings[] = {
	2543	"-parent", "-title", "-font", "-command", "-visible", NULL
	2544	};
	2545
	2546	hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
	2547
	2548	/*
	2549	* with no arguments we return all the options in a dict
	2550	*/
	2551
	2552	if (objc == 1) {
	2553	Tcl_Obj keyObj, valueObj;
	2554	Tcl_Obj *dictObj = Tcl_NewDictObj();
	2555	for (i = 0; r == TCL_OK && optionStrings[i] != NULL; ++i) {
	2556	keyObj = Tcl_NewStringObj(optionStrings[i], -1);
	2557	valueObj = FontchooserCget(hdPtr, i);
	2558	r = Tcl_DictObjPut(interp, dictObj, keyObj, valueObj);
	2559	}
	2560	if (r == TCL_OK) {
	2561	Tcl_SetObjResult(interp, dictObj);
	2562	}
	2563	return r;
	2564	}
	2565
	2566	for (i = 1; i < objc; i += 2) {
	2567	int optionIndex, len;
	2568	if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings,
	2569	"option", 0, &optionIndex) != TCL_OK) {
	2570	return TCL_ERROR;
	2571	}
	2572	if (objc == 2) {
	2573	/* if one option and no arg - return the current value */
	2574	Tcl_SetObjResult(interp, FontchooserCget(hdPtr, optionIndex));
	2575	return TCL_OK;
	2576	}
	2577	if (i + 1 == objc) {
	2578	Tcl_AppendResult(interp, "value for \"",
	2579	Tcl_GetString(objv[i]), "\" missing", NULL);
	2580	return TCL_ERROR;
	2581	}
	2582	switch (optionIndex) {
	2583	case FontchooserVisible: {
	2584	const char *msg = "cannot change read-only option "
	2585	"\"-visible\": use the show or hide command";
	2586	Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
	2587	return TCL_ERROR;
	2588	}
	2589	case FontchooserParent: {
	2590	Tk_Window parent = Tk_NameToWindow(interp,
	2591	Tcl_GetString(objv[i+1]), tkwin);
	2592	if (parent == None) {
	2593	return TCL_ERROR;
	2594	}
	2595	if (hdPtr->parentObj) {
	2596	Tcl_DecrRefCount(hdPtr->parentObj);
	2597	}
	2598	hdPtr->parentObj = objv[i+1];
	2599	if (Tcl_IsShared(hdPtr->parentObj)) {
	2600	hdPtr->parentObj = Tcl_DuplicateObj(hdPtr->parentObj);
	2601	}
	2602	Tcl_IncrRefCount(hdPtr->parentObj);
	2603	break;
	2604	}
	2605	case FontchooserTitle: {
	2606	if (hdPtr->titleObj) {
	2607	Tcl_DecrRefCount(hdPtr->titleObj);
	2608	}
	2609	hdPtr->titleObj = objv[i+1];
	2610	if (Tcl_IsShared(hdPtr->titleObj)) {
	2611	hdPtr->titleObj = Tcl_DuplicateObj(hdPtr->titleObj);
	2612	}
	2613	Tcl_IncrRefCount(hdPtr->titleObj);
	2614	break;
	2615	}
	2616	case FontchooserFont: {
	2617	if (hdPtr->fontObj) {
	2618	Tcl_DecrRefCount(hdPtr->fontObj);
	2619	}
	2620	Tcl_GetStringFromObj(objv[i+1], &len);
	2621	if (len) {
	2622	hdPtr->fontObj = objv[i+1];
	2623	if (Tcl_IsShared(hdPtr->fontObj)) {
	2624	hdPtr->fontObj = Tcl_DuplicateObj(hdPtr->fontObj);
	2625	}
	2626	Tcl_IncrRefCount(hdPtr->fontObj);
	2627	} else {
	2628	hdPtr->fontObj = NULL;
	2629	}
	2630	break;
	2631	}
	2632	case FontchooserCmd: {
	2633	if (hdPtr->cmdObj) {
	2634	Tcl_DecrRefCount(hdPtr->cmdObj);
	2635	}
	2636	Tcl_GetStringFromObj(objv[i+1], &len);
	2637	if (len) {
	2638	hdPtr->cmdObj = objv[i+1];
	2639	if (Tcl_IsShared(hdPtr->cmdObj)) {
	2640	hdPtr->cmdObj = Tcl_DuplicateObj(hdPtr->cmdObj);
	2641	}
	2642	Tcl_IncrRefCount(hdPtr->cmdObj);
	2643	} else {
	2644	hdPtr->cmdObj = NULL;
	2645	}
	2646	break;
	2647	}
	2648	}
	2649	}
	2650	return TCL_OK;
	2651	}
	2652
	2653	/*
	2654	* ----------------------------------------------------------------------
	2655	*
	2656	* FontchooserShowCmd --
	2657	*
	2658	* Implements the 'tk fontchooser show' ensemble command. The
	2659	* per-interp configuration data for the dialog is held in an interp
	2660	* associated structure.
	2661	* Calls the Win32 FontChooser API which provides a modal dialog.
	2662	* See HookProc where we make a few changes to the dialog and set
	2663	* some additional state.
	2664	*
	2665	* ----------------------------------------------------------------------
	2666	*/
	2667
	2668	static int
	2669	FontchooserShowCmd(
	2670	ClientData clientData, /* Main window */
	2671	Tcl_Interp *interp,
	2672	int objc,
	2673	Tcl_Obj *const objv[])
	2674	{
	2675	Tk_Window tkwin, parent;
	2676	CHOOSEFONT cf;
	2677	LOGFONT lf;
	2678	HDC hdc;
	2679	HookData *hdPtr;
	2680	int r = TCL_OK, oldMode = 0;
	2681
	2682	hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
	2683
	2684	tkwin = parent = (Tk_Window) clientData;
	2685	if (hdPtr->parentObj) {
	2686	parent = Tk_NameToWindow(interp, Tcl_GetString(hdPtr->parentObj), tkwin);
	2687	if (parent == None) {
	2688	return TCL_ERROR;
	2689	}
	2690	}
	2691
	2692	Tk_MakeWindowExist(parent);
	2693
	2694	ZeroMemory(&cf, sizeof(CHOOSEFONT));
	2695	ZeroMemory(&lf, sizeof(LOGFONT));
	2696	lf.lfCharSet = DEFAULT_CHARSET;
	2697	cf.lStructSize = sizeof(CHOOSEFONT);
	2698	cf.hwndOwner = Tk_GetHWND(Tk_WindowId(parent));
	2699	cf.lpLogFont = &lf;
	2700	cf.nFontType = SCREEN_FONTTYPE;
	2701	cf.Flags = CF_SCREENFONTS \| CF_EFFECTS \| CF_ENABLEHOOK;
	2702	cf.rgbColors = RGB(0,0,0);
	2703	cf.lpfnHook = HookProc;
	2704	cf.lCustData = (INT_PTR)hdPtr;
	2705	hdPtr->interp = interp;
	2706	hdPtr->parent = parent;
	2707	hdc = GetDC(cf.hwndOwner);
	2708
	2709	if (hdPtr->fontObj != NULL) {
	2710	TkFont *fontPtr;
	2711	Tk_Font f = Tk_AllocFontFromObj(interp, tkwin, hdPtr->fontObj);
	2712	if (f == NULL) {
	2713	return TCL_ERROR;
	2714	}
	2715	fontPtr = (TkFont *)f;
	2716	cf.Flags \|= CF_INITTOLOGFONTSTRUCT;
	2717	strncpy(lf.lfFaceName, Tk_GetUid(fontPtr->fa.family), LF_FACESIZE-1);
	2718	lf.lfFaceName[LF_FACESIZE-1] = 0;
	2719	lf.lfHeight = -MulDiv(TkFontGetPoints(tkwin, fontPtr->fa.size),
	2720	GetDeviceCaps(hdc, LOGPIXELSY), 72);
	2721	if (fontPtr->fa.weight == TK_FW_BOLD) lf.lfWeight = FW_BOLD;
	2722	if (fontPtr->fa.slant != TK_FS_ROMAN) lf.lfItalic = TRUE;
	2723	if (fontPtr->fa.underline) lf.lfUnderline = TRUE;
	2724	if (fontPtr->fa.overstrike) lf.lfStrikeOut = TRUE;
	2725	Tk_FreeFont(f);
	2726	}
	2727
	2728	if (TCL_OK == r && hdPtr->cmdObj != NULL) {
	2729	int len = 0;
	2730	r = Tcl_ListObjLength(interp, hdPtr->cmdObj, &len);
	2731	if (len > 0) cf.Flags \|= CF_APPLY;
	2732	}
	2733
	2734	if (TCL_OK == r) {
	2735	oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
	2736	if (ChooseFont(&cf)) {
	2737	if (hdPtr->cmdObj) {
	2738	ApplyLogfont(hdPtr->interp, hdPtr->cmdObj, hdc, &lf);
	2739	}
	2740	if (hdPtr->parent) {
	2741	TkSendVirtualEvent(hdPtr->parent, "TkFontchooserFontChanged");
	2742	}
	2743	}
	2744	Tcl_SetServiceMode(oldMode);
	2745	EnableWindow(cf.hwndOwner, 1);
	2746	}
	2747
	2748	ReleaseDC(cf.hwndOwner, hdc);
	2749
	2750	return r;
	2751	}
	2752
	2753	/*
	2754	* ----------------------------------------------------------------------
	2755	*
	2756	* FontchooserHideCmd --
	2757	*
	2758	* Implementation of the 'tk fontchooser hide' ensemble. See the
	2759	* user documentation for details.
	2760	* As the Win32 FontChooser function is always modal all we do here
	2761	* is destroy the dialog
	2762	*
	2763	* ----------------------------------------------------------------------
	2764	*/
	2765
	2766	static int
	2767	FontchooserHideCmd(
	2768	ClientData clientData, /* Main window */
	2769	Tcl_Interp *interp,
	2770	int objc,
	2771	Tcl_Obj *const objv[])
	2772	{
	2773	HookData *hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
	2774	if (hdPtr->hwnd && IsWindow(hdPtr->hwnd)) {
	2775	EndDialog(hdPtr->hwnd, 0);
	2776	}
	2777	return TCL_OK;
	2778	}
	2779
	2780	/*
	2781	* ----------------------------------------------------------------------
	2782	*
	2783	* DeleteHookData --
	2784	*
	2785	* Clean up the font chooser configuration data when the interp
	2786	* is destroyed.
	2787	*
	2788	* ----------------------------------------------------------------------
	2789	*/
	2790
	2791	static void
	2792	DeleteHookData(ClientData clientData, Tcl_Interp *interp)
	2793	{
	2794	HookData *hdPtr = clientData;
	2795	if (hdPtr->parentObj)
	2796	Tcl_DecrRefCount(hdPtr->parentObj);
	2797	if (hdPtr->fontObj)
	2798	Tcl_DecrRefCount(hdPtr->fontObj);
	2799	if (hdPtr->titleObj)
	2800	Tcl_DecrRefCount(hdPtr->titleObj);
	2801	if (hdPtr->cmdObj)
	2802	Tcl_DecrRefCount(hdPtr->cmdObj);
	2803	ckfree((char *)hdPtr);
	2804	}
	2805
	2806	/*
	2807	* ----------------------------------------------------------------------
	2808	*
	2809	* TkInitFontchooser --
	2810	*
	2811	* Associate the font chooser configuration data with the Tcl
	2812	* interpreter. There is one font chooser per interp.
	2813	*
	2814	* ----------------------------------------------------------------------
	2815	*/
	2816
	2817	MODULE_SCOPE const TkEnsemble tkFontchooserEnsemble[];
	2818	const TkEnsemble tkFontchooserEnsemble[] = {
	2819	{ "configure", FontchooserConfigureCmd, NULL },
	2820	{ "show", FontchooserShowCmd, NULL },
	2821	{ "hide", FontchooserHideCmd, NULL },
	2822	{ NULL, NULL, NULL }
	2823	};
	2824
	2825	int
	2826	TkInitFontchooser(Tcl_Interp *interp, ClientData clientData)
	2827	{
	2828	HookData *hdPtr = NULL;
	2829	hdPtr = (HookData *)ckalloc(sizeof(HookData));
	2830	memset(hdPtr, 0, sizeof(HookData));
	2831	Tcl_SetAssocData(interp, "::tk::fontchooser", DeleteHookData, hdPtr);
	2832	return TCL_OK;
	2833	}
	2834
	2835	/*
2299	2836	* Local Variables:
2300	2837	* mode: c
2301	2838	* c-basic-offset: 4

+4

-7

win/tkWinDraw.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkWinDraw.c,v 1.21 2008/04/27 22:39:16 dkf Exp $
	12	* RCS: @(#) $Id: tkWinDraw.c,v 1.23 2008/11/22 20:05:32 patthoyts Exp $
13	13	*/
14	14
15	15	#include "tkWinInt.h"

18	18	* These macros convert between X's bizarre angle units to radians.
19	19	*/
20	20
21		#define PI 3.14159265358979
22	21	#define XAngleToRadians(a) ((double)(a) / 64 * PI / 180);
23	22
24	23	/*

813	812	SetPolyFillMode(dcMem, (gc->fill_rule == EvenOddRule) ? ALTERNATE
814	813	: WINDING);
815	814	oldMemBrush = SelectObject(dcMem, CreateSolidBrush(gc->foreground));
816		(*func)(dcMem, winPoints, npoints);
	815	func(dcMem, winPoints, npoints);
817	816	BitBlt(dc, rect.left, rect.top, width, height, dcMem, 0, 0, COPYFG);
818	817
819	818	/*

825	824	if (gc->fill_style == FillOpaqueStippled) {
826	825	DeleteObject(SelectObject(dcMem,
827	826	CreateSolidBrush(gc->background)));
828		(*func)(dcMem, winPoints, npoints);
	827	func(dcMem, winPoints, npoints);
829	828	BitBlt(dc, rect.left, rect.top, width, height, dcMem, 0, 0,
830	829	COPYBG);
831	830	}

841	840
842	841	SetPolyFillMode(dc, (gc->fill_rule == EvenOddRule) ? ALTERNATE
843	842	: WINDING);
844
845		(*func)(dc, winPoints, npoints);
846
	843	func(dc, winPoints, npoints);
847	844	SelectObject(dc, oldPen);
848	845	}
849	846	DeleteObject(SelectObject(dc, oldBrush));

+290

-84

win/tkWinFont.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkWinFont.c,v 1.40 2008/10/05 18:22:22 dkf Exp $
	13	* RCS: @(#) $Id: tkWinFont.c,v 1.45 2008/11/22 20:05:32 patthoyts Exp $
14	14	*/
15	15
16	16	#include "tkWinInt.h"

51	51	int isSymbolFont; /* Non-zero if this is a symbol font. */
52	52	int isWideFont; /* 1 if this is a double-byte font, 0
53	53	* otherwise. */
54		BOOL (WINAPI textOutProc)(HDC, int, int, TCHAR , int);
	54	BOOL (WINAPI textOutProc)(HDC hdc, int x, int y, TCHAR str, int len);
55	55	/* The procedure to use to draw text after it
56	56	* has been converted from UTF-8 to the
57	57	* encoding of this font. */

95	95	typedef struct SubFont {
96	96	char *fontMap; / Pointer to font map from the FontFamily,
97	97	* cached here to save a dereference. */
98		HFONT hFont; /* The specific screen font that will be used
	98	HFONT hFont0; /* The specific screen font that will be used
99	99	* when displaying/measuring chars belonging
100	100	* to the FontFamily. */
101	101	FontFamily familyPtr; / The FontFamily for this SubFont. */
	102	HFONT hFontAngled;
	103	double angle;
102	104	} SubFont;
103	105
104	106	/*

124	126	* attributes. Usually points to
125	127	* staticSubFonts, but may point to malloced
126	128	* space if there are lots of SubFonts. */
127
128	129	HWND hwnd; /* Toplevel window of application that owns
129	130	* this font, used for getting HDC for
130	131	* offscreen measurements. */

190	191
191	192	static FontFamily * AllocFontFamily(HDC hdc, HFONT hFont, int base);
192	193	static SubFont * CanUseFallback(HDC hdc, WinFont *fontPtr,
193		char *fallbackName, int ch,
	194	const char *fallbackName, int ch,
194	195	SubFont **subFontPtrPtr);
195	196	static SubFont * CanUseFallbackWithAliases(HDC hdc, WinFont *fontPtr,
196		char faceName, int ch, Tcl_DString nameTriedPtr,
	197	const char *faceName, int ch,
	198	Tcl_DString *nameTriedPtr,
197	199	SubFont **subFontPtrPtr);
198	200	static int FamilyExists(HDC hdc, const char *faceName);
199		static char * FamilyOrAliasExists(HDC hdc, const char *faceName);
	201	static const char * FamilyOrAliasExists(HDC hdc, const char *faceName);
200	202	static SubFont * FindSubFontForChar(WinFont *fontPtr, int ch,
201	203	SubFont **subFontPtrPtr);
202	204	static void FontMapInsert(SubFont *subFontPtr, int ch);

204	206	static int FontMapLookup(SubFont *subFontPtr, int ch);
205	207	static void FreeFontFamily(FontFamily *familyPtr);
206	208	static HFONT GetScreenFont(const TkFontAttributes *faPtr,
207		const char *faceName, int pixelSize);
	209	const char *faceName, int pixelSize,
	210	double angle);
208	211	static void InitFont(Tk_Window tkwin, HFONT hFont,
209	212	int overstrike, WinFont *tkFontPtr);
210		static void InitSubFont(HDC hdc, HFONT hFont, int base,
	213	static inline void InitSubFont(HDC hdc, HFONT hFont, int base,
211	214	SubFont *subFontPtr);
212	215	static int CreateNamedSystemLogFont(Tcl_Interp *interp,
213	216	Tk_Window tkwin, const char* name,

218	221	USHORT startCount, USHORT endCount,
219	222	int *symbolPtr);
220	223	static void MultiFontTextOut(HDC hdc, WinFont *fontPtr,
221		const char *source, int numBytes, int x, int y);
	224	const char *source, int numBytes, int x, int y,
	225	double angle);
222	226	static void ReleaseFont(WinFont *fontPtr);
223		static void ReleaseSubFont(SubFont *subFontPtr);
	227	static inline void ReleaseSubFont(SubFont *subFontPtr);
224	228	static int SeenName(const char name, Tcl_DString dsPtr);
225		static void SwapLong(PULONG p);
226		static void SwapShort(USHORT *p);
	229	static inline HFONT SelectFont(HDC hdc, WinFont *fontPtr,
	230	SubFont *subFontPtr, double angle);
	231	static inline void SwapLong(PULONG p);
	232	static inline void SwapShort(USHORT *p);
227	233	static int CALLBACK WinFontCanUseProc(ENUMLOGFONT *lfPtr,
228	234	NEWTEXTMETRIC *tmPtr, int fontType,
229	235	LPARAM lParam);

318	324
319	325	/*
320	326	*---------------------------------------------------------------------------
	327	*
321	328	* CreateNamedSystemFont --
322	329	*
323	330	* This function registers a Windows logical font description with the Tk
324	331	* named font mechanism.
325	332	*
326		* Side effects
327		*
	333	* Side effects:
328	334	* A new named font is added to the Tk font registry.
329	335	*
330	336	*---------------------------------------------------------------------------

339	345	{
340	346	HFONT hFont;
341	347	int r;
342
	348
343	349	hFont = CreateFontIndirect(logFontPtr);
344	350	r = CreateNamedSystemFont(interp, tkwin, name, hFont);
345	351	DeleteObject((HGDIOBJ)hFont);

348	354
349	355	/*
350	356	*---------------------------------------------------------------------------
	357	*
351	358	* CreateNamedSystemFont --
352	359	*
353		* This function registers a Windows font with the Tk
354		* named font mechanism.
355		*
356		* Side effects
357		*
	360	* This function registers a Windows font with the Tk named font
	361	* mechanism.
	362	*
	363	* Side effects:
358	364	* A new named font is added to the Tk font registry.
359	365	*
360	366	*---------------------------------------------------------------------------

369	375	{
370	376	WinFont winfont;
371	377	int r;
372
	378
373	379	TkDeleteNamedFont(NULL, tkwin, name);
374	380	InitFont(tkwin, hFont, 0, &winfont);
375	381	r = TkCreateNamedFont(interp, tkwin, name, &winfont.font.fa);

379	385
380	386	/*
381	387	*---------------------------------------------------------------------------
	388	*
382	389	* TkWinSystemFonts --
383	390	*
384	391	* Create some platform specific named fonts that to give access to the
385		* system fonts. These are all defined for the Windows desktop parameters.
	392	* system fonts. These are all defined for the Windows desktop
	393	* parameters.
386	394	*
387	395	*---------------------------------------------------------------------------
388	396	*/
389	397
390	398	void
391		TkWinSetupSystemFonts(TkMainInfo *mainPtr)
	399	TkWinSetupSystemFonts(
	400	TkMainInfo *mainPtr)
392	401	{
393	402	Tcl_Interp *interp;
394	403	Tk_Window tkwin;

442	451	hFont = (HFONT) GetStockObject(ANSI_FIXED_FONT);
443	452	CreateNamedSystemFont(interp, tkwin, "TkFixedFont", hFont);
444	453
445		/*
	454	/*
446	455	* Setup the remaining standard Tk font names as named fonts.
447	456	*/
448	457

499	508	HFONT hFont;
500	509	Window window;
501	510	WinFont *fontPtr;
502		char ***fontFallbacks;
	511	const char const const *fontFallbacks;
503	512	Tk_Uid faceName, fallback, actualName;
504	513
505	514	tkwin = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr;

547	556	ReleaseDC(hwnd, hdc);
548	557
549	558	hFont = GetScreenFont(faPtr, faceName,
550		TkFontGetPixels(tkwin, faPtr->size));
	559	TkFontGetPixels(tkwin, faPtr->size), 0.0);
551	560	if (tkFontPtr == NULL) {
552	561	fontPtr = (WinFont *) ckalloc(sizeof(WinFont));
553	562	} else {

725	734	Tk_Window tkwin, /* Window on the font's display */
726	735	Tk_Font tkfont, /* Font to query */
727	736	Tcl_UniChar c, /* Character of interest */
728		TkFontAttributes* faPtr) /* Output: Font attributes */
	737	TkFontAttributes faPtr) / Output: Font attributes */
729	738	{
730	739	WinFont fontPtr = (WinFont ) tkfont;
731	740	/* Structure describing the logical font */

733	742	/* GDI device context */
734	743	SubFont *lastSubFontPtr = &fontPtr->subFontArray[0];
735	744	/* Pointer to subfont array in case
736		* FindSubFontForChar needs to fix up
737		* the memory allocation */
738		SubFont *thisSubFontPtr = FindSubFontForChar(fontPtr, c,
739		&lastSubFontPtr);
740		/* Pointer to the subfont to use for
741		* the given character */
	745	* FindSubFontForChar needs to fix up the
	746	* memory allocation */
	747	SubFont *thisSubFontPtr =
	748	FindSubFontForChar(fontPtr, c, &lastSubFontPtr);
	749	/* Pointer to the subfont to use for the given
	750	* character */
742	751	FontFamily *familyPtr = thisSubFontPtr->familyPtr;
743	752	HFONT oldfont; /* Saved font from the device context */
744	753	TEXTMETRIC tm; /* Font metrics of the selected subfont */

747	756	* Get the font attributes.
748	757	*/
749	758
750		oldfont = SelectObject(hdc, thisSubFontPtr->hFont);
	759	oldfont = SelectObject(hdc, thisSubFontPtr->hFont0);
751	760	GetTextMetrics(hdc, &tm);
752	761	SelectObject(hdc, oldfont);
753	762	ReleaseDC(fontPtr->hwnd, hdc);

825	834
826	835	hdc = GetDC(fontPtr->hwnd);
827	836	lastSubFontPtr = &fontPtr->subFontArray[0];
828		oldFont = SelectObject(hdc, lastSubFontPtr->hFont);
	837	oldFont = SelectObject(hdc, lastSubFontPtr->hFont0);
829	838
830	839	/*
831	840	* A three step process:

847	856	Tcl_UtfToExternalDString(familyPtr->encoding, start,
848	857	(int) (p - start), &runString);
849	858	size.cx = 0;
850		(*familyPtr->getTextExtentPoint32Proc)(hdc,
	859	familyPtr->getTextExtentPoint32Proc(hdc,
851	860	Tcl_DStringValue(&runString),
852	861	Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
853	862	&size);

860	869	lastSubFontPtr = thisSubFontPtr;
861	870	start = p;
862	871
863		SelectObject(hdc, lastSubFontPtr->hFont);
	872	SelectObject(hdc, lastSubFontPtr->hFont0);
864	873	}
865	874	p = next;
866	875	}

875	884	Tcl_UtfToExternalDString(familyPtr->encoding, start,
876	885	(int) (p - start), &runString);
877	886	size.cx = 0;
878		(*familyPtr->getTextExtentPoint32Proc)(hdc,
879		Tcl_DStringValue(&runString),
	887	familyPtr->getTextExtentPoint32Proc(hdc, Tcl_DStringValue(&runString),
880	888	Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
881	889	&size);
882	890	Tcl_DStringFree(&runString);

909	917	&dstWrote, NULL);
910	918	Tcl_DStringAppend(&runString,buf,dstWrote);
911	919	size.cx = 0;
912		(*familyPtr->getTextExtentPoint32Proc)(hdc,
	920	familyPtr->getTextExtentPoint32Proc(hdc,
913	921	Tcl_DStringValue(&runString),
914	922	Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
915	923	&size);

1089	1097	SetROP2(dc, tkpWinRopModes[gc->function]);
1090	1098
1091	1099	if ((gc->clip_mask != None) &&
1092		((TkpClipMask*)gc->clip_mask)->type == TKP_CLIP_REGION) {
1093		SelectClipRgn(dc, (HRGN)((TkpClipMask*)gc->clip_mask)->value.region);
	1100	((TkpClipMask *) gc->clip_mask)->type == TKP_CLIP_REGION) {
	1101	SelectClipRgn(dc, (HRGN)((TkpClipMask *)gc->clip_mask)->value.region);
	1102	}
	1103
	1104	if ((gc->fill_style == FillStippled
	1105	\|\| gc->fill_style == FillOpaqueStippled)
	1106	&& gc->stipple != None) {
	1107	TkWinDrawable twdPtr = (TkWinDrawable ) gc->stipple;
	1108	HBRUSH oldBrush, stipple;
	1109	HBITMAP oldBitmap, bitmap;
	1110	HDC dcMem;
	1111	TEXTMETRIC tm;
	1112	SIZE size;
	1113
	1114	if (twdPtr->type != TWD_BITMAP) {
	1115	Tcl_Panic("unexpected drawable type in stipple");
	1116	}
	1117
	1118	/*
	1119	* Select stipple pattern into destination dc.
	1120	*/
	1121
	1122	dcMem = CreateCompatibleDC(dc);
	1123
	1124	stipple = CreatePatternBrush(twdPtr->bitmap.handle);
	1125	SetBrushOrgEx(dc, gc->ts_x_origin, gc->ts_y_origin, NULL);
	1126	oldBrush = SelectObject(dc, stipple);
	1127
	1128	SetTextAlign(dcMem, TA_LEFT \| TA_BASELINE);
	1129	SetTextColor(dcMem, gc->foreground);
	1130	SetBkMode(dcMem, TRANSPARENT);
	1131	SetBkColor(dcMem, RGB(0, 0, 0));
	1132
	1133	/*
	1134	* Compute the bounding box and create a compatible bitmap.
	1135	*/
	1136
	1137	GetTextExtentPoint(dcMem, source, numBytes, &size);
	1138	GetTextMetrics(dcMem, &tm);
	1139	size.cx -= tm.tmOverhang;
	1140	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
	1141	oldBitmap = SelectObject(dcMem, bitmap);
	1142
	1143	/*
	1144	* The following code is tricky because fonts are rendered in multiple
	1145	* colors. First we draw onto a black background and copy the white
	1146	* bits. Then we draw onto a white background and copy the black bits.
	1147	* Both the foreground and background bits of the font are ANDed with
	1148	* the stipple pattern as they are copied.
	1149	*/
	1150
	1151	PatBlt(dcMem, 0, 0, size.cx, size.cy, BLACKNESS);
	1152	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y, 0.0);
	1153	BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
	1154	0, 0, 0xEA02E9);
	1155	PatBlt(dcMem, 0, 0, size.cx, size.cy, WHITENESS);
	1156	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y, 0.0);
	1157	BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
	1158	0, 0, 0x8A0E06);
	1159
	1160	/*
	1161	* Destroy the temporary bitmap and restore the device context.
	1162	*/
	1163
	1164	SelectObject(dcMem, oldBitmap);
	1165	DeleteObject(bitmap);
	1166	DeleteDC(dcMem);
	1167	SelectObject(dc, oldBrush);
	1168	DeleteObject(stipple);
	1169	} else if (gc->function == GXcopy) {
	1170	SetTextAlign(dc, TA_LEFT \| TA_BASELINE);
	1171	SetTextColor(dc, gc->foreground);
	1172	SetBkMode(dc, TRANSPARENT);
	1173	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y, 0.0);
	1174	} else {
	1175	HBITMAP oldBitmap, bitmap;
	1176	HDC dcMem;
	1177	TEXTMETRIC tm;
	1178	SIZE size;
	1179
	1180	dcMem = CreateCompatibleDC(dc);
	1181
	1182	SetTextAlign(dcMem, TA_LEFT \| TA_BASELINE);
	1183	SetTextColor(dcMem, gc->foreground);
	1184	SetBkMode(dcMem, TRANSPARENT);
	1185	SetBkColor(dcMem, RGB(0, 0, 0));
	1186
	1187	/*
	1188	* Compute the bounding box and create a compatible bitmap.
	1189	*/
	1190
	1191	GetTextExtentPoint(dcMem, source, numBytes, &size);
	1192	GetTextMetrics(dcMem, &tm);
	1193	size.cx -= tm.tmOverhang;
	1194	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
	1195	oldBitmap = SelectObject(dcMem, bitmap);
	1196
	1197	MultiFontTextOut(dcMem, fontPtr, source, numBytes, 0, tm.tmAscent,
	1198	0.0);
	1199	BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
	1200	0, 0, (DWORD) tkpWinBltModes[gc->function]);
	1201
	1202	/*
	1203	* Destroy the temporary bitmap and restore the device context.
	1204	*/
	1205
	1206	SelectObject(dcMem, oldBitmap);
	1207	DeleteObject(bitmap);
	1208	DeleteDC(dcMem);
	1209	}
	1210	TkWinReleaseDrawableDC(drawable, dc, &state);
	1211	}
	1212
	1213	void
	1214	TkpDrawAngledChars(
	1215	Display display, / Display on which to draw. */
	1216	Drawable drawable, /* Window or pixmap in which to draw. */
	1217	GC gc, /* Graphics context for drawing characters. */
	1218	Tk_Font tkfont, /* Font in which characters will be drawn;
	1219	* must be the same as font used in GC. */
	1220	const char source, / UTF-8 string to be displayed. Need not be
	1221	* '\0' terminated. All Tk meta-characters
	1222	* (tabs, control characters, and newlines)
	1223	* should be stripped out of the string that
	1224	* is passed to this function. If they are not
	1225	* stripped out, they will be displayed as
	1226	* regular printing characters. */
	1227	int numBytes, /* Number of bytes in string. */
	1228	double x, double y, /* Coordinates at which to place origin of
	1229	* string when drawing. */
	1230	double angle)
	1231	{
	1232	HDC dc;
	1233	WinFont *fontPtr;
	1234	TkWinDCState state;
	1235
	1236	fontPtr = (WinFont *) gc->font;
	1237	display->request++;
	1238
	1239	if (drawable == None) {
	1240	return;
	1241	}
	1242
	1243	dc = TkWinGetDrawableDC(display, drawable, &state);
	1244
	1245	SetROP2(dc, tkpWinRopModes[gc->function]);
	1246
	1247	if ((gc->clip_mask != None) &&
	1248	((TkpClipMask *) gc->clip_mask)->type == TKP_CLIP_REGION) {
	1249	SelectClipRgn(dc, (HRGN)((TkpClipMask *)gc->clip_mask)->value.region);
1094	1250	}
1095	1251
1096	1252	if ((gc->fill_style == FillStippled

1141	1297	*/
1142	1298
1143	1299	PatBlt(dcMem, 0, 0, size.cx, size.cy, BLACKNESS);
1144		MultiFontTextOut(dc, fontPtr, source, numBytes, x, y);
1145		BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
	1300	MultiFontTextOut(dc, fontPtr, source, numBytes, (int)x, (int)y, angle);
	1301	BitBlt(dc, (int)x, (int)y - tm.tmAscent, size.cx, size.cy, dcMem,
1146	1302	0, 0, 0xEA02E9);
1147	1303	PatBlt(dcMem, 0, 0, size.cx, size.cy, WHITENESS);
1148		MultiFontTextOut(dc, fontPtr, source, numBytes, x, y);
1149		BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
	1304	MultiFontTextOut(dc, fontPtr, source, numBytes, (int)x, (int)y, angle);
	1305	BitBlt(dc, (int)x, (int)y - tm.tmAscent, size.cx, size.cy, dcMem,
1150	1306	0, 0, 0x8A0E06);
1151	1307
1152	1308	/*

1162	1318	SetTextAlign(dc, TA_LEFT \| TA_BASELINE);
1163	1319	SetTextColor(dc, gc->foreground);
1164	1320	SetBkMode(dc, TRANSPARENT);
1165		MultiFontTextOut(dc, fontPtr, source, numBytes, x, y);
	1321	MultiFontTextOut(dc, fontPtr, source, numBytes, (int)x, (int)y, angle);
1166	1322	} else {
1167	1323	HBITMAP oldBitmap, bitmap;
1168	1324	HDC dcMem;

1186	1342	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
1187	1343	oldBitmap = SelectObject(dcMem, bitmap);
1188	1344
1189		MultiFontTextOut(dcMem, fontPtr, source, numBytes, 0, tm.tmAscent);
1190		BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
	1345	MultiFontTextOut(dcMem, fontPtr, source, numBytes, 0, tm.tmAscent,
	1346	angle);
	1347	BitBlt(dc, (int)x, (int)y - tm.tmAscent, size.cx, size.cy, dcMem,
1191	1348	0, 0, (DWORD) tkpWinBltModes[gc->function]);
1192	1349
1193	1350	/*

1241	1398	* drawing. */
1242	1399	{
1243	1400	(void) numBytes; /unused/
1244		Tk_DrawChars(display, drawable, gc, tkfont,
1245		source + rangeStart, rangeLength, x, y);
	1401	Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
	1402	rangeLength, x, y);
1246	1403	}
1247	1404
1248	1405	/*

1272	1429	* following string. */
1273	1430	const char source, / Potentially multilingual UTF-8 string. */
1274	1431	int numBytes, /* Length of string in bytes. */
1275		int x, int y) /* Coordinates at which to place origin of
	1432	int x, int y, /* Coordinates at which to place origin of
1276	1433	* string when drawing. */
	1434	double angle)
1277	1435	{
1278	1436	Tcl_UniChar ch;
1279	1437	SIZE size;

1285	1443	TEXTMETRIC tm;
1286	1444
1287	1445	lastSubFontPtr = &fontPtr->subFontArray[0];
1288		oldFont = SelectObject(hdc, lastSubFontPtr->hFont);
	1446	oldFont = SelectFont(hdc, fontPtr, lastSubFontPtr, angle);
1289	1447	GetTextMetrics(hdc, &tm);
1290	1448
1291	1449	end = source + numBytes;

1297	1455	familyPtr = lastSubFontPtr->familyPtr;
1298	1456	Tcl_UtfToExternalDString(familyPtr->encoding, source,
1299	1457	(int) (p - source), &runString);
1300		(*familyPtr->textOutProc)(hdc, x-(tm.tmOverhang/2), y,
	1458	familyPtr->textOutProc(hdc, x-(tm.tmOverhang/2), y,
1301	1459	Tcl_DStringValue(&runString),
1302	1460	Tcl_DStringLength(&runString)>>familyPtr->isWideFont);
1303		(*familyPtr->getTextExtentPoint32Proc)(hdc,
	1461	familyPtr->getTextExtentPoint32Proc(hdc,
1304	1462	Tcl_DStringValue(&runString),
1305	1463	Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
1306	1464	&size);

1309	1467	}
1310	1468	lastSubFontPtr = thisSubFontPtr;
1311	1469	source = p;
1312		SelectObject(hdc, lastSubFontPtr->hFont);
	1470	SelectFont(hdc, fontPtr, lastSubFontPtr, angle);
1313	1471	GetTextMetrics(hdc, &tm);
1314	1472	}
1315	1473	p = next;

1318	1476	familyPtr = lastSubFontPtr->familyPtr;
1319	1477	Tcl_UtfToExternalDString(familyPtr->encoding, source,
1320	1478	(int) (p - source), &runString);
1321		(*familyPtr->textOutProc)(hdc, x-(tm.tmOverhang/2), y,
	1479	familyPtr->textOutProc(hdc, x-(tm.tmOverhang/2), y,
1322	1480	Tcl_DStringValue(&runString),
1323	1481	Tcl_DStringLength(&runString) >> familyPtr->isWideFont);
1324	1482	Tcl_DStringFree(&runString);
1325	1483	}
1326	1484	SelectObject(hdc, oldFont);
	1485	}
	1486
	1487	static inline HFONT
	1488	SelectFont(
	1489	HDC hdc,
	1490	WinFont *fontPtr,
	1491	SubFont *subFontPtr,
	1492	double angle)
	1493	{
	1494	if (angle == 0.0) {
	1495	return SelectObject(hdc, subFontPtr->hFont0);
	1496	} else if (angle == subFontPtr->angle) {
	1497	return SelectObject(hdc, subFontPtr->hFontAngled);
	1498	} else {
	1499	if (subFontPtr->hFontAngled) {
	1500	DeleteObject(subFontPtr->hFontAngled);
	1501	}
	1502	subFontPtr->hFontAngled = GetScreenFont(&fontPtr->font.fa,
	1503	subFontPtr->familyPtr->faceName, fontPtr->pixelSize, angle);
	1504	if (subFontPtr->hFontAngled == NULL) {
	1505	return SelectObject(hdc, subFontPtr->hFont0);
	1506	}
	1507	subFontPtr->angle = angle;
	1508	return SelectObject(hdc, subFontPtr->hFontAngled);
	1509	}
1327	1510	}
1328	1511
1329	1512	/*

1402	1585
1403	1586	fontPtr->font.fid = (Font) fontPtr;
1404	1587	fontPtr->hwnd = hwnd;
1405		fontPtr->pixelSize = tm.tmHeight - tm.tmInternalLeading;
	1588	fontPtr->pixelSize = tm.tmHeight;
	1589
	1590	/*
	1591	* The font pixelSize should be the tmHeight - tmInternalLeading
	1592	* but this causes fonts to appear too small on for instance
	1593	* Russian systems where there is internal leading in use.
	1594	* This hack appears to sort things out.
	1595	* NB: the logic on this flag is reversed - this means if the
	1596	* font is not fixed then subtract the leading value.
	1597	*/
	1598
	1599	if (tm.tmPitchAndFamily & TMPF_FIXED_PITCH) {
	1600	fontPtr->pixelSize -= tm.tmInternalLeading;
	1601	}
1406	1602
1407	1603	faPtr = &fontPtr->font.fa;
1408	1604	faPtr->family = Tk_GetUid(Tcl_DStringValue(&faceString));
1409	1605
1410	1606	faPtr->size =
1411		TkFontGetPoints(tkwin, -(fontPtr->pixelSize));
	1607	TkFontGetPoints(tkwin, -(fontPtr->pixelSize));
1412	1608	faPtr->weight =
1413	1609	(tm.tmWeight > FW_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL;
1414	1610	faPtr->slant = (tm.tmItalic != 0) ? TK_FS_ITALIC : TK_FS_ROMAN;

1486	1682	*-------------------------------------------------------------------------
1487	1683	*/
1488	1684
1489		static void
	1685	static inline void
1490	1686	InitSubFont(
1491	1687	HDC hdc, /* HDC in which font can be selected. */
1492	1688	HFONT hFont, /* The screen font. */

1495	1691	SubFont subFontPtr) / Filled with SubFont constructed from above
1496	1692	* attributes. */
1497	1693	{
1498		subFontPtr->hFont = hFont;
	1694	subFontPtr->hFont0 = hFont;
1499	1695	subFontPtr->familyPtr = AllocFontFamily(hdc, hFont, base);
1500	1696	subFontPtr->fontMap = subFontPtr->familyPtr->fontMap;
	1697	subFontPtr->hFontAngled = NULL;
	1698	subFontPtr->angle = 0.0;
1501	1699	}
1502	1700
1503	1701	/*

1517	1715	*---------------------------------------------------------------------------
1518	1716	*/
1519	1717
1520		static void
	1718	static inline void
1521	1719	ReleaseSubFont(
1522	1720	SubFont subFontPtr) / The SubFont to delete. */
1523	1721	{
1524		DeleteObject(subFontPtr->hFont);
	1722	DeleteObject(subFontPtr->hFont0);
	1723	if (subFontPtr->hFontAngled) {
	1724	DeleteObject(subFontPtr->hFontAngled);
	1725	}
1525	1726	FreeFontFamily(subFontPtr->familyPtr);
1526	1727	}
1527	1728

1565	1766	Tcl_DString faceString;
1566	1767	Tcl_Encoding encoding;
1567	1768	char buf[LF_FACESIZE * sizeof(WCHAR)];
1568		ThreadSpecificData tsdPtr = (ThreadSpecificData )
	1769	ThreadSpecificData *tsdPtr =
1569	1770	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1570	1771
1571	1772	hFont = SelectObject(hdc, hFont);

1673	1874	{
1674	1875	int i;
1675	1876	FontFamily **familyPtrPtr;
1676		ThreadSpecificData tsdPtr = (ThreadSpecificData )
	1877	ThreadSpecificData *tsdPtr =
1677	1878	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1678	1879
1679	1880	if (familyPtr == NULL) {

1744	1945	HDC hdc;
1745	1946	int i, j, k;
1746	1947	CanUse canUse;
1747		char aliases, anyFallbacks;
1748		char ***fontFallbacks;
1749		char *fallbackName;
	1948	const char const aliases;
	1949	const char const anyFallbacks;
	1950	const char const const *fontFallbacks;
	1951	const char *fallbackName;
1750	1952	SubFont *subFontPtr;
1751	1953	Tcl_DString ds;
1752	1954

2031	2233	if (endCount[j] >= i) {
2032	2234	if (startCount[j] <= i) {
2033	2235	bitOffset = i & (FONTMAP_BITSPERPAGE - 1);
2034		subFontPtr->fontMap[row][bitOffset >> 3] \|= 1 << (bitOffset & 7);
	2236	subFontPtr->fontMap[row][bitOffset >> 3] \|=
	2237	1 << (bitOffset & 7);
2035	2238	}
2036	2239	break;
2037	2240	}

2089	2292	HDC hdc, /* HDC in which font can be selected. */
2090	2293	WinFont fontPtr, / The font object that will own the new
2091	2294	* screen font. */
2092		char faceName, / Desired face name for new screen font. */
	2295	const char faceName, / Desired face name for new screen font. */
2093	2296	int ch, /* The Unicode character that the new screen
2094	2297	* font must be able to display. */
2095	2298	Tcl_DString nameTriedPtr, / Records face names that have already been

2100	2303	* array of subfonts. */
2101	2304	{
2102	2305	int i;
2103		char **aliases;
	2306	const char const aliases;
2104	2307	SubFont *subFontPtr;
2105	2308
2106	2309	if (SeenName(faceName, nameTriedPtr) == 0) {

2192	2395	HDC hdc, /* HDC in which font can be selected. */
2193	2396	WinFont fontPtr, / The font object that will own the new
2194	2397	* screen font. */
2195		char faceName, / Desired face name for new screen font. */
	2398	const char faceName, / Desired face name for new screen font. */
2196	2399	int ch, /* The Unicode character that the new screen
2197	2400	* font must be able to display. */
2198	2401	SubFont *subFontPtrPtr) / Variable to fix-up if we realloc the array

2220	2423	* Load this font and see if it has the desired character.
2221	2424	*/
2222	2425
2223		hFont = GetScreenFont(&fontPtr->font.fa, faceName, fontPtr->pixelSize);
	2426	hFont = GetScreenFont(&fontPtr->font.fa, faceName, fontPtr->pixelSize,
	2427	0.0);
2224	2428	InitSubFont(hdc, hFont, 0, &subFont);
2225	2429	if (((ch < 256) && (subFont.familyPtr->isSymbolFont))
2226	2430	\|\| (FontMapLookup(&subFont, ch) == 0)) {

2236	2440	if (fontPtr->numSubFonts >= SUBFONT_SPACE) {
2237	2441	SubFont *newPtr;
2238	2442
2239		newPtr = (SubFont *) ckalloc(sizeof(SubFont)
2240		* (fontPtr->numSubFonts + 1));
2241		memcpy((char *) newPtr, fontPtr->subFontArray,
	2443	newPtr = (SubFont *)
	2444	ckalloc(sizeof(SubFont) * (fontPtr->numSubFonts + 1));
	2445	memcpy(newPtr, fontPtr->subFontArray,
2242	2446	fontPtr->numSubFonts * sizeof(SubFont));
2243	2447	if (fontPtr->subFontArray != fontPtr->staticSubFonts) {
2244	2448	ckfree((char *) fontPtr->subFontArray);

2280	2484	/* Desired font attributes for new HFONT. */
2281	2485	const char faceName, / Overrides font family specified in font
2282	2486	* attributes. */
2283		int pixelSize) /* Overrides size specified in font
	2487	int pixelSize, /* Overrides size specified in font
2284	2488	* attributes. */
	2489	double angle) /* What is the desired orientation of the
	2490	* font. */
2285	2491	{
2286	2492	Tcl_DString ds;
2287	2493	HFONT hFont;

2290	2496	memset(&lf, 0, sizeof(lf));
2291	2497	lf.lfHeight = -pixelSize;
2292	2498	lf.lfWidth = 0;
2293		lf.lfEscapement = 0;
2294		lf.lfOrientation = 0;
	2499	lf.lfEscapement = (int) floor(angle * 10 + 0.5);
	2500	lf.lfOrientation = (int) floor(angle * 10 + 0.5);
2295	2501	lf.lfWeight = (faPtr->weight == TK_FW_NORMAL) ? FW_NORMAL : FW_BOLD;
2296	2502	lf.lfItalic = faPtr->slant;
2297	2503	lf.lfUnderline = faPtr->underline;

2399	2605	return (result == 0);
2400	2606	}
2401	2607
2402		static char *
	2608	static const char *
2403	2609	FamilyOrAliasExists(
2404	2610	HDC hdc,
2405	2611	const char *faceName)
2406	2612	{
2407		char **aliases;
	2613	const char const aliases;
2408	2614	int i;
2409	2615
2410	2616	if (FamilyExists(hdc, faceName) != 0) {

2709	2915	*-------------------------------------------------------------------------
2710	2916	*/
2711	2917
2712		static void
	2918	static inline void
2713	2919	SwapShort(
2714	2920	PUSHORT p)
2715	2921	{
2716	2922	p = (SHORT)(HIBYTE(p) + (LOBYTE(*p) << 8));
2717	2923	}
2718	2924
2719		static void
	2925	static inline void
2720	2926	SwapLong(
2721	2927	PULONG p)
2722	2928	{

+2

-2

win/tkWinImage.c less more

7	7	* See the file "license.terms" for information on usage and redistribution
8	8	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9	9	*
10		* RCS: @(#) $Id: tkWinImage.c,v 1.11 2007/01/12 10:41:23 dkf Exp $
	10	* RCS: @(#) $Id: tkWinImage.c,v 1.12 2008/10/17 23:18:38 nijtmans Exp $
11	11	*/
12	12
13	13	#include "tkWinInt.h"

640	640	imagePtr = XGetImageZPixmap(display, d, x, y,
641	641	width, height, plane_mask, format);
642	642	} else {
643		char *errMsg = NULL;
	643	const char *errMsg = NULL;
644	644	char infoBuf[sizeof(BITMAPINFO) + sizeof(RGBQUAD)];
645	645	BITMAPINFO infoPtr = (BITMAPINFO)infoBuf;
646	646

+3

-1

win/tkWinInt.h less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkWinInt.h,v 1.31 2007/12/14 15:56:09 patthoyts Exp $
	12	* RCS: @(#) $Id: tkWinInt.h,v 1.32 2008/12/10 05:02:52 das Exp $
13	13	*/
14	14
15	15	#ifndef _TKWININT

210	210	BOOL (WINAPI *insertMenu)(HMENU hMenu, UINT uPosition, UINT uFlags,
211	211	UINT uIDNewItem, LPCTSTR lpNewItem);
212	212	int (WINAPI *getWindowText)(HWND hWnd, LPCTSTR lpString, int nMaxCount);
	213	HWND (WINAPI *findWindow)(LPCTSTR lpClassName, LPCTSTR lpWindowName);
	214	int (WINAPI *getClassName)(HWND hwnd, LPTSTR lpClassName, int nMaxCount);
213	215	} TkWinProcs;
214	216
215	217	EXTERN TkWinProcs *tkWinProcs;

+6

-6

win/tkWinMenu.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkWinMenu.c,v 1.59 2007/12/13 15:28:56 dgp Exp $
	12	* RCS: @(#) $Id: tkWinMenu.c,v 1.62 2008/12/09 21:22:56 dgp Exp $
13	13	*/
14	14
15	15	#define OEMRESOURCE

451	451	strcpy(itemText, "( )");
452	452	} else {
453	453	int i;
454		char *label = (mePtr->labelPtr == NULL) ? ""
	454	const char *label = (mePtr->labelPtr == NULL) ? ""
455	455	: Tcl_GetString(mePtr->labelPtr);
456		char *accel = (mePtr->accelPtr == NULL) ? ""
	456	const char *accel = (mePtr->accelPtr == NULL) ? ""
457	457	: Tcl_GetString(mePtr->accelPtr);
458	458	const char p, next;
459	459	Tcl_DString itemString;

668	668	}
669	669	}
670	670	if (!systemMenu) {
671		(*tkWinProcs->insertMenu)(winMenuHdl, 0xFFFFFFFF, flags,
	671	tkWinProcs->insertMenu(winMenuHdl, 0xFFFFFFFF, flags,
672	672	itemID, lpNewItem);
673	673	}
674	674	Tcl_DStringFree(&translatedText);

1031	1031	if ((code != TCL_OK) && (code != TCL_CONTINUE)
1032	1032	&& (code != TCL_BREAK)) {
1033	1033	Tcl_AddErrorInfo(interp, "\n (menu preprocess)");
1034		Tcl_BackgroundError(interp);
	1034	Tcl_BackgroundException(interp, code);
1035	1035	}
1036	1036	Tcl_Release((ClientData)interp);
1037	1037	}

1090	1090	code = TkInvokeMenu(interp, menuPtr, mePtr->index);
1091	1091	if (code != TCL_OK && code != TCL_CONTINUE && code != TCL_BREAK) {
1092	1092	Tcl_AddErrorInfo(interp, "\n (menu invoke)");
1093		Tcl_BackgroundError(interp);
	1093	Tcl_BackgroundException(interp, code);
1094	1094	}
1095	1095	Tcl_Release((ClientData)interp);
1096	1096	*plResult = 0;

+2

-2

win/tkWinScrlbr.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkWinScrlbr.c,v 1.16 2008/10/03 13:13:31 dkf Exp $
	11	* RCS: @(#) $Id: tkWinScrlbr.c,v 1.17 2008/12/09 21:22:56 dgp Exp $
12	12	*/
13	13
14	14	#include "tkWinInt.h"

571	571	code = Tcl_GlobalEval(interp, cmdString.string);
572	572	if (code != TCL_OK && code != TCL_CONTINUE && code != TCL_BREAK) {
573	573	Tcl_AddErrorInfo(interp, "\n (scrollbar command)");
574		Tcl_BackgroundError(interp);
	574	Tcl_BackgroundException(interp, code);
575	575	}
576	576	Tcl_DStringFree(&cmdString);
577	577

+21

-19

win/tkWinSend.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkWinSend.c,v 1.17 2008/10/05 18:22:22 dkf Exp $
	12	* RCS: @(#) $Id: tkWinSend.c,v 1.18 2008/10/17 23:18:38 nijtmans Exp $
13	13	*/
14	14
15	15	#include "tkInt.h"

67	67	static void InterpDeleteProc(ClientData clientData,
68	68	Tcl_Interp *interp);
69	69	#endif
	70	#ifdef TK_SEND_ENABLED_ON_WINDOWS
70	71	static void RevokeObjectRegistration(RegisteredInterp *riPtr);
	72	#endif
71	73	static HRESULT BuildMoniker(const char name, LPMONIKER pmk);
72	74	#ifdef TK_SEND_ENABLED_ON_WINDOWS
73	75	static HRESULT RegisterInterp(const char *name,

87	89	#else
88	90	#define TRACE 1 ? ((void)0) : SendTrace
89	91	#endif
90
	92
91	93	/*
92	94	*--------------------------------------------------------------
93	95	*

188	190	return (const char *) riPtr->name;
189	191	#endif /* TK_SEND_ENABLED_ON_WINDOWS */
190	192	}
191
	193
192	194	/*
193	195	*----------------------------------------------------------------------
194	196	*

294	296	return result;
295	297	#endif /* TK_SEND_ENABLED_ON_WINDOWS */
296	298	}
297
	299
298	300	/*
299	301	*--------------------------------------------------------------
300	302	*

323	325	enum {
324	326	SEND_ASYNC, SEND_DISPLAYOF, SEND_LAST
325	327	};
326		static const char *sendOptions[] = {
	328	static const char *const sendOptions[] = {
327	329	"-async", "-displayof", "--", NULL
328	330	};
329	331	int result = TCL_OK;

386	388
387	389	return result;
388	390	}
389
	391
390	392	/*
391	393	*--------------------------------------------------------------
392	394	*

455	457	}
456	458	return result;
457	459	}
458
	460
459	461	/*
460	462	*--------------------------------------------------------------
461	463	*

510	512
511	513	ckfree(clientData);
512	514	}
513		#endif
514
	515
515	516	/*
516	517	*--------------------------------------------------------------
517	518	*

555	556	riPtr->name = NULL;
556	557	}
557	558	}
558
	559	#endif
	560
559	561	/*
560	562	* ----------------------------------------------------------------------
561	563	*

582	584	CoUninitialize();
583	585	}
584	586	#endif
585
	587
586	588	/*
587	589	* ----------------------------------------------------------------------
588	590	*

625	627	}
626	628	return hr;
627	629	}
628
	630
629	631	/*
630	632	* ----------------------------------------------------------------------
631	633	*

703	705	return hr;
704	706	}
705	707	#endif
706
	708
707	709	/*
708	710	* ----------------------------------------------------------------------
709	711	*

811	813
812	814	return (SUCCEEDED(hr) ? TCL_OK : TCL_ERROR);
813	815	}
814
	816
815	817	/*
816	818	* ----------------------------------------------------------------------
817	819	*

861	863
862	864	return errPtr;
863	865	}
864
	866
865	867	/*
866	868	* ----------------------------------------------------------------------
867	869	*

925	927	}
926	928	}
927	929	}
928
	930
929	931	/*
930	932	* ----------------------------------------------------------------------
931	933	*

969	971
970	972	return 0;
971	973	}
972
	974
973	975	/*
974	976	* ----------------------------------------------------------------------
975	977	*

1006	1008
1007	1009	return 1; /* 1 to indicate the event has been handled */
1008	1010	}
1009
	1011
1010	1012	/*
1011	1013	* ----------------------------------------------------------------------
1012	1014	*

1037	1039	OutputDebugString(buffer);
1038	1040	va_end(args);
1039	1041	}
1040
	1042
1041	1043	/*
1042	1044	* Local Variables:
1043	1045	* mode: c

+82

-69

win/tkWinTest.c less more

10	10	* See the file "license.terms" for information on usage and redistribution of
11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*
13		* RCS: @(#) $Id: tkWinTest.c,v 1.17 2008/04/27 22:39:17 dkf Exp $
	13	* RCS: @(#) $Id: tkWinTest.c,v 1.24 2008/12/10 05:02:52 das Exp $
14	14	*/
15	15
16	16	#include "tkWinInt.h"

32	32	static int TestgetwindowinfoObjCmd(ClientData clientData,
33	33	Tcl_Interp *interp, int objc,
34	34	Tcl_Obj *const objv[]);
	35	static int TestwinlocaleObjCmd(ClientData clientData,
	36	Tcl_Interp *interp, int objc,
	37	Tcl_Obj *const objv[]);
35	38	MODULE_SCOPE int TkplatformtestInit(Tcl_Interp *interp);
36
37
	39	static Tk_GetSelProc SetSelectionResult;
	40
38	41	/*
39	42	*----------------------------------------------------------------------
40	43	*

68	71	(ClientData) Tk_MainWindow(interp), NULL);
69	72	Tcl_CreateObjCommand(interp, "testgetwindowinfo", TestgetwindowinfoObjCmd,
70	73	(ClientData) Tk_MainWindow(interp), NULL);
71
	74	Tcl_CreateObjCommand(interp, "testwinlocale", TestwinlocaleObjCmd,
	75	(ClientData) Tk_MainWindow(interp), NULL);
72	76	return TCL_OK;
73	77	}
74	78

121	125	}
122	126	if (length == 0) {
123	127	if (error == ERROR_CALL_NOT_IMPLEMENTED) {
124		msg = "function not supported under Win32s";
	128	msg = (char *)"function not supported under Win32s";
125	129	} else {
126	130	sprintf(msgBuf, "unknown error: %ld", error);
127	131	msg = msgBuf;

173	177	*
174	178	*----------------------------------------------------------------------
175	179	*/
	180
	181	static int
	182	SetSelectionResult(
	183	ClientData dummy,
	184	Tcl_Interp *interp,
	185	const char *selection)
	186	{
	187	Tcl_AppendResult(interp, selection, NULL);
	188	return TCL_OK;
	189	}
176	190
177	191	static int
178	192	TestclipboardObjCmd(

181	195	int objc, /* Number of arguments. */
182	196	Tcl_Obj const objv[]) / Argument values. */
183	197	{
184		HGLOBAL handle;
185		char *data;
186		int code = TCL_OK;
	198	Tk_Window tkwin = (Tk_Window) clientData;
187	199
188	200	if (objc != 1) {
189	201	Tcl_WrongNumArgs(interp, 1, objv, NULL);
190	202	return TCL_ERROR;
191	203	}
192		if (OpenClipboard(NULL)) {
193		/*
194		* We could consider using CF_UNICODETEXT on NT, but then we would
195		* have to convert it from External. Instead we'll just take this and
196		* do "bytestring" at the Tcl level for Unicode inclusive text
197		*/
198
199		handle = GetClipboardData(CF_TEXT);
200		if (handle != NULL) {
201		data = GlobalLock(handle);
202		Tcl_AppendResult(interp, data, NULL);
203		GlobalUnlock(handle);
204		} else {
205		Tcl_AppendResult(interp, "null clipboard handle", NULL);
206		code = TCL_ERROR;
207		}
208		CloseClipboard();
209		return code;
210		} else {
211		Tcl_AppendResult(interp, "couldn't open clipboard: ", NULL);
212		AppendSystemError(interp, GetLastError());
213		return TCL_ERROR;
214		}
215		return TCL_OK;
	204	return TkSelGetSelection(interp, tkwin, Tk_InternAtom(tkwin, "CLIPBOARD"),
	205	XA_STRING, SetSelectionResult, NULL);
216	206	}
217	207
218	208	/*

304	294	child = GetWindow(child, GW_HWNDNEXT);
305	295	}
306	296	if (child == NULL) {
	297	Tcl_AppendResult(interp, "could not find a control matching \"",
	298	argv[2], "\"", NULL);
307	299	return TCL_ERROR;
308	300	}
309	301	}

365	357	/*
366	358	* testfindwindow title ?class?
367	359	* Find a Windows window using the FindWindow API call. This takes the window
368		* title and optionally the window class and if found returns the HWND and
	360	* title and optionally the window class and if found returns the HWND and
369	361	* raises an error if the window is not found.
370	362	* eg: testfindwindow Console TkTopLevel
371	363	* Can find the console window if it is visible.

380	372	int objc, /* Number of arguments. */
381	373	Tcl_Obj const objv[]) / Argument values. */
382	374	{
383		const char title = NULL, class = NULL;
	375	const TCHAR title = NULL, class = NULL;
	376	Tcl_DString titleString, classString;
384	377	HWND hwnd = NULL;
385	378	int r = TCL_OK;
	379
	380	Tcl_DStringInit(&classString);
	381	Tcl_DStringInit(&titleString);
386	382
387	383	if (objc < 2 \|\| objc > 3) {
388	384	Tcl_WrongNumArgs(interp, 1, objv, "title ?class?");
389	385	return TCL_ERROR;
390	386	}
391		title = Tcl_GetString(objv[1]);
392		if (objc == 3)
393		class = Tcl_GetString(objv[2]);
394		hwnd = FindWindowA(class, title);
	387
	388	title = Tcl_WinUtfToTChar(Tcl_GetString(objv[1]), -1, &titleString);
	389	if (objc == 3) {
	390	class = Tcl_WinUtfToTChar(Tcl_GetString(objv[2]), -1, &classString);
	391	}
	392
	393	hwnd = tkWinProcs->findWindow(class, title);
395	394
396	395	if (hwnd == NULL) {
397	396	Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to find window: ", -1));

400	399	} else {
401	400	Tcl_SetObjResult(interp, Tcl_NewLongObj((long)hwnd));
402	401	}
	402
	403	Tcl_DStringFree(&titleString);
	404	Tcl_DStringFree(&classString);
403	405	return r;
404
	406
405	407	}
406	408
407	409	static BOOL CALLBACK
408		EnumChildrenProc(HWND hwnd, LPARAM lParam)
409		{
410		Tcl_Obj listObj = (Tcl_Obj )lParam;
411		Tcl_ListObjAppendElement(NULL, listObj, Tcl_NewLongObj((long)hwnd));
	410	EnumChildrenProc(
	411	HWND hwnd,
	412	LPARAM lParam)
	413	{
	414	Tcl_Obj listObj = (Tcl_Obj ) lParam;
	415
	416	Tcl_ListObjAppendElement(NULL, listObj, Tcl_NewLongObj((long) hwnd));
412	417	return TRUE;
413	418	}
414	419

420	425	Tcl_Obj *const objv[])
421	426	{
422	427	HWND hwnd = NULL;
423		Tcl_Obj resObj = NULL, classObj = NULL, *textObj = NULL;
	428	Tcl_Obj dictObj = NULL, classObj = NULL, *textObj = NULL;
424	429	Tcl_Obj *childrenObj = NULL;
425	430	char buf[512];
426	431	int cch, cchBuf = tkWinProcs->useWide ? 256 : 512;

432	437
433	438	if (Tcl_GetLongFromObj(interp, objv[1], (long *)&hwnd) != TCL_OK)
434	439	return TCL_ERROR;
435
436		if (tkWinProcs->useWide) {
437		cch = GetClassNameW(hwnd, (LPWSTR)buf, sizeof(buf)/sizeof(WCHAR));
438		classObj = Tcl_NewUnicodeObj((LPWSTR)buf, cch);
439		} else {
440		cch = GetClassNameA(hwnd, (LPSTR)buf, sizeof(buf));
441		classObj = Tcl_NewStringObj((LPSTR)buf, cch);
442		}
	440
	441	cch = tkWinProcs->getClassName(hwnd, buf, cchBuf);
443	442	if (cch == 0) {
444	443	Tcl_SetResult(interp, "failed to get class name: ", TCL_STATIC);
445	444	AppendSystemError(interp, GetLastError());
446	445	return TCL_ERROR;
447		}
448
449		resObj = Tcl_NewListObj(0, NULL);
450		Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("class", -1));
451		Tcl_ListObjAppendElement(interp, resObj, classObj);
452
453		Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("id", -1));
454		Tcl_ListObjAppendElement(interp, resObj,
	446	} else {
	447	Tcl_DString ds;
	448	Tcl_WinTCharToUtf(buf, -1, &ds);
	449	classObj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
	450	Tcl_DStringFree(&ds);
	451	}
	452
	453	dictObj = Tcl_NewDictObj();
	454	Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("class", 5), classObj);
	455	Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("id", 2),
455	456	Tcl_NewLongObj(GetWindowLong(hwnd, GWL_ID)));
456	457
457	458	cch = tkWinProcs->getWindowText(hwnd, (LPTSTR)buf, cchBuf);

461	462	textObj = Tcl_NewStringObj((LPCSTR)buf, cch);
462	463	}
463	464
464		Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("text", -1));
465		Tcl_ListObjAppendElement(interp, resObj, textObj);
466		Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("parent", -1));
467		Tcl_ListObjAppendElement(interp, resObj,
	465	Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("text", 4), textObj);
	466	Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("parent", 6),
468	467	Tcl_NewLongObj((long)GetParent(hwnd)));
469	468
470	469	childrenObj = Tcl_NewListObj(0, NULL);
471	470	EnumChildWindows(hwnd, EnumChildrenProc, (LPARAM)childrenObj);
472		Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("children", -1));
473		Tcl_ListObjAppendElement(interp, resObj, childrenObj);
474
475		Tcl_SetObjResult(interp, resObj);
	471	Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("children", -1), childrenObj);
	472
	473	Tcl_SetObjResult(interp, dictObj);
476	474	return TCL_OK;
477		}
	475	}
	476
	477	static int
	478	TestwinlocaleObjCmd(
	479	ClientData clientData, /* Main window for application. */
	480	Tcl_Interp interp, / Current interpreter. */
	481	int objc, /* Number of arguments. */
	482	Tcl_Obj const objv[]) / Argument values. */
	483	{
	484	if (objc != 1) {
	485	Tcl_WrongNumArgs(interp, 1, objv, NULL);
	486	return TCL_ERROR;
	487	}
	488	Tcl_SetObjResult(interp, Tcl_NewIntObj((int)GetThreadLocale()));
	489	return TCL_OK;
	490	}
478	491
479	492	/*
480	493	* Local Variables:

+179

-3

win/tkWinWindow.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: tkWinWindow.c,v 1.18 2008/08/19 15:52:14 georgeps Exp $
	11	* RCS: @(#) $Id: tkWinWindow.c,v 1.19 2008/10/20 10:50:20 dkf Exp $
12	12	*/
13	13
14	14	#include "tkWinInt.h"
	15	#include "tkBusy.h"
15	16
16	17	typedef struct ThreadSpecificData {
17	18	int initialized; /* 0 means table below needs initializing. */

173	174	/*
174	175	* Use pointer representation, because Win64 is P64 (not LP64). Windows
175	176	* doesn't print the 0x for %p, so we do it.
176		* bug #2026405: cygwin does output 0x for %p so test and recover.
	177	* Bug 2026405: cygwin does output 0x for %p so test and recover.
177	178	*/
178	179
179	180	sprintf(buf, "0x%p", hwnd);
180		if (buf[2] == '0' && buf[3] == 'x')
	181	if (buf[2] == '0' && buf[3] == 'x') {
181	182	sprintf(buf, "%p", hwnd);
	183	}
182	184	}
183	185
184	186	/*

783	785	}
784	786
785	787	/*
	788	*----------------------------------------------------------------------
	789	*
	790	* TkpShowBusyWindow --
	791	*
	792	* Makes a busy window "appear".
	793	*
	794	* Results:
	795	* None.
	796	*
	797	* Side effects:
	798	* Arranges for the busy window to start intercepting events and the
	799	* cursor to change to the configured "hey, I'm busy!" setting.
	800	*
	801	*----------------------------------------------------------------------
	802	*/
	803
	804	void
	805	TkpShowBusyWindow(
	806	TkBusy busy)
	807	{
	808	Busy busyPtr = (Busy ) busy;
	809	HWND hWnd;
	810	POINT point;
	811	Display *display;
	812	Window window;
	813
	814	if (busyPtr->tkBusy != NULL) {
	815	Tk_MapWindow(busyPtr->tkBusy);
	816	window = Tk_WindowId(busyPtr->tkBusy);
	817	display = Tk_Display(busyPtr->tkBusy);
	818	hWnd = Tk_GetHWND(window);
	819	display->request++;
	820	SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE \| SWP_NOSIZE);
	821	}
	822
	823	/*
	824	* Under Win32, cursors aren't associated with windows. Tk fakes this by
	825	* watching Motion events on its windows. So Tk will automatically change
	826	* the cursor when the pointer enters the Busy window. But Windows does
	827	* not immediately change the cursor; it waits for the cursor position to
	828	* change or a system call. We need to change the cursor before the
	829	* application starts processing, so set the cursor position redundantly
	830	* back to the current position.
	831	*/
	832
	833	GetCursorPos(&point);
	834	SetCursorPos(point.x, point.y);
	835	}
	836
	837	/*
	838	*----------------------------------------------------------------------
	839	*
	840	* TkpHideBusyWindow --
	841	*
	842	* Makes a busy window "disappear".
	843	*
	844	* Results:
	845	* None.
	846	*
	847	* Side effects:
	848	* Arranges for the busy window to stop intercepting events, and the
	849	* cursor to change back to its normal setting.
	850	*
	851	*----------------------------------------------------------------------
	852	*/
	853
	854	void
	855	TkpHideBusyWindow(
	856	TkBusy busy)
	857	{
	858	Busy busyPtr = (Busy ) busy;
	859	POINT point;
	860
	861	if (busyPtr->tkBusy != NULL) {
	862	Tk_UnmapWindow(busyPtr->tkBusy);
	863	}
	864
	865	/*
	866	* Under Win32, cursors aren't associated with windows. Tk fakes this by
	867	* watching Motion events on its windows. So Tk will automatically change
	868	* the cursor when the pointer enters the Busy window. But Windows does
	869	* not immediately change the cursor: it waits for the cursor position to
	870	* change or a system call. We need to change the cursor before the
	871	* application starts processing, so set the cursor position redundantly
	872	* back to the current position.
	873	*/
	874
	875	GetCursorPos(&point);
	876	SetCursorPos(point.x, point.y);
	877	}
	878
	879	/*
	880	*----------------------------------------------------------------------
	881	*
	882	* TkpMakeTransparentWindowExist --
	883	*
	884	* Construct the platform-specific resources for a transparent window.
	885	*
	886	* Results:
	887	* None.
	888	*
	889	* Side effects:
	890	* Moves the specified window in the stacking order.
	891	*
	892	*----------------------------------------------------------------------
	893	*/
	894
	895	void
	896	TkpMakeTransparentWindowExist(
	897	Tk_Window tkwin, /* Token for window. */
	898	Window parent) /* Parent window. */
	899	{
	900	TkWindow winPtr = (TkWindow ) tkwin;
	901	HWND hParent = (HWND) parent, hWnd;
	902	int style = WS_CHILD \| WS_CLIPCHILDREN \| WS_CLIPSIBLINGS;
	903	DWORD exStyle = WS_EX_TRANSPARENT \| WS_EX_TOPMOST;
	904
	905	#define TK_WIN_CHILD_CLASS_NAME "TkChild"
	906	hWnd = CreateWindowEx(exStyle, TK_WIN_CHILD_CLASS_NAME, NULL, style,
	907	Tk_X(tkwin), Tk_Y(tkwin), Tk_Width(tkwin), Tk_Height(tkwin),
	908	hParent, NULL, Tk_GetHINSTANCE(), NULL);
	909	winPtr->window = Tk_AttachHWND(tkwin, hWnd);
	910	}
	911
	912	/*
	913	*----------------------------------------------------------------------
	914	*
	915	* TkpCreateBusy --
	916	*
	917	* Construct the platform-specific parts of a busy window. Note that this
	918	* postpones the actual creation of the window resource until later.
	919	*
	920	* Results:
	921	* None.
	922	*
	923	* Side effects:
	924	* Sets up part of the busy window structure.
	925	*
	926	*----------------------------------------------------------------------
	927	*/
	928
	929	void
	930	TkpCreateBusy(
	931	Tk_FakeWin *winPtr,
	932	Tk_Window tkRef,
	933	Window *parentPtr,
	934	Tk_Window tkParent,
	935	TkBusy busy)
	936	{
	937	Busy busyPtr = (Busy ) busy;
	938
	939	if (winPtr->flags & TK_REPARENTED) {
	940	/*
	941	* This works around a bug in the implementation of menubars for
	942	* non-Macintosh window systems (Win32 and X11). Tk doesn't reset the
	943	* pointers to the parent window when the menu is reparented
	944	* (winPtr->parentPtr points to the wrong window). We get around this
	945	* by determining the parent via the native API calls.
	946	*/
	947
	948	HWND hWnd = GetParent(Tk_GetHWND(Tk_WindowId(tkRef)));
	949	RECT rect;
	950
	951	if (GetWindowRect(hWnd, &rect)) {
	952	busyPtr->width = rect.right - rect.left;
	953	busyPtr->height = rect.bottom - rect.top;
	954	}
	955	} else {
	956	*parentPtr = Tk_WindowId(tkParent);
	957	parentPtr = (Window) Tk_GetHWND(parentPtr);
	958	}
	959	}
	960
	961	/*
786	962	* Local Variables:
787	963	* mode: c
788	964	* c-basic-offset: 4

+23

-15

win/tkWinWm.c less more

11	11	* See the file "license.terms" for information on usage and redistribution of
12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*
14		* RCS: @(#) $Id: tkWinWm.c,v 1.130 2008/10/06 21:57:21 patthoyts Exp $
	14	* RCS: @(#) $Id: tkWinWm.c,v 1.134 2008/12/09 21:22:56 dgp Exp $
15	15	*/
16	16
17	17	#include "tkWinInt.h"

2829	2829	Tcl_Obj const objv[]) / Argument objects. */
2830	2830	{
2831	2831	Tk_Window tkwin = clientData;
2832		static const char *optionStrings[] = {
	2832	static const char *const optionStrings[] = {
2833	2833	"aspect", "attributes", "client", "colormapwindows",
2834	2834	"command", "deiconify", "focusmodel", "forget", "frame",
2835	2835	"geometry", "grid", "group", "iconbitmap",

3536	3536	}
3537	3537	if (objc == 3) {
3538	3538	if (wmPtr->cmdArgv != NULL) {
3539		Tcl_SetResult(interp,
3540		Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv), TCL_DYNAMIC);
	3539	argv3 = Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv);
	3540	Tcl_SetResult(interp, argv3, TCL_VOLATILE);
	3541	ckfree(argv3);
3541	3542	}
3542	3543	return TCL_OK;
3543	3544	}

3641	3642	Tcl_Obj const objv[]) / Argument objects. */
3642	3643	{
3643	3644	register WmInfo *wmPtr = winPtr->wmInfoPtr;
3644		static const char *optionStrings[] = {
	3645	static const char *const optionStrings[] = {
3645	3646	"active", "passive", NULL
3646	3647	};
3647	3648	enum options {

3712	3713	/* Already not managed by wm - ignore it */
3713	3714	}
3714	3715	return TCL_OK;
3715		}
	3716	}
	3717
3716	3718	/*
3717	3719	*----------------------------------------------------------------------
3718	3720	*

4586	4588	register WmInfo *wmPtr = winPtr->wmInfoPtr;
4587	4589
4588	4590	if (!Tk_IsTopLevel(frameWin)) {
	4591	if (!Tk_IsManageable(frameWin)) {
	4592	Tcl_AppendResult(interp, "window \"",
	4593	Tk_PathName(frameWin), "\" is not manageable: must be "
	4594	"a frame, labelframe or toplevel", NULL);
	4595	return TCL_ERROR;
	4596	}
4589	4597	TkFocusSplit(winPtr);
4590	4598	Tk_UnmapWindow(frameWin);
4591	4599	winPtr->flags \|= TK_TOP_HIERARCHY\|TK_TOP_LEVEL\|TK_HAS_WRAPPER\|TK_WIN_MANAGED;

4795	4803	Tcl_Obj const objv[]) / Argument objects. */
4796	4804	{
4797	4805	register WmInfo *wmPtr = winPtr->wmInfoPtr;
4798		static const char *optionStrings[] = {
	4806	static const char *const optionStrings[] = {
4799	4807	"program", "user", NULL
4800	4808	};
4801	4809	enum options {

5012	5020	Tcl_Obj const objv[]) / Argument objects. */
5013	5021	{
5014	5022	register WmInfo *wmPtr = winPtr->wmInfoPtr;
5015		static const char *optionStrings[] = {
	5023	static const char *const optionStrings[] = {
5016	5024	"program", "user", NULL
5017	5025	};
5018	5026	enum options {

5078	5086	Tcl_Obj const objv[]) / Argument objects. */
5079	5087	{
5080	5088	TkWindow windows, window_ptr;
5081		static const char *optionStrings[] = {
	5089	static const char *const optionStrings[] = {
5082	5090	"isabove", "isbelow", NULL
5083	5091	};
5084	5092	enum options {

5196	5204	Tcl_Obj const objv[]) / Argument objects. */
5197	5205	{
5198	5206	register WmInfo *wmPtr = winPtr->wmInfoPtr;
5199		static const char *optionStrings[] = {
	5207	static const char *const optionStrings[] = {
5200	5208	"normal", "iconic", "withdrawn", "zoomed", NULL
5201	5209	};
5202	5210	enum options {

6514	6522	Tcl_Preserve(interp);
6515	6523	result = Tcl_GlobalEval(interp, protPtr->command);
6516	6524	if (result != TCL_OK) {
6517		Tcl_AddErrorInfo(interp, "\n (command for \"");
6518		Tcl_AddErrorInfo(interp, name);
6519		Tcl_AddErrorInfo(interp, "\" window manager protocol)");
6520		Tcl_BackgroundError(interp);
	6525	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
	6526	"\n (command for \"%s\" window manager protocol)",
	6527	name));
	6528	Tcl_BackgroundException(interp, result);
6521	6529	}
6522	6530	Tcl_Release(interp);
6523	6531	Tcl_Release(protPtr);

8456	8464	*----------------------------------------------------------------------
8457	8465	*/
8458	8466
8459		static void
	8467	static void
8460	8468	RemapWindows(
8461	8469	TkWindow *winPtr,
8462	8470	HWND parentHWND)

+5

-1

win/tkWinX.c less more

9	9	* See the file "license.terms" for information on usage and redistribution of
10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*
12		* RCS: @(#) $Id: tkWinX.c,v 1.58 2008/04/27 22:39:17 dkf Exp $
	12	* RCS: @(#) $Id: tkWinX.c,v 1.59 2008/12/10 05:02:52 das Exp $
13	13	*/
14	14
15	15	/*

78	78	(BOOL (WINAPI *)(HMENU hMenu, UINT uPosition, UINT uFlags,
79	79	UINT uIDNewItem, LPCTSTR lpNewItem)) InsertMenuA,
80	80	(int (WINAPI *)(HWND hWnd, LPCTSTR lpString, int nMaxCount)) GetWindowTextA,
	81	(HWND (WINAPI *)(LPCTSTR lpClassName, LPCTSTR lpWindowName)) FindWindowA,
	82	(int (WINAPI *)(HWND hwnd, LPTSTR lpClassName, int nMaxCount)) GetClassNameA,
81	83	};
82	84
83	85	static TkWinProcs unicodeProcs = {

96	98	(BOOL (WINAPI *)(HMENU hMenu, UINT uPosition, UINT uFlags,
97	99	UINT uIDNewItem, LPCTSTR lpNewItem)) InsertMenuW,
98	100	(int (WINAPI *)(HWND hWnd, LPCTSTR lpString, int nMaxCount)) GetWindowTextW,
	101	(HWND (WINAPI *)(LPCTSTR lpClassName, LPCTSTR lpWindowName)) FindWindowW,
	102	(int (WINAPI *)(HWND hwnd, LPTSTR lpClassName, int nMaxCount)) GetClassNameW,
99	103	};
100	104
101	105	TkWinProcs *tkWinProcs;

+17

-5

win/ttkWinTheme.c less more

0	0	/* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
1	1	*
2		* $Id: ttkWinTheme.c,v 1.13 2008/01/08 17:01:00 jenglish Exp $
	2	* $Id: ttkWinTheme.c,v 1.14 2008/11/01 15:34:24 patthoyts Exp $
3	3	*/
4	4
5	5	#ifdef _MSC_VER

103	103	Ttk_Padding margins; /* additional placement padding */
104	104	} FrameControlElementData;
105	105
106		#define _FIXEDSIZE 0x8000
	106	#define _FIXEDSIZE 0x80000000L
	107	#define _HALFMETRIC 0x40000000L
107	108	#define FIXEDSIZE(id) (id\|_FIXEDSIZE)
	109	#define HALFMETRIC(id) (id\|_HALFMETRIC)
108	110	#define GETMETRIC(m) \
109		((m) & _FIXEDSIZE ? (m) & ~_FIXEDSIZE : GetSystemMetrics(m))
	111	((m) & _FIXEDSIZE ? (m) & ~_FIXEDSIZE : GetSystemMetrics((m)&0x0fffffff))
110	112
111	113	static FrameControlElementData FrameControlElements[] = {
112	114	{ "Checkbutton.indicator",

130	132	{ "sizegrip",
131	133	DFC_SCROLL, DFCS_SCROLLSIZEGRIP, SM_CXVSCROLL, SM_CYHSCROLL,
132	134	arrow_statemap, {0,0,0,0} },
	135	{ "Spinbox.uparrow",
	136	DFC_SCROLL, DFCS_SCROLLUP, SM_CXVSCROLL, HALFMETRIC(SM_CYVSCROLL),
	137	arrow_statemap, {0,0,0,0} },
	138	{ "Spinbox.downarrow",
	139	DFC_SCROLL, DFCS_SCROLLDOWN, SM_CXVSCROLL, HALFMETRIC(SM_CYVSCROLL),
	140	arrow_statemap, {0,0,0,0} },
133	141
134	142	{ 0,0,0,0,0,0, {0,0,0,0} }
135	143	};

141	149	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
142	150	{
143	151	FrameControlElementData *p = clientData;
144		*widthPtr = GETMETRIC(p->cxId) + Ttk_PaddingWidth(p->margins);
145		*heightPtr = GETMETRIC(p->cyId) + Ttk_PaddingHeight(p->margins);
	152	int cx = GETMETRIC(p->cxId);
	153	int cy = GETMETRIC(p->cyId);
	154	if (p->cxId & _HALFMETRIC) cx /= 2;
	155	if (p->cyId & _HALFMETRIC) cy /= 2;
	156	*widthPtr = cx + Ttk_PaddingWidth(p->margins);
	157	*heightPtr = cy + Ttk_PaddingHeight(p->margins);
146	158	}
147	159
148	160	static void FrameControlElementDraw(

+65

-2

win/ttkWinXPTheme.c less more

0	0	/*
1		* $Id: ttkWinXPTheme.c,v 1.20 2008/04/27 22:39:17 dkf Exp $
	1	* $Id: ttkWinXPTheme.c,v 1.22 2008/12/05 11:11:58 patthoyts Exp $
2	2	*
3	3	* Tk theme engine which uses the Windows XP "Visual Styles" API
4	4	* Adapted from Georgios Petasis' XP theme patch.

257	257	{ CBXS_DISABLED, TTK_STATE_DISABLED, 0 },
258	258	{ CBXS_PRESSED, TTK_STATE_PRESSED, 0 },
259	259	{ CBXS_HOT, TTK_STATE_ACTIVE, 0 },
	260	{ CBXS_HOT, TTK_STATE_HOVER, 0 },
260	261	{ CBXS_NORMAL, 0, 0 }
261	262	};
262	263

314	315	{ ABS_RIGHTHOT, TTK_STATE_ACTIVE, 0 },
315	316	{ ABS_RIGHTNORMAL, 0, 0 }
316	317	};
	318
	319	static Ttk_StateTable spinbutton_statemap[] =
	320	{
	321	{ DNS_DISABLED, TTK_STATE_DISABLED, 0 },
	322	{ DNS_PRESSED, TTK_STATE_PRESSED, 0 },
	323	{ DNS_HOT, TTK_STATE_ACTIVE, 0 },
	324	{ DNS_NORMAL, 0, 0 },
	325	};
317	326
318	327	/*
319	328	* Trackbar thumb: (Tk: "scale slider")

581	590	sizeof(NullElement),
582	591	TtkNullElementOptions,
583	592	GenericSizedElementSize,
	593	GenericElementDraw
	594	};
	595
	596	/*----------------------------------------------------------------------
	597	* +++ Spinbox arrow element.
	598	* These are half-height scrollbar buttons.
	599	*/
	600
	601	static void
	602	SpinboxArrowElementSize(
	603	void clientData, void elementRecord, Tk_Window tkwin,
	604	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
	605	{
	606	ElementData *elementData = clientData;
	607
	608	if (!InitElementData(elementData, tkwin, 0))
	609	return;
	610
	611	GenericSizedElementSize(clientData, elementRecord, tkwin,
	612	widthPtr, heightPtr, paddingPtr);
	613
	614	/* force the arrow button height to half size */
	615	*heightPtr /= 2;
	616	}
	617
	618	static Ttk_ElementSpec SpinboxArrowElementSpec = {
	619	TK_STYLE_VERSION_2,
	620	sizeof(NullElement),
	621	TtkNullElementOptions,
	622	SpinboxArrowElementSize,
584	623	GenericElementDraw
585	624	};
586	625

963	1002	HP_HEADERITEM, header_statemap, PAD(4,0,4,0),0 },
964	1003	{ "sizegrip", &GenericElementSpec, L"STATUS",
965	1004	SP_GRIPPER, null_statemap, NOPAD,0 },
	1005	{ "Spinbox.field", &GenericElementSpec, L"EDIT",
	1006	EP_EDITTEXT, edittext_statemap, PAD(1, 1, 1, 1), 0 },
	1007	{ "Spinbox.uparrow", &SpinboxArrowElementSpec, L"SPIN",
	1008	SPNP_UP, spinbutton_statemap, NOPAD,
	1009	PAD_MARGINS \| ((SM_CXVSCROLL << 8) \| SM_CYVSCROLL) },
	1010	{ "Spinbox.downarrow", &SpinboxArrowElementSpec, L"SPIN",
	1011	SPNP_DOWN, spinbutton_statemap, NOPAD,
	1012	PAD_MARGINS \| ((SM_CXVSCROLL << 8) \| SM_CYVSCROLL) },
966	1013
967	1014	#if BROKEN_TEXT_ELEMENT
968	1015	{ "Labelframe.text", &TextElementSpec, L"BUTTON",

1128	1175	XPThemeData *themeData;
1129	1176	XPThemeProcs *procs;
1130	1177	HINSTANCE hlibrary;
1131		Ttk_Theme themePtr, parentPtr;
	1178	Ttk_Theme themePtr, parentPtr, vistaPtr;
1132	1179	ElementInfo *infoPtr;
	1180	OSVERSIONINFO os;
	1181
	1182	os.dwOSVersionInfoSize = sizeof(os);
	1183	GetVersionEx(&os);
1133	1184
1134	1185	procs = LoadXPThemeProcs(&hlibrary);
1135	1186	if (!procs)

1156	1207	Ttk_SetThemeEnabledProc(themePtr, XPThemeEnabled, themeData);
1157	1208	Ttk_RegisterCleanup(interp, themeData, XPThemeDeleteProc);
1158	1209	Ttk_RegisterElementFactory(interp, "vsapi", Ttk_CreateVsapiElement, themeData);
	1210
	1211	/*
	1212	* Create the vista theme on suitable platform versions and set the theme
	1213	* enable function. The theme itself is defined in script.
	1214	*/
	1215
	1216	if (os.dwPlatformId == VER_PLATFORM_WIN32_NT && os.dwMajorVersion > 5) {
	1217	vistaPtr = Ttk_CreateTheme(interp, "vista", themePtr);
	1218	if (vistaPtr) {
	1219	Ttk_SetThemeEnabledProc(vistaPtr, XPThemeEnabled, themeData);
	1220	}
	1221	}
1159	1222
1160	1223	/*
1161	1224	* New elements:

+4

-4

xlib/xcolors.c less more

8	8	* See the file "license.terms" for information on usage and redistribution of
9	9	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	*
11		* RCS: @(#) $Id: xcolors.c,v 1.7 2007/01/02 23:39:40 dkf Exp $
	11	* RCS: @(#) $Id: xcolors.c,v 1.8 2008/10/17 23:18:38 nijtmans Exp $
12	12	*/
13	13
14	14	#include <tkInt.h>

33	33	*/
34	34
35	35	typedef struct {
36		char *name;
	36	const char *name;
37	37	unsigned char red, green, blue;
38	38	} XColorEntry;
39	39
40		static XColorEntry xColors[] = {
	40	static const XColorEntry xColors[] = {
41	41	{ "alice blue", 240, 248, 255 },
42	42	{ "AliceBlue", 240, 248, 255 },
43	43	{ "antique white", 250, 235, 215 },

824	824	*/
825	825
826	826	if (numXColors == 0) {
827		XColorEntry *ePtr;
	827	const XColorEntry *ePtr;
828	828	for (ePtr = xColors; ePtr->name != NULL; ePtr++) {
829	829	numXColors++;
830	830	}